[hibernate-commits] Hibernate SVN: r15067 - in core/trunk/documentation/manual/src/main/docbook: ja-JP/content and 3 other directories.

hibernate-commits at lists.jboss.org hibernate-commits at lists.jboss.org
Thu Aug 14 11:35:41 EDT 2008


Author: steve.ebersole at jboss.com
Date: 2008-08-14 11:35:40 -0400 (Thu, 14 Aug 2008)
New Revision: 15067

Modified:
   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/ja-JP/content/transactions.po
   core/trunk/documentation/manual/src/main/docbook/ko-KR/content/transactions.po
   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/zh-CN/content/architecture.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/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/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/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/xml.po
Log:
undo fixes for HHH-3080,HHH-3190,HHH-2976,HHH-3397

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	2008-08-14 15:28:13 UTC (rev 15066)
+++ core/trunk/documentation/manual/src/main/docbook/fr-FR/content/architecture.po	2008-08-14 15:35:40 UTC (rev 15067)
@@ -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: 2008-08-14 15:28+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
-#: architecture.xml:21
+#: architecture.xml:30
 #, no-c-format
 msgid "Architecture"
 msgstr "Architecture"
 
 #. Tag: title
-#: architecture.xml:24
+#: architecture.xml:33
 #, no-c-format
 msgid "Overview"
 msgstr "Généralités"
 
 #. Tag: para
-#: architecture.xml:26
+#: architecture.xml:35
 #, no-c-format
 msgid "A (very) high-level view of the Hibernate architecture:"
 msgstr "Voici une vue (très) haut niveau de l'architecture d'Hibernate :"
 
 #. Tag: para
-#: architecture.xml:39
+#: architecture.xml:48
 #, no-c-format
 msgid ""
 "This diagram shows Hibernate using the database and configuration data to "
@@ -40,7 +40,7 @@
 "persistants) à l'application."
 
 #. Tag: para
-#: architecture.xml:44
+#: architecture.xml:53
 #, no-c-format
 msgid ""
 "We would like to show a more detailed view of the runtime architecture. "
@@ -56,7 +56,7 @@
 "transactions. Cette approche utilise le minimum des APIs Hibernate :"
 
 #. Tag: para
-#: architecture.xml:61
+#: architecture.xml:70
 #, no-c-format
 msgid ""
 "The \"full cream\" architecture abstracts the application away from the "
@@ -66,20 +66,20 @@
 "sous-jacentes et laisse Hibernate s'occuper des détails."
 
 #. Tag: para
-#: architecture.xml:75
+#: architecture.xml:84
 #, fuzzy, no-c-format
 msgid "Heres some definitions of the objects in the diagrams:"
 msgstr ""
 "Voici quelques définitions des objets des diagrammes : <placeholder-1/>"
 
 #. Tag: term
-#: architecture.xml:80
+#: architecture.xml:89
 #, no-c-format
 msgid "SessionFactory (<literal>org.hibernate.SessionFactory</literal>)"
 msgstr "SessionFactory (<literal>org.hibernate.SessionFactory</literal>)"
 
 #. Tag: para
-#: architecture.xml:82
+#: architecture.xml:91
 #, no-c-format
 msgid ""
 "A threadsafe (immutable) cache of compiled mappings for a single database. A "
@@ -96,13 +96,13 @@
 "nœuds d'un cluster."
 
 #. Tag: term
-#: architecture.xml:92
+#: architecture.xml:101
 #, no-c-format
 msgid "Session (<literal>org.hibernate.Session</literal>)"
 msgstr "Session (<literal>org.hibernate.Session</literal>)"
 
 #. Tag: para
-#: architecture.xml:94
+#: architecture.xml:103
 #, no-c-format
 msgid ""
 "A single-threaded, short-lived object representing a conversation between "
@@ -119,13 +119,13 @@
 "d'objets ou lors de la récupération d'objets par leur identifiant."
 
 #. Tag: term
-#: architecture.xml:104
+#: architecture.xml:113
 #, no-c-format
 msgid "Persistent objects and collections"
 msgstr "Objets et Collections persistants"
 
 #. Tag: para
-#: architecture.xml:106
+#: architecture.xml:115
 #, no-c-format
 msgid ""
 "Short-lived, single threaded objects containing persistent state and "
@@ -144,13 +144,13 @@
 "Data Transfer Objects - DTO : objet de transfert de données)."
 
 #. Tag: term
-#: architecture.xml:117
+#: architecture.xml:126
 #, no-c-format
 msgid "Transient and detached objects and collections"
 msgstr "Objets et collections transients"
 
 #. Tag: para
-#: architecture.xml:119
+#: architecture.xml:128
 #, no-c-format
 msgid ""
 "Instances of persistent classes that are not currently associated with a "
@@ -164,13 +164,13 @@
 "instanciées par une <literal>Session</literal> fermée."
 
 #. Tag: term
-#: architecture.xml:128
+#: architecture.xml:137
 #, no-c-format
 msgid "Transaction (<literal>org.hibernate.Transaction</literal>)"
 msgstr "Transaction (<literal>org.hibernate.Transaction</literal>)"
 
 #. Tag: para
-#: architecture.xml:130
+#: architecture.xml:139
 #, no-c-format
 msgid ""
 "(Optional) A single-threaded, short-lived object used by the application to "
@@ -189,7 +189,7 @@
 "n'est jamais optionnelle!"
 
 #. Tag: term
-#: architecture.xml:141
+#: architecture.xml:150
 #, no-c-format
 msgid ""
 "ConnectionProvider (<literal>org.hibernate.connection.ConnectionProvider</"
@@ -199,7 +199,7 @@
 "literal>)"
 
 #. Tag: para
-#: architecture.xml:143
+#: architecture.xml:152
 #, no-c-format
 msgid ""
 "(Optional) A factory for (and pool of) JDBC connections. Abstracts "
@@ -213,7 +213,7 @@
 "mais peut être étendu/implémenté par le développeur."
 
 #. Tag: term
-#: architecture.xml:151
+#: architecture.xml:160
 #, no-c-format
 msgid ""
 "TransactionFactory (<literal>org.hibernate.TransactionFactory</literal>)"
@@ -221,7 +221,7 @@
 "TransactionFactory (<literal>org.hibernate.TransactionFactory</literal>)"
 
 #. Tag: para
-#: architecture.xml:153
+#: architecture.xml:162
 #, no-c-format
 msgid ""
 "(Optional) A factory for <literal>Transaction</literal> instances. Not "
@@ -231,13 +231,13 @@
 "exposé à l'application, mais peut être étendu/implémenté par le développeur."
 
 #. Tag: emphasis
-#: architecture.xml:160
+#: architecture.xml:169
 #, no-c-format
 msgid "Extension Interfaces"
 msgstr "Interfaces d'extension"
 
 #. Tag: para
-#: architecture.xml:162
+#: architecture.xml:171
 #, no-c-format
 msgid ""
 "Hibernate offers many optional extension interfaces you can implement to "
@@ -250,7 +250,7 @@
 "détails."
 
 #. Tag: para
-#: architecture.xml:171
+#: architecture.xml:180
 #, no-c-format
 msgid ""
 "Given a \"lite\" architecture, the application bypasses the "
@@ -263,13 +263,13 @@
 "JTA ou JDBC."
 
 #. Tag: title
-#: architecture.xml:179
+#: architecture.xml:188
 #, no-c-format
 msgid "Instance states"
 msgstr "Etats des instances"
 
 #. Tag: para
-#: architecture.xml:180
+#: architecture.xml:189
 #, no-c-format
 msgid ""
 "An instance of a persistent classes may be in one of three different states, "
@@ -283,13 +283,13 @@
 "concept de contexte de persistance :"
 
 #. Tag: term
-#: architecture.xml:188
+#: architecture.xml:197
 #, no-c-format
 msgid "transient"
 msgstr "passager (transient)"
 
 #. Tag: para
-#: architecture.xml:190
+#: architecture.xml:199
 #, no-c-format
 msgid ""
 "The instance is not, and has never been associated with any persistence "
@@ -300,13 +300,13 @@
 "primaire)"
 
 #. Tag: term
-#: architecture.xml:198
+#: architecture.xml:207
 #, no-c-format
 msgid "persistent"
 msgstr "persistant"
 
 #. Tag: para
-#: architecture.xml:200
+#: architecture.xml:209
 #, no-c-format
 msgid ""
 "The instance is currently associated with a persistence context. It has a "
@@ -323,18 +323,18 @@
 "l'objet)"
 
 #. Tag: term
-#: architecture.xml:212
+#: architecture.xml:221
 #, no-c-format
 msgid "detached"
 msgstr "détaché"
 
 #. Tag: para
-#: architecture.xml:214
-#, no-c-format
+#: architecture.xml:223
+#, 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. "
+"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."
 msgstr ""
@@ -345,13 +345,13 @@
 "sur la relation entre l'identité persistante et l'identité Java."
 
 #. Tag: title
-#: architecture.xml:229
+#: architecture.xml:238
 #, no-c-format
 msgid "JMX Integration"
 msgstr "Intégration JMX"
 
 #. Tag: para
-#: architecture.xml:231
+#: architecture.xml:240
 #, no-c-format
 msgid ""
 "JMX is the J2EE standard for management of Java components. Hibernate may be "
@@ -364,7 +364,7 @@
 "literal>."
 
 #. Tag: para
-#: architecture.xml:237
+#: architecture.xml:246
 #, no-c-format
 msgid ""
 "For an example how to deploy Hibernate as a JMX service on the JBoss "
@@ -377,7 +377,7 @@
 "Hibernate via JMX sur JBoss AS, vous aurez également les bénéfices suivants :"
 
 #. Tag: para
-#: architecture.xml:245
+#: architecture.xml:254
 #, no-c-format
 msgid ""
 "<emphasis>Session Management:</emphasis> The Hibernate <literal>Session</"
@@ -402,7 +402,7 @@
 "accéder à la <literal>Session</literal>."
 
 #. Tag: para
-#: architecture.xml:257
+#: architecture.xml:266
 #, no-c-format
 msgid ""
 "<emphasis>HAR deployment:</emphasis> Usually you deploy the Hibernate JMX "
@@ -423,7 +423,7 @@
 "fichiers de mapping dans votre fichier HAR."
 
 #. Tag: para
-#: architecture.xml:268
+#: architecture.xml:277
 #, no-c-format
 msgid ""
 "Consult the JBoss AS user guide for more information about these options."
@@ -432,7 +432,7 @@
 "ces options."
 
 #. Tag: para
-#: architecture.xml:272
+#: architecture.xml:281
 #, no-c-format
 msgid ""
 "Another feature available as a JMX service are runtime Hibernate statistics. "
@@ -443,13 +443,13 @@
 "linkend=\"configuration-optional-statistics\"/>."
 
 #. Tag: title
-#: architecture.xml:279
+#: architecture.xml:288
 #, no-c-format
 msgid "JCA Support"
 msgstr "Support JCA"
 
 #. Tag: para
-#: architecture.xml:280
+#: architecture.xml:289
 #, no-c-format
 msgid ""
 "Hibernate may also be configured as a JCA connector. Please see the website "
@@ -461,13 +461,13 @@
 "support JCA d'Hibernate est encore considéré comme expérimental."
 
 #. Tag: title
-#: architecture.xml:287
+#: architecture.xml:296
 #, no-c-format
 msgid "Contextual Sessions"
 msgstr "Sessions Contextuelles"
 
 #. Tag: para
-#: architecture.xml:288
+#: architecture.xml:297
 #, no-c-format
 msgid ""
 "Most applications using Hibernate need some form of \"contextual\" sessions, "
@@ -493,7 +493,7 @@
 "l'utilisation de proxy/interception."
 
 #. Tag: para
-#: architecture.xml:297
+#: architecture.xml:306
 #, no-c-format
 msgid ""
 "Starting with version 3.0.1, Hibernate added the <literal>SessionFactory."
@@ -520,7 +520,7 @@
 "basée sur JTA."
 
 #. Tag: para
-#: architecture.xml:307
+#: architecture.xml:316
 #, no-c-format
 msgid ""
 "However, as of version 3.1, the processing behind <literal>SessionFactory."
@@ -539,7 +539,7 @@
 "définir la portée et le contexte des sessions courantes."
 
 #. Tag: para
-#: architecture.xml:314
+#: architecture.xml:323
 #, no-c-format
 msgid ""
 "See the Javadocs for the <literal>org.hibernate.context."
@@ -557,7 +557,7 @@
 "interface."
 
 #. Tag: para
-#: architecture.xml:324
+#: architecture.xml:333
 #, no-c-format
 msgid ""
 "<literal>org.hibernate.context.JTASessionContext</literal> - current "
@@ -571,7 +571,7 @@
 "pour les détails."
 
 #. Tag: para
-#: architecture.xml:332
+#: architecture.xml:341
 #, no-c-format
 msgid ""
 "<literal>org.hibernate.context.ThreadLocalSessionContext</literal> - current "
@@ -583,7 +583,7 @@
 "pour les détails."
 
 #. Tag: para
-#: architecture.xml:338
+#: architecture.xml:347
 #, no-c-format
 msgid ""
 "<literal>org.hibernate.context.ManagedSessionContext</literal> - current "
@@ -597,14 +597,14 @@
 "this class, it does never open, flush, or close a <literal>Session</literal>."
 
 #. Tag: para
-#: architecture.xml:347
-#, no-c-format
+#: architecture.xml:356
+#, 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 "
+"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 "
@@ -626,7 +626,7 @@
 "d'informations et des exemples de code."
 
 #. Tag: para
-#: architecture.xml:359
+#: architecture.xml:368
 #, no-c-format
 msgid ""
 "The <literal>hibernate.current_session_context_class</literal> configuration "

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	2008-08-14 15:28:13 UTC (rev 15066)
+++ core/trunk/documentation/manual/src/main/docbook/fr-FR/content/association_mapping.po	2008-08-14 15:35:40 UTC (rev 15067)
@@ -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: 2008-08-14 15:28+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
-#: association_mapping.xml:6
+#: association_mapping.xml:30
 #, no-c-format
 msgid "Association Mappings"
 msgstr "Mapper les associations"
 
 #. Tag: title
-#: association_mapping.xml:9
+#: association_mapping.xml:33
 #, no-c-format
 msgid "Introduction"
 msgstr "Introduction"
 
 #. Tag: para
-#: association_mapping.xml:11
+#: association_mapping.xml:35
 #, no-c-format
 msgid ""
 "Association mappings are the often most difficult thing to get right. In "
@@ -40,7 +40,7 @@
 "<literal>Address</literal>."
 
 #. Tag: para
-#: association_mapping.xml:19
+#: association_mapping.xml:43
 #, no-c-format
 msgid ""
 "We'll classify associations by whether or not they map to an intervening "
@@ -52,7 +52,7 @@
 "association."
 
 #. Tag: para
-#: association_mapping.xml:24
+#: association_mapping.xml:48
 #, no-c-format
 msgid ""
 "Nullable foreign keys are not considered good practice in traditional data "
@@ -69,19 +69,19 @@
 "contrainte de non-nullité sur les clés étrangères."
 
 #. Tag: title
-#: association_mapping.xml:34
+#: association_mapping.xml:58
 #, no-c-format
 msgid "Unidirectional associations"
 msgstr "Association unidirectionnelle"
 
 #. Tag: title
-#: association_mapping.xml:37 association_mapping.xml:108
+#: association_mapping.xml:61 association_mapping.xml:132
 #, no-c-format
 msgid "many to one"
 msgstr "plusieurs à un"
 
 #. 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 "
@@ -92,7 +92,7 @@
 "associations unidirectionnelles."
 
 #. Tag: programlisting
-#: association_mapping.xml:44
+#: association_mapping.xml:68
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Person\">\n"
@@ -112,7 +112,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"
@@ -123,8 +123,8 @@
 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:209 association_mapping.xml:249
 #, fuzzy, no-c-format
 msgid "one to one"
 msgstr ""
@@ -138,7 +138,7 @@
 "Un à un"
 
 #. 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</"
@@ -150,7 +150,7 @@
 "d'unicité que l'on impose à cette colonne."
 
 #. Tag: programlisting
-#: association_mapping.xml:57
+#: association_mapping.xml:81
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Person\">\n"
@@ -171,7 +171,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: association_mapping.xml:58 association_mapping.xml:193
+#: association_mapping.xml:82 association_mapping.xml:217
 #, no-c-format
 msgid ""
 "<![CDATA[\n"
@@ -182,7 +182,7 @@
 msgstr ""
 
 #. Tag: para
-#: association_mapping.xml:60
+#: association_mapping.xml:84
 #, no-c-format
 msgid ""
 "A <emphasis>unidirectional one-to-one association on a primary key</"
@@ -195,7 +195,7 @@
 "exemple.)"
 
 #. Tag: programlisting
-#: association_mapping.xml:66
+#: association_mapping.xml:90
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Person\">\n"
@@ -215,7 +215,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: association_mapping.xml:67 association_mapping.xml:201
+#: association_mapping.xml:91 association_mapping.xml:225
 #, no-c-format
 msgid ""
 "<![CDATA[\n"
@@ -225,13 +225,13 @@
 msgstr ""
 
 #. Tag: title
-#: association_mapping.xml:72 association_mapping.xml:94
+#: association_mapping.xml:96 association_mapping.xml:118
 #, no-c-format
 msgid "one to many"
 msgstr "un à plusieurs"
 
 #. Tag: para
-#: association_mapping.xml:74
+#: association_mapping.xml:98
 #, no-c-format
 msgid ""
 "A <emphasis>unidirectional one-to-many association on a foreign key</"
@@ -242,7 +242,7 @@
 "vraiment recommandée."
 
 #. Tag: programlisting
-#: association_mapping.xml:79
+#: association_mapping.xml:103
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Person\">\n"
@@ -264,7 +264,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: association_mapping.xml:80
+#: association_mapping.xml:104
 #, no-c-format
 msgid ""
 "<![CDATA[\n"
@@ -275,7 +275,7 @@
 msgstr ""
 
 #. Tag: para
-#: association_mapping.xml:82
+#: association_mapping.xml:106
 #, no-c-format
 msgid "We think it's better to use a join table for this kind of association."
 msgstr ""
@@ -283,13 +283,13 @@
 "type d'association."
 
 #. Tag: title
-#: association_mapping.xml:91
+#: association_mapping.xml:115
 #, no-c-format
 msgid "Unidirectional associations with join tables"
 msgstr "Associations unidirectionnelles avec tables de jointure"
 
 #. Tag: para
-#: association_mapping.xml:96
+#: association_mapping.xml:120
 #, no-c-format
 msgid ""
 "A <emphasis>unidirectional one-to-many association on a join table</"
@@ -304,7 +304,7 @@
 "to-many)."
 
 #. Tag: programlisting
-#: association_mapping.xml:102
+#: association_mapping.xml:126
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Person\">\n"
@@ -327,7 +327,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: association_mapping.xml:103
+#: association_mapping.xml:127
 #, no-c-format
 msgid ""
 "<![CDATA[\n"
@@ -339,7 +339,7 @@
 msgstr ""
 
 #. Tag: para
-#: association_mapping.xml:110
+#: association_mapping.xml:134
 #, no-c-format
 msgid ""
 "A <emphasis>unidirectional many-to-one association on a join table</"
@@ -350,7 +350,7 @@
 "est optionnelle."
 
 #. Tag: programlisting
-#: association_mapping.xml:115
+#: association_mapping.xml:139
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Person\">\n"
@@ -374,7 +374,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: association_mapping.xml:116
+#: association_mapping.xml:140
 #, no-c-format
 msgid ""
 "<![CDATA[\n"
@@ -386,7 +386,7 @@
 msgstr ""
 
 #. Tag: para
-#: association_mapping.xml:123
+#: association_mapping.xml:147
 #, no-c-format
 msgid ""
 "A <emphasis>unidirectional one-to-one association on a join table</emphasis> "
@@ -396,7 +396,7 @@
 "table de jointure</emphasis> est extrèmement rare mais envisageable."
 
 #. Tag: programlisting
-#: association_mapping.xml:128
+#: association_mapping.xml:152
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Person\">\n"
@@ -422,7 +422,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: association_mapping.xml:129 association_mapping.xml:233
+#: association_mapping.xml:153 association_mapping.xml:257
 #, no-c-format
 msgid ""
 "<![CDATA[\n"
@@ -434,13 +434,13 @@
 msgstr ""
 
 #. Tag: title
-#: association_mapping.xml:134 association_mapping.xml:238
+#: association_mapping.xml:158 association_mapping.xml:262
 #, no-c-format
 msgid "many to many"
 msgstr "plusieurs à plusieurs"
 
 #. Tag: para
-#: association_mapping.xml:136
+#: association_mapping.xml:160
 #, no-c-format
 msgid ""
 "Finally, we have a <emphasis>unidirectional many-to-many association</"
@@ -450,7 +450,7 @@
 "à-plusieurs (many-to-many)</emphasis>."
 
 #. Tag: programlisting
-#: association_mapping.xml:140
+#: association_mapping.xml:164
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Person\">\n"
@@ -472,7 +472,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: association_mapping.xml:141 association_mapping.xml:246
+#: association_mapping.xml:165 association_mapping.xml:270
 #, no-c-format
 msgid ""
 "<![CDATA[\n"
@@ -484,19 +484,19 @@
 msgstr ""
 
 #. Tag: title
-#: association_mapping.xml:148
+#: association_mapping.xml:172
 #, no-c-format
 msgid "Bidirectional associations"
 msgstr "Associations bidirectionnelles"
 
 #. Tag: title
-#: association_mapping.xml:151 association_mapping.xml:211
+#: association_mapping.xml:175 association_mapping.xml:235
 #, no-c-format
 msgid "one to many / many to one"
 msgstr "un à plusieurs / plusieurs à un"
 
 #. Tag: para
-#: association_mapping.xml:153
+#: association_mapping.xml:177
 #, no-c-format
 msgid ""
 "A <emphasis>bidirectional many-to-one association</emphasis> is the most "
@@ -507,7 +507,7 @@
 "(c'est la façon standard de créer des relations parents/enfants.)"
 
 #. Tag: programlisting
-#: association_mapping.xml:159
+#: association_mapping.xml:183
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Person\">\n"
@@ -531,7 +531,7 @@
 msgstr ""
 
 #. Tag: para
-#: association_mapping.xml:163
+#: association_mapping.xml:187
 #, no-c-format
 msgid ""
 "If you use a <literal>List</literal> (or other indexed collection) you need "
@@ -549,7 +549,7 @@
 "<literal>update=\"false\"</literal> et <literal>insert=\"false\"</literal>):"
 
 #. Tag: programlisting
-#: association_mapping.xml:171
+#: association_mapping.xml:195
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Person\">\n"
@@ -574,7 +574,7 @@
 msgstr ""
 
 #. Tag: para
-#: association_mapping.xml:173
+#: association_mapping.xml:197
 #, no-c-format
 msgid ""
 "It is important that you define <literal>not-null=\"true\"</literal> on the "
@@ -592,7 +592,7 @@
 "literal> element."
 
 #. Tag: para
-#: association_mapping.xml:187
+#: association_mapping.xml:211
 #, no-c-format
 msgid ""
 "A <emphasis>bidirectional one-to-one association on a foreign key</emphasis> "
@@ -602,7 +602,7 @@
 "étrangère</emphasis> est aussi très fréquente."
 
 #. Tag: programlisting
-#: association_mapping.xml:192
+#: association_mapping.xml:216
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Person\">\n"
@@ -625,7 +625,7 @@
 msgstr ""
 
 #. Tag: para
-#: association_mapping.xml:195
+#: association_mapping.xml:219
 #, no-c-format
 msgid ""
 "A <emphasis>bidirectional one-to-one association on a primary key</emphasis> "
@@ -635,7 +635,7 @@
 "primaire</emphasis> utilise un générateur particulier d'id."
 
 #. Tag: programlisting
-#: association_mapping.xml:200
+#: association_mapping.xml:224
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Person\">\n"
@@ -657,13 +657,13 @@
 msgstr ""
 
 #. Tag: title
-#: association_mapping.xml:208
+#: association_mapping.xml:232
 #, no-c-format
 msgid "Bidirectional associations with join tables"
 msgstr "Associations bidirectionnelles avec table de jointure"
 
 #. Tag: para
-#: association_mapping.xml:213
+#: association_mapping.xml:237
 #, no-c-format
 msgid ""
 "A <emphasis>bidirectional one-to-many association on a join table</"
@@ -676,7 +676,7 @@
 "collection, ou sur la jointure."
 
 #. Tag: programlisting
-#: association_mapping.xml:219
+#: association_mapping.xml:243
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Person\">\n"
@@ -708,7 +708,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: association_mapping.xml:220
+#: association_mapping.xml:244
 #, no-c-format
 msgid ""
 "<![CDATA[\n"
@@ -720,7 +720,7 @@
 msgstr ""
 
 #. Tag: para
-#: association_mapping.xml:227
+#: association_mapping.xml:251
 #, no-c-format
 msgid ""
 "A <emphasis>bidirectional one-to-one association on a join table</emphasis> "
@@ -730,7 +730,7 @@
 "table de jointure</emphasis> est extrèmement rare mais envisageable."
 
 #. Tag: programlisting
-#: association_mapping.xml:232
+#: association_mapping.xml:256
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Person\">\n"
@@ -766,7 +766,7 @@
 msgstr ""
 
 #. Tag: para
-#: association_mapping.xml:240
+#: association_mapping.xml:264
 #, no-c-format
 msgid ""
 "Finally, we have a <emphasis>bidirectional many-to-many association</"
@@ -776,7 +776,7 @@
 "plusieurs</emphasis>."
 
 #. Tag: programlisting
-#: association_mapping.xml:244
+#: association_mapping.xml:268
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Person\">\n"
@@ -803,13 +803,13 @@
 msgstr ""
 
 #. Tag: title
-#: association_mapping.xml:253
+#: association_mapping.xml:277
 #, no-c-format
 msgid "More complex association mappings"
 msgstr "Des mappings plus complexes"
 
 #. Tag: para
-#: association_mapping.xml:255
+#: association_mapping.xml:279
 #, no-c-format
 msgid ""
 "More complex association joins are <emphasis>extremely</emphasis> rare. "
@@ -827,7 +827,7 @@
 "<literal>effectiveStartDate</literal>, mappées de telle sorte:"
 
 #. Tag: programlisting
-#: association_mapping.xml:264
+#: association_mapping.xml:288
 #, no-c-format
 msgid ""
 "<![CDATA[<properties name=\"currentAccountKey\">\n"
@@ -842,7 +842,7 @@
 msgstr ""
 
 #. Tag: para
-#: association_mapping.xml:266
+#: association_mapping.xml:290
 #, no-c-format
 msgid ""
 "Then we can map an association to the <emphasis>current</emphasis> instance "
@@ -853,7 +853,7 @@
 "utilisant:"
 
 #. Tag: programlisting
-#: association_mapping.xml:271
+#: association_mapping.xml:295
 #, no-c-format
 msgid ""
 "<![CDATA[<many-to-one name=\"currentAccountInfo\" \n"
@@ -865,7 +865,7 @@
 msgstr ""
 
 #. Tag: para
-#: association_mapping.xml:273
+#: association_mapping.xml:297
 #, no-c-format
 msgid ""
 "In a more complex example, imagine that the association between "
@@ -883,7 +883,7 @@
 "pourrait être mappée comme cela:"
 
 #. Tag: programlisting
-#: association_mapping.xml:281
+#: association_mapping.xml:305
 #, no-c-format
 msgid ""
 "<![CDATA[<join>\n"
@@ -901,7 +901,7 @@
 msgstr ""
 
 #. Tag: para
-#: association_mapping.xml:283
+#: association_mapping.xml:307
 #, no-c-format
 msgid ""
 "You can get quite creative with this functionality, but it is usually more "

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	2008-08-14 15:28:13 UTC (rev 15066)
+++ core/trunk/documentation/manual/src/main/docbook/fr-FR/content/basic_mapping.po	2008-08-14 15:35:40 UTC (rev 15067)
@@ -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: 2008-08-14 15:28+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
-#: basic_mapping.xml:5
+#: basic_mapping.xml:29
 #, no-c-format
 msgid "Basic O/R Mapping"
 msgstr "Mapping O/R basique"
 
 #. Tag: title
-#: basic_mapping.xml:8
+#: basic_mapping.xml:32
 #, no-c-format
 msgid "Mapping declaration"
 msgstr "Déclaration de Mapping"
 
 #. Tag: para
-#: basic_mapping.xml:10
+#: basic_mapping.xml:34
 #, no-c-format
 msgid ""
 "Object/relational mappings are usually defined in an XML document. The "
@@ -38,7 +38,7 @@
 "et non des déclarations des tables."
 
 #. Tag: para
-#: basic_mapping.xml:17
+#: basic_mapping.xml:41
 #, no-c-format
 msgid ""
 "Note that, even though many Hibernate users choose to write the XML by hand, "
@@ -50,13 +50,13 @@
 "ce document, notamment XDoclet, Middlegen et AndroMDA."
 
 #. Tag: para
-#: basic_mapping.xml:23
+#: basic_mapping.xml:47
 #, no-c-format
 msgid "Lets kick off with an example mapping:"
 msgstr "Démarrons avec un exemple de mapping :"
 
 #. Tag: programlisting
-#: basic_mapping.xml:27
+#: basic_mapping.xml:51
 #, no-c-format
 msgid ""
 "<![CDATA[<?xml version=\"1.0\"?>\n"
@@ -126,7 +126,7 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:29
+#: basic_mapping.xml:53
 #, no-c-format
 msgid ""
 "We will now discuss the content of the mapping document. We will only "
@@ -142,13 +142,13 @@
 "de schéma. (Par exemple l'attribut <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
+#: basic_mapping.xml:66
 #, no-c-format
 msgid ""
 "All XML mappings should declare the doctype shown. The actual DTD may be "
@@ -166,13 +166,13 @@
 "de DTD par rapport au contenu de votre classpath."
 
 #. Tag: title
-#: basic_mapping.xml:52
+#: basic_mapping.xml:76
 #, no-c-format
 msgid "EntityResolver"
 msgstr "EntityResolver"
 
 #. Tag: para
-#: basic_mapping.xml:53
+#: basic_mapping.xml:77
 #, no-c-format
 msgid ""
 "As mentioned previously, Hibernate will first attempt to resolve DTDs in its "
@@ -190,7 +190,7 @@
 "namespaces."
 
 #. Tag: para
-#: basic_mapping.xml:61
+#: basic_mapping.xml:85
 #, no-c-format
 msgid ""
 "a <literal>hibernate namespace</literal> is recognized whenever the resolver "
@@ -204,7 +204,7 @@
 "classlaoder which loaded the Hibernate classes."
 
 #. Tag: para
-#: basic_mapping.xml:70
+#: basic_mapping.xml:94
 #, no-c-format
 msgid ""
 "a <literal>user namespace</literal> is recognized whenever the resolver "
@@ -220,13 +220,13 @@
 "Hibernate classes."
 
 #. Tag: para
-#: basic_mapping.xml:79
+#: basic_mapping.xml:103
 #, no-c-format
 msgid "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 +247,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,13 +259,13 @@
 "custom\">typedef</link>."
 
 #. Tag: title
-#: basic_mapping.xml:91
+#: basic_mapping.xml:115
 #, no-c-format
 msgid "hibernate-mapping"
 msgstr "hibernate-mapping"
 
 #. Tag: para
-#: basic_mapping.xml:93
+#: basic_mapping.xml:117
 #, no-c-format
 msgid ""
 "This element has several optional attributes. The <literal>schema</literal> "
@@ -289,7 +289,7 @@
 "classes non qualifiés dans le langage de requête."
 
 #. Tag: programlisting
-#: basic_mapping.xml:114
+#: basic_mapping.xml:138
 #, no-c-format
 msgid ""
 "<![CDATA[<hibernate-mapping\n"
@@ -304,7 +304,7 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:117
+#: basic_mapping.xml:141
 #, no-c-format
 msgid "<literal>schema</literal> (optional): The name of a database schema."
 msgstr ""
@@ -312,7 +312,7 @@
 "données."
 
 #. Tag: para
-#: basic_mapping.xml:122
+#: basic_mapping.xml:146
 #, no-c-format
 msgid "<literal>catalog</literal> (optional): The name of a database catalog."
 msgstr ""
@@ -320,7 +320,7 @@
 "données."
 
 #. Tag: para
-#: basic_mapping.xml:127
+#: basic_mapping.xml:151
 #, no-c-format
 msgid ""
 "<literal>default-cascade</literal> (optional - defaults to <literal>none</"
@@ -330,7 +330,7 @@
 "<literal>none</literal>) : Un type de cascade par défaut."
 
 #. Tag: para
-#: basic_mapping.xml:133
+#: basic_mapping.xml:157
 #, no-c-format
 msgid ""
 "<literal>default-access</literal> (optional - defaults to <literal>property</"
@@ -343,7 +343,7 @@
 "literal>."
 
 #. Tag: para
-#: basic_mapping.xml:140
+#: basic_mapping.xml:164
 #, no-c-format
 msgid ""
 "<literal>default-lazy</literal> (optional - defaults to <literal>true</"
@@ -355,7 +355,7 @@
 "literal> non spécifié : celui des mappings de classes et de collection."
 
 #. Tag: para
-#: basic_mapping.xml:147
+#: basic_mapping.xml:171
 #, no-c-format
 msgid ""
 "<literal>auto-import</literal> (optional - defaults to <literal>true</"
@@ -367,7 +367,7 @@
 "(des classes de ce mapping) dans le langage de requête."
 
 #. Tag: para
-#: basic_mapping.xml:154
+#: basic_mapping.xml:178
 #, no-c-format
 msgid ""
 "<literal>package</literal> (optional): Specifies a package prefix to assume "
@@ -377,7 +377,7 @@
 "les noms de classe non qualifiés du document de mapping."
 
 #. Tag: para
-#: basic_mapping.xml:162
+#: basic_mapping.xml:186
 #, no-c-format
 msgid ""
 "If you have two persistent classes with the same (unqualified) name, you "
@@ -389,7 +389,7 @@
 "exception si vous essayez d'assigner à deux classes le même nom importé."
 
 #. Tag: para
-#: basic_mapping.xml:168
+#: basic_mapping.xml:192
 #, no-c-format
 msgid ""
 "Note that the <literal>hibernate-mapping</literal> element allows you to "
@@ -410,13 +410,13 @@
 "<literal>Animal.hbm.xml</literal>."
 
 #. Tag: title
-#: basic_mapping.xml:181
+#: basic_mapping.xml:205
 #, no-c-format
 msgid "<title>class</title>"
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:183
+#: basic_mapping.xml:207
 #, no-c-format
 msgid ""
 "You may declare a persistent class using the <literal>class</literal> "
@@ -425,7 +425,7 @@
 "Déclarez une classe persistante avec l'élément <literal>class</literal> :"
 
 #. Tag: programlisting
-#: basic_mapping.xml:211
+#: basic_mapping.xml:235
 #, no-c-format
 msgid ""
 "<![CDATA[<class\n"
@@ -455,7 +455,7 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:214
+#: basic_mapping.xml:238
 #, no-c-format
 msgid ""
 "<literal>name</literal> (optional): The fully qualified Java class name of "
@@ -467,7 +467,7 @@
 "mapping ne se rapporte pas à une entité POJO."
 
 #. Tag: para
-#: basic_mapping.xml:221
+#: basic_mapping.xml:245
 #, no-c-format
 msgid ""
 "<literal>table</literal> (optional - defaults to the unqualified class "
@@ -477,7 +477,7 @@
 "classe) : Le nom de sa table en base de données."
 
 #. Tag: para
-#: basic_mapping.xml:227
+#: basic_mapping.xml:251
 #, no-c-format
 msgid ""
 "<literal>discriminator-value</literal> (optional - defaults to the class "
@@ -491,7 +491,7 @@
 "<literal>not null</literal> sont autorisées."
 
 #. Tag: para
-#: basic_mapping.xml:234
+#: basic_mapping.xml:258
 #, no-c-format
 msgid ""
 "<literal>mutable</literal> (optional, defaults to <literal>true</literal>): "
@@ -501,7 +501,7 @@
 "défaut) : Spécifie que des instances de la classe sont (ou non) immuables."
 
 #. Tag: para
-#: basic_mapping.xml:240 basic_mapping.xml:2204
+#: basic_mapping.xml:264 basic_mapping.xml:2228
 #, fuzzy, no-c-format
 msgid ""
 "<literal>schema</literal> (optional): Override the schema name specified by "
@@ -515,7 +515,7 @@
 "spécifié par l'élément de base <literal>&lt;hibernate-mapping&gt;</literal>."
 
 #. Tag: para
-#: basic_mapping.xml:246 basic_mapping.xml:2210
+#: basic_mapping.xml:270 basic_mapping.xml:2234
 #, fuzzy, no-c-format
 msgid ""
 "<literal>catalog</literal> (optional): Override the catalog name specified "
@@ -529,7 +529,7 @@
 "spécifié par l'élément de base <literal>&lt;hibernate-mapping&gt;</literal>."
 
 #. Tag: para
-#: basic_mapping.xml:252
+#: basic_mapping.xml:276
 #, no-c-format
 msgid ""
 "<literal>proxy</literal> (optional): Specifies an interface to use for lazy "
@@ -540,7 +540,7 @@
 "indiquer le nom de la classe elle-même."
 
 #. Tag: para
-#: basic_mapping.xml:258
+#: basic_mapping.xml:282
 #, no-c-format
 msgid ""
 "<literal>dynamic-update</literal> (optional, defaults to <literal>false</"
@@ -553,7 +553,7 @@
 "ont été modifiées."
 
 #. Tag: para
-#: basic_mapping.xml:265
+#: basic_mapping.xml:289
 #, no-c-format
 msgid ""
 "<literal>dynamic-insert</literal> (optional, defaults to <literal>false</"
@@ -566,7 +566,7 @@
 "non nulles."
 
 #. Tag: para
-#: basic_mapping.xml:272
+#: basic_mapping.xml:296
 #, no-c-format
 msgid ""
 "<literal>select-before-update</literal> (optional, defaults to "
@@ -588,7 +588,7 @@
 "SQL est véritablement nécessaire."
 
 #. Tag: para
-#: basic_mapping.xml:282
+#: basic_mapping.xml:306
 #, no-c-format
 msgid ""
 "<literal>polymorphism</literal> (optional, defaults to <literal>implicit</"
@@ -600,7 +600,7 @@
 "implicite ou explicite est utilisée."
 
 #. Tag: para
-#: basic_mapping.xml:288
+#: basic_mapping.xml:312
 #, no-c-format
 msgid ""
 "<literal>where</literal> (optional) specify an arbitrary SQL <literal>WHERE</"
@@ -610,7 +610,7 @@
 "literal> à utiliser lorsque l'on récupère des objets de cette classe."
 
 #. Tag: para
-#: basic_mapping.xml:294
+#: basic_mapping.xml:318
 #, no-c-format
 msgid ""
 "<literal>persister</literal> (optional): Specifies a custom "
@@ -620,7 +620,7 @@
 "<literal>ClassPersister</literal> particulier."
 
 #. Tag: para
-#: basic_mapping.xml:299
+#: basic_mapping.xml:323
 #, no-c-format
 msgid ""
 "<literal>batch-size</literal> (optional, defaults to <literal>1</literal>) "
@@ -631,7 +631,7 @@
 "classe par identifiant en une seule requête."
 
 #. Tag: para
-#: basic_mapping.xml:305
+#: basic_mapping.xml:329
 #, no-c-format
 msgid ""
 "<literal>optimistic-lock</literal> (optional, defaults to <literal>version</"
@@ -641,7 +641,7 @@
 "<literal>version</literal>) : Détermine la stratégie de verrou optimiste."
 
 #. Tag: para
-#: basic_mapping.xml:311
+#: basic_mapping.xml:335
 #, no-c-format
 msgid ""
 "<literal>lazy</literal> (optional): Lazy fetching may be completely disabled "
@@ -652,7 +652,7 @@
 "l'interface <literal>proxy</literal>."
 
 #. Tag: para
-#: basic_mapping.xml:317
+#: basic_mapping.xml:341
 #, no-c-format
 msgid ""
 "<literal>entity-name</literal> (optional, defaults to the class name): "
@@ -670,7 +670,7 @@
 "linkend=\"xml\"/> pour plus d'informations."
 
 #. Tag: para
-#: basic_mapping.xml:327
+#: basic_mapping.xml:351
 #, no-c-format
 msgid ""
 "<literal>check</literal> (optional): A SQL expression used to generate a "
@@ -682,7 +682,7 @@
 "de schéma."
 
 #. Tag: para
-#: basic_mapping.xml:333
+#: basic_mapping.xml:357
 #, no-c-format
 msgid ""
 "<literal>rowid</literal> (optional): Hibernate can use so called ROWIDs on "
@@ -698,7 +698,7 @@
 "Un ROWID représente la localisation physique d'un tuple enregistré."
 
 #. Tag: para
-#: basic_mapping.xml:341
+#: basic_mapping.xml:365
 #, no-c-format
 msgid ""
 "<literal>subselect</literal> (optional): Maps an immutable and read-only "
@@ -711,7 +711,7 @@
 "plus d'information."
 
 #. Tag: para
-#: basic_mapping.xml:348
+#: basic_mapping.xml:372
 #, no-c-format
 msgid ""
 "<literal>abstract</literal> (optional): Used to mark abstract superclasses "
@@ -722,7 +722,7 @@
 "subclass&gt;</literal>."
 
 #. Tag: para
-#: basic_mapping.xml:356
+#: basic_mapping.xml:380
 #, no-c-format
 msgid ""
 "It is perfectly acceptable for the named persistent class to be an "
@@ -739,7 +739,7 @@
 "des classes internes c'est à dire <literal>eg.Foo$Bar</literal>."
 
 #. Tag: para
-#: basic_mapping.xml:363
+#: basic_mapping.xml:387
 #, no-c-format
 msgid ""
 "Immutable classes, <literal>mutable=\"false\"</literal>, may not be updated "
@@ -751,7 +751,7 @@
 "faire quelques optimisations mineures sur les performances."
 
 #. Tag: para
-#: basic_mapping.xml:368
+#: basic_mapping.xml:392
 #, no-c-format
 msgid ""
 "The optional <literal>proxy</literal> attribute enables lazy initialization "
@@ -768,7 +768,7 @@
 "chargement différé (lazy initialization)."
 
 #. Tag: para
-#: basic_mapping.xml:375
+#: basic_mapping.xml:399
 #, no-c-format
 msgid ""
 "<emphasis>Implicit</emphasis> polymorphism means that instances of the class "
@@ -802,7 +802,7 @@
 "voir la partie design pattern du site communautaire)."
 
 #. Tag: para
-#: basic_mapping.xml:387
+#: basic_mapping.xml:411
 #, no-c-format
 msgid ""
 "The <literal>persister</literal> attribute lets you customize the "
@@ -825,7 +825,7 @@
 "simple (d'une \"persistance\" vers une <literal>Hashtable</literal>)."
 
 #. Tag: para
-#: basic_mapping.xml:398
+#: basic_mapping.xml:422
 #, no-c-format
 msgid ""
 "Note that the <literal>dynamic-update</literal> and <literal>dynamic-insert</"
@@ -843,7 +843,7 @@
 "amoindrir. A utiliser en connaissance de causes."
 
 #. Tag: para
-#: basic_mapping.xml:406
+#: basic_mapping.xml:430
 #, no-c-format
 msgid ""
 "Use of <literal>select-before-update</literal> will usually decrease "
@@ -857,7 +857,7 @@
 "d'instances à une <literal>Session</literal>."
 
 #. Tag: para
-#: basic_mapping.xml:412
+#: basic_mapping.xml:436
 #, no-c-format
 msgid ""
 "If you enable <literal>dynamic-update</literal>, you will have a choice of "
@@ -867,19 +867,19 @@
 "stratégies de verrouillage optimiste (optimistic locking) sont les suivantes:"
 
 #. Tag: para
-#: basic_mapping.xml:418
+#: basic_mapping.xml:442
 #, 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:423
+#: basic_mapping.xml:447
 #, no-c-format
 msgid "<literal>all</literal> check all columns"
 msgstr "<literal>all</literal> vérifie toutes les colonnes"
 
 #. Tag: para
-#: basic_mapping.xml:428
+#: basic_mapping.xml:452
 #, no-c-format
 msgid ""
 "<literal>dirty</literal> check the changed columns, allowing some concurrent "
@@ -889,13 +889,13 @@
 "updates concurrents"
 
 #. Tag: para
-#: basic_mapping.xml:433
+#: basic_mapping.xml:457
 #, 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:438
+#: basic_mapping.xml:462
 #, no-c-format
 msgid ""
 "We <emphasis>very</emphasis> strongly recommend that you use version/"
@@ -911,7 +911,7 @@
 "lorsqu'on utilise <literal>Session.merge()</literal>)."
 
 #. Tag: para
-#: basic_mapping.xml:445
+#: basic_mapping.xml:469
 #, no-c-format
 msgid ""
 "There is no difference between a view and a base table for a Hibernate "
@@ -930,7 +930,7 @@
 "immuable en lecture seule sur un sous-select SQL donné:"
 
 #. Tag: programlisting
-#: basic_mapping.xml:453
+#: basic_mapping.xml:477
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Summary\">\n"
@@ -948,7 +948,7 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:455
+#: basic_mapping.xml:479
 #, no-c-format
 msgid ""
 "Declare the tables to synchronize this entity with, ensuring that auto-flush "
@@ -963,13 +963,13 @@
 "élément de mapping."
 
 #. Tag: title
-#: basic_mapping.xml:465
+#: basic_mapping.xml:489
 #, no-c-format
 msgid "<title>id</title>"
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:467
+#: basic_mapping.xml:491
 #, no-c-format
 msgid ""
 "Mapped classes <emphasis>must</emphasis> declare the primary key column of "
@@ -985,7 +985,7 @@
 "cette propriété et la clef primaire en base."
 
 #. Tag: programlisting
-#: basic_mapping.xml:482
+#: basic_mapping.xml:506
 #, no-c-format
 msgid ""
 "<![CDATA[<id\n"
@@ -1001,7 +1001,7 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:485
+#: basic_mapping.xml:509
 #, no-c-format
 msgid ""
 "<literal>name</literal> (optional): The name of the identifier property."
@@ -1010,14 +1010,14 @@
 "d'identifiant."
 
 #. Tag: para
-#: basic_mapping.xml:490
+#: basic_mapping.xml:514
 #, 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:495
+#: basic_mapping.xml:519
 #, no-c-format
 msgid ""
 "<literal>column</literal> (optional - defaults to the property name): The "
@@ -1027,7 +1027,7 @@
 "défaut) : Nom de la clef primaire."
 
 #. Tag: para
-#: basic_mapping.xml:501
+#: basic_mapping.xml:525
 #, no-c-format
 msgid ""
 "<literal>unsaved-value</literal> (optional - defaults to a \"sensible\" "
@@ -1042,9 +1042,9 @@
 "sauvegardées ou chargées dans une session précédente."
 
 #. 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: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
 #, fuzzy, no-c-format
 msgid ""
 "<literal>access</literal> (optional - defaults to <literal>property</"
@@ -1092,7 +1092,7 @@
 "propriété."
 
 #. Tag: para
-#: basic_mapping.xml:517
+#: basic_mapping.xml:541
 #, no-c-format
 msgid ""
 "If the <literal>name</literal> attribute is missing, it is assumed that the "
@@ -1102,7 +1102,7 @@
 "classe ne possède pas de propriété identifiant."
 
 #. Tag: para
-#: basic_mapping.xml:522
+#: basic_mapping.xml:546
 #, no-c-format
 msgid ""
 "The <literal>unsaved-value</literal> attribute is almost never needed in "
@@ -1114,7 +1114,7 @@
 "valeur par défaut."
 
 #. Tag: para
-#: basic_mapping.xml:526
+#: basic_mapping.xml:550
 #, no-c-format
 msgid ""
 "There is an alternative <literal>&lt;composite-id&gt;</literal> declaration "
@@ -1126,13 +1126,13 @@
 "Son utilisation est fortement déconseillée pour d'autres cas."
 
 #. Tag: title
-#: basic_mapping.xml:532
+#: basic_mapping.xml:556
 #, no-c-format
 msgid "Generator"
 msgstr "Generator"
 
 #. Tag: para
-#: basic_mapping.xml:534
+#: basic_mapping.xml:558
 #, no-c-format
 msgid ""
 "The optional <literal>&lt;generator&gt;</literal> child element names a Java "
@@ -1148,7 +1148,7 @@
 "<literal>&lt;param&gt;</literal>."
 
 #. Tag: programlisting
-#: basic_mapping.xml:541
+#: basic_mapping.xml:565
 #, no-c-format
 msgid ""
 "<![CDATA[<id name=\"id\" type=\"long\" column=\"cat_id\">\n"
@@ -1160,7 +1160,7 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:543
+#: basic_mapping.xml:567
 #, fuzzy, no-c-format
 msgid ""
 "All generators implement the interface <literal>org.hibernate.id."
@@ -1177,13 +1177,13 @@
 "<placeholder-1/>"
 
 #. Tag: literal
-#: basic_mapping.xml:551
+#: basic_mapping.xml:575
 #, no-c-format
 msgid "increment"
 msgstr "increment"
 
 #. Tag: para
-#: basic_mapping.xml:553
+#: basic_mapping.xml:577
 #, no-c-format
 msgid ""
 "generates identifiers of type <literal>long</literal>, <literal>short</"
@@ -1197,13 +1197,13 @@
 "en environnement clusterisé.</emphasis>"
 
 #. Tag: literal
-#: basic_mapping.xml:562
+#: basic_mapping.xml:586
 #, no-c-format
 msgid "identity"
 msgstr "identity"
 
 #. Tag: para
-#: basic_mapping.xml:564
+#: basic_mapping.xml:588
 #, no-c-format
 msgid ""
 "supports identity columns in DB2, MySQL, MS SQL Server, Sybase and "
@@ -1215,13 +1215,13 @@
 "<literal>short</literal> ou <literal>int</literal>."
 
 #. Tag: literal
-#: basic_mapping.xml:572
+#: basic_mapping.xml:596
 #, no-c-format
 msgid "sequence"
 msgstr "sequence"
 
 #. Tag: para
-#: basic_mapping.xml:574
+#: basic_mapping.xml:598
 #, no-c-format
 msgid ""
 "uses a sequence in DB2, PostgreSQL, Oracle, SAP DB, McKoi or a generator in "
@@ -1233,13 +1233,13 @@
 "<literal>long</literal>, <literal>short</literal> ou <literal>int</literal>"
 
 #. Tag: literal
-#: basic_mapping.xml:582
+#: basic_mapping.xml:606
 #, no-c-format
 msgid "hilo"
 msgstr "hilo"
 
 #. Tag: para
-#: basic_mapping.xml:584
+#: basic_mapping.xml:608
 #, no-c-format
 msgid ""
 "uses a hi/lo algorithm to efficiently generate identifiers of type "
@@ -1257,13 +1257,13 @@
 "pour une base de données particulière seulement."
 
 #. Tag: literal
-#: basic_mapping.xml:594
+#: basic_mapping.xml:618
 #, no-c-format
 msgid "seqhilo"
 msgstr "seqhilo"
 
 #. Tag: para
-#: basic_mapping.xml:596
+#: basic_mapping.xml:620
 #, no-c-format
 msgid ""
 "uses a hi/lo algorithm to efficiently generate identifiers of type "
@@ -1275,13 +1275,13 @@
 "literal>, étant donné un nom de séquence en base."
 
 #. Tag: literal
-#: basic_mapping.xml:604
+#: basic_mapping.xml:628
 #, no-c-format
 msgid "uuid"
 msgstr "uuid"
 
 #. Tag: para
-#: basic_mapping.xml:606
+#: basic_mapping.xml:630
 #, no-c-format
 msgid ""
 "uses a 128-bit UUID algorithm to generate identifiers of type string, unique "
@@ -1293,26 +1293,26 @@
 "en codé en une chaîne de nombre héxadécimaux de longueur 32."
 
 #. Tag: literal
-#: basic_mapping.xml:614
+#: basic_mapping.xml:638
 #, no-c-format
 msgid "guid"
 msgstr "guid"
 
 #. Tag: para
-#: basic_mapping.xml:616
+#: basic_mapping.xml:640
 #, 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:622
+#: basic_mapping.xml:646
 #, no-c-format
 msgid "native"
 msgstr "native"
 
 #. Tag: para
-#: basic_mapping.xml:624
+#: basic_mapping.xml:648
 #, no-c-format
 msgid ""
 "picks <literal>identity</literal>, <literal>sequence</literal> or "
@@ -1324,13 +1324,13 @@
 "données sous-jacente."
 
 #. Tag: literal
-#: basic_mapping.xml:632
+#: basic_mapping.xml:656
 #, no-c-format
 msgid "assigned"
 msgstr "assigned"
 
 #. Tag: para
-#: basic_mapping.xml:634
+#: basic_mapping.xml:658
 #, no-c-format
 msgid ""
 "lets the application to assign an identifier to the object before "
@@ -1342,13 +1342,13 @@
 "si aucun <literal>&lt;generator&gt;</literal> n'est spécifié."
 
 #. Tag: literal
-#: basic_mapping.xml:642
+#: basic_mapping.xml:666
 #, no-c-format
 msgid "select"
 msgstr "select"
 
 #. Tag: para
-#: basic_mapping.xml:644
+#: basic_mapping.xml:668
 #, no-c-format
 msgid ""
 "retrieves a primary key assigned by a database trigger by selecting the row "
@@ -1358,13 +1358,13 @@
 "par une clef unique quelconque."
 
 #. Tag: literal
-#: basic_mapping.xml:651
+#: basic_mapping.xml:675
 #, no-c-format
 msgid "foreign"
 msgstr "foreign"
 
 #. Tag: para
-#: basic_mapping.xml:653
+#: basic_mapping.xml:677
 #, no-c-format
 msgid ""
 "uses the identifier of another associated object. Usually used in "
@@ -1376,13 +1376,13 @@
 "la clef primaire."
 
 #. Tag: literal
-#: basic_mapping.xml:660
+#: basic_mapping.xml:684
 #, no-c-format
 msgid "sequence-identity"
 msgstr "sequence-identity"
 
 #. Tag: para
-#: basic_mapping.xml:662
+#: basic_mapping.xml:686
 #, no-c-format
 msgid ""
 "a specialized sequence generation strategy which utilizes a database "
@@ -1400,13 +1400,13 @@
 "these insert statements are disabled due to a bug in the Oracle drivers."
 
 #. Tag: title
-#: basic_mapping.xml:679
+#: basic_mapping.xml:703
 #, no-c-format
 msgid "Hi/lo algorithm"
 msgstr "algorithme Hi/lo"
 
 #. Tag: para
-#: basic_mapping.xml:680
+#: basic_mapping.xml:704
 #, no-c-format
 msgid ""
 "The <literal>hilo</literal> and <literal>seqhilo</literal> generators "
@@ -1423,7 +1423,7 @@
 "Oracle (quand la base sous-jacente le propose)."
 
 #. Tag: programlisting
-#: basic_mapping.xml:687
+#: basic_mapping.xml:711
 #, no-c-format
 msgid ""
 "<![CDATA[<id name=\"id\" type=\"long\" column=\"cat_id\">\n"
@@ -1436,7 +1436,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: basic_mapping.xml:689
+#: basic_mapping.xml:713
 #, no-c-format
 msgid ""
 "<![CDATA[<id name=\"id\" type=\"long\" column=\"cat_id\">\n"
@@ -1448,7 +1448,7 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:691
+#: basic_mapping.xml:715
 #, no-c-format
 msgid ""
 "Unfortunately, you can't use <literal>hilo</literal> when supplying your own "
@@ -1464,13 +1464,13 @@
 "<literal>hibernate.transaction.manager_lookup_class</literal>."
 
 #. Tag: title
-#: basic_mapping.xml:700
+#: basic_mapping.xml:724
 #, no-c-format
 msgid "UUID algorithm"
 msgstr "UUID algorithm"
 
 #. Tag: para
-#: basic_mapping.xml:701
+#: basic_mapping.xml:725
 #, no-c-format
 msgid ""
 "The UUID contains: IP address, startup time of the JVM (accurate to a "
@@ -1484,13 +1484,13 @@
 "partir de Java, c'est donc le mieux que l'on puisse faire sans utiliser JNI."
 
 #. Tag: title
-#: basic_mapping.xml:710
+#: basic_mapping.xml:734
 #, no-c-format
 msgid "Identity columns and sequences"
 msgstr "Colonnes identifiantes et séquences"
 
 #. Tag: para
-#: basic_mapping.xml:711
+#: basic_mapping.xml:735
 #, no-c-format
 msgid ""
 "For databases which support identity columns (DB2, MySQL, Sybase, MS SQL), "
@@ -1507,7 +1507,7 @@
 "nécessitent deux requêtes SQL pour insérer un objet."
 
 #. Tag: programlisting
-#: basic_mapping.xml:719
+#: basic_mapping.xml:743
 #, no-c-format
 msgid ""
 "<![CDATA[<id name=\"id\" type=\"long\" column=\"person_id\">\n"
@@ -1518,7 +1518,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: basic_mapping.xml:721
+#: basic_mapping.xml:745
 #, no-c-format
 msgid ""
 "<![CDATA[<id name=\"id\" type=\"long\" column=\"person_id\" unsaved-value=\"0"
@@ -1528,7 +1528,7 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:723
+#: basic_mapping.xml:747
 #, no-c-format
 msgid ""
 "For cross-platform development, the <literal>native</literal> strategy will "
@@ -1542,13 +1542,13 @@
 "possibilités offertes par la base sous-jacente."
 
 #. Tag: title
-#: basic_mapping.xml:732
+#: basic_mapping.xml:756
 #, no-c-format
 msgid "Assigned identifiers"
 msgstr "Identifiants assignés"
 
 #. Tag: para
-#: basic_mapping.xml:733
+#: basic_mapping.xml:757
 #, no-c-format
 msgid ""
 "If you want the application to assign identifiers (as opposed to having "
@@ -1568,7 +1568,7 @@
 "pas d'élément <literal>&lt;generator&gt;</literal>."
 
 #. Tag: para
-#: basic_mapping.xml:742
+#: basic_mapping.xml:766
 #, no-c-format
 msgid ""
 "Choosing the <literal>assigned</literal> generator makes Hibernate use "
@@ -1584,13 +1584,13 @@
 "<literal>Interceptor.isUnsaved()</literal>."
 
 #. Tag: title
-#: basic_mapping.xml:752
+#: basic_mapping.xml:776
 #, no-c-format
 msgid "Primary keys assigned by triggers"
 msgstr "Clefs primaires assignées par trigger"
 
 #. Tag: para
-#: basic_mapping.xml:753
+#: basic_mapping.xml:777
 #, no-c-format
 msgid ""
 "For legacy schemas only (Hibernate does not generate DDL with triggers)."
@@ -1599,7 +1599,7 @@
 "génère pas de DDL avec des triggers)"
 
 #. Tag: programlisting
-#: basic_mapping.xml:757
+#: basic_mapping.xml:781
 #, no-c-format
 msgid ""
 "<![CDATA[<id name=\"id\" type=\"long\" column=\"person_id\">\n"
@@ -1610,7 +1610,7 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:759
+#: basic_mapping.xml:783
 #, no-c-format
 msgid ""
 "In the above example, there is a unique valued property named "
@@ -1624,13 +1624,13 @@
 "générée par trigger."
 
 #. Tag: title
-#: basic_mapping.xml:771
+#: basic_mapping.xml:795
 #, no-c-format
 msgid "Enhanced identifier generators"
 msgstr "Enhanced identifier generators"
 
 #. Tag: para
-#: basic_mapping.xml:773
+#: basic_mapping.xml:797
 #, no-c-format
 msgid ""
 "Starting with release 3.2.3, there are 2 new generators which represent a re-"
@@ -1650,7 +1650,7 @@
 "current releases and can be referenced by FQN."
 
 #. Tag: para
-#: basic_mapping.xml:781
+#: basic_mapping.xml:805
 #, fuzzy, no-c-format
 msgid ""
 "The first of these new generators is <literal>org.hibernate.id.enhanced."
@@ -1687,7 +1687,7 @@
 "<placeholder-1/>"
 
 #. Tag: para
-#: basic_mapping.xml:795
+#: basic_mapping.xml:819
 #, no-c-format
 msgid ""
 "<literal>sequence_name</literal> (optional, defaults to "
@@ -1699,7 +1699,7 @@
 "to be used."
 
 #. Tag: para
-#: basic_mapping.xml:801
+#: basic_mapping.xml:825
 #, no-c-format
 msgid ""
 "<literal>initial_value</literal> (optional, defaults to <literal>1</"
@@ -1713,7 +1713,7 @@
 "\"STARTS WITH\"."
 
 #. Tag: para
-#: basic_mapping.xml:808
+#: basic_mapping.xml:832
 #, no-c-format
 msgid ""
 "<literal>increment_size</literal> (optional, defaults to <literal>1</"
@@ -1727,7 +1727,7 @@
 "named \"INCREMENT BY\"."
 
 #. Tag: para
-#: basic_mapping.xml:815
+#: basic_mapping.xml:839
 #, no-c-format
 msgid ""
 "<literal>force_table_use</literal> (optional, defaults to <literal>false</"
@@ -1739,7 +1739,7 @@
 "though the dialect might support sequence?"
 
 #. Tag: para
-#: basic_mapping.xml:822
+#: basic_mapping.xml:846
 #, no-c-format
 msgid ""
 "<literal>value_column</literal> (optional, defaults to <literal>next_val</"
@@ -1751,7 +1751,7 @@
 "table which is used to hold the value."
 
 #. Tag: para
-#: basic_mapping.xml:829
+#: basic_mapping.xml:853
 #, fuzzy, no-c-format
 msgid ""
 "<literal>optimizer</literal> (optional, defaults to <literal>none</"
@@ -1761,7 +1761,7 @@
 "literal>) : le style de cascade."
 
 #. Tag: para
-#: basic_mapping.xml:836
+#: basic_mapping.xml:860
 #, fuzzy, no-c-format
 msgid ""
 "The second of these new generators is <literal>org.hibernate.id.enhanced."
@@ -1787,7 +1787,7 @@
 "parameters: <placeholder-1/>"
 
 #. Tag: para
-#: basic_mapping.xml:846
+#: basic_mapping.xml:870
 #, no-c-format
 msgid ""
 "<literal>table_name</literal> (optional, defaults to "
@@ -1797,7 +1797,7 @@
 "<literal>hibernate_sequences</literal>): The name of the table to be used."
 
 #. Tag: para
-#: basic_mapping.xml:852
+#: basic_mapping.xml:876
 #, no-c-format
 msgid ""
 "<literal>value_column_name</literal> (optional, defaults to "
@@ -1809,7 +1809,7 @@
 "used to hold the value."
 
 #. Tag: para
-#: basic_mapping.xml:858
+#: basic_mapping.xml:882
 #, no-c-format
 msgid ""
 "<literal>segment_column_name</literal> (optional, defaults to "
@@ -1823,7 +1823,7 @@
 "identifies which increment value to use."
 
 #. Tag: para
-#: basic_mapping.xml:865
+#: basic_mapping.xml:889
 #, no-c-format
 msgid ""
 "<literal>segment_value</literal> (optional, defaults to <literal>default</"
@@ -1835,7 +1835,7 @@
 "pull increment values for this generator."
 
 #. Tag: para
-#: basic_mapping.xml:872
+#: basic_mapping.xml:896
 #, no-c-format
 msgid ""
 "<literal>segment_value_length</literal> (optional, defaults to <literal>255</"
@@ -1847,7 +1847,7 @@
 "segment key column."
 
 #. Tag: para
-#: basic_mapping.xml:878
+#: basic_mapping.xml:902
 #, no-c-format
 msgid ""
 "<literal>initial_value</literal> (optional, defaults to <literal>1</"
@@ -1857,7 +1857,7 @@
 "literal>): The initial value to be retrieved from the table."
 
 #. Tag: para
-#: basic_mapping.xml:884
+#: basic_mapping.xml:908
 #, no-c-format
 msgid ""
 "<literal>increment_size</literal> (optional, defaults to <literal>1</"
@@ -1867,7 +1867,7 @@
 "literal>): The value by which subsequent calls to the table should differ."
 
 #. Tag: para
-#: basic_mapping.xml:890
+#: basic_mapping.xml:914
 #, fuzzy, no-c-format
 msgid ""
 "<literal>optimizer</literal> (optional, defaults to <literal></literal>): See"
@@ -1876,13 +1876,13 @@
 "literal>) : le style de cascade."
 
 #. Tag: title
-#: basic_mapping.xml:900
+#: basic_mapping.xml:924
 #, no-c-format
 msgid "Identifier generator optimization"
 msgstr "Identifier generator optimization"
 
 #. Tag: para
-#: basic_mapping.xml:901
+#: basic_mapping.xml:925
 #, fuzzy, no-c-format
 msgid ""
 "For identifier generators which store values in the database, it is "
@@ -1902,7 +1902,7 @@
 "\"/> support this notion. <placeholder-1/>"
 
 #. Tag: para
-#: basic_mapping.xml:909
+#: basic_mapping.xml:933
 #, no-c-format
 msgid ""
 "<literal>none</literal> (generally this is the default if no optimizer was "
@@ -1914,7 +1914,7 @@
 "each and every request."
 
 #. Tag: para
-#: basic_mapping.xml:915
+#: basic_mapping.xml:939
 #, no-c-format
 msgid ""
 "<literal>hilo</literal>: applies a hi/lo algorithm around the database "
@@ -1932,7 +1932,7 @@
 "define a group \"hi value\"."
 
 #. Tag: para
-#: basic_mapping.xml:924
+#: basic_mapping.xml:948
 #, no-c-format
 msgid ""
 "<literal>pooled</literal>: like was discussed for <literal>hilo</literal>, "
@@ -1950,13 +1950,13 @@
 "refers to the values coming from the database."
 
 #. Tag: title
-#: basic_mapping.xml:937
+#: basic_mapping.xml:961
 #, no-c-format
 msgid "composite-id"
 msgstr "composite-id"
 
 #. Tag: programlisting
-#: basic_mapping.xml:939
+#: basic_mapping.xml:963
 #, no-c-format
 msgid ""
 "<![CDATA[<composite-id\n"
@@ -1975,7 +1975,7 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:941
+#: basic_mapping.xml:965
 #, no-c-format
 msgid ""
 "For a table with a composite key, you may map multiple properties of the "
@@ -1990,7 +1990,7 @@
 "literal> comme fils."
 
 #. Tag: programlisting
-#: basic_mapping.xml:948
+#: basic_mapping.xml:972
 #, no-c-format
 msgid ""
 "<![CDATA[<composite-id>\n"
@@ -2000,7 +2000,7 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:950
+#: basic_mapping.xml:974
 #, no-c-format
 msgid ""
 "Your persistent class <emphasis>must</emphasis> override <literal>equals()</"
@@ -2013,7 +2013,7 @@
 "l'interface <literal>Serializable</literal>."
 
 #. Tag: para
-#: basic_mapping.xml:956
+#: basic_mapping.xml:980
 #, no-c-format
 msgid ""
 "Unfortunately, this approach to composite identifiers means that a "
@@ -2034,7 +2034,7 @@
 "\" et ne la recommandons pas pour des applications complexes."
 
 #. Tag: para
-#: basic_mapping.xml:965
+#: basic_mapping.xml:989
 #, no-c-format
 msgid ""
 "A second approach is what we call a <emphasis>mapped</emphasis> composite "
@@ -2048,7 +2048,7 @@
 "particulière."
 
 #. Tag: programlisting
-#: basic_mapping.xml:971
+#: basic_mapping.xml:995
 #, no-c-format
 msgid ""
 "<![CDATA[<composite-id class=\"MedicareId\" mapped=\"true\">\n"
@@ -2058,7 +2058,7 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:973
+#: basic_mapping.xml:997
 #, no-c-format
 msgid ""
 "In this example, both the composite identifier class, <literal>MedicareId</"
@@ -2077,7 +2077,7 @@
 "de cette approche est la duplication du code."
 
 #. Tag: para
-#: basic_mapping.xml:982
+#: basic_mapping.xml:1006
 #, no-c-format
 msgid ""
 "The following attributes are used to specify a mapped composite identifier:"
@@ -2085,7 +2085,7 @@
 "Les attributs suivants servent à configurer un identifiant composé mappé :"
 
 #. Tag: para
-#: basic_mapping.xml:988
+#: basic_mapping.xml:1012
 #, no-c-format
 msgid ""
 "<literal>mapped</literal> (optional, defaults to <literal>false</literal>): "
@@ -2099,7 +2099,7 @@
 "identifiante)."
 
 #. Tag: para
-#: basic_mapping.xml:996
+#: basic_mapping.xml:1020
 #, no-c-format
 msgid ""
 "<literal>class</literal> (optional, but required for a mapped composite "
@@ -2109,7 +2109,7 @@
 "mappé) : La classe composant utilisée comme identifiant composé."
 
 #. Tag: para
-#: basic_mapping.xml:1003
+#: basic_mapping.xml:1027
 #, no-c-format
 msgid ""
 "We will describe a third, even more convenient approach where the composite "
@@ -2123,7 +2123,7 @@
 "s'appliquent que pour cette dernière approche :"
 
 #. Tag: para
-#: basic_mapping.xml:1011
+#: basic_mapping.xml:1035
 #, no-c-format
 msgid ""
 "<literal>name</literal> (optional, required for this approach): A property "
@@ -2134,7 +2134,7 @@
 "chapitre 9)."
 
 #. Tag: para
-#: basic_mapping.xml:1023
+#: basic_mapping.xml:1047
 #, no-c-format
 msgid ""
 "<literal>class</literal> (optional - defaults to the property type "
@@ -2146,7 +2146,7 @@
 "(voir prochaine section)."
 
 #. Tag: para
-#: basic_mapping.xml:1030
+#: basic_mapping.xml:1054
 #, no-c-format
 msgid ""
 "This third approach, an <emphasis>identifier component</emphasis> is the one "
@@ -2156,13 +2156,13 @@
 "applications."
 
 #. Tag: title
-#: basic_mapping.xml:1038
+#: basic_mapping.xml:1062
 #, no-c-format
 msgid "discriminator"
 msgstr "discriminator"
 
 #. Tag: para
-#: basic_mapping.xml:1040
+#: basic_mapping.xml:1064
 #, no-c-format
 msgid ""
 "The <literal>&lt;discriminator&gt;</literal> element is required for "
@@ -2186,7 +2186,7 @@
 "<literal>yes_no</literal>, <literal>true_false</literal>."
 
 #. Tag: programlisting
-#: basic_mapping.xml:1058
+#: basic_mapping.xml:1082
 #, no-c-format
 msgid ""
 "<![CDATA[<discriminator\n"
@@ -2199,7 +2199,7 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:1061
+#: basic_mapping.xml:1085
 #, no-c-format
 msgid ""
 "<literal>column</literal> (optional - defaults to <literal>class</literal>) "
@@ -2209,7 +2209,7 @@
 "literal>) le nom de la colonne discriminante."
 
 #. Tag: para
-#: basic_mapping.xml:1067
+#: basic_mapping.xml:1091
 #, no-c-format
 msgid ""
 "<literal>type</literal> (optional - defaults to <literal>string</literal>) a "
@@ -2219,7 +2219,7 @@
 "un nom indiquant le type Hibernate."
 
 #. Tag: para
-#: basic_mapping.xml:1073
+#: basic_mapping.xml:1097
 #, no-c-format
 msgid ""
 "<literal>force</literal> (optional - defaults to <literal>false</literal>) "
@@ -2231,7 +2231,7 @@
 "quand on récupère toutes les instances de la classe de base."
 
 #. Tag: para
-#: basic_mapping.xml:1080
+#: basic_mapping.xml:1104
 #, no-c-format
 msgid ""
 "<literal>insert</literal> (optional - defaults to <literal>true</literal>) "
@@ -2245,7 +2245,7 @@
 "la colonne dans les <literal>INSERT</literal> SQL)."
 
 #. Tag: para
-#: basic_mapping.xml:1088
+#: basic_mapping.xml:1112
 #, no-c-format
 msgid ""
 "<literal>formula</literal> (optional) an arbitrary SQL expression that is "
@@ -2257,7 +2257,7 @@
 "le contenu."
 
 #. Tag: para
-#: basic_mapping.xml:1096
+#: basic_mapping.xml:1120
 #, no-c-format
 msgid ""
 "Actual values of the discriminator column are specified by the "
@@ -2269,7 +2269,7 @@
 "class&gt;</literal> et <literal>&lt;subclass&gt;</literal>."
 
 #. Tag: para
-#: basic_mapping.xml:1102
+#: basic_mapping.xml:1126
 #, no-c-format
 msgid ""
 "The <literal>force</literal> attribute is (only) useful if the table "
@@ -2281,7 +2281,7 @@
 "une classe persistante. Ce ne sera généralement pas le cas."
 
 #. Tag: para
-#: basic_mapping.xml:1108
+#: basic_mapping.xml:1132
 #, no-c-format
 msgid ""
 "Using the <literal>formula</literal> attribute you can declare an arbitrary "
@@ -2292,7 +2292,7 @@
 "ligne :"
 
 #. Tag: programlisting
-#: basic_mapping.xml:1113
+#: basic_mapping.xml:1137
 #, no-c-format
 msgid ""
 "<![CDATA[<discriminator\n"
@@ -2301,13 +2301,13 @@
 msgstr ""
 
 #. Tag: title
-#: basic_mapping.xml:1118
+#: basic_mapping.xml:1142
 #, no-c-format
 msgid "version (optional)"
 msgstr "version (optionnel)"
 
 #. Tag: para
-#: basic_mapping.xml:1120
+#: basic_mapping.xml:1144
 #, no-c-format
 msgid ""
 "The <literal>&lt;version&gt;</literal> element is optional and indicates "
@@ -2320,7 +2320,7 @@
 "(voir plus-bas)."
 
 #. Tag: programlisting
-#: basic_mapping.xml:1136
+#: basic_mapping.xml:1160
 #, no-c-format
 msgid ""
 "<![CDATA[<version\n"
@@ -2336,7 +2336,7 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:1139
+#: basic_mapping.xml:1163
 #, no-c-format
 msgid ""
 "<literal>column</literal> (optional - defaults to the property name): The "
@@ -2346,7 +2346,7 @@
 "propriété) : Le nom de la colonne contenant le numéro de version."
 
 #. Tag: para
-#: basic_mapping.xml:1145
+#: basic_mapping.xml:1169
 #, no-c-format
 msgid ""
 "<literal>name</literal>: The name of a property of the persistent class."
@@ -2354,7 +2354,7 @@
 "<literal>name</literal> : Le nom d'un attribut de la classe persistante."
 
 #. Tag: para
-#: basic_mapping.xml:1150
+#: basic_mapping.xml:1174
 #, no-c-format
 msgid ""
 "<literal>type</literal> (optional - defaults to <literal>integer</literal>): "
@@ -2364,7 +2364,7 @@
 "literal>) : Le type du numéro de version."
 
 #. Tag: para
-#: basic_mapping.xml:1162
+#: basic_mapping.xml:1186
 #, no-c-format
 msgid ""
 "<literal>unsaved-value</literal> (optional - defaults to <literal>undefined</"
@@ -2381,7 +2381,7 @@
 "valeur de l'atribut identifiant devrait être utilisé)."
 
 #. Tag: para
-#: basic_mapping.xml:1171
+#: basic_mapping.xml:1195
 #, no-c-format
 msgid ""
 "<literal>generated</literal> (optional - defaults to <literal>never</"
@@ -2395,7 +2395,7 @@
 "properties</xref>."
 
 #. Tag: para
-#: basic_mapping.xml:1178
+#: basic_mapping.xml:1202
 #, no-c-format
 msgid ""
 "<literal>insert</literal> (optional - defaults to <literal>true</literal>): "
@@ -2410,7 +2410,7 @@
 "literal>."
 
 #. Tag: para
-#: basic_mapping.xml:1188
+#: basic_mapping.xml:1212
 #, no-c-format
 msgid ""
 "Version numbers may be of Hibernate type <literal>long</literal>, "
@@ -2422,7 +2422,7 @@
 "<literal>timestamp</literal> ou <literal>calendar</literal>."
 
 #. Tag: para
-#: basic_mapping.xml:1193
+#: basic_mapping.xml:1217
 #, no-c-format
 msgid ""
 "A version or timestamp property should never be null for a detached "
@@ -2443,13 +2443,13 @@
 "des clefs composées !</emphasis>"
 
 #. Tag: title
-#: basic_mapping.xml:1204
+#: basic_mapping.xml:1228
 #, no-c-format
 msgid "timestamp (optional)"
 msgstr "timestamp (optionnel)"
 
 #. Tag: para
-#: basic_mapping.xml:1206
+#: basic_mapping.xml:1230
 #, no-c-format
 msgid ""
 "The optional <literal>&lt;timestamp&gt;</literal> element indicates that the "
@@ -2465,7 +2465,7 @@
 "l'application peut parfois utiliser l'horodatage à d'autres fins."
 
 #. Tag: programlisting
-#: basic_mapping.xml:1222
+#: basic_mapping.xml:1246
 #, no-c-format
 msgid ""
 "<![CDATA[<timestamp\n"
@@ -2480,7 +2480,7 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:1225
+#: basic_mapping.xml:1249
 #, no-c-format
 msgid ""
 "<literal>column</literal> (optional - defaults to the property name): The "
@@ -2490,7 +2490,7 @@
 "propriété) : Le nom d'une colonne contenant le timestamp."
 
 #. Tag: para
-#: basic_mapping.xml:1231
+#: basic_mapping.xml:1255
 #, no-c-format
 msgid ""
 "<literal>name</literal>: The name of a JavaBeans style property of Java type "
@@ -2502,7 +2502,7 @@
 "persistante."
 
 #. Tag: para
-#: basic_mapping.xml:1244
+#: basic_mapping.xml:1268
 #, no-c-format
 msgid ""
 "<literal>unsaved-value</literal> (optional - defaults to <literal>null</"
@@ -2519,7 +2519,7 @@
 "de l'attribut identifiant devrait être utilisée)."
 
 #. Tag: para
-#: basic_mapping.xml:1253
+#: basic_mapping.xml:1277
 #, no-c-format
 msgid ""
 "<literal>source</literal> (optional - defaults to <literal>vm</literal>): "
@@ -2541,7 +2541,7 @@
 "provoquant des erreurs de précision (Oracle 8 par exemple)."
 
 #. Tag: para
-#: basic_mapping.xml:1265
+#: basic_mapping.xml:1289
 #, no-c-format
 msgid ""
 "<literal>generated</literal> (optional - defaults to <literal>never</"
@@ -2554,7 +2554,7 @@
 "données cf. <xref linkend=\"mapping-generated\">generated properties</xref>."
 
 #. Tag: para
-#: basic_mapping.xml:1274
+#: basic_mapping.xml:1298
 #, no-c-format
 msgid ""
 "Note that <literal>&lt;timestamp&gt;</literal> is equivalent to <literal>&lt;"
@@ -2566,13 +2566,13 @@
 "version type=\"timestamp\"&gt;</literal>."
 
 #. Tag: title
-#: basic_mapping.xml:1284
+#: basic_mapping.xml:1308
 #, no-c-format
 msgid "property"
 msgstr "property"
 
 #. Tag: para
-#: basic_mapping.xml:1286
+#: basic_mapping.xml:1310
 #, no-c-format
 msgid ""
 "The <literal>&lt;property&gt;</literal> element declares a persistent, "
@@ -2582,7 +2582,7 @@
 "classe au sens JavaBean."
 
 #. Tag: programlisting
-#: basic_mapping.xml:1308
+#: basic_mapping.xml:1332
 #, no-c-format
 msgid ""
 "<![CDATA[<property\n"
@@ -2608,7 +2608,7 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:1311
+#: basic_mapping.xml:1335
 #, no-c-format
 msgid ""
 "<literal>name</literal>: the name of the property, with an initial lowercase "
@@ -2618,7 +2618,7 @@
 "minuscule."
 
 #. Tag: para
-#: basic_mapping.xml:1317
+#: basic_mapping.xml:1341
 #, no-c-format
 msgid ""
 "<literal>column</literal> (optional - defaults to the property name): the "
@@ -2630,14 +2630,14 @@
 "élément(s) <literal>&lt;column&gt;</literal>."
 
 #. Tag: para
-#: basic_mapping.xml:1324
+#: basic_mapping.xml:1348
 #, 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:1329
+#: basic_mapping.xml:1353
 #, no-c-format
 msgid ""
 "<literal>update, insert</literal> (optional - defaults to <literal>true</"
@@ -2654,7 +2654,7 @@
 "données (utile si vous savez qu'un trigger affectera la valeur à la colonne)."
 
 #. Tag: para
-#: basic_mapping.xml:1338
+#: basic_mapping.xml:1362
 #, no-c-format
 msgid ""
 "<literal>formula</literal> (optional): an SQL expression that defines the "
@@ -2666,7 +2666,7 @@
 "calculées ne possède pas leur propre mapping."
 
 #. Tag: para
-#: basic_mapping.xml:1351
+#: basic_mapping.xml:1375
 #, no-c-format
 msgid ""
 "<literal>lazy</literal> (optional - defaults to <literal>false</literal>): "
@@ -2678,7 +2678,7 @@
 "quand on accède à la variable d'instance pour la première fois."
 
 #. Tag: para
-#: basic_mapping.xml:1358
+#: basic_mapping.xml:1382
 #, no-c-format
 msgid ""
 "<literal>unique</literal> (optional): Enable the DDL generation of a unique "
@@ -2690,7 +2690,7 @@
 "<literal>property-ref</literal>."
 
 #. Tag: para
-#: basic_mapping.xml:1365
+#: basic_mapping.xml:1389
 #, no-c-format
 msgid ""
 "<literal>not-null</literal> (optional): Enable the DDL generation of a "
@@ -2700,7 +2700,7 @@
 "non nullité pour les colonnes."
 
 #. Tag: para
-#: basic_mapping.xml:1371
+#: basic_mapping.xml:1395
 #, no-c-format
 msgid ""
 "<literal>optimistic-lock</literal> (optional - defaults to <literal>true</"
@@ -2715,7 +2715,7 @@
 "propriété est marquée obsolète (dirty)."
 
 #. Tag: para
-#: basic_mapping.xml:1379
+#: basic_mapping.xml:1403
 #, no-c-format
 msgid ""
 "<literal>generated</literal> (optional - defaults to <literal>never</"
@@ -2728,13 +2728,13 @@
 "<xref linkend=\"mapping-generated\">generated properties</xref>."
 
 #. Tag: para
-#: basic_mapping.xml:1388
+#: basic_mapping.xml:1412
 #, no-c-format
 msgid "<emphasis>typename</emphasis> could be:"
 msgstr "<emphasis>typename</emphasis> peut être:"
 
 #. Tag: para
-#: basic_mapping.xml:1394
+#: basic_mapping.xml:1418
 #, no-c-format
 msgid ""
 "The name of a Hibernate basic type (eg. <literal>integer, string, character, "
@@ -2744,7 +2744,7 @@
 "date, timestamp, float, binary, serializable, object, blob</literal>)."
 
 #. Tag: para
-#: basic_mapping.xml:1400
+#: basic_mapping.xml:1424
 #, no-c-format
 msgid ""
 "The name of a Java class with a default basic type (eg. <literal>int, float, "
@@ -2756,13 +2756,13 @@
 "Clob</literal>)."
 
 #. Tag: para
-#: basic_mapping.xml:1406
+#: basic_mapping.xml:1430
 #, no-c-format
 msgid "The name of a serializable Java class."
 msgstr "Nom d'une classe Java sérialisable."
 
 #. Tag: para
-#: basic_mapping.xml:1411
+#: basic_mapping.xml:1435
 #, no-c-format
 msgid ""
 "The class name of a custom type (eg. <literal>com.illflow.type.MyCustomType</"
@@ -2772,7 +2772,7 @@
 "MyCustomType</literal>)."
 
 #. Tag: para
-#: basic_mapping.xml:1417
+#: basic_mapping.xml:1441
 #, no-c-format
 msgid ""
 "If you do not specify a type, Hibernate will use reflection upon the named "
@@ -2793,7 +2793,7 @@
 "ou pour préciser un type spécifique)."
 
 #. Tag: para
-#: basic_mapping.xml:1427
+#: basic_mapping.xml:1451
 #, no-c-format
 msgid ""
 "The <literal>access</literal> attribute lets you control how Hibernate will "
@@ -2813,7 +2813,7 @@
 "<literal>org.hibernate.property.PropertyAccessor</literal>."
 
 #. Tag: para
-#: basic_mapping.xml:1436
+#: basic_mapping.xml:1460
 #, no-c-format
 msgid ""
 "An especially powerful feature are derived properties. These properties are "
@@ -2829,7 +2829,7 @@
 "literal> dans la requête SQL qui charge une instance :"
 
 #. Tag: programlisting
-#: basic_mapping.xml:1443
+#: basic_mapping.xml:1467
 #, no-c-format
 msgid ""
 "<![CDATA[\n"
@@ -2842,7 +2842,7 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:1445
+#: basic_mapping.xml:1469
 #, no-c-format
 msgid ""
 "Note that you can reference the entities own table by not declaring an alias "
@@ -2857,13 +2857,13 @@
 "l'attribut si vous le souhaitez."
 
 #. Tag: title
-#: basic_mapping.xml:1455
+#: basic_mapping.xml:1479
 #, no-c-format
 msgid "many-to-one"
 msgstr "many-to-one"
 
 #. Tag: para
-#: basic_mapping.xml:1457
+#: basic_mapping.xml:1481
 #, no-c-format
 msgid ""
 "An ordinary association to another persistent class is declared using a "
@@ -2877,7 +2877,7 @@
 "référence la ou les clef(s) primaire(s) dans la table cible."
 
 #. Tag: programlisting
-#: basic_mapping.xml:1485
+#: basic_mapping.xml:1509
 #, no-c-format
 msgid ""
 "<![CDATA[<many-to-one\n"
@@ -2906,7 +2906,7 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:1488 basic_mapping.xml:1669 basic_mapping.xml:1855
+#: basic_mapping.xml:1512 basic_mapping.xml:1693 basic_mapping.xml:1879
 #, fuzzy, no-c-format
 msgid "<literal>name</literal>: The name of the property."
 msgstr ""
@@ -2920,7 +2920,7 @@
 "déterminé par réflexion) : le nom de la classe (fille) du composant."
 
 #. Tag: para
-#: basic_mapping.xml:1493 basic_mapping.xml:2284
+#: basic_mapping.xml:1517 basic_mapping.xml:2308
 #, fuzzy, no-c-format
 msgid ""
 "<literal>column</literal> (optional): The name of the foreign key column. "
@@ -2937,7 +2937,7 @@
 "<literal>&lt;column&gt;</literal>."
 
 #. Tag: para
-#: basic_mapping.xml:1500 basic_mapping.xml:1674
+#: basic_mapping.xml:1524 basic_mapping.xml:1698
 #, fuzzy, no-c-format
 msgid ""
 "<literal>class</literal> (optional - defaults to the property type "
@@ -2951,7 +2951,7 @@
 "être cascadées de l'objet père vers l'objet associé."
 
 #. Tag: para
-#: basic_mapping.xml:1506
+#: basic_mapping.xml:1530
 #, no-c-format
 msgid ""
 "<literal>cascade</literal> (optional): Specifies which operations should be "
@@ -2961,7 +2961,7 @@
 "être propagées de l'objet père vers les objets associés."
 
 #. Tag: para
-#: basic_mapping.xml:1512 basic_mapping.xml:1695
+#: basic_mapping.xml:1536 basic_mapping.xml:1719
 #, fuzzy, no-c-format
 msgid ""
 "<literal>fetch</literal> (optional - defaults to <literal>select</literal>): "
@@ -2977,7 +2977,7 @@
 "n'est pas spécifié, la clef primaire de la classe associée est utilisée."
 
 #. Tag: para
-#: basic_mapping.xml:1518
+#: basic_mapping.xml:1542
 #, no-c-format
 msgid ""
 "<literal>update, insert</literal> (optional - defaults to <literal>true</"
@@ -2994,7 +2994,7 @@
 "données (utile si vous savez qu'un trigger affectera la valeur à la colonne)."
 
 #. Tag: para
-#: basic_mapping.xml:1527
+#: basic_mapping.xml:1551
 #, no-c-format
 msgid ""
 "<literal>property-ref</literal>: (optional) The name of a property of the "
@@ -3006,7 +3006,7 @@
 "spécifié, la clef primaire de la classe associée est utilisée."
 
 #. Tag: para
-#: basic_mapping.xml:1540
+#: basic_mapping.xml:1564
 #, no-c-format
 msgid ""
 "<literal>unique</literal> (optional): Enable the DDL generation of a unique "
@@ -3020,7 +3020,7 @@
 "association one-to-one."
 
 #. Tag: para
-#: basic_mapping.xml:1548
+#: basic_mapping.xml:1572
 #, no-c-format
 msgid ""
 "<literal>not-null</literal> (optional): Enable the DDL generation of a "
@@ -3030,7 +3030,7 @@
 "de non nullité pour la clef étrangère."
 
 #. Tag: para
-#: basic_mapping.xml:1554
+#: basic_mapping.xml:1578
 #, no-c-format
 msgid ""
 "<literal>optimistic-lock</literal> (optional - defaults to <literal>true</"
@@ -3045,7 +3045,7 @@
 "(dirty)."
 
 #. Tag: para
-#: basic_mapping.xml:1562
+#: basic_mapping.xml:1586
 #, no-c-format
 msgid ""
 "<literal>lazy</literal> (optional - defaults to <literal>proxy</literal>): "
@@ -3065,7 +3065,7 @@
 "literal> indique que l'association sera toujours chargée."
 
 #. Tag: para
-#: basic_mapping.xml:1572
+#: basic_mapping.xml:1596
 #, no-c-format
 msgid ""
 "<literal>not-found</literal> (optional - defaults to <literal>exception</"
@@ -3079,7 +3079,7 @@
 "ligne manquante comme une association nulle."
 
 #. Tag: para
-#: basic_mapping.xml:1579 basic_mapping.xml:1733
+#: basic_mapping.xml:1603 basic_mapping.xml:1757
 #, fuzzy, no-c-format
 msgid ""
 "<literal>entity-name</literal> (optional): The entity name of the associated "
@@ -3092,7 +3092,7 @@
 "Il existe deux types d'associations one-to-one :"
 
 #. Tag: para
-#: basic_mapping.xml:1585
+#: basic_mapping.xml:1608
 #, no-c-format
 msgid ""
 "<literal>formula</literal> (optional): an SQL expression that defines the "
@@ -3102,7 +3102,7 @@
 "valeur pour une clé étrangère calculée."
 
 #. Tag: para
-#: basic_mapping.xml:1592
+#: basic_mapping.xml:1616
 #, no-c-format
 msgid ""
 "Setting a value of the <literal>cascade</literal> attribute to any "
@@ -3130,7 +3130,7 @@
 "supportent pas orphan delete."
 
 #. Tag: para
-#: basic_mapping.xml:1605
+#: basic_mapping.xml:1629
 #, no-c-format
 msgid ""
 "A typical <literal>many-to-one</literal> declaration looks as simple as this:"
@@ -3138,7 +3138,7 @@
 "Une déclaration <literal>many-to-one</literal> typique est aussi simple que :"
 
 #. Tag: programlisting
-#: basic_mapping.xml:1609
+#: basic_mapping.xml:1633
 #, no-c-format
 msgid ""
 "<![CDATA[<many-to-one name=\"product\" class=\"Product\" column=\"PRODUCT_ID"
@@ -3146,7 +3146,7 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:1611
+#: basic_mapping.xml:1635
 #, no-c-format
 msgid ""
 "The <literal>property-ref</literal> attribute should only be used for "
@@ -3166,7 +3166,7 @@
 "literal> contrôle la génération DDL par Hibernate avec l'outil SchemaExport.)"
 
 #. Tag: programlisting
-#: basic_mapping.xml:1620
+#: basic_mapping.xml:1644
 #, no-c-format
 msgid ""
 "<![CDATA[<property name=\"serialNumber\" unique=\"true\" type=\"string\" "
@@ -3174,13 +3174,13 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:1622
+#: basic_mapping.xml:1646
 #, 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:1626
+#: basic_mapping.xml:1650
 #, no-c-format
 msgid ""
 "<![CDATA[<many-to-one name=\"product\" property-ref=\"serialNumber\" column="
@@ -3188,13 +3188,13 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:1628
+#: basic_mapping.xml:1652
 #, no-c-format
 msgid "This is certainly not encouraged, however."
 msgstr "bien que ce ne soit certainement pas encouragé."
 
 #. Tag: para
-#: basic_mapping.xml:1632
+#: basic_mapping.xml:1656
 #, no-c-format
 msgid ""
 "If the referenced unique key comprises multiple properties of the associated "
@@ -3206,7 +3206,7 @@
 "<literal>&lt;properties&gt;</literal>."
 
 #. Tag: para
-#: basic_mapping.xml:1637
+#: basic_mapping.xml:1661
 #, no-c-format
 msgid ""
 "If the referenced unique key is the property of a component, you may specify "
@@ -3214,7 +3214,7 @@
 msgstr "one-to-one"
 
 #. Tag: programlisting
-#: basic_mapping.xml:1641
+#: basic_mapping.xml:1665
 #, no-c-format
 msgid ""
 "<![CDATA[<many-to-one name=\"owner\" property-ref=\"identity.ssn\" column="
@@ -3222,7 +3222,7 @@
 msgstr ""
 
 #. Tag: title
-#: basic_mapping.xml:1646
+#: basic_mapping.xml:1670
 #, no-c-format
 msgid "one-to-one"
 msgstr ""
@@ -3230,7 +3230,7 @@
 "avec l'élément <literal>one-to-one</literal>."
 
 #. Tag: para
-#: basic_mapping.xml:1648
+#: basic_mapping.xml:1672
 #, no-c-format
 msgid ""
 "A one-to-one association to another persistent class is declared using a "
@@ -3238,7 +3238,7 @@
 msgstr "<literal>name</literal> : Le nom de la propriété."
 
 #. Tag: programlisting
-#: basic_mapping.xml:1666
+#: basic_mapping.xml:1690
 #, no-c-format
 msgid ""
 "<![CDATA[<one-to-one\n"
@@ -3259,7 +3259,7 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:1680
+#: basic_mapping.xml:1704
 #, no-c-format
 msgid ""
 "<literal>cascade</literal> (optional) specifies which operations should be "
@@ -3273,7 +3273,7 @@
 "par l'outil d'export de schéma)."
 
 #. Tag: para
-#: basic_mapping.xml:1686
+#: basic_mapping.xml:1710
 #, no-c-format
 msgid ""
 "<literal>constrained</literal> (optional) specifies that a foreign key "
@@ -3288,7 +3288,7 @@
 "séquentiel."
 
 #. Tag: para
-#: basic_mapping.xml:1701
+#: basic_mapping.xml:1725
 #, no-c-format
 msgid ""
 "<literal>property-ref</literal>: (optional) The name of a property of the "
@@ -3300,7 +3300,7 @@
 "de la propriété."
 
 #. Tag: para
-#: basic_mapping.xml:1714
+#: basic_mapping.xml:1738
 #, no-c-format
 msgid ""
 "<literal>formula</literal> (optional): Almost all one to one associations "
@@ -3319,7 +3319,7 @@
 "impossible et Hibernate chargera automatiquement l'association !</emphasis>"
 
 #. Tag: para
-#: basic_mapping.xml:1722
+#: basic_mapping.xml:1746
 #, no-c-format
 msgid ""
 "<literal>lazy</literal> (optional - defaults to <literal>proxy</literal>): "
@@ -3335,19 +3335,19 @@
 "associated class."
 
 #. Tag: para
-#: basic_mapping.xml:1740
+#: basic_mapping.xml:1764
 #, no-c-format
 msgid "There are two varieties of one-to-one association:"
 msgstr "associations par clef primaire"
 
 #. Tag: para
-#: basic_mapping.xml:1744
+#: basic_mapping.xml:1768
 #, no-c-format
 msgid "primary key associations"
 msgstr "association par clef étrangère unique"
 
 #. Tag: para
-#: basic_mapping.xml:1747
+#: basic_mapping.xml:1771
 #, no-c-format
 msgid "unique foreign key associations"
 msgstr ""
@@ -3359,7 +3359,7 @@
 "d'identifiant !"
 
 #. Tag: para
-#: basic_mapping.xml:1752
+#: basic_mapping.xml:1776
 #, no-c-format
 msgid ""
 "Primary key associations don't need an extra table column; if two rows are "
@@ -3372,7 +3372,7 @@
 "<literal>Employee</literal> et <literal>Person</literal>, respectivement."
 
 #. Tag: para
-#: basic_mapping.xml:1759
+#: basic_mapping.xml:1783
 #, no-c-format
 msgid ""
 "For a primary key association, add the following mappings to "
@@ -3384,13 +3384,13 @@
 "<literal>foreign</literal> :"
 
 #. Tag: programlisting
-#: basic_mapping.xml:1764
+#: basic_mapping.xml:1788
 #, no-c-format
 msgid "<![CDATA[<one-to-one name=\"person\" class=\"Person\"/>]]>"
 msgstr ""
 
 #. Tag: programlisting
-#: basic_mapping.xml:1765
+#: basic_mapping.xml:1789
 #, no-c-format
 msgid ""
 "<![CDATA[<one-to-one name=\"employee\" class=\"Employee\" constrained=\"true"
@@ -3398,7 +3398,7 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:1767
+#: basic_mapping.xml:1791
 #, no-c-format
 msgid ""
 "Now we must ensure that the primary keys of related rows in the PERSON and "
@@ -3411,7 +3411,7 @@
 "literal> de cette <literal>Person</literal>."
 
 #. Tag: programlisting
-#: basic_mapping.xml:1773
+#: basic_mapping.xml:1797
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"person\" table=\"PERSON\">\n"
@@ -3428,7 +3428,7 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:1775
+#: basic_mapping.xml:1799
 #, no-c-format
 msgid ""
 "A newly saved instance of <literal>Person</literal> is then assigned the "
@@ -3441,7 +3441,7 @@
 "indiquée ainsi :"
 
 #. Tag: para
-#: basic_mapping.xml:1781
+#: basic_mapping.xml:1805
 #, no-c-format
 msgid ""
 "Alternatively, a foreign key with a unique constraint, from "
@@ -3452,7 +3452,7 @@
 "mapping de <literal>Person</literal> :"
 
 #. Tag: programlisting
-#: basic_mapping.xml:1786
+#: basic_mapping.xml:1810
 #, no-c-format
 msgid ""
 "<![CDATA[<many-to-one name=\"person\" class=\"Person\" column=\"PERSON_ID\" "
@@ -3460,7 +3460,7 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:1788
+#: basic_mapping.xml:1812
 #, no-c-format
 msgid ""
 "And this association may be made bidirectional by adding the following to "
@@ -3468,7 +3468,7 @@
 msgstr "natural-id"
 
 #. Tag: programlisting
-#: basic_mapping.xml:1793
+#: basic_mapping.xml:1817
 #, no-c-format
 msgid ""
 "<![CDATA[<one-to-one name=\"employee\" class=\"Employee\" property-ref="
@@ -3476,7 +3476,7 @@
 msgstr ""
 
 #. Tag: title
-#: basic_mapping.xml:1798
+#: basic_mapping.xml:1822
 #, no-c-format
 msgid "natural-id"
 msgstr ""
@@ -3490,7 +3490,7 @@
 "documentera."
 
 #. Tag: programlisting
-#: basic_mapping.xml:1800
+#: basic_mapping.xml:1824
 #, no-c-format
 msgid ""
 "<![CDATA[<natural-id mutable=\"true|false\"/>\n"
@@ -3501,7 +3501,7 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:1802
+#: basic_mapping.xml:1826
 #, no-c-format
 msgid ""
 "Even though we recommend the use of surrogate keys as primary keys, you "
@@ -3517,7 +3517,7 @@
 "l'entité."
 
 #. Tag: para
-#: basic_mapping.xml:1811
+#: basic_mapping.xml:1835
 #, no-c-format
 msgid ""
 "We strongly recommend that you implement <literal>equals()</literal> and "
@@ -3528,7 +3528,7 @@
 "clés naturelles."
 
 #. Tag: para
-#: basic_mapping.xml:1816
+#: basic_mapping.xml:1840
 #, no-c-format
 msgid ""
 "This mapping is not intended for use with entities with natural primary keys."
@@ -3538,7 +3538,7 @@
 "immuable (constants)."
 
 #. Tag: para
-#: basic_mapping.xml:1822
+#: basic_mapping.xml:1846
 #, no-c-format
 msgid ""
 "<literal>mutable</literal> (optional, defaults to <literal>false</literal>): "
@@ -3547,7 +3547,7 @@
 msgstr "component, dynamic-component"
 
 #. Tag: title
-#: basic_mapping.xml:1832
+#: basic_mapping.xml:1856
 #, no-c-format
 msgid "component, dynamic-component"
 msgstr ""
@@ -3557,7 +3557,7 @@
 "\"Components\" plus bas."
 
 #. Tag: para
-#: basic_mapping.xml:1834
+#: basic_mapping.xml:1858
 #, no-c-format
 msgid ""
 "The <literal>&lt;component&gt;</literal> element maps properties of a child "
@@ -3567,7 +3567,7 @@
 msgstr "<literal>name</literal> : Nom de la propriété"
 
 #. Tag: programlisting
-#: basic_mapping.xml:1852
+#: basic_mapping.xml:1876
 #, no-c-format
 msgid ""
 "<![CDATA[<component\n"
@@ -3589,7 +3589,7 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:1860
+#: basic_mapping.xml:1884
 #, no-c-format
 msgid ""
 "<literal>class</literal> (optional - defaults to the property type "
@@ -3599,7 +3599,7 @@
 "dans les <literal>INSERT</literal>s ?"
 
 #. Tag: para
-#: basic_mapping.xml:1866 basic_mapping.xml:1955
+#: basic_mapping.xml:1890 basic_mapping.xml:1979
 #, fuzzy, no-c-format
 msgid ""
 "<literal>insert</literal>: Do the mapped columns appear in SQL "
@@ -3613,7 +3613,7 @@
 "dans les <literal>UPDATE</literal>s ?"
 
 #. Tag: para
-#: basic_mapping.xml:1872 basic_mapping.xml:1961
+#: basic_mapping.xml:1896 basic_mapping.xml:1985
 #, fuzzy, no-c-format
 msgid ""
 "<literal>update</literal>: Do the mapped columns appear in SQL "
@@ -3631,7 +3631,7 @@
 "obsolète (dirty)."
 
 #. Tag: para
-#: basic_mapping.xml:1884
+#: basic_mapping.xml:1908
 #, no-c-format
 msgid ""
 "<literal>lazy</literal> (optional - defaults to <literal>false</literal>): "
@@ -3645,7 +3645,7 @@
 "obsolète (dirty)."
 
 #. Tag: para
-#: basic_mapping.xml:1891
+#: basic_mapping.xml:1915
 #, no-c-format
 msgid ""
 "<literal>optimistic-lock</literal> (optional - defaults to <literal>true</"
@@ -3658,7 +3658,7 @@
 "colonnes mappées de ce composant."
 
 #. Tag: para
-#: basic_mapping.xml:1899 basic_mapping.xml:1975
+#: basic_mapping.xml:1923 basic_mapping.xml:1999
 #, fuzzy, no-c-format
 msgid ""
 "<literal>unique</literal> (optional - defaults to <literal>false</literal>): "
@@ -3673,7 +3673,7 @@
 "literal> suivant :"
 
 #. Tag: para
-#: basic_mapping.xml:1908
+#: basic_mapping.xml:1932
 #, no-c-format
 msgid ""
 "The child <literal>&lt;property&gt;</literal> tags map properties of the "
@@ -3684,7 +3684,7 @@
 "classe composant comme une référence arrière vers l'entité contenante."
 
 #. Tag: para
-#: basic_mapping.xml:1913
+#: basic_mapping.xml:1937
 #, no-c-format
 msgid ""
 "The <literal>&lt;component&gt;</literal> element allows a <literal>&lt;"
@@ -3697,7 +3697,7 @@
 "\"components-dynamic\"/>."
 
 #. Tag: para
-#: basic_mapping.xml:1919
+#: basic_mapping.xml:1943
 #, no-c-format
 msgid ""
 "The <literal>&lt;dynamic-component&gt;</literal> element allows a "
@@ -3706,7 +3706,7 @@
 msgstr "properties"
 
 #. Tag: title
-#: basic_mapping.xml:1928
+#: basic_mapping.xml:1952
 #, no-c-format
 msgid "properties"
 msgstr ""
@@ -3717,7 +3717,7 @@
 "un moyen pratique de définir une contrainte d'unicité multi-colonnes."
 
 #. Tag: para
-#: basic_mapping.xml:1930
+#: basic_mapping.xml:1954
 #, no-c-format
 msgid ""
 "The <literal>&lt;properties&gt;</literal> element allows the definition of a "
@@ -3730,7 +3730,7 @@
 "emphasis> le véritable nom d'une propriété."
 
 #. Tag: programlisting
-#: basic_mapping.xml:1946
+#: basic_mapping.xml:1970
 #, no-c-format
 msgid ""
 "<![CDATA[<properties\n"
@@ -3748,7 +3748,7 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:1949
+#: basic_mapping.xml:1973
 #, no-c-format
 msgid ""
 "<literal>name</literal>: The logical name of the grouping - <emphasis>not</"
@@ -3758,7 +3758,7 @@
 "dans les <literal>INSERT</literal>s ?"
 
 #. Tag: para
-#: basic_mapping.xml:1967
+#: basic_mapping.xml:1991
 #, no-c-format
 msgid ""
 "<literal>optimistic-lock</literal> (optional - defaults to <literal>true</"
@@ -3771,7 +3771,7 @@
 "colonnes mappées de ce composant."
 
 #. Tag: para
-#: basic_mapping.xml:1984
+#: basic_mapping.xml:2008
 #, no-c-format
 msgid ""
 "For example, if we have the following <literal>&lt;properties&gt;</literal> "
@@ -3782,7 +3782,7 @@
 "<literal>Person</literal> au lieu de la clef primaire :"
 
 #. Tag: programlisting
-#: basic_mapping.xml:1988
+#: basic_mapping.xml:2012
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Person\">\n"
@@ -3798,7 +3798,7 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:1990
+#: basic_mapping.xml:2014
 #, no-c-format
 msgid ""
 "Then we might have some legacy data association which refers to this unique "
@@ -3808,7 +3808,7 @@
 "contexte de mapping de données héritées d'anciens systèmes."
 
 #. Tag: programlisting
-#: basic_mapping.xml:1995
+#: basic_mapping.xml:2019
 #, no-c-format
 msgid ""
 "<![CDATA[<many-to-one name=\"person\"\n"
@@ -3820,7 +3820,7 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:1997
+#: basic_mapping.xml:2021
 #, no-c-format
 msgid ""
 "We don't recommend the use of this kind of thing outside the context of "
@@ -3828,7 +3828,7 @@
 msgstr "subclass"
 
 #. Tag: title
-#: basic_mapping.xml:2005
+#: basic_mapping.xml:2029
 #, no-c-format
 msgid "subclass"
 msgstr ""
@@ -3838,7 +3838,7 @@
 "subclass&gt;</literal>."
 
 #. Tag: para
-#: basic_mapping.xml:2007
+#: basic_mapping.xml:2031
 #, no-c-format
 msgid ""
 "Finally, polymorphic persistence requires the declaration of each subclass "
@@ -3847,7 +3847,7 @@
 msgstr "<literal>name</literal> : Le nom complet de la sous-classe."
 
 #. Tag: programlisting
-#: basic_mapping.xml:2020
+#: basic_mapping.xml:2044
 #, no-c-format
 msgid ""
 "<![CDATA[<subclass\n"
@@ -3867,7 +3867,7 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:2023 basic_mapping.xml:2081 basic_mapping.xml:2144
+#: basic_mapping.xml:2047 basic_mapping.xml:2105 basic_mapping.xml:2168
 #, fuzzy, no-c-format
 msgid ""
 "<literal>name</literal>: The fully qualified class name of the subclass."
@@ -3881,7 +3881,7 @@
 "<literal>name</literal> : Le nom Java complet de la sous-classe."
 
 #. Tag: para
-#: basic_mapping.xml:2028
+#: basic_mapping.xml:2052
 #, no-c-format
 msgid ""
 "<literal>discriminator-value</literal> (optional - defaults to the class "
@@ -3891,7 +3891,7 @@
 "utiliser pour les chargements à la demande des proxies (lazy)."
 
 #. Tag: para
-#: basic_mapping.xml:2034 basic_mapping.xml:2091 basic_mapping.xml:2154
+#: basic_mapping.xml:2058 basic_mapping.xml:2115 basic_mapping.xml:2178
 #, fuzzy, no-c-format
 msgid ""
 "<literal>proxy</literal> (optional): Specifies a class or interface to use "
@@ -3909,7 +3909,7 @@
 "le chargement différé des proxies."
 
 #. Tag: para
-#: basic_mapping.xml:2040 basic_mapping.xml:2097 basic_mapping.xml:2160
+#: basic_mapping.xml:2064 basic_mapping.xml:2121 basic_mapping.xml:2184
 #, fuzzy, no-c-format
 msgid ""
 "<literal>lazy</literal> (optional, defaults to <literal>true</literal>): "
@@ -3932,7 +3932,7 @@
 "chargement à la demande."
 
 #. Tag: para
-#: basic_mapping.xml:2048
+#: basic_mapping.xml:2072
 #, no-c-format
 msgid ""
 "Each subclass should declare its own persistent properties and subclasses. "
@@ -3945,7 +3945,7 @@
 "\"/>."
 
 #. Tag: para
-#: basic_mapping.xml:2056 basic_mapping.xml:2114 basic_mapping.xml:2172
+#: basic_mapping.xml:2080 basic_mapping.xml:2138 basic_mapping.xml:2196
 #, no-c-format
 msgid ""
 "For information about inheritance mappings, see <xref linkend=\"inheritance"
@@ -3955,13 +3955,13 @@
 "\"inheritance\"/>."
 
 #. Tag: title
-#: basic_mapping.xml:2063
+#: basic_mapping.xml:2087
 #, no-c-format
 msgid "joined-subclass"
 msgstr "joined-subclass"
 
 #. Tag: para
-#: basic_mapping.xml:2065
+#: basic_mapping.xml:2089
 #, no-c-format
 msgid ""
 "Alternatively, each subclass may be mapped to its own table (table-per-"
@@ -3975,7 +3975,7 @@
 "classe. L'élément <literal>&lt;joined-subclass&gt;</literal> est utilisé."
 
 #. Tag: programlisting
-#: basic_mapping.xml:2078
+#: basic_mapping.xml:2102
 #, no-c-format
 msgid ""
 "<![CDATA[<joined-subclass\n"
@@ -4001,7 +4001,7 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:2086 basic_mapping.xml:2149
+#: basic_mapping.xml:2110 basic_mapping.xml:2173
 #, fuzzy, no-c-format
 msgid "<literal>table</literal>: The name of the subclass table."
 msgstr ""
@@ -4011,7 +4011,7 @@
 "<literal>table</literal> : nom de la table de la sous-classe."
 
 #. Tag: para
-#: basic_mapping.xml:2105
+#: basic_mapping.xml:2129
 #, no-c-format
 msgid ""
 "No discriminator column is required for this mapping strategy. Each subclass "
@@ -4025,7 +4025,7 @@
 "literal>. Le mapping au début de ce chapitre serait ré-écrit ainsi :"
 
 #. Tag: programlisting
-#: basic_mapping.xml:2112
+#: basic_mapping.xml:2136
 #, no-c-format
 msgid ""
 "<![CDATA[<?xml version=\"1.0\"?>\n"
@@ -4063,13 +4063,13 @@
 msgstr ""
 
 #. Tag: title
-#: basic_mapping.xml:2121
+#: basic_mapping.xml:2145
 #, no-c-format
 msgid "union-subclass"
 msgstr "union-subclass"
 
 #. Tag: para
-#: basic_mapping.xml:2123
+#: basic_mapping.xml:2147
 #, no-c-format
 msgid ""
 "A third option is to map only the concrete classes of an inheritance "
@@ -4093,7 +4093,7 @@
 "vous devez utiliser le mapping <literal>&lt;union-subclass&gt;</literal>."
 
 #. Tag: programlisting
-#: basic_mapping.xml:2141
+#: basic_mapping.xml:2165
 #, no-c-format
 msgid ""
 "<![CDATA[<union-subclass\n"
@@ -4118,7 +4118,7 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:2168
+#: basic_mapping.xml:2192
 #, no-c-format
 msgid ""
 "No discriminator column or key column is required for this mapping strategy."
@@ -4127,13 +4127,13 @@
 "stratégie de mapping."
 
 #. Tag: title
-#: basic_mapping.xml:2179
+#: basic_mapping.xml:2203
 #, no-c-format
 msgid "join"
 msgstr "join"
 
 #. Tag: para
-#: basic_mapping.xml:2181
+#: basic_mapping.xml:2205
 #, no-c-format
 msgid ""
 "Using the <literal>&lt;join&gt;</literal> element, it is possible to map "
@@ -4144,7 +4144,7 @@
 "mapper des propriétés d'une classe sur plusieurs tables."
 
 #. Tag: programlisting
-#: basic_mapping.xml:2195
+#: basic_mapping.xml:2219
 #, no-c-format
 msgid ""
 "<![CDATA[<join\n"
@@ -4163,13 +4163,13 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:2199
+#: basic_mapping.xml:2223
 #, 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:2216
+#: basic_mapping.xml:2240
 #, no-c-format
 msgid ""
 "<literal>fetch</literal> (optional - defaults to <literal>join</literal>): "
@@ -4195,7 +4195,7 @@
 "ses super-classes."
 
 #. Tag: para
-#: basic_mapping.xml:2229
+#: basic_mapping.xml:2253
 #, no-c-format
 msgid ""
 "<literal>inverse</literal> (optional - defaults to <literal>false</"
@@ -4207,7 +4207,7 @@
 "mettre à jour les propriétés définies par cette jointure."
 
 #. Tag: para
-#: basic_mapping.xml:2236
+#: basic_mapping.xml:2260
 #, no-c-format
 msgid ""
 "<literal>optional</literal> (optional - defaults to <literal>false</"
@@ -4221,7 +4221,7 @@
 "toujours une jointure externe pour charger les propriétés."
 
 #. Tag: para
-#: basic_mapping.xml:2245
+#: basic_mapping.xml:2269
 #, no-c-format
 msgid ""
 "For example, the address information for a person can be mapped to a "
@@ -4232,7 +4232,7 @@
 "valeur pour toutes ses propriétés) :"
 
 #. Tag: programlisting
-#: basic_mapping.xml:2250
+#: basic_mapping.xml:2274
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Person\"\n"
@@ -4250,7 +4250,7 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:2252
+#: basic_mapping.xml:2276
 #, no-c-format
 msgid ""
 "This feature is often only useful for legacy data models, we recommend fewer "
@@ -4265,13 +4265,13 @@
 "dans une hiérarchie simple ainsi qu'il est expliqué plus tard."
 
 #. Tag: title
-#: basic_mapping.xml:2262
+#: basic_mapping.xml:2286
 #, no-c-format
 msgid "<title>key</title>"
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:2264
+#: basic_mapping.xml:2288
 #, no-c-format
 msgid ""
 "We've seen the <literal>&lt;key&gt;</literal> element crop up a few times "
@@ -4286,7 +4286,7 @@
 "d'origine."
 
 #. Tag: programlisting
-#: basic_mapping.xml:2280
+#: basic_mapping.xml:2304
 #, no-c-format
 msgid ""
 "<![CDATA[<key\n"
@@ -4300,7 +4300,7 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:2291
+#: basic_mapping.xml:2315
 #, no-c-format
 msgid ""
 "<literal>on-delete</literal> (optional, defaults to <literal>noaction</"
@@ -4312,7 +4312,7 @@
 "possibilité au niveau base de données de suppression en cascade."
 
 #. Tag: para
-#: basic_mapping.xml:2298
+#: basic_mapping.xml:2322
 #, no-c-format
 msgid ""
 "<literal>property-ref</literal> (optional): Specifies that the foreign key "
@@ -4324,7 +4324,7 @@
 "d'origine (Pour les données de systèmes legacy)."
 
 #. Tag: para
-#: basic_mapping.xml:2305
+#: basic_mapping.xml:2329
 #, no-c-format
 msgid ""
 "<literal>not-null</literal> (optional): Specifies that the foreign key "
@@ -4336,7 +4336,7 @@
 "fait partie de la clef primaire)."
 
 #. Tag: para
-#: basic_mapping.xml:2312
+#: basic_mapping.xml:2336
 #, no-c-format
 msgid ""
 "<literal>update</literal> (optional): Specifies that the foreign key should "
@@ -4348,7 +4348,7 @@
 "clef primaire)."
 
 #. Tag: para
-#: basic_mapping.xml:2319
+#: basic_mapping.xml:2343
 #, no-c-format
 msgid ""
 "<literal>unique</literal> (optional): Specifies that the foreign key should "
@@ -4360,7 +4360,7 @@
 "la clef primaire)."
 
 #. Tag: para
-#: basic_mapping.xml:2327
+#: basic_mapping.xml:2351
 #, no-c-format
 msgid ""
 "We recommend that for systems where delete performance is important, all "
@@ -4379,7 +4379,7 @@
 "versionnées."
 
 #. Tag: para
-#: basic_mapping.xml:2335
+#: basic_mapping.xml:2359
 #, no-c-format
 msgid ""
 "The <literal>not-null</literal> and <literal>update</literal> attributes are "
@@ -4395,13 +4395,13 @@
 "<literal>&lt;key not-null=\"true\"&gt;</literal>."
 
 #. Tag: title
-#: basic_mapping.xml:2345
+#: basic_mapping.xml:2369
 #, no-c-format
 msgid "column and formula elements"
 msgstr "éléments column et formula"
 
 #. Tag: para
-#: basic_mapping.xml:2346
+#: basic_mapping.xml:2370
 #, no-c-format
 msgid ""
 "Any mapping element which accepts a <literal>column</literal> attribute will "
@@ -4415,7 +4415,7 @@
 "l'attribut <literal>formula</literal>."
 
 #. Tag: programlisting
-#: basic_mapping.xml:2352
+#: basic_mapping.xml:2376
 #, no-c-format
 msgid ""
 "<![CDATA[<column\n"
@@ -4433,13 +4433,13 @@
 msgstr ""
 
 #. Tag: programlisting
-#: basic_mapping.xml:2354
+#: basic_mapping.xml:2378
 #, no-c-format
 msgid "<![CDATA[<formula>SQL expression</formula>]]>"
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:2356
+#: basic_mapping.xml:2380
 #, no-c-format
 msgid ""
 "<literal>column</literal> and <literal>formula</literal> attributes may even "
@@ -4452,7 +4452,7 @@
 "exotiques."
 
 #. Tag: programlisting
-#: basic_mapping.xml:2362
+#: basic_mapping.xml:2386
 #, no-c-format
 msgid ""
 "<![CDATA[<many-to-one name=\"homeAddress\" class=\"Address\"\n"
@@ -4463,13 +4463,13 @@
 msgstr ""
 
 #. Tag: title
-#: basic_mapping.xml:2367
+#: basic_mapping.xml:2391
 #, no-c-format
 msgid "import"
 msgstr "import"
 
 #. Tag: para
-#: basic_mapping.xml:2369
+#: basic_mapping.xml:2393
 #, no-c-format
 msgid ""
 "Suppose your application has two persistent classes with the same name, and "
@@ -4486,13 +4486,13 @@
 "mappées explicitement."
 
 #. Tag: programlisting
-#: basic_mapping.xml:2376
+#: basic_mapping.xml:2400
 #, no-c-format
 msgid "<![CDATA[<import class=\"java.lang.Object\" rename=\"Universe\"/>]]>"
 msgstr ""
 
 #. Tag: programlisting
-#: basic_mapping.xml:2383
+#: basic_mapping.xml:2407
 #, no-c-format
 msgid ""
 "<![CDATA[<import\n"
@@ -4502,7 +4502,7 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:2386
+#: basic_mapping.xml:2410
 #, no-c-format
 msgid ""
 "<literal>class</literal>: The fully qualified class name of of any Java "
@@ -4510,7 +4510,7 @@
 msgstr "<literal>class</literal> : Nom Java complet de la classe."
 
 #. Tag: para
-#: basic_mapping.xml:2391
+#: basic_mapping.xml:2415
 #, no-c-format
 msgid ""
 "<literal>rename</literal> (optional - defaults to the unqualified class "
@@ -4520,13 +4520,13 @@
 "Java (sans package)) : Nom pouvant être utilisé dans le langage de requête."
 
 #. Tag: title
-#: basic_mapping.xml:2402
+#: basic_mapping.xml:2426
 #, no-c-format
 msgid "<title>any</title>"
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:2404
+#: basic_mapping.xml:2428
 #, no-c-format
 msgid ""
 "There is one further type of property mapping. The <literal>&lt;any&gt;</"
@@ -4550,7 +4550,7 @@
 "utilisateur, etc...)."
 
 #. Tag: para
-#: basic_mapping.xml:2414
+#: basic_mapping.xml:2438
 #, no-c-format
 msgid ""
 "The <literal>meta-type</literal> attribute lets the application specify a "
@@ -4566,7 +4566,7 @@
 "partir de valeurs du méta-type sur les noms des classes."
 
 #. Tag: programlisting
-#: basic_mapping.xml:2421
+#: basic_mapping.xml:2445
 #, no-c-format
 msgid ""
 "<![CDATA[<any name=\"being\" id-type=\"long\" meta-type=\"string\">\n"
@@ -4579,7 +4579,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: basic_mapping.xml:2432
+#: basic_mapping.xml:2456
 #, no-c-format
 msgid ""
 "<![CDATA[<any\n"
@@ -4600,19 +4600,19 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:2435
+#: basic_mapping.xml:2459
 #, 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:2440
+#: basic_mapping.xml:2464
 #, no-c-format
 msgid "<literal>id-type</literal>: the identifier type."
 msgstr "<literal>id-type</literal> : le type identifiant."
 
 #. Tag: para
-#: basic_mapping.xml:2445
+#: basic_mapping.xml:2469
 #, no-c-format
 msgid ""
 "<literal>meta-type</literal> (optional - defaults to <literal>string</"
@@ -4622,7 +4622,7 @@
 "literal>) : Tout type permis pour un mapping par discriminateur."
 
 #. Tag: para
-#: basic_mapping.xml:2451
+#: basic_mapping.xml:2475
 #, no-c-format
 msgid ""
 "<literal>cascade</literal> (optional- defaults to <literal>none</literal>): "
@@ -4632,7 +4632,7 @@
 "literal>) : le style de cascade."
 
 #. Tag: para
-#: basic_mapping.xml:2463
+#: basic_mapping.xml:2487
 #, no-c-format
 msgid ""
 "<literal>optimistic-lock</literal> (optional - defaults to <literal>true</"
@@ -4646,19 +4646,19 @@
 "incrément de version doit avoir lieu quand cette propriété est marquée dirty."
 
 #. Tag: title
-#: basic_mapping.xml:2478
+#: basic_mapping.xml:2502
 #, no-c-format
 msgid "Hibernate Types"
 msgstr "Hibernate Types"
 
 #. Tag: title
-#: basic_mapping.xml:2481
+#: basic_mapping.xml:2505
 #, no-c-format
 msgid "Entities and values"
 msgstr "Entités et valeurs"
 
 #. Tag: para
-#: basic_mapping.xml:2483
+#: basic_mapping.xml:2507
 #, no-c-format
 msgid ""
 "To understand the behaviour of various Java language-level objects with "
@@ -4668,7 +4668,7 @@
 "service de persistance, nous avons besoin de les classer en deux groupes :"
 
 #. Tag: para
-#: basic_mapping.xml:2488
+#: basic_mapping.xml:2512
 #, no-c-format
 msgid ""
 "An <emphasis>entity</emphasis> exists independently of any other objects "
@@ -4693,7 +4693,7 @@
 "partagées. Elles peuvent aussi être versionnées."
 
 #. Tag: para
-#: basic_mapping.xml:2499
+#: basic_mapping.xml:2523
 #, no-c-format
 msgid ""
 "An entity's persistent state consists of references to other entities and "
@@ -4718,7 +4718,7 @@
 "entités ou collections."
 
 #. Tag: para
-#: basic_mapping.xml:2510
+#: basic_mapping.xml:2534
 #, no-c-format
 msgid ""
 "Up until now, we've been using the term \"persistent class\" to refer to "
@@ -4748,14 +4748,14 @@
 "value type."
 
 #. Tag: para
-#: basic_mapping.xml:2524
+#: basic_mapping.xml:2548
 #, no-c-format
 msgid "We'll revisit both concepts throughout the documentation."
 msgstr ""
 "Nous nous pencherons sur ces deux concepts tout au long de la documentation."
 
 #. Tag: para
-#: basic_mapping.xml:2528
+#: basic_mapping.xml:2552
 #, no-c-format
 msgid ""
 "The challenge is to map the Java type system (and the developers' definition "
@@ -4784,7 +4784,7 @@
 "tard."
 
 #. Tag: para
-#: basic_mapping.xml:2541
+#: basic_mapping.xml:2565
 #, no-c-format
 msgid "All built-in Hibernate types except collections support null semantics."
 msgstr ""
@@ -4792,13 +4792,13 @@
 "autorisent la valeur null."
 
 #. Tag: title
-#: basic_mapping.xml:2548
+#: basic_mapping.xml:2572
 #, no-c-format
 msgid "Basic value types"
 msgstr "Basic value types"
 
 #. Tag: para
-#: basic_mapping.xml:2550
+#: basic_mapping.xml:2574
 #, fuzzy, no-c-format
 msgid ""
 "The built-in <emphasis>basic mapping types</emphasis> may be roughly "
@@ -4808,7 +4808,7 @@
 "grossièrement être rangés dans les catégories suivantes : <placeholder-1/>"
 
 #. Tag: literal
-#: basic_mapping.xml:2555
+#: basic_mapping.xml:2579
 #, no-c-format
 msgid ""
 "integer, long, short, float, double, character, byte, boolean, yes_no, "
@@ -4818,7 +4818,7 @@
 "true_false"
 
 #. Tag: para
-#: basic_mapping.xml:2558
+#: basic_mapping.xml:2582
 #, no-c-format
 msgid ""
 "Type mappings from Java primitives or wrapper classes to appropriate (vendor-"
@@ -4833,13 +4833,13 @@
 "<literal>java.lang.Boolean</literal>."
 
 #. Tag: literal
-#: basic_mapping.xml:2567
+#: basic_mapping.xml:2591
 #, no-c-format
 msgid "string"
 msgstr "string"
 
 #. Tag: para
-#: basic_mapping.xml:2569
+#: basic_mapping.xml:2593
 #, no-c-format
 msgid ""
 "A type mapping from <literal>java.lang.String</literal> to <literal>VARCHAR</"
@@ -4849,13 +4849,13 @@
 "<literal>VARCHAR</literal> (ou le <literal>VARCHAR2</literal> Oracle)."
 
 #. Tag: literal
-#: basic_mapping.xml:2576
+#: basic_mapping.xml:2600
 #, no-c-format
 msgid "date, time, timestamp"
 msgstr "date, time, timestamp"
 
 #. Tag: para
-#: basic_mapping.xml:2578
+#: basic_mapping.xml:2602
 #, no-c-format
 msgid ""
 "Type mappings from <literal>java.util.Date</literal> and its subclasses to "
@@ -4867,13 +4867,13 @@
 "<literal>TIMESTAMP</literal> (ou équivalent)."
 
 #. Tag: literal
-#: basic_mapping.xml:2586
+#: basic_mapping.xml:2610
 #, no-c-format
 msgid "calendar, calendar_date"
 msgstr "calendar, calendar_date"
 
 #. Tag: para
-#: basic_mapping.xml:2588
+#: basic_mapping.xml:2612
 #, no-c-format
 msgid ""
 "Type mappings from <literal>java.util.Calendar</literal> to SQL types "
@@ -4883,13 +4883,13 @@
 "SQL <literal>TIMESTAMP</literal> et <literal>DATE</literal> (ou équivalent)."
 
 #. Tag: literal
-#: basic_mapping.xml:2596
+#: basic_mapping.xml:2620
 #, no-c-format
 msgid "big_decimal, big_integer"
 msgstr "big_decimal, big_integer"
 
 #. Tag: para
-#: basic_mapping.xml:2598
+#: basic_mapping.xml:2622
 #, no-c-format
 msgid ""
 "Type mappings from <literal>java.math.BigDecimal</literal> and <literal>java."
@@ -4901,13 +4901,13 @@
 "le <literal>NUMBER</literal> Oracle)."
 
 #. Tag: literal
-#: basic_mapping.xml:2606
+#: basic_mapping.xml:2630
 #, no-c-format
 msgid "locale, timezone, currency"
 msgstr "locale, timezone, currency"
 
 #. Tag: para
-#: basic_mapping.xml:2608
+#: basic_mapping.xml:2632
 #, no-c-format
 msgid ""
 "Type mappings from <literal>java.util.Locale</literal>, <literal>java.util."
@@ -4925,13 +4925,13 @@
 "sont mappées sur leur <literal>ID</literal>."
 
 #. Tag: literal
-#: basic_mapping.xml:2620
+#: basic_mapping.xml:2644
 #, fuzzy, no-c-format
 msgid "<literal>class</literal>"
 msgstr "<literal>all</literal> vérifie toutes les colonnes"
 
 #. Tag: para
-#: basic_mapping.xml:2622
+#: basic_mapping.xml:2646
 #, no-c-format
 msgid ""
 "A type mapping from <literal>java.lang.Class</literal> to <literal>VARCHAR</"
@@ -4943,25 +4943,25 @@
 "objet <literal>Class</literal> est mappé sur son nom Java complet."
 
 #. Tag: literal
-#: basic_mapping.xml:2630
+#: basic_mapping.xml:2654
 #, no-c-format
 msgid "binary"
 msgstr "binary"
 
 #. Tag: para
-#: basic_mapping.xml:2632
+#: basic_mapping.xml:2656
 #, 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:2638
+#: basic_mapping.xml:2662
 #, no-c-format
 msgid "text"
 msgstr "text"
 
 #. Tag: para
-#: basic_mapping.xml:2640
+#: basic_mapping.xml:2664
 #, no-c-format
 msgid ""
 "Maps long Java strings to a SQL <literal>CLOB</literal> or <literal>TEXT</"
@@ -4971,13 +4971,13 @@
 "<literal>CLOB</literal> ou <literal>TEXT</literal>."
 
 #. Tag: literal
-#: basic_mapping.xml:2647
+#: basic_mapping.xml:2671
 #, no-c-format
 msgid "serializable"
 msgstr "serializable"
 
 #. Tag: para
-#: basic_mapping.xml:2649
+#: basic_mapping.xml:2673
 #, no-c-format
 msgid ""
 "Maps serializable Java types to an appropriate SQL binary type. You may also "
@@ -4990,13 +4990,13 @@
 "défaut un type de base."
 
 #. Tag: literal
-#: basic_mapping.xml:2658
+#: basic_mapping.xml:2682
 #, no-c-format
 msgid "clob, blob"
 msgstr "clob, blob"
 
 #. Tag: para
-#: basic_mapping.xml:2660
+#: basic_mapping.xml:2684
 #, no-c-format
 msgid ""
 "Type mappings for the JDBC classes <literal>java.sql.Clob</literal> and "
@@ -5011,7 +5011,7 @@
 "pilotes est moyennement bonne)."
 
 #. Tag: literal
-#: basic_mapping.xml:2670
+#: basic_mapping.xml:2694
 #, no-c-format
 msgid ""
 "imm_date, imm_time, imm_timestamp, imm_calendar, imm_calendar_date, "
@@ -5021,7 +5021,7 @@
 "imm_serializable, imm_binary"
 
 #. Tag: para
-#: basic_mapping.xml:2674
+#: basic_mapping.xml:2698
 #, no-c-format
 msgid ""
 "Type mappings for what are usually considered mutable Java types, where "
@@ -5041,7 +5041,7 @@
 "doit assigner un nouvel (non identique) objet à la propriété."
 
 #. Tag: para
-#: basic_mapping.xml:2689
+#: basic_mapping.xml:2713
 #, no-c-format
 msgid ""
 "Unique identifiers of entities and collections may be of any basic type "
@@ -5054,7 +5054,7 @@
 "composites sont aussi permis, voir plus bas)."
 
 #. Tag: para
-#: basic_mapping.xml:2695
+#: basic_mapping.xml:2719
 #, no-c-format
 msgid ""
 "The basic value types have corresponding <literal>Type</literal> constants "
@@ -5068,13 +5068,13 @@
 "<literal>string</literal>."
 
 #. Tag: title
-#: basic_mapping.xml:2704
+#: basic_mapping.xml:2728
 #, no-c-format
 msgid "Custom value types"
 msgstr "Types de valeur définis par l'utilisateur"
 
 #. Tag: para
-#: basic_mapping.xml:2706
+#: basic_mapping.xml:2730
 #, no-c-format
 msgid ""
 "It is relatively easy for developers to create their own value types. For "
@@ -5099,7 +5099,7 @@
 "literal>, <literal>SURNAME</literal>."
 
 #. Tag: para
-#: basic_mapping.xml:2717
+#: basic_mapping.xml:2741
 #, no-c-format
 msgid ""
 "To implement a custom type, implement either <literal>org.hibernate."
@@ -5115,7 +5115,7 @@
 "DoubleStringType</literal> pour voir ce qu'il est possible de faire."
 
 #. Tag: programlisting
-#: basic_mapping.xml:2725
+#: basic_mapping.xml:2749
 #, no-c-format
 msgid ""
 "<![CDATA[<property name=\"twoStrings\" type=\"org.hibernate.test."
@@ -5126,7 +5126,7 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:2727
+#: basic_mapping.xml:2751
 #, no-c-format
 msgid ""
 "Notice the use of <literal>&lt;column&gt;</literal> tags to map a property "
@@ -5136,7 +5136,7 @@
 "mapper une propriété sur des colonnes multiples."
 
 #. Tag: para
-#: basic_mapping.xml:2732
+#: basic_mapping.xml:2756
 #, no-c-format
 msgid ""
 "The <literal>CompositeUserType</literal>, <literal>EnhancedUserType</"
@@ -5150,7 +5150,7 @@
 "spécialisées."
 
 #. Tag: para
-#: basic_mapping.xml:2738
+#: basic_mapping.xml:2762
 #, no-c-format
 msgid ""
 "You may even supply parameters to a <literal>UserType</literal> in the "
@@ -5167,7 +5167,7 @@
 "vos fichiers de mapping."
 
 #. Tag: programlisting
-#: basic_mapping.xml:2746
+#: basic_mapping.xml:2770
 #, no-c-format
 msgid ""
 "<![CDATA[<property name=\"priority\">\n"
@@ -5178,7 +5178,7 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:2748
+#: basic_mapping.xml:2772
 #, no-c-format
 msgid ""
 "The <literal>UserType</literal> can now retrieve the value for the parameter "
@@ -5190,7 +5190,7 @@
 "<literal>Properties</literal> qui lui est passé."
 
 #. Tag: para
-#: basic_mapping.xml:2753
+#: basic_mapping.xml:2777
 #, no-c-format
 msgid ""
 "If you use a certain <literal>UserType</literal> very often, it may be "
@@ -5206,7 +5206,7 @@
 "valeurs de paramètres par défaut si ce type est paramétré."
 
 #. Tag: programlisting
-#: basic_mapping.xml:2760
+#: basic_mapping.xml:2784
 #, no-c-format
 msgid ""
 "<![CDATA[<typedef class=\"com.mycompany.usertypes.DefaultValueIntegerType\" "
@@ -5216,13 +5216,13 @@
 msgstr ""
 
 #. Tag: programlisting
-#: basic_mapping.xml:2762
+#: basic_mapping.xml:2786
 #, no-c-format
 msgid "<![CDATA[<property name=\"priority\" type=\"default_zero\"/>]]>"
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:2764
+#: basic_mapping.xml:2788
 #, no-c-format
 msgid ""
 "It is also possible to override the parameters supplied in a typedef on a "
@@ -5232,7 +5232,7 @@
 "cas par cas en utilisant des paramètres type sur le mapping de la propriété."
 
 #. Tag: para
-#: basic_mapping.xml:2769
+#: basic_mapping.xml:2793
 #, no-c-format
 msgid ""
 "Even though Hibernate's rich range of built-in types and support for "
@@ -5257,13 +5257,13 @@
 "futurs dans votre façon de représenter des valeurs monétaires."
 
 #. Tag: title
-#: basic_mapping.xml:2785
+#: basic_mapping.xml:2809
 #, no-c-format
 msgid "Mapping a class more than once"
 msgstr "Mapper une classe plus d'une fois"
 
 #. Tag: para
-#: basic_mapping.xml:2786
+#: basic_mapping.xml:2810
 #, no-c-format
 msgid ""
 "It is possible to provide more than one mapping for a particular persistent "
@@ -5282,7 +5282,7 @@
 "nommées."
 
 #. Tag: programlisting
-#: basic_mapping.xml:2794
+#: basic_mapping.xml:2818
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Contract\" table=\"Contracts\"\n"
@@ -5305,7 +5305,7 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:2796
+#: basic_mapping.xml:2820
 #, no-c-format
 msgid ""
 "Notice how associations are now specified using <literal>entity-name</"
@@ -5315,13 +5315,13 @@
 "<literal>entity-name</literal> au lieu de <literal>class</literal>."
 
 #. Tag: title
-#: basic_mapping.xml:2804
+#: basic_mapping.xml:2828
 #, no-c-format
 msgid "SQL quoted identifiers"
 msgstr "SQL quoted identifiers"
 
 #. Tag: para
-#: basic_mapping.xml:2805
+#: basic_mapping.xml:2829
 #, no-c-format
 msgid ""
 "You may force Hibernate to quote an identifier in the generated SQL by "
@@ -5337,7 +5337,7 @@
 "mais des parenthèses pour SQL server et des backticks pour MySQL)."
 
 #. Tag: programlisting
-#: basic_mapping.xml:2812
+#: basic_mapping.xml:2836
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"LineItem\" table=\"`Line Item`\">\n"
@@ -5349,13 +5349,13 @@
 msgstr ""
 
 #. Tag: title
-#: basic_mapping.xml:2818
+#: basic_mapping.xml:2842
 #, no-c-format
 msgid "Metadata alternatives"
 msgstr "alternatives Metadata"
 
 #. Tag: para
-#: basic_mapping.xml:2820
+#: basic_mapping.xml:2844
 #, no-c-format
 msgid ""
 "XML isn't for everyone, and so there are some alternative ways to define O/R "
@@ -5365,13 +5365,13 @@
 "définir des metatda de mappings O/R dans Hibernate."
 
 #. Tag: title
-#: basic_mapping.xml:2825
+#: basic_mapping.xml:2849
 #, no-c-format
 msgid "Using XDoclet markup"
 msgstr "utilisation de XDoclet"
 
 #. Tag: para
-#: basic_mapping.xml:2827
+#: basic_mapping.xml:2851
 #, no-c-format
 msgid ""
 "Many Hibernate users prefer to embed mapping information directly in "
@@ -5388,7 +5388,7 @@
 "<literal>Cat</literal> avec des mappings XDoclet."
 
 #. Tag: programlisting
-#: basic_mapping.xml:2834
+#: basic_mapping.xml:2858
 #, no-c-format
 msgid ""
 "<![CDATA[package eg;\n"
@@ -5498,20 +5498,20 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:2836
+#: basic_mapping.xml:2860
 #, no-c-format
 msgid "See the Hibernate web site 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:2843
+#: basic_mapping.xml:2867
 #, no-c-format
 msgid "Using JDK 5.0 Annotations"
 msgstr "Utilisation des annotations JDK 5.0"
 
 #. Tag: para
-#: basic_mapping.xml:2845
+#: basic_mapping.xml:2869
 #, no-c-format
 msgid ""
 "JDK 5.0 introduced XDoclet-style annotations at the language level, type-"
@@ -5538,13 +5538,13 @@
 "télécharger. EJB3 (JSR-220) et les métadata Hibernate3 sont supportés."
 
 #. Tag: para
-#: basic_mapping.xml:2856
+#: basic_mapping.xml:2880
 #, 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:2860
+#: basic_mapping.xml:2884
 #, no-c-format
 msgid ""
 "<![CDATA[@Entity(access = AccessType.FIELD)\n"
@@ -5572,7 +5572,7 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:2862
+#: basic_mapping.xml:2886
 #, no-c-format
 msgid ""
 "Note that support for JDK 5.0 Annotations (and JSR-220) is still work in "
@@ -5584,13 +5584,13 @@
 "pour plus de détails."
 
 #. Tag: title
-#: basic_mapping.xml:2871
+#: basic_mapping.xml:2895
 #, no-c-format
 msgid "Generated Properties"
 msgstr "Propriétés générées"
 
 #. Tag: para
-#: basic_mapping.xml:2872
+#: basic_mapping.xml:2896
 #, no-c-format
 msgid ""
 "Generated properties are properties which have their values generated by the "
@@ -5613,7 +5613,7 @@
 "pour récupérer les valeurs générées."
 
 #. Tag: para
-#: basic_mapping.xml:2881
+#: basic_mapping.xml:2905
 #, no-c-format
 msgid ""
 "Properties marked as generated must additionally be non-insertable and non-"
@@ -5629,7 +5629,7 @@
 "\">simple properties</xref> peuvent être marqués comme générées."
 
 #. Tag: para
-#: basic_mapping.xml:2888
+#: basic_mapping.xml:2912
 #, no-c-format
 msgid ""
 "<literal>never</literal> (the default) - means that the given property value "
@@ -5639,7 +5639,7 @@
 "n'est pas générée dans la base de données."
 
 #. Tag: para
-#: basic_mapping.xml:2892
+#: basic_mapping.xml:2916
 #, no-c-format
 msgid ""
 "<literal>insert</literal> - states that the given property value is "
@@ -5658,7 +5658,7 @@
 "comme générées, cette option n'est pas disponible à cet endroit..."
 
 #. Tag: para
-#: basic_mapping.xml:2900
+#: basic_mapping.xml:2924
 #, no-c-format
 msgid ""
 "<literal>always</literal> - states that the property value is generated both "
@@ -5668,13 +5668,13 @@
 "générée à l'insert comme aux updates."
 
 #. Tag: title
-#: basic_mapping.xml:2907
+#: basic_mapping.xml:2931
 #, no-c-format
 msgid "Auxiliary Database Objects"
 msgstr "Objets auxiliaires de la base de données"
 
 #. Tag: para
-#: basic_mapping.xml:2908
+#: basic_mapping.xml:2932
 #, no-c-format
 msgid ""
 "Allows CREATE and DROP of arbitrary database objects, in conjunction with "
@@ -5695,7 +5695,7 @@
 "deux modes pour définir les objets auxiliaires de base de données..."
 
 #. Tag: para
-#: basic_mapping.xml:2917
+#: basic_mapping.xml:2941
 #, no-c-format
 msgid ""
 "The first mode is to explicitly list the CREATE and DROP commands out in the "
@@ -5705,7 +5705,7 @@
 "dans le fichier de mapping:"
 
 #. Tag: programlisting
-#: basic_mapping.xml:2921
+#: basic_mapping.xml:2945
 #, no-c-format
 msgid ""
 "<![CDATA[<hibernate-mapping>\n"
@@ -5718,7 +5718,7 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:2922
+#: basic_mapping.xml:2946
 #, no-c-format
 msgid ""
 "The second mode is to supply a custom class which knows how to construct the "
@@ -5731,7 +5731,7 @@
 "AuxiliaryDatabaseObject</literal>."
 
 #. Tag: programlisting
-#: basic_mapping.xml:2927
+#: basic_mapping.xml:2951
 #, no-c-format
 msgid ""
 "<![CDATA[<hibernate-mapping>\n"
@@ -5743,7 +5743,7 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:2928
+#: basic_mapping.xml:2952
 #, no-c-format
 msgid ""
 "Additionally, these database objects can be optionally scoped such that they "
@@ -5753,7 +5753,7 @@
 "optionnellement traités selon l'utilisation de dialectes particuliers.."
 
 #. Tag: programlisting
-#: basic_mapping.xml:2932
+#: basic_mapping.xml:2956
 #, no-c-format
 msgid ""
 "<![CDATA[<hibernate-mapping>\n"

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	2008-08-14 15:28:13 UTC (rev 15066)
+++ core/trunk/documentation/manual/src/main/docbook/fr-FR/content/batch.po	2008-08-14 15:35:40 UTC (rev 15067)
@@ -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: 2008-08-14 15:28+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,13 +11,13 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: batch.xml:5
+#: batch.xml:29
 #, no-c-format
 msgid "Batch processing"
 msgstr "Traitement par paquet"
 
 #. Tag: para
-#: batch.xml:7
+#: batch.xml:31
 #, no-c-format
 msgid ""
 "A naive approach to inserting 100 000 rows in the database using Hibernate "
@@ -27,7 +27,7 @@
 "utilisant Hibernate pourrait ressembler à ça :"
 
 #. Tag: programlisting
-#: batch.xml:12
+#: batch.xml:36
 #, no-c-format
 msgid ""
 "<![CDATA[Session session = sessionFactory.openSession();\n"
@@ -41,7 +41,7 @@
 msgstr ""
 
 #. Tag: para
-#: batch.xml:14
+#: batch.xml:38
 #, no-c-format
 msgid ""
 "This would fall over with an <literal>OutOfMemoryException</literal> "
@@ -55,7 +55,7 @@
 "insérées dans le cache de second niveau."
 
 #. Tag: para
-#: batch.xml:20
+#: batch.xml:44
 #, no-c-format
 msgid ""
 "In this chapter we'll show you how to avoid this problem. First, however, if "
@@ -71,13 +71,13 @@
 "50) :"
 
 #. Tag: programlisting
-#: batch.xml:27
+#: batch.xml:51
 #, no-c-format
 msgid "<![CDATA[hibernate.jdbc.batch_size 20]]>"
 msgstr ""
 
 #. Tag: para
-#: batch.xml:29
+#: batch.xml:53
 #, no-c-format
 msgid ""
 "Note that Hibernate disables insert batching at the JDBC level transparently "
@@ -87,7 +87,7 @@
 "où l'interaction avec le cache de second niveau est complètement désactivé :"
 
 #. Tag: para
-#: batch.xml:34
+#: batch.xml:58
 #, no-c-format
 msgid ""
 "You also might like to do this kind of work in a process where interaction "
@@ -95,13 +95,13 @@
 msgstr "Insertions en paquet"
 
 #. Tag: programlisting
-#: batch.xml:39
+#: batch.xml:63
 #, no-c-format
 msgid "<![CDATA[hibernate.cache.use_second_level_cache false]]>"
 msgstr ""
 
 #. Tag: para
-#: batch.xml:41
+#: batch.xml:65
 #, no-c-format
 msgid ""
 "However, this is not absolutely necessary, since we can explicitly set the "
@@ -113,13 +113,13 @@
 "literal> sur la session, pour contrôler la taille du cache de premier niveau."
 
 #. Tag: title
-#: batch.xml:47
+#: batch.xml:71
 #, no-c-format
 msgid "Batch inserts"
 msgstr "Paquet de mises à jour"
 
 #. Tag: para
-#: batch.xml:49
+#: batch.xml:73
 #, no-c-format
 msgid ""
 "When making new objects persistent, you must <literal>flush()</literal> and "
@@ -132,7 +132,7 @@
 "de lignes de données."
 
 #. Tag: programlisting
-#: batch.xml:55
+#: batch.xml:79
 #, no-c-format
 msgid ""
 "<![CDATA[Session session = sessionFactory.openSession();\n"
@@ -153,13 +153,13 @@
 msgstr ""
 
 #. Tag: title
-#: batch.xml:60
+#: batch.xml:84
 #, no-c-format
 msgid "Batch updates"
 msgstr "L'interface StatelessSession"
 
 #. Tag: para
-#: batch.xml:62
+#: batch.xml:86
 #, no-c-format
 msgid ""
 "For retrieving and updating data the same ideas apply. In addition, you need "
@@ -184,7 +184,7 @@
 "proche de la couche JDBC sous-jacente."
 
 #. Tag: programlisting
-#: batch.xml:68
+#: batch.xml:92
 #, no-c-format
 msgid ""
 "<![CDATA[Session session = sessionFactory.openSession();\n"
@@ -209,7 +209,7 @@
 msgstr ""
 
 #. Tag: title
-#: batch.xml:73
+#: batch.xml:97
 #, no-c-format
 msgid "The StatelessSession interface"
 msgstr ""
@@ -218,7 +218,7 @@
 "sont jamais associées à un contexte de persistance."
 
 #. Tag: para
-#: batch.xml:74
+#: batch.xml:98
 #, no-c-format
 msgid ""
 "Alternatively, Hibernate provides a command-oriented API that may be used "
@@ -246,7 +246,7 @@
 "par l'interface <literal>Session</literal>."
 
 #. Tag: programlisting
-#: batch.xml:89
+#: batch.xml:113
 #, no-c-format
 msgid ""
 "<![CDATA[StatelessSession session = sessionFactory.openStatelessSession();\n"
@@ -265,7 +265,7 @@
 msgstr ""
 
 #. Tag: para
-#: batch.xml:91
+#: batch.xml:115
 #, no-c-format
 msgid ""
 "Note that in this code example, the <literal>Customer</literal> instances "
@@ -274,7 +274,7 @@
 msgstr "Opérations de style DML"
 
 #. Tag: para
-#: batch.xml:97
+#: batch.xml:121
 #, no-c-format
 msgid ""
 "The <literal>insert(), update()</literal> and <literal>delete()</literal> "
@@ -297,7 +297,7 @@
 "(<xref linkend=\"queryhql\">HQL</xref>)."
 
 #. Tag: title
-#: batch.xml:110
+#: batch.xml:134
 #, no-c-format
 msgid "DML-style operations"
 msgstr ""
@@ -307,7 +307,7 @@
 "noter :"
 
 #. Tag: para
-#: batch.xml:112
+#: batch.xml:136
 #, no-c-format
 msgid ""
 "As already discussed, automatic and transparent object/relational mapping is "
@@ -322,7 +322,7 @@
 msgstr "Dans la clause from, le mot-clef FROM est optionnel"
 
 #. Tag: para
-#: batch.xml:122
+#: batch.xml:146
 #, no-c-format
 msgid ""
 "The pseudo-syntax for <literal>UPDATE</literal> and <literal>DELETE</"
@@ -336,7 +336,7 @@
 "n'importe quelle référence de propriété d'être qualifiée."
 
 #. Tag: para
-#: batch.xml:130
+#: batch.xml:154
 #, no-c-format
 msgid "In the from-clause, the FROM keyword is optional"
 msgstr ""
@@ -345,7 +345,7 @@
 "les sous-requêtes, elles-mêmes, peuvent contenir des jointures."
 
 #. Tag: para
-#: batch.xml:135
+#: batch.xml:159
 #, no-c-format
 msgid ""
 "There can only be a single entity named in the from-clause; it can "
@@ -355,7 +355,7 @@
 msgstr "La clause where est aussi optionnelle."
 
 #. Tag: para
-#: batch.xml:143
+#: batch.xml:167
 #, no-c-format
 msgid ""
 "No <link linkend=\"queryhql-joins-forms\">joins</link> (either implicit or "
@@ -368,7 +368,7 @@
 "</literal> de JDBC) :"
 
 #. Tag: para
-#: batch.xml:150
+#: batch.xml:174
 #, no-c-format
 msgid "The where-clause is also optional."
 msgstr ""
@@ -376,7 +376,7 @@
 "<literal>Query.executeUpdate()</literal> :"
 
 #. Tag: para
-#: batch.xml:156
+#: batch.xml:180
 #, no-c-format
 msgid ""
 "As an example, to execute an HQL <literal>UPDATE</literal>, use the "
@@ -398,7 +398,7 @@
 "hiérarchie d'héritage."
 
 #. Tag: programlisting
-#: batch.xml:162
+#: batch.xml:186
 #, no-c-format
 msgid ""
 "<![CDATA[Session session = sessionFactory.openSession();\n"
@@ -417,7 +417,7 @@
 msgstr ""
 
 #. Tag: para
-#: batch.xml:164
+#: batch.xml:188
 #, no-c-format
 msgid ""
 "HQL <literal>UPDATE</literal> statements, by default do not effect the <link "
@@ -435,7 +435,7 @@
 "Quelques points sont à noter :"
 
 #. Tag: programlisting
-#: batch.xml:174
+#: batch.xml:198
 #, no-c-format
 msgid ""
 "<![CDATA[Session session = sessionFactory.openSession();\n"
@@ -451,7 +451,7 @@
 msgstr ""
 
 #. Tag: para
-#: batch.xml:176
+#: batch.xml:200
 #, no-c-format
 msgid ""
 "Note that custom version types (<literal>org.hibernate.usertype."
@@ -462,7 +462,7 @@
 "INSERT INTO ... VALUES ... ."
 
 #. Tag: para
-#: batch.xml:181
+#: batch.xml:205
 #, no-c-format
 msgid ""
 "To execute an HQL <literal>DELETE</literal>, use the same <literal>Query."
@@ -478,7 +478,7 @@
 "expressions <literal>INSERT</literal> par nature non polymorphiques."
 
 #. Tag: programlisting
-#: batch.xml:186
+#: batch.xml:210
 #, no-c-format
 msgid ""
 "<![CDATA[Session session = sessionFactory.openSession();\n"
@@ -494,7 +494,7 @@
 msgstr ""
 
 #. Tag: para
-#: batch.xml:188
+#: batch.xml:212
 #, no-c-format
 msgid ""
 "The <literal>int</literal> value returned by the <literal>Query.executeUpdate"
@@ -522,7 +522,7 @@
 "gérer la conversion."
 
 #. Tag: para
-#: batch.xml:199
+#: batch.xml:223
 #, no-c-format
 msgid ""
 "The pseudo-syntax for <literal>INSERT</literal> statements is: "
@@ -546,7 +546,7 @@
 "select."
 
 #. Tag: para
-#: batch.xml:207
+#: batch.xml:231
 #, no-c-format
 msgid ""
 "Only the INSERT INTO ... SELECT ... form is supported; not the INSERT "
@@ -561,7 +561,7 @@
 "VersionType</literal> est utilisée)."
 
 #. Tag: para
-#: batch.xml:210
+#: batch.xml:234
 #, no-c-format
 msgid ""
 "The properties_list is analogous to the <literal>column speficiation</"
@@ -574,7 +574,7 @@
 "Un exemple d'exécution d'une expression <literal>INSERT</literal> HQL :"
 
 #. Tag: para
-#: batch.xml:220
+#: batch.xml:244
 #, no-c-format
 msgid ""
 "select_statement can be any valid HQL select query, with the caveat that the "
@@ -590,7 +590,7 @@
 msgstr "translator-credits"
 
 #. Tag: para
-#: batch.xml:232
+#: batch.xml:256
 #, no-c-format
 msgid ""
 "For the id property, the insert statement gives you two options. You can "
@@ -609,7 +609,7 @@
 msgstr ""
 
 #. Tag: para
-#: batch.xml:247
+#: batch.xml:271
 #, no-c-format
 msgid ""
 "For properties mapped as either <literal>version</literal> or "
@@ -621,13 +621,13 @@
 msgstr ""
 
 #. Tag: para
-#: batch.xml:257
+#: batch.xml:281
 #, no-c-format
 msgid "An example HQL <literal>INSERT</literal> statement execution:"
 msgstr ""
 
 #. Tag: programlisting
-#: batch.xml:261
+#: batch.xml:285
 #, 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	2008-08-14 15:28:13 UTC (rev 15066)
+++ core/trunk/documentation/manual/src/main/docbook/fr-FR/content/best_practices.po	2008-08-14 15:35:40 UTC (rev 15067)
@@ -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: 2008-08-14 15:28+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,13 +11,13 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: best_practices.xml:5
+#: best_practices.xml:29
 #, no-c-format
 msgid "Best Practices"
 msgstr "Meilleures pratiques"
 
 #. Tag: term
-#: best_practices.xml:9
+#: best_practices.xml:33
 #, no-c-format
 msgid ""
 "Write fine-grained classes and map them using <literal>&lt;component&gt;</"
@@ -27,7 +27,7 @@
 "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</"
@@ -40,13 +40,13 @@
 "permet la réutilisation du code et simplifie la maintenance."
 
 #. Tag: term
-#: best_practices.xml:19
+#: best_practices.xml:43
 #, 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:21
+#: best_practices.xml:45
 #, no-c-format
 msgid ""
 "Hibernate makes identifier properties optional. There are all sorts of "
@@ -59,13 +59,13 @@
 "sans connotation métier)."
 
 #. Tag: term
-#: best_practices.xml:29
+#: best_practices.xml:53
 #, no-c-format
 msgid "Identify natural keys."
 msgstr "Identifiez les clefs naturelles."
 
 #. 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,13 +79,13 @@
 "composent la clef naturelle."
 
 #. Tag: term
-#: best_practices.xml:39
+#: best_practices.xml:63
 #, 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:41
+#: best_practices.xml:65
 #, no-c-format
 msgid ""
 "Don't use a single monolithic mapping document. Map <literal>com.eg.Foo</"
@@ -97,25 +97,25 @@
 "tout son sens lors d'un travail en équipe."
 
 #. Tag: term
-#: best_practices.xml:49
+#: best_practices.xml:73
 #, no-c-format
 msgid "Load mappings as resources."
 msgstr "Chargez les mappings comme des ressources."
 
 #. Tag: para
-#: best_practices.xml:51
+#: best_practices.xml:75
 #, no-c-format
 msgid "Deploy the mappings along with the classes they map."
 msgstr "Déployez les mappings en même temps que les classes qu'ils mappent."
 
 #. Tag: term
-#: best_practices.xml:57
+#: best_practices.xml:81
 #, no-c-format
 msgid "Consider externalising query strings."
 msgstr "Pensez à externaliser les chaînes de caractères."
 
 #. Tag: para
-#: best_practices.xml:59
+#: best_practices.xml:83
 #, no-c-format
 msgid ""
 "This is a good practice if your queries call non-ANSI-standard SQL "
@@ -127,13 +127,13 @@
 "mapping rendra votre application plus portable."
 
 #. Tag: term
-#: best_practices.xml:67
+#: best_practices.xml:91
 #, no-c-format
 msgid "Use bind variables."
 msgstr "Utilisez les variables \"bindées\"."
 
 #. Tag: para
-#: best_practices.xml:69
+#: best_practices.xml:93
 #, no-c-format
 msgid ""
 "As in JDBC, always replace non-constant values by \"?\". Never use string "
@@ -146,13 +146,13 @@
 "paramètres nommés dans les requêtes."
 
 #. Tag: term
-#: best_practices.xml:77
+#: best_practices.xml:101
 #, no-c-format
 msgid "Don't manage your own JDBC connections."
 msgstr "Ne gérez pas vous même les connexions JDBC."
 
 #. Tag: para
-#: best_practices.xml:79
+#: best_practices.xml:103
 #, no-c-format
 msgid ""
 "Hibernate lets the application manage JDBC connections. This approach should "
@@ -167,13 +167,13 @@
 "ConnectionProvider</literal>."
 
 #. Tag: term
-#: best_practices.xml:87
+#: best_practices.xml:111
 #, no-c-format
 msgid "Consider using a custom type."
 msgstr "Pensez à utiliser les types utilisateurs."
 
 #. Tag: para
-#: best_practices.xml:89
+#: best_practices.xml:113
 #, no-c-format
 msgid ""
 "Suppose you have a Java type, say from some library, that needs to be "
@@ -189,13 +189,13 @@
 "l'implémentation des transformations vers / depuis les types Hibernate."
 
 #. Tag: term
-#: best_practices.xml:98
+#: best_practices.xml:122
 #, 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:100
+#: best_practices.xml:124
 #, no-c-format
 msgid ""
 "In performance-critical areas of the system, some kinds of operations might "
@@ -216,13 +216,13 @@
 "même gestion des connexions."
 
 #. Tag: term
-#: best_practices.xml:110
+#: best_practices.xml:134
 #, no-c-format
 msgid "Understand <literal>Session</literal> flushing."
 msgstr "Comprendre le flush de <literal>Session</literal>."
 
 #. Tag: para
-#: best_practices.xml:112
+#: best_practices.xml:136
 #, no-c-format
 msgid ""
 "From time to time the Session synchronizes its persistent state with the "
@@ -238,7 +238,7 @@
 "menées dans une transaction particulière."
 
 #. Tag: term
-#: best_practices.xml:121
+#: best_practices.xml:145
 #, no-c-format
 msgid "In a three tiered architecture, consider using detached objects."
 msgstr ""
@@ -246,7 +246,7 @@
 "<literal>saveOrUpdate()</literal>."
 
 #. Tag: para
-#: best_practices.xml:123
+#: best_practices.xml:147
 #, no-c-format
 msgid ""
 "When using a servlet / session bean architecture, you could pass persistent "
@@ -263,7 +263,7 @@
 "données."
 
 #. Tag: term
-#: best_practices.xml:132
+#: best_practices.xml:156
 #, no-c-format
 msgid "In a two tiered architecture, consider using long persistence contexts."
 msgstr ""
@@ -271,7 +271,7 @@
 "session."
 
 #. Tag: para
-#: best_practices.xml:134
+#: best_practices.xml:158
 #, no-c-format
 msgid ""
 "Database Transactions have to be as short as possible for best scalability. "
@@ -302,13 +302,13 @@
 "avec des données périmées."
 
 #. Tag: term
-#: best_practices.xml:148
+#: best_practices.xml:172
 #, no-c-format
 msgid "Don't treat exceptions as recoverable."
 msgstr "Considérez que les exceptions ne sont pas rattrapables."
 
 #. Tag: para
-#: best_practices.xml:150
+#: best_practices.xml:174
 #, no-c-format
 msgid ""
 "This is more of a necessary practice than a \"best\" practice. When an "
@@ -328,13 +328,13 @@
 "données, utilisez <literal>Session.get()</literal> ou un requête."
 
 #. Tag: term
-#: best_practices.xml:160
+#: best_practices.xml:184
 #, no-c-format
 msgid "Prefer lazy fetching for associations."
 msgstr "Préférez le chargement tardif des associations."
 
 #. Tag: para
-#: best_practices.xml:162
+#: best_practices.xml:186
 #, no-c-format
 msgid ""
 "Use eager fetching sparingly. Use proxies and lazy collections for most "
@@ -356,7 +356,7 @@
 "requête avec un <literal>left join fetch</literal>."
 
 #. Tag: term
-#: best_practices.xml:172
+#: best_practices.xml:196
 #, no-c-format
 msgid ""
 "Use the <emphasis>open session in view</emphasis> pattern, or a disciplined "
@@ -367,7 +367,7 @@
 "éviter des problèmes avec des données non rapatriées."
 
 #. Tag: para
-#: best_practices.xml:177
+#: best_practices.xml:201
 #, no-c-format
 msgid ""
 "Hibernate frees the developer from writing tedious <emphasis>Data Transfer "
@@ -398,13 +398,13 @@
 "à travers tout le processus de rendu de la vue."
 
 #. Tag: term
-#: best_practices.xml:191
+#: best_practices.xml:215
 #, 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:193
+#: best_practices.xml:217
 #, no-c-format
 msgid ""
 "Hide (Hibernate) data-access code behind an interface. Combine the "
@@ -422,13 +422,13 @@
 "pas valable pour une application avec cinq tables)."
 
 #. Tag: term
-#: best_practices.xml:203
+#: best_practices.xml:227
 #, no-c-format
 msgid "Don't use exotic association mappings."
 msgstr "N'utilisez pas d'associations de mapping exotiques."
 
 #. Tag: para
-#: best_practices.xml:205
+#: best_practices.xml:229
 #, no-c-format
 msgid ""
 "Good usecases for a real many-to-many associations are rare. Most of the "
@@ -448,13 +448,13 @@
 "c'est vraiment nécessaire."
 
 #. Tag: term
-#: best_practices.xml:215
+#: best_practices.xml:239
 #, no-c-format
 msgid "Prefer bidirectional associations."
 msgstr "Préférez les associations bidirectionnelles."
 
 #. 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/fr-FR/content/collection_mapping.po
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/fr-FR/content/collection_mapping.po	2008-08-14 15:28:13 UTC (rev 15066)
+++ core/trunk/documentation/manual/src/main/docbook/fr-FR/content/collection_mapping.po	2008-08-14 15:35:40 UTC (rev 15067)
@@ -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: 2008-08-14 15:28+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
-#: collection_mapping.xml:5
+#: collection_mapping.xml:29
 #, no-c-format
 msgid "Collection Mapping"
 msgstr "Mapping des collections"
 
 #. Tag: title
-#: collection_mapping.xml:8
+#: collection_mapping.xml:32
 #, no-c-format
 msgid "Persistent collections"
 msgstr "Collections persistantes"
 
 #. Tag: para
-#: collection_mapping.xml:10
+#: collection_mapping.xml:34
 #, no-c-format
 msgid ""
 "Hibernate requires that persistent collection-valued fields be declared as "
@@ -33,7 +33,7 @@
 "soient déclarés comme des types d'interface, par exemple :"
 
 #. Tag: programlisting
-#: collection_mapping.xml:15
+#: collection_mapping.xml:39
 #, no-c-format
 msgid ""
 "<![CDATA[public class Product {\n"
@@ -48,7 +48,7 @@
 msgstr ""
 
 #. Tag: para
-#: collection_mapping.xml:17
+#: collection_mapping.xml:41
 #, no-c-format
 msgid ""
 "The actual interface might be <literal>java.util.Set</literal>, "
@@ -67,7 +67,7 @@
 "literal>.)"
 
 #. Tag: para
-#: collection_mapping.xml:26
+#: collection_mapping.xml:50
 #, no-c-format
 msgid ""
 "Notice how we initialized the instance variable with an instance of "
@@ -87,7 +87,7 @@
 "à Hibernate de <literal>Set</literal>. Prenez garde aux erreurs :"
 
 #. Tag: programlisting
-#: collection_mapping.xml:36
+#: collection_mapping.xml:60
 #, no-c-format
 msgid ""
 "<![CDATA[Cat cat = new DomesticCat();\n"
@@ -102,7 +102,7 @@
 msgstr ""
 
 #. Tag: para
-#: collection_mapping.xml:38
+#: collection_mapping.xml:62
 #, no-c-format
 msgid ""
 "The persistent collections injected by Hibernate behave like "
@@ -116,7 +116,7 @@
 "<literal>ArrayList</literal>, selon le type de l'interface."
 
 #. Tag: para
-#: collection_mapping.xml:45
+#: collection_mapping.xml:69
 #, no-c-format
 msgid ""
 "Collections instances have the usual behavior of value types. They are "
@@ -140,7 +140,7 @@
 "collection vide."
 
 #. Tag: para
-#: collection_mapping.xml:56
+#: collection_mapping.xml:80
 #, no-c-format
 msgid ""
 "You shouldn't have to worry much about any of this. Use persistent "
@@ -153,15 +153,30 @@
 "bidirectionnelles (traitée plus loin)."
 
 #. Tag: title
-#: collection_mapping.xml:65
+#: collection_mapping.xml:89
 #, no-c-format
 msgid "Collection mappings"
 msgstr "Mapper une collection"
 
 #. Tag: para
-#: collection_mapping.xml:67
+#: 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."
+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 "
+"suggérons d'expérimenter avec l'outil de génération de schéma pour avoir une "
+"idée de comment traduire les différentes déclarations de mapping vers des "
+"table de la base de données."
+
+#. 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>."
@@ -172,7 +187,7 @@
 "literal>."
 
 #. Tag: programlisting
-#: collection_mapping.xml:73
+#: collection_mapping.xml:105
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Product\">\n"
@@ -185,7 +200,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;"
@@ -201,7 +216,7 @@
 "literal> est représentatif :"
 
 #. Tag: programlisting
-#: collection_mapping.xml:100
+#: collection_mapping.xml:132
 #, no-c-format
 msgid ""
 "<![CDATA[<map\n"
@@ -230,14 +245,14 @@
 msgstr ""
 
 #. Tag: para
-#: collection_mapping.xml:103
+#: collection_mapping.xml:135
 #, 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:108
+#: collection_mapping.xml:140
 #, no-c-format
 msgid ""
 "<literal>table</literal> (optional - defaults to property name) the name of "
@@ -248,7 +263,7 @@
 "many)"
 
 #. Tag: para
-#: collection_mapping.xml:114
+#: collection_mapping.xml:146
 #, no-c-format
 msgid ""
 "<literal>schema</literal> (optional) the name of a table schema to override "
@@ -258,7 +273,7 @@
 "schéma déclaré dans l'élément racine"
 
 #. Tag: para
-#: collection_mapping.xml:120
+#: collection_mapping.xml:152
 #, no-c-format
 msgid ""
 "<literal>lazy</literal> (optional - defaults to <literal>true</literal>) may "
@@ -273,7 +288,7 @@
 "pas la collection (approprié pour de très grosses collections)"
 
 #. Tag: para
-#: collection_mapping.xml:129
+#: collection_mapping.xml:161
 #, no-c-format
 msgid ""
 "<literal>inverse</literal> (optional - defaults to <literal>false</literal>) "
@@ -284,7 +299,7 @@
 "l'association bidirectionnelle"
 
 #. Tag: para
-#: collection_mapping.xml:135
+#: collection_mapping.xml:167
 #, no-c-format
 msgid ""
 "<literal>cascade</literal> (optional - defaults to <literal>none</literal>) "
@@ -294,7 +309,7 @@
 "literal>) : active les opérations de cascade vers les entités filles"
 
 #. Tag: para
-#: collection_mapping.xml:141
+#: collection_mapping.xml:173
 #, no-c-format
 msgid ""
 "<literal>sort</literal> (optional) specify a sorted collection with "
@@ -305,7 +320,7 @@
 "donnée (implémentant Comparator)"
 
 #. Tag: para
-#: collection_mapping.xml:147
+#: collection_mapping.xml:179
 #, no-c-format
 msgid ""
 "<literal>order-by</literal> (optional, JDK1.4 only) specify a table column "
@@ -319,7 +334,7 @@
 "en option <literal>asc</literal> ou <literal>desc</literal>"
 
 #. Tag: para
-#: collection_mapping.xml:154
+#: collection_mapping.xml:186
 #, no-c-format
 msgid ""
 "<literal>where</literal> (optional) specify an arbitrary SQL <literal>WHERE</"
@@ -332,7 +347,7 @@
 "données disponibles)"
 
 #. Tag: para
-#: collection_mapping.xml:161
+#: collection_mapping.xml:193
 #, no-c-format
 msgid ""
 "<literal>fetch</literal> (optional, defaults to <literal>select</literal>) "
@@ -345,7 +360,7 @@
 "séquentiels"
 
 #. Tag: para
-#: collection_mapping.xml:168
+#: collection_mapping.xml:200
 #, no-c-format
 msgid ""
 "<literal>batch-size</literal> (optional, defaults to <literal>1</literal>) "
@@ -356,7 +371,7 @@
 "instances de cette collection en initialisation tardive"
 
 #. Tag: para
-#: collection_mapping.xml:174
+#: collection_mapping.xml:206
 #, no-c-format
 msgid ""
 "<literal>access</literal> (optional - defaults to <literal>property</"
@@ -368,7 +383,7 @@
 "de la propriété"
 
 #. Tag: para
-#: collection_mapping.xml:180
+#: collection_mapping.xml:212
 #, no-c-format
 msgid ""
 "<literal>optimistic-lock</literal> (optional - defaults to <literal>true</"
@@ -382,7 +397,7 @@
 "un vers plusieurs, il est souvent raisonnable de désactiver ce paramètre)"
 
 #. Tag: para
-#: collection_mapping.xml:188
+#: collection_mapping.xml:220
 #, no-c-format
 msgid ""
 "<literal>mutable</literal> (optional - defaults to <literal>true</literal>): "
@@ -395,13 +410,13 @@
 "cas)"
 
 #. Tag: title
-#: collection_mapping.xml:198
+#: collection_mapping.xml:230
 #, no-c-format
 msgid "Collection foreign keys"
 msgstr "Les clefs étrangères d'une collection"
 
 #. Tag: para
-#: collection_mapping.xml:200
+#: collection_mapping.xml:232
 #, no-c-format
 msgid ""
 "Collection instances are distinguished in the database by the foreign key of "
@@ -417,7 +432,7 @@
 "collection est mappée par l'élément <literal>&lt;key&gt;</literal>."
 
 #. Tag: para
-#: collection_mapping.xml:208
+#: collection_mapping.xml:240
 #, no-c-format
 msgid ""
 "There may be a nullability constraint on the foreign key column. For most "
@@ -431,13 +446,13 @@
 "avoir besoin de spécifier <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
+#: collection_mapping.xml:249
 #, no-c-format
 msgid ""
 "The foreign key constraint may use <literal>ON DELETE CASCADE</literal>."
@@ -446,13 +461,13 @@
 "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;</"
@@ -462,13 +477,13 @@
 "<literal>&lt;key&gt;</literal>."
 
 #. Tag: title
-#: collection_mapping.xml:231
+#: collection_mapping.xml:263
 #, no-c-format
 msgid "Collection elements"
 msgstr "Les éléments d'une collection"
 
 #. Tag: para
-#: collection_mapping.xml:233
+#: collection_mapping.xml:265
 #, no-c-format
 msgid ""
 "Collections may contain almost any other Hibernate type, including all basic "
@@ -489,7 +504,7 @@
 "considéré être l'état retenu par la 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</"
@@ -508,13 +523,13 @@
 "suivants sont utilisés pour mapper des associations d'entité."
 
 #. Tag: title
-#: collection_mapping.xml:254
+#: collection_mapping.xml:286
 #, no-c-format
 msgid "Indexed collections"
 msgstr "Collections indexées"
 
 #. Tag: para
-#: collection_mapping.xml:256
+#: collection_mapping.xml:288
 #, no-c-format
 msgid ""
 "All collection mappings, except those with set and bag semantics, need an "
@@ -544,7 +559,7 @@
 "de zéro par défaut)."
 
 #. Tag: sect2
-#: collection_mapping.xml:267
+#: collection_mapping.xml:299
 #, no-c-format
 msgid ""
 "<programlistingco> <areaspec> <area id=\"index1\" coords=\"2 45\"/> <area id="
@@ -590,7 +605,7 @@
 msgstr ""
 
 #. Tag: para
-#: collection_mapping.xml:348
+#: collection_mapping.xml:380
 #, no-c-format
 msgid ""
 "If your table doesn't have an index column, and you still wish to use "
@@ -605,29 +620,14 @@
 "sac (NdT : bag) ne garde pas son ordre quand il est récupéré de la base de "
 "données, mais il peut être optionnellement trié ou ordonné."
 
-#. 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 ""
-"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 "
-"suggérons d'expérimenter avec l'outil de génération de schéma pour avoir une "
-"idée de comment traduire les différentes déclarations de mapping vers des "
-"table de la base de données."
-
 #. Tag: title
-#: collection_mapping.xml:364
+#: collection_mapping.xml:390
 #, no-c-format
 msgid "Collections of values and many-to-many associations"
 msgstr "Collections de valeurs et associations plusieurs-vers-plusieurs"
 
 #. Tag: para
-#: collection_mapping.xml:366
+#: collection_mapping.xml:392
 #, no-c-format
 msgid ""
 "Any collection of values or many-to-many association requires a dedicated "
@@ -642,7 +642,7 @@
 "(s) d'index."
 
 #. Tag: para
-#: collection_mapping.xml:373
+#: collection_mapping.xml:399
 #, no-c-format
 msgid ""
 "For a collection of values, we use the <literal>&lt;element&gt;</literal> "
@@ -652,7 +652,7 @@
 "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 "
@@ -723,13 +723,13 @@
 msgstr ""
 
 #. Tag: para
-#: collection_mapping.xml:480
+#: 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 :"
 
 #. Tag: programlisting
-#: collection_mapping.xml:484
+#: collection_mapping.xml:510
 #, no-c-format
 msgid ""
 "<![CDATA[<set name=\"names\" table=\"person_names\">\n"
@@ -739,7 +739,7 @@
 msgstr ""
 
 #. Tag: para
-#: collection_mapping.xml:486
+#: collection_mapping.xml:512
 #, no-c-format
 msgid ""
 "A bag containing integers (with an iteration order determined by the "
@@ -749,7 +749,7 @@
 "l'attribut <literal>order-by</literal>) :"
 
 #. Tag: programlisting
-#: collection_mapping.xml:491
+#: collection_mapping.xml:517
 #, no-c-format
 msgid ""
 "<![CDATA[<bag name=\"sizes\" \n"
@@ -761,7 +761,7 @@
 msgstr ""
 
 #. Tag: para
-#: collection_mapping.xml:493
+#: collection_mapping.xml:519
 #, no-c-format
 msgid "An array of entities - in this case, a many to many association:"
 msgstr ""
@@ -769,7 +769,7 @@
 "plusieurs :"
 
 #. Tag: programlisting
-#: collection_mapping.xml:497
+#: collection_mapping.xml:523
 #, no-c-format
 msgid ""
 "<![CDATA[<array name=\"addresses\" \n"
@@ -782,13 +782,13 @@
 msgstr ""
 
 #. Tag: para
-#: collection_mapping.xml:499
+#: collection_mapping.xml:525
 #, 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:503
+#: collection_mapping.xml:529
 #, no-c-format
 msgid ""
 "<![CDATA[<map name=\"holidays\" \n"
@@ -802,13 +802,13 @@
 msgstr ""
 
 #. Tag: para
-#: collection_mapping.xml:505
+#: collection_mapping.xml:531
 #, no-c-format
 msgid "A list of components (discussed in the next chapter):"
 msgstr "Une liste de composants (discute dans le prochain chapitre) :"
 
 #. Tag: programlisting
-#: collection_mapping.xml:509
+#: collection_mapping.xml:535
 #, no-c-format
 msgid ""
 "<![CDATA[<list name=\"carComponents\" \n"
@@ -824,13 +824,13 @@
 msgstr ""
 
 #. Tag: title
-#: collection_mapping.xml:514
+#: collection_mapping.xml:540
 #, no-c-format
 msgid "One-to-many associations"
 msgstr "Association un-vers-plusieurs"
 
 #. Tag: para
-#: collection_mapping.xml:516
+#: collection_mapping.xml:542
 #, no-c-format
 msgid ""
 "A <emphasis>one to many association</emphasis> links the tables of two "
@@ -843,7 +843,7 @@
 "normales :"
 
 #. Tag: para
-#: collection_mapping.xml:524
+#: collection_mapping.xml:550
 #, no-c-format
 msgid ""
 "An instance of the contained entity class may not belong to more than one "
@@ -853,7 +853,7 @@
 "d'une instance de la collection"
 
 #. Tag: para
-#: collection_mapping.xml:530
+#: collection_mapping.xml:556
 #, no-c-format
 msgid ""
 "An instance of the contained entity class may not appear at more than one "
@@ -863,7 +863,7 @@
 "plus d'une valeur d'index de la collection"
 
 #. Tag: para
-#: collection_mapping.xml:537
+#: collection_mapping.xml:563
 #, no-c-format
 msgid ""
 "An association from <literal>Product</literal> to <literal>Part</literal> "
@@ -877,7 +877,7 @@
 "to-many&gt;</literal> indique que c'est une association un vers plusieurs."
 
 #. Tag: programlisting
-#: collection_mapping.xml:550
+#: collection_mapping.xml:576
 #, no-c-format
 msgid ""
 "<![CDATA[<one-to-many \n"
@@ -890,13 +890,13 @@
 msgstr ""
 
 #. Tag: para
-#: collection_mapping.xml:553
+#: collection_mapping.xml:579
 #, 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:558
+#: collection_mapping.xml:584
 #, no-c-format
 msgid ""
 "<literal>not-found</literal> (optional - defaults to <literal>exception</"
@@ -910,7 +910,7 @@
 "ligne manquante comme une association nulle"
 
 #. Tag: para
-#: collection_mapping.xml:565
+#: collection_mapping.xml:591
 #, fuzzy, no-c-format
 msgid ""
 "<literal>entity-name</literal> (optional): The entity name of the associated "
@@ -924,7 +924,7 @@
 "associée, comme une alternative à <literal>class</literal>."
 
 #. Tag: para
-#: collection_mapping.xml:573
+#: collection_mapping.xml:599
 #, no-c-format
 msgid ""
 "Notice that the <literal>&lt;one-to-many&gt;</literal> element does not need "
@@ -936,7 +936,7 @@
 "de la table nulle part."
 
 #. Tag: para
-#: collection_mapping.xml:579
+#: collection_mapping.xml:605
 #, no-c-format
 msgid ""
 "<emphasis>Very important note:</emphasis> If the foreign key column of a "
@@ -956,7 +956,7 @@
 "associations bidirectionnelles plus tard dans ce chapitre."
 
 #. Tag: para
-#: collection_mapping.xml:588
+#: collection_mapping.xml:614
 #, no-c-format
 msgid ""
 "This example shows a map of <literal>Part</literal> entities by name (where "
@@ -968,7 +968,7 @@
 "literal>). Notez l'utilisation d'un index basé sur une formule."
 
 #. Tag: programlisting
-#: collection_mapping.xml:594
+#: collection_mapping.xml:620
 #, no-c-format
 msgid ""
 "<![CDATA[<map name=\"parts\"\n"
@@ -980,19 +980,19 @@
 msgstr ""
 
 #. Tag: title
-#: collection_mapping.xml:600
+#: collection_mapping.xml:626
 #, no-c-format
 msgid "Advanced collection mappings"
 msgstr "Mappings de collection avancés"
 
 #. Tag: title
-#: collection_mapping.xml:603
+#: collection_mapping.xml:629
 #, no-c-format
 msgid "Sorted collections"
 msgstr "Collections triées"
 
 #. Tag: para
-#: collection_mapping.xml:605
+#: collection_mapping.xml:631
 #, no-c-format
 msgid ""
 "Hibernate supports collections implementing <literal>java.util.SortedMap</"
@@ -1004,7 +1004,7 @@
 "spécifier un comparateur dans le fichier de mapping :"
 
 #. Tag: programlisting
-#: collection_mapping.xml:610
+#: collection_mapping.xml:636
 #, no-c-format
 msgid ""
 "<![CDATA[<set name=\"aliases\" \n"
@@ -1022,7 +1022,7 @@
 msgstr ""
 
 #. Tag: para
-#: collection_mapping.xml:612
+#: collection_mapping.xml:638
 #, no-c-format
 msgid ""
 "Allowed values of the <literal>sort</literal> attribute are "
@@ -1034,7 +1034,7 @@
 "classe implémentant <literal>java.util.Comparator</literal>."
 
 #. Tag: para
-#: collection_mapping.xml:618
+#: collection_mapping.xml:644
 #, no-c-format
 msgid ""
 "Sorted collections actually behave like <literal>java.util.TreeSet</literal> "
@@ -1044,7 +1044,7 @@
 "TreeSet</literal> ou <literal>java.util.TreeMap</literal>."
 
 #. Tag: para
-#: collection_mapping.xml:623
+#: collection_mapping.xml:649
 #, no-c-format
 msgid ""
 "If you want the database itself to order the collection elements use the "
@@ -1063,7 +1063,7 @@
 "pas en mémoire."
 
 #. Tag: programlisting
-#: collection_mapping.xml:632
+#: collection_mapping.xml:658
 #, no-c-format
 msgid ""
 "<![CDATA[<set name=\"aliases\" table=\"person_aliases\" order-by=\"lower"
@@ -1080,7 +1080,7 @@
 msgstr ""
 
 #. Tag: para
-#: collection_mapping.xml:634
+#: collection_mapping.xml:660
 #, no-c-format
 msgid ""
 "Note that the value of the <literal>order-by</literal> attribute is an SQL "
@@ -1090,7 +1090,7 @@
 "SQL, pas un ordre HQL !"
 
 #. Tag: para
-#: collection_mapping.xml:639
+#: collection_mapping.xml:665
 #, no-c-format
 msgid ""
 "Associations may even be sorted by some arbitrary criteria at runtime using "
@@ -1100,7 +1100,7 @@
 "l'exécution en utilisant un <literal>filter()</literal> de collection."
 
 #. Tag: programlisting
-#: collection_mapping.xml:644
+#: collection_mapping.xml:670
 #, no-c-format
 msgid ""
 "<![CDATA[sortedUsers = s.createFilter( group.getUsers(), \"order by this.name"
@@ -1108,13 +1108,13 @@
 msgstr ""
 
 #. Tag: title
-#: collection_mapping.xml:649
+#: collection_mapping.xml:675
 #, no-c-format
 msgid "Bidirectional associations"
 msgstr "Associations bidirectionnelles"
 
 #. Tag: para
-#: collection_mapping.xml:651
+#: collection_mapping.xml:677
 #, fuzzy, no-c-format
 msgid ""
 "A <emphasis>bidirectional association</emphasis> allows navigation from both "
@@ -1126,31 +1126,31 @@
 "bidirectionnelles sont supportées : <placeholder-1/>"
 
 #. Tag: term
-#: collection_mapping.xml:658
+#: collection_mapping.xml:684
 #, no-c-format
 msgid "one-to-many"
 msgstr "un-vers-plusieurs (NdT : one-to-many)"
 
 #. Tag: para
-#: collection_mapping.xml:660
+#: collection_mapping.xml:686
 #, no-c-format
 msgid "set or bag valued at one end, single-valued at the other"
 msgstr "ensemble ou sac à une extrémité, une seule valeur à l'autre"
 
 #. Tag: term
-#: collection_mapping.xml:666
+#: collection_mapping.xml:692
 #, no-c-format
 msgid "many-to-many"
 msgstr "plusieurs-vers-plusieurs (NdT : many-to-many)"
 
 #. Tag: para
-#: collection_mapping.xml:668
+#: collection_mapping.xml:694
 #, 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:677
+#: collection_mapping.xml:703
 #, no-c-format
 msgid ""
 "You may specify a bidirectional many-to-many association simply by mapping "
@@ -1165,7 +1165,7 @@
 "ne peut pas être une collection indexée)."
 
 #. Tag: para
-#: collection_mapping.xml:684
+#: collection_mapping.xml:710
 #, no-c-format
 msgid ""
 "Here's an example of a bidirectional many-to-many association; each category "
@@ -1176,7 +1176,7 @@
 "plusieurs catégories :"
 
 #. Tag: programlisting
-#: collection_mapping.xml:689
+#: collection_mapping.xml:715
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Category\">\n"
@@ -1201,7 +1201,7 @@
 msgstr ""
 
 #. Tag: para
-#: collection_mapping.xml:691
+#: collection_mapping.xml:717
 #, no-c-format
 msgid ""
 "Changes made only to the inverse end of the association are <emphasis>not</"
@@ -1218,7 +1218,7 @@
 "plusieurs-vers-plusieurs en Java :"
 
 #. Tag: programlisting
-#: collection_mapping.xml:699
+#: collection_mapping.xml:725
 #, no-c-format
 msgid ""
 "<![CDATA[\n"
@@ -1233,7 +1233,7 @@
 msgstr ""
 
 #. Tag: para
-#: collection_mapping.xml:701
+#: collection_mapping.xml:727
 #, no-c-format
 msgid ""
 "The non-inverse side is used to save the in-memory representation to the "
@@ -1243,7 +1243,7 @@
 "mémoire dans la base de données."
 
 #. Tag: para
-#: collection_mapping.xml:705
+#: collection_mapping.xml:731
 #, no-c-format
 msgid ""
 "You may define a bidirectional one-to-many association by mapping a one-to-"
@@ -1256,7 +1256,7 @@
 "valuée <literal>inverse=\"true\"</literal>."
 
 #. Tag: programlisting
-#: collection_mapping.xml:711
+#: collection_mapping.xml:737
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Parent\">\n"
@@ -1279,7 +1279,7 @@
 msgstr ""
 
 #. Tag: para
-#: collection_mapping.xml:713
+#: collection_mapping.xml:739
 #, no-c-format
 msgid ""
 "Mapping one end of an association with <literal>inverse=\"true\"</literal> "
@@ -1290,13 +1290,13 @@
 "orthogonaux !"
 
 #. Tag: title
-#: collection_mapping.xml:721
+#: collection_mapping.xml:747
 #, no-c-format
 msgid "Bidirectional associations with indexed collections"
 msgstr "Associations bidirectionnelles avec des collections indexées"
 
 #. Tag: para
-#: collection_mapping.xml:722
+#: collection_mapping.xml:748
 #, no-c-format
 msgid ""
 "A bidirectional association where one end is represented as a <literal>&lt;"
@@ -1313,7 +1313,7 @@
 "la collection :"
 
 #. Tag: programlisting
-#: collection_mapping.xml:729
+#: collection_mapping.xml:755
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Parent\">\n"
@@ -1340,7 +1340,7 @@
 msgstr ""
 
 #. Tag: para
-#: collection_mapping.xml:731
+#: collection_mapping.xml:757
 #, no-c-format
 msgid ""
 "But, if there is no such property on the child class, we can't think of the "
@@ -1357,7 +1357,7 @@
 "pourrions utiliser le mapping suivant :"
 
 #. Tag: programlisting
-#: collection_mapping.xml:738
+#: collection_mapping.xml:764
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Parent\">\n"
@@ -1385,7 +1385,7 @@
 msgstr ""
 
 #. Tag: para
-#: collection_mapping.xml:740
+#: collection_mapping.xml:766
 #, no-c-format
 msgid ""
 "Note that in this mapping, the collection-valued end of the association is "
@@ -1397,13 +1397,13 @@
 "cela entraîne-t-il réellement des expressions updates inutiles ?"
 
 #. Tag: title
-#: collection_mapping.xml:748
+#: collection_mapping.xml:774
 #, no-c-format
 msgid "Ternary associations"
 msgstr "Associations ternaires"
 
 #. Tag: para
-#: collection_mapping.xml:750
+#: collection_mapping.xml:776
 #, no-c-format
 msgid ""
 "There are three possible approaches to mapping a ternary association. One is "
@@ -1414,7 +1414,7 @@
 "qu'index :"
 
 #. Tag: programlisting
-#: collection_mapping.xml:755
+#: collection_mapping.xml:781
 #, no-c-format
 msgid ""
 "<![CDATA[<map name=\"contracts\">\n"
@@ -1425,7 +1425,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: collection_mapping.xml:757
+#: collection_mapping.xml:783
 #, no-c-format
 msgid ""
 "<![CDATA[<map name=\"connections\">\n"
@@ -1436,7 +1436,7 @@
 msgstr ""
 
 #. Tag: para
-#: collection_mapping.xml:759
+#: collection_mapping.xml:785
 #, no-c-format
 msgid ""
 "A second approach is to simply remodel the association as an entity class. "
@@ -1446,7 +1446,7 @@
 "classe d'entité. C'est l'approche la plus commune."
 
 #. Tag: para
-#: collection_mapping.xml:764
+#: collection_mapping.xml:790
 #, no-c-format
 msgid ""
 "A final alternative is to use composite elements, which we will discuss "
@@ -1456,13 +1456,13 @@
 "discuterons plus tard."
 
 #. Tag: literal
-#: collection_mapping.xml:771
+#: collection_mapping.xml:797
 #, no-c-format
 msgid "Using an &lt;idbag&gt;"
 msgstr "Utiliser un <literal>&lt;idbag&gt;</literal>"
 
 #. Tag: para
-#: collection_mapping.xml:773
+#: collection_mapping.xml:799
 #, no-c-format
 msgid ""
 "If you've fully embraced our view that composite keys are a bad thing and "
@@ -1488,7 +1488,7 @@
 "valeurs vers une table avec une clef subrogée."
 
 #. Tag: para
-#: collection_mapping.xml:784
+#: collection_mapping.xml:810
 #, no-c-format
 msgid ""
 "The <literal>&lt;idbag&gt;</literal> element lets you map a <literal>List</"
@@ -1499,7 +1499,7 @@
 "sémantique de sac."
 
 #. Tag: programlisting
-#: collection_mapping.xml:789
+#: collection_mapping.xml:815
 #, no-c-format
 msgid ""
 "<![CDATA[<idbag name=\"lovers\" table=\"LOVERS\">\n"
@@ -1512,7 +1512,7 @@
 msgstr ""
 
 #. Tag: para
-#: collection_mapping.xml:791
+#: collection_mapping.xml:817
 #, no-c-format
 msgid ""
 "As you can see, an <literal>&lt;idbag&gt;</literal> has a synthetic id "
@@ -1527,7 +1527,7 @@
 "ligne particulière."
 
 #. Tag: para
-#: collection_mapping.xml:798
+#: collection_mapping.xml:824
 #, no-c-format
 msgid ""
 "Note that the update performance of an <literal>&lt;idbag&gt;</literal> is "
@@ -1542,7 +1542,7 @@
 "liste, une map ou un ensemble."
 
 #. Tag: para
-#: collection_mapping.xml:805
+#: collection_mapping.xml:831
 #, no-c-format
 msgid ""
 "In the current implementation, the <literal>native</literal> identifier "
@@ -1554,13 +1554,13 @@
 "identifiants de collection <literal>&lt;idbag&gt;</literal>."
 
 #. Tag: title
-#: collection_mapping.xml:829
+#: collection_mapping.xml:855
 #, no-c-format
 msgid "Collection examples"
 msgstr "Exemples de collections"
 
 #. Tag: para
-#: collection_mapping.xml:831
+#: collection_mapping.xml:857
 #, no-c-format
 msgid ""
 "The previous sections are pretty confusing. So lets look at an example. This "
@@ -1570,7 +1570,7 @@
 "classe :"
 
 #. Tag: programlisting
-#: collection_mapping.xml:836
+#: collection_mapping.xml:862
 #, no-c-format
 msgid ""
 "<![CDATA[package eg;\n"
@@ -1592,7 +1592,7 @@
 msgstr ""
 
 #. Tag: para
-#: collection_mapping.xml:838
+#: collection_mapping.xml:864
 #, no-c-format
 msgid ""
 "has a collection of <literal>Child</literal> instances. If each child has at "
@@ -1603,7 +1603,7 @@
 "plusieurs :"
 
 #. Tag: programlisting
-#: collection_mapping.xml:844
+#: collection_mapping.xml:870
 #, no-c-format
 msgid ""
 "<![CDATA[<hibernate-mapping>\n"
@@ -1629,13 +1629,13 @@
 msgstr ""
 
 #. Tag: para
-#: collection_mapping.xml:846
+#: collection_mapping.xml:872
 #, 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:850
+#: collection_mapping.xml:876
 #, no-c-format
 msgid ""
 "<![CDATA[create table parent ( id bigint not null primary key )\n"
@@ -1645,7 +1645,7 @@
 msgstr ""
 
 #. Tag: para
-#: collection_mapping.xml:852
+#: collection_mapping.xml:878
 #, no-c-format
 msgid ""
 "If the parent is <emphasis>required</emphasis>, use a bidirectional one-to-"
@@ -1655,7 +1655,7 @@
 "vers-plusieurs unidirectionnelle :"
 
 #. Tag: programlisting
-#: collection_mapping.xml:857
+#: collection_mapping.xml:883
 #, no-c-format
 msgid ""
 "<![CDATA[<hibernate-mapping>\n"
@@ -1683,13 +1683,13 @@
 msgstr ""
 
 #. Tag: para
-#: collection_mapping.xml:859
+#: collection_mapping.xml:885
 #, no-c-format
 msgid "Notice the <literal>NOT NULL</literal> constraint:"
 msgstr "Notez la contrainte <literal>NOT NULL</literal> :"
 
 #. Tag: programlisting
-#: collection_mapping.xml:863
+#: collection_mapping.xml:889
 #, no-c-format
 msgid ""
 "<![CDATA[create table parent ( id bigint not null primary key )\n"
@@ -1701,7 +1701,7 @@
 msgstr ""
 
 #. Tag: para
-#: collection_mapping.xml:865
+#: collection_mapping.xml:891
 #, no-c-format
 msgid ""
 "Alternatively, if you absolutely insist that this association should be "
@@ -1713,7 +1713,7 @@
 "literal> sur le mapping <literal>&lt;key&gt;</literal> :"
 
 #. Tag: programlisting
-#: collection_mapping.xml:871
+#: collection_mapping.xml:897
 #, no-c-format
 msgid ""
 "<![CDATA[<hibernate-mapping>\n"
@@ -1739,7 +1739,7 @@
 msgstr ""
 
 #. Tag: para
-#: collection_mapping.xml:873
+#: collection_mapping.xml:899
 #, no-c-format
 msgid ""
 "On the other hand, if a child might have multiple parents, a many-to-many "
@@ -1749,7 +1749,7 @@
 "association plusieurs-vers-plusieurs est plus appropriée :"
 
 #. Tag: programlisting
-#: collection_mapping.xml:878
+#: collection_mapping.xml:904
 #, no-c-format
 msgid ""
 "<![CDATA[<hibernate-mapping>\n"
@@ -1775,13 +1775,13 @@
 msgstr ""
 
 #. Tag: para
-#: collection_mapping.xml:880
+#: collection_mapping.xml:906
 #, no-c-format
 msgid "Table definitions:"
 msgstr "Définitions des tables :"
 
 #. Tag: programlisting
-#: collection_mapping.xml:884
+#: collection_mapping.xml:910
 #, no-c-format
 msgid ""
 "<![CDATA[create table parent ( id bigint not null primary key )\n"
@@ -1796,7 +1796,7 @@
 msgstr ""
 
 #. Tag: para
-#: collection_mapping.xml:886
+#: collection_mapping.xml:912
 #, no-c-format
 msgid ""
 "For more examples and a complete walk-through a parent/child relationship "
@@ -1806,7 +1806,7 @@
 "enfant, voir see <xref linkend=\"example-parentchild\"/>."
 
 #. Tag: para
-#: collection_mapping.xml:891
+#: collection_mapping.xml:917
 #, no-c-format
 msgid ""
 "Even more exotic association mappings are possible, we will catalog all "

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	2008-08-14 15:28:13 UTC (rev 15066)
+++ core/trunk/documentation/manual/src/main/docbook/fr-FR/content/component_mapping.po	2008-08-14 15:35:40 UTC (rev 15067)
@@ -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: 2008-08-14 15:28+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,13 +11,13 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: component_mapping.xml:5
+#: component_mapping.xml:29
 #, no-c-format
 msgid "Component Mapping"
 msgstr "Mapping de composants"
 
 #. Tag: para
-#: component_mapping.xml:7
+#: component_mapping.xml:31
 #, no-c-format
 msgid ""
 "The notion of a <emphasis>component</emphasis> is re-used in several "
@@ -27,13 +27,13 @@
 "contextes, avec différents objectifs, à travers Hibernate."
 
 #. Tag: title
-#: component_mapping.xml:13
+#: component_mapping.xml:37
 #, no-c-format
 msgid "Dependent objects"
 msgstr "Objects dépendants"
 
 #. Tag: para
-#: component_mapping.xml:15
+#: component_mapping.xml:39
 #, no-c-format
 msgid ""
 "A component is a contained object that is persisted as a value type, not an "
@@ -48,7 +48,7 @@
 "personne de cette façon:"
 
 #. Tag: programlisting
-#: component_mapping.xml:21
+#: component_mapping.xml:45
 #, no-c-format
 msgid ""
 "<![CDATA[public class Person {\n"
@@ -79,7 +79,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: component_mapping.xml:23
+#: component_mapping.xml:47
 #, no-c-format
 msgid ""
 "<![CDATA[public class Name {\n"
@@ -108,7 +108,7 @@
 msgstr ""
 
 #. Tag: para
-#: component_mapping.xml:25
+#: component_mapping.xml:49
 #, no-c-format
 msgid ""
 "Now <literal>Name</literal> may be persisted as a component of "
@@ -123,13 +123,13 @@
 "( par exemple getId() ) qui sont propres aux entités."
 
 #. Tag: para
-#: component_mapping.xml:32
+#: component_mapping.xml:56
 #, no-c-format
 msgid "Our Hibernate mapping would look like:"
 msgstr "Nous serions alors amené à mapper ce composant de cette façon:"
 
 #. Tag: programlisting
-#: component_mapping.xml:36
+#: component_mapping.xml:60
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"eg.Person\" table=\"person\">\n"
@@ -147,7 +147,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>, "
@@ -159,7 +159,7 @@
 "literal> and <literal>last</literal>."
 
 #. Tag: para
-#: component_mapping.xml:46
+#: component_mapping.xml:70
 #, no-c-format
 msgid ""
 "Like all value types, components do not support shared references. In other "
@@ -181,7 +181,7 @@
 "programmatif devrait être satisfaisant dans la plupart des cas."
 
 #. Tag: para
-#: component_mapping.xml:55
+#: component_mapping.xml:79
 #, no-c-format
 msgid ""
 "The properties of a component may be of any Hibernate type (collections, "
@@ -196,7 +196,7 @@
 "supporter un modèle objet très granulaire."
 
 #. Tag: para
-#: component_mapping.xml:62
+#: component_mapping.xml:86
 #, 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:68
+#: component_mapping.xml:92
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"eg.Person\" table=\"person\">\n"
@@ -226,13 +226,13 @@
 msgstr ""
 
 #. Tag: title
-#: component_mapping.xml:73
+#: component_mapping.xml:97
 #, no-c-format
 msgid "Collections of dependent objects"
 msgstr "Collection d'objets dépendants"
 
 #. Tag: para
-#: component_mapping.xml:75
+#: component_mapping.xml:99
 #, no-c-format
 msgid ""
 "Collections of components are supported (eg. an array of type <literal>Name</"
@@ -246,7 +246,7 @@
 "composite-element&gt;</literal>."
 
 #. Tag: programlisting
-#: component_mapping.xml:82
+#: component_mapping.xml:106
 #, no-c-format
 msgid ""
 "<![CDATA[<set name=\"someNames\" table=\"some_names\" lazy=\"true\">\n"
@@ -260,7 +260,7 @@
 msgstr ""
 
 #. Tag: para
-#: component_mapping.xml:84
+#: component_mapping.xml:108
 #, no-c-format
 msgid ""
 "Note: if you define a <literal>Set</literal> of composite elements, it is "
@@ -272,7 +272,7 @@
 "et <literal>hashCode()</literal> correctement."
 
 #. Tag: para
-#: component_mapping.xml:90
+#: component_mapping.xml:114
 #, no-c-format
 msgid ""
 "Composite elements may contain components but not collections. If your "
@@ -295,7 +295,7 @@
 "différentes)"
 
 #. Tag: para
-#: component_mapping.xml:102
+#: component_mapping.xml:126
 #, no-c-format
 msgid ""
 "Please note that a composite element mapping doesn't support null-able "
@@ -318,7 +318,7 @@
 "literal> ou <literal>&lt;idbag&gt;</literal>."
 
 #. Tag: para
-#: component_mapping.xml:113
+#: component_mapping.xml:137
 #, no-c-format
 msgid ""
 "A special case of a composite element is a composite element with a nested "
@@ -339,7 +339,7 @@
 "de l'association."
 
 #. Tag: programlisting
-#: component_mapping.xml:123
+#: component_mapping.xml:147
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"eg.Order\" .... >\n"
@@ -358,7 +358,7 @@
 msgstr ""
 
 #. Tag: para
-#: component_mapping.xml:125
+#: component_mapping.xml:149
 #, no-c-format
 msgid ""
 "Of course, there can't be a reference to the purchae on the other side, for "
@@ -373,13 +373,13 @@
 "n'autorise pas les références partagées."
 
 #. Tag: para
-#: component_mapping.xml:133
+#: component_mapping.xml:157
 #, 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:135
+#: component_mapping.xml:159
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"eg.Order\" .... >\n"
@@ -395,7 +395,7 @@
 msgstr ""
 
 #. Tag: para
-#: component_mapping.xml:137
+#: component_mapping.xml:161
 #, no-c-format
 msgid ""
 "Composite elements may appear in queries using the same syntax as "
@@ -405,13 +405,13 @@
 "même syntaxe que associations"
 
 #. Tag: title
-#: component_mapping.xml:145
+#: component_mapping.xml:169
 #, no-c-format
 msgid "Components as Map indices"
 msgstr "Utiliser les composants comme index de map"
 
 #. Tag: para
-#: component_mapping.xml:147
+#: component_mapping.xml:171
 #, no-c-format
 msgid ""
 "The <literal>&lt;composite-map-key&gt;</literal> element lets you map a "
@@ -425,13 +425,13 @@
 "<literal>equals()</literal> dans la classe du composant."
 
 #. Tag: title
-#: component_mapping.xml:156
+#: component_mapping.xml:180
 #, no-c-format
 msgid "Components as composite identifiers"
 msgstr "Utiliser un composant comme identifiant"
 
 #. Tag: para
-#: component_mapping.xml:158
+#: component_mapping.xml:182
 #, no-c-format
 msgid ""
 "You may use a component as an identifier of an entity class. Your component "
@@ -441,13 +441,13 @@
 "cela la classe du composant doit respecter certaines règles."
 
 #. Tag: para
-#: component_mapping.xml:165
+#: component_mapping.xml:189
 #, 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:170
+#: component_mapping.xml:194
 #, no-c-format
 msgid ""
 "It must re-implement <literal>equals()</literal> and <literal>hashCode()</"
@@ -458,7 +458,7 @@
 "dans la base de données."
 
 #. Tag: emphasis
-#: component_mapping.xml:179
+#: component_mapping.xml:203
 #, no-c-format
 msgid ""
 "Note: in Hibernate3, the second requirement is not an absolutely hard "
@@ -468,7 +468,7 @@
 "mais faîtes le quand même."
 
 #. Tag: para
-#: component_mapping.xml:183
+#: component_mapping.xml:207
 #, no-c-format
 msgid ""
 "You can't use an <literal>IdentifierGenerator</literal> to generate "
@@ -479,7 +479,7 @@
 "identifiants."
 
 #. Tag: para
-#: component_mapping.xml:188
+#: component_mapping.xml:212
 #, no-c-format
 msgid ""
 "Use the <literal>&lt;composite-id&gt;</literal> tag (with nested "
@@ -495,7 +495,7 @@
 "<literal>Order</literal>."
 
 #. Tag: programlisting
-#: component_mapping.xml:196
+#: component_mapping.xml:220
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"OrderLine\">\n"
@@ -519,7 +519,7 @@
 msgstr ""
 
 #. Tag: para
-#: component_mapping.xml:198
+#: component_mapping.xml:222
 #, no-c-format
 msgid ""
 "Now, any foreign keys referencing the <literal>OrderLine</literal> table are "
@@ -532,7 +532,7 @@
 "<literal>OrderLine</literal> devrait être mappé de la façon suivante :"
 
 #. Tag: programlisting
-#: component_mapping.xml:204
+#: component_mapping.xml:228
 #, no-c-format
 msgid ""
 "<![CDATA[<many-to-one name=\"orderLine\" class=\"OrderLine\">\n"
@@ -544,7 +544,7 @@
 msgstr ""
 
 #. Tag: para
-#: component_mapping.xml:206
+#: component_mapping.xml:230
 #, no-c-format
 msgid ""
 "(Note that the <literal>&lt;column&gt;</literal> tag is an alternative to "
@@ -554,7 +554,7 @@
 "l'attribut <literal>column</literal> que l'on utilise partout.)"
 
 #. Tag: para
-#: component_mapping.xml:211
+#: component_mapping.xml:235
 #, no-c-format
 msgid ""
 "A <literal>many-to-many</literal> association to <literal>OrderLine</"
@@ -564,7 +564,7 @@
 "<literal>OrderLine</literal> utilisera aussi une clé étrangère composite:"
 
 #. Tag: programlisting
-#: component_mapping.xml:216
+#: component_mapping.xml:240
 #, no-c-format
 msgid ""
 "<![CDATA[<set name=\"undeliveredOrderLines\">\n"
@@ -578,7 +578,7 @@
 msgstr ""
 
 #. Tag: para
-#: component_mapping.xml:218
+#: component_mapping.xml:242
 #, no-c-format
 msgid ""
 "The collection of <literal>OrderLine</literal>s in <literal>Order</literal> "
@@ -588,7 +588,7 @@
 "literal> utilisera:"
 
 #. Tag: programlisting
-#: component_mapping.xml:223
+#: component_mapping.xml:247
 #, no-c-format
 msgid ""
 "<![CDATA[<set name=\"orderLines\" inverse=\"true\">\n"
@@ -601,7 +601,7 @@
 msgstr ""
 
 #. Tag: para
-#: component_mapping.xml:225
+#: component_mapping.xml:249
 #, no-c-format
 msgid ""
 "(The <literal>&lt;one-to-many&gt;</literal> element, as usual, declares no "
@@ -611,7 +611,7 @@
 "déclare pas de colonne.)"
 
 #. Tag: para
-#: component_mapping.xml:229
+#: component_mapping.xml:253
 #, no-c-format
 msgid ""
 "If <literal>OrderLine</literal> itself owns a collection, it also has a "
@@ -621,7 +621,7 @@
 "aura aussi une clé composite étrangère."
 
 #. Tag: programlisting
-#: component_mapping.xml:234
+#: component_mapping.xml:258
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"OrderLine\">\n"
@@ -642,19 +642,19 @@
 msgstr ""
 
 #. Tag: title
-#: component_mapping.xml:239
+#: component_mapping.xml:263
 #, no-c-format
 msgid "Dynamic components"
 msgstr "Composant Dynamique"
 
 #. Tag: para
-#: component_mapping.xml:241
+#: component_mapping.xml:265
 #, no-c-format
 msgid "You may even 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:245
+#: component_mapping.xml:269
 #, no-c-format
 msgid ""
 "<![CDATA[<dynamic-component name=\"userAttributes\">\n"
@@ -665,7 +665,7 @@
 msgstr ""
 
 #. Tag: para
-#: component_mapping.xml:247
+#: component_mapping.xml:271
 #, no-c-format
 msgid ""
 "The semantics of a <literal>&lt;dynamic-component&gt;</literal> mapping are "

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	2008-08-14 15:28:13 UTC (rev 15066)
+++ core/trunk/documentation/manual/src/main/docbook/fr-FR/content/configuration.po	2008-08-14 15:35:40 UTC (rev 15067)
@@ -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: 2008-08-14 15:28+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,13 +11,13 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: configuration.xml:5
+#: configuration.xml:29
 #, no-c-format
 msgid "Configuration"
 msgstr "Configuration"
 
 #. Tag: para
-#: configuration.xml:7
+#: configuration.xml:31
 #, no-c-format
 msgid ""
 "Because Hibernate is designed to operate in many different environments, "
@@ -36,20 +36,20 @@
 "classpath et à l'adapter."
 
 #. Tag: title
-#: configuration.xml:16
+#: configuration.xml:40
 #, no-c-format
 msgid "Programmatic configuration"
 msgstr "Configuration par programmation"
 
 #. 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 ""
 "Une instance de <literal>org.hibernate.cfg.Configuration</literal> "
 "représente un ensemble de mappings des classes Java d'une application vers "
@@ -58,12 +58,13 @@
 "mappings sont constitués d'un ensemble de fichiers de mapping 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 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>:"
 msgstr ""
 "Vous pouvez obtenir une instance de <literal>Configuration</literal> en "
 "l'instanciant directement et en spécifiant la liste des documents XML de "
@@ -71,7 +72,7 @@
 "faire à l'aide de la méthode <literal>addResource()</literal> :"
 
 #. Tag: programlisting
-#: configuration.xml:32
+#: configuration.xml:55
 #, no-c-format
 msgid ""
 "<![CDATA[Configuration cfg = new Configuration()\n"
@@ -80,7 +81,7 @@
 msgstr ""
 
 #. Tag: para
-#: configuration.xml:34
+#: configuration.xml:57
 #, no-c-format
 msgid ""
 "An alternative (sometimes better) way is to specify the mapped class, and "
@@ -90,7 +91,7 @@
 "de laisser Hibernate trouver les documents de mapping pour vous :"
 
 #. Tag: programlisting
-#: configuration.xml:39
+#: configuration.xml:62
 #, no-c-format
 msgid ""
 "<![CDATA[Configuration cfg = new Configuration()\n"
@@ -99,12 +100,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 "
+"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."
 msgstr ""
 "Hibernate va rechercher les fichiers de mappings <literal>/org/hibernate/"
@@ -113,17 +114,17 @@
 "en dur."
 
 #. 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:"
 msgstr ""
 "Une <literal>Configuration</literal> vous permet également de préciser des "
 "propriétés de configuration :"
 
 #. Tag: programlisting
-#: configuration.xml:53
+#: configuration.xml:75
 #, no-c-format
 msgid ""
 "<![CDATA[Configuration cfg = new Configuration()\n"
@@ -137,7 +138,7 @@
 msgstr ""
 
 #. Tag: para
-#: configuration.xml:55
+#: configuration.xml:77
 #, no-c-format
 msgid ""
 "This is not the only way to pass configuration properties to Hibernate. The "
@@ -147,27 +148,27 @@
 "Hibernate. Les différentes options sont :"
 
 #. 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 ""
 "Passer une instance de <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 ""
 "Placer <literal>hibernate.properties</literal> dans un répertoire racine du "
 "classpath"
 
 #. Tag: para
-#: configuration.xml:74
+#: configuration.xml:95
 #, no-c-format
 msgid ""
 "Set <literal>System</literal> properties using <literal>java -"
@@ -177,7 +178,7 @@
 "<literal>java -Dproperty=value</literal>."
 
 #. Tag: para
-#: configuration.xml:80
+#: configuration.xml:100
 #, no-c-format
 msgid ""
 "Include <literal>&lt;property&gt;</literal> elements in <literal>hibernate."
@@ -187,38 +188,40 @@
 "<literal>hibernate.cfg.xml</literal> (voir plus loin)."
 
 #. Tag: para
-#: configuration.xml:87
-#, no-c-format
+#: configuration.xml:107
+#, fuzzy, no-c-format
 msgid ""
-"<literal>hibernate.properties</literal> is the easiest approach if you want "
-"to get started quickly."
+"<filename>hibernate.properties</filename> is the easiest approach if you "
+"want to get started quickly."
 msgstr ""
 "L'utilisation d'<literal>hibernate.properties</literal> est l'approche la "
 "plus simple si vous voulez démarrer rapidement"
 
 #. 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, to be discarded once a <literal>SessionFactory</"
+"literal> is created."
 msgstr ""
 "La <literal>Configuration</literal> est un objet de démarrage qui sera "
 "supprimé une fois qu'une <literal>SessionFactory</literal> aura été créée."
 
 #. Tag: title
-#: configuration.xml:100
+#: configuration.xml:119
 #, no-c-format
 msgid "Obtaining a SessionFactory"
 msgstr "Obtenir une 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 ""
 "Une fois que tous les mappings ont été parsés par la <literal>Configuration</"
 "literal>, l'application doit obtenir une fabrique d'instances de "
@@ -226,50 +229,51 @@
 "threads de l'application :"
 
 #. 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 permet à votre application d'instancier plus d'une "
 "<literal>SessionFactory</literal>. Cela est pratique lorsque vous utilisez "
 "plus d'une base de données."
 
 #. Tag: title
-#: configuration.xml:119
+#: configuration.xml:138
 #, no-c-format
 msgid "JDBC connections"
 msgstr "Connexions 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:"
+"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:"
 msgstr ""
 "Habituellement, vous voulez que la <literal>SessionFactory</literal> crée "
 "les connexions JDBC et les mette dans un pool pour vous. Si vous suivez "
 "cette approche, ouvrir une <literal>Session</literal> est aussi simple que :"
 
 #. 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
+#: configuration.xml:148
 #, no-c-format
 msgid ""
 "As soon as you do something that requires access to the database, a JDBC "
@@ -279,13 +283,13 @@
 "une connexion JDBC sera récupérée dans le 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."
+"class <classname>org.hibernate.cfg.Environment</classname>. We will now "
+"describe the most important settings for JDBC connection configuration."
 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 "
@@ -294,26 +298,26 @@
 "connexions JDBC les plus importants."
 
 #. 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 obtiendra des connexions (et les mettra dans un pool) en utilisant "
 "<literal>java.sql.DriverManager</literal> si vous positionnez les paramètres "
 "de la manière suivante :"
 
 #. Tag: title
-#: configuration.xml:147
+#: configuration.xml:165
 #, no-c-format
 msgid "Hibernate JDBC Properties"
 msgstr "Propriétés JDBC d'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
 #, fuzzy, no-c-format
 msgid "Property name"
 msgstr ""
@@ -333,9 +337,9 @@
 "Nom de la propriété"
 
 #. 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
 #, fuzzy, no-c-format
 msgid "Purpose"
 msgstr ""
@@ -354,77 +358,77 @@
 "#-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#\n"
 "Fonction"
 
-#. 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 du 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 "utilisateur de la base de données"
 
-#. 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 "mot de passe de la base de données"
 
-#. 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 "nombre maximum de connexions dans le 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. "
 "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 <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 ""
 "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 "
@@ -437,15 +441,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'd like to use Proxool refer to the packaged "
+"<filename>hibernate.properties</filename> and the Hibernate web site for "
+"more information."
 msgstr ""
 "C3P0 est un pool de connexions JDBC open source distribué avec Hibernate "
 "dans le répertoire <literal>lib</literal>. Hibernate utilisera son provider "
@@ -456,16 +461,16 @@
 "site web d'Hibernate pour plus d'informations."
 
 #. 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:"
+"Here is an example <filename>hibernate.properties</filename> file for C3P0:"
 msgstr ""
 "Voici un exemple de fichier <literal>hibernate.properties</literal> pour "
 "C3P0:"
 
 #. Tag: programlisting
-#: configuration.xml:225
+#: configuration.xml:242
 #, no-c-format
 msgid ""
 "<![CDATA[hibernate.connection.driver_class = org.postgresql.Driver\n"
@@ -480,13 +485,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'll 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 "
@@ -495,43 +500,43 @@
 "propriétés suivantes :"
 
 #. Tag: title
-#: configuration.xml:235
+#: configuration.xml:251
 #, no-c-format
 msgid "Hibernate Datasource Properties"
 msgstr "Propriété d'une Datasource 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 "Nom JNDI de la datasource"
 
-#. 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 du fournisseur 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></"
@@ -539,29 +544,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's 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 "
 "l'utilisation d'une datasource JNDI fournie par un serveur d'applications :"
 
 #. Tag: programlisting
-#: configuration.xml:295
+#: configuration.xml:311
 #, no-c-format
 msgid ""
 "<![CDATA[hibernate.connection.datasource = java:/comp/env/jdbc/test\n"
@@ -573,7 +578,7 @@
 msgstr ""
 
 #. Tag: para
-#: configuration.xml:297
+#: configuration.xml:313
 #, no-c-format
 msgid ""
 "JDBC connections obtained from a JNDI datasource will automatically "
@@ -584,13 +589,13 @@
 "d'applications."
 
 #. 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>."
+"\"<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>."
 msgstr ""
 "Des propriétés supplémentaires de connexion peuvent être passées en "
 "préfixant le nom de la propriété par \"<literal>hibernate.connnection</"
@@ -598,13 +603,14 @@
 "utilisant <literal>hibernate.connection.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>."
+"implementing the interface <interfacename>org.hibernate.connection."
+"ConnectionProvider</interfacename>, and specifying your custom "
+"implementation via the <property>hibernate.connection.provider_class</"
+"property> property."
 msgstr ""
 "Vous pouvez fournir votre propre stratégie d'obtention des connexions JDBC "
 "en implémentant l'interface <literal>org.hibernate.connection."
@@ -613,13 +619,13 @@
 "literal>."
 
 #. Tag: title
-#: configuration.xml:317
+#: configuration.xml:333
 #, no-c-format
 msgid "Optional configuration properties"
 msgstr "Propriétés de configuration optionnelles"
 
 #. Tag: para
-#: configuration.xml:319
+#: configuration.xml:335
 #, no-c-format
 msgid ""
 "There are a number of other properties that control the behaviour of "
@@ -631,12 +637,12 @@
 "nominal."
 
 #. Tag: para
-#: configuration.xml:324
-#, no-c-format
+#: configuration.xml:340
+#, 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 "
+"Dproperty=value</literal> or <filename>hibernate.properties</filename>. They "
 "may <emphasis>not</emphasis> be set by the other techniques described above."
 msgstr ""
 "<emphasis>Attention : Certaines de ces propriétés sont uniquement de niveau "
@@ -647,30 +653,31 @@
 "techniques décrites ci-dessus."
 
 #. Tag: title
-#: configuration.xml:332
+#: configuration.xml:347
 #, no-c-format
 msgid "Hibernate Configuration Properties"
 msgstr "Propriétés de configuration d'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 ""
 "Le nom de la classe du <placeholder-1/> Hibernate. qui permet à Hibernate de "
 "générer du SQL optimisé pour une base de données relationnelle particulière. "
 "<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</"
@@ -716,14 +723,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 chose the correct "
+"<classname>org.hibernate.dialect.Dialect</classname> implementation to use "
+"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 "
@@ -735,11 +751,11 @@
 "<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> | "
@@ -785,27 +801,27 @@
 "<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 ""
 "Formate et indente le sql dans la console et dans le log <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 "
@@ -815,7 +831,7 @@
 "de table ne l'ayant pas surchargé. <placeholder-1/>"
 
 #. Tag: para
-#: configuration.xml:390
+#: configuration.xml:409
 #, fuzzy, no-c-format
 msgid "<emphasis role=\"strong\">eg.</emphasis> <literal>SCHEMA_NAME</literal>"
 msgstr ""
@@ -859,14 +875,14 @@
 "<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."
@@ -875,7 +891,7 @@
 "généré. <placeholder-1/>"
 
 #. Tag: para
-#: configuration.xml:403
+#: configuration.xml:422
 #, fuzzy, no-c-format
 msgid ""
 "<emphasis role=\"strong\">eg.</emphasis> <literal>CATALOG_NAME</literal>"
@@ -920,24 +936,24 @@
 "<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 ""
 "La <placeholder-1/> sera automatiquement liée à ce nom dans le JNDI après sa "
 "création. <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</"
@@ -983,14 +999,14 @@
 "<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 "
@@ -1003,7 +1019,7 @@
 "<placeholder-2/>"
 
 #. Tag: para
-#: configuration.xml:430
+#: configuration.xml:449
 #, no-c-format
 msgid ""
 "<emphasis role=\"strong\">eg.</emphasis> recommended values between "
@@ -1012,14 +1028,14 @@
 "<emphasis role=\"strong\">ex.</emphasis> valeurs recommandées entre "
 "<literal>0</literal> et <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."
 msgstr ""
@@ -1027,7 +1043,7 @@
 "<placeholder-1/>"
 
 #. Tag: para
-#: configuration.xml:443
+#: configuration.xml:462
 #, no-c-format
 msgid ""
 "<emphasis role=\"strong\">eg.</emphasis> recommended values <literal>4</"
@@ -1036,14 +1052,14 @@
 "<emphasis role=\"strong\">ex.</emphasis> Valeurs recommandées : <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 "
@@ -1053,7 +1069,7 @@
 "sessions ouvertes depuis cette <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</"
@@ -1062,14 +1078,14 @@
 "<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 "
@@ -1080,14 +1096,14 @@
 "éléments qui sont mis à jour. Cela permet de limiter les deadlocks de "
 "transaction dans les systèmes hautement concurents. <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."
@@ -1095,14 +1111,14 @@
 "Si activé, Hibernate va collecter des statistiques utiles pour le réglage "
 "des performances. <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 "
@@ -1112,14 +1128,14 @@
 "remises aux valeurs par défaut lorsque les objets seront supprimés. "
 "<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 "
@@ -1130,19 +1146,19 @@
 "2/>"
 
 #. Tag: title
-#: configuration.xml:521
+#: configuration.xml:540
 #, no-c-format
 msgid "Hibernate JDBC and Connection Properties"
 msgstr "Propriétés Hibernate liées à JDBC et aux connexions"
 
-#. 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."
@@ -1151,14 +1167,14 @@
 "Une valeur non nulle détermine la taille de chargement des statements JDBC "
 "(appelle <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 ""
@@ -1166,7 +1182,7 @@
 "batch de JDBC2. <placeholder-1/>"
 
 #. Tag: para
-#: configuration.xml:549
+#: configuration.xml:568
 #, no-c-format
 msgid ""
 "<emphasis role=\"strong\">eg.</emphasis> recommended values between "
@@ -1175,14 +1191,14 @@
 "<emphasis role=\"strong\">ex.</emphasis> les valeurs recommandées entre "
 "<literal>5</literal> et <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 "
@@ -1196,24 +1212,24 @@
 "versionner automatiquement les données. Par défaut = <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 ""
 "Sélectionne un <placeholder-1/> personnalisé. La plupart des applications "
 "n'auront pas besoin de cette propriété de configuration <placeholder-2/>"
 
 #. Tag: para
-#: configuration.xml:577
+#: configuration.xml:596
 #, fuzzy, no-c-format
 msgid ""
 "<emphasis role=\"strong\">eg.</emphasis> <literal>classname.of."
@@ -1259,14 +1275,14 @@
 "<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 "
@@ -1278,31 +1294,32 @@
 "JDBC fournie par l'utilisateur. Autrement, Hibernate utilise les métadonnées "
 "de la connexion. <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 ""
 "Utilise des flux lorsque l'on écrit/lit des types <placeholder-1/> ou "
 "<placeholder-2/> vers et à partir de JDBC (propriété de niveau système). "
 "<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> "
@@ -1318,8 +1335,8 @@
 "utilisant les meta données de connexion. <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>"
 msgstr ""
@@ -1363,24 +1380,25 @@
 "<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 ""
 "Le nom de la classe d'un <placeholder-1/> personnalisé qui fournit des "
 "connexions JDBC à Hibernate <placeholder-2/>"
 
 #. Tag: para
-#: configuration.xml:634
+#: configuration.xml:652
 #, fuzzy, no-c-format
 msgid ""
 "<emphasis role=\"strong\">eg.</emphasis> <literal>classname.of."
@@ -1426,19 +1444,20 @@
 "<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."
+"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."
 msgstr ""
 "Définit le niveau d'isolation des transactions JDBC. Regardez <placeholder-1/"
 "> pour connaître le sens des différentes valeurs mais notez également que la "
@@ -1446,7 +1465,7 @@
 "<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>"
 msgstr ""
@@ -1490,28 +1509,28 @@
 "<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)."
 msgstr ""
 "Active le mode de commit automatique (autocommit) pour les connexions JDBC "
 "du pool (non recommandé). <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 "
@@ -1536,7 +1555,7 @@
 "> pour des transactions JDBC. <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) | "
@@ -1548,7 +1567,7 @@
 "literal> | <literal>auto</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 "
@@ -1567,15 +1586,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 "
@@ -1583,14 +1602,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 "
@@ -1598,25 +1617,25 @@
 msgstr ""
 
 #. Tag: title
-#: configuration.xml:719
+#: configuration.xml:737
 #, no-c-format
 msgid "Hibernate Cache Properties"
 msgstr "Propriétés du Cache d'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 "Le nom de classe d'un <placeholder-1/> spécifique. <placeholder-2/>"
 
 #. Tag: para
-#: configuration.xml:736
+#: configuration.xml:754
 #, fuzzy, no-c-format
 msgid ""
 "<emphasis role=\"strong\">eg.</emphasis> <literal>classname.of."
@@ -1663,13 +1682,13 @@
 "<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 "
@@ -1682,13 +1701,13 @@
 "en cluster. <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."
@@ -1697,13 +1716,13 @@
 "être déclarées comme pouvant être mise en 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 "
@@ -1715,13 +1734,13 @@
 "<placeholder-1/> dans leur mapping. <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 "
@@ -1731,7 +1750,7 @@
 "<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</"
@@ -1778,13 +1797,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 ""
@@ -1792,7 +1811,7 @@
 "<placeholder-1/>"
 
 #. Tag: para
-#: configuration.xml:802
+#: configuration.xml:820
 #, fuzzy, no-c-format
 msgid "<emphasis role=\"strong\">eg.</emphasis> <literal>prefix</literal>"
 msgstr ""
@@ -1837,13 +1856,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-"
@@ -1853,19 +1872,19 @@
 "format plus adapté à la visualisation par un humain. <placeholder-1/>"
 
 #. Tag: title
-#: configuration.xml:826
+#: configuration.xml:844
 #, no-c-format
 msgid "Hibernate Transaction Properties"
 msgstr "Propriétés des transactions 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 "
@@ -1877,7 +1896,7 @@
 "<placeholder-4/>"
 
 #. Tag: para
-#: configuration.xml:845
+#: configuration.xml:863
 #, fuzzy, no-c-format
 msgid ""
 "<emphasis role=\"strong\">eg.</emphasis> <literal>classname.of."
@@ -1924,13 +1943,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 "
@@ -1940,13 +1959,13 @@
 "JTA du serveur d'applications. <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 "
@@ -1958,7 +1977,7 @@
 "environnement JTA. <placeholder-2/>"
 
 #. Tag: para
-#: configuration.xml:873
+#: configuration.xml:891
 #, fuzzy, no-c-format
 msgid ""
 "<emphasis role=\"strong\">eg.</emphasis> <literal>classname.of."
@@ -2005,13 +2024,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 "
@@ -2025,13 +2044,13 @@
 "\"architecture-current-session\"/>. <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 "
@@ -2044,19 +2063,19 @@
 "contexte fourni par Hibernate est recommandée, voir <placeholder-1/>"
 
 #. Tag: title
-#: configuration.xml:914
+#: configuration.xml:932
 #, no-c-format
 msgid "Miscellaneous Properties"
 msgstr "Propriétés diverses"
 
 #. 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\" "
@@ -2068,7 +2087,7 @@
 "d'informations sur les stratégies fournies. <placeholder-2/>"
 
 #. Tag: para
-#: configuration.xml:934
+#: configuration.xml:952
 #, fuzzy, no-c-format
 msgid ""
 "<emphasis role=\"strong\">eg.</emphasis> <literal>jta</literal> | "
@@ -2079,19 +2098,19 @@
 "<literal>thread</literal> | <literal>custom.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 "Choisi l'implémentation du parseur de requête <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."
@@ -2103,13 +2122,13 @@
 "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 "
@@ -2120,7 +2139,7 @@
 "1/>"
 
 #. Tag: para
-#: configuration.xml:961
+#: configuration.xml:979
 #, fuzzy, no-c-format
 msgid ""
 "<emphasis role=\"strong\">eg.</emphasis> <literal>hqlLiteral=SQL_LITERAL, "
@@ -2167,13 +2186,13 @@
 "<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 "
@@ -2187,7 +2206,7 @@
 "fermée explicitement. <placeholder-4/>"
 
 #. Tag: para
-#: configuration.xml:977
+#: configuration.xml:995
 #, fuzzy, no-c-format
 msgid ""
 "<emphasis role=\"strong\">eg.</emphasis> <literal>validate</literal> | "
@@ -2199,13 +2218,13 @@
 "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). "
@@ -2220,13 +2239,13 @@
 "définie que dans le fichier <placeholder-1/>. <placeholder-2/>"
 
 #. Tag: title
-#: configuration.xml:1004
+#: configuration.xml:1022
 #, no-c-format
 msgid "SQL Dialects"
 msgstr "Dialectes SQL"
 
 #. Tag: para
-#: configuration.xml:1006
+#: configuration.xml:1024
 #, no-c-format
 msgid ""
 "You should always set the <literal>hibernate.dialect</literal> property to "
@@ -2242,19 +2261,19 @@
 "listées ci-dessus, vous évitant l'effort de le faire à la main."
 
 #. Tag: title
-#: configuration.xml:1014
+#: configuration.xml:1032
 #, no-c-format
 msgid "Hibernate SQL Dialects (<literal>hibernate.dialect</literal>)"
 msgstr "Dialectes SQL d'Hibernate (<literal>hibernate.dialect</literal>)"
 
 #. Tag: entry
-#: configuration.xml:1022
+#: configuration.xml:1040
 #, no-c-format
 msgid "RDBMS"
 msgstr "SGBD"
 
 #. Tag: entry
-#: configuration.xml:1023
+#: configuration.xml:1041
 #, fuzzy, no-c-format
 msgid "Dialect"
 msgstr ""
@@ -2264,277 +2283,277 @@
 "Dialecte"
 
 #. 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
+#: configuration.xml:1070
 #, no-c-format
 msgid "Oracle 9i/10g"
 msgstr "Oracle 9i/10g"
 
 #. Tag: literal
-#: configuration.xml:1052
+#: configuration.xml:1070
 #, no-c-format
 msgid "org.hibernate.dialect.Oracle9Dialect"
 msgstr "org.hibernate.dialect.Oracle9Dialect"
 
 #. Tag: entry
-#: configuration.xml:1055
+#: configuration.xml:1073
 #, no-c-format
 msgid "Sybase"
 msgstr "Sybase"
 
 #. Tag: literal
-#: configuration.xml:1055
+#: configuration.xml:1073
 #, no-c-format
 msgid "org.hibernate.dialect.SybaseDialect"
 msgstr "org.hibernate.dialect.SybaseDialect"
 
 #. Tag: entry
-#: configuration.xml:1058
+#: configuration.xml:1076
 #, no-c-format
 msgid "Sybase Anywhere"
 msgstr "Sybase Anywhere"
 
 #. Tag: literal
-#: configuration.xml:1058
+#: configuration.xml:1076
 #, no-c-format
 msgid "org.hibernate.dialect.SybaseAnywhereDialect"
 msgstr "org.hibernate.dialect.SybaseAnywhereDialect"
 
 #. Tag: entry
-#: configuration.xml:1061
+#: configuration.xml:1079
 #, no-c-format
 msgid "Microsoft SQL Server"
 msgstr "Microsoft SQL Server"
 
 #. Tag: literal
-#: configuration.xml:1061
+#: configuration.xml:1079
 #, no-c-format
 msgid "org.hibernate.dialect.SQLServerDialect"
 msgstr "org.hibernate.dialect.SQLServerDialect"
 
 #. Tag: entry
-#: configuration.xml:1064
+#: configuration.xml:1082
 #, no-c-format
 msgid "SAP DB"
 msgstr "SAP DB"
 
 #. Tag: literal
-#: configuration.xml:1064
+#: configuration.xml:1082
 #, no-c-format
 msgid "org.hibernate.dialect.SAPDBDialect"
 msgstr "org.hibernate.dialect.SAPDBDialect"
 
 #. Tag: entry
-#: configuration.xml:1067
+#: configuration.xml:1085
 #, no-c-format
 msgid "Informix"
 msgstr "Informix"
 
 #. Tag: literal
-#: configuration.xml:1067
+#: configuration.xml:1085
 #, no-c-format
 msgid "org.hibernate.dialect.InformixDialect"
 msgstr "org.hibernate.dialect.InformixDialect"
 
 #. Tag: entry
-#: configuration.xml:1070
+#: configuration.xml:1088
 #, no-c-format
 msgid "HypersonicSQL"
 msgstr "HypersonicSQL"
 
 #. Tag: literal
-#: configuration.xml:1070
+#: configuration.xml:1088
 #, no-c-format
 msgid "org.hibernate.dialect.HSQLDialect"
 msgstr "org.hibernate.dialect.HSQLDialect"
 
 #. Tag: entry
-#: configuration.xml:1073
+#: configuration.xml:1091
 #, no-c-format
 msgid "Ingres"
 msgstr "Ingres"
 
 #. Tag: literal
-#: configuration.xml:1073
+#: configuration.xml:1091
 #, no-c-format
 msgid "org.hibernate.dialect.IngresDialect"
 msgstr "org.hibernate.dialect.IngresDialect"
 
 #. Tag: entry
-#: configuration.xml:1076
+#: configuration.xml:1094
 #, no-c-format
 msgid "Progress"
 msgstr "Progress"
 
 #. Tag: literal
-#: configuration.xml:1076
+#: configuration.xml:1094
 #, no-c-format
 msgid "org.hibernate.dialect.ProgressDialect"
 msgstr "org.hibernate.dialect.ProgressDialect"
 
 #. Tag: entry
-#: configuration.xml:1079
+#: configuration.xml:1097
 #, no-c-format
 msgid "Mckoi SQL"
 msgstr "Mckoi SQL"
 
 #. Tag: literal
-#: configuration.xml:1079
+#: configuration.xml:1097
 #, no-c-format
 msgid "org.hibernate.dialect.MckoiDialect"
 msgstr "org.hibernate.dialect.MckoiDialect"
 
 #. Tag: entry
-#: configuration.xml:1082
+#: configuration.xml:1100
 #, no-c-format
 msgid "Interbase"
 msgstr "Interbase"
 
 #. Tag: literal
-#: configuration.xml:1082
+#: configuration.xml:1100
 #, no-c-format
 msgid "org.hibernate.dialect.InterbaseDialect"
 msgstr "org.hibernate.dialect.InterbaseDialect"
 
 #. Tag: entry
-#: configuration.xml:1085
+#: configuration.xml:1103
 #, no-c-format
 msgid "Pointbase"
 msgstr "Pointbase"
 
 #. Tag: literal
-#: configuration.xml:1085
+#: configuration.xml:1103
 #, no-c-format
 msgid "org.hibernate.dialect.PointbaseDialect"
 msgstr "org.hibernate.dialect.PointbaseDialect"
 
 #. Tag: entry
-#: configuration.xml:1088
+#: configuration.xml:1106
 #, no-c-format
 msgid "FrontBase"
 msgstr "FrontBase"
 
 #. Tag: literal
-#: configuration.xml:1088
+#: configuration.xml:1106
 #, no-c-format
 msgid "org.hibernate.dialect.FrontbaseDialect"
 msgstr "org.hibernate.dialect.FrontbaseDialect"
 
 #. Tag: entry
-#: configuration.xml:1091
+#: configuration.xml:1109
 #, no-c-format
 msgid "Firebird"
 msgstr "Firebird"
 
 #. Tag: literal
-#: configuration.xml:1091
+#: configuration.xml:1109
 #, no-c-format
 msgid "org.hibernate.dialect.FirebirdDialect"
 msgstr "org.hibernate.dialect.FirebirdDialect"
 
 #. Tag: title
-#: configuration.xml:1100
+#: configuration.xml:1118
 #, no-c-format
 msgid "Outer Join Fetching"
 msgstr "Chargement par Jointure Ouverte"
 
 #. Tag: para
-#: configuration.xml:1102
+#: configuration.xml:1120
 #, no-c-format
 msgid ""
 "If your database supports ANSI, Oracle or Sybase style outer joins, "
@@ -2554,7 +2573,7 @@
 "un d'être chargé en un seul <literal>SELECT</literal> SQL."
 
 #. Tag: para
-#: configuration.xml:1111
+#: configuration.xml:1129
 #, no-c-format
 msgid ""
 "Outer join fetching may be disabled <emphasis>globally</emphasis> by setting "
@@ -2571,7 +2590,7 @@
 "<literal>fetch=\"join\"</literal>."
 
 #. Tag: para
-#: configuration.xml:1119
+#: configuration.xml:1137
 #, no-c-format
 msgid "See <xref linkend=\"performance-fetching\"/> for more information."
 msgstr ""
@@ -2579,13 +2598,13 @@
 "d'information."
 
 #. Tag: title
-#: configuration.xml:1126
+#: configuration.xml:1144
 #, no-c-format
 msgid "Binary Streams"
 msgstr "Flux binaires"
 
 #. Tag: para
-#: configuration.xml:1128
+#: configuration.xml:1146
 #, no-c-format
 msgid ""
 "Oracle limits the size of <literal>byte</literal> arrays that may be passed "
@@ -2602,13 +2621,13 @@
 "niveau système uniquement.</emphasis>"
 
 #. Tag: title
-#: configuration.xml:1139
+#: configuration.xml:1157
 #, no-c-format
 msgid "Second-level and query cache"
 msgstr "Cache de second niveau et cache de requêtes"
 
 #. Tag: para
-#: configuration.xml:1141
+#: configuration.xml:1159
 #, no-c-format
 msgid ""
 "The properties prefixed by <literal>hibernate.cache</literal> allow you to "
@@ -2622,13 +2641,13 @@
 "pour plus de détails."
 
 #. Tag: title
-#: configuration.xml:1151
+#: configuration.xml:1169
 #, no-c-format
 msgid "Query Language Substitution"
 msgstr "Substitution dans le langage de requêtage"
 
 #. Tag: para
-#: configuration.xml:1153
+#: configuration.xml:1171
 #, no-c-format
 msgid ""
 "You may define new Hibernate query tokens using <literal>hibernate.query."
@@ -2639,13 +2658,13 @@
 "exemple :"
 
 #. Tag: programlisting
-#: configuration.xml:1158
+#: configuration.xml:1176
 #, no-c-format
 msgid "hibernate.query.substitutions true=1, false=0"
 msgstr "hibernate.query.substitutions vrai=1, faux=0"
 
 #. Tag: para
-#: configuration.xml:1160
+#: configuration.xml:1178
 #, no-c-format
 msgid ""
 "would cause the tokens <literal>true</literal> and <literal>false</literal> "
@@ -2655,13 +2674,13 @@
 "par des entiers dans le SQL généré."
 
 #. Tag: programlisting
-#: configuration.xml:1165
+#: configuration.xml:1183
 #, no-c-format
 msgid "hibernate.query.substitutions toLowercase=LOWER"
 msgstr "hibernate.query.substitutions toLowercase=LOWER"
 
 #. Tag: para
-#: configuration.xml:1167
+#: configuration.xml:1185
 #, no-c-format
 msgid "would allow you to rename the SQL <literal>LOWER</literal> function."
 msgstr ""
@@ -2669,13 +2688,13 @@
 "<literal>toLowercase</literal>"
 
 #. Tag: title
-#: configuration.xml:1174
+#: configuration.xml:1192
 #, no-c-format
 msgid "Hibernate statistics"
 msgstr "Statistiques Hibernate"
 
 #. Tag: para
-#: configuration.xml:1176
+#: configuration.xml:1194
 #, no-c-format
 msgid ""
 "If you enable <literal>hibernate.generate_statistics</literal>, Hibernate "
@@ -2692,39 +2711,31 @@
 "<literal>org.hibernate.stats</literal> pour plus d'informations."
 
 #. Tag: title
-#: configuration.xml:1188
+#: configuration.xml:1206
 #, no-c-format
 msgid "Logging"
 msgstr "Tracer"
 
 #. Tag: para
-#: configuration.xml:1190
+#: configuration.xml:1208
 #, no-c-format
-msgid "Hibernate logs various events using Apache commons-logging."
-msgstr "Hibernate trace divers évènements en utilisant 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 "
+"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."
 msgstr ""
-"Le service commons-logging délèguera directement à Apache Log4j (si vous "
-"incluez <literal>log4j.jar</literal> dans votre classpath) ou le système de "
-"trace du JDK 1.4 (si vous tournez sous le JDK 1.4 et supérieur). Vous pouvez "
-"télécharger Log4j à partir de <literal>http://jakarta.apache.org</literal>. "
-"Pour utiliser Log4j, vous devrez placer dans votre classpath un fichier "
-"<literal>log4j.properties</literal>. Un exemple de fichier est distribué "
-"avec Hibernate dans le répertoire <literal>src/</literal>."
 
 #. Tag: para
-#: configuration.xml:1204
+#: configuration.xml:1219
 #, no-c-format
 msgid ""
 "We strongly recommend that you familiarize yourself with Hibernate's log "
@@ -2740,31 +2751,31 @@
 "suivantes :"
 
 #. Tag: title
-#: configuration.xml:1213
+#: configuration.xml:1228
 #, no-c-format
 msgid "Hibernate Log Categories"
 msgstr "Catégories de trace d'Hibernate"
 
 #. Tag: entry
-#: configuration.xml:1219
+#: configuration.xml:1234
 #, no-c-format
 msgid "Category"
 msgstr "Catégorie"
 
 #. Tag: entry
-#: configuration.xml:1220
+#: configuration.xml:1235
 #, no-c-format
 msgid "Function"
 msgstr "Fonction"
 
 #. Tag: literal
-#: configuration.xml:1225
+#: configuration.xml:1240
 #, no-c-format
 msgid "org.hibernate.SQL"
 msgstr "org.hibernate.SQL"
 
 #. Tag: entry
-#: configuration.xml:1226
+#: configuration.xml:1241
 #, no-c-format
 msgid "Log all SQL DML statements as they are executed"
 msgstr ""
@@ -2772,25 +2783,25 @@
 "exécutées"
 
 #. Tag: literal
-#: configuration.xml:1229
+#: configuration.xml:1244
 #, no-c-format
 msgid "org.hibernate.type"
 msgstr "org.hibernate.type"
 
 #. Tag: entry
-#: configuration.xml:1230
+#: configuration.xml:1245
 #, no-c-format
 msgid "Log all JDBC parameters"
 msgstr "Trace tous les paramètres JDBC"
 
 #. Tag: literal
-#: configuration.xml:1233
+#: configuration.xml:1248
 #, no-c-format
 msgid "org.hibernate.tool.hbm2ddl"
 msgstr "org.hibernate.tool.hbm2ddl"
 
 #. Tag: entry
-#: configuration.xml:1234
+#: configuration.xml:1249
 #, no-c-format
 msgid "Log all SQL DDL statements as they are executed"
 msgstr ""
@@ -2798,13 +2809,13 @@
 "base) qui sont exécutées"
 
 #. Tag: literal
-#: configuration.xml:1237
+#: configuration.xml:1252
 #, no-c-format
 msgid "org.hibernate.pretty"
 msgstr "org.hibernate.pretty"
 
 #. Tag: entry
-#: configuration.xml:1238
+#: configuration.xml:1253
 #, no-c-format
 msgid ""
 "Log the state of all entities (max 20 entities) associated with the session "
@@ -2814,49 +2825,49 @@
 "avec la session hibernate au moment du flush"
 
 #. Tag: literal
-#: configuration.xml:1244
+#: configuration.xml:1259
 #, no-c-format
 msgid "org.hibernate.cache"
 msgstr "org.hibernate.cache"
 
 #. Tag: entry
-#: configuration.xml:1245
+#: configuration.xml:1260
 #, no-c-format
 msgid "Log all second-level cache activity"
 msgstr "Trace toute l'activité du cache de second niveau"
 
 #. Tag: literal
-#: configuration.xml:1248
+#: configuration.xml:1263
 #, no-c-format
 msgid "org.hibernate.transaction"
 msgstr "org.hibernate.transaction"
 
 #. Tag: entry
-#: configuration.xml:1249
+#: configuration.xml:1264
 #, no-c-format
 msgid "Log transaction related activity"
 msgstr "Trace toute l'activité relative aux transactions"
 
 #. Tag: literal
-#: configuration.xml:1252
+#: configuration.xml:1267
 #, no-c-format
 msgid "org.hibernate.jdbc"
 msgstr "org.hibernate.jdbc"
 
 #. Tag: entry
-#: configuration.xml:1253
+#: configuration.xml:1268
 #, no-c-format
 msgid "Log all JDBC resource acquisition"
 msgstr "Trace toute acquisition de ressource JDBC"
 
 #. Tag: literal
-#: configuration.xml:1256
+#: configuration.xml:1271
 #, no-c-format
 msgid "org.hibernate.hql.ast.AST"
 msgstr "org.hibernate.hql.ast.AST"
 
 #. Tag: entry
-#: configuration.xml:1257
+#: configuration.xml:1272
 #, no-c-format
 msgid "Log HQL and SQL ASTs during query parsing"
 msgstr ""
@@ -2864,25 +2875,25 @@
 "des requêtes"
 
 #. Tag: literal
-#: configuration.xml:1262
+#: configuration.xml:1277
 #, no-c-format
 msgid "org.hibernate.secure"
 msgstr "org.hibernate.secure"
 
 #. Tag: entry
-#: configuration.xml:1263
+#: configuration.xml:1278
 #, no-c-format
 msgid "Log all JAAS authorization requests"
 msgstr "Trace toutes les demandes d'autorisation JAAS"
 
 #. Tag: literal
-#: configuration.xml:1266
+#: configuration.xml:1281
 #, no-c-format
 msgid "org.hibernate"
 msgstr "org.hibernate"
 
 #. Tag: entry
-#: configuration.xml:1267
+#: configuration.xml:1282
 #, no-c-format
 msgid ""
 "Log everything (a lot of information, but very useful for troubleshooting)"
@@ -2891,7 +2902,7 @@
 "problèmes)."
 
 #. Tag: para
-#: configuration.xml:1276
+#: configuration.xml:1291
 #, no-c-format
 msgid ""
 "When developing applications with Hibernate, you should almost always work "
@@ -2905,13 +2916,13 @@
 "propriété <literal>hibernate.show_sql</literal> activée."
 
 #. Tag: title
-#: configuration.xml:1286
+#: configuration.xml:1301
 #, no-c-format
 msgid "Implementing a <literal>NamingStrategy</literal>"
 msgstr "Implémenter une <literal>NamingStrategy</literal>"
 
 #. Tag: para
-#: configuration.xml:1288
+#: configuration.xml:1303
 #, no-c-format
 msgid ""
 "The interface <literal>org.hibernate.cfg.NamingStrategy</literal> allows you "
@@ -2922,7 +2933,7 @@
 "de données."
 
 #. Tag: para
-#: configuration.xml:1293
+#: configuration.xml:1308
 #, no-c-format
 msgid ""
 "You may provide rules for automatically generating database identifiers from "
@@ -2941,7 +2952,7 @@
 "utilisée par Hibernate est minimale."
 
 #. Tag: para
-#: configuration.xml:1302
+#: configuration.xml:1317
 #, no-c-format
 msgid ""
 "You may specify a different strategy by calling <literal>Configuration."
@@ -2952,7 +2963,7 @@
 "mappings :"
 
 #. Tag: programlisting
-#: configuration.xml:1307
+#: configuration.xml:1322
 #, no-c-format
 msgid ""
 "<![CDATA[SessionFactory sf = new Configuration()\n"
@@ -2963,7 +2974,7 @@
 msgstr ""
 
 #. Tag: para
-#: configuration.xml:1309
+#: configuration.xml:1324
 #, no-c-format
 msgid ""
 "<literal>org.hibernate.cfg.ImprovedNamingStrategy</literal> is a built-in "
@@ -2974,13 +2985,13 @@
 "applications."
 
 #. Tag: title
-#: configuration.xml:1317
+#: configuration.xml:1332
 #, no-c-format
 msgid "XML configuration file"
 msgstr "Fichier de configuration XML"
 
 #. Tag: para
-#: configuration.xml:1319
+#: configuration.xml:1334
 #, no-c-format
 msgid ""
 "An alternative approach to configuration is to specify a full configuration "
@@ -2995,7 +3006,7 @@
 "présents."
 
 #. Tag: para
-#: configuration.xml:1326
+#: configuration.xml:1341
 #, no-c-format
 msgid ""
 "The XML configuration file is by default expected to be in the root o your "
@@ -3005,7 +3016,7 @@
 "<literal>CLASSPATH</literal>. En voici un exemple :"
 
 #. Tag: programlisting
-#: configuration.xml:1331
+#: configuration.xml:1346
 #, no-c-format
 msgid ""
 "<![CDATA[<?xml version='1.0' encoding='utf-8'?>\n"
@@ -3049,7 +3060,7 @@
 msgstr ""
 
 #. Tag: para
-#: configuration.xml:1333
+#: configuration.xml:1348
 #, no-c-format
 msgid ""
 "As you can see, the advantage of this approach is the externalization of the "
@@ -3069,7 +3080,7 @@
 "dessus."
 
 #. Tag: para
-#: configuration.xml:1342
+#: configuration.xml:1357
 #, no-c-format
 msgid "With the XML configuration, starting Hibernate is then as simple as"
 msgstr ""
@@ -3077,7 +3088,7 @@
 "ceci :"
 
 #. Tag: programlisting
-#: configuration.xml:1346
+#: configuration.xml:1361
 #, no-c-format
 msgid ""
 "<![CDATA[SessionFactory sf = new Configuration().configure()."
@@ -3085,13 +3096,13 @@
 msgstr ""
 
 #. Tag: para
-#: configuration.xml:1348
+#: configuration.xml:1363
 #, no-c-format
 msgid "You can pick a different XML configuration file using"
 msgstr "You can pick a different XML configuration file using"
 
 #. Tag: programlisting
-#: configuration.xml:1352
+#: configuration.xml:1367
 #, no-c-format
 msgid ""
 "<![CDATA[SessionFactory sf = new Configuration()\n"
@@ -3100,20 +3111,20 @@
 msgstr ""
 
 #. Tag: title
-#: configuration.xml:1357
+#: configuration.xml:1372
 #, no-c-format
 msgid "J2EE Application Server integration"
 msgstr "Intégration à un serveur d'application J2EE"
 
 #. Tag: para
-#: configuration.xml:1359
+#: configuration.xml:1374
 #, 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:1365
+#: configuration.xml:1380
 #, no-c-format
 msgid ""
 "<emphasis>Container-managed datasources</emphasis>: Hibernate can use JDBC "
@@ -3137,7 +3148,7 @@
 "de votre code entre plusieurs serveurs d'application."
 
 #. Tag: para
-#: configuration.xml:1380
+#: configuration.xml:1395
 #, no-c-format
 msgid ""
 "<emphasis>Automatic JNDI binding</emphasis>: Hibernate can bind its "
@@ -3147,7 +3158,7 @@
 "sa <literal>SessionFactory</literal> à JNDI après le démarrage."
 
 #. Tag: para
-#: configuration.xml:1389
+#: configuration.xml:1404
 #, no-c-format
 msgid ""
 "<emphasis>JTA Session binding:</emphasis> The Hibernate <literal>Session</"
@@ -3168,7 +3179,7 @@
 "descripteurs de déploiement."
 
 #. Tag: para
-#: configuration.xml:1402
+#: configuration.xml:1417
 #, no-c-format
 msgid ""
 "<emphasis>JMX deployment:</emphasis> If you have a JMX capable application "
@@ -3189,7 +3200,7 @@
 "disponible avant qu'Hibernate ne démarre, etc)."
 
 #. Tag: para
-#: configuration.xml:1413
+#: configuration.xml:1428
 #, no-c-format
 msgid ""
 "Depending on your environment, you might have to set the configuration "
@@ -3202,13 +3213,13 @@
 "containment\"."
 
 #. Tag: title
-#: configuration.xml:1420
+#: configuration.xml:1435
 #, no-c-format
 msgid "Transaction strategy configuration"
 msgstr "Configuration de la stratégie transactionnelle"
 
 #. Tag: para
-#: configuration.xml:1422
+#: configuration.xml:1437
 #, no-c-format
 msgid ""
 "The Hibernate <literal>Session</literal> API is independent of any "
@@ -3228,7 +3239,7 @@
 "literal> lorsque cela est nécessaire."
 
 #. Tag: para
-#: configuration.xml:1430
+#: configuration.xml:1445
 #, no-c-format
 msgid ""
 "To keep your code portable between these two (and other) environments we "
@@ -3247,32 +3258,32 @@
 "literal>."
 
 #. Tag: para
-#: configuration.xml:1437
+#: configuration.xml:1452
 #, no-c-format
 msgid "There are three standard (built-in) choices:"
 msgstr "Il existe trois choix standards (fournis) :"
 
 #. Tag: literal
-#: configuration.xml:1443
+#: configuration.xml:1458
 #, no-c-format
 msgid "org.hibernate.transaction.JDBCTransactionFactory"
 msgstr "net.sf.hibernate.transaction.JDBCTransactionFactory"
 
 #. Tag: para
-#: configuration.xml:1445
+#: configuration.xml:1460
 #, 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:1449
+#: configuration.xml:1464
 #, no-c-format
 msgid "org.hibernate.transaction.JTATransactionFactory"
 msgstr "org.hibernate.transaction.JTATransactionFactory"
 
 #. Tag: para
-#: configuration.xml:1451
+#: configuration.xml:1466
 #, no-c-format
 msgid ""
 "delegates to container-managed transaction if an existing transaction is "
@@ -3284,19 +3295,19 @@
 "transaction gérée par le bean est utilisée."
 
 #. Tag: literal
-#: configuration.xml:1459
+#: configuration.xml:1474
 #, no-c-format
 msgid "org.hibernate.transaction.CMTTransactionFactory"
 msgstr "org.hibernate.transaction.CMTTransactionFactory"
 
 #. Tag: para
-#: configuration.xml:1461
+#: configuration.xml:1476
 #, 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:1466
+#: configuration.xml:1481
 #, no-c-format
 msgid ""
 "You may also define your own transaction strategies (for a CORBA transaction "
@@ -3306,7 +3317,7 @@
 "un service de transaction CORBA par exemple)."
 
 #. Tag: para
-#: configuration.xml:1471
+#: configuration.xml:1486
 #, no-c-format
 msgid ""
 "Some features in Hibernate (i.e. the second level cache, Contextual Sessions "
@@ -3324,151 +3335,151 @@
 "J2EE ne fournit pas un seul mécanisme standard."
 
 #. Tag: title
-#: configuration.xml:1479
+#: configuration.xml:1494
 #, no-c-format
 msgid "JTA TransactionManagers"
 msgstr "TransactionManagers JTA"
 
 #. Tag: entry
-#: configuration.xml:1485
+#: configuration.xml:1500
 #, no-c-format
 msgid "Transaction Factory"
 msgstr "Fabrique de Transaction"
 
 #. Tag: entry
-#: configuration.xml:1486
+#: configuration.xml:1501
 #, no-c-format
 msgid "Application Server"
 msgstr "Serveur d'application"
 
 #. Tag: literal
-#: configuration.xml:1491
+#: configuration.xml:1506
 #, no-c-format
 msgid "org.hibernate.transaction.JBossTransactionManagerLookup"
 msgstr "org.hibernate.transaction.JBossTransactionManagerLookup"
 
 #. Tag: entry
-#: configuration.xml:1492
+#: configuration.xml:1507
 #, no-c-format
 msgid "JBoss"
 msgstr "JBoss"
 
 #. Tag: literal
-#: configuration.xml:1495
+#: configuration.xml:1510
 #, no-c-format
 msgid "org.hibernate.transaction.WeblogicTransactionManagerLookup"
 msgstr "org.hibernate.transaction.WeblogicTransactionManagerLookup"
 
 #. Tag: entry
-#: configuration.xml:1496
+#: configuration.xml:1511
 #, no-c-format
 msgid "Weblogic"
 msgstr "Weblogic"
 
 #. Tag: literal
-#: configuration.xml:1499
+#: configuration.xml:1514
 #, no-c-format
 msgid "org.hibernate.transaction.WebSphereTransactionManagerLookup"
 msgstr "org.hibernate.transaction.WebSphereTransactionManagerLookup"
 
 #. Tag: entry
-#: configuration.xml:1500
+#: configuration.xml:1515
 #, no-c-format
 msgid "WebSphere"
 msgstr "WebSphere"
 
 #. Tag: literal
-#: configuration.xml:1503
+#: configuration.xml:1518
 #, no-c-format
 msgid "org.hibernate.transaction.WebSphereExtendedJTATransactionLookup"
 msgstr "org.hibernate.transaction.WebSphereExtendedJTATransactionLookup"
 
 #. Tag: entry
-#: configuration.xml:1504
+#: configuration.xml:1519
 #, no-c-format
 msgid "WebSphere 6"
 msgstr "WebSphere 6"
 
 #. Tag: literal
-#: configuration.xml:1507
+#: configuration.xml:1522
 #, no-c-format
 msgid "org.hibernate.transaction.OrionTransactionManagerLookup"
 msgstr "org.hibernate.transaction.OrionTransactionManagerLookup"
 
 #. Tag: entry
-#: configuration.xml:1508
+#: configuration.xml:1523
 #, no-c-format
 msgid "Orion"
 msgstr "Orion"
 
 #. Tag: literal
-#: configuration.xml:1511
+#: configuration.xml:1526
 #, no-c-format
 msgid "org.hibernate.transaction.ResinTransactionManagerLookup"
 msgstr "org.hibernate.transaction.ResinTransactionManagerLookup"
 
 #. Tag: entry
-#: configuration.xml:1512
+#: configuration.xml:1527
 #, no-c-format
 msgid "Resin"
 msgstr "Resin"
 
 #. Tag: literal
-#: configuration.xml:1515
+#: configuration.xml:1530
 #, no-c-format
 msgid "org.hibernate.transaction.JOTMTransactionManagerLookup"
 msgstr "org.hibernate.transaction.JOTMTransactionManagerLookup"
 
 #. Tag: entry
-#: configuration.xml:1516
+#: configuration.xml:1531
 #, no-c-format
 msgid "JOTM"
 msgstr "JOTM"
 
 #. Tag: literal
-#: configuration.xml:1519
+#: configuration.xml:1534
 #, no-c-format
 msgid "org.hibernate.transaction.JOnASTransactionManagerLookup"
 msgstr "org.hibernate.transaction.JOnASTransactionManagerLookup"
 
 #. Tag: entry
-#: configuration.xml:1520
+#: configuration.xml:1535
 #, no-c-format
 msgid "JOnAS"
 msgstr "JOnAS"
 
 #. Tag: literal
-#: configuration.xml:1523
+#: configuration.xml:1538
 #, no-c-format
 msgid "org.hibernate.transaction.JRun4TransactionManagerLookup"
 msgstr "org.hibernate.transaction.JRun4TransactionManagerLookup"
 
 #. Tag: entry
-#: configuration.xml:1524
+#: configuration.xml:1539
 #, no-c-format
 msgid "JRun4"
 msgstr "JRun4"
 
 #. Tag: literal
-#: configuration.xml:1527
+#: configuration.xml:1542
 #, no-c-format
 msgid "org.hibernate.transaction.BESTransactionManagerLookup"
 msgstr "org.hibernate.transaction.BESTransactionManagerLookup"
 
 #. Tag: entry
-#: configuration.xml:1528
+#: configuration.xml:1543
 #, no-c-format
 msgid "Borland ES"
 msgstr "Borland ES"
 
 #. Tag: title
-#: configuration.xml:1537
+#: configuration.xml:1552
 #, no-c-format
 msgid "JNDI-bound <literal>SessionFactory</literal>"
 msgstr "<literal>SessionFactory</literal> associée au JNDI"
 
 #. Tag: para
-#: configuration.xml:1539
+#: configuration.xml:1554
 #, no-c-format
 msgid ""
 "A JNDI bound Hibernate <literal>SessionFactory</literal> can simplify the "
@@ -3483,7 +3494,7 @@
 "même registre."
 
 #. Tag: para
-#: configuration.xml:1546
+#: configuration.xml:1561
 #, no-c-format
 msgid ""
 "If you wish to have the <literal>SessionFactory</literal> bound to a JNDI "
@@ -3502,7 +3513,7 @@
 "Tomcat)."
 
 #. Tag: para
-#: configuration.xml:1554
+#: configuration.xml:1569
 #, no-c-format
 msgid ""
 "When binding the <literal>SessionFactory</literal> to JNDI, Hibernate will "
@@ -3517,7 +3528,7 @@
 "literal> par défaut sera utilisé."
 
 #. Tag: para
-#: configuration.xml:1561
+#: configuration.xml:1576
 #, no-c-format
 msgid ""
 "Hibernate will automatically place the <literal>SessionFactory</literal> in "
@@ -3534,7 +3545,7 @@
 "plus tard dans ce document."
 
 #. Tag: para
-#: configuration.xml:1568
+#: configuration.xml:1583
 #, no-c-format
 msgid ""
 "If you use a JNDI <literal>SessionFactory</literal>, an EJB or any other "
@@ -3545,7 +3556,7 @@
 "utilisant un lookup JNDI."
 
 #. Tag: para
-#: configuration.xml:1573
+#: configuration.xml:1588
 #, no-c-format
 msgid ""
 "We recommend that you bind the <literal>SessionFactory</literal> to JNDI in "
@@ -3566,13 +3577,13 @@
 "voir chapitre 1."
 
 #. Tag: title
-#: configuration.xml:1585
+#: configuration.xml:1600
 #, no-c-format
 msgid "Current Session context management with JTA"
 msgstr "Association automatique de la Session à JTA"
 
 #. Tag: para
-#: configuration.xml:1587
+#: configuration.xml:1602
 #, no-c-format
 msgid ""
 "The easiest way to handle <literal>Session</literal>s and transactions is "
@@ -3616,13 +3627,13 @@
 "avec CMT est recommandée."
 
 #. Tag: title
-#: configuration.xml:1610
+#: configuration.xml:1625
 #, no-c-format
 msgid "JMX deployment"
 msgstr "Déploiement JMX"
 
 #. Tag: para
-#: configuration.xml:1612
+#: configuration.xml:1627
 #, no-c-format
 msgid ""
 "The line <literal>cfg.buildSessionFactory()</literal> still has to be "
@@ -3639,7 +3650,7 @@
 "managé</emphasis>."
 
 #. Tag: para
-#: configuration.xml:1620
+#: configuration.xml:1635
 #, no-c-format
 msgid ""
 "Hibernate is distributed with <literal>org.hibernate.jmx.HibernateService</"
@@ -3654,7 +3665,7 @@
 "d'exemple pour JBoss 4.0.x:"
 
 #. Tag: programlisting
-#: configuration.xml:1627
+#: configuration.xml:1642
 #, no-c-format
 msgid ""
 "<![CDATA[<?xml version=\"1.0\"?>\n"
@@ -3705,7 +3716,7 @@
 msgstr ""
 
 #. Tag: para
-#: configuration.xml:1629
+#: configuration.xml:1644
 #, no-c-format
 msgid ""
 "This file is deployed in a directory called <literal>META-INF</literal> and "
@@ -3728,6 +3739,27 @@
 "unité déployable à chaud. Vous pouvez consulter la documentation de JBoss AS "
 "pour plus d'information sur les services JMX et le déploiement des EJBs."
 
+#~ msgid "Hibernate logs various events using Apache commons-logging."
+#~ msgstr ""
+#~ "Hibernate trace divers évènements en utilisant 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 ""
+#~ "Le service commons-logging délèguera directement à Apache Log4j (si vous "
+#~ "incluez <literal>log4j.jar</literal> dans votre classpath) ou le système "
+#~ "de trace du JDK 1.4 (si vous tournez sous le JDK 1.4 et supérieur). Vous "
+#~ "pouvez télécharger Log4j à partir de <literal>http://jakarta.apache.org</"
+#~ "literal>. Pour utiliser Log4j, vous devrez placer dans votre classpath un "
+#~ "fichier <literal>log4j.properties</literal>. Un exemple de fichier est "
+#~ "distribué avec Hibernate dans le répertoire <literal>src/</literal>."
+
 #~ msgid "<placeholder-1/> (optional)"
 #~ msgstr "<placeholder-1/> (optionnelle)"
 

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	2008-08-14 15:28:13 UTC (rev 15066)
+++ core/trunk/documentation/manual/src/main/docbook/fr-FR/content/events.po	2008-08-14 15:35:40 UTC (rev 15067)
@@ -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: 2008-08-14 15:28+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,13 +11,13 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: events.xml:5
+#: events.xml:29
 #, no-c-format
 msgid "Interceptors and events"
 msgstr "Les intercepteurs et les événements"
 
 #. Tag: para
-#: events.xml:7
+#: events.xml:31
 #, no-c-format
 msgid ""
 "It is often useful for the application to react to certain events that occur "
@@ -30,13 +30,13 @@
 "d'Hibernate."
 
 #. Tag: title
-#: events.xml:14
+#: events.xml:38
 #, no-c-format
 msgid "Interceptors"
 msgstr "Intercepteurs"
 
 #. Tag: para
-#: events.xml:16
+#: events.xml:40
 #, no-c-format
 msgid ""
 "The <literal>Interceptor</literal> interface provides callbacks from the "
@@ -60,7 +60,7 @@
 "un <literal>Auditable</literal> est mis à jour."
 
 #. Tag: para
-#: events.xml:27
+#: events.xml:51
 #, no-c-format
 msgid ""
 "You may either implement <literal>Interceptor</literal> directly or (better) "
@@ -70,7 +70,7 @@
 "(mieux) étendre <literal>EmptyInterceptor</literal>."
 
 #. Tag: programlisting
-#: events.xml:32
+#: events.xml:56
 #, no-c-format
 msgid ""
 "<![CDATA[package org.hibernate.test;\n"
@@ -159,7 +159,7 @@
 msgstr ""
 
 #. Tag: para
-#: events.xml:34
+#: events.xml:58
 #, no-c-format
 msgid ""
 "Interceptors come in two flavors: <literal>Session</literal>-scoped and "
@@ -169,7 +169,7 @@
 "<literal>SessionFactory</literal>-scoped."
 
 #. Tag: para
-#: events.xml:39
+#: events.xml:63
 #, no-c-format
 msgid ""
 "A <literal>Session</literal>-scoped interceptor is specified when a session "
@@ -181,13 +181,13 @@
 "accepting an <literal>Interceptor</literal>."
 
 #. 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
+#: events.xml:71
 #, no-c-format
 msgid ""
 "A <literal>SessionFactory</literal>-scoped interceptor is registered with "
@@ -209,20 +209,20 @@
 "multiple sessions will use this interceptor (potentially) concurrently."
 
 #. 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 "Système d'événements"
 
 #. Tag: para
-#: events.xml:63
+#: events.xml:87
 #, no-c-format
 msgid ""
 "If you have to react to particular events in your persistence layer, you may "
@@ -235,7 +235,7 @@
 "être utilisé en supplément ou en remplacement des interceptors."
 
 #. Tag: para
-#: events.xml:69
+#: events.xml:93
 #, no-c-format
 msgid ""
 "Essentially all of the methods of the <literal>Session</literal> interface "
@@ -270,7 +270,7 @@
 "<literal>Session</literal>."
 
 #. Tag: para
-#: events.xml:84
+#: events.xml:108
 #, no-c-format
 msgid ""
 "The listeners should be considered effectively singletons; meaning, they are "
@@ -282,7 +282,7 @@
 "pas sauvegarder des états de variables d'instance."
 
 #. Tag: para
-#: events.xml:89
+#: events.xml:113
 #, no-c-format
 msgid ""
 "A custom listener should implement the appropriate interface for the event "
@@ -304,7 +304,7 @@
 "un exemple de listener personnalisé pour l'événement de chargement :"
 
 #. Tag: programlisting
-#: events.xml:99
+#: events.xml:123
 #, no-c-format
 msgid ""
 "<![CDATA[public class MyLoadListener implements LoadEventListener {\n"
@@ -321,7 +321,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 "
@@ -331,7 +331,7 @@
 "d'utiliser ce listener en plus du listener par défaut :"
 
 #. Tag: programlisting
-#: events.xml:106
+#: events.xml:130
 #, no-c-format
 msgid ""
 "<![CDATA[<hibernate-configuration>\n"
@@ -347,13 +347,13 @@
 msgstr ""
 
 #. Tag: para
-#: events.xml:108
+#: events.xml:132
 #, no-c-format
 msgid "Instead, you may register it programmatically:"
 msgstr "Vous pouvez aussi l'inscrire par programmation :"
 
 #. Tag: programlisting
-#: events.xml:112
+#: events.xml:136
 #, no-c-format
 msgid ""
 "<![CDATA[Configuration cfg = new Configuration();\n"
@@ -363,7 +363,7 @@
 msgstr ""
 
 #. Tag: para
-#: events.xml:114
+#: events.xml:138
 #, no-c-format
 msgid ""
 "Listeners registered declaratively cannot share instances. If the same class "
@@ -380,7 +380,7 @@
 "d'inscription par programmation."
 
 #. Tag: para
-#: events.xml:122
+#: events.xml:146
 #, no-c-format
 msgid ""
 "Why implement an interface and define the specific type during "
@@ -396,13 +396,13 @@
 "pendant la configuration."
 
 #. Tag: title
-#: events.xml:132
+#: events.xml:156
 #, no-c-format
 msgid "Hibernate declarative security"
 msgstr "Sécurité déclarative d'Hibernate"
 
 #. Tag: para
-#: events.xml:133
+#: events.xml:157
 #, no-c-format
 msgid ""
 "Usually, declarative security in Hibernate applications is managed in a "
@@ -417,7 +417,7 @@
 "d'événements."
 
 #. Tag: para
-#: events.xml:139
+#: events.xml:163
 #, no-c-format
 msgid ""
 "First, you must configure the appropriate event listeners, to enable the use "
@@ -427,7 +427,7 @@
 "permettre l'utilisation d'autorisations JAAS."
 
 #. Tag: programlisting
-#: events.xml:144
+#: events.xml:168
 #, no-c-format
 msgid ""
 "<![CDATA[<listener type=\"pre-delete\" class=\"org.hibernate.secure."
@@ -441,7 +441,7 @@
 msgstr ""
 
 #. Tag: para
-#: events.xml:146
+#: events.xml:170
 #, no-c-format
 msgid ""
 "Note that <literal>&lt;listener type=\"...\" class=\"...\"/&gt;</literal> is "
@@ -455,7 +455,7 @@
 "listener pour un type d'événement particulier."
 
 #. Tag: para
-#: events.xml:152
+#: events.xml:176
 #, no-c-format
 msgid ""
 "Next, still in <literal>hibernate.cfg.xml</literal>, bind the permissions to "
@@ -465,7 +465,7 @@
 "permissions aux rôles :"
 
 #. Tag: programlisting
-#: events.xml:156
+#: events.xml:180
 #, no-c-format
 msgid ""
 "<![CDATA[<grant role=\"admin\" entity-name=\"User\" actions=\"insert,update,"
@@ -474,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 "Les noms de rôle sont les rôles compris par votre fournisseur JAAC."

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	2008-08-14 15:28:13 UTC (rev 15066)
+++ core/trunk/documentation/manual/src/main/docbook/fr-FR/content/example_mappings.po	2008-08-14 15:35:40 UTC (rev 15067)
@@ -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: 2008-08-14 15:28+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
-#: example_mappings.xml:20
+#: example_mappings.xml:29
 #, no-c-format
 msgid "Example: Various Mappings"
 msgstr "Exemple : quelques mappings"
 
 #. Tag: para
-#: example_mappings.xml:22
+#: example_mappings.xml:31
 #, no-c-format
 msgid "This chapters shows off some more complex association mappings."
 msgstr "Ce chapitre montre quelques mappings plus complexes."
 
 #. Tag: title
-#: example_mappings.xml:27
+#: example_mappings.xml:36
 #, no-c-format
 msgid "Employer/Employee"
 msgstr "Employeur/Employé (Employer/Employee)"
 
 #. Tag: para
-#: example_mappings.xml:29
+#: example_mappings.xml:38
 #, no-c-format
 msgid ""
 "The following model of the relationship between <literal>Employer</literal> "
@@ -46,13 +46,13 @@
 "monétaires et les noms des employés."
 
 #. Tag: para
-#: example_mappings.xml:46
+#: example_mappings.xml:55
 #, no-c-format
 msgid "Heres a possible mapping document:"
 msgstr "Voici un document de mapping possible :"
 
 #. Tag: programlisting
-#: example_mappings.xml:50
+#: example_mappings.xml:59
 #, no-c-format
 msgid ""
 "<![CDATA[<hibernate-mapping>\n"
@@ -108,7 +108,7 @@
 msgstr ""
 
 #. Tag: para
-#: example_mappings.xml:52
+#: example_mappings.xml:61
 #, no-c-format
 msgid ""
 "And heres the table schema generated by <literal>SchemaExport</literal>."
@@ -116,7 +116,7 @@
 "Et voici le schéma des tables générées par <literal>SchemaExport</literal>."
 
 #. Tag: programlisting
-#: example_mappings.xml:56
+#: example_mappings.xml:65
 #, no-c-format
 msgid ""
 "<![CDATA[create table employers (\n"
@@ -157,13 +157,13 @@
 msgstr ""
 
 #. Tag: title
-#: example_mappings.xml:61
+#: example_mappings.xml:70
 #, no-c-format
 msgid "Author/Work"
 msgstr "Auteur/Travail (Author/Work)"
 
 #. Tag: para
-#: example_mappings.xml:63
+#: example_mappings.xml:72
 #, no-c-format
 msgid ""
 "Consider the following model of the relationships between <literal>Work</"
@@ -183,14 +183,14 @@
 "<literal>Author</literal> hérite de <literal>Person</literal>."
 
 #. Tag: para
-#: example_mappings.xml:81
+#: example_mappings.xml:90
 #, 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:85
+#: example_mappings.xml:94
 #, no-c-format
 msgid ""
 "<![CDATA[<hibernate-mapping>\n"
@@ -247,7 +247,7 @@
 msgstr ""
 
 #. Tag: para
-#: example_mappings.xml:87
+#: example_mappings.xml:96
 #, no-c-format
 msgid ""
 "There are four tables in this mapping. <literal>works</literal>, "
@@ -263,7 +263,7 @@
 "schéma de tables, généré par <literal>SchemaExport</literal>."
 
 #. Tag: programlisting
-#: example_mappings.xml:95
+#: example_mappings.xml:104
 #, no-c-format
 msgid ""
 "<![CDATA[create table works (\n"
@@ -304,13 +304,13 @@
 msgstr ""
 
 #. Tag: title
-#: example_mappings.xml:100
+#: example_mappings.xml:109
 #, no-c-format
 msgid "Customer/Order/Product"
 msgstr "Client/Commande/Produit (Customer/Order/Product)"
 
 #. Tag: para
-#: example_mappings.xml:102
+#: example_mappings.xml:111
 #, no-c-format
 msgid ""
 "Now consider a model of the relationships between <literal>Customer</"
@@ -335,13 +335,13 @@
 "composite."
 
 #. Tag: para
-#: example_mappings.xml:122
+#: example_mappings.xml:131
 #, no-c-format
 msgid "The mapping document:"
 msgstr "Le document de mapping :"
 
 #. Tag: programlisting
-#: example_mappings.xml:126
+#: example_mappings.xml:135
 #, no-c-format
 msgid ""
 "<![CDATA[<hibernate-mapping>\n"
@@ -384,7 +384,7 @@
 msgstr ""
 
 #. Tag: para
-#: example_mappings.xml:128
+#: example_mappings.xml:137
 #, no-c-format
 msgid ""
 "<literal>customers</literal>, <literal>orders</literal>, "
@@ -398,7 +398,7 @@
 "literal> est aussi la table d'association liant orders à products."
 
 #. Tag: programlisting
-#: example_mappings.xml:135
+#: example_mappings.xml:144
 #, no-c-format
 msgid ""
 "<![CDATA[create table customers (\n"
@@ -438,13 +438,13 @@
 msgstr ""
 
 #. Tag: title
-#: example_mappings.xml:140
+#: example_mappings.xml:149
 #, no-c-format
 msgid "Miscellaneous example mappings"
 msgstr "Divers mappings d'exemple"
 
 #. Tag: para
-#: example_mappings.xml:142
+#: example_mappings.xml:151
 #, no-c-format
 msgid ""
 "These examples are all taken from the Hibernate test suite. You will find "
@@ -456,19 +456,19 @@
 "literal> de la distribution d'Hibernate."
 
 #. Tag: para
-#: example_mappings.xml:148
+#: 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:151
+#: example_mappings.xml:160
 #, no-c-format
 msgid "\"Typed\" one-to-one association"
 msgstr "\"Typed\" one-to-one association"
 
 #. Tag: programlisting
-#: example_mappings.xml:152
+#: example_mappings.xml:161
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Person\">\n"
@@ -500,13 +500,13 @@
 msgstr ""
 
 #. Tag: title
-#: example_mappings.xml:156
+#: example_mappings.xml:165
 #, no-c-format
 msgid "Composite key example"
 msgstr "Exemple de clef composée"
 
 #. Tag: programlisting
-#: example_mappings.xml:157
+#: example_mappings.xml:166
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Customer\">\n"
@@ -625,13 +625,13 @@
 msgstr ""
 
 #. Tag: title
-#: example_mappings.xml:161
+#: example_mappings.xml:170
 #, 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:162
+#: example_mappings.xml:171
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"User\" table=\"`User`\">\n"
@@ -672,13 +672,13 @@
 msgstr ""
 
 #. Tag: title
-#: example_mappings.xml:166
+#: example_mappings.xml:175
 #, no-c-format
 msgid "Content based discrimination"
 msgstr "Contenu basé sur une discrimination"
 
 #. Tag: programlisting
-#: example_mappings.xml:167
+#: example_mappings.xml:176
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Person\"\n"
@@ -734,13 +734,13 @@
 msgstr ""
 
 #. Tag: title
-#: example_mappings.xml:171
+#: example_mappings.xml:180
 #, no-c-format
 msgid "Associations on alternate keys"
 msgstr "Associations sur des clefs alternées"
 
 #. Tag: programlisting
-#: example_mappings.xml:172
+#: example_mappings.xml:181
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Person\">\n"

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	2008-08-14 15:28:13 UTC (rev 15066)
+++ core/trunk/documentation/manual/src/main/docbook/fr-FR/content/example_parentchild.po	2008-08-14 15:35:40 UTC (rev 15067)
@@ -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: 2008-08-14 15:28+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,13 +11,13 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: example_parentchild.xml:5
+#: example_parentchild.xml:29
 #, no-c-format
 msgid "Example: Parent/Child"
 msgstr "Exemple : Père/Fils"
 
 #. Tag: para
-#: example_parentchild.xml:7
+#: example_parentchild.xml:31
 #, no-c-format
 msgid ""
 "One of the very first things that new users try to do with Hibernate is to "
@@ -52,13 +52,13 @@
 "vraiment pas difficile !"
 
 #. Tag: title
-#: example_parentchild.xml:21
+#: example_parentchild.xml:45
 #, no-c-format
 msgid "A note about collections"
 msgstr "Une note à propos des collections"
 
 #. Tag: para
-#: example_parentchild.xml:23
+#: example_parentchild.xml:47
 #, no-c-format
 msgid ""
 "Hibernate collections are considered to be a logical part of their owning "
@@ -71,7 +71,7 @@
 "suivantes :"
 
 #. Tag: para
-#: example_parentchild.xml:30
+#: example_parentchild.xml:54
 #, no-c-format
 msgid ""
 "When we remove / add an object from / to a collection, the version number of "
@@ -81,7 +81,7 @@
 "version du propriétaire de la collection est incrémenté."
 
 #. Tag: para
-#: example_parentchild.xml:36
+#: example_parentchild.xml:60
 #, no-c-format
 msgid ""
 "If an object that was removed from a collection is an instance of a value "
@@ -97,7 +97,7 @@
 "son état sera immédiatement persistant."
 
 #. Tag: para
-#: example_parentchild.xml:44
+#: example_parentchild.xml:68
 #, no-c-format
 msgid ""
 "On the other hand, if an entity is removed from a collection (a one-to-many "
@@ -115,7 +115,7 @@
 "par défaut, la persistance de cette entité."
 
 #. Tag: para
-#: example_parentchild.xml:54
+#: example_parentchild.xml:78
 #, no-c-format
 msgid ""
 "Instead, the default behaviour is that adding an entity to a collection "
@@ -131,13 +131,13 @@
 "vie du fils est liée au cycle de vie du père."
 
 #. Tag: title
-#: example_parentchild.xml:64
+#: example_parentchild.xml:88
 #, no-c-format
 msgid "Bidirectional one-to-many"
 msgstr "un-vers-plusieurs bidirectionnel"
 
 #. 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> "
@@ -147,7 +147,7 @@
 "</literal> de <literal>Parent</literal> vers <literal>Child</literal>."
 
 #. Tag: programlisting
-#: example_parentchild.xml:71
+#: example_parentchild.xml:95
 #, no-c-format
 msgid ""
 "<![CDATA[<set name=\"children\">\n"
@@ -157,13 +157,13 @@
 msgstr ""
 
 #. Tag: para
-#: example_parentchild.xml:73
+#: example_parentchild.xml:97
 #, no-c-format
 msgid "If we were to execute the following code"
 msgstr "Si nous executions le code suivant"
 
 #. Tag: programlisting
-#: example_parentchild.xml:77
+#: example_parentchild.xml:101
 #, no-c-format
 msgid ""
 "<![CDATA[Parent p = .....;\n"
@@ -174,13 +174,13 @@
 msgstr ""
 
 #. Tag: para
-#: example_parentchild.xml:79
+#: example_parentchild.xml:103
 #, no-c-format
 msgid "Hibernate would issue two SQL statements:"
 msgstr "Hibernate exécuterait deux ordres 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>"
@@ -189,7 +189,7 @@
 "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 "
@@ -199,7 +199,7 @@
 "<literal>c</literal>"
 
 #. Tag: para
-#: example_parentchild.xml:95
+#: example_parentchild.xml:119
 #, no-c-format
 msgid ""
 "This is not only inefficient, but also violates any <literal>NOT NULL</"
@@ -213,7 +213,7 @@
 "null=\"true\"</literal> dans le mapping de la collection :"
 
 #. Tag: programlisting
-#: example_parentchild.xml:101
+#: example_parentchild.xml:125
 #, no-c-format
 msgid ""
 "<![CDATA[<set name=\"children\">\n"
@@ -223,13 +223,13 @@
 msgstr ""
 
 #. Tag: para
-#: example_parentchild.xml:103
+#: example_parentchild.xml:127
 #, no-c-format
 msgid "However, this is not the recommended solution."
 msgstr "Cependant ce n'est pas la solution recommandée."
 
 #. Tag: para
-#: example_parentchild.xml:106
+#: example_parentchild.xml:130
 #, no-c-format
 msgid ""
 "The underlying cause of this behaviour is that the link (the foreign key "
@@ -246,7 +246,7 @@
 "<literal>Child</literal>."
 
 #. 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\"/"
@@ -254,7 +254,7 @@
 msgstr ""
 
 #. Tag: para
-#: example_parentchild.xml:115
+#: example_parentchild.xml:139
 #, no-c-format
 msgid ""
 "(We also need to add the <literal>parent</literal> property to the "
@@ -264,7 +264,7 @@
 "dans la classe <literal>Child</literal>)."
 
 #. Tag: para
-#: example_parentchild.xml:119
+#: example_parentchild.xml:143
 #, no-c-format
 msgid ""
 "Now that the <literal>Child</literal> entity is managing the state of the "
@@ -276,7 +276,7 @@
 "Nous utilisons l'attribut <literal>inverse</literal>."
 
 #. Tag: programlisting
-#: example_parentchild.xml:124
+#: example_parentchild.xml:148
 #, no-c-format
 msgid ""
 "<![CDATA[<set name=\"children\" inverse=\"true\">\n"
@@ -286,7 +286,7 @@
 msgstr ""
 
 #. Tag: para
-#: example_parentchild.xml:126
+#: example_parentchild.xml:150
 #, no-c-format
 msgid "The following code would be used to add a new <literal>Child</literal>"
 msgstr ""
@@ -294,7 +294,7 @@
 "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"
@@ -306,13 +306,13 @@
 msgstr ""
 
 #. Tag: para
-#: example_parentchild.xml:132
+#: example_parentchild.xml:156
 #, no-c-format
 msgid "And now, only one SQL <literal>INSERT</literal> would be issued!"
 msgstr "Maintenant, seul un <literal>INSERT</literal> SQL est nécessaire !"
 
 #. Tag: para
-#: example_parentchild.xml:136
+#: example_parentchild.xml:160
 #, no-c-format
 msgid ""
 "To tighten things up a bit, we could create an <literal>addChild()</literal> "
@@ -322,7 +322,7 @@
 "<literal>addChild()</literal> dans <literal>Parent</literal>."
 
 #. Tag: programlisting
-#: example_parentchild.xml:141
+#: example_parentchild.xml:165
 #, no-c-format
 msgid ""
 "<![CDATA[public void addChild(Child c) {\n"
@@ -332,13 +332,13 @@
 msgstr ""
 
 #. Tag: para
-#: example_parentchild.xml:143
+#: example_parentchild.xml:167
 #, no-c-format
 msgid "Now, the code to add a <literal>Child</literal> looks like"
 msgstr "Le code d'ajout d'un <literal>Child</literal> serait alors"
 
 #. Tag: programlisting
-#: example_parentchild.xml:147
+#: example_parentchild.xml:171
 #, no-c-format
 msgid ""
 "<![CDATA[Parent p = (Parent) session.load(Parent.class, pid);\n"
@@ -349,13 +349,13 @@
 msgstr ""
 
 #. Tag: title
-#: example_parentchild.xml:152
+#: example_parentchild.xml:176
 #, no-c-format
 msgid "Cascading life cycle"
 msgstr "Cycle de vie en cascade"
 
 #. Tag: para
-#: example_parentchild.xml:154
+#: example_parentchild.xml:178
 #, no-c-format
 msgid ""
 "The explicit call to <literal>save()</literal> is still annoying. We will "
@@ -365,7 +365,7 @@
 "pouvons simplifier cela en utilisant les cascades."
 
 #. Tag: programlisting
-#: example_parentchild.xml:159
+#: example_parentchild.xml:183
 #, no-c-format
 msgid ""
 "<![CDATA[<set name=\"children\" inverse=\"true\" cascade=\"all\">\n"
@@ -375,13 +375,13 @@
 msgstr ""
 
 #. Tag: para
-#: example_parentchild.xml:161
+#: example_parentchild.xml:185
 #, no-c-format
 msgid "This simplifies the code above to"
 msgstr "Simplifie le code précédent en"
 
 #. Tag: programlisting
-#: example_parentchild.xml:165
+#: example_parentchild.xml:189
 #, no-c-format
 msgid ""
 "<![CDATA[Parent p = (Parent) session.load(Parent.class, pid);\n"
@@ -391,7 +391,7 @@
 msgstr ""
 
 #. Tag: para
-#: example_parentchild.xml:167
+#: example_parentchild.xml:191
 #, no-c-format
 msgid ""
 "Similarly, we don't need to iterate over the children when saving or "
@@ -403,7 +403,7 @@
 "<literal>p</literal> et tous ses fils de la base de données."
 
 #. Tag: programlisting
-#: example_parentchild.xml:172
+#: example_parentchild.xml:196
 #, no-c-format
 msgid ""
 "<![CDATA[Parent p = (Parent) session.load(Parent.class, pid);\n"
@@ -412,13 +412,13 @@
 msgstr ""
 
 #. Tag: para
-#: example_parentchild.xml:174
+#: example_parentchild.xml:198
 #, no-c-format
 msgid "However, this code"
 msgstr "Par contre, ce 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"
@@ -429,7 +429,7 @@
 msgstr ""
 
 #. Tag: para
-#: example_parentchild.xml:180
+#: example_parentchild.xml:204
 #, no-c-format
 msgid ""
 "will not remove <literal>c</literal> from the database; it will ony remove "
@@ -444,7 +444,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"
@@ -455,7 +455,7 @@
 msgstr ""
 
 #. Tag: para
-#: example_parentchild.xml:188
+#: example_parentchild.xml:212
 #, no-c-format
 msgid ""
 "Now, in our case, a <literal>Child</literal> can't really exist without its "
@@ -469,7 +469,7 @@
 "utiliser <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"
@@ -480,7 +480,7 @@
 msgstr ""
 
 #. Tag: para
-#: example_parentchild.xml:196
+#: example_parentchild.xml:220
 #, no-c-format
 msgid ""
 "Note: even though the collection mapping specifies <literal>inverse=\"true"
@@ -497,13 +497,13 @@
 "literal>."
 
 #. Tag: title
-#: example_parentchild.xml:206
+#: example_parentchild.xml:230
 #, no-c-format
 msgid "Cascades and <literal>unsaved-value</literal>"
 msgstr "Cascades et <literal>unsaved-value</literal>"
 
 #. Tag: para
-#: example_parentchild.xml:208
+#: example_parentchild.xml:232
 #, no-c-format
 msgid ""
 "Suppose we loaded up a <literal>Parent</literal> in one <literal>Session</"
@@ -535,7 +535,7 @@
 "value</literal> explicitement.</emphasis>"
 
 #. Tag: para
-#: example_parentchild.xml:220
+#: example_parentchild.xml:244
 #, no-c-format
 msgid ""
 "The following code will update <literal>parent</literal> and <literal>child</"
@@ -545,7 +545,7 @@
 "literal> et insérera <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"
@@ -557,7 +557,7 @@
 msgstr ""
 
 #. Tag: para
-#: example_parentchild.xml:227
+#: example_parentchild.xml:251
 #, no-c-format
 msgid ""
 "Well, that's all very well for the case of a generated identifier, but what "
@@ -579,13 +579,13 @@
 "pire des cas, à la base de données, pour voir si la ligne existe."
 
 #. Tag: title
-#: example_parentchild.xml:260
+#: example_parentchild.xml:284
 #, no-c-format
 msgid "Conclusion"
 msgstr "Conclusion"
 
 #. Tag: para
-#: example_parentchild.xml:262
+#: example_parentchild.xml:286
 #, no-c-format
 msgid ""
 "There is quite a bit to digest here and it might look confusing first time "
@@ -598,7 +598,7 @@
 "pattern père / fils."
 
 #. Tag: para
-#: example_parentchild.xml:267
+#: example_parentchild.xml:291
 #, no-c-format
 msgid ""
 "We mentioned an alternative in the first paragraph. None of the above issues "

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	2008-08-14 15:28:13 UTC (rev 15066)
+++ core/trunk/documentation/manual/src/main/docbook/fr-FR/content/example_weblog.po	2008-08-14 15:35:40 UTC (rev 15067)
@@ -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: 2008-08-14 15:28+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
-#: example_weblog.xml:5
+#: example_weblog.xml:29
 #, no-c-format
 msgid "Example: Weblog Application"
 msgstr "Exemple : application Weblog"
 
 #. Tag: title
-#: example_weblog.xml:8
+#: example_weblog.xml:32
 #, no-c-format
 msgid "Persistent Classes"
 msgstr "Classes persistantes"
 
 #. Tag: para
-#: example_weblog.xml:10
+#: example_weblog.xml:34
 #, no-c-format
 msgid ""
 "The persistent classes represent a weblog, and an item posted in a weblog. "
@@ -35,7 +35,7 @@
 "allons utiliser un \"bag\" trié au lieu d'un 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 "Mappings Hibernate"
 
 #. Tag: para
-#: example_weblog.xml:25
+#: example_weblog.xml:49
 #, no-c-format
 msgid "The XML mappings should now be quite straightforward."
 msgstr "Le mapping XML doit maintenant être relativement simple à vos yeux."
 
 #. 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,13 +224,13 @@
 msgstr ""
 
 #. Tag: title
-#: example_weblog.xml:36
+#: example_weblog.xml:60
 #, no-c-format
 msgid "Hibernate Code"
 msgstr "Code Hibernate"
 
 #. Tag: para
-#: example_weblog.xml:38
+#: example_weblog.xml:62
 #, no-c-format
 msgid ""
 "The following class demonstrates some of the kinds of things we can do with "
@@ -240,7 +240,7 @@
 "ces classes."
 
 #. 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/fr-FR/content/filters.po
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/fr-FR/content/filters.po	2008-08-14 15:28:13 UTC (rev 15066)
+++ core/trunk/documentation/manual/src/main/docbook/fr-FR/content/filters.po	2008-08-14 15:35:40 UTC (rev 15067)
@@ -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: 2008-08-14 15:28+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,13 +11,13 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: filters.xml:5
+#: filters.xml:29
 #, no-c-format
 msgid "Filtering data"
 msgstr "Filtrer les données"
 
 #. Tag: para
-#: filters.xml:7
+#: filters.xml:31
 #, no-c-format
 msgid ""
 "Hibernate3 provides an innovative new approach to handling data with "
@@ -31,13 +31,13 @@
 "pour une session Hibernate particulière."
 
 #. Tag: title
-#: filters.xml:14
+#: filters.xml:38
 #, no-c-format
 msgid "Hibernate filters"
 msgstr "Filtres Hibernate"
 
 #. Tag: para
-#: filters.xml:16
+#: filters.xml:40
 #, no-c-format
 msgid ""
 "Hibernate3 adds the ability to pre-define filter criteria and attach those "
@@ -60,7 +60,7 @@
 "données, mais paramétrées dans l'application."
 
 #. 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
+#: filters.xml:58
 #, no-c-format
 msgid "Then, this filter can be attached to a class:"
 msgstr "Puis, ce filtre peut être attaché à une 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
+#: filters.xml:64
 #, no-c-format
 msgid "or, to a collection:"
 msgstr "ou à une collection :"
 
 #. Tag: programlisting
-#: filters.xml:44
+#: filters.xml:68
 #, no-c-format
 msgid ""
 "<![CDATA[<set ...>\n"
@@ -116,21 +116,21 @@
 msgstr ""
 
 #. Tag: para
-#: filters.xml:46
+#: filters.xml:70
 #, no-c-format
 msgid "or, even 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
-#: 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 "
+"enableFilter()</literal> method, which returns an instance of the "
 "<literal>Filter</literal> interface. Using the simple filter defined above, "
 "this would look like:"
 msgstr ""
@@ -144,7 +144,7 @@
 "défini au-dessus ressemblerait à :"
 
 #. Tag: programlisting
-#: filters.xml:59
+#: filters.xml:83
 #, no-c-format
 msgid ""
 "<![CDATA[session.enableFilter(\"myFilter\").setParameter(\"myFilterParam\", "
@@ -152,7 +152,7 @@
 msgstr ""
 
 #. Tag: para
-#: filters.xml:61
+#: filters.xml:85
 #, no-c-format
 msgid ""
 "Note that methods on the org.hibernate.Filter interface do allow the method-"
@@ -162,7 +162,7 @@
 "chaînage de beaucoup de méthodes communes d'Hibernate."
 
 #. Tag: para
-#: filters.xml:65
+#: filters.xml:89
 #, no-c-format
 msgid ""
 "A full example, using temporal data with an effective record date pattern:"
@@ -171,7 +171,7 @@
 "date d'enregistrement effectif :"
 
 #. Tag: programlisting
-#: filters.xml:69
+#: filters.xml:93
 #, no-c-format
 msgid ""
 "<![CDATA[<filter-def name=\"effectiveDate\">\n"
@@ -209,7 +209,7 @@
 msgstr ""
 
 #. Tag: para
-#: filters.xml:71
+#: filters.xml:95
 #, no-c-format
 msgid ""
 "Then, in order to ensure that you always get back currently effective "
@@ -221,7 +221,7 @@
 "session avant de récupérer des données des employés :"
 
 #. Tag: programlisting
-#: filters.xml:76
+#: filters.xml:100
 #, no-c-format
 msgid ""
 "<![CDATA[Session session = ...;\n"
@@ -235,7 +235,7 @@
 msgstr ""
 
 #. Tag: para
-#: filters.xml:78
+#: filters.xml:102
 #, no-c-format
 msgid ""
 "In the HQL above, even though we only explicitly mentioned a salary "
@@ -249,7 +249,7 @@
 "salaire supérieur à un million de dollars."
 
 #. Tag: para
-#: filters.xml:84
+#: filters.xml:108
 #, no-c-format
 msgid ""
 "Note: if you plan on using filters with outer joining (either through HQL or "
@@ -264,7 +264,7 @@
 "d'abord, suivi du(des) nom(s) de colonne après l'opérateur."
 
 #. Tag: para
-#: filters.xml:91
+#: filters.xml:115
 #, no-c-format
 msgid ""
 "After being defined a filter might be attached to multiple entities and/or "
@@ -275,7 +275,7 @@
 msgstr "translator-credits"
 
 #. Tag: programlisting
-#: filters.xml:98
+#: filters.xml:122
 #, no-c-format
 msgid ""
 "<![CDATA[<filter-def name=\"myFilter\" condition=\"abc > xyz\">...</filter-"
@@ -284,7 +284,7 @@
 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 "

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	2008-08-14 15:28:13 UTC (rev 15066)
+++ core/trunk/documentation/manual/src/main/docbook/fr-FR/content/inheritance_mapping.po	2008-08-14 15:35:40 UTC (rev 15067)
@@ -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: 2008-08-14 15:28+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
+#: inheritance_mapping.xml:29
 #, no-c-format
 msgid "Inheritance Mapping"
 msgstr "Mapping d'héritage de classe"
 
 #. Tag: title
-#: inheritance_mapping.xml:8
+#: inheritance_mapping.xml:32
 #, no-c-format
 msgid "The Three Strategies"
 msgstr "Les trois stratégies"
 
 #. Tag: para
-#: inheritance_mapping.xml:10
+#: inheritance_mapping.xml:34
 #, no-c-format
 msgid "Hibernate supports the three basic inheritance mapping strategies:"
 msgstr "Hibernate supporte les trois stratégies d'héritage de base :"
 
 #. Tag: para
-#: inheritance_mapping.xml:16
+#: inheritance_mapping.xml:40
 #, no-c-format
 msgid "table per class hierarchy"
 msgstr "une table par hiérarchie de classe (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 @@
 "une table par classe fille"
 
 #. Tag: para
-#: inheritance_mapping.xml:26
+#: inheritance_mapping.xml:50
 #, no-c-format
 msgid "table per concrete class"
 msgstr "une table par classe concrète (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,13 +61,13 @@
 "qui supporte le polymorphisme :"
 
 #. Tag: para
-#: inheritance_mapping.xml:39
+#: inheritance_mapping.xml:63
 #, no-c-format
 msgid "implicit polymorphism"
 msgstr "le polymorphisme implicite"
 
 #. Tag: para
-#: inheritance_mapping.xml:45
+#: inheritance_mapping.xml:69
 #, no-c-format
 msgid ""
 "It is possible to use different mapping strategies for different branches of "
@@ -94,7 +94,7 @@
 "literal> (voir dessous)."
 
 #. Tag: para
-#: inheritance_mapping.xml:59
+#: inheritance_mapping.xml:83
 #, no-c-format
 msgid ""
 "It is possible to define <literal>subclass</literal>, <literal>union-"
@@ -121,7 +121,7 @@
 "impose encore de définir les classes mères avant les classes filles."
 
 #. Tag: programlisting
-#: inheritance_mapping.xml:70
+#: inheritance_mapping.xml:94
 #, no-c-format
 msgid ""
 "<![CDATA[\n"
@@ -134,13 +134,13 @@
 msgstr ""
 
 #. Tag: title
-#: inheritance_mapping.xml:74
+#: inheritance_mapping.xml:98
 #, no-c-format
 msgid "Table per class hierarchy"
 msgstr "Une table par hiérarchie de classe"
 
 #. Tag: para
-#: inheritance_mapping.xml:76
+#: inheritance_mapping.xml:100
 #, no-c-format
 msgid ""
 "Suppose we have an interface <literal>Payment</literal>, with implementors "
@@ -154,7 +154,7 @@
 "hiérarchie serait :"
 
 #. Tag: programlisting
-#: inheritance_mapping.xml:83
+#: inheritance_mapping.xml:107
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Payment\" table=\"PAYMENT\">\n"
@@ -178,7 +178,7 @@
 msgstr ""
 
 #. Tag: para
-#: inheritance_mapping.xml:85
+#: inheritance_mapping.xml:109
 #, no-c-format
 msgid ""
 "Exactly one table is required. There is one big limitation of this mapping "
@@ -191,19 +191,19 @@
 "literal>."
 
 #. Tag: title
-#: inheritance_mapping.xml:94
+#: inheritance_mapping.xml:118
 #, no-c-format
 msgid "Table per subclass"
 msgstr "Une table par classe fille"
 
 #. Tag: para
-#: inheritance_mapping.xml:96
+#: inheritance_mapping.xml:120
 #, no-c-format
 msgid "A table per subclass mapping would look like:"
 msgstr "La stratégie une table par classe fille serait :"
 
 #. Tag: programlisting
-#: inheritance_mapping.xml:100
+#: inheritance_mapping.xml:124
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Payment\" table=\"PAYMENT\">\n"
@@ -229,7 +229,7 @@
 msgstr ""
 
 #. Tag: para
-#: inheritance_mapping.xml:102
+#: inheritance_mapping.xml:126
 #, no-c-format
 msgid ""
 "Four tables are required. The three subclass tables have primary key "
@@ -241,13 +241,13 @@
 "association un-vers-un)."
 
 #. Tag: title
-#: inheritance_mapping.xml:111
+#: inheritance_mapping.xml:135
 #, 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:113
+#: inheritance_mapping.xml:137
 #, no-c-format
 msgid ""
 "Note that Hibernate's implementation of table per subclass requires no "
@@ -271,7 +271,7 @@
 "<literal>&lt;join&gt;</literal>, comme suit :"
 
 #. 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 "
@@ -317,14 +317,14 @@
 "sur la classe mère."
 
 #. Tag: title
-#: inheritance_mapping.xml:136
+#: inheritance_mapping.xml:160
 #, no-c-format
 msgid "Mixing table per class hierarchy with table per subclass"
 msgstr ""
 "Mélange d'une table par hiérarchie de classe avec une table par classe fille"
 
 #. Tag: para
-#: inheritance_mapping.xml:138
+#: inheritance_mapping.xml:162
 #, no-c-format
 msgid ""
 "You may even mix the table per hierarchy and table per subclass strategies "
@@ -334,7 +334,7 @@
 "classe et d'une table par classe fille en utilisant cette approche :"
 
 #. 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 @@
 "<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,13 +380,13 @@
 msgstr ""
 
 #. Tag: title
-#: inheritance_mapping.xml:156
+#: inheritance_mapping.xml:180
 #, no-c-format
 msgid "Table per concrete class"
 msgstr "Une table par classe concrète"
 
 #. Tag: para
-#: inheritance_mapping.xml:158
+#: inheritance_mapping.xml:182
 #, no-c-format
 msgid ""
 "There are two ways we could go about mapping the table per concrete class "
@@ -397,7 +397,7 @@
 "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 "
@@ -431,7 +431,7 @@
 "propriétés héritéés."
 
 #. Tag: para
-#: inheritance_mapping.xml:170
+#: inheritance_mapping.xml:194
 #, no-c-format
 msgid ""
 "The limitation of this approach is that if a property is mapped on the "
@@ -449,7 +449,7 @@
 "\" d'une hiérarchie."
 
 #. Tag: para
-#: inheritance_mapping.xml:179
+#: inheritance_mapping.xml:203
 #, no-c-format
 msgid ""
 "If your superclass is abstract, map it with <literal>abstract=\"true\"</"
@@ -463,19 +463,19 @@
 "dessus) est requise pour contenir des instances de la classe mère."
 
 #. Tag: title
-#: inheritance_mapping.xml:189
+#: inheritance_mapping.xml:213
 #, 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
-#: inheritance_mapping.xml:191
+#: inheritance_mapping.xml:215
 #, no-c-format
 msgid "An alternative approach is to make use of implicit polymorphism:"
 msgstr "Une approche alternative est l'emploi du polymorphisme implicite :"
 
 #. Tag: programlisting
-#: inheritance_mapping.xml:195
+#: inheritance_mapping.xml:219
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"CreditCardPayment\" table=\"CREDIT_PAYMENT\">\n"
@@ -504,7 +504,7 @@
 msgstr ""
 
 #. Tag: para
-#: inheritance_mapping.xml:197
+#: inheritance_mapping.xml:221
 #, no-c-format
 msgid ""
 "Notice that nowhere do we mention the <literal>Payment</literal> interface "
@@ -523,7 +523,7 @@
 "literal> dans le mapping)."
 
 #. 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 "
@@ -534,7 +534,7 @@
 "polymorphiques."
 
 #. Tag: para
-#: inheritance_mapping.xml:212
+#: inheritance_mapping.xml:236
 #, no-c-format
 msgid ""
 "For this mapping strategy, a polymorphic association to <literal>Payment</"
@@ -545,7 +545,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"
@@ -558,13 +558,13 @@
 msgstr ""
 
 #. Tag: title
-#: inheritance_mapping.xml:222
+#: inheritance_mapping.xml:246
 #, no-c-format
 msgid "Mixing implicit polymorphism with other inheritance mappings"
 msgstr "Mélange du polymorphisme implicite avec d'autres mappings d'héritage"
 
 #. Tag: para
-#: inheritance_mapping.xml:224
+#: inheritance_mapping.xml:248
 #, no-c-format
 msgid ""
 "There is one further thing to notice about this mapping. Since the "
@@ -582,7 +582,7 @@
 "polymorphiques pour l'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"
@@ -615,7 +615,7 @@
 msgstr ""
 
 #. Tag: para
-#: inheritance_mapping.xml:234
+#: inheritance_mapping.xml:258
 #, no-c-format
 msgid ""
 "Once again, we don't mention <literal>Payment</literal> explicitly. If we "
@@ -636,13 +636,13 @@
 "<literal>NonelectronicTransaction</literal>."
 
 #. Tag: title
-#: inheritance_mapping.xml:249
+#: inheritance_mapping.xml:273
 #, no-c-format
 msgid "Limitations"
 msgstr "Limitations"
 
 #. Tag: para
-#: inheritance_mapping.xml:251
+#: inheritance_mapping.xml:275
 #, no-c-format
 msgid ""
 "There are certain limitations to the \"implicit polymorphism\" approach to "
@@ -656,7 +656,7 @@
 "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 "
@@ -666,128 +666,128 @@
 "concrète, et du polymorphisme implicite, dans Hibernate."
 
 #. Tag: title
-#: inheritance_mapping.xml:264
+#: inheritance_mapping.xml:288
 #, no-c-format
 msgid "Features of inheritance mappings"
 msgstr "Caractéristiques du mapping d'héritage"
 
 #. Tag: entry
-#: inheritance_mapping.xml:276
+#: inheritance_mapping.xml:300
 #, no-c-format
 msgid "Inheritance strategy"
 msgstr "Stratégie d'héritage"
 
 #. Tag: entry
-#: inheritance_mapping.xml:277
+#: inheritance_mapping.xml:301
 #, no-c-format
 msgid "Polymorphic many-to-one"
 msgstr "many-to-one polymorphique"
 
 #. Tag: entry
-#: inheritance_mapping.xml:278
+#: inheritance_mapping.xml:302
 #, no-c-format
 msgid "Polymorphic one-to-one"
 msgstr "one-to-one polymorphique"
 
 #. Tag: entry
-#: inheritance_mapping.xml:279
+#: inheritance_mapping.xml:303
 #, no-c-format
 msgid "Polymorphic one-to-many"
 msgstr "one-to-many polymorphique"
 
 #. Tag: entry
-#: inheritance_mapping.xml:280
+#: inheritance_mapping.xml:304
 #, no-c-format
 msgid "Polymorphic many-to-many"
 msgstr "many-to-many polymorphique"
 
 #. Tag: entry
-#: inheritance_mapping.xml:281
+#: inheritance_mapping.xml:305
 #, no-c-format
 msgid "Polymorphic <literal>load()/get()</literal>"
 msgstr ""
 
 #. Tag: entry
-#: inheritance_mapping.xml:282
+#: inheritance_mapping.xml:306
 #, no-c-format
 msgid "Polymorphic queries"
 msgstr "Requêtes polymorphiques"
 
 #. Tag: entry
-#: inheritance_mapping.xml:283
+#: inheritance_mapping.xml:307
 #, no-c-format
 msgid "Polymorphic joins"
 msgstr "Jointures polymorphiques"
 
 #. Tag: entry
-#: inheritance_mapping.xml:284
+#: inheritance_mapping.xml:308
 #, no-c-format
 msgid "Outer join fetching"
 msgstr "Récupération par jointure externe"
 
 #. Tag: entry
-#: inheritance_mapping.xml:289
+#: inheritance_mapping.xml:313
 #, no-c-format
 msgid "table per class-hierarchy"
 msgstr "une table par hiérarchie de classe"
 
 #. Tag: literal
-#: inheritance_mapping.xml:290 inheritance_mapping.xml:301
-#: inheritance_mapping.xml:312
+#: inheritance_mapping.xml:314 inheritance_mapping.xml:325
+#: inheritance_mapping.xml:336
 #, 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:315 inheritance_mapping.xml:326
+#: inheritance_mapping.xml:337
 #, 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:316 inheritance_mapping.xml:327
 #, 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:317 inheritance_mapping.xml:328
+#: inheritance_mapping.xml:339
 #, 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:318 inheritance_mapping.xml:329
+#: inheritance_mapping.xml:340
 #, 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:319 inheritance_mapping.xml:330
+#: inheritance_mapping.xml:341 inheritance_mapping.xml:352
 #, 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:320 inheritance_mapping.xml:331
+#: inheritance_mapping.xml:342
 #, 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:321 inheritance_mapping.xml:332
+#: inheritance_mapping.xml:343
 #, no-c-format
 msgid "supported"
 msgstr "supportée"
 
 #. Tag: entry
-#: inheritance_mapping.xml:300
+#: inheritance_mapping.xml:324
 #, fuzzy, no-c-format
 msgid "<entry>table per subclass</entry>"
 msgstr ""
@@ -797,13 +797,13 @@
 "une table par classe fille"
 
 #. Tag: entry
-#: inheritance_mapping.xml:311
+#: inheritance_mapping.xml:335
 #, no-c-format
 msgid "table per concrete-class (union-subclass)"
 msgstr "une table par classe concrète (union-subclass)"
 
 #. Tag: entry
-#: inheritance_mapping.xml:314
+#: inheritance_mapping.xml:338
 #, no-c-format
 msgid ""
 "<literal>&lt;one-to-many&gt;</literal> (for <literal>inverse=\"true\"</"
@@ -811,20 +811,20 @@
 msgstr ""
 
 #. Tag: entry
-#: inheritance_mapping.xml:322
+#: inheritance_mapping.xml:346
 #, no-c-format
 msgid "table per concrete class (implicit polymorphism)"
 msgstr "une table par classe concrète (polymorphisme implicite)"
 
 #. Tag: literal
-#: inheritance_mapping.xml:323
+#: inheritance_mapping.xml:347
 #, 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:348 inheritance_mapping.xml:349
+#: inheritance_mapping.xml:353 inheritance_mapping.xml:354
 #, fuzzy, no-c-format
 msgid "not supported"
 msgstr ""
@@ -838,13 +838,13 @@
 "non supportée"
 
 #. Tag: literal
-#: inheritance_mapping.xml:326
+#: inheritance_mapping.xml:350
 #, no-c-format
 msgid "&lt;many-to-any&gt;"
 msgstr "&lt;many-to-any&gt;"
 
 #. Tag: literal
-#: inheritance_mapping.xml:327
+#: inheritance_mapping.xml:351
 #, 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	2008-08-14 15:28:13 UTC (rev 15066)
+++ core/trunk/documentation/manual/src/main/docbook/fr-FR/content/performance.po	2008-08-14 15:35:40 UTC (rev 15067)
@@ -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: 2008-08-14 15:28+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
-#: performance.xml:5
+#: performance.xml:29
 #, no-c-format
 msgid "Improving performance"
 msgstr "Améliorer les performances"
 
 #. Tag: title
-#: performance.xml:8
+#: performance.xml:32
 #, no-c-format
 msgid "Fetching strategies"
 msgstr "Stratégies de chargement"
 
 #. Tag: para
-#: performance.xml:10
+#: performance.xml:34
 #, no-c-format
 msgid ""
 "A <emphasis>fetching strategy</emphasis> is the strategy Hibernate will use "
@@ -39,13 +39,13 @@
 "literal> particulière."
 
 #. Tag: para
-#: performance.xml:17
+#: performance.xml:41
 #, no-c-format
 msgid "Hibernate3 defines the following fetching strategies:"
 msgstr "Hibernate3 définit les stratégies de chargement suivantes :"
 
 #. Tag: para
-#: performance.xml:23
+#: performance.xml:47
 #, no-c-format
 msgid ""
 "<emphasis>Join fetching</emphasis> - Hibernate retrieves the associated "
@@ -57,7 +57,7 @@
 "utilisant un <literal>OUTER JOIN</literal>."
 
 #. Tag: para
-#: performance.xml:30
+#: performance.xml:54
 #, no-c-format
 msgid ""
 "<emphasis>Select fetching</emphasis> - a second <literal>SELECT</literal> is "
@@ -72,7 +72,7 @@
 "exécuté que lorsque vous accéderez réellement à l'association."
 
 #. Tag: para
-#: performance.xml:39
+#: performance.xml:63
 #, no-c-format
 msgid ""
 "<emphasis>Subselect fetching</emphasis> - a second <literal>SELECT</literal> "
@@ -89,7 +89,7 @@
 "accéderez réellement à l'association."
 
 #. Tag: para
-#: performance.xml:48
+#: performance.xml:72
 #, no-c-format
 msgid ""
 "<emphasis>Batch fetching</emphasis> - an optimization strategy for select "
@@ -103,13 +103,13 @@
 "spécifiant une liste de clé primaire ou de clé étrangère."
 
 #. Tag: para
-#: performance.xml:57
+#: performance.xml:81
 #, no-c-format
 msgid "Hibernate also distinguishes between:"
 msgstr "Hibernate fait également la distinction entre :"
 
 #. Tag: para
-#: performance.xml:63
+#: performance.xml:87
 #, no-c-format
 msgid ""
 "<emphasis>Immediate fetching</emphasis> - an association, collection or "
@@ -120,7 +120,7 @@
 "cet élément est chargé."
 
 #. Tag: para
-#: performance.xml:69
+#: performance.xml:93
 #, no-c-format
 msgid ""
 "<emphasis>Lazy collection fetching</emphasis> - a collection is fetched when "
@@ -132,7 +132,7 @@
 "s'agit du mode de chargement par défaut pour les collections)."
 
 #. Tag: para
-#: performance.xml:76
+#: performance.xml:100
 #, no-c-format
 msgid ""
 "<emphasis>\"Extra-lazy\" collection fetching</emphasis> - individual "
@@ -147,7 +147,7 @@
 "aux très grandes collections)."
 
 #. Tag: para
-#: performance.xml:84
+#: performance.xml:108
 #, no-c-format
 msgid ""
 "<emphasis>Proxy fetching</emphasis> - a single-valued association is fetched "
@@ -159,7 +159,7 @@
 "est appelée sur l'objet associé."
 
 #. Tag: para
-#: performance.xml:91
+#: performance.xml:115
 #, no-c-format
 msgid ""
 "<emphasis>\"No-proxy\" fetching</emphasis> - a single-valued association is "
@@ -178,7 +178,7 @@
 "rarement nécessaire."
 
 #. Tag: para
-#: performance.xml:101
+#: performance.xml:125
 #, no-c-format
 msgid ""
 "<emphasis>Lazy attribute fetching</emphasis> - an attribute or single valued "
@@ -190,7 +190,7 @@
 "une instrumentation du bytecode à la compilation et est rarement nécessaire."
 
 #. Tag: para
-#: performance.xml:110
+#: performance.xml:134
 #, no-c-format
 msgid ""
 "We have two orthogonal notions here: <emphasis>when</emphasis> is the "
@@ -207,13 +207,13 @@
 "une instance détachée d'une classe particulière."
 
 #. Tag: title
-#: performance.xml:119
+#: performance.xml:143
 #, no-c-format
 msgid "Working with lazy associations"
 msgstr "Travailler avec des associations chargées tardivement"
 
 #. Tag: para
-#: performance.xml:121
+#: performance.xml:145
 #, no-c-format
 msgid ""
 "By default, Hibernate3 uses lazy select fetching for collections and lazy "
@@ -226,7 +226,7 @@
 "associations dans la plupart des applications."
 
 #. Tag: para
-#: performance.xml:127
+#: performance.xml:151
 #, no-c-format
 msgid ""
 "<emphasis>Note:</emphasis> if you set <literal>hibernate."
@@ -240,7 +240,7 @@
 "être activée à un niveau de granularité plus fin)."
 
 #. Tag: para
-#: performance.xml:134
+#: performance.xml:158
 #, no-c-format
 msgid ""
 "However, lazy fetching poses one problem that you must be aware of. Access "
@@ -252,7 +252,7 @@
 "session hibernate ouverte, va conduire à une exception. Par exemple :"
 
 #. Tag: programlisting
-#: performance.xml:140
+#: performance.xml:164
 #, no-c-format
 msgid ""
 "<![CDATA[s = sessions.openSession();\n"
@@ -269,7 +269,7 @@
 msgstr ""
 
 #. Tag: para
-#: performance.xml:142
+#: performance.xml:166
 #, no-c-format
 msgid ""
 "Since the permissions collection was not initialized when the "
@@ -285,7 +285,7 @@
 "déplacer le code qui lit la collection avant le \"commit\" de la transaction."
 
 #. Tag: para
-#: performance.xml:150
+#: performance.xml:174
 #, no-c-format
 msgid ""
 "Alternatively, we could use a non-lazy collection or association, by "
@@ -304,7 +304,7 @@
 "chaque transaction !"
 
 #. Tag: para
-#: performance.xml:159
+#: performance.xml:183
 #, no-c-format
 msgid ""
 "On the other hand, we often want to choose join fetching (which is non-lazy "
@@ -321,13 +321,13 @@
 "objet simple ou vers une collection."
 
 #. Tag: title
-#: performance.xml:170
+#: performance.xml:194
 #, no-c-format
 msgid "Tuning fetch strategies"
 msgstr "Personnalisation des stratégies de chargement"
 
 #. Tag: para
-#: performance.xml:172
+#: performance.xml:196
 #, no-c-format
 msgid ""
 "Select fetching (the default) is extremely vulnerable to N+1 selects "
@@ -338,7 +338,7 @@
 "jointure dans les fichiers de mapping :"
 
 #. Tag: programlisting
-#: performance.xml:177
+#: performance.xml:201
 #, no-c-format
 msgid ""
 "<![CDATA[<set name=\"permissions\" \n"
@@ -349,13 +349,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 "
@@ -365,27 +365,27 @@
 "dans les fichiers de mapping affecte :"
 
 #. Tag: para
-#: performance.xml:187
+#: performance.xml:211
 #, no-c-format
 msgid "retrieval via <literal>get()</literal> or <literal>load()</literal>"
 msgstr ""
 "La récupération 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 ""
 "La récupération implicite lorsque l'on navigue à travers une association"
 
 #. Tag: para
-#: performance.xml:197
+#: performance.xml:221
 #, no-c-format
 msgid "<literal>Criteria</literal> queries"
 msgstr "Les requêtes de type <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 ""
@@ -393,7 +393,7 @@
 "literal>"
 
 #. Tag: para
-#: performance.xml:208
+#: performance.xml:232
 #, no-c-format
 msgid ""
 "No matter what fetching strategy you use, the defined non-lazy graph is "
@@ -406,7 +406,7 @@
 "une seule requête HQL."
 
 #. Tag: para
-#: performance.xml:214
+#: performance.xml:238
 #, no-c-format
 msgid ""
 "Usually, we don't use the mapping document to customize fetching. Instead, "
@@ -425,7 +425,7 @@
 "méthode <literal>setFetchMode(FetchMode.JOIN)</literal>"
 
 #. Tag: para
-#: performance.xml:223
+#: performance.xml:247
 #, no-c-format
 msgid ""
 "If you ever feel like you wish you could change the fetching strategy used "
@@ -438,7 +438,7 @@
 "par exemple :"
 
 #. Tag: programlisting
-#: performance.xml:229
+#: performance.xml:253
 #, no-c-format
 msgid ""
 "<![CDATA[User user = (User) session.createCriteria(User.class)\n"
@@ -448,7 +448,7 @@
 msgstr ""
 
 #. Tag: para
-#: performance.xml:231
+#: performance.xml:255
 #, no-c-format
 msgid ""
 "(This is Hibernate's equivalent of what some ORM solutions call a \"fetch "
@@ -458,7 +458,7 @@
 "mapping appellent un \"fetch plan\" ou \"plan de chargement\")"
 
 #. Tag: para
-#: performance.xml:235
+#: performance.xml:259
 #, no-c-format
 msgid ""
 "A completely different way to avoid problems with N+1 selects is to use the "
@@ -468,13 +468,13 @@
 "selects est d'utiliser le cache de second niveau."
 
 #. Tag: title
-#: performance.xml:243
+#: performance.xml:267
 #, no-c-format
 msgid "Single-ended association proxies"
 msgstr "Proxys pour des associations vers un seul objet"
 
 #. Tag: para
-#: performance.xml:245
+#: performance.xml:269
 #, no-c-format
 msgid ""
 "Lazy fetching for collections is implemented using Hibernate's own "
@@ -493,7 +493,7 @@
 "à jour à chaud du bytecode (à l'aide de l'excellente librairie CGLIB)."
 
 #. Tag: para
-#: performance.xml:253
+#: performance.xml:277
 #, no-c-format
 msgid ""
 "By default, Hibernate3 generates proxies (at startup) for all persistent "
@@ -505,7 +505,7 @@
 "associations <literal>many-to-one</literal> et <literal>one-to-one</literal>."
 
 #. Tag: para
-#: performance.xml:259
+#: performance.xml:283
 #, no-c-format
 msgid ""
 "The mapping file may declare an interface to use as the proxy interface for "
@@ -523,7 +523,7 @@
 "persistantes !</emphasis>"
 
 #. Tag: para
-#: performance.xml:266
+#: performance.xml:290
 #, no-c-format
 msgid ""
 "There are some gotchas to be aware of when extending this approach to "
@@ -533,7 +533,7 @@
 "des classes polymorphiques, exemple :"
 
 #. Tag: programlisting
-#: performance.xml:271
+#: performance.xml:295
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Cat\" proxy=\"Cat\">\n"
@@ -545,7 +545,7 @@
 msgstr ""
 
 #. Tag: para
-#: performance.xml:273
+#: performance.xml:297
 #, no-c-format
 msgid ""
 "Firstly, instances of <literal>Cat</literal> will never be castable to "
@@ -557,7 +557,7 @@
 "jacente est une instance de <literal>DomesticCat</literal> :"
 
 #. Tag: programlisting
-#: performance.xml:279
+#: performance.xml:303
 #, no-c-format
 msgid ""
 "<![CDATA[Cat cat = (Cat) session.load(Cat.class, id);  // instantiate a "
@@ -570,7 +570,7 @@
 msgstr ""
 
 #. Tag: para
-#: performance.xml:281
+#: performance.xml:305
 #, no-c-format
 msgid "Secondly, it is possible to break proxy <literal>==</literal>."
 msgstr ""
@@ -578,7 +578,7 @@
 "des proxy."
 
 #. Tag: programlisting
-#: performance.xml:285
+#: performance.xml:309
 #, no-c-format
 msgid ""
 "<![CDATA[Cat cat = (Cat) session.load(Cat.class, id);            // "
@@ -590,7 +590,7 @@
 msgstr ""
 
 #. Tag: para
-#: performance.xml:287
+#: performance.xml:311
 #, no-c-format
 msgid ""
 "However, the situation is not quite as bad as it looks. Even though we now "
@@ -602,7 +602,7 @@
 "quand même le même objet :"
 
 #. Tag: programlisting
-#: performance.xml:292
+#: performance.xml:316
 #, no-c-format
 msgid ""
 "<![CDATA[cat.setWeight(11.0);  // hit the db to initialize the proxy\n"
@@ -610,7 +610,7 @@
 msgstr ""
 
 #. Tag: para
-#: performance.xml:294
+#: performance.xml:318
 #, no-c-format
 msgid ""
 "Third, you may not use a CGLIB proxy for a <literal>final</literal> class or "
@@ -621,7 +621,7 @@
 "<literal>final</literal>."
 
 #. Tag: para
-#: performance.xml:299
+#: performance.xml:323
 #, no-c-format
 msgid ""
 "Finally, if your persistent object acquires any resources upon instantiation "
@@ -635,7 +635,7 @@
 "vraiment une sous classe de la classe persistante."
 
 #. Tag: para
-#: performance.xml:305
+#: performance.xml:329
 #, no-c-format
 msgid ""
 "These problems are all due to fundamental limitations in Java's single "
@@ -650,7 +650,7 @@
 "fichier de mapping :"
 
 #. Tag: programlisting
-#: performance.xml:311
+#: performance.xml:335
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"CatImpl\" proxy=\"Cat\">\n"
@@ -662,7 +662,7 @@
 msgstr ""
 
 #. Tag: para
-#: performance.xml:313
+#: performance.xml:337
 #, no-c-format
 msgid ""
 "where <literal>CatImpl</literal> implements the interface <literal>Cat</"
@@ -680,7 +680,7 @@
 "(Notez que <literal>list()</literal> ne retourne généralement pas de proxy)."
 
 #. Tag: programlisting
-#: performance.xml:321
+#: performance.xml:345
 #, no-c-format
 msgid ""
 "<![CDATA[Cat cat = (Cat) session.load(CatImpl.class, catid);\n"
@@ -690,7 +690,7 @@
 msgstr ""
 
 #. Tag: para
-#: performance.xml:323
+#: performance.xml:347
 #, no-c-format
 msgid ""
 "Relationships are also lazily initialized. This means you must declare any "
@@ -702,14 +702,14 @@
 "et non <literal>CatImpl</literal>."
 
 #. Tag: para
-#: performance.xml:328
+#: performance.xml:352
 #, no-c-format
 msgid ""
 "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:334
+#: performance.xml:358
 #, no-c-format
 msgid ""
 "<literal>equals()</literal>, if the persistent class does not override "
@@ -719,7 +719,7 @@
 "<literal>equals()</literal>"
 
 #. Tag: para
-#: performance.xml:340
+#: performance.xml:364
 #, no-c-format
 msgid ""
 "<literal>hashCode()</literal>, if the persistent class does not override "
@@ -729,13 +729,13 @@
 "<literal>hashCode()</literal>"
 
 #. Tag: para
-#: performance.xml:346
+#: performance.xml:370
 #, no-c-format
 msgid "The identifier getter method"
 msgstr "Le getter de l'identifiant"
 
 #. Tag: para
-#: performance.xml:352
+#: performance.xml:376
 #, no-c-format
 msgid ""
 "Hibernate will detect persistent classes that override <literal>equals()</"
@@ -745,7 +745,7 @@
 "ou <literal>hashCode()</literal>."
 
 #. Tag: para
-#: performance.xml:357
+#: performance.xml:381
 #, no-c-format
 msgid ""
 "By choosing <literal>lazy=\"no-proxy\"</literal> instead of the default "
@@ -760,13 +760,13 @@
 "en une initialisation du proxy."
 
 #. Tag: title
-#: performance.xml:367
+#: performance.xml:391
 #, no-c-format
 msgid "Initializing collections and proxies"
 msgstr "Initialisation des collections et des proxys"
 
 #. Tag: para
-#: performance.xml:369
+#: performance.xml:393
 #, no-c-format
 msgid ""
 "A <literal>LazyInitializationException</literal> will be thrown by Hibernate "
@@ -781,7 +781,7 @@
 "proxy est dans l'état \"détachée\"."
 
 #. Tag: para
-#: performance.xml:375
+#: performance.xml:399
 #, no-c-format
 msgid ""
 "Sometimes we need to ensure that a proxy or collection is initialized before "
@@ -798,7 +798,7 @@
 "code et n'est pas très générique."
 
 #. Tag: para
-#: performance.xml:382
+#: performance.xml:406
 #, no-c-format
 msgid ""
 "The static methods <literal>Hibernate.initialize()</literal> and "
@@ -818,7 +818,7 @@
 "literal> a le même effet sur la collection kittens."
 
 #. Tag: para
-#: performance.xml:391
+#: performance.xml:415
 #, no-c-format
 msgid ""
 "Another option is to keep the <literal>Session</literal> open until all "
@@ -839,7 +839,7 @@
 "initialisée. Il y a deux moyens de traiter ce problème :"
 
 #. Tag: para
-#: performance.xml:402
+#: performance.xml:426
 #, no-c-format
 msgid ""
 "In a web-based application, a servlet filter can be used to close the "
@@ -863,7 +863,7 @@
 "Hibernate pour des exemples sur le pattern \"Open Session in View\"."
 
 #. Tag: para
-#: performance.xml:415
+#: performance.xml:439
 #, no-c-format
 msgid ""
 "In an application with a separate business tier, the business logic must "
@@ -895,7 +895,7 @@
 "<emphasis>Session Facade</emphasis>."
 
 #. Tag: para
-#: performance.xml:430
+#: performance.xml:454
 #, no-c-format
 msgid ""
 "You may also attach a previously loaded object to a new <literal>Session</"
@@ -912,7 +912,7 @@
 "ad hoc."
 
 #. Tag: para
-#: performance.xml:440
+#: performance.xml:464
 #, no-c-format
 msgid ""
 "Sometimes you don't want to initialize a large collection, but still need "
@@ -923,7 +923,7 @@
 "ensemble de ses données"
 
 #. Tag: para
-#: performance.xml:445
+#: performance.xml:469
 #, no-c-format
 msgid ""
 "You can use a collection filter to get the size of a collection without "
@@ -933,7 +933,7 @@
 "l'initialiser :"
 
 #. Tag: programlisting
-#: performance.xml:449
+#: performance.xml:473
 #, no-c-format
 msgid ""
 "<![CDATA[( (Integer) s.createFilter( collection, \"select count(*)\" ).list"
@@ -941,7 +941,7 @@
 msgstr ""
 
 #. Tag: para
-#: performance.xml:451
+#: performance.xml:475
 #, no-c-format
 msgid ""
 "The <literal>createFilter()</literal> method is also used to efficiently "
@@ -953,7 +953,7 @@
 "besoin de l'initialiser dans son ensemble."
 
 #. Tag: programlisting
-#: performance.xml:456
+#: performance.xml:480
 #, no-c-format
 msgid ""
 "<![CDATA[s.createFilter( lazyCollection, \"\").setFirstResult(0)."
@@ -961,13 +961,13 @@
 msgstr ""
 
 #. Tag: title
-#: performance.xml:461
+#: performance.xml:485
 #, no-c-format
 msgid "Using batch fetching"
 msgstr "Utiliser le chargement par lot"
 
 #. Tag: para
-#: performance.xml:463
+#: performance.xml:487
 #, no-c-format
 msgid ""
 "Hibernate can make efficient use of batch fetching, that is, Hibernate can "
@@ -984,7 +984,7 @@
 "le chargement par lot : au niveau de la classe et au niveau de la collection."
 
 #. Tag: para
-#: performance.xml:469
+#: performance.xml:493
 #, no-c-format
 msgid ""
 "Batch fetching for classes/entities is easier to understand. Imagine you "
@@ -1011,13 +1011,13 @@
 "size</literal> (taille du lot) dans le mapping de <literal>Person</literal> :"
 
 #. Tag: programlisting
-#: performance.xml:479
+#: performance.xml:503
 #, no-c-format
 msgid "<![CDATA[<class name=\"Person\" batch-size=\"10\">...</class>]]>"
 msgstr ""
 
 #. Tag: para
-#: performance.xml:481
+#: performance.xml:505
 #, no-c-format
 msgid ""
 "Hibernate will now execute only three queries, the pattern is 10, 10, 5."
@@ -1026,12 +1026,12 @@
 "10, 10, et 5 entités."
 
 #. Tag: para
-#: performance.xml:485
-#, no-c-format
+#: performance.xml:509
+#, fuzzy, 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>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 "
@@ -1047,7 +1047,7 @@
 "literal>, Hibernate pourra précharger les collections :"
 
 #. Tag: programlisting
-#: performance.xml:494
+#: performance.xml:518
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Person\">\n"
@@ -1058,7 +1058,7 @@
 msgstr ""
 
 #. Tag: para
-#: performance.xml:496
+#: performance.xml:520
 #, no-c-format
 msgid ""
 "With a <literal>batch-size</literal> of 3, Hibernate will load 3, 3, 3, 1 "
@@ -1073,7 +1073,7 @@
 "particulière."
 
 #. Tag: para
-#: performance.xml:502
+#: performance.xml:526
 #, no-c-format
 msgid ""
 "Batch fetching of collections is particularly useful if you have a nested "
@@ -1088,13 +1088,13 @@
 "pour des arbres principalement en lecture.)"
 
 #. Tag: title
-#: performance.xml:511
+#: performance.xml:535
 #, no-c-format
 msgid "Using subselect fetching"
 msgstr "Utilisation du chargement par sous select"
 
 #. Tag: para
-#: performance.xml:513
+#: performance.xml:537
 #, no-c-format
 msgid ""
 "If one lazy collection or single-valued proxy has to be fetched, Hibernate "
@@ -1107,13 +1107,13 @@
 "possibilité de fragmenter le chargement."
 
 #. Tag: title
-#: performance.xml:524
+#: performance.xml:548
 #, no-c-format
 msgid "Using lazy property fetching"
 msgstr "Utiliser le chargement tardif des propriétés"
 
 #. Tag: para
-#: performance.xml:526
+#: performance.xml:550
 #, no-c-format
 msgid ""
 "Hibernate3 supports the lazy fetching of individual properties. This "
@@ -1135,7 +1135,7 @@
 "modèle de données ne peut pas être amélioré."
 
 #. Tag: para
-#: performance.xml:535
+#: performance.xml:559
 #, no-c-format
 msgid ""
 "To enable lazy property loading, set the <literal>lazy</literal> attribute "
@@ -1145,7 +1145,7 @@
 "<literal>lazy</literal> sur une propriété particulière du mapping :"
 
 #. Tag: programlisting
-#: performance.xml:540
+#: performance.xml:564
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Document\">\n"
@@ -1161,7 +1161,7 @@
 msgstr ""
 
 #. Tag: para
-#: performance.xml:542
+#: performance.xml:566
 #, no-c-format
 msgid ""
 "Lazy property loading requires buildtime bytecode instrumentation! If your "
@@ -1174,7 +1174,7 @@
 "retombera dans le mode de chargement immédiat."
 
 #. Tag: para
-#: performance.xml:548
+#: performance.xml:572
 #, no-c-format
 msgid "For bytecode instrumentation, use the following Ant task:"
 msgstr ""
@@ -1182,7 +1182,7 @@
 "suivante :"
 
 #. Tag: programlisting
-#: performance.xml:552
+#: performance.xml:576
 #, no-c-format
 msgid ""
 "<![CDATA[<target name=\"instrument\" depends=\"compile\">\n"
@@ -1202,13 +1202,13 @@
 msgstr ""
 
 #. Tag: para
-#: performance.xml:554
-#, no-c-format
+#: performance.xml:578
+#, 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."
+"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,7 +1217,7 @@
 "solution préférable."
 
 #. Tag: para
-#: performance.xml:561
+#: performance.xml:585
 #, no-c-format
 msgid ""
 "You may force the usual eager fetching of properties using <literal>fetch "
@@ -1227,13 +1227,13 @@
 "utilisant <literal>fetch all properties</literal> dans les requêts HQL."
 
 #. Tag: title
-#: performance.xml:571
+#: performance.xml:595
 #, no-c-format
 msgid "The Second Level Cache"
 msgstr "Le cache de second niveau"
 
 #. Tag: para
-#: performance.xml:573
+#: performance.xml:597
 #, no-c-format
 msgid ""
 "A Hibernate <literal>Session</literal> is a transaction-level cache of "
@@ -1255,7 +1255,7 @@
 "cache)."
 
 #. Tag: para
-#: performance.xml:581
+#: performance.xml:605
 #, no-c-format
 msgid ""
 "You have the option to tell Hibernate which caching implementation to use by "
@@ -1275,43 +1275,43 @@
 "literal>."
 
 #. Tag: title
-#: performance.xml:592
+#: performance.xml:616
 #, no-c-format
 msgid "Cache Providers"
 msgstr "Fournisseur de cache"
 
 #. Tag: entry
-#: performance.xml:601 performance.xml:774
+#: performance.xml:625 performance.xml:813
 #, no-c-format
 msgid "Cache"
 msgstr "Cache"
 
 #. Tag: entry
-#: performance.xml:602
+#: performance.xml:626
 #, no-c-format
 msgid "Provider class"
 msgstr "Classe pourvoyeuse"
 
 #. Tag: entry
-#: performance.xml:603
+#: performance.xml:627
 #, no-c-format
 msgid "Type"
 msgstr "Type"
 
 #. Tag: entry
-#: performance.xml:604
+#: performance.xml:628
 #, no-c-format
 msgid "Cluster Safe"
 msgstr "Support en Cluster"
 
 #. Tag: entry
-#: performance.xml:605
+#: performance.xml:629
 #, no-c-format
 msgid "Query Cache Supported"
 msgstr "Cache de requêtes supporté"
 
 #. Tag: entry
-#: performance.xml:610 performance.xml:783
+#: performance.xml:634 performance.xml:822
 #, fuzzy, no-c-format
 msgid "Hashtable (not intended for production use)"
 msgstr ""
@@ -1321,120 +1321,138 @@
 "Hashtable (ne pas utilser en production)"
 
 #. Tag: literal
-#: performance.xml:611
+#: performance.xml:635
 #, no-c-format
 msgid "org.hibernate.cache.HashtableCacheProvider"
 msgstr "org.hibernate.cache.HashtableCacheProvider"
 
 #. Tag: entry
-#: performance.xml:612
+#: performance.xml:636
 #, no-c-format
 msgid "memory"
 msgstr "mémoire"
 
 #. 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: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
 #, no-c-format
 msgid "<entry>yes</entry>"
 msgstr ""
 
 #. Tag: entry
-#: performance.xml:617 performance.xml:790
+#: performance.xml:641 performance.xml:829
 #, no-c-format
 msgid "EHCache"
 msgstr "EHCache"
 
 #. Tag: literal
-#: performance.xml:618
+#: performance.xml:642
 #, no-c-format
 msgid "org.hibernate.cache.EhCacheProvider"
 msgstr "org.hibernate.cache.EhCacheProvider"
 
 #. Tag: entry
-#: performance.xml:619 performance.xml:626
+#: performance.xml:643 performance.xml:650
 #, no-c-format
 msgid "memory, disk"
 msgstr "mémoire, disque"
 
 #. Tag: entry
-#: performance.xml:624 performance.xml:797
+#: performance.xml:648 performance.xml:836
 #, no-c-format
 msgid "OSCache"
 msgstr "OSCache"
 
 #. Tag: literal
-#: performance.xml:625
+#: performance.xml:649
 #, no-c-format
 msgid "org.hibernate.cache.OSCacheProvider"
 msgstr "org.hibernate.cache.OSCacheProvider"
 
 #. Tag: entry
-#: performance.xml:631 performance.xml:804
+#: performance.xml:655 performance.xml:843
 #, no-c-format
 msgid "SwarmCache"
 msgstr "SwarmCache"
 
 #. Tag: literal
-#: performance.xml:632
+#: performance.xml:656
 #, no-c-format
 msgid "org.hibernate.cache.SwarmCacheProvider"
 msgstr "org.hibernate.cache.SwarmCacheProvider"
 
 #. Tag: entry
-#: performance.xml:633
+#: performance.xml:657
 #, no-c-format
 msgid "clustered (ip multicast)"
 msgstr "en cluster (multicast ip)"
 
 #. Tag: entry
-#: performance.xml:634
+#: performance.xml:658
 #, no-c-format
 msgid "yes (clustered invalidation)"
 msgstr "oui (invalidation de cluster)"
 
 #. Tag: entry
-#: performance.xml:638 performance.xml:811
-#, no-c-format
-msgid "JBoss TreeCache"
+#: performance.xml:662 performance.xml:850
+#, fuzzy, no-c-format
+msgid "JBoss Cache 1.x"
 msgstr "JBoss TreeCache"
 
 #. Tag: literal
-#: performance.xml:639
+#: performance.xml:663
 #, no-c-format
 msgid "org.hibernate.cache.TreeCacheProvider"
 msgstr "org.hibernate.cache.TreeCacheProvider"
 
 #. Tag: entry
-#: performance.xml:640
+#: performance.xml:664 performance.xml:671
 #, no-c-format
 msgid "clustered (ip multicast), transactional"
 msgstr "en cluster (multicast ip), transactionnel"
 
 #. Tag: entry
-#: performance.xml:641
+#: performance.xml:665
 #, no-c-format
 msgid "yes (replication)"
 msgstr "oui (replication)"
 
 #. Tag: entry
-#: performance.xml:642
+#: performance.xml:666 performance.xml:673
 #, no-c-format
 msgid "yes (clock sync req.)"
 msgstr "oui (horloge sync. nécessaire)"
 
+#. Tag: entry
+#: performance.xml:669 performance.xml:857
+#, fuzzy, no-c-format
+msgid "JBoss Cache 2"
+msgstr "JBoss TreeCache"
+
+#. Tag: literal
+#: performance.xml:670
+#, fuzzy, no-c-format
+msgid "org.hibernate.cache.jbc2.JBossCacheRegionFactory"
+msgstr "org.hibernate.cache.EhCacheProvider"
+
+#. Tag: entry
+#: performance.xml:672
+#, fuzzy, no-c-format
+msgid "yes (replication or invalidation)"
+msgstr "oui (invalidation de cluster)"
+
 #. Tag: title
-#: performance.xml:649
+#: performance.xml:680
 #, no-c-format
 msgid "Cache mappings"
 msgstr "Mapping de Cache"
 
 #. Tag: para
-#: performance.xml:651
+#: performance.xml:682
 #, no-c-format
 msgid ""
 "The <literal>&lt;cache&gt;</literal> element of a class or collection "
@@ -1444,7 +1462,7 @@
 "à la forme suivante :"
 
 #. Tag: programlisting
-#: performance.xml:662
+#: performance.xml:693
 #, no-c-format
 msgid ""
 "<![CDATA[<cache \n"
@@ -1455,7 +1473,7 @@
 msgstr ""
 
 #. Tag: para
-#: performance.xml:665
+#: performance.xml:696
 #, no-c-format
 msgid ""
 "<literal>usage</literal> (required) specifies the caching strategy: "
@@ -1468,7 +1486,7 @@
 "literal>"
 
 #. Tag: para
-#: performance.xml:674
+#: performance.xml:705
 #, no-c-format
 msgid ""
 "<literal>region</literal> (optional, defaults to the class or collection "
@@ -1479,7 +1497,7 @@
 "cache de second niveau"
 
 #. Tag: para
-#: performance.xml:681
+#: performance.xml:712
 #, no-c-format
 msgid ""
 "<literal>include</literal> (optional, defaults to <literal>all</literal>) "
@@ -1493,10 +1511,10 @@
 "lorsque le chargement tardif des attributs est activé."
 
 #. Tag: para
-#: performance.xml:691
-#, no-c-format
+#: performance.xml:722
+#, fuzzy, no-c-format
 msgid ""
-"Alternatively (preferrably?), you may specify <literal>&lt;class-cache&gt;</"
+"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>."
 msgstr ""
@@ -1505,7 +1523,7 @@
 "cache&gt;</literal> dans <literal>hibernate.cfg.xml</literal>."
 
 #. Tag: para
-#: performance.xml:696
+#: performance.xml:727
 #, no-c-format
 msgid ""
 "The <literal>usage</literal> attribute specifies a <emphasis>cache "
@@ -1515,13 +1533,13 @@
 "concurrence d'accès au cache</emphasis>."
 
 #. Tag: title
-#: performance.xml:703
+#: performance.xml:734
 #, no-c-format
 msgid "Strategy: read only"
 msgstr "Strategie : lecture seule"
 
 #. Tag: para
-#: performance.xml:705
+#: performance.xml:736
 #, no-c-format
 msgid ""
 "If your application needs to read but never modify instances of a persistent "
@@ -1535,7 +1553,7 @@
 "parfaitement sûre dans un cluster."
 
 #. Tag: programlisting
-#: performance.xml:711
+#: performance.xml:742
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"eg.Immutable\" mutable=\"false\">\n"
@@ -1545,13 +1563,13 @@
 msgstr ""
 
 #. Tag: title
-#: performance.xml:717
+#: performance.xml:748
 #, no-c-format
 msgid "Strategy: read/write"
 msgstr "Stratégie : lecture/écriture"
 
 #. Tag: para
-#: performance.xml:719
+#: performance.xml:750
 #, no-c-format
 msgid ""
 "If the application needs to update data, a <literal>read-write</literal> "
@@ -1581,7 +1599,7 @@
 "fournis."
 
 #. Tag: programlisting
-#: performance.xml:730
+#: performance.xml:761
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"eg.Cat\" .... >\n"
@@ -1595,13 +1613,13 @@
 msgstr ""
 
 #. Tag: title
-#: performance.xml:735
+#: performance.xml:766
 #, no-c-format
 msgid "Strategy: nonstrict read/write"
 msgstr "Stratégie : lecture/écriture non stricte"
 
 #. Tag: para
-#: performance.xml:737
+#: performance.xml:768
 #, no-c-format
 msgid ""
 "If the application only occasionally needs to update data (ie. if it is "
@@ -1624,13 +1642,13 @@
 "close()</literal> ou <literal>Session.disconnect()</literal>"
 
 #. Tag: title
-#: performance.xml:749
+#: performance.xml:780
 #, no-c-format
 msgid "Strategy: transactional"
 msgstr "Stratégie : transactionelle"
 
 #. Tag: para
-#: performance.xml:751
+#: performance.xml:782
 #, no-c-format
 msgid ""
 "The <literal>transactional</literal> cache strategy provides support for "
@@ -1643,11 +1661,26 @@
 "cache ne peut être utilisé que dans un environnement JTA et vous devez "
 "spécifier <literal>hibernate.transaction.manager_lookup_class</literal>."
 
+#. Tag: title
+#: performance.xml:791
+#, fuzzy, no-c-format
+msgid "Cache-provider/concurrency-strategy compatibility"
+msgstr "Stratégie de concurrence du cache"
+
 #. Tag: para
-#: performance.xml:759
-#, no-c-format
+#: performance.xml:794
+#, 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 ""
+"Aucun des caches livrés ne supporte toutes les stratégies de concurrence. Le "
+"tableau suivant montre quels caches sont compatibles avec quelles stratégies "
+"de concurrence."
+
+#. Tag: para
+#: performance.xml:799
+#, fuzzy, no-c-format
+msgid ""
 "The following table shows which providers are compatible with which "
 "concurrency strategies."
 msgstr ""
@@ -1656,43 +1689,43 @@
 "de concurrence."
 
 #. Tag: title
-#: performance.xml:765
+#: performance.xml:804
 #, no-c-format
 msgid "Cache Concurrency Strategy Support"
 msgstr "Stratégie de concurrence du cache"
 
 #. Tag: entry
-#: performance.xml:775
+#: performance.xml:814
 #, no-c-format
 msgid "read-only"
 msgstr "read-only (lecture seule)"
 
 #. Tag: entry
-#: performance.xml:776
+#: performance.xml:815
 #, no-c-format
 msgid "nonstrict-read-write"
 msgstr "nonstrict-read-write (lecture-écriture non stricte)"
 
 #. Tag: entry
-#: performance.xml:777
+#: performance.xml:816
 #, no-c-format
 msgid "read-write"
 msgstr "read-write (lecture-ériture)"
 
 #. Tag: entry
-#: performance.xml:778
+#: performance.xml:817
 #, no-c-format
 msgid "transactional"
 msgstr "transactional (transactionnel)"
 
 #. Tag: title
-#: performance.xml:824
+#: performance.xml:872
 #, no-c-format
 msgid "Managing the caches"
 msgstr "Gérer les caches"
 
 #. Tag: para
-#: performance.xml:826
+#: performance.xml:874
 #, no-c-format
 msgid ""
 "Whenever you pass an object to <literal>save()</literal>, <literal>update()</"
@@ -1710,7 +1743,7 @@
 "interne de la <literal>Session</literal>."
 
 #. Tag: para
-#: performance.xml:833
+#: performance.xml:881
 #, no-c-format
 msgid ""
 "When <literal>flush()</literal> is subsequently called, the state of that "
@@ -1728,7 +1761,7 @@
 "l'objet et ses collections dépendantes du cache de la session"
 
 #. Tag: programlisting
-#: performance.xml:841
+#: performance.xml:889
 #, no-c-format
 msgid ""
 "<![CDATA[ScrollableResult cats = sess.createQuery(\"from Cat as cat\").scroll"
@@ -1741,7 +1774,7 @@
 msgstr ""
 
 #. Tag: para
-#: performance.xml:843
+#: performance.xml:891
 #, no-c-format
 msgid ""
 "The <literal>Session</literal> also provides a <literal>contains()</literal> "
@@ -1751,7 +1784,7 @@
 "</literal> pour déterminer si une instance appartient au cache de la session."
 
 #. Tag: para
-#: performance.xml:848
+#: performance.xml:896
 #, no-c-format
 msgid ""
 "To completely evict all objects from the session cache, call "
@@ -1761,7 +1794,7 @@
 "()</literal>"
 
 #. Tag: para
-#: performance.xml:852
+#: performance.xml:900
 #, no-c-format
 msgid ""
 "For the second-level cache, there are methods defined on "
@@ -1774,7 +1807,7 @@
 "collection."
 
 #. Tag: programlisting
-#: performance.xml:858
+#: performance.xml:906
 #, no-c-format
 msgid ""
 "<![CDATA[sessionFactory.evict(Cat.class, catId); //evict a particular Cat\n"
@@ -1786,7 +1819,7 @@
 msgstr ""
 
 #. Tag: para
-#: performance.xml:860
+#: performance.xml:908
 #, no-c-format
 msgid ""
 "The <literal>CacheMode</literal> controls how a particular session interacts "
@@ -1796,7 +1829,7 @@
 "interragit avec le cache de second niveau"
 
 #. Tag: para
-#: performance.xml:867
+#: performance.xml:915
 #, no-c-format
 msgid ""
 "<literal>CacheMode.NORMAL</literal> - read items from and write items to the "
@@ -1806,7 +1839,7 @@
 "de second niveau"
 
 #. Tag: para
-#: performance.xml:872
+#: performance.xml:920
 #, no-c-format
 msgid ""
 "<literal>CacheMode.GET</literal> - read items from the second-level cache, "
@@ -1817,7 +1850,7 @@
 "donnée"
 
 #. Tag: para
-#: performance.xml:878
+#: performance.xml:926
 #, no-c-format
 msgid ""
 "<literal>CacheMode.PUT</literal> - write items to the second-level cache, "
@@ -1827,7 +1860,7 @@
 "niveau mais ne les lit pas dans le cache de second niveau"
 
 #. Tag: para
-#: performance.xml:884
+#: performance.xml:932
 #, no-c-format
 msgid ""
 "<literal>CacheMode.REFRESH</literal> - write items to the second-level "
@@ -1841,7 +1874,7 @@
 "rafraîchissement du cache de second niveau pour chaque item lu dans la base"
 
 #. Tag: para
-#: performance.xml:892
+#: performance.xml:940
 #, no-c-format
 msgid ""
 "To browse the contents of a second-level or query cache region, use the "
@@ -1852,7 +1885,7 @@
 "API:"
 
 #. Tag: programlisting
-#: performance.xml:897
+#: performance.xml:945
 #, no-c-format
 msgid ""
 "<![CDATA[Map cacheEntries = sessionFactory.getStatistics()\n"
@@ -1861,7 +1894,7 @@
 msgstr ""
 
 #. Tag: para
-#: performance.xml:899
+#: performance.xml:947
 #, no-c-format
 msgid ""
 "You'll need to enable statistics, and, optionally, force Hibernate to keep "
@@ -1872,7 +1905,7 @@
 "compréhensible pour l'utilisateur :"
 
 #. Tag: programlisting
-#: performance.xml:904
+#: performance.xml:952
 #, no-c-format
 msgid ""
 "<![CDATA[hibernate.generate_statistics true\n"
@@ -1880,13 +1913,13 @@
 msgstr ""
 
 #. Tag: title
-#: performance.xml:909
+#: performance.xml:957
 #, no-c-format
 msgid "The Query Cache"
 msgstr "Le cache de requêtes"
 
 #. Tag: para
-#: performance.xml:911
+#: performance.xml:959
 #, no-c-format
 msgid ""
 "Query result sets may also be cached. This is only useful for queries that "
@@ -1898,13 +1931,13 @@
 "Pour utiliser le cache de requêtes, vous devez d'abord l'activer :"
 
 #. Tag: programlisting
-#: performance.xml:916
+#: performance.xml:964
 #, no-c-format
 msgid "<![CDATA[hibernate.cache.use_query_cache true]]>"
 msgstr ""
 
 #. Tag: para
-#: performance.xml:918
+#: performance.xml:966
 #, no-c-format
 msgid ""
 "This setting causes the creation of two new cache regions - one holding "
@@ -1927,7 +1960,7 @@
 "second niveau pour être efficace."
 
 #. Tag: para
-#: performance.xml:928
+#: performance.xml:976
 #, no-c-format
 msgid ""
 "Most queries do not benefit from caching, so by default queries are not "
@@ -1942,7 +1975,7 @@
 "résultats si la requête est exécutée."
 
 #. Tag: para
-#: performance.xml:935
+#: performance.xml:983
 #, no-c-format
 msgid ""
 "If you require fine-grained control over query cache expiration policies, "
@@ -1954,7 +1987,7 @@
 "particulière en appelant <literal>Query.setCacheRegion()</literal>."
 
 #. Tag: programlisting
-#: performance.xml:941
+#: performance.xml:989
 #, no-c-format
 msgid ""
 "<![CDATA[List blogs = sess.createQuery(\"from Blog blog where blog.blogger "
@@ -1967,7 +2000,7 @@
 msgstr ""
 
 #. Tag: para
-#: performance.xml:943
+#: performance.xml:991
 #, no-c-format
 msgid ""
 "If the query should force a refresh of its query cache region, you should "
@@ -1988,13 +2021,13 @@
 "<literal>SessionFactory.evictQueries()</literal>."
 
 #. Tag: title
-#: performance.xml:955
+#: performance.xml:1003
 #, no-c-format
 msgid "Understanding Collection performance"
 msgstr "Comprendre les performances des Collections"
 
 #. Tag: para
-#: performance.xml:957
+#: performance.xml:1005
 #, no-c-format
 msgid ""
 "We've already spent quite some time talking about collections. In this "
@@ -2005,37 +2038,37 @@
 "section, nous allons traiter du comportement des collections à l'exécution."
 
 #. Tag: title
-#: performance.xml:964
+#: performance.xml:1012
 #, no-c-format
 msgid "Taxonomy"
 msgstr "Classification"
 
 #. Tag: para
-#: performance.xml:966
+#: performance.xml:1014
 #, no-c-format
 msgid "Hibernate defines three basic kinds of collections:"
 msgstr "Hibernate définit trois types de collections :"
 
 #. Tag: para
-#: performance.xml:970
+#: performance.xml:1018
 #, no-c-format
 msgid "collections of values"
 msgstr "les collections de valeurs"
 
 #. Tag: para
-#: performance.xml:973
+#: performance.xml:1021
 #, no-c-format
 msgid "one to many associations"
 msgstr "les associations un-vers-plusieurs"
 
 #. Tag: para
-#: performance.xml:976
+#: performance.xml:1024
 #, no-c-format
 msgid "many to many associations"
 msgstr "les associations plusieurs-vers-plusieurs"
 
 #. Tag: para
-#: performance.xml:980
+#: performance.xml:1028
 #, no-c-format
 msgid ""
 "This classification distinguishes the various table and foreign key "
@@ -2054,25 +2087,25 @@
 "amène aux classifications suivantes :"
 
 #. Tag: para
-#: performance.xml:991
+#: performance.xml:1039
 #, no-c-format
 msgid "indexed collections"
 msgstr "collections indexées"
 
 #. Tag: para
-#: performance.xml:994
+#: performance.xml:1042
 #, no-c-format
 msgid "sets"
 msgstr "sets"
 
 #. Tag: para
-#: performance.xml:997
+#: performance.xml:1045
 #, no-c-format
 msgid "bags"
 msgstr "bags"
 
 #. Tag: para
-#: performance.xml:1001
+#: performance.xml:1049
 #, no-c-format
 msgid ""
 "All indexed collections (maps, lists, arrays) have a primary key consisting "
@@ -2089,13 +2122,13 @@
 "efficacement lorsqu'Hibernate essaie de le mettre à jour ou de le supprimer."
 
 #. Tag: para
-#: performance.xml:1009
-#, no-c-format
+#: performance.xml:1057
+#, 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 "
+"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 "
@@ -2116,7 +2149,7 @@
 "literal>)."
 
 #. Tag: para
-#: performance.xml:1020
+#: performance.xml:1068
 #, no-c-format
 msgid ""
 "<literal>&lt;idbag&gt;</literal> mappings define a surrogate key, so they "
@@ -2127,7 +2160,7 @@
 "jour. En fait il s'agit du meilleur cas de mise à jour d'une collection"
 
 #. Tag: para
-#: performance.xml:1025
+#: performance.xml:1073
 #, no-c-format
 msgid ""
 "Bags are the worst case. Since a bag permits duplicate element values and "
@@ -2145,7 +2178,7 @@
 "très inefficace."
 
 #. Tag: para
-#: performance.xml:1033
+#: performance.xml:1081
 #, no-c-format
 msgid ""
 "Note that for a one-to-many association, the \"primary key\" may not be the "
@@ -2159,7 +2192,7 @@
 "Hibernate \"localise\" chaque enregistrement de la collection)."
 
 #. Tag: title
-#: performance.xml:1043
+#: performance.xml:1091
 #, no-c-format
 msgid ""
 "Lists, maps, idbags and sets are the most efficient collections to update"
@@ -2168,7 +2201,7 @@
 "efficaces pour la mise à jour"
 
 #. Tag: para
-#: performance.xml:1045
+#: performance.xml:1093
 #, no-c-format
 msgid ""
 "From the discussion above, it should be clear that indexed collections and "
@@ -2180,7 +2213,7 @@
 "les opérations d'ajout, de suppression ou de modification d'éléments."
 
 #. Tag: para
-#: performance.xml:1051
+#: performance.xml:1099
 #, no-c-format
 msgid ""
 "There is, arguably, one more advantage that indexed collections have over "
@@ -2201,7 +2234,7 @@
 "pas aux associations un vers plusieurs."
 
 #. Tag: para
-#: performance.xml:1060
+#: performance.xml:1108
 #, no-c-format
 msgid ""
 "After observing that arrays cannot be lazy, we would conclude that lists, "
@@ -2218,7 +2251,7 @@
 "\"set\" est la plus naturelle dans le modèle relationnel."
 
 #. Tag: para
-#: performance.xml:1068
+#: performance.xml:1116
 #, no-c-format
 msgid ""
 "However, in well-designed Hibernate domain models, we usually see that most "
@@ -2235,14 +2268,14 @@
 "des collections ne s'appliquent tout simplement pas dans ces cas là."
 
 #. Tag: title
-#: performance.xml:1078
+#: performance.xml:1126
 #, 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:1080
+#: performance.xml:1128
 #, no-c-format
 msgid ""
 "Just before you ditch bags forever, there is a particular case in which bags "
@@ -2267,7 +2300,7 @@
 "suivant beaucoup plus rapide."
 
 #. Tag: programlisting
-#: performance.xml:1090
+#: performance.xml:1138
 #, no-c-format
 msgid ""
 "<![CDATA[Parent p = (Parent) sess.load(Parent.class, id);\n"
@@ -2278,13 +2311,13 @@
 msgstr ""
 
 #. Tag: title
-#: performance.xml:1095
+#: performance.xml:1143
 #, no-c-format
 msgid "One shot delete"
 msgstr "Suppression en un coup"
 
 #. Tag: para
-#: performance.xml:1097
+#: performance.xml:1145
 #, no-c-format
 msgid ""
 "Occasionally, deleting collection elements one by one can be extremely "
@@ -2301,7 +2334,7 @@
 "fait !"
 
 #. Tag: para
-#: performance.xml:1104
+#: performance.xml:1152
 #, no-c-format
 msgid ""
 "Suppose we add a single element to a collection of size twenty and then "
@@ -2315,7 +2348,7 @@
 "la collection ne soit un bag). Ce qui est souhaitable."
 
 #. Tag: para
-#: performance.xml:1110
+#: performance.xml:1158
 #, no-c-format
 msgid ""
 "However, suppose that we remove eighteen elements, leaving two and then add "
@@ -2326,13 +2359,13 @@
 "moyens de procéder."
 
 #. Tag: para
-#: performance.xml:1117
+#: performance.xml:1165
 #, 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:1120
+#: performance.xml:1168
 #, no-c-format
 msgid ""
 "remove the whole collection (in one SQL <literal>DELETE</literal>) and "
@@ -2342,7 +2375,7 @@
 "puis insérer les cinq éléments restant un à un"
 
 #. Tag: para
-#: performance.xml:1125
+#: performance.xml:1173
 #, no-c-format
 msgid ""
 "Hibernate isn't smart enough to know that the second option is probably "
@@ -2355,7 +2388,7 @@
 "triggers de bases de données plutôt aléatoire, etc...)."
 
 #. Tag: para
-#: performance.xml:1131
+#: performance.xml:1179
 #, no-c-format
 msgid ""
 "Fortunately, you can force this behaviour (ie. the second strategy) at any "
@@ -2369,7 +2402,7 @@
 "restants. Ceci peut être très pratique et très puissant de temps en temps."
 
 #. Tag: para
-#: performance.xml:1137
+#: performance.xml:1185
 #, no-c-format
 msgid ""
 "Of course, one-shot-delete does not apply to collections mapped "
@@ -2379,13 +2412,13 @@
 "qui sont mappées avec <literal>inverse=\"true\"</literal>."
 
 #. Tag: title
-#: performance.xml:1146
+#: performance.xml:1194
 #, no-c-format
 msgid "Monitoring performance"
 msgstr "Moniteur de performance"
 
 #. Tag: para
-#: performance.xml:1148
+#: performance.xml:1196
 #, no-c-format
 msgid ""
 "Optimization is not much use without monitoring and access to performance "
@@ -2399,13 +2432,13 @@
 "<literal>SessionFactory</literal>."
 
 #. Tag: title
-#: performance.xml:1155
+#: performance.xml:1203
 #, no-c-format
 msgid "Monitoring a SessionFactory"
 msgstr "Suivi d'une SessionFactory"
 
 #. Tag: para
-#: performance.xml:1157
+#: performance.xml:1205
 #, no-c-format
 msgid ""
 "You can access <literal>SessionFactory</literal> metrics in two ways. Your "
@@ -2418,7 +2451,7 @@
 "literal> vous même."
 
 #. Tag: para
-#: performance.xml:1163
+#: performance.xml:1211
 #, no-c-format
 msgid ""
 "Hibernate can also use JMX to publish metrics if you enable the "
@@ -2432,7 +2465,7 @@
 "factory. Voici un code qui montre un exemple de configuration minimaliste :"
 
 #. Tag: programlisting
-#: performance.xml:1170
+#: performance.xml:1218
 #, no-c-format
 msgid ""
 "<![CDATA[// MBean service registration for a specific SessionFactory\n"
@@ -2448,7 +2481,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: performance.xml:1173
+#: performance.xml:1221
 #, no-c-format
 msgid ""
 "<![CDATA[// MBean service registration for all SessionFactory's\n"
@@ -2462,7 +2495,7 @@
 msgstr ""
 
 #. Tag: para
-#: performance.xml:1175
+#: performance.xml:1223
 #, no-c-format
 msgid ""
 "TODO: This doesn't make sense: In the first case, we retrieve and use the "
@@ -2477,7 +2510,7 @@
 "\")</literal>"
 
 #. Tag: para
-#: performance.xml:1180
+#: performance.xml:1228
 #, no-c-format
 msgid ""
 "You can (de)activate the monitoring for a <literal>SessionFactory</literal>"
@@ -2485,7 +2518,7 @@
 "Vous pouvez (dés)activer le suivi pour une <literal>SessionFactory</literal>"
 
 #. Tag: para
-#: performance.xml:1185
+#: performance.xml:1233
 #, no-c-format
 msgid ""
 "at configuration time, set <literal>hibernate.generate_statistics</literal> "
@@ -2495,7 +2528,7 @@
 "generate_statistics</literal> à <literal>false</literal>"
 
 #. Tag: para
-#: performance.xml:1192
+#: performance.xml:1240
 #, no-c-format
 msgid ""
 "at runtime: <literal>sf.getStatistics().setStatisticsEnabled(true)</literal> "
@@ -2505,11 +2538,11 @@
 "literal> ou <literal>hibernateStatsBean.setStatisticsEnabled(true)</literal>"
 
 #. Tag: para
-#: performance.xml:1199
-#, no-c-format
+#: performance.xml:1247
+#, 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 ""
 "Les statistiques peuvent être remises à zéro de manière programmatique à "
@@ -2518,13 +2551,13 @@
 "literal>"
 
 #. Tag: title
-#: performance.xml:1208
+#: performance.xml:1256
 #, no-c-format
 msgid "Metrics"
 msgstr "Métriques"
 
 #. Tag: para
-#: performance.xml:1210
+#: performance.xml:1258
 #, no-c-format
 msgid ""
 "Hibernate provides a number of metrics, from very basic to the specialized "
@@ -2538,7 +2571,7 @@
 "l'API de l'interface <literal>Statistics</literal> dans trois catégories :"
 
 #. Tag: para
-#: performance.xml:1217
+#: performance.xml:1265
 #, no-c-format
 msgid ""
 "Metrics related to the general <literal>Session</literal> usage, such as "
@@ -2549,7 +2582,7 @@
 "récupérées, etc..."
 
 #. Tag: para
-#: performance.xml:1223
+#: performance.xml:1271
 #, no-c-format
 msgid ""
 "Metrics related to he entities, collections, queries, and caches as a whole "
@@ -2559,7 +2592,7 @@
 "leur ensemble (métriques globales),"
 
 #. Tag: para
-#: performance.xml:1229
+#: performance.xml:1277
 #, no-c-format
 msgid ""
 "Detailed metrics related to a particular entity, collection, query or cache "
@@ -2569,10 +2602,10 @@
 "ou une région de cache particulière."
 
 #. Tag: para
-#: performance.xml:1236
-#, no-c-format
+#: performance.xml:1284
+#, fuzzy, no-c-format
 msgid ""
-"For exampl,e you can check the cache hit, miss, and put ratio of entities, "
+"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 "
@@ -2586,7 +2619,7 @@
 "n'offre qu'une précision de l'ordre de 10 secondes."
 
 #. Tag: para
-#: performance.xml:1243
+#: performance.xml:1291
 #, no-c-format
 msgid ""
 "Simple getters are used to access the global metrics (i.e. not tied to a "
@@ -2611,7 +2644,7 @@
 "simple :"
 
 #. Tag: programlisting
-#: performance.xml:1253
+#: performance.xml:1301
 #, no-c-format
 msgid ""
 "<![CDATA[Statistics stats = HibernateUtil.sessionFactory.getStatistics();\n"
@@ -2633,7 +2666,7 @@
 msgstr ""
 
 #. Tag: para
-#: performance.xml:1255
+#: performance.xml:1303
 #, no-c-format
 msgid ""
 "To work on all entities, collections, queries and region caches, you can "

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	2008-08-14 15:28:13 UTC (rev 15066)
+++ core/trunk/documentation/manual/src/main/docbook/fr-FR/content/persistent_classes.po	2008-08-14 15:35:40 UTC (rev 15067)
@@ -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: 2008-08-14 15:28+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,13 +11,13 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: persistent_classes.xml:5
+#: persistent_classes.xml:29
 #, no-c-format
 msgid "Persistent Classes"
 msgstr "Classes persistantes"
 
 #. Tag: para
-#: persistent_classes.xml:7
+#: persistent_classes.xml:31
 #, no-c-format
 msgid ""
 "Persistent classes are classes in an application that implement the entities "
@@ -32,7 +32,7 @@
 "une instance peut être éphémère (NdT : transient) ou détachée."
 
 #. Tag: para
-#: persistent_classes.xml:14
+#: persistent_classes.xml:38
 #, no-c-format
 msgid ""
 "Hibernate works best if these classes follow some simple rules, also known "
@@ -50,13 +50,13 @@
 "<literal>Map</literal>, par exemple."
 
 #. Tag: title
-#: persistent_classes.xml:23
+#: persistent_classes.xml:47
 #, no-c-format
 msgid "A simple POJO example"
 msgstr "Un exemple simple de POJO"
 
 #. Tag: para
-#: persistent_classes.xml:25
+#: persistent_classes.xml:49
 #, no-c-format
 msgid "Most Java applications require a persistent class representing felines."
 msgstr ""
@@ -64,7 +64,7 @@
 "les félins."
 
 #. Tag: programlisting
-#: persistent_classes.xml:29
+#: persistent_classes.xml:53
 #, no-c-format
 msgid ""
 "<![CDATA[package eg;\n"
@@ -148,19 +148,19 @@
 msgstr ""
 
 #. Tag: para
-#: persistent_classes.xml:31
+#: 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 :"
 
 #. Tag: title
-#: persistent_classes.xml:37
+#: persistent_classes.xml:61
 #, no-c-format
 msgid "Implement a no-argument constructor"
 msgstr "Implémenter un constructeur sans argument"
 
 #. Tag: para
-#: persistent_classes.xml:39
+#: persistent_classes.xml:63
 #, no-c-format
 msgid ""
 "<literal>Cat</literal> has a no-argument constructor. All persistent classes "
@@ -179,13 +179,13 @@
 "Hibernate."
 
 #. Tag: title
-#: persistent_classes.xml:49
+#: persistent_classes.xml:73
 #, no-c-format
 msgid "Provide an identifier property (optional)"
 msgstr "Fournir une propriété d'indentifiant (optionnel)"
 
 #. Tag: para
-#: persistent_classes.xml:51
+#: persistent_classes.xml:75
 #, no-c-format
 msgid ""
 "<literal>Cat</literal> has a property called <literal>id</literal>. This "
@@ -208,7 +208,7 @@
 "composites plus tard)."
 
 #. 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 "
@@ -220,7 +220,7 @@
 "interne. Toutefois, nous ne le recommandons pas."
 
 #. Tag: para
-#: persistent_classes.xml:65
+#: persistent_classes.xml:89
 #, no-c-format
 msgid ""
 "In fact, some functionality is available only to classes which declare an "
@@ -230,7 +230,7 @@
 "déclarant un identifiant de propriété :"
 
 #. Tag: para
-#: persistent_classes.xml:72
+#: persistent_classes.xml:96
 #, fuzzy, no-c-format
 msgid ""
 "Transitive reattachment for detached objects (cascade update or cascade "
@@ -241,19 +241,19 @@
 "\"/>"
 
 #. 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
+#: persistent_classes.xml:113
 #, no-c-format
 msgid ""
 "We recommend you declare consistently-named identifier properties on "
@@ -265,13 +265,13 @@
 "(ie. non primitif)."
 
 #. Tag: title
-#: persistent_classes.xml:96
+#: persistent_classes.xml:120
 #, no-c-format
 msgid "Prefer non-final classes (optional)"
 msgstr "Favoriser les classes non finales (optionnel)"
 
 #. Tag: para
-#: persistent_classes.xml:97
+#: persistent_classes.xml:121
 #, no-c-format
 msgid ""
 "A central feature of Hibernate, <emphasis>proxies</emphasis>, depends upon "
@@ -283,7 +283,7 @@
 "l'implémentation d'une interface qui déclare toutes les méthodes publiques."
 
 #. Tag: para
-#: persistent_classes.xml:102
+#: persistent_classes.xml:126
 #, no-c-format
 msgid ""
 "You can persist <literal>final</literal> classes that do not implement an "
@@ -296,7 +296,7 @@
 "qui limitera vos possibilités d'ajustement des performances."
 
 #. 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 "
@@ -310,14 +310,14 @@
 "désactiver les proxies en paramétrant <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 ""
 "Déclarer les accesseurs et mutateurs des attributs persistants (optionnel)"
 
 #. Tag: para
-#: persistent_classes.xml:117
+#: persistent_classes.xml:141
 #, no-c-format
 msgid ""
 "<literal>Cat</literal> declares accessor methods for all its persistent "
@@ -340,7 +340,7 @@
 "champs pour des propriétés particulières, si besoin est."
 
 #. Tag: para
-#: persistent_classes.xml:127
+#: persistent_classes.xml:151
 #, no-c-format
 msgid ""
 "Properties need <emphasis>not</emphasis> be declared public - Hibernate can "
@@ -353,13 +353,13 @@
 "literal>."
 
 #. Tag: title
-#: persistent_classes.xml:138
+#: persistent_classes.xml:162
 #, no-c-format
 msgid "Implementing inheritance"
 msgstr "Implémenter l'héritage"
 
 #. Tag: para
-#: persistent_classes.xml:140
+#: persistent_classes.xml:164
 #, no-c-format
 msgid ""
 "A subclass must also observe the first and second rules. It inherits its "
@@ -369,7 +369,7 @@
 "hérite sa propriété d'identifiant de <literal>Cat</literal>."
 
 #. Tag: programlisting
-#: persistent_classes.xml:145
+#: persistent_classes.xml:169
 #, no-c-format
 msgid ""
 "<![CDATA[package eg;\n"
@@ -387,7 +387,7 @@
 msgstr ""
 
 #. Tag: title
-#: persistent_classes.xml:149
+#: persistent_classes.xml:173
 #, no-c-format
 msgid ""
 "Implementing <literal>equals()</literal> and <literal>hashCode()</literal>"
@@ -395,7 +395,7 @@
 "Implémenter <literal>equals()</literal> et <literal>hashCode()</literal>"
 
 #. Tag: para
-#: persistent_classes.xml:151
+#: persistent_classes.xml:175
 #, no-c-format
 msgid ""
 "You have to override the <literal>equals()</literal> and <literal>hashCode()"
@@ -405,7 +405,7 @@
 "<literal>hashCode()</literal> si vous"
 
 #. Tag: para
-#: persistent_classes.xml:157
+#: persistent_classes.xml:181
 #, no-c-format
 msgid ""
 "intend to put instances of persistent classes in a <literal>Set</literal> "
@@ -417,13 +417,13 @@
 "associations pluri-valuées) <emphasis>et</emphasis>"
 
 #. Tag: para
-#: persistent_classes.xml:164
+#: persistent_classes.xml:188
 #, no-c-format
 msgid "intend to use reattachment of detached instances"
 msgstr "avez l'intention d'utiliser le réattachement d'instances détachées"
 
 #. Tag: para
-#: persistent_classes.xml:170
+#: persistent_classes.xml:194
 #, no-c-format
 msgid ""
 "Hibernate guarantees equivalence of persistent identity (database row) and "
@@ -440,7 +440,7 @@
 "correcte pour les <literal>Set</literal>s."
 
 #. Tag: para
-#: persistent_classes.xml:178
+#: persistent_classes.xml:202
 #, no-c-format
 msgid ""
 "The most obvious way is to implement <literal>equals()</literal>/"
@@ -478,7 +478,7 @@
 "et l'égalité."
 
 #. Tag: para
-#: persistent_classes.xml:192
+#: persistent_classes.xml:216
 #, no-c-format
 msgid ""
 "We recommend implementing <literal>equals()</literal> and <literal>hashCode()"
@@ -495,7 +495,7 @@
 "(une clé candidate <emphasis>naturelle</emphasis>) :"
 
 #. Tag: programlisting
-#: persistent_classes.xml:200
+#: persistent_classes.xml:224
 #, no-c-format
 msgid ""
 "<![CDATA[public class Cat {\n"
@@ -524,7 +524,7 @@
 msgstr ""
 
 #. Tag: para
-#: persistent_classes.xml:202
+#: persistent_classes.xml:226
 #, no-c-format
 msgid ""
 "Note that a business key does not have to be as solid as a database primary "
@@ -538,13 +538,13 @@
 "une clef métier."
 
 #. Tag: title
-#: persistent_classes.xml:212
+#: persistent_classes.xml:236
 #, no-c-format
 msgid "Dynamic models"
 msgstr "Modèles dynamiques"
 
 #. Tag: emphasis
-#: persistent_classes.xml:215
+#: persistent_classes.xml:239
 #, no-c-format
 msgid ""
 "Note that the following features are currently considered experimental and "
@@ -554,7 +554,7 @@
 "expérimentales et peuvent changer dans un futur proche."
 
 #. Tag: para
-#: persistent_classes.xml:219
+#: persistent_classes.xml:243
 #, no-c-format
 msgid ""
 "Persistent entities don't necessarily have to be represented as POJO classes "
@@ -571,7 +571,7 @@
 "classes persistantes, seulement des fichiers de mapping."
 
 #. Tag: para
-#: persistent_classes.xml:227
+#: persistent_classes.xml:251
 #, no-c-format
 msgid ""
 "By default, Hibernate works in normal POJO mode. You may set a default "
@@ -586,7 +586,7 @@
 "\"configuration-optional-properties\"/>)."
 
 #. Tag: para
-#: persistent_classes.xml:234
+#: persistent_classes.xml:258
 #, no-c-format
 msgid ""
 "The following examples demonstrates the representation using <literal>Map</"
@@ -599,7 +599,7 @@
 "nom de classe :"
 
 #. Tag: programlisting
-#: persistent_classes.xml:240
+#: persistent_classes.xml:264
 #, no-c-format
 msgid ""
 "<![CDATA[<hibernate-mapping>\n"
@@ -638,7 +638,7 @@
 msgstr ""
 
 #. Tag: para
-#: persistent_classes.xml:242
+#: persistent_classes.xml:266
 #, no-c-format
 msgid ""
 "Note that even though associations are declared using target class names, "
@@ -650,7 +650,7 @@
 "dynamique au lieu d'un POJO."
 
 #. Tag: para
-#: persistent_classes.xml:249
+#: persistent_classes.xml:273
 #, no-c-format
 msgid ""
 "After setting the default entity mode to <literal>dynamic-map</literal> for "
@@ -663,7 +663,7 @@
 "literal>s :"
 
 #. Tag: programlisting
-#: persistent_classes.xml:255
+#: persistent_classes.xml:279
 #, no-c-format
 msgid ""
 "<![CDATA[Session s = openSession();\n"
@@ -690,7 +690,7 @@
 msgstr ""
 
 #. Tag: para
-#: persistent_classes.xml:257
+#: persistent_classes.xml:281
 #, no-c-format
 msgid ""
 "The advantages of a dynamic mapping are quick turnaround time for "
@@ -709,7 +709,7 @@
 "tard."
 
 #. Tag: para
-#: persistent_classes.xml:265
+#: persistent_classes.xml:289
 #, no-c-format
 msgid ""
 "Entity representation modes can also be set on a per <literal>Session</"
@@ -719,7 +719,7 @@
 "<literal>Session</literal> :"
 
 #. Tag: programlisting
-#: persistent_classes.xml:270
+#: persistent_classes.xml:294
 #, no-c-format
 msgid ""
 "<![CDATA[Session dynamicSession = pojoSession.getSession(EntityMode.MAP);\n"
@@ -737,7 +737,7 @@
 msgstr ""
 
 #. Tag: para
-#: persistent_classes.xml:273
+#: persistent_classes.xml:297
 #, no-c-format
 msgid ""
 "Please note that the call to <literal>getSession()</literal> using an "
@@ -759,7 +759,7 @@
 "transaction et de la connexion à l'unité de travail primaire."
 
 #. Tag: para
-#: persistent_classes.xml:283
+#: persistent_classes.xml:307
 #, no-c-format
 msgid ""
 "More information about the XML representation capabilities can be found in "
@@ -769,13 +769,13 @@
 "dans <xref linkend=\"xml\"/>."
 
 #. Tag: title
-#: persistent_classes.xml:291
+#: persistent_classes.xml:315
 #, no-c-format
 msgid "Tuplizers"
 msgstr "Tuplizers"
 
 #. Tag: para
-#: persistent_classes.xml:293
+#: persistent_classes.xml:317
 #, no-c-format
 msgid ""
 "<literal>org.hibernate.tuple.Tuplizer</literal>, and its sub-interfaces, are "
@@ -811,7 +811,7 @@
 "composants."
 
 #. Tag: para
-#: persistent_classes.xml:308
+#: persistent_classes.xml:332
 #, no-c-format
 msgid ""
 "Users may also plug in their own tuplizers. Perhaps you require that a "
@@ -834,7 +834,7 @@
 "notre entité utilisateur :"
 
 #. Tag: programlisting
-#: persistent_classes.xml:317
+#: persistent_classes.xml:341
 #, no-c-format
 msgid ""
 "<![CDATA[<hibernate-mapping>\n"
@@ -874,8 +874,14 @@
 "}]]>"
 msgstr ""
 
+#. Tag: title
+#: persistent_classes.xml:347
+#, no-c-format
+msgid "Extentsions"
+msgstr ""
+
 #. Tag: para
-#: persistent_classes.xml:322
+#: persistent_classes.xml:348
 #, no-c-format
 msgid ""
 "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	2008-08-14 15:28:13 UTC (rev 15066)
+++ core/trunk/documentation/manual/src/main/docbook/fr-FR/content/preface.po	2008-08-14 15:35:40 UTC (rev 15067)
@@ -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: 2008-08-14 15:28+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,13 +11,13 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: preface.xml:21
+#: preface.xml:29
 #, no-c-format
 msgid "Preface"
 msgstr "Préface"
 
 #. Tag: para
-#: preface.xml:23
+#: preface.xml:31
 #, no-c-format
 msgid ""
 "Working with object-oriented software and a relational database can be "
@@ -35,7 +35,7 @@
 "des données et sa représentation relationnelle basée sur un schéma SQL."
 
 #. Tag: para
-#: preface.xml:31
+#: preface.xml:39
 #, no-c-format
 msgid ""
 "Hibernate not only takes care of the mapping from Java classes to database "
@@ -51,7 +51,7 @@
 "des données via SQL et JDBC."
 
 #. Tag: para
-#: preface.xml:38
+#: preface.xml:46
 #, no-c-format
 msgid ""
 "Hibernates goal is to relieve the developer from 95 percent of common data "
@@ -75,7 +75,7 @@
 "représentation tabulaire à une représentation sous forme de graphe d'objets."
 
 #. 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, "
@@ -85,7 +85,7 @@
 "même en Java, suivez ces quelques étapes :"
 
 #. 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 @@
 "d'instructions étape par étape."
 
 #. Tag: para
-#: preface.xml:63
+#: preface.xml:71
 #, no-c-format
 msgid ""
 "Read <xref linkend=\"architecture\"/> to understand the environments where "
@@ -106,7 +106,7 @@
 "dans lesquels Hibernate peut être utilisé."
 
 #. Tag: para
-#: preface.xml:69
+#: preface.xml:77
 #, no-c-format
 msgid ""
 "Have a look at the <literal>eg/</literal> directory in the Hibernate "
@@ -125,7 +125,7 @@
 "Windows tapez <literal>build eg</literal>."
 
 #. Tag: para
-#: preface.xml:80
+#: preface.xml:88
 #, no-c-format
 msgid ""
 "Use this reference documentation as your primary source of information. "
@@ -143,7 +143,7 @@
 "exemple pour 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,7 +151,7 @@
 "le site web Hibernate."
 
 #. Tag: para
-#: preface.xml:95
+#: preface.xml:103
 #, no-c-format
 msgid ""
 "Third party demos, examples, and tutorials are linked on the Hibernate "
@@ -161,7 +161,7 @@
 "site web 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 "
@@ -174,7 +174,7 @@
 "etc)."
 
 #. Tag: para
-#: preface.xml:109
+#: preface.xml:117
 #, no-c-format
 msgid ""
 "If you have questions, use the user forum linked on the Hibernate website. "
@@ -190,7 +190,7 @@
 "diffusion de développement."
 
 #. 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/fr-FR/content/query_criteria.po
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/fr-FR/content/query_criteria.po	2008-08-14 15:28:13 UTC (rev 15066)
+++ core/trunk/documentation/manual/src/main/docbook/fr-FR/content/query_criteria.po	2008-08-14 15:35:40 UTC (rev 15067)
@@ -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: 2008-08-14 15:28+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
-#: query_criteria.xml:5
+#: query_criteria.xml:29
 #, no-c-format
 msgid "Criteria Queries"
 msgstr "Requêtes par critères"
 
 #. Tag: para
-#: query_criteria.xml:7
+#: query_criteria.xml:31
 #, no-c-format
 msgid "Hibernate features an intuitive, extensible criteria query API."
 msgstr ""
 "Hibernate offre une API d'interrogation par critères intuitive et extensible."
 
 #. Tag: title
-#: query_criteria.xml:12
+#: query_criteria.xml:36
 #, no-c-format
 msgid "Creating a <literal>Criteria</literal> instance"
 msgstr "Créer une instance de <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 "
@@ -42,7 +42,7 @@
 "fournit les instances 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"
@@ -51,13 +51,13 @@
 msgstr ""
 
 #. Tag: title
-#: query_criteria.xml:25
+#: query_criteria.xml:49
 #, no-c-format
 msgid "Narrowing the result set"
 msgstr "Restriction du résultat"
 
 #. 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 @@
 "des types de <literal>Criterion</literal> pré-définis."
 
 #. 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
+#: query_criteria.xml:61
 #, no-c-format
 msgid "Restrictions may be grouped logically."
 msgstr "Les restrictions peuvent être goupées de manière logique."
 
 #. 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,7 +116,7 @@
 msgstr ""
 
 #. Tag: para
-#: query_criteria.xml:45
+#: query_criteria.xml:69
 #, no-c-format
 msgid ""
 "There are quite a range of built-in criterion types (<literal>Restrictions</"
@@ -128,7 +128,7 @@
 "utile vous permet de spécifier directement du SQL."
 
 #. Tag: programlisting
-#: query_criteria.xml:50
+#: query_criteria.xml:74
 #, no-c-format
 msgid ""
 "<![CDATA[List cats = sess.createCriteria(Cat.class)\n"
@@ -138,7 +138,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 "
@@ -148,7 +148,7 @@
 "l'entité que l'on souhaite intérroger."
 
 #. Tag: para
-#: query_criteria.xml:57
+#: query_criteria.xml:81
 #, no-c-format
 msgid ""
 "An alternative approach to obtaining a criterion is to get it from a "
@@ -161,7 +161,7 @@
 "literal>."
 
 #. Tag: programlisting
-#: query_criteria.xml:63
+#: query_criteria.xml:87
 #, no-c-format
 msgid ""
 "<![CDATA[\n"
@@ -179,13 +179,13 @@
 msgstr ""
 
 #. Tag: title
-#: query_criteria.xml:68
+#: query_criteria.xml:92
 #, no-c-format
 msgid "Ordering the results"
 msgstr "Trier les résultats"
 
 #. Tag: para
-#: query_criteria.xml:70
+#: query_criteria.xml:94
 #, no-c-format
 msgid ""
 "You may order the results using <literal>org.hibernate.criterion.Order</"
@@ -195,7 +195,7 @@
 "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"
@@ -207,7 +207,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: query_criteria.xml:76
+#: query_criteria.xml:100
 #, no-c-format
 msgid ""
 "<![CDATA[List cats = sess.createCriteria(Cat.class)\n"
@@ -219,13 +219,13 @@
 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 "
@@ -235,7 +235,7 @@
 "des associations en utilisant <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"
@@ -246,7 +246,7 @@
 msgstr ""
 
 #. Tag: para
-#: query_criteria.xml:90
+#: query_criteria.xml:114
 #, no-c-format
 msgid ""
 "note that the second <literal>createCriteria()</literal> returns a new "
@@ -258,13 +258,13 @@
 "éléments de la collection <literal>kittens</literal>."
 
 #. Tag: para
-#: query_criteria.xml:96
+#: query_criteria.xml:120
 #, no-c-format
 msgid "The following, alternate form is useful in certain circumstances."
 msgstr "La forme alternative suivante est utile dans certains cas."
 
 #. Tag: programlisting
-#: query_criteria.xml:100
+#: query_criteria.xml:124
 #, no-c-format
 msgid ""
 "<![CDATA[List cats = sess.createCriteria(Cat.class)\n"
@@ -275,7 +275,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 "
@@ -285,7 +285,7 @@
 "<literal>Criteria</literal>.)"
 
 #. Tag: para
-#: query_criteria.xml:107
+#: query_criteria.xml:131
 #, no-c-format
 msgid ""
 "Note that the kittens collections held by the <literal>Cat</literal> "
@@ -300,7 +300,7 @@
 "utiliser <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"
@@ -317,13 +317,13 @@
 msgstr ""
 
 #. Tag: title
-#: query_criteria.xml:119
+#: query_criteria.xml:143
 #, no-c-format
 msgid "Dynamic association fetching"
 msgstr "Peuplement d'associations de manière dynamique"
 
 #. Tag: para
-#: query_criteria.xml:121
+#: query_criteria.xml:145
 #, no-c-format
 msgid ""
 "You may specify association fetching semantics at runtime using "
@@ -335,7 +335,7 @@
 "\"outer-join\" du mapping."
 
 #. Tag: programlisting
-#: query_criteria.xml:126
+#: query_criteria.xml:150
 #, no-c-format
 msgid ""
 "<![CDATA[List cats = sess.createCriteria(Cat.class)\n"
@@ -346,7 +346,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</"
@@ -358,13 +358,13 @@
 "fetching\"/> pour plus d'informations."
 
 #. Tag: title
-#: query_criteria.xml:136
+#: query_criteria.xml:160
 #, no-c-format
 msgid "Example queries"
 msgstr "Requêtes par l'exemple"
 
 #. 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 "
@@ -374,7 +374,7 @@
 "construire un critère suivant une instance d'objet donnée."
 
 #. Tag: programlisting
-#: query_criteria.xml:143
+#: query_criteria.xml:167
 #, no-c-format
 msgid ""
 "<![CDATA[Cat cat = new Cat();\n"
@@ -386,7 +386,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, "
@@ -396,7 +396,7 @@
 "Par défaut, les valeurs null sont exclues."
 
 #. 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 ""
@@ -404,7 +404,7 @@
 "l'<literal>Exemple</literal>."
 
 #. Tag: programlisting
-#: query_criteria.xml:154
+#: query_criteria.xml:178
 #, no-c-format
 msgid ""
 "<![CDATA[Example example = Example.create(cat)\n"
@@ -419,7 +419,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 ""
@@ -427,7 +427,7 @@
 "associés."
 
 #. Tag: programlisting
-#: query_criteria.xml:160
+#: query_criteria.xml:184
 #, no-c-format
 msgid ""
 "<![CDATA[List results = session.createCriteria(Cat.class)\n"
@@ -438,13 +438,13 @@
 msgstr ""
 
 #. Tag: title
-#: query_criteria.xml:165
+#: query_criteria.xml:189
 #, no-c-format
 msgid "Projections, aggregation and grouping"
 msgstr "Projections, agrégation et regroupement"
 
 #. Tag: para
-#: query_criteria.xml:166
+#: query_criteria.xml:190
 #, no-c-format
 msgid ""
 "The class <literal>org.hibernate.criterion.Projections</literal> is a "
@@ -456,7 +456,7 @@
 "projection sur une requête en appelant <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"
@@ -466,7 +466,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: query_criteria.xml:174
+#: query_criteria.xml:198
 #, no-c-format
 msgid ""
 "<![CDATA[List results = session.createCriteria(Cat.class)\n"
@@ -480,7 +480,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 "
@@ -493,7 +493,7 @@
 "aussi dans la clause <literal>group by</literal> SQL."
 
 #. Tag: para
-#: query_criteria.xml:182
+#: query_criteria.xml:206
 #, no-c-format
 msgid ""
 "An alias may optionally be assigned to a projection, so that the projected "
@@ -505,7 +505,7 @@
 "façons différentes de faire ça :"
 
 #. Tag: programlisting
-#: query_criteria.xml:188
+#: query_criteria.xml:212
 #, no-c-format
 msgid ""
 "<![CDATA[List results = session.createCriteria(Cat.class)\n"
@@ -516,7 +516,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: query_criteria.xml:190
+#: query_criteria.xml:214
 #, no-c-format
 msgid ""
 "<![CDATA[List results = session.createCriteria(Cat.class)\n"
@@ -526,7 +526,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 "
@@ -540,7 +540,7 @@
 "alias lorsque vous ajoutez la projection à la liste de projections :"
 
 #. Tag: programlisting
-#: query_criteria.xml:199
+#: query_criteria.xml:223
 #, no-c-format
 msgid ""
 "<![CDATA[List results = session.createCriteria(Cat.class)\n"
@@ -556,7 +556,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"
@@ -571,7 +571,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 "
@@ -581,7 +581,7 @@
 "formuler des projections :"
 
 #. Tag: programlisting
-#: query_criteria.xml:207
+#: query_criteria.xml:231
 #, no-c-format
 msgid ""
 "<![CDATA[List results = session.createCriteria(Cat.class)\n"
@@ -591,7 +591,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: query_criteria.xml:209
+#: query_criteria.xml:233
 #, no-c-format
 msgid ""
 "<![CDATA[List results = session.createCriteria(Cat.class)\n"
@@ -607,13 +607,13 @@
 msgstr ""
 
 #. Tag: title
-#: query_criteria.xml:214
+#: query_criteria.xml:238
 #, no-c-format
 msgid "Detached queries and subqueries"
 msgstr "Requêtes et sous-requêtes détachées"
 
 #. Tag: para
-#: query_criteria.xml:215
+#: query_criteria.xml:239
 #, no-c-format
 msgid ""
 "The <literal>DetachedCriteria</literal> class lets you create a query "
@@ -625,7 +625,7 @@
 "utilisant n'importe quelle <literal>Session</literal> arbitraire."
 
 #. Tag: programlisting
-#: query_criteria.xml:220
+#: query_criteria.xml:244
 #, no-c-format
 msgid ""
 "<![CDATA[DetachedCriteria query = DetachedCriteria.forClass(Cat.class)\n"
@@ -640,7 +640,7 @@
 msgstr ""
 
 #. Tag: para
-#: query_criteria.xml:222
+#: query_criteria.xml:246
 #, no-c-format
 msgid ""
 "A <literal>DetachedCriteria</literal> may also be used to express a "
@@ -653,7 +653,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"
@@ -664,7 +664,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: query_criteria.xml:230
+#: query_criteria.xml:254
 #, no-c-format
 msgid ""
 "<![CDATA[DetachedCriteria weights = DetachedCriteria.forClass(Cat.class)\n"
@@ -675,13 +675,13 @@
 msgstr ""
 
 #. Tag: para
-#: query_criteria.xml:232
+#: query_criteria.xml:256
 #, no-c-format
 msgid "Even correlated subqueries are possible:"
 msgstr "Même des requêtes corrélées sont possibles :"
 
 #. Tag: programlisting
-#: query_criteria.xml:236
+#: query_criteria.xml:260
 #, no-c-format
 msgid ""
 "<![CDATA[DetachedCriteria avgWeightForSex = DetachedCriteria.forClass(Cat."
@@ -694,13 +694,13 @@
 msgstr ""
 
 #. Tag: title
-#: query_criteria.xml:245
+#: query_criteria.xml:269
 #, no-c-format
 msgid "Queries by natural identifier"
 msgstr "Requêtes par identifiant naturel"
 
 #. Tag: para
-#: query_criteria.xml:247
+#: query_criteria.xml:271
 #, no-c-format
 msgid ""
 "For most queries, including criteria queries, the query cache is not very "
@@ -719,7 +719,7 @@
 "provision spéciale pour ce cas d'utilisation."
 
 #. Tag: para
-#: query_criteria.xml:255
+#: query_criteria.xml:279
 #, no-c-format
 msgid ""
 "First, you should map the natural key of your entity using <literal>&lt;"
@@ -730,7 +730,7 @@
 "second niveau."
 
 #. Tag: programlisting
-#: query_criteria.xml:260
+#: query_criteria.xml:284
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"User\">\n"
@@ -747,7 +747,7 @@
 msgstr ""
 
 #. Tag: para
-#: query_criteria.xml:262
+#: query_criteria.xml:286
 #, no-c-format
 msgid ""
 "Note that this functionality is not intended for use with entities with "
@@ -757,13 +757,13 @@
 "entités avec des clefs naturelles <emphasis>mutables</emphasis>."
 
 #. Tag: para
-#: query_criteria.xml:267
+#: 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:271
+#: query_criteria.xml:295
 #, no-c-format
 msgid ""
 "Now, <literal>Restrictions.naturalId()</literal> allows us to make use of "
@@ -773,7 +773,7 @@
 "l'utilisation de l'algorithme de cache plus efficace."
 
 #. Tag: programlisting
-#: query_criteria.xml:276
+#: query_criteria.xml:300
 #, no-c-format
 msgid ""
 "<![CDATA[session.createCriteria(User.class)\n"

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	2008-08-14 15:28:13 UTC (rev 15066)
+++ core/trunk/documentation/manual/src/main/docbook/fr-FR/content/query_hql.po	2008-08-14 15:35:40 UTC (rev 15067)
@@ -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: 2008-08-14 15:28+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,13 +11,13 @@
 "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: Langage de requêtage d'Hibernate"
 
 #. Tag: para
-#: query_hql.xml:7
+#: query_hql.xml:31
 #, no-c-format
 msgid ""
 "Hibernate is equipped with an extremely powerful query language that (quite "
@@ -31,13 +31,13 @@
 "d'héritage, de polymorphisme et d'association."
 
 #. Tag: title
-#: query_hql.xml:14
+#: query_hql.xml:38
 #, no-c-format
 msgid "Case Sensitivity"
 msgstr "Sensibilité à la casse"
 
 #. Tag: para
-#: query_hql.xml:16
+#: query_hql.xml:40
 #, no-c-format
 msgid ""
 "Queries are case-insensitive, except for names of Java classes and "
@@ -54,7 +54,7 @@
 "<literal>foo.BARSET</literal>."
 
 #. Tag: para
-#: query_hql.xml:27
+#: query_hql.xml:51
 #, no-c-format
 msgid ""
 "This manual uses lowercase HQL keywords. Some users find queries with "
@@ -67,25 +67,25 @@
 "Java."
 
 #. Tag: title
-#: query_hql.xml:35
+#: query_hql.xml:59
 #, no-c-format
 msgid "The from clause"
 msgstr "La clause 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 "La requête Hibernate la plus simple est de la forme :"
 
 #. 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
+#: query_hql.xml:67
 #, no-c-format
 msgid ""
 "which simply returns all instances of the class <literal>eg.Cat</literal>. "
@@ -98,13 +98,13 @@
 "Donc nous écrivons presque toujours :"
 
 #. 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>, "
@@ -116,13 +116,13 @@
 "parties de la requête."
 
 #. 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
+#: query_hql.xml:83
 #, no-c-format
 msgid ""
 "This query assigns the alias <literal>cat</literal> to <literal>Cat</"
@@ -135,13 +135,13 @@
 "écrire :"
 
 #. 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
+#: query_hql.xml:91
 #, no-c-format
 msgid ""
 "Multiple classes may appear, resulting in a cartesian product or \"cross\" "
@@ -151,19 +151,19 @@
 "(encore appelé jointures croisées)."
 
 #. 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
+#: query_hql.xml:98
 #, no-c-format
 msgid ""
 "It is considered good practice to name query aliases using an initial "
@@ -176,13 +176,13 @@
 "(<literal>domesticCat</literal>)."
 
 #. Tag: title
-#: query_hql.xml:83
+#: query_hql.xml:107
 #, no-c-format
 msgid "Associations and joins"
 msgstr "Associations et jointures"
 
 #. Tag: para
-#: query_hql.xml:85
+#: query_hql.xml:109
 #, no-c-format
 msgid ""
 "We may also assign aliases to associated entities, or even to elements of a "
@@ -193,7 +193,7 @@
 "literal> (jointure)."
 
 #. Tag: programlisting
-#: query_hql.xml:90
+#: query_hql.xml:114
 #, no-c-format
 msgid ""
 "<![CDATA[from Cat as cat\n"
@@ -202,43 +202,43 @@
 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
+#: query_hql.xml:120
 #, 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
-#: query_hql.xml:103
+#: query_hql.xml:127
 #, no-c-format
 msgid "inner join"
 msgstr "<literal>inner join</literal> (jointure fermée)"
 
 #. Tag: literal
-#: query_hql.xml:108
+#: query_hql.xml:132
 #, no-c-format
 msgid "left outer join"
 msgstr "<literal>left outer join</literal> (jointure ouverte par la gauche)"
 
 #. Tag: literal
-#: query_hql.xml:113
+#: query_hql.xml:137
 #, no-c-format
 msgid "right outer join"
 msgstr "<literal>right outer join</literal> (jointure ouverte par la droite)"
 
 #. Tag: para
-#: query_hql.xml:117
+#: query_hql.xml:141
 #, no-c-format
 msgid "<literal>full join</literal> (not usually useful)"
 msgstr ""
@@ -246,7 +246,7 @@
 "inutile)"
 
 #. 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 "
@@ -257,7 +257,7 @@
 "abbrégées."
 
 #. Tag: programlisting
-#: query_hql.xml:128
+#: query_hql.xml:152
 #, no-c-format
 msgid ""
 "<![CDATA[from Cat as cat\n"
@@ -266,7 +266,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> "
@@ -276,7 +276,7 @@
 "utilisant le mot-clef HQL <literal>with</literal>."
 
 #. Tag: programlisting
-#: query_hql.xml:135
+#: query_hql.xml:159
 #, no-c-format
 msgid ""
 "<![CDATA[from Cat as cat\n"
@@ -285,7 +285,7 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:137
+#: query_hql.xml:161
 #, no-c-format
 msgid ""
 "In addition, a \"fetch\" join allows associations or collections of values "
@@ -304,7 +304,7 @@
 "d'informations."
 
 #. Tag: programlisting
-#: query_hql.xml:145
+#: query_hql.xml:169
 #, no-c-format
 msgid ""
 "<![CDATA[from Cat as cat\n"
@@ -313,7 +313,7 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:147
+#: query_hql.xml:171
 #, no-c-format
 msgid ""
 "A fetch join does not usually need to assign an alias, because the "
@@ -332,7 +332,7 @@
 "supplémentaire :"
 
 #. Tag: programlisting
-#: query_hql.xml:155
+#: query_hql.xml:179
 #, no-c-format
 msgid ""
 "<![CDATA[from Cat as cat\n"
@@ -342,7 +342,7 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:157
+#: query_hql.xml:181
 #, no-c-format
 msgid ""
 "Note that the <literal>fetch</literal> construct may not be used in queries "
@@ -375,7 +375,7 @@
 "sont pas utiles en général."
 
 #. Tag: para
-#: query_hql.xml:172
+#: query_hql.xml:196
 #, no-c-format
 msgid ""
 "If you are using property-level lazy fetching (with bytecode "
@@ -389,13 +389,13 @@
 "requête) en utilisant <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 '%"
@@ -403,13 +403,13 @@
 msgstr ""
 
 #. Tag: title
-#: query_hql.xml:184
+#: query_hql.xml:208
 #, no-c-format
 msgid "Forms of join syntax"
 msgstr "Formes de syntaxes pour les jointures"
 
 #. Tag: para
-#: query_hql.xml:186
+#: query_hql.xml:210
 #, no-c-format
 msgid ""
 "HQL supports two forms of association joining: <literal>implicit</literal> "
@@ -419,7 +419,7 @@
 "literal> et <literal>explicite</literal>."
 
 #. Tag: para
-#: query_hql.xml:190
+#: query_hql.xml:214
 #, no-c-format
 msgid ""
 "The queries shown in the previous section all use the <literal>explicit</"
@@ -431,7 +431,7 @@
 "dans la clause from. C'est la forme recommandée."
 
 #. 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, "
@@ -445,19 +445,19 @@
 "<literal>implicites</literal> résultent en des inner join dans le SQL généré."
 
 #. 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
+#: query_hql.xml:230
 #, no-c-format
 msgid "Refering to identifier property"
 msgstr "Refering to identifier property"
 
 #. Tag: para
-#: query_hql.xml:208
+#: query_hql.xml:232
 #, no-c-format
 msgid ""
 "There are, generally speaking, 2 ways to refer to an entity's identifier "
@@ -467,7 +467,7 @@
 "property:"
 
 #. Tag: para
-#: query_hql.xml:213
+#: query_hql.xml:237
 #, no-c-format
 msgid ""
 "The special property (lowercase) <literal>id</literal> may be used to "
@@ -479,7 +479,7 @@
 "entity does not define a non-identifier property named id</emphasis>."
 
 #. Tag: para
-#: query_hql.xml:220
+#: query_hql.xml:244
 #, no-c-format
 msgid ""
 "If the entity defines a named identifier property, you may use that property "
@@ -489,7 +489,7 @@
 "name."
 
 #. Tag: para
-#: query_hql.xml:226
+#: query_hql.xml:250
 #, no-c-format
 msgid ""
 "References to composite identifier properties follow the same naming rules. "
@@ -505,7 +505,7 @@
 "identifier property."
 
 #. Tag: para
-#: query_hql.xml:233
+#: query_hql.xml:257
 #, fuzzy, no-c-format
 msgid ""
 "Note: this has changed significantly starting in version 3.2.2. In previous "
@@ -521,13 +521,13 @@
 "could never be referenced in Hibernate queries."
 
 #. Tag: title
-#: query_hql.xml:242
+#: query_hql.xml:266
 #, no-c-format
 msgid "The select clause"
 msgstr "La clause select"
 
 #. Tag: para
-#: query_hql.xml:244
+#: query_hql.xml:268
 #, no-c-format
 msgid ""
 "The <literal>select</literal> clause picks which objects and properties to "
@@ -537,7 +537,7 @@
 "doivent être retournés dans le résultat de la requête. Soit :"
 
 #. Tag: programlisting
-#: query_hql.xml:249
+#: query_hql.xml:273
 #, no-c-format
 msgid ""
 "<![CDATA[select mate\n"
@@ -546,7 +546,7 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:251
+#: query_hql.xml:275
 #, no-c-format
 msgid ""
 "The query will select <literal>mate</literal>s of other <literal>Cat</"
@@ -556,13 +556,13 @@
 "literal>s. Vous pouvez explimer la requête d'une manière plus compacte :"
 
 #. Tag: programlisting
-#: query_hql.xml:256
+#: query_hql.xml:280
 #, no-c-format
 msgid "<![CDATA[select cat.mate from Cat cat]]>"
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:258
+#: query_hql.xml:282
 #, no-c-format
 msgid ""
 "Queries may return properties of any value type including properties of "
@@ -572,7 +572,7 @@
 "celles de type composant (component) :"
 
 #. Tag: programlisting
-#: query_hql.xml:262
+#: query_hql.xml:286
 #, no-c-format
 msgid ""
 "<![CDATA[select cat.name from DomesticCat cat\n"
@@ -580,13 +580,13 @@
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:264
+#: query_hql.xml:288
 #, no-c-format
 msgid "<![CDATA[select cust.name.firstName from Customer as cust]]>"
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:266
+#: query_hql.xml:290
 #, no-c-format
 msgid ""
 "Queries may return multiple objects and/or properties as an array of type "
@@ -596,7 +596,7 @@
 "forme d'un tableau du type <literal>Object[]</literal>,"
 
 #. Tag: programlisting
-#: query_hql.xml:271
+#: query_hql.xml:295
 #, no-c-format
 msgid ""
 "<![CDATA[select mother, offspr, mate.name\n"
@@ -606,13 +606,13 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:273
+#: query_hql.xml:297
 #, 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:277
+#: query_hql.xml:301
 #, no-c-format
 msgid ""
 "<![CDATA[select new list(mother, offspr, mate.name)\n"
@@ -622,13 +622,13 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:279
+#: 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é,"
 
 #. Tag: programlisting
-#: query_hql.xml:283
+#: query_hql.xml:307
 #, no-c-format
 msgid ""
 "<![CDATA[select new Family(mother, mate, offspr)\n"
@@ -638,7 +638,7 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:285
+#: query_hql.xml:309
 #, no-c-format
 msgid ""
 "assuming that the class <literal>Family</literal> has an appropriate "
@@ -648,7 +648,7 @@
 "approprié."
 
 #. Tag: para
-#: query_hql.xml:289
+#: query_hql.xml:313
 #, no-c-format
 msgid ""
 "You may assign aliases to selected expressions using <literal>as</literal>:"
@@ -657,7 +657,7 @@
 "<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 "
@@ -666,7 +666,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</"
@@ -676,7 +676,7 @@
 "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, "
@@ -685,7 +685,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."
@@ -694,13 +694,13 @@
 "les valeurs sélectionnées."
 
 #. Tag: title
-#: query_hql.xml:308
+#: query_hql.xml:332
 #, no-c-format
 msgid "Aggregate functions"
 msgstr "Fonctions d'aggrégation"
 
 #. Tag: para
-#: query_hql.xml:310
+#: query_hql.xml:334
 #, no-c-format
 msgid ""
 "HQL queries may even return the results of aggregate functions on properties:"
@@ -709,7 +709,7 @@
 "d'aggrégation sur les propriétés :"
 
 #. 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"
@@ -718,31 +718,31 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:325
+#: query_hql.xml:349
 #, no-c-format
 msgid "The supported aggregate functions are"
 msgstr "Les fonctions supportées sont"
 
 #. 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
+#: query_hql.xml:371
 #, no-c-format
 msgid ""
 "You may use arithmetic operators, concatenation, and recognized SQL "
@@ -752,7 +752,7 @@
 "fonctions SQL reconnues dans la clause select :"
 
 #. Tag: programlisting
-#: query_hql.xml:352
+#: query_hql.xml:376
 #, no-c-format
 msgid ""
 "<![CDATA[select cat.weight + sum(kitten.weight)\n"
@@ -762,14 +762,14 @@
 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
+#: query_hql.xml:380
 #, no-c-format
 msgid ""
 "The <literal>distinct</literal> and <literal>all</literal> keywords may be "
@@ -779,7 +779,7 @@
 "être utilisés et ont la même signification qu'en SQL."
 
 #. Tag: programlisting
-#: query_hql.xml:361
+#: query_hql.xml:385
 #, no-c-format
 msgid ""
 "<![CDATA[select distinct cat.name from Cat cat\n"
@@ -788,19 +788,19 @@
 msgstr ""
 
 #. Tag: title
-#: query_hql.xml:366
+#: query_hql.xml:390
 #, no-c-format
 msgid "Polymorphic queries"
 msgstr "Requêtes polymorphiques"
 
 #. Tag: para
-#: query_hql.xml:368
+#: query_hql.xml:392
 #, no-c-format
 msgid "A query like:"
 msgstr "Une requête comme:"
 
 #. Tag: para
-#: query_hql.xml:374
+#: query_hql.xml:398
 #, no-c-format
 msgid ""
 "returns instances not only of <literal>Cat</literal>, but also of subclasses "
@@ -818,13 +818,13 @@
 "cette interface. La requête suivante retournera tous les objets persistants :"
 
 #. 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 "
@@ -834,13 +834,13 @@
 "classes persistantes :"
 
 #. 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
+#: query_hql.xml:415
 #, no-c-format
 msgid ""
 "Note that these last two queries will require more than one SQL "
@@ -855,13 +855,13 @@
 "literal>)."
 
 #. Tag: title
-#: query_hql.xml:400
+#: query_hql.xml:424
 #, no-c-format
 msgid "The where clause"
 msgstr "La clause where"
 
 #. Tag: para
-#: query_hql.xml:402
+#: query_hql.xml:426
 #, no-c-format
 msgid ""
 "The <literal>where</literal> clause allows you to narrow the list of "
@@ -872,25 +872,25 @@
 "propriétés par leur nom :"
 
 #. 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 "S'il y a un alias, utilisez un nom de propriété qualifié :"
 
 #. 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
+#: query_hql.xml:439
 #, no-c-format
 msgid "returns instances of <literal>Cat</literal> named 'Fritz'."
 msgstr ""
@@ -898,7 +898,7 @@
 "'Fritz'."
 
 #. Tag: programlisting
-#: query_hql.xml:419
+#: query_hql.xml:443
 #, no-c-format
 msgid ""
 "<![CDATA[select foo\n"
@@ -907,7 +907,7 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:421
+#: query_hql.xml:445
 #, no-c-format
 msgid ""
 "will return all instances of <literal>Foo</literal> for which there exists "
@@ -923,13 +923,13 @@
 "clause <literal>where</literal> extrêmement puissante. Soit :"
 
 #. Tag: programlisting
-#: query_hql.xml:430
+#: query_hql.xml:454
 #, no-c-format
 msgid "<![CDATA[from Cat cat where cat.mate.name is not null]]>"
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:432
+#: query_hql.xml:456
 #, no-c-format
 msgid ""
 "This query translates to an SQL query with a table (inner) join. If you were "
@@ -939,7 +939,7 @@
 "vous souhaitez écrire quelque chose comme :"
 
 #. Tag: programlisting
-#: query_hql.xml:437
+#: query_hql.xml:461
 #, no-c-format
 msgid ""
 "<![CDATA[from Foo foo\n"
@@ -947,7 +947,7 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:439
+#: query_hql.xml:463
 #, no-c-format
 msgid ""
 "you would end up with a query that would require four table joins in SQL."
@@ -955,7 +955,7 @@
 "vous finiriez avec une requête qui nécessiterait quatre jointures en SQL."
 
 #. Tag: para
-#: query_hql.xml:443
+#: query_hql.xml:467
 #, no-c-format
 msgid ""
 "The <literal>=</literal> operator may be used to compare not only "
@@ -965,13 +965,13 @@
 "des propriétés que des instances :"
 
 #. Tag: programlisting
-#: query_hql.xml:448
+#: query_hql.xml:472
 #, 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:474
 #, no-c-format
 msgid ""
 "<![CDATA[select cat, mate\n"
@@ -980,7 +980,7 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:452
+#: query_hql.xml:476
 #, no-c-format
 msgid ""
 "The special property (lowercase) <literal>id</literal> may be used to "
@@ -992,7 +992,7 @@
 "utiliser le nom de cette propriété)."
 
 #. Tag: programlisting
-#: query_hql.xml:458
+#: query_hql.xml:482
 #, no-c-format
 msgid ""
 "<![CDATA[from Cat as cat where cat.id = 123\n"
@@ -1001,7 +1001,7 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:460
+#: query_hql.xml:484
 #, no-c-format
 msgid "The second query is efficient. No table join is required!"
 msgstr ""
@@ -1009,7 +1009,7 @@
 "nécessaire !"
 
 #. Tag: para
-#: query_hql.xml:464
+#: query_hql.xml:488
 #, no-c-format
 msgid ""
 "Properties of composite identifiers may also be used. Suppose "
@@ -1023,7 +1023,7 @@
 "<literal>country</literal> et <literal>medicareNumber</literal>."
 
 #. Tag: programlisting
-#: query_hql.xml:471
+#: query_hql.xml:495
 #, no-c-format
 msgid ""
 "<![CDATA[from bank.Person person\n"
@@ -1032,7 +1032,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:473
+#: query_hql.xml:497
 #, no-c-format
 msgid ""
 "<![CDATA[from bank.Account account\n"
@@ -1041,13 +1041,13 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:475
+#: query_hql.xml:499
 #, no-c-format
 msgid "Once again, the second query requires no table join."
 msgstr "Une fois de plus, la seconde requête ne nécessite pas de jointure."
 
 #. Tag: para
-#: query_hql.xml:479
+#: query_hql.xml:503
 #, no-c-format
 msgid ""
 "Likewise, the special property <literal>class</literal> accesses the "
@@ -1061,13 +1061,13 @@
 "valeur discriminante."
 
 #. Tag: programlisting
-#: query_hql.xml:485
+#: query_hql.xml:509
 #, no-c-format
 msgid "<![CDATA[from Cat cat where cat.class = DomesticCat]]>"
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:487
+#: query_hql.xml:511
 #, no-c-format
 msgid ""
 "You may also use components or composite user types, or properties of said "
@@ -1082,7 +1082,7 @@
 "avec un composant <literal>address</literal>"
 
 #. Tag: para
-#: query_hql.xml:492
+#: query_hql.xml:516
 #, no-c-format
 msgid ""
 "An \"any\" type has the special properties <literal>id</literal> and "
@@ -1096,7 +1096,7 @@
 "mappée avec <literal>&lt;any&gt;</literal>)."
 
 #. Tag: programlisting
-#: query_hql.xml:498
+#: query_hql.xml:522
 #, no-c-format
 msgid ""
 "<![CDATA[from AuditLog log, Payment payment\n"
@@ -1104,7 +1104,7 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:500
+#: query_hql.xml:524
 #, no-c-format
 msgid ""
 "Notice that <literal>log.item.class</literal> and <literal>payment.class</"
@@ -1116,13 +1116,13 @@
 "colonnes de la base de données complètement différentes."
 
 #. Tag: title
-#: query_hql.xml:508
+#: query_hql.xml:532
 #, no-c-format
 msgid "Expressions"
 msgstr "Expressions"
 
 #. Tag: para
-#: query_hql.xml:510
+#: query_hql.xml:534
 #, no-c-format
 msgid ""
 "Expressions allowed in the <literal>where</literal> clause include most of "
@@ -1132,13 +1132,13 @@
 "plupart des choses que vous pouvez utiliser en SQL :"
 
 #. Tag: para
-#: query_hql.xml:517
+#: query_hql.xml:541
 #, no-c-format
 msgid "mathematical operators <literal>+, -, *, /</literal>"
 msgstr "opérateurs mathématiques <literal>+, -, *, /</literal>"
 
 #. Tag: para
-#: query_hql.xml:522
+#: query_hql.xml:546
 #, no-c-format
 msgid ""
 "binary comparison operators <literal>=, &gt;=, &lt;=, &lt;&gt;, !=, like</"
@@ -1148,19 +1148,19 @@
 "like</literal>"
 
 #. Tag: para
-#: query_hql.xml:527
+#: query_hql.xml:551
 #, 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:532
+#: query_hql.xml:556
 #, no-c-format
 msgid "Parentheses <literal>( )</literal>, indicating grouping"
 msgstr "Parenthèses <literal>( )</literal>, indiquant un regroupement"
 
 #. Tag: para
-#: query_hql.xml:537
+#: query_hql.xml:561
 #, no-c-format
 msgid ""
 "<literal>in</literal>, <literal>not in</literal>, <literal>between</"
@@ -1174,7 +1174,7 @@
 "<literal>member of</literal> and <literal>not member of</literal>"
 
 #. Tag: para
-#: query_hql.xml:550
+#: query_hql.xml:574
 #, no-c-format
 msgid ""
 "\"Simple\" case, <literal>case ... when ... then ... else ... end</literal>, "
@@ -1184,7 +1184,7 @@
 "and \"searched\" case, <literal>case when ... then ... else ... end</literal>"
 
 #. Tag: para
-#: query_hql.xml:556
+#: query_hql.xml:580
 #, no-c-format
 msgid ""
 "string concatenation <literal>...||...</literal> or <literal>concat(...,...)"
@@ -1194,7 +1194,7 @@
 "<literal>concat(...,...)</literal>"
 
 #. Tag: para
-#: query_hql.xml:561
+#: query_hql.xml:585
 #, no-c-format
 msgid ""
 "<literal>current_date()</literal>, <literal>current_time()</literal>, "
@@ -1204,7 +1204,7 @@
 "<literal>current_timestamp()</literal>"
 
 #. Tag: para
-#: query_hql.xml:567
+#: query_hql.xml:591
 #, no-c-format
 msgid ""
 "<literal>second(...)</literal>, <literal>minute(...)</literal>, <literal>hour"
@@ -1216,7 +1216,7 @@
 "<literal>year(...)</literal>,"
 
 #. Tag: para
-#: query_hql.xml:574
+#: query_hql.xml:598
 #, no-c-format
 msgid ""
 "Any function or operator defined by EJB-QL 3.0: <literal>substring(), trim"
@@ -1228,13 +1228,13 @@
 "sqrt(), bit_length(), mod()</literal>"
 
 #. Tag: para
-#: query_hql.xml:580
+#: query_hql.xml:604
 #, no-c-format
 msgid "<literal>coalesce()</literal> and <literal>nullif()</literal>"
 msgstr "<literal>coalesce()</literal> et <literal>nullif()</literal>"
 
 #. Tag: para
-#: query_hql.xml:585
+#: query_hql.xml:609
 #, no-c-format
 msgid ""
 "<literal>str()</literal> for converting numeric or temporal values to a "
@@ -1244,7 +1244,7 @@
 "temporelles vers une chaîne de caractères lisible"
 
 #. Tag: para
-#: query_hql.xml:591
+#: query_hql.xml:615
 #, no-c-format
 msgid ""
 "<literal>cast(... as ...)</literal>, where the second argument is the name "
@@ -1258,7 +1258,7 @@
 "supportés par la base de données sous-jacente"
 
 #. Tag: para
-#: query_hql.xml:599
+#: query_hql.xml:623
 #, no-c-format
 msgid ""
 "the HQL <literal>index()</literal> function, that applies to aliases of a "
@@ -1268,7 +1268,7 @@
 "collection indexée jointe"
 
 #. Tag: para
-#: query_hql.xml:605
+#: query_hql.xml:629
 #, no-c-format
 msgid ""
 "HQL functions that take collection-valued path expressions: <literal>size(), "
@@ -1284,7 +1284,7 @@
 "utilisant <literal>some, all, exists, any, in</literal>."
 
 #. Tag: para
-#: query_hql.xml:613
+#: query_hql.xml:637
 #, no-c-format
 msgid ""
 "Any database-supported SQL scalar function like <literal>sign()</literal>, "
@@ -1296,13 +1296,13 @@
 "literal>, <literal>sin()</literal>"
 
 #. Tag: para
-#: query_hql.xml:619
+#: query_hql.xml:643
 #, no-c-format
 msgid "JDBC-style positional parameters <literal>?</literal>"
 msgstr "Les paramètres positionnels de JDBC <literal>?</literal>"
 
 #. Tag: para
-#: query_hql.xml:624
+#: query_hql.xml:648
 #, no-c-format
 msgid ""
 "named parameters <literal>:name</literal>, <literal>:start_date</literal>, "
@@ -1312,7 +1312,7 @@
 "<literal>:x1</literal>"
 
 #. Tag: para
-#: query_hql.xml:629
+#: query_hql.xml:653
 #, no-c-format
 msgid ""
 "SQL literals <literal>'foo'</literal>, <literal>69</literal>, <literal>6.66E"
@@ -1322,7 +1322,7 @@
 "01-01 10:00:01.0'</literal>"
 
 #. Tag: para
-#: query_hql.xml:635
+#: query_hql.xml:659
 #, no-c-format
 msgid ""
 "Java <literal>public static final</literal> constants <literal>eg.Color."
@@ -1332,7 +1332,7 @@
 "TABBY</literal>"
 
 #. Tag: para
-#: query_hql.xml:641
+#: query_hql.xml:665
 #, no-c-format
 msgid ""
 "<literal>in</literal> and <literal>between</literal> may be used as follows:"
@@ -1341,32 +1341,32 @@
 "comme suit :"
 
 #. Tag: programlisting
-#: query_hql.xml:645
+#: query_hql.xml:669
 #, 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:671
 #, no-c-format
 msgid ""
 "<![CDATA[from DomesticCat cat where cat.name in ( 'Foo', 'Bar', 'Baz' )]]>"
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:649
+#: query_hql.xml:673
 #, no-c-format
 msgid "and the negated forms may be written"
 msgstr "et la forme négative peut être écrite"
 
 #. Tag: programlisting
-#: query_hql.xml:653
+#: query_hql.xml:677
 #, 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:679
 #, no-c-format
 msgid ""
 "<![CDATA[from DomesticCat cat where cat.name not in ( 'Foo', 'Bar', 'Baz' )]]"
@@ -1374,7 +1374,7 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:657
+#: query_hql.xml:681
 #, no-c-format
 msgid ""
 "Likewise, <literal>is null</literal> and <literal>is not null</literal> may "
@@ -1384,7 +1384,7 @@
 "peuvent être utilisés pour tester les valeurs nulle."
 
 #. Tag: para
-#: query_hql.xml:662
+#: query_hql.xml:686
 #, no-c-format
 msgid ""
 "Booleans may be easily used in expressions by declaring HQL query "
@@ -1394,7 +1394,7 @@
 "de requêtes dans la configuration Hibernate :"
 
 #. Tag: programlisting
-#: query_hql.xml:667
+#: query_hql.xml:691
 #, no-c-format
 msgid ""
 "<![CDATA[<property name=\"hibernate.query.substitutions\">true 1, false 0</"
@@ -1402,7 +1402,7 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:669
+#: query_hql.xml:693
 #, no-c-format
 msgid ""
 "This will replace the keywords <literal>true</literal> and <literal>false</"
@@ -1414,13 +1414,13 @@
 "SQL du HQL suivant :"
 
 #. Tag: programlisting
-#: query_hql.xml:674
+#: query_hql.xml:698
 #, no-c-format
 msgid "<![CDATA[from Cat cat where cat.alive = true]]>"
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:676
+#: query_hql.xml:700
 #, no-c-format
 msgid ""
 "You may test the size of a collection with the special property "
@@ -1430,19 +1430,19 @@
 "<literal>size</literal>, ou la fonction spéciale <literal>size()</literal>."
 
 #. Tag: programlisting
-#: query_hql.xml:681
+#: query_hql.xml:705
 #, no-c-format
 msgid "<![CDATA[from Cat cat where cat.kittens.size > 0]]>"
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:683
+#: query_hql.xml:707
 #, no-c-format
 msgid "<![CDATA[from Cat cat where size(cat.kittens) > 0]]>"
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:685
+#: query_hql.xml:709
 #, no-c-format
 msgid ""
 "For indexed collections, you may refer to the minimum and maximum indices "
@@ -1459,26 +1459,26 @@
 "<literal>maxelement</literal>."
 
 #. Tag: programlisting
-#: query_hql.xml:693
+#: query_hql.xml:717
 #, no-c-format
 msgid ""
 "<![CDATA[from Calendar cal where maxelement(cal.holidays) > current_date]]>"
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:695
+#: query_hql.xml:719
 #, no-c-format
 msgid "<![CDATA[from Order order where maxindex(order.items) > 100]]>"
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:697
+#: query_hql.xml:721
 #, no-c-format
 msgid "<![CDATA[from Order order where minelement(order.items) > 10000]]>"
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:699
+#: query_hql.xml:723
 #, no-c-format
 msgid ""
 "The SQL functions <literal>any, some, all, exists, in</literal> are "
@@ -1492,7 +1492,7 @@
 "d'une sous requête (voir ci dessous)."
 
 #. Tag: programlisting
-#: query_hql.xml:705
+#: query_hql.xml:729
 #, no-c-format
 msgid ""
 "<![CDATA[select mother from Cat as mother, Cat as kit\n"
@@ -1500,7 +1500,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:707
+#: query_hql.xml:731
 #, no-c-format
 msgid ""
 "<![CDATA[select p from NameList list, Person p\n"
@@ -1508,25 +1508,25 @@
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:709
+#: query_hql.xml:733
 #, no-c-format
 msgid "<![CDATA[from Cat cat where exists elements(cat.kittens)]]>"
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:711
+#: query_hql.xml:735
 #, no-c-format
 msgid "<![CDATA[from Player p where 3 > all elements(p.scores)]]>"
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:713
+#: query_hql.xml:737
 #, no-c-format
 msgid "<![CDATA[from Show show where 'fizard' in indices(show.acts)]]>"
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:715
+#: query_hql.xml:739
 #, no-c-format
 msgid ""
 "Note that these constructs - <literal>size</literal>, <literal>elements</"
@@ -1542,7 +1542,7 @@
 "clause where dans Hibernate3."
 
 #. Tag: para
-#: query_hql.xml:722
+#: query_hql.xml:746
 #, no-c-format
 msgid ""
 "Elements of indexed collections (arrays, lists, maps) may be referred to by "
@@ -1552,13 +1552,13 @@
 "référencés via index (dans une clause where seulement) :"
 
 #. Tag: programlisting
-#: query_hql.xml:727
+#: query_hql.xml:751
 #, no-c-format
 msgid "<![CDATA[from Order order where order.items[0].id = 1234]]>"
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:729
+#: query_hql.xml:753
 #, no-c-format
 msgid ""
 "<![CDATA[select person from Person person, Calendar calendar\n"
@@ -1567,7 +1567,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:731
+#: query_hql.xml:755
 #, no-c-format
 msgid ""
 "<![CDATA[select item from Item item, Order order\n"
@@ -1576,7 +1576,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:733
+#: query_hql.xml:757
 #, no-c-format
 msgid ""
 "<![CDATA[select item from Item item, Order order\n"
@@ -1584,7 +1584,7 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:735
+#: query_hql.xml:759
 #, no-c-format
 msgid ""
 "The expression inside <literal>[]</literal> may even be an arithmetic "
@@ -1594,7 +1594,7 @@
 "arithmétique."
 
 #. Tag: programlisting
-#: query_hql.xml:739
+#: query_hql.xml:763
 #, no-c-format
 msgid ""
 "<![CDATA[select item from Item item, Order order\n"
@@ -1602,7 +1602,7 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:741
+#: query_hql.xml:765
 #, no-c-format
 msgid ""
 "HQL also provides the built-in <literal>index()</literal> function, for "
@@ -1612,7 +1612,7 @@
 "éléments d'une association one-to-many ou d'une collections de valeurs."
 
 #. Tag: programlisting
-#: query_hql.xml:746
+#: query_hql.xml:770
 #, no-c-format
 msgid ""
 "<![CDATA[select item, index(item) from Order order\n"
@@ -1621,7 +1621,7 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:748
+#: query_hql.xml:772
 #, no-c-format
 msgid "Scalar SQL functions supported by the underlying database may be used"
 msgstr ""
@@ -1629,13 +1629,13 @@
 "peuvent être utilisées"
 
 #. Tag: programlisting
-#: query_hql.xml:752
+#: query_hql.xml:776
 #, no-c-format
 msgid "<![CDATA[from DomesticCat cat where upper(cat.name) like 'FRI%']]>"
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:754
+#: query_hql.xml:778
 #, no-c-format
 msgid ""
 "If you are not yet convinced by all this, think how much longer and less "
@@ -1646,7 +1646,7 @@
 "suivante :"
 
 #. Tag: programlisting
-#: query_hql.xml:759
+#: query_hql.xml:783
 #, no-c-format
 msgid ""
 "<![CDATA[select cust\n"
@@ -1659,13 +1659,13 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:761
+#: query_hql.xml:785
 #, no-c-format
 msgid "<emphasis>Hint:</emphasis> something like"
 msgstr "<emphasis>Un indice :</emphasis> cela donnerait quelque chose comme"
 
 #. Tag: programlisting
-#: query_hql.xml:765
+#: query_hql.xml:789
 #, no-c-format
 msgid ""
 "<![CDATA[SELECT cust.name, cust.address, cust.phone, cust.id, cust."
@@ -1689,13 +1689,13 @@
 msgstr ""
 
 #. Tag: title
-#: query_hql.xml:770
+#: query_hql.xml:794
 #, no-c-format
 msgid "The order by clause"
 msgstr "La clause order by"
 
 #. Tag: para
-#: query_hql.xml:772
+#: query_hql.xml:796
 #, no-c-format
 msgid ""
 "The list returned by a query may be ordered by any property of a returned "
@@ -1705,7 +1705,7 @@
 "propriété de la classe ou du composant retourné :"
 
 #. Tag: programlisting
-#: query_hql.xml:776
+#: query_hql.xml:800
 #, no-c-format
 msgid ""
 "<![CDATA[from DomesticCat cat\n"
@@ -1713,7 +1713,7 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:778
+#: query_hql.xml:802
 #, no-c-format
 msgid ""
 "The optional <literal>asc</literal> or <literal>desc</literal> indicate "
@@ -1723,13 +1723,13 @@
 "respectivement si le tri doit être croissant ou décroissant."
 
 #. Tag: title
-#: query_hql.xml:785
+#: query_hql.xml:809
 #, no-c-format
 msgid "The group by clause"
 msgstr "La clause group by"
 
 #. Tag: para
-#: query_hql.xml:787
+#: query_hql.xml:811
 #, no-c-format
 msgid ""
 "A query that returns aggregate values may be grouped by any property of a "
@@ -1739,7 +1739,7 @@
 "groupées par propriété ou composant :"
 
 #. Tag: programlisting
-#: query_hql.xml:791
+#: query_hql.xml:815
 #, no-c-format
 msgid ""
 "<![CDATA[select cat.color, sum(cat.weight), count(cat)\n"
@@ -1748,7 +1748,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:793
+#: query_hql.xml:817
 #, no-c-format
 msgid ""
 "<![CDATA[select foo.id, avg(name), max(name)\n"
@@ -1757,13 +1757,13 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:795
+#: query_hql.xml:819
 #, 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:799
+#: query_hql.xml:823
 #, no-c-format
 msgid ""
 "<![CDATA[select cat.color, sum(cat.weight), count(cat)\n"
@@ -1773,7 +1773,7 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:801
+#: query_hql.xml:825
 #, no-c-format
 msgid ""
 "SQL functions and aggregate functions are allowed in the <literal>having</"
@@ -1786,7 +1786,7 @@
 "exemple)."
 
 #. Tag: programlisting
-#: query_hql.xml:807
+#: query_hql.xml:831
 #, no-c-format
 msgid ""
 "<![CDATA[select cat\n"
@@ -1798,7 +1798,7 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:809
+#: query_hql.xml:833
 #, no-c-format
 msgid ""
 "Note that neither the <literal>group by</literal> clause nor the "
@@ -1812,13 +1812,13 @@
 "<literal>order by</literal> ne peuvent contenir d'expressions arithmétiques."
 
 #. Tag: title
-#: query_hql.xml:821
+#: query_hql.xml:845
 #, no-c-format
 msgid "Subqueries"
 msgstr "Sous-requêtes"
 
 #. Tag: para
-#: query_hql.xml:823
+#: query_hql.xml:847
 #, no-c-format
 msgid ""
 "For databases that support subselects, Hibernate supports subqueries within "
@@ -1833,7 +1833,7 @@
 "principale) sont supportées."
 
 #. Tag: programlisting
-#: query_hql.xml:829
+#: query_hql.xml:853
 #, no-c-format
 msgid ""
 "<![CDATA[from Cat as fatcat\n"
@@ -1843,7 +1843,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:831
+#: query_hql.xml:855
 #, no-c-format
 msgid ""
 "<![CDATA[from DomesticCat as cat\n"
@@ -1853,7 +1853,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:833
+#: query_hql.xml:857
 #, no-c-format
 msgid ""
 "<![CDATA[from Cat as cat\n"
@@ -1863,7 +1863,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:835
+#: query_hql.xml:859
 #, no-c-format
 msgid ""
 "<![CDATA[from DomesticCat as cat\n"
@@ -1873,7 +1873,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:837
+#: query_hql.xml:861
 #, no-c-format
 msgid ""
 "<![CDATA[select cat.id, (select max(kit.weight) from cat.kitten kit)\n"
@@ -1881,7 +1881,7 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:839
+#: query_hql.xml:863
 #, no-c-format
 msgid "Note that HQL subqueries may occur only in the select or where clauses."
 msgstr ""
@@ -1889,7 +1889,7 @@
 "select ou where."
 
 #. Tag: para
-#: query_hql.xml:843
+#: query_hql.xml:867
 #, no-c-format
 msgid ""
 "Note that subqueries can also utilize <literal>row value constructor</"
@@ -1899,13 +1899,13 @@
 "literal> syntax. See <xref linkend=\"queryhql-tuple\"/> for more details."
 
 #. Tag: title
-#: query_hql.xml:851
+#: query_hql.xml:875
 #, no-c-format
 msgid "HQL examples"
 msgstr "Exemples HQL"
 
 #. Tag: para
-#: query_hql.xml:853
+#: query_hql.xml:877
 #, no-c-format
 msgid ""
 "Hibernate queries can be quite powerful and complex. In fact, the power of "
@@ -1920,7 +1920,7 @@
 "que vous écrirez seront plus simples que les exemples suivantes !"
 
 #. Tag: para
-#: query_hql.xml:859
+#: query_hql.xml:883
 #, no-c-format
 msgid ""
 "The following query returns the order id, number of items and total value of "
@@ -1941,7 +1941,7 @@
 "corrélée)."
 
 #. Tag: programlisting
-#: query_hql.xml:868
+#: query_hql.xml:892
 #, no-c-format
 msgid ""
 "<![CDATA[select order.id, sum(price.amount), count(item)\n"
@@ -1965,7 +1965,7 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:870
+#: query_hql.xml:894
 #, no-c-format
 msgid ""
 "What a monster! Actually, in real life, I'm not very keen on subqueries, so "
@@ -1975,7 +1975,7 @@
 "la requête ressemblait donc plutôt à cela :"
 
 #. Tag: programlisting
-#: query_hql.xml:875
+#: query_hql.xml:899
 #, no-c-format
 msgid ""
 "<![CDATA[select order.id, sum(price.amount), count(item)\n"
@@ -1994,7 +1994,7 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:877
+#: query_hql.xml:901
 #, no-c-format
 msgid ""
 "The next query counts the number of payments in each status, excluding all "
@@ -2013,7 +2013,7 @@
 "<literal>PAYMENT_STATUS_CHANGE</literal>."
 
 #. Tag: programlisting
-#: query_hql.xml:885
+#: query_hql.xml:909
 #, no-c-format
 msgid ""
 "<![CDATA[select count(payment), status.name\n"
@@ -2034,7 +2034,7 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:887
+#: query_hql.xml:911
 #, no-c-format
 msgid ""
 "If I would have mapped the <literal>statusChanges</literal> collection as a "
@@ -2044,7 +2044,7 @@
 "une liste, au lieu d'un ensemble, la requête aurait été plus facile à écrire."
 
 #. Tag: programlisting
-#: query_hql.xml:892
+#: query_hql.xml:916
 #, no-c-format
 msgid ""
 "<![CDATA[select count(payment), status.name\n"
@@ -2058,7 +2058,7 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:894
+#: query_hql.xml:918
 #, no-c-format
 msgid ""
 "The next query uses the MS SQL Server <literal>isNull()</literal> function "
@@ -2079,7 +2079,7 @@
 "<literal>ORG_USER</literal>."
 
 #. Tag: programlisting
-#: query_hql.xml:903
+#: query_hql.xml:927
 #, no-c-format
 msgid ""
 "<![CDATA[select account, payment\n"
@@ -2092,7 +2092,7 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:905
+#: query_hql.xml:929
 #, no-c-format
 msgid ""
 "For some databases, we would need to do away with the (correlated) subselect."
@@ -2101,7 +2101,7 @@
 "(corrélée)."
 
 #. Tag: programlisting
-#: query_hql.xml:909
+#: query_hql.xml:933
 #, no-c-format
 msgid ""
 "<![CDATA[select account, payment\n"
@@ -2115,13 +2115,13 @@
 msgstr ""
 
 #. Tag: title
-#: query_hql.xml:914
+#: query_hql.xml:938
 #, no-c-format
 msgid "Bulk update and delete"
 msgstr "Mise à jour et suppression"
 
 #. Tag: para
-#: query_hql.xml:916
+#: query_hql.xml:940
 #, no-c-format
 msgid ""
 "HQL now supports <literal>update</literal>, <literal>delete</literal> and "
@@ -2133,13 +2133,13 @@
 "<xref linkend=\"batch-direct\"/> pour les détails."
 
 #. Tag: title
-#: query_hql.xml:924
+#: query_hql.xml:948
 #, no-c-format
 msgid "Tips &amp; Tricks"
 msgstr "Trucs &amp; Astuces"
 
 #. Tag: para
-#: query_hql.xml:926
+#: query_hql.xml:950
 #, no-c-format
 msgid ""
 "You can count the number of query results without actually returning them:"
@@ -2147,7 +2147,7 @@
 "Vous pouvez compter le nombre de résultats d'une requête sans les retourner :"
 
 #. Tag: programlisting
-#: query_hql.xml:930
+#: query_hql.xml:954
 #, no-c-format
 msgid ""
 "<![CDATA[( (Integer) session.createQuery(\"select count(*) from ....\")."
@@ -2155,7 +2155,7 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:932
+#: query_hql.xml:956
 #, no-c-format
 msgid "To order a result by the size of a collection, use the following query:"
 msgstr ""
@@ -2163,7 +2163,7 @@
 "suivante :"
 
 #. Tag: programlisting
-#: query_hql.xml:936
+#: query_hql.xml:960
 #, no-c-format
 msgid ""
 "<![CDATA[select usr.id, usr.name\n"
@@ -2174,7 +2174,7 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:938
+#: query_hql.xml:962
 #, no-c-format
 msgid ""
 "If your database supports subselects, you can place a condition upon "
@@ -2185,13 +2185,13 @@
 "requête:"
 
 #. Tag: programlisting
-#: query_hql.xml:943
+#: query_hql.xml:967
 #, no-c-format
 msgid "<![CDATA[from User usr where size(usr.messages) >= 1]]>"
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:945
+#: query_hql.xml:969
 #, no-c-format
 msgid "If your database doesn't support subselects, use the following query:"
 msgstr ""
@@ -2199,7 +2199,7 @@
 "requête suivante :"
 
 #. Tag: programlisting
-#: query_hql.xml:949
+#: query_hql.xml:973
 #, no-c-format
 msgid ""
 "<![CDATA[select usr.id, usr.name\n"
@@ -2210,7 +2210,7 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:951
+#: query_hql.xml:975
 #, no-c-format
 msgid ""
 "As this solution can't return a <literal>User</literal> with zero messages "
@@ -2221,7 +2221,7 @@
 "utile :"
 
 #. Tag: programlisting
-#: query_hql.xml:956
+#: query_hql.xml:980
 #, no-c-format
 msgid ""
 "<![CDATA[select usr.id, usr.name\n"
@@ -2232,7 +2232,7 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:958
+#: query_hql.xml:982
 #, no-c-format
 msgid "Properties of a JavaBean can be bound to named query parameters:"
 msgstr ""
@@ -2240,7 +2240,7 @@
 "nommés d'un requête :"
 
 #. Tag: programlisting
-#: query_hql.xml:962
+#: query_hql.xml:986
 #, no-c-format
 msgid ""
 "<![CDATA[Query q = s.createQuery(\"from foo Foo as foo where foo.name=:name "
@@ -2250,7 +2250,7 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:964
+#: query_hql.xml:988
 #, no-c-format
 msgid ""
 "Collections are pageable by using the <literal>Query</literal> interface "
@@ -2260,7 +2260,7 @@
 "<literal>Query</literal> avec un filtre :"
 
 #. Tag: programlisting
-#: query_hql.xml:968
+#: query_hql.xml:992
 #, no-c-format
 msgid ""
 "<![CDATA[Query q = s.createFilter( collection, \"\" ); // the trivial "
@@ -2271,7 +2271,7 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:970
+#: query_hql.xml:994
 #, no-c-format
 msgid "Collection elements may be ordered or grouped using a query filter:"
 msgstr ""
@@ -2279,7 +2279,7 @@
 "filtre de requête :"
 
 #. Tag: programlisting
-#: query_hql.xml:974
+#: query_hql.xml:998
 #, no-c-format
 msgid ""
 "<![CDATA[Collection orderedCollection = s.filter( collection, \"order by "
@@ -2289,13 +2289,13 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:976
+#: query_hql.xml:1000
 #, 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:980
+#: query_hql.xml:1004
 #, no-c-format
 msgid ""
 "<![CDATA[( (Integer) session.createQuery(\"select count(*) from ....\")."
@@ -2303,13 +2303,13 @@
 msgstr ""
 
 #. Tag: title
-#: query_hql.xml:985
+#: query_hql.xml:1009
 #, no-c-format
 msgid "Components"
 msgstr "translator-credits"
 
 #. Tag: para
-#: query_hql.xml:987
+#: query_hql.xml:1011
 #, no-c-format
 msgid ""
 "Components might be used in just about every way that simple value types can "
@@ -2318,19 +2318,19 @@
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:992 query_hql.xml:1038
+#: query_hql.xml:1016 query_hql.xml:1062
 #, no-c-format
 msgid "<![CDATA[select p.name from Person p]]>"
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:993
+#: query_hql.xml:1017
 #, no-c-format
 msgid "<![CDATA[select p.name.first from Person p]]>"
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:995
+#: query_hql.xml:1019
 #, no-c-format
 msgid ""
 "where the Person's name property is a component. Components can also be used "
@@ -2338,37 +2338,37 @@
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:1000
+#: query_hql.xml:1024
 #, no-c-format
 msgid "<![CDATA[from Person p where p.name = :name]]>"
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:1001
+#: query_hql.xml:1025
 #, no-c-format
 msgid "<![CDATA[from Person p where p.name.first = :firstName]]>"
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:1003
+#: query_hql.xml:1027
 #, 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:1031
 #, no-c-format
 msgid "<![CDATA[from Person p order by p.name]]>"
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:1008
+#: query_hql.xml:1032
 #, no-c-format
 msgid "<![CDATA[from Person p order by p.name.first]]>"
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:1010
+#: query_hql.xml:1034
 #, no-c-format
 msgid ""
 "Another common use of components is in <link linkend=\"queryhql-tuple\">row "
@@ -2376,13 +2376,13 @@
 msgstr ""
 
 #. Tag: title
-#: query_hql.xml:1016
+#: query_hql.xml:1040
 #, no-c-format
 msgid "Row value constructor syntax"
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:1018
+#: query_hql.xml:1042
 #, no-c-format
 msgid ""
 "HQL supports the use of ANSI SQL <literal>row value constructor</literal> "
@@ -2393,7 +2393,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:1025
+#: query_hql.xml:1049
 #, no-c-format
 msgid ""
 "<![CDATA[from Person p where p.name.first='John' and p.name."
@@ -2401,7 +2401,7 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:1027
+#: query_hql.xml:1051
 #, no-c-format
 msgid ""
 "That's valid syntax, although a little verbose. It be nice to make this a "
@@ -2409,13 +2409,13 @@
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:1032
+#: query_hql.xml:1056
 #, no-c-format
 msgid "<![CDATA[from Person p where p.name=('John', 'Jingleheimer-Schmidt')]]>"
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:1034
+#: query_hql.xml:1058
 #, no-c-format
 msgid ""
 "It can also be useful to specify this in the <literal>select</literal> "
@@ -2423,7 +2423,7 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:1040
+#: query_hql.xml:1064
 #, no-c-format
 msgid ""
 "Another time using <literal>row value constructor</literal> syntax can be "
@@ -2432,7 +2432,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:1045
+#: query_hql.xml:1069
 #, no-c-format
 msgid ""
 "<![CDATA[from Cat as cat\n"
@@ -2442,7 +2442,7 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:1047
+#: query_hql.xml:1071
 #, no-c-format
 msgid ""
 "One thing to consider when deciding if you want to use this syntax is that "

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	2008-08-14 15:28:13 UTC (rev 15066)
+++ core/trunk/documentation/manual/src/main/docbook/fr-FR/content/query_sql.po	2008-08-14 15:35:40 UTC (rev 15067)
@@ -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: 2008-08-14 15:28+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,13 +11,13 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: query_sql.xml:5
+#: query_sql.xml:29
 #, no-c-format
 msgid "Native SQL"
 msgstr "SQL natif"
 
 #. Tag: para
-#: query_sql.xml:7
+#: query_sql.xml:31
 #, no-c-format
 msgid ""
 "You may also express queries in the native SQL dialect of your database. "
@@ -34,7 +34,7 @@
 "JDBC vers une application Hibernate."
 
 #. Tag: para
-#: query_sql.xml:13
+#: query_sql.xml:37
 #, no-c-format
 msgid ""
 "Hibernate3 allows you to specify handwritten SQL (including stored "
@@ -45,13 +45,13 @@
 "suppression et chargement."
 
 #. Tag: title
-#: query_sql.xml:17
+#: query_sql.xml:41
 #, no-c-format
 msgid "Using a <literal>SQLQuery</literal>"
 msgstr "Utiliser une <literal>SQLQuery</literal>"
 
 #. Tag: para
-#: query_sql.xml:19
+#: query_sql.xml:43
 #, no-c-format
 msgid ""
 "Execution of native SQL queries is controlled via the <literal>SQLQuery</"
@@ -65,19 +65,19 @@
 "simples, nous pouvons utiliser la forme suivante :"
 
 #. 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"
@@ -86,7 +86,7 @@
 msgstr ""
 
 #. Tag: para
-#: query_sql.xml:32
+#: query_sql.xml:56
 #, no-c-format
 msgid ""
 "These will both return a List of Object arrays (Object[]) with scalar values "
@@ -98,7 +98,7 @@
 "deduce the actual order and types of the returned scalar values."
 
 #. Tag: para
-#: query_sql.xml:37
+#: query_sql.xml:61
 #, no-c-format
 msgid ""
 "To avoid the overhead of using <literal>ResultSetMetadata</literal> or "
@@ -110,7 +110,7 @@
 "()</literal>."
 
 #. Tag: programlisting
-#: query_sql.xml:41
+#: query_sql.xml:65
 #, no-c-format
 msgid ""
 "<![CDATA[sess.createSQLQuery(\"SELECT * FROM CATS\")\n"
@@ -121,29 +121,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:194 query_sql.xml:345
 #, 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:349
 #, 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, "
+"<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 @@
 "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 "
@@ -167,7 +167,7 @@
 "scalars."
 
 #. Tag: programlisting
-#: query_sql.xml:66
+#: query_sql.xml:90
 #, no-c-format
 msgid ""
 "<![CDATA[sess.createSQLQuery(\"SELECT * FROM CATS\")\n"
@@ -178,7 +178,7 @@
 msgstr ""
 
 #. Tag: para
-#: query_sql.xml:68
+#: query_sql.xml:92
 #, no-c-format
 msgid ""
 "This is essentially the same query as before, but now "
@@ -190,7 +190,7 @@
 "BIRTHDATE where as the type of ID is explicitly specified."
 
 #. Tag: para
-#: query_sql.xml:72
+#: query_sql.xml:96
 #, no-c-format
 msgid ""
 "How the java.sql.Types returned from ResultSetMetaData is mapped to "
@@ -204,13 +204,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 "
@@ -224,7 +224,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"
@@ -234,13 +234,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 "
@@ -252,7 +252,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 "
@@ -270,7 +270,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"
@@ -279,19 +279,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 "
@@ -305,7 +305,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, "
@@ -316,7 +316,7 @@
 msgstr ""
 
 #. Tag: para
-#: query_sql.xml:128
+#: query_sql.xml:152
 #, no-c-format
 msgid ""
 "In this example the returned <literal>Cat</literal>'s will have their "
@@ -334,7 +334,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, "
@@ -345,7 +345,7 @@
 msgstr ""
 
 #. Tag: para
-#: query_sql.xml:138
+#: query_sql.xml:162
 #, no-c-format
 msgid ""
 "At this stage we are reaching the limits of what is possible with native "
@@ -359,13 +359,13 @@
 "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
+#: query_sql.xml:172
 #, no-c-format
 msgid ""
 "Until now the result set column names are assumed to be the same as the "
@@ -379,7 +379,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 "
@@ -389,7 +389,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."
@@ -400,14 +400,14 @@
 msgstr ""
 
 #. Tag: para
-#: query_sql.xml:158
-#, no-c-format
+#: query_sql.xml:182
+#, 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 "
+"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 "
@@ -418,13 +418,13 @@
 "\"NAME\")."
 
 #. Tag: para
-#: query_sql.xml:165
+#: query_sql.xml:189
 #, 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:192
 #, no-c-format
 msgid ""
 "<![CDATA[sess.createSQLQuery(\"SELECT {cat.*}, {mother.*}  FROM CATS c, CATS "
@@ -435,7 +435,7 @@
 msgstr ""
 
 #. Tag: para
-#: query_sql.xml:174
+#: query_sql.xml:198
 #, no-c-format
 msgid ""
 "the SQL query string, with placeholders for Hibernate to inject column "
@@ -445,23 +445,23 @@
 "aliases"
 
 #. Tag: para
-#: query_sql.xml:179
+#: query_sql.xml:203
 #, 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:207
+#, 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 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."
 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 +473,7 @@
 "clause if we like."
 
 #. Tag: programlisting
-#: query_sql.xml:192
+#: query_sql.xml:216
 #, no-c-format
 msgid ""
 "<![CDATA[String sql = \"SELECT ID as {c.id}, NAME as {c.name}, \" + \n"
@@ -488,13 +488,13 @@
 msgstr ""
 
 #. Tag: title
-#: query_sql.xml:195
+#: query_sql.xml:219
 #, no-c-format
 msgid "Alias and property references"
 msgstr "Alias and property references"
 
 #. Tag: para
-#: query_sql.xml:197
+#: query_sql.xml:221
 #, no-c-format
 msgid ""
 "For most cases the above alias injection is needed, but for queries relating "
@@ -508,7 +508,7 @@
 "allow Hibernate to inject the proper aliases."
 
 #. Tag: para
-#: query_sql.xml:202
+#: query_sql.xml:226
 #, no-c-format
 msgid ""
 "The following table shows the different possibilities of using the alias "
@@ -520,211 +520,211 @@
 "have a unique and probably different name when used."
 
 #. Tag: title
-#: query_sql.xml:208
+#: query_sql.xml:232
 #, no-c-format
 msgid "Alias injection names"
 msgstr "Alias injection names"
 
 #. Tag: entry
-#: query_sql.xml:219
+#: query_sql.xml:243
 #, no-c-format
 msgid "Description"
 msgstr "Description"
 
 #. Tag: entry
-#: query_sql.xml:221
+#: query_sql.xml:245
 #, no-c-format
 msgid "Syntax"
 msgstr "Syntax"
 
 #. Tag: entry
-#: query_sql.xml:223
+#: query_sql.xml:247
 #, no-c-format
 msgid "Example"
 msgstr "Example"
 
 #. Tag: entry
-#: query_sql.xml:229
+#: query_sql.xml:253
 #, no-c-format
 msgid "A simple property"
 msgstr "A simple property"
 
 #. Tag: literal
-#: query_sql.xml:231
+#: query_sql.xml:255
 #, no-c-format
 msgid "{[aliasname].[propertyname]"
 msgstr "{[aliasname].[propertyname]"
 
 #. Tag: literal
-#: query_sql.xml:233
+#: query_sql.xml:257
 #, no-c-format
 msgid "A_NAME as {item.name}"
 msgstr "A_NAME as {item.name}"
 
 #. Tag: entry
-#: query_sql.xml:237
+#: query_sql.xml:261
 #, no-c-format
 msgid "A composite property"
 msgstr "A composite property"
 
 #. Tag: literal
-#: query_sql.xml:239
+#: query_sql.xml:263
 #, no-c-format
 msgid "{[aliasname].[componentname].[propertyname]}"
 msgstr "{[aliasname].[componentname].[propertyname]}"
 
 #. Tag: literal
-#: query_sql.xml:241
+#: query_sql.xml:265
 #, 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:270
 #, no-c-format
 msgid "Discriminator of an entity"
 msgstr "Discriminator of an entity"
 
 #. Tag: literal
-#: query_sql.xml:248
+#: query_sql.xml:272
 #, no-c-format
 msgid "{[aliasname].class}"
 msgstr "{[aliasname].class}"
 
 #. Tag: literal
-#: query_sql.xml:250
+#: query_sql.xml:274
 #, no-c-format
 msgid "DISC as {item.class}"
 msgstr "DISC as {item.class}"
 
 #. Tag: entry
-#: query_sql.xml:254
+#: query_sql.xml:278
 #, 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:280 query_sql.xml:328
 #, no-c-format
 msgid "{[aliasname].*}"
 msgstr "{[aliasname].*}"
 
 #. Tag: literal
-#: query_sql.xml:258
+#: query_sql.xml:282
 #, no-c-format
 msgid "{item.*}"
 msgstr "{item.*}"
 
 #. Tag: entry
-#: query_sql.xml:262
+#: query_sql.xml:286
 #, no-c-format
 msgid "A collection key"
 msgstr "A collection key"
 
 #. Tag: literal
-#: query_sql.xml:264
+#: query_sql.xml:288
 #, no-c-format
 msgid "{[aliasname].key}"
 msgstr "{[aliasname].key}"
 
 #. Tag: literal
-#: query_sql.xml:266
+#: query_sql.xml:290
 #, no-c-format
 msgid "ORGID as {coll.key}"
 msgstr "ORGID as {coll.key}"
 
 #. Tag: entry
-#: query_sql.xml:270
+#: query_sql.xml:294
 #, no-c-format
 msgid "The id of an collection"
 msgstr "The id of an collection"
 
 #. Tag: literal
-#: query_sql.xml:272
+#: query_sql.xml:296
 #, no-c-format
 msgid "{[aliasname].id}"
 msgstr "{[aliasname].id}"
 
 #. Tag: literal
-#: query_sql.xml:274
+#: query_sql.xml:298
 #, no-c-format
 msgid "EMPID as {coll.id}"
 msgstr "EMPID as {coll.id}"
 
 #. Tag: entry
-#: query_sql.xml:278
+#: query_sql.xml:302
 #, no-c-format
 msgid "The element of an collection"
 msgstr "The element of an collection"
 
 #. Tag: literal
-#: query_sql.xml:280
+#: query_sql.xml:304
 #, no-c-format
 msgid "{[aliasname].element}"
 msgstr "{[aliasname].element}"
 
 #. Tag: literal
-#: query_sql.xml:282
+#: query_sql.xml:306
 #, no-c-format
 msgid "XID as {coll.element}"
 msgstr "XID as {coll.element}"
 
 #. Tag: entry
-#: query_sql.xml:286
+#: query_sql.xml:310
 #, no-c-format
 msgid "roperty of the element in the collection"
 msgstr "roperty of the element in the collection"
 
 #. Tag: literal
-#: query_sql.xml:288
+#: query_sql.xml:312
 #, no-c-format
 msgid "{[aliasname].element.[propertyname]}"
 msgstr "{[aliasname].element.[propertyname]}"
 
 #. Tag: literal
-#: query_sql.xml:290
+#: query_sql.xml:314
 #, no-c-format
 msgid "NAME as {coll.element.name}"
 msgstr "NAME as {coll.element.name}"
 
 #. Tag: entry
-#: query_sql.xml:294
+#: query_sql.xml:318
 #, 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:320
 #, no-c-format
 msgid "{[aliasname].element.*}"
 msgstr "{[aliasname].element.*}"
 
 #. Tag: literal
-#: query_sql.xml:298
+#: query_sql.xml:322
 #, no-c-format
 msgid "{coll.element.*}"
 msgstr "{coll.element.*}"
 
 #. Tag: entry
-#: query_sql.xml:302
+#: query_sql.xml:326
 #, 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:330
 #, no-c-format
 msgid "{coll.*}"
 msgstr "{coll.*}"
 
 #. Tag: title
-#: query_sql.xml:315
+#: query_sql.xml:339
 #, no-c-format
 msgid "Returning non-managed entities"
 msgstr "Returning non-managed entities"
 
 #. Tag: para
-#: query_sql.xml:317
+#: query_sql.xml:341
 #, no-c-format
 msgid ""
 "It is possible to apply a ResultTransformer to native sql queries. Allowing "
@@ -734,7 +734,7 @@
 "it to e.g. return non-managed entities."
 
 #. Tag: programlisting
-#: query_sql.xml:319
+#: query_sql.xml:343
 #, no-c-format
 msgid ""
 "<![CDATA[sess.createSQLQuery(\"SELECT NAME, BIRTHDATE FROM CATS\")\n"
@@ -742,13 +742,13 @@
 msgstr ""
 
 #. Tag: para
-#: query_sql.xml:329
+#: query_sql.xml:353
 #, no-c-format
 msgid "a result transformer"
 msgstr "a result transformer"
 
 #. Tag: para
-#: query_sql.xml:333
+#: query_sql.xml:357
 #, no-c-format
 msgid ""
 "The above query will return a list of <literal>CatDTO</literal> which has "
@@ -760,13 +760,13 @@
 "corresponding properties or fields."
 
 #. Tag: title
-#: query_sql.xml:340
+#: query_sql.xml:364
 #, no-c-format
 msgid "Handling inheritance"
 msgstr "Handling inheritance"
 
 #. Tag: para
-#: query_sql.xml:342
+#: query_sql.xml:366
 #, no-c-format
 msgid ""
 "Native sql queries which query for entities that is mapped as part of an "
@@ -778,19 +778,19 @@
 "subclasses."
 
 #. Tag: title
-#: query_sql.xml:348
+#: query_sql.xml:372
 #, no-c-format
 msgid "Parameters"
 msgstr "Parameters"
 
 #. Tag: para
-#: query_sql.xml:350
+#: query_sql.xml:374
 #, 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:377
 #, no-c-format
 msgid ""
 "<![CDATA[Query query = sess.createSQLQuery(\"SELECT * FROM CATS WHERE NAME "
@@ -803,13 +803,13 @@
 msgstr ""
 
 #. Tag: title
-#: query_sql.xml:361
+#: query_sql.xml:385
 #, no-c-format
 msgid "Named SQL queries"
 msgstr "Requêtes SQL nommées"
 
 #. Tag: para
-#: query_sql.xml:363
+#: query_sql.xml:387
 #, no-c-format
 msgid ""
 "Named SQL queries may be defined in the mapping document and called in "
@@ -822,7 +822,7 @@
 "<literal>addEntity()</literal>."
 
 #. Tag: programlisting
-#: query_sql.xml:368
+#: query_sql.xml:392
 #, no-c-format
 msgid ""
 "<![CDATA[<sql-query name=\"persons\">\n"
@@ -836,7 +836,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: query_sql.xml:370
+#: query_sql.xml:394
 #, no-c-format
 msgid ""
 "<![CDATA[List people = sess.getNamedQuery(\"persons\")\n"
@@ -846,7 +846,7 @@
 msgstr ""
 
 #. Tag: para
-#: query_sql.xml:372
+#: query_sql.xml:396
 #, no-c-format
 msgid ""
 "The <literal>&lt;return-join&gt;</literal> and <literal>&lt;load-"
@@ -858,7 +858,7 @@
 "associations et définir des requêtes qui initialisent des collections."
 
 #. Tag: programlisting
-#: query_sql.xml:377
+#: query_sql.xml:401
 #, no-c-format
 msgid ""
 "<![CDATA[<sql-query name=\"personsWith\">\n"
@@ -879,7 +879,7 @@
 msgstr ""
 
 #. Tag: para
-#: query_sql.xml:379
+#: query_sql.xml:403
 #, 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:383
+#: query_sql.xml:407
 #, no-c-format
 msgid ""
 "<![CDATA[<sql-query name=\"mySqlQuery\">\n"
@@ -904,11 +904,11 @@
 msgstr ""
 
 #. Tag: para
-#: query_sql.xml:385
-#, no-c-format
+#: query_sql.xml:409
+#, 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 "
+"resultset&gt;</literal> element 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 "
@@ -917,7 +917,7 @@
 "<literal>setResultSetMapping()</literal>."
 
 #. Tag: programlisting
-#: query_sql.xml:390
+#: query_sql.xml:414
 #, no-c-format
 msgid ""
 "<![CDATA[<resultset name=\"personAddress\">\n"
@@ -941,7 +941,7 @@
 msgstr ""
 
 #. Tag: para
-#: query_sql.xml:392
+#: query_sql.xml:416
 #, no-c-format
 msgid ""
 "You can alternatively use the resultset mapping information in your hbm "
@@ -951,7 +951,7 @@
 "files directly in java code."
 
 #. Tag: programlisting
-#: query_sql.xml:395
+#: query_sql.xml:419
 #, no-c-format
 msgid ""
 "<![CDATA[List cats = sess.createSQLQuery(\n"
@@ -963,7 +963,7 @@
 msgstr ""
 
 #. Tag: title
-#: query_sql.xml:398
+#: query_sql.xml:422
 #, no-c-format
 msgid "Using return-property to explicitly specify column/alias names"
 msgstr ""
@@ -971,7 +971,7 @@
 "colonnes/alias"
 
 #. Tag: para
-#: query_sql.xml:401
+#: query_sql.xml:425
 #, no-c-format
 msgid ""
 "With <literal>&lt;return-property&gt;</literal> you can explicitly tell "
@@ -984,7 +984,7 @@
 "alias."
 
 #. Tag: programlisting
-#: query_sql.xml:406
+#: query_sql.xml:430
 #, no-c-format
 msgid ""
 "<![CDATA[<sql-query name=\"mySqlQuery\">\n"
@@ -1002,7 +1002,7 @@
 msgstr ""
 
 #. Tag: para
-#: query_sql.xml:408
+#: query_sql.xml:432
 #, no-c-format
 msgid ""
 "<literal>&lt;return-property&gt;</literal> also works with multiple columns. "
@@ -1014,7 +1014,7 @@
 "ne peut pas permettre une bonne granularité des propriétés multi-colonnes."
 
 #. Tag: programlisting
-#: query_sql.xml:413
+#: query_sql.xml:437
 #, no-c-format
 msgid ""
 "<![CDATA[<sql-query name=\"organizationCurrentEmployments\">\n"
@@ -1035,7 +1035,7 @@
 msgstr ""
 
 #. Tag: para
-#: query_sql.xml:415
+#: query_sql.xml:439
 #, no-c-format
 msgid ""
 "Notice that in this example we used <literal>&lt;return-property&gt;</"
@@ -1048,7 +1048,7 @@
 "veulent référencer les colonnes et les propriétés."
 
 #. Tag: para
-#: query_sql.xml:420
+#: query_sql.xml:444
 #, no-c-format
 msgid ""
 "If your mapping has a discriminator you must use <literal>&lt;return-"
@@ -1058,13 +1058,13 @@
 "discriminator&gt;</literal> pour spécifier la colonne discriminante."
 
 #. Tag: title
-#: query_sql.xml:426
+#: query_sql.xml:450
 #, 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:428
+#: query_sql.xml:452
 #, no-c-format
 msgid ""
 "Hibernate 3 introduces support for queries via stored procedures and "
@@ -1081,7 +1081,7 @@
 "stockée en Oracle 9 et version supérieure :"
 
 #. Tag: programlisting
-#: query_sql.xml:434
+#: query_sql.xml:458
 #, no-c-format
 msgid ""
 "<![CDATA[CREATE OR REPLACE FUNCTION selectAllEmployments\n"
@@ -1099,7 +1099,7 @@
 msgstr ""
 
 #. Tag: para
-#: query_sql.xml:436
+#: query_sql.xml:460
 #, no-c-format
 msgid "To use this query in Hibernate you need to map it via a named query."
 msgstr ""
@@ -1107,7 +1107,7 @@
 "une requête nommée."
 
 #. Tag: programlisting
-#: query_sql.xml:439
+#: query_sql.xml:463
 #, no-c-format
 msgid ""
 "<![CDATA[<sql-query name=\"selectAllEmployees_SP\" callable=\"true\">\n"
@@ -1128,7 +1128,7 @@
 msgstr ""
 
 #. Tag: para
-#: query_sql.xml:441
+#: query_sql.xml:465
 #, no-c-format
 msgid ""
 "Notice stored procedures currently only return scalars and entities. "
@@ -1140,13 +1140,13 @@
 "<literal>&lt;load-collection&gt;</literal> ne sont pas supportés."
 
 #. Tag: title
-#: query_sql.xml:446
+#: query_sql.xml:470
 #, 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:448
+#: query_sql.xml:472
 #, no-c-format
 msgid ""
 "To use stored procedures with Hibernate the procedures/functions have to "
@@ -1165,7 +1165,7 @@
 "pour les procédures stockées."
 
 #. Tag: para
-#: query_sql.xml:455
+#: query_sql.xml:479
 #, no-c-format
 msgid ""
 "Stored procedure queries can't be paged with <literal>setFirstResult()/"
@@ -1175,7 +1175,7 @@
 "<literal>setFirstResult()/setMaxResults()</literal>."
 
 #. Tag: para
-#: query_sql.xml:458
+#: query_sql.xml:482
 #, no-c-format
 msgid ""
 "Recommended call form is standard SQL92: <literal>{ ? = call functionName"
@@ -1187,13 +1187,13 @@
 "parameters&gt;}</literal>. Native call syntax is not supported."
 
 #. Tag: para
-#: query_sql.xml:463
+#: query_sql.xml:487
 #, no-c-format
 msgid "For Oracle the following rules apply:"
 msgstr "Pour Oracle les règles suivantes s'appliquent :"
 
 #. Tag: para
-#: query_sql.xml:467
+#: query_sql.xml:491
 #, no-c-format
 msgid ""
 "A function must return a result set. The first parameter of a procedure must "
@@ -1209,13 +1209,13 @@
 "type <literal>REF CURSOR</literal>."
 
 #. Tag: para
-#: query_sql.xml:476
+#: query_sql.xml:500
 #, 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:480
+#: query_sql.xml:504
 #, no-c-format
 msgid ""
 "The procedure must return a result set. Note that since these servers can/"
@@ -1230,7 +1230,7 @@
 "reste sera ignoré."
 
 #. Tag: para
-#: query_sql.xml:488
+#: query_sql.xml:512
 #, no-c-format
 msgid ""
 "If you can enable <literal>SET NOCOUNT ON</literal> in your procedure it "
@@ -1241,13 +1241,13 @@
 "obligation."
 
 #. Tag: title
-#: query_sql.xml:498
+#: query_sql.xml:522
 #, 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:500
+#: query_sql.xml:524
 #, no-c-format
 msgid ""
 "Hibernate3 can use custom SQL statements for create, update, and delete "
@@ -1266,7 +1266,7 @@
 "<literal>&lt;sql-update&gt;</literal> surchargent ces chaînes de caractères :"
 
 #. Tag: programlisting
-#: query_sql.xml:508
+#: query_sql.xml:532
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Person\">\n"
@@ -1282,7 +1282,7 @@
 msgstr ""
 
 #. Tag: para
-#: query_sql.xml:510
+#: query_sql.xml:534
 #, no-c-format
 msgid ""
 "The SQL is directly executed in your database, so you are free to use any "
@@ -1295,7 +1295,7 @@
 "de données."
 
 #. Tag: para
-#: query_sql.xml:514
+#: query_sql.xml:538
 #, no-c-format
 msgid ""
 "Stored procedures are supported if the <literal>callable</literal> attribute "
@@ -1305,7 +1305,7 @@
 "literal> est paramétré :"
 
 #. Tag: programlisting
-#: query_sql.xml:517
+#: query_sql.xml:541
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Person\">\n"
@@ -1321,7 +1321,7 @@
 msgstr ""
 
 #. Tag: para
-#: query_sql.xml:519
+#: query_sql.xml:543
 #, no-c-format
 msgid ""
 "The order of the positional parameters are currently vital, as they must be "
@@ -1331,7 +1331,7 @@
 "être dans la même séquence qu'Hibernate les attend."
 
 #. Tag: para
-#: query_sql.xml:522
+#: query_sql.xml:546
 #, no-c-format
 msgid ""
 "You can see the expected order by enabling debug logging for the "
@@ -1350,7 +1350,7 @@
 "Hibernate.)"
 
 #. Tag: para
-#: query_sql.xml:529
+#: query_sql.xml:553
 #, no-c-format
 msgid ""
 "The stored procedures are in most cases (read: better do it than not) "
@@ -1366,7 +1366,7 @@
 "expression comme un paramètre de sortie numérique pour les opérations CUD :"
 
 #. Tag: programlisting
-#: query_sql.xml:535
+#: query_sql.xml:559
 #, no-c-format
 msgid ""
 "<![CDATA[CREATE OR REPLACE FUNCTION updatePerson (uid IN NUMBER, uname IN "
@@ -1386,13 +1386,13 @@
 msgstr ""
 
 #. Tag: title
-#: query_sql.xml:539
+#: query_sql.xml:563
 #, no-c-format
 msgid "Custom SQL for loading"
 msgstr "SQL personnalisé pour le chargement"
 
 #. Tag: para
-#: query_sql.xml:541
+#: query_sql.xml:565
 #, no-c-format
 msgid "You may also declare your own SQL (or HQL) queries for entity loading:"
 msgstr ""
@@ -1400,7 +1400,7 @@
 "chargement d'entité :"
 
 #. Tag: programlisting
-#: query_sql.xml:544
+#: query_sql.xml:568
 #, no-c-format
 msgid ""
 "<![CDATA[<sql-query name=\"person\">\n"
@@ -1413,7 +1413,7 @@
 msgstr ""
 
 #. Tag: para
-#: query_sql.xml:546
+#: query_sql.xml:570
 #, no-c-format
 msgid ""
 "This is just a named query declaration, as discussed earlier. You may "
@@ -1423,7 +1423,7 @@
 "pouvez référencer cette requête nommée dans un mapping de classe :"
 
 #. Tag: programlisting
-#: query_sql.xml:549
+#: query_sql.xml:573
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Person\">\n"
@@ -1436,20 +1436,20 @@
 msgstr ""
 
 #. Tag: para
-#: query_sql.xml:551
+#: query_sql.xml:575
 #, 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:553
+#: query_sql.xml:577
 #, no-c-format
 msgid "You may 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:555
+#: query_sql.xml:579
 #, no-c-format
 msgid ""
 "<![CDATA[<set name=\"employments\" inverse=\"true\">\n"
@@ -1460,7 +1460,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: query_sql.xml:557
+#: query_sql.xml:581
 #, no-c-format
 msgid ""
 "<![CDATA[<sql-query name=\"employments\">\n"
@@ -1473,7 +1473,7 @@
 msgstr ""
 
 #. Tag: para
-#: query_sql.xml:559
+#: query_sql.xml:583
 #, no-c-format
 msgid ""
 "You could even define an entity loader that loads a collection by join "
@@ -1483,7 +1483,7 @@
 "par jointure :"
 
 #. Tag: programlisting
-#: query_sql.xml:562
+#: query_sql.xml:586
 #, 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	2008-08-14 15:28:13 UTC (rev 15066)
+++ core/trunk/documentation/manual/src/main/docbook/fr-FR/content/session_api.po	2008-08-14 15:35:40 UTC (rev 15067)
@@ -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: 2008-08-14 15:28+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,13 +11,13 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: session_api.xml:5
+#: session_api.xml:29
 #, no-c-format
 msgid "Working with objects"
 msgstr "Travailler avec des objets"
 
 #. Tag: para
-#: session_api.xml:7
+#: session_api.xml:31
 #, no-c-format
 msgid ""
 "Hibernate is a full object/relational mapping solution that not only shields "
@@ -36,7 +36,7 @@
 "persistance dans les applications 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,19 +52,19 @@
 "d'applications lors du réglage de la performance de leur système."
 
 #. Tag: title
-#: session_api.xml:24
+#: session_api.xml:48
 #, no-c-format
 msgid "Hibernate object states"
 msgstr "États des objets 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 définit et comprend les états suivants :"
 
 #. Tag: para
-#: session_api.xml:32
+#: session_api.xml:56
 #, no-c-format
 msgid ""
 "<emphasis>Transient</emphasis> - an object is transient if it has just been "
@@ -87,7 +87,7 @@
 "besoin d'être exécutées pour cette transistion)."
 
 #. Tag: para
-#: session_api.xml:44
+#: session_api.xml:68
 #, no-c-format
 msgid ""
 "<emphasis>Persistent</emphasis> - a persistent instance has a representation "
@@ -110,7 +110,7 @@
 "objet devrait être rendu éphémère."
 
 #. Tag: para
-#: session_api.xml:55
+#: session_api.xml:79
 #, no-c-format
 msgid ""
 "<emphasis>Detached</emphasis> - a detached instance is an object that has "
@@ -135,7 +135,7 @@
 "c'est-à-dire une unité de travail du point de vue de l'utilisateur."
 
 #. Tag: para
-#: session_api.xml:69
+#: session_api.xml:93
 #, no-c-format
 msgid ""
 "We'll now discuss the states and state transitions (and the Hibernate "
@@ -145,13 +145,13 @@
 "méthodes d'Hibernate qui déclenchent une transition) plus en détails."
 
 #. Tag: title
-#: session_api.xml:77
+#: session_api.xml:101
 #, no-c-format
 msgid "Making objects persistent"
 msgstr "Rendre des objets persistants"
 
 #. Tag: para
-#: session_api.xml:79
+#: session_api.xml:103
 #, no-c-format
 msgid ""
 "Newly instantiated instances of a a persistent class are considered "
@@ -164,7 +164,7 @@
 "avec une session :"
 
 #. Tag: programlisting
-#: session_api.xml:86
+#: session_api.xml:110
 #, no-c-format
 msgid ""
 "<![CDATA[DomesticCat fritz = new DomesticCat();\n"
@@ -175,7 +175,7 @@
 msgstr ""
 
 #. Tag: para
-#: session_api.xml:88
+#: session_api.xml:112
 #, no-c-format
 msgid ""
 "If <literal>Cat</literal> has a generated identifier, the identifier is "
@@ -197,7 +197,7 @@
 "brouillon d'EJB3."
 
 #. Tag: para
-#: session_api.xml:100
+#: session_api.xml:124
 #, no-c-format
 msgid ""
 "<literal>persist()</literal> makes a transient instance persistent. However, "
@@ -217,7 +217,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 "
@@ -233,7 +233,7 @@
 "running conversation with an extended Session/persistence context."
 
 #. Tag: para
-#: session_api.xml:121
+#: session_api.xml:145
 #, no-c-format
 msgid ""
 "Alternatively, you may assign the identifier using an overloaded version of "
@@ -243,7 +243,7 @@
 "surchargée de <literal>save()</literal>."
 
 #. Tag: programlisting
-#: session_api.xml:126
+#: session_api.xml:150
 #, no-c-format
 msgid ""
 "<![CDATA[DomesticCat pk = new DomesticCat();\n"
@@ -256,7 +256,7 @@
 msgstr ""
 
 #. Tag: para
-#: session_api.xml:128
+#: session_api.xml:152
 #, no-c-format
 msgid ""
 "If the object you make persistent has associated objects (e.g. the "
@@ -277,7 +277,7 @@
 "les objets dans le mauvais ordre."
 
 #. Tag: para
-#: session_api.xml:138
+#: session_api.xml:162
 #, no-c-format
 msgid ""
 "Usually you don't bother with this detail, as you'll very likely use "
@@ -294,13 +294,13 @@
 "transitive est traitée plus loin dans ce chapitre."
 
 #. Tag: title
-#: session_api.xml:149
+#: session_api.xml:173
 #, no-c-format
 msgid "Loading an object"
 msgstr "Chargement d'un objet"
 
 #. Tag: para
-#: session_api.xml:151
+#: session_api.xml:175
 #, no-c-format
 msgid ""
 "The <literal>load()</literal> methods of <literal>Session</literal> gives "
@@ -315,13 +315,13 @@
 "dans un état persistant."
 
 #. 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"
@@ -331,14 +331,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 ""
 "Alternativement, vous pouvez charger un état dans une instance donnée :"
 
 #. Tag: programlisting
-#: session_api.xml:166
+#: session_api.xml:190
 #, no-c-format
 msgid ""
 "<![CDATA[Cat cat = new DomesticCat();\n"
@@ -348,7 +348,7 @@
 msgstr ""
 
 #. Tag: para
-#: session_api.xml:168
+#: session_api.xml:192
 #, no-c-format
 msgid ""
 "Note that <literal>load()</literal> will throw an unrecoverable exception if "
@@ -371,7 +371,7 @@
 "pour le mapping de la classe."
 
 #. Tag: para
-#: session_api.xml:179
+#: session_api.xml:203
 #, no-c-format
 msgid ""
 "If you are not certain that a matching row exists, you should use the "
@@ -384,7 +384,7 @@
 "correspondante."
 
 #. Tag: programlisting
-#: session_api.xml:185
+#: session_api.xml:209
 #, no-c-format
 msgid ""
 "<![CDATA[Cat cat = (Cat) sess.get(Cat.class, id);\n"
@@ -396,7 +396,7 @@
 msgstr ""
 
 #. Tag: para
-#: session_api.xml:187
+#: session_api.xml:211
 #, no-c-format
 msgid ""
 "You may even load an object using an SQL <literal>SELECT ... FOR UPDATE</"
@@ -408,13 +408,13 @@
 "documentation de l'API pour plus d'informations."
 
 #. 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
+#: session_api.xml:218
 #, no-c-format
 msgid ""
 "Note that any associated instances or contained collections are "
@@ -428,7 +428,7 @@
 "ou <literal>all</literal> en tant que style de cascade pour l'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, "
@@ -441,7 +441,7 @@
 "initiliser certains propriétés de l'objet."
 
 #. Tag: programlisting
-#: session_api.xml:207
+#: session_api.xml:231
 #, no-c-format
 msgid ""
 "<![CDATA[sess.save(cat);\n"
@@ -450,7 +450,7 @@
 msgstr ""
 
 #. Tag: para
-#: session_api.xml:209
+#: session_api.xml:233
 #, no-c-format
 msgid ""
 "An important question usually appears at this point: How much does Hibernate "
@@ -465,13 +465,13 @@
 "<xref linkend=\"performance-fetching\"/>."
 
 #. Tag: title
-#: session_api.xml:219
+#: session_api.xml:243
 #, no-c-format
 msgid "Querying"
 msgstr "Requêtage"
 
 #. Tag: para
-#: session_api.xml:221
+#: session_api.xml:245
 #, no-c-format
 msgid ""
 "If you don't know the identifiers of the objects you are looking for, you "
@@ -491,13 +491,13 @@
 "objets."
 
 #. Tag: title
-#: session_api.xml:231
+#: session_api.xml:255
 #, no-c-format
 msgid "Executing queries"
 msgstr "Exécution de requêtes"
 
 #. 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."
@@ -513,7 +513,7 @@
 "literal> en utilisant la <literal>Session</literal> courante :"
 
 #. Tag: programlisting
-#: session_api.xml:240
+#: session_api.xml:264
 #, no-c-format
 msgid ""
 "<![CDATA[List cats = session.createQuery(\n"
@@ -543,7 +543,7 @@
 msgstr ""
 
 #. Tag: para
-#: session_api.xml:242
+#: session_api.xml:266
 #, no-c-format
 msgid ""
 "A query is usually executed by invoking <literal>list()</literal>, the "
@@ -563,13 +563,13 @@
 "seul objet."
 
 #. Tag: title
-#: session_api.xml:254
+#: session_api.xml:278
 #, no-c-format
 msgid "Iterating results"
 msgstr "Itération de résultats"
 
 #. Tag: para
-#: session_api.xml:256
+#: session_api.xml:280
 #, no-c-format
 msgid ""
 "Occasionally, you might be able to achieve better performance by executing "
@@ -594,7 +594,7 @@
 "supplémentaires pour initialiser les instances réelles."
 
 #. Tag: programlisting
-#: session_api.xml:268
+#: session_api.xml:292
 #, no-c-format
 msgid ""
 "<![CDATA[// fetch ids\n"
@@ -613,13 +613,13 @@
 msgstr ""
 
 #. Tag: title
-#: session_api.xml:272
+#: session_api.xml:296
 #, no-c-format
 msgid "Queries that return tuples"
 msgstr "Requêtes qui retournent des tuples"
 
 #. Tag: para
-#: session_api.xml:274
+#: session_api.xml:298
 #, no-c-format
 msgid ""
 "Hibernate queries sometimes return tuples of objects, in which case each "
@@ -629,7 +629,7 @@
 "chaque tuple est retourné comme un tableau :"
 
 #. Tag: programlisting
-#: session_api.xml:279
+#: session_api.xml:303
 #, no-c-format
 msgid ""
 "<![CDATA[Iterator kittensAndMothers = sess.createQuery(\n"
@@ -647,13 +647,13 @@
 msgstr ""
 
 #. Tag: title
-#: session_api.xml:284
+#: session_api.xml:308
 #, no-c-format
 msgid "Scalar results"
 msgstr "Résultats scalaires"
 
 #. Tag: para
-#: session_api.xml:286
+#: session_api.xml:310
 #, no-c-format
 msgid ""
 "Queries may specify a property of a class in the <literal>select</literal> "
@@ -666,7 +666,7 @@
 "résultats \"scalaires\" (et pas des entités dans un état persistant)."
 
 #. Tag: programlisting
-#: session_api.xml:292
+#: session_api.xml:316
 #, no-c-format
 msgid ""
 "<![CDATA[Iterator results = sess.createQuery(\n"
@@ -686,13 +686,13 @@
 msgstr ""
 
 #. Tag: title
-#: session_api.xml:297
+#: session_api.xml:321
 #, no-c-format
 msgid "Bind parameters"
 msgstr "Lier des paramètres"
 
 #. Tag: para
-#: session_api.xml:299
+#: session_api.xml:323
 #, no-c-format
 msgid ""
 "Methods on <literal>Query</literal> are provided for binding values to named "
@@ -709,7 +709,7 @@
 "caractères de la requête. Les avantages des paramètres nommés sont :"
 
 #. 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"
@@ -718,19 +718,19 @@
 "chaîne de la requête"
 
 #. Tag: para
-#: session_api.xml:315
+#: session_api.xml:339
 #, no-c-format
 msgid "they may occur multiple times in the same query"
 msgstr "ils peuvent apparaître plusieurs fois dans la même requête"
 
 #. Tag: para
-#: session_api.xml:320
+#: session_api.xml:344
 #, no-c-format
 msgid "they are self-documenting"
 msgstr "ils sont auto-documentés"
 
 #. Tag: programlisting
-#: session_api.xml:326
+#: session_api.xml:350
 #, no-c-format
 msgid ""
 "<![CDATA[//named parameter (preferred)\n"
@@ -741,7 +741,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: session_api.xml:328
+#: session_api.xml:352
 #, no-c-format
 msgid ""
 "<![CDATA[//positional parameter\n"
@@ -751,7 +751,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: session_api.xml:330
+#: session_api.xml:354
 #, no-c-format
 msgid ""
 "<![CDATA[//named parameter list\n"
@@ -765,13 +765,13 @@
 msgstr ""
 
 #. Tag: title
-#: session_api.xml:335
+#: session_api.xml:359
 #, no-c-format
 msgid "Pagination"
 msgstr "Pagination"
 
 #. Tag: para
-#: session_api.xml:337
+#: session_api.xml:361
 #, no-c-format
 msgid ""
 "If you need to specify bounds upon your result set (the maximum number of "
@@ -784,7 +784,7 @@
 "l'interface <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"
@@ -794,7 +794,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 "
@@ -804,13 +804,13 @@
 "votre SGBD."
 
 #. Tag: title
-#: session_api.xml:353
+#: session_api.xml:377
 #, no-c-format
 msgid "Scrollable iteration"
 msgstr "Itération \"scrollable\""
 
 #. Tag: para
-#: session_api.xml:355
+#: session_api.xml:379
 #, no-c-format
 msgid ""
 "If your JDBC driver supports scrollable <literal>ResultSet</literal>s, the "
@@ -824,7 +824,7 @@
 "une navigation flexible dans les résultats de la requête."
 
 #. 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 "
@@ -854,7 +854,7 @@
 msgstr ""
 
 #. Tag: para
-#: session_api.xml:364
+#: session_api.xml:388
 #, no-c-format
 msgid ""
 "Note that an open database connection (and cursor) is required for this "
@@ -867,13 +867,13 @@
 "de pagination hors ligne."
 
 #. Tag: title
-#: session_api.xml:373
+#: session_api.xml:397
 #, no-c-format
 msgid "Externalizing named queries"
 msgstr "Externaliser des requêtes nommées"
 
 #. Tag: para
-#: session_api.xml:375
+#: session_api.xml:399
 #, no-c-format
 msgid ""
 "You may also define named queries in the mapping document. (Remember to use "
@@ -886,7 +886,7 @@
 "éléments XML.)"
 
 #. Tag: programlisting
-#: session_api.xml:381
+#: session_api.xml:405
 #, no-c-format
 msgid ""
 "<![CDATA[<query name=\"ByNameAndMaximumWeight\"><![CDATA[\n"
@@ -897,13 +897,13 @@
 msgstr ""
 
 #. Tag: para
-#: session_api.xml:383
+#: session_api.xml:407
 #, no-c-format
 msgid "Parameter binding and executing is done programatically:"
 msgstr "La liaison de paramètres et l'exécution sont fait par programmation :"
 
 #. Tag: programlisting
-#: session_api.xml:387
+#: session_api.xml:411
 #, no-c-format
 msgid ""
 "<![CDATA[Query q = sess.getNamedQuery(\"ByNameAndMaximumWeight\");\n"
@@ -913,7 +913,7 @@
 msgstr ""
 
 #. Tag: para
-#: session_api.xml:389
+#: session_api.xml:413
 #, no-c-format
 msgid ""
 "Note that the actual program code is independent of the query language that "
@@ -926,7 +926,7 @@
 "plaçant dans les fichiers de mapping."
 
 #. Tag: para
-#: session_api.xml:395
+#: session_api.xml:419
 #, no-c-format
 msgid ""
 "Also note that a query declaration inside a <literal>&lt;hibernate-"
@@ -943,13 +943,13 @@
 "ByNameAndMaximumWeight</literal>."
 
 #. Tag: title
-#: session_api.xml:408
+#: session_api.xml:432
 #, no-c-format
 msgid "Filtering collections"
 msgstr "Filtrer des collections"
 
 #. Tag: para
-#: session_api.xml:409
+#: session_api.xml:433
 #, no-c-format
 msgid ""
 "A collection <emphasis>filter</emphasis> is a special type of query that may "
@@ -962,7 +962,7 @@
 "l'élément de la collection courant."
 
 #. Tag: programlisting
-#: session_api.xml:415
+#: session_api.xml:439
 #, no-c-format
 msgid ""
 "<![CDATA[Collection blackKittens = session.createFilter(\n"
@@ -974,7 +974,7 @@
 msgstr ""
 
 #. Tag: para
-#: session_api.xml:417
+#: session_api.xml:441
 #, no-c-format
 msgid ""
 "The returned collection is considered a bag, and it's a copy of the given "
@@ -987,7 +987,7 @@
 "comportement attendu)."
 
 #. Tag: para
-#: session_api.xml:423
+#: session_api.xml:447
 #, no-c-format
 msgid ""
 "Observe that filters do not require a <literal>from</literal> clause (though "
@@ -999,7 +999,7 @@
 "sont pas limités à retourner des éléments de la collection eux-mêmes."
 
 #. Tag: programlisting
-#: session_api.xml:428
+#: session_api.xml:452
 #, no-c-format
 msgid ""
 "<![CDATA[Collection blackKittenMates = session.createFilter(\n"
@@ -1009,7 +1009,7 @@
 msgstr ""
 
 #. Tag: para
-#: session_api.xml:430
+#: 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 "
@@ -1019,7 +1019,7 @@
 "ensemble d'éléments dans une énorme collection :"
 
 #. Tag: programlisting
-#: session_api.xml:435
+#: session_api.xml:459
 #, no-c-format
 msgid ""
 "<![CDATA[Collection tenKittens = session.createFilter(\n"
@@ -1029,13 +1029,13 @@
 msgstr ""
 
 #. Tag: title
-#: session_api.xml:440
+#: session_api.xml:464
 #, no-c-format
 msgid "Criteria queries"
 msgstr "Requêtes Criteria"
 
 #. Tag: para
-#: session_api.xml:442
+#: session_api.xml:466
 #, no-c-format
 msgid ""
 "HQL is extremely powerful but some developers prefer to build queries "
@@ -1049,7 +1049,7 @@
 "requête <literal>Criteria</literal> pour ces cas :"
 
 #. Tag: programlisting
-#: session_api.xml:448
+#: session_api.xml:472
 #, no-c-format
 msgid ""
 "<![CDATA[Criteria crit = session.createCriteria(Cat.class);\n"
@@ -1059,7 +1059,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</"
@@ -1070,13 +1070,13 @@
 "sont traitées plus en détail dans <xref linkend=\"querycriteria\"/>."
 
 #. Tag: title
-#: session_api.xml:458
+#: session_api.xml:482
 #, no-c-format
 msgid "Queries in native SQL"
 msgstr "Requêtes en SQL natif"
 
 #. Tag: para
-#: session_api.xml:460
+#: session_api.xml:484
 #, no-c-format
 msgid ""
 "You may express a query in SQL, using <literal>createSQLQuery()</literal> "
@@ -1093,7 +1093,7 @@
 "mettre les alias SQL entre accolades :"
 
 #. Tag: programlisting
-#: session_api.xml:468
+#: session_api.xml:492
 #, no-c-format
 msgid ""
 "<![CDATA[List cats = session.createSQLQuery(\"SELECT {cat.*} FROM CAT {cat} "
@@ -1103,7 +1103,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: session_api.xml:470
+#: session_api.xml:494
 #, no-c-format
 msgid ""
 "<![CDATA[List cats = session.createSQLQuery(\n"
@@ -1116,7 +1116,7 @@
 msgstr ""
 
 #. Tag: para
-#: session_api.xml:472
+#: session_api.xml:496
 #, no-c-format
 msgid ""
 "SQL queries may contain named and positional parameters, just like Hibernate "
@@ -1129,13 +1129,13 @@
 ">."
 
 #. Tag: title
-#: session_api.xml:483
+#: session_api.xml:507
 #, no-c-format
 msgid "Modifying persistent objects"
 msgstr "Modifier des objets persistants"
 
 #. Tag: para
-#: session_api.xml:485
+#: session_api.xml:509
 #, no-c-format
 msgid ""
 "<emphasis>Transactional persistent instances</emphasis> (ie. objects loaded, "
@@ -1161,7 +1161,7 @@
 "literal> est ouverte :"
 
 #. Tag: programlisting
-#: session_api.xml:496
+#: session_api.xml:520
 #, no-c-format
 msgid ""
 "<![CDATA[DomesticCat cat = (DomesticCat) sess.load( Cat.class, new Long"
@@ -1171,7 +1171,7 @@
 msgstr ""
 
 #. Tag: para
-#: session_api.xml:498
+#: session_api.xml:522
 #, no-c-format
 msgid ""
 "Sometimes this programming model is inefficient since it would require both "
@@ -1187,7 +1187,7 @@
 "détachées."
 
 #. Tag: emphasis
-#: session_api.xml:506
+#: session_api.xml:530
 #, fuzzy, no-c-format
 msgid ""
 "Note that Hibernate does not offer its own API for direct execution of "
@@ -1213,13 +1213,13 @@
 "pour les astuces possibles d'opérations groupées."
 
 #. Tag: title
-#: session_api.xml:521
+#: session_api.xml:545
 #, no-c-format
 msgid "Modifying detached objects"
 msgstr "Modifier des objets détachés"
 
 #. Tag: para
-#: session_api.xml:523
+#: session_api.xml:547
 #, no-c-format
 msgid ""
 "Many applications need to retrieve an object in one transaction, send it to "
@@ -1236,7 +1236,7 @@
 "versionnées pour assurer l'isolation pour les \"longues\" unités de travail."
 
 #. Tag: para
-#: session_api.xml:530
+#: session_api.xml:554
 #, no-c-format
 msgid ""
 "Hibernate supports this model by providing for reattachment of detached "
@@ -1248,7 +1248,7 @@
 "<literal>Session.merge()</literal> :"
 
 #. Tag: programlisting
-#: session_api.xml:536
+#: session_api.xml:560
 #, no-c-format
 msgid ""
 "<![CDATA[// in the first session\n"
@@ -1265,7 +1265,7 @@
 msgstr ""
 
 #. Tag: para
-#: session_api.xml:538
+#: session_api.xml:562
 #, no-c-format
 msgid ""
 "If the <literal>Cat</literal> with identifier <literal>catId</literal> had "
@@ -1277,7 +1277,7 @@
 "l'application a essayé de le réattacher, une exception aurait été levée."
 
 #. Tag: para
-#: session_api.xml:544
+#: session_api.xml:568
 #, no-c-format
 msgid ""
 "Use <literal>update()</literal> if you are sure that the session does not "
@@ -1298,7 +1298,7 @@
 "exécutée."
 
 #. Tag: para
-#: session_api.xml:553
+#: session_api.xml:577
 #, no-c-format
 msgid ""
 "The application should individually <literal>update()</literal> detached "
@@ -1315,7 +1315,7 @@
 "\"objectstate-transitive\"/>."
 
 #. Tag: para
-#: session_api.xml:560
+#: session_api.xml:584
 #, no-c-format
 msgid ""
 "The <literal>lock()</literal> method also allows an application to "
@@ -1327,7 +1327,7 @@
 "doit être non modifiée !"
 
 #. Tag: programlisting
-#: session_api.xml:565
+#: session_api.xml:589
 #, no-c-format
 msgid ""
 "<![CDATA[//just reassociate:\n"
@@ -1339,7 +1339,7 @@
 msgstr ""
 
 #. Tag: para
-#: session_api.xml:567
+#: session_api.xml:591
 #, no-c-format
 msgid ""
 "Note that <literal>lock()</literal> can be used with various "
@@ -1354,7 +1354,7 @@
 "literal>."
 
 #. Tag: para
-#: session_api.xml:574
+#: session_api.xml:598
 #, no-c-format
 msgid ""
 "Other models for long units of work are discussed in <xref linkend="
@@ -1364,13 +1364,13 @@
 "linkend=\"transactions-optimistic\"/>."
 
 #. Tag: title
-#: session_api.xml:581
+#: session_api.xml:605
 #, no-c-format
 msgid "Automatic state detection"
 msgstr "Détection automatique d'un état"
 
 #. Tag: para
-#: session_api.xml:583
+#: session_api.xml:607
 #, no-c-format
 msgid ""
 "Hibernate users have requested a general purpose method that either saves a "
@@ -1385,7 +1385,7 @@
 "literal> implémente cette fonctionnalité."
 
 #. Tag: programlisting
-#: session_api.xml:590
+#: session_api.xml:614
 #, no-c-format
 msgid ""
 "<![CDATA[// in the first session\n"
@@ -1403,7 +1403,7 @@
 msgstr ""
 
 #. Tag: para
-#: session_api.xml:592
+#: session_api.xml:616
 #, no-c-format
 msgid ""
 "The usage and semantics of <literal>saveOrUpdate()</literal> seems to be "
@@ -1421,7 +1421,7 @@
 "applications n'utiliseront jamais ces méthodes."
 
 #. Tag: para
-#: session_api.xml:600
+#: session_api.xml:624
 #, no-c-format
 msgid ""
 "Usually <literal>update()</literal> or <literal>saveOrUpdate()</literal> are "
@@ -1431,31 +1431,31 @@
 "literal> sont utilisées dans le scénario suivant :"
 
 #. Tag: para
-#: session_api.xml:607
+#: session_api.xml:631
 #, 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:612
+#: session_api.xml:636
 #, 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:617
+#: session_api.xml:641
 #, 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:622
+#: session_api.xml:646
 #, 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:627
+#: session_api.xml:651
 #, no-c-format
 msgid ""
 "the application persists these modifications by calling <literal>update()</"
@@ -1465,19 +1465,19 @@
 "literal> dans une seconde sessin"
 
 #. Tag: para
-#: session_api.xml:634
+#: session_api.xml:658
 #, 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:640
+#: session_api.xml:664
 #, 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:645
+#: session_api.xml:669
 #, no-c-format
 msgid ""
 "if another object associated with the session has the same identifier, throw "
@@ -1487,7 +1487,7 @@
 "exception"
 
 #. Tag: para
-#: session_api.xml:651
+#: session_api.xml:675
 #, no-c-format
 msgid "if the object has no identifier property, <literal>save()</literal> it"
 msgstr ""
@@ -1495,7 +1495,7 @@
 "literal>"
 
 #. Tag: para
-#: session_api.xml:656
+#: session_api.xml:680
 #, no-c-format
 msgid ""
 "if the object's identifier has the value assigned to a newly instantiated "
@@ -1505,7 +1505,7 @@
 "instancié, appeler <literal>save()</literal>"
 
 #. Tag: para
-#: session_api.xml:662
+#: session_api.xml:686
 #, no-c-format
 msgid ""
 "if the object is versioned (by a <literal>&lt;version&gt;</literal> or "
@@ -1519,19 +1519,19 @@
 "instancié, appeler <literal>save()</literal>"
 
 #. Tag: para
-#: session_api.xml:670
+#: session_api.xml:694
 #, 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:676
+#: session_api.xml:700
 #, 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:682
+#: session_api.xml:706
 #, no-c-format
 msgid ""
 "if there is a persistent instance with the same identifier currently "
@@ -1543,7 +1543,7 @@
 "persistante"
 
 #. Tag: para
-#: session_api.xml:689
+#: session_api.xml:713
 #, no-c-format
 msgid ""
 "if there is no persistent instance currently associated with the session, "
@@ -1554,13 +1554,13 @@
 "persistante"
 
 #. Tag: para
-#: session_api.xml:695
+#: session_api.xml:719
 #, no-c-format
 msgid "the persistent instance is returned"
 msgstr "l'instance persistante est retournée"
 
 #. Tag: para
-#: session_api.xml:700
+#: session_api.xml:724
 #, no-c-format
 msgid ""
 "the given instance does not become associated with the session, it remains "
@@ -1569,13 +1569,13 @@
 "l'instance donnée ne devient pas associée à la session, elle reste détachée"
 
 #. Tag: title
-#: session_api.xml:710
+#: session_api.xml:734
 #, no-c-format
 msgid "Deleting persistent objects"
 msgstr "Suppression d'objets persistants"
 
 #. Tag: para
-#: session_api.xml:712
+#: session_api.xml:736
 #, no-c-format
 msgid ""
 "<literal>Session.delete()</literal> will remove an object's state from the "
@@ -1589,13 +1589,13 @@
 "literal> comme rendant une instance persistante éphémère."
 
 #. Tag: programlisting
-#: session_api.xml:719
+#: session_api.xml:743
 #, no-c-format
 msgid "<![CDATA[sess.delete(cat);]]>"
 msgstr ""
 
 #. Tag: para
-#: session_api.xml:721
+#: session_api.xml:745
 #, no-c-format
 msgid ""
 "You may delete objects in any order you like, without risk of foreign key "
@@ -1610,13 +1610,13 @@
 "parent, mais oubliez d'effacer les enfants."
 
 #. Tag: title
-#: session_api.xml:732
+#: session_api.xml:756
 #, 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:734
+#: session_api.xml:758
 #, no-c-format
 msgid ""
 "It is occasionally useful to be able to take a graph of persistent instances "
@@ -1628,7 +1628,7 @@
 "regénérer les valeurs des identifiants."
 
 #. Tag: programlisting
-#: session_api.xml:740
+#: session_api.xml:764
 #, no-c-format
 msgid ""
 "<![CDATA[//retrieve a cat from one database\n"
@@ -1647,7 +1647,7 @@
 msgstr ""
 
 #. Tag: para
-#: session_api.xml:742
+#: session_api.xml:766
 #, no-c-format
 msgid ""
 "The <literal>ReplicationMode</literal> determines how <literal>replicate()</"
@@ -1658,7 +1658,7 @@
 "données."
 
 #. Tag: para
-#: session_api.xml:749
+#: session_api.xml:773
 #, no-c-format
 msgid ""
 "<literal>ReplicationMode.IGNORE</literal> - ignore the object when there is "
@@ -1668,7 +1668,7 @@
 "ligne existante dans la base de données avec le même identifiant"
 
 #. Tag: para
-#: session_api.xml:755
+#: session_api.xml:779
 #, no-c-format
 msgid ""
 "<literal>ReplicationMode.OVERWRITE</literal> - overwrite any existing "
@@ -1678,7 +1678,7 @@
 "existante dans la base de données avec le même identifiant"
 
 #. Tag: para
-#: session_api.xml:761
+#: session_api.xml:785
 #, no-c-format
 msgid ""
 "<literal>ReplicationMode.EXCEPTION</literal> - throw an exception if there "
@@ -1688,7 +1688,7 @@
 "ligne dans la base de données avec le même identifiant"
 
 #. Tag: para
-#: session_api.xml:767
+#: session_api.xml:791
 #, no-c-format
 msgid ""
 "<literal>ReplicationMode.LATEST_VERSION</literal> - overwrite the row if its "
@@ -1700,7 +1700,7 @@
 "ignore l'objet sinon"
 
 #. Tag: para
-#: session_api.xml:775
+#: session_api.xml:799
 #, no-c-format
 msgid ""
 "Usecases for this feature include reconciling data entered into different "
@@ -1715,13 +1715,13 @@
 "ACID, et plus."
 
 #. Tag: title
-#: session_api.xml:784
+#: session_api.xml:808
 #, no-c-format
 msgid "Flushing the Session"
 msgstr "Flush de la session"
 
 #. Tag: para
-#: session_api.xml:786
+#: session_api.xml:810
 #, no-c-format
 msgid ""
 "From time to time the <literal>Session</literal> will execute the SQL "
@@ -1735,32 +1735,32 @@
 "par défaut aux points suivants :"
 
 #. Tag: para
-#: session_api.xml:795
+#: session_api.xml:819
 #, no-c-format
 msgid "before some query executions"
 msgstr "lors de certaines exécutions de requête"
 
 #. Tag: para
-#: session_api.xml:800
+#: session_api.xml:824
 #, 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:805
+#: session_api.xml:829
 #, no-c-format
 msgid "from <literal>Session.flush()</literal>"
 msgstr "lors d'un appel à <literal>Session.flush()</literal>"
 
 #. Tag: para
-#: session_api.xml:811
+#: session_api.xml:835
 #, 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:817
+#: session_api.xml:841
 #, no-c-format
 msgid ""
 "all entity insertions, in the same order the corresponding objects were "
@@ -1770,31 +1770,31 @@
 "correspondants sauvegardés par l'appel à <literal>Session.save()</literal>"
 
 #. Tag: para
-#: session_api.xml:823
+#: session_api.xml:847
 #, no-c-format
 msgid "all entity updates"
 msgstr "mise à jours des entités"
 
 #. Tag: para
-#: session_api.xml:828
+#: session_api.xml:852
 #, no-c-format
 msgid "all collection deletions"
 msgstr "suppression des collections"
 
 #. Tag: para
-#: session_api.xml:833
+#: session_api.xml:857
 #, 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:838
+#: session_api.xml:862
 #, no-c-format
 msgid "all collection insertions"
 msgstr "insertion des collections"
 
 #. Tag: para
-#: session_api.xml:843
+#: session_api.xml:867
 #, no-c-format
 msgid ""
 "all entity deletions, in the same order the corresponding objects were "
@@ -1805,7 +1805,7 @@
 "</literal>"
 
 #. Tag: para
-#: session_api.xml:850
+#: session_api.xml:874
 #, no-c-format
 msgid ""
 "(An exception is that objects using <literal>native</literal> ID generation "
@@ -1815,7 +1815,7 @@
 "literal> d'identifiants sont insérés lorsqu'ils sont sauvegardés.)"
 
 #. Tag: para
-#: session_api.xml:855
+#: session_api.xml:879
 #, no-c-format
 msgid ""
 "Except when you explicity <literal>flush()</literal>, there are absolutely "
@@ -1833,7 +1833,7 @@
 "jamais de données périmées, ni des données fausses."
 
 #. Tag: para
-#: session_api.xml:863
+#: session_api.xml:887
 #, no-c-format
 msgid ""
 "It is possible to change the default behavior so that flush occurs less "
@@ -1856,7 +1856,7 @@
 "moment (voir <xref linkend=\"transactions-optimistic-longsession\"/>)."
 
 #. Tag: programlisting
-#: session_api.xml:873
+#: session_api.xml:897
 #, no-c-format
 msgid ""
 "<![CDATA[sess = sf.openSession();\n"
@@ -1876,7 +1876,7 @@
 msgstr ""
 
 #. Tag: para
-#: session_api.xml:875
+#: session_api.xml:899
 #, no-c-format
 msgid ""
 "During flush, an exception might occur (e.g. if a DML operation violates a "
@@ -1890,13 +1890,13 @@
 "d'Hibernate, nous le traitons dans <xref linkend=\"transactions\"/>."
 
 #. Tag: title
-#: session_api.xml:884
+#: session_api.xml:908
 #, no-c-format
 msgid "Transitive persistence"
 msgstr "Persistance transitive"
 
 #. Tag: para
-#: session_api.xml:886
+#: session_api.xml:910
 #, no-c-format
 msgid ""
 "It is quite cumbersome to save, delete, or reattach individual objects, "
@@ -1908,7 +1908,7 @@
 "est une relation parent/enfant. Considérez l'exemple suivant :"
 
 #. Tag: para
-#: session_api.xml:892
+#: session_api.xml:916
 #, no-c-format
 msgid ""
 "If the children in a parent/child relationship would be value typed (e.g. a "
@@ -1932,7 +1932,7 @@
 "données."
 
 #. Tag: para
-#: session_api.xml:903
+#: session_api.xml:927
 #, no-c-format
 msgid ""
 "Now consider the same scenario with parent and child objects being entities, "
@@ -1953,7 +1953,7 @@
 "accessibilité</emphasis> par défaut."
 
 #. Tag: para
-#: session_api.xml:912
+#: session_api.xml:936
 #, no-c-format
 msgid ""
 "For each basic operation of the Hibernate session - including "
@@ -1973,26 +1973,26 @@
 "l'indiquer dans le document de mapping. Par exemple :"
 
 #. Tag: programlisting
-#: session_api.xml:921
+#: session_api.xml:945
 #, no-c-format
 msgid "<![CDATA[<one-to-one name=\"person\" cascade=\"persist\"/>]]>"
 msgstr ""
 
 #. Tag: para
-#: session_api.xml:923
+#: session_api.xml:947
 #, no-c-format
 msgid "Cascade styles my be combined:"
 msgstr "Les styles de cascade peuvent être combinés :"
 
 #. Tag: programlisting
-#: session_api.xml:927
+#: session_api.xml:951
 #, no-c-format
 msgid ""
 "<![CDATA[<one-to-one name=\"person\" cascade=\"persist,delete,lock\"/>]]>"
 msgstr ""
 
 #. Tag: para
-#: session_api.xml:929
+#: session_api.xml:953
 #, no-c-format
 msgid ""
 "You may even use <literal>cascade=\"all\"</literal> to specify that "
@@ -2006,7 +2006,7 @@
 "literal> spécifie qu'aucune opération ne sera cascadée."
 
 #. Tag: para
-#: session_api.xml:935
+#: session_api.xml:959
 #, no-c-format
 msgid ""
 "A special cascade style, <literal>delete-orphan</literal>, applies only to "
@@ -2020,13 +2020,13 @@
 "qui est supprimé de l'association."
 
 #. Tag: para
-#: session_api.xml:942
+#: session_api.xml:966
 #, no-c-format
 msgid "Recommendations:"
 msgstr "Recommandations :"
 
 #. Tag: para
-#: session_api.xml:948
+#: session_api.xml:972
 #, no-c-format
 msgid ""
 "It doesn't usually make sense to enable cascade on a <literal>&lt;many-to-"
@@ -2041,7 +2041,7 @@
 "literal>."
 
 #. Tag: para
-#: session_api.xml:956
+#: session_api.xml:980
 #, no-c-format
 msgid ""
 "If the child object's lifespan is bounded by the lifespan of the parent "
@@ -2053,7 +2053,7 @@
 "spécifiant <literal>cascade=\"all,delete-orphan\"</literal>."
 
 #. Tag: para
-#: session_api.xml:963
+#: session_api.xml:987
 #, no-c-format
 msgid ""
 "Otherwise, you might not need cascade at all. But if you think that you will "
@@ -2068,7 +2068,7 @@
 "literal>."
 
 #. Tag: para
-#: session_api.xml:971
+#: session_api.xml:995
 #, no-c-format
 msgid ""
 "Mapping an association (either a single valued association, or a collection) "
@@ -2083,7 +2083,7 @@
 "jour/suppression de l'enfant ou des enfants."
 
 #. Tag: para
-#: session_api.xml:977
+#: session_api.xml:1001
 #, no-c-format
 msgid ""
 "Futhermore, a mere reference to a child from a persistent parent will result "
@@ -2103,7 +2103,7 @@
 "opérations de cascade pour une relation parent/enfant est la suivante :"
 
 #. Tag: para
-#: session_api.xml:988
+#: session_api.xml:1012
 #, no-c-format
 msgid ""
 "If a parent is passed to <literal>persist()</literal>, all children are "
@@ -2113,7 +2113,7 @@
 "passés à <literal>persist()</literal>"
 
 #. Tag: para
-#: session_api.xml:994
+#: session_api.xml:1018
 #, no-c-format
 msgid ""
 "If a parent is passed to <literal>merge()</literal>, all children are passed "
@@ -2123,7 +2123,7 @@
 "passés à <literal>merge()</literal>"
 
 #. Tag: para
-#: session_api.xml:1000
+#: session_api.xml:1024
 #, no-c-format
 msgid ""
 "If a parent is passed to <literal>save()</literal>, <literal>update()</"
@@ -2135,7 +2135,7 @@
 "à <literal>saveOrUpdate()</literal>"
 
 #. Tag: para
-#: session_api.xml:1006
+#: session_api.xml:1030
 #, no-c-format
 msgid ""
 "If a transient or detached child becomes referenced by a persistent parent, "
@@ -2145,7 +2145,7 @@
 "il est passé à <literal>saveOrUpdate()</literal>"
 
 #. Tag: para
-#: session_api.xml:1012
+#: session_api.xml:1036
 #, no-c-format
 msgid ""
 "If a parent is deleted, all children are passed to <literal>delete()</"
@@ -2155,7 +2155,7 @@
 "literal>"
 
 #. Tag: para
-#: session_api.xml:1017
+#: session_api.xml:1041
 #, no-c-format
 msgid ""
 "If a child is dereferenced by a persistent parent, <emphasis>nothing special "
@@ -2169,7 +2169,7 @@
 "literal> soit paramétré, au quel cas l'enfant \"orphelin\" est supprimé."
 
 #. Tag: para
-#: session_api.xml:1026
+#: session_api.xml:1050
 #, no-c-format
 msgid ""
 "Finally, note that cascading of operations can be applied to an object graph "
@@ -2188,13 +2188,13 @@
 "associées atteignables lors du flush de la <literal>Session</literal>."
 
 #. Tag: title
-#: session_api.xml:1038
+#: session_api.xml:1062
 #, no-c-format
 msgid "Using metadata"
 msgstr "Utilisation des méta-données"
 
 #. Tag: para
-#: session_api.xml:1040
+#: session_api.xml:1064
 #, no-c-format
 msgid ""
 "Hibernate requires a very rich meta-level model of all entity and value "
@@ -2214,7 +2214,7 @@
 "associées)."
 
 #. Tag: para
-#: session_api.xml:1047
+#: session_api.xml:1071
 #, no-c-format
 msgid ""
 "Hibernate exposes metadata via the <literal>ClassMetadata</literal> and "
@@ -2228,7 +2228,7 @@
 "peuvent être obtenues à partir de la <literal>SessionFactory</literal>."
 
 #. Tag: programlisting
-#: session_api.xml:1054
+#: session_api.xml:1078
 #, 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	2008-08-14 15:28:13 UTC (rev 15066)
+++ core/trunk/documentation/manual/src/main/docbook/fr-FR/content/toolset_guide.po	2008-08-14 15:35:40 UTC (rev 15067)
@@ -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: 2008-08-14 15:28+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,13 +11,13 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: toolset_guide.xml:5
+#: toolset_guide.xml:29
 #, no-c-format
 msgid "Toolset Guide"
 msgstr "Guide des outils"
 
 #. Tag: para
-#: toolset_guide.xml:7
+#: toolset_guide.xml:31
 #, no-c-format
 msgid ""
 "Roundtrip engineering with Hibernate is possible using a set of Eclipse "
@@ -28,7 +28,7 @@
 "utilisant Hibernate."
 
 #. Tag: para
-#: toolset_guide.xml:12
+#: toolset_guide.xml:36
 #, no-c-format
 msgid ""
 "The <emphasis>Hibernate Tools</emphasis> currently include plugins for the "
@@ -40,7 +40,7 @@
 "données existantes :"
 
 #. Tag: para
-#: toolset_guide.xml:18
+#: toolset_guide.xml:42
 #, no-c-format
 msgid ""
 "<emphasis>Mapping Editor:</emphasis> An editor for Hibernate XML mapping "
@@ -55,7 +55,7 @@
 "qu'un éditeurXML normal."
 
 #. Tag: para
-#: toolset_guide.xml:23
+#: toolset_guide.xml:47
 #, no-c-format
 msgid ""
 "<emphasis>Console:</emphasis> The console is a new view in Eclipse. In "
@@ -71,7 +71,7 @@
 "votre base de données et de parcourir les résultats directement dans Eclipse."
 
 #. Tag: para
-#: toolset_guide.xml:30
+#: toolset_guide.xml:54
 #, no-c-format
 msgid ""
 "<emphasis>Development Wizards:</emphasis> Several wizards are provided with "
@@ -89,13 +89,13 @@
 "L'assistant d'ingénierie inverse supporte les modèles utilisateur."
 
 #. Tag: emphasis
-#: toolset_guide.xml:38
+#: toolset_guide.xml:62
 #, no-c-format
 msgid "Ant Tasks:"
 msgstr "Tâches Ant :"
 
 #. Tag: para
-#: toolset_guide.xml:43
+#: toolset_guide.xml:67
 #, no-c-format
 msgid ""
 "Please refer to the <emphasis>Hibernate Tools</emphasis> package and it's "
@@ -105,7 +105,7 @@
 "documentation pour plus d'informations."
 
 #. Tag: para
-#: toolset_guide.xml:48
+#: toolset_guide.xml:72
 #, no-c-format
 msgid ""
 "However, the Hibernate main package comes bundled with an integrated tool "
@@ -118,13 +118,13 @@
 "<literal>hbm2ddl</literal>."
 
 #. Tag: title
-#: toolset_guide.xml:55
+#: toolset_guide.xml:79
 #, no-c-format
 msgid "Automatic schema generation"
 msgstr "Génération automatique du schéma"
 
 #. Tag: para
-#: toolset_guide.xml:57
+#: toolset_guide.xml:81
 #, no-c-format
 msgid ""
 "DDL may be generated from your mapping files by a Hibernate utility. The "
@@ -139,7 +139,7 @@
 "générateurs d'identifiant mappés."
 
 #. Tag: para
-#: toolset_guide.xml:64
+#: toolset_guide.xml:88
 #, no-c-format
 msgid ""
 "You <emphasis>must</emphasis> specify a SQL <literal>Dialect</literal> via "
@@ -151,7 +151,7 @@
 "de cet outils, puisque la DDL est fortement dépendante de la base de données."
 
 #. Tag: para
-#: toolset_guide.xml:70
+#: toolset_guide.xml:94
 #, no-c-format
 msgid "First, customize your mapping files to improve the generated schema."
 msgstr ""
@@ -159,13 +159,13 @@
 "généré."
 
 #. Tag: title
-#: toolset_guide.xml:75
+#: toolset_guide.xml:99
 #, no-c-format
 msgid "Customizing the schema"
 msgstr "Personnaliser le schéma"
 
 #. Tag: para
-#: toolset_guide.xml:77
+#: toolset_guide.xml:101
 #, no-c-format
 msgid ""
 "Many Hibernate mapping elements define optional attributes named "
@@ -179,19 +179,19 @@
 "précision,... d'une colonne avec ces attributs."
 
 #. 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
+#: toolset_guide.xml:111
 #, no-c-format
 msgid ""
 "Some tags also accept a <literal>not-null</literal> attribute (for "
@@ -205,14 +205,14 @@
 "contrainte de colonne <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\" "
@@ -220,7 +220,7 @@
 msgstr ""
 
 #. Tag: para
-#: toolset_guide.xml:97
+#: toolset_guide.xml:121
 #, no-c-format
 msgid ""
 "A <literal>unique-key</literal> attribute may be used to group columns in a "
@@ -236,7 +236,7 @@
 "juste à grouper les colonnes dans le fichier de mapping."
 
 #. Tag: programlisting
-#: toolset_guide.xml:105
+#: toolset_guide.xml:129
 #, no-c-format
 msgid ""
 "<![CDATA[<many-to-one name=\"org\" column=\"orgId\" unique-key="
@@ -245,7 +245,7 @@
 msgstr ""
 
 #. Tag: para
-#: toolset_guide.xml:107
+#: toolset_guide.xml:131
 #, no-c-format
 msgid ""
 "An <literal>index</literal> attribute specifies the name of an index that "
@@ -257,7 +257,7 @@
 "groupées dans un même index, en spécifiant le même nom d'index."
 
 #. Tag: programlisting
-#: toolset_guide.xml:113
+#: toolset_guide.xml:137
 #, no-c-format
 msgid ""
 "<![CDATA[<property name=\"lastName\" index=\"CustName\"/>\n"
@@ -265,7 +265,7 @@
 msgstr ""
 
 #. Tag: para
-#: toolset_guide.xml:115
+#: toolset_guide.xml:139
 #, no-c-format
 msgid ""
 "A <literal>foreign-key</literal> attribute may be used to override the name "
@@ -275,7 +275,7 @@
 "le nom des clés étrangères générées."
 
 #. 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\"/"
@@ -283,7 +283,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> "
@@ -293,7 +293,7 @@
 "column&gt;</literal>. Ceci est utile pour les type multi-colonnes:"
 
 #. Tag: programlisting
-#: toolset_guide.xml:127
+#: toolset_guide.xml:151
 #, no-c-format
 msgid ""
 "<![CDATA[<property name=\"name\" type=\"my.customtypes.Name\"/>\n"
@@ -306,7 +306,7 @@
 msgstr ""
 
 #. Tag: para
-#: toolset_guide.xml:129
+#: toolset_guide.xml:153
 #, no-c-format
 msgid ""
 "The <literal>default</literal> attribute lets you specify a default value "
@@ -319,7 +319,7 @@
 "mappée)."
 
 #. Tag: programlisting
-#: toolset_guide.xml:135
+#: toolset_guide.xml:159
 #, no-c-format
 msgid ""
 "<![CDATA[<property name=\"credits\" type=\"integer\" insert=\"false\">\n"
@@ -328,7 +328,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"
@@ -337,7 +337,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 "
@@ -347,7 +347,7 @@
 "mapping par défaut du type Hibernate vers un type SQL."
 
 #. Tag: programlisting
-#: toolset_guide.xml:144
+#: toolset_guide.xml:168
 #, no-c-format
 msgid ""
 "<![CDATA[<property name=\"balance\" type=\"float\">\n"
@@ -356,7 +356,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 "
@@ -366,7 +366,7 @@
 "vérification."
 
 #. Tag: programlisting
-#: toolset_guide.xml:150
+#: toolset_guide.xml:174
 #, no-c-format
 msgid ""
 "<![CDATA[<property name=\"foo\" type=\"integer\">\n"
@@ -375,7 +375,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"
@@ -385,151 +385,151 @@
 msgstr ""
 
 #. Tag: title
-#: toolset_guide.xml:156
+#: toolset_guide.xml:180
 #, no-c-format
 msgid "Summary"
 msgstr "Summary"
 
 #. Tag: entry
-#: toolset_guide.xml:163
+#: toolset_guide.xml:187
 #, no-c-format
 msgid "Attribute"
 msgstr "Attribut"
 
 #. Tag: entry
-#: toolset_guide.xml:164
+#: toolset_guide.xml:188
 #, no-c-format
 msgid "Values"
 msgstr "Valeur"
 
 #. Tag: entry
-#: toolset_guide.xml:165
+#: toolset_guide.xml:189
 #, no-c-format
 msgid "Interpretation"
 msgstr "Interprétation"
 
 #. Tag: literal
-#: toolset_guide.xml:170
+#: toolset_guide.xml:194
 #, no-c-format
 msgid "length"
 msgstr "length"
 
 #. Tag: entry
-#: toolset_guide.xml:171 toolset_guide.xml:176 toolset_guide.xml:181
+#: toolset_guide.xml:195 toolset_guide.xml:200 toolset_guide.xml:205
 #, no-c-format
 msgid "number"
 msgstr "numérique"
 
 #. Tag: entry
-#: toolset_guide.xml:172
+#: toolset_guide.xml:196
 #, no-c-format
 msgid "column length"
 msgstr "taille d'une colonne"
 
 #. Tag: literal
-#: toolset_guide.xml:175
+#: toolset_guide.xml:199
 #, no-c-format
 msgid "precision"
 msgstr "precision"
 
 #. Tag: entry
-#: toolset_guide.xml:177
+#: toolset_guide.xml:201
 #, no-c-format
 msgid "column decimal precision"
 msgstr "précision décimale de la colonne"
 
 #. Tag: literal
-#: toolset_guide.xml:180
+#: toolset_guide.xml:204
 #, no-c-format
 msgid "scale"
 msgstr "scale"
 
 #. Tag: entry
-#: toolset_guide.xml:182
+#: toolset_guide.xml:206
 #, no-c-format
 msgid "column decimal scale"
 msgstr "scale décimale de la colonne"
 
 #. Tag: literal
-#: toolset_guide.xml:185
+#: toolset_guide.xml:209
 #, no-c-format
 msgid "not-null"
 msgstr "not-null"
 
 #. Tag: literal
-#: toolset_guide.xml:186 toolset_guide.xml:191
+#: toolset_guide.xml:210 toolset_guide.xml:215
 #, no-c-format
 msgid "true|false"
 msgstr "true|false"
 
 #. Tag: entry
-#: toolset_guide.xml:187
+#: toolset_guide.xml:211
 #, no-c-format
 msgid "specfies that the column should be non-nullable"
 msgstr "spécifie que la colonne doit être non-nulle"
 
 #. Tag: literal
-#: toolset_guide.xml:190
+#: toolset_guide.xml:214
 #, no-c-format
 msgid "unique"
 msgstr "unique"
 
 #. Tag: entry
-#: toolset_guide.xml:192
+#: toolset_guide.xml:216
 #, 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:195
+#: toolset_guide.xml:219
 #, no-c-format
 msgid "index"
 msgstr "index"
 
 #. Tag: literal
-#: toolset_guide.xml:196
+#: toolset_guide.xml:220
 #, no-c-format
 msgid "index_name"
 msgstr "index_name"
 
 #. Tag: entry
-#: toolset_guide.xml:197
+#: toolset_guide.xml:221
 #, 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:200
+#: toolset_guide.xml:224
 #, no-c-format
 msgid "unique-key"
 msgstr "unique-key"
 
 #. Tag: literal
-#: toolset_guide.xml:201
+#: toolset_guide.xml:225
 #, no-c-format
 msgid "unique_key_name"
 msgstr "unique_key_name"
 
 #. Tag: entry
-#: toolset_guide.xml:202
+#: toolset_guide.xml:226
 #, 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:205
+#: toolset_guide.xml:229
 #, no-c-format
 msgid "foreign-key"
 msgstr "foreign-key"
 
 #. Tag: literal
-#: toolset_guide.xml:206
+#: toolset_guide.xml:230
 #, no-c-format
 msgid "foreign_key_name"
 msgstr "foreign_key_name"
 
 #. Tag: entry
-#: toolset_guide.xml:207
+#: toolset_guide.xml:231
 #, fuzzy, no-c-format
 msgid ""
 "specifies the name of the foreign key constraint generated for an "
@@ -545,19 +545,19 @@
 "6/>."
 
 #. Tag: literal
-#: toolset_guide.xml:217
+#: toolset_guide.xml:241
 #, no-c-format
 msgid "sql-type"
 msgstr "sql-type"
 
 #. Tag: literal
-#: toolset_guide.xml:218
+#: toolset_guide.xml:242
 #, no-c-format
 msgid "SQL column type"
 msgstr "SQL column_type"
 
 #. Tag: entry
-#: toolset_guide.xml:219
+#: toolset_guide.xml:243
 #, fuzzy, no-c-format
 msgid ""
 "overrides the default column type (attribute of <literal>&lt;column&gt;</"
@@ -567,13 +567,13 @@
 "uniquement)"
 
 #. Tag: literal
-#: toolset_guide.xml:225
+#: toolset_guide.xml:249
 #, no-c-format
 msgid "default"
 msgstr "default"
 
 #. Tag: entry
-#: toolset_guide.xml:226 toolset_guide.xml:233
+#: toolset_guide.xml:250 toolset_guide.xml:257
 #, fuzzy, no-c-format
 msgid "SQL expression"
 msgstr ""
@@ -583,25 +583,25 @@
 "SQL expression"
 
 #. Tag: entry
-#: toolset_guide.xml:227
+#: toolset_guide.xml:251
 #, 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:232
+#: toolset_guide.xml:256
 #, no-c-format
 msgid "check"
 msgstr "check"
 
 #. Tag: entry
-#: toolset_guide.xml:234
+#: toolset_guide.xml:258
 #, 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:242
+#: toolset_guide.xml:266
 #, no-c-format
 msgid ""
 "The <literal>&lt;comment&gt;</literal> element allows you to specify "
@@ -611,7 +611,7 @@
 "commentaire pour le schéma généré."
 
 #. Tag: programlisting
-#: toolset_guide.xml:247
+#: toolset_guide.xml:271
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Customer\" table=\"CurCust\">\n"
@@ -621,7 +621,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: toolset_guide.xml:249
+#: toolset_guide.xml:273
 #, no-c-format
 msgid ""
 "<![CDATA[<property name=\"balance\">\n"
@@ -632,7 +632,7 @@
 msgstr ""
 
 #. Tag: para
-#: toolset_guide.xml:251
+#: toolset_guide.xml:275
 #, no-c-format
 msgid ""
 "This results in a <literal>comment on table</literal> or <literal>comment on "
@@ -642,13 +642,13 @@
 "<literal>comment on column</literal> dans la DDL générée (où supportée)."
 
 #. Tag: title
-#: toolset_guide.xml:260
+#: toolset_guide.xml:284
 #, no-c-format
 msgid "Running the tool"
 msgstr "Exécuter l'outil"
 
 #. Tag: para
-#: toolset_guide.xml:262
+#: toolset_guide.xml:286
 #, no-c-format
 msgid ""
 "The <literal>SchemaExport</literal> tool writes a DDL script to standard out "
@@ -658,7 +658,7 @@
 "standard et/ou exécute les ordres DDL."
 
 #. Tag: para
-#: toolset_guide.xml:267
+#: toolset_guide.xml:291
 #, no-c-format
 msgid ""
 "<literal>java -cp </literal><emphasis>hibernate_classpaths</emphasis> "
@@ -667,32 +667,32 @@
 msgstr ""
 
 #. Tag: title
-#: toolset_guide.xml:273
+#: toolset_guide.xml:297
 #, 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:279 toolset_guide.xml:429 toolset_guide.xml:498
+#: toolset_guide.xml:303 toolset_guide.xml:453 toolset_guide.xml:522
 #, 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:304 toolset_guide.xml:391 toolset_guide.xml:454
+#: toolset_guide.xml:523
 #, no-c-format
 msgid "Description"
 msgstr "Description"
 
 #. Tag: literal
-#: toolset_guide.xml:285 toolset_guide.xml:435
+#: toolset_guide.xml:309 toolset_guide.xml:459
 #, no-c-format
 msgid "--quiet"
 msgstr "--quiet"
 
 #. Tag: entry
-#: toolset_guide.xml:286 toolset_guide.xml:436
+#: toolset_guide.xml:310 toolset_guide.xml:460
 #, fuzzy, no-c-format
 msgid "don't output the script to stdout"
 msgstr ""
@@ -702,85 +702,85 @@
 "ne pas écrire vers la sortie standard"
 
 #. Tag: literal
-#: toolset_guide.xml:289
+#: toolset_guide.xml:313
 #, no-c-format
 msgid "--drop"
 msgstr "--drop"
 
 #. Tag: entry
-#: toolset_guide.xml:290
+#: toolset_guide.xml:314
 #, no-c-format
 msgid "only drop the tables"
 msgstr "supprime seuleument les tables"
 
 #. Tag: literal
-#: toolset_guide.xml:293
+#: toolset_guide.xml:317
 #, no-c-format
 msgid "--create"
 msgstr "--create"
 
 #. Tag: entry
-#: toolset_guide.xml:294
+#: toolset_guide.xml:318
 #, no-c-format
 msgid "only create the tables"
 msgstr "ne créé que les tables"
 
 #. Tag: literal
-#: toolset_guide.xml:297 toolset_guide.xml:439
+#: toolset_guide.xml:321 toolset_guide.xml:463
 #, no-c-format
 msgid "--text"
 msgstr "--text"
 
 #. Tag: entry
-#: toolset_guide.xml:298
+#: toolset_guide.xml:322
 #, no-c-format
 msgid "don't export to the database"
 msgstr "ne pas exécuter sur la base de données"
 
 #. Tag: literal
-#: toolset_guide.xml:301
+#: toolset_guide.xml:325
 #, no-c-format
 msgid "--output=my_schema.ddl"
 msgstr "--output=my_schema.ddl"
 
 #. Tag: entry
-#: toolset_guide.xml:302
+#: toolset_guide.xml:326
 #, no-c-format
 msgid "output the ddl script to a file"
 msgstr "écrit le script ddl vers un fichier"
 
 #. Tag: literal
-#: toolset_guide.xml:305 toolset_guide.xml:443 toolset_guide.xml:504
+#: toolset_guide.xml:329 toolset_guide.xml:467 toolset_guide.xml:528
 #, 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:330 toolset_guide.xml:468 toolset_guide.xml:529
 #, fuzzy, no-c-format
 msgid "select a <literal>NamingStrategy</literal>"
 msgstr "dans <literal>hibernate.properties</literal>"
 
 #. Tag: literal
-#: toolset_guide.xml:309 toolset_guide.xml:451 toolset_guide.xml:512
+#: toolset_guide.xml:333 toolset_guide.xml:475 toolset_guide.xml:536
 #, no-c-format
 msgid "--config=hibernate.cfg.xml"
 msgstr "--config=hibernate.cfg.xml"
 
 #. Tag: entry
-#: toolset_guide.xml:310
+#: toolset_guide.xml:334
 #, 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:313 toolset_guide.xml:447 toolset_guide.xml:508
+#: toolset_guide.xml:337 toolset_guide.xml:471 toolset_guide.xml:532
 #, 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:338 toolset_guide.xml:472 toolset_guide.xml:533
 #, fuzzy, no-c-format
 msgid "read database properties from a file"
 msgstr ""
@@ -792,31 +792,31 @@
 "lit les propriétés dela base de données depuis un fichier de propriétés"
 
 #. Tag: literal
-#: toolset_guide.xml:317
+#: toolset_guide.xml:341
 #, no-c-format
 msgid "--format"
 msgstr "--format"
 
 #. Tag: entry
-#: toolset_guide.xml:318
+#: toolset_guide.xml:342
 #, 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:321
+#: toolset_guide.xml:345
 #, no-c-format
 msgid "--delimiter=;"
 msgstr "--delimiter=x"
 
 #. Tag: entry
-#: toolset_guide.xml:322
+#: toolset_guide.xml:346
 #, 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:328
+#: toolset_guide.xml:352
 #, no-c-format
 msgid "You may even embed <literal>SchemaExport</literal> in your application:"
 msgstr ""
@@ -824,7 +824,7 @@
 "application :"
 
 #. Tag: programlisting
-#: toolset_guide.xml:332
+#: toolset_guide.xml:356
 #, no-c-format
 msgid ""
 "<![CDATA[Configuration cfg = ....;\n"
@@ -832,19 +832,19 @@
 msgstr ""
 
 #. Tag: title
-#: toolset_guide.xml:337
+#: toolset_guide.xml:361
 #, no-c-format
 msgid "Properties"
 msgstr "Propriétés"
 
 #. Tag: para
-#: toolset_guide.xml:339
+#: toolset_guide.xml:363
 #, no-c-format
 msgid "Database properties may be specified"
 msgstr "Les propriétés de la base de données peuvent être spécifiées"
 
 #. Tag: para
-#: toolset_guide.xml:345
+#: toolset_guide.xml:369
 #, no-c-format
 msgid ""
 "as system properties with <literal>-D</literal><emphasis>&lt;property&gt;</"
@@ -854,104 +854,104 @@
 "</emphasis>"
 
 #. Tag: para
-#: toolset_guide.xml:348
+#: toolset_guide.xml:372
 #, no-c-format
 msgid "in <literal>hibernate.properties</literal>"
 msgstr "dans <literal>hibernate.properties</literal>"
 
 #. Tag: para
-#: toolset_guide.xml:351
+#: toolset_guide.xml:375
 #, 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:355
+#: toolset_guide.xml:379
 #, no-c-format
 msgid "The needed properties are:"
 msgstr "Les propriétés nécessaires sont :"
 
 #. Tag: title
-#: toolset_guide.xml:360
+#: toolset_guide.xml:384
 #, no-c-format
 msgid "SchemaExport Connection Properties"
 msgstr "SchemaExport Connection Properties"
 
 #. Tag: entry
-#: toolset_guide.xml:366
+#: toolset_guide.xml:390
 #, no-c-format
 msgid "Property Name"
 msgstr "Nom de la propriété"
 
 #. Tag: literal
-#: toolset_guide.xml:372
+#: toolset_guide.xml:396
 #, no-c-format
 msgid "hibernate.connection.driver_class"
 msgstr "hibernate.connection.driver_class"
 
 #. Tag: entry
-#: toolset_guide.xml:373
+#: toolset_guide.xml:397
 #, no-c-format
 msgid "jdbc driver class"
 msgstr "classe du driver JDBC"
 
 #. Tag: literal
-#: toolset_guide.xml:376
+#: toolset_guide.xml:400
 #, no-c-format
 msgid "hibernate.connection.url"
 msgstr "hibernate.connection.url"
 
 #. Tag: entry
-#: toolset_guide.xml:377
+#: toolset_guide.xml:401
 #, no-c-format
 msgid "jdbc url"
 msgstr "URL JDBC"
 
 #. Tag: literal
-#: toolset_guide.xml:380
+#: toolset_guide.xml:404
 #, no-c-format
 msgid "hibernate.connection.username"
 msgstr "hibernate.connection.username"
 
 #. Tag: entry
-#: toolset_guide.xml:381
+#: toolset_guide.xml:405
 #, no-c-format
 msgid "database user"
 msgstr "utilisateur de la base de données"
 
 #. Tag: literal
-#: toolset_guide.xml:384
+#: toolset_guide.xml:408
 #, no-c-format
 msgid "hibernate.connection.password"
 msgstr "hibernate.connection.password"
 
 #. Tag: entry
-#: toolset_guide.xml:385
+#: toolset_guide.xml:409
 #, no-c-format
 msgid "user password"
 msgstr "mot de passe de l'utilisateur"
 
 #. Tag: literal
-#: toolset_guide.xml:388
+#: toolset_guide.xml:412
 #, no-c-format
 msgid "hibernate.dialect"
 msgstr "hibernate.dialect"
 
 #. Tag: entry
-#: toolset_guide.xml:389
+#: toolset_guide.xml:413
 #, no-c-format
 msgid "dialect"
 msgstr "dialecte"
 
 #. Tag: title
-#: toolset_guide.xml:398
+#: toolset_guide.xml:422
 #, no-c-format
 msgid "Using Ant"
 msgstr "Utiliser Ant"
 
 #. Tag: para
-#: toolset_guide.xml:400
+#: toolset_guide.xml:424
 #, no-c-format
 msgid ""
 "You can call <literal>SchemaExport</literal> from your Ant build script:"
@@ -960,7 +960,7 @@
 "construction Ant :"
 
 #. Tag: programlisting
-#: toolset_guide.xml:404
+#: toolset_guide.xml:428
 #, no-c-format
 msgid ""
 "<![CDATA[<target name=\"schemaexport\">\n"
@@ -983,13 +983,13 @@
 msgstr ""
 
 #. Tag: title
-#: toolset_guide.xml:409
+#: toolset_guide.xml:433
 #, no-c-format
 msgid "Incremental schema updates"
 msgstr "Mises à jour incrémentales du schéma"
 
 #. Tag: para
-#: toolset_guide.xml:411
+#: toolset_guide.xml:435
 #, no-c-format
 msgid ""
 "The <literal>SchemaUpdate</literal> tool will update an existing schema with "
@@ -1003,7 +1003,7 @@
 "ne fonctionnera donc pas avec tous les drivers JDBC."
 
 #. Tag: para
-#: toolset_guide.xml:417
+#: toolset_guide.xml:441
 #, no-c-format
 msgid ""
 "<literal>java -cp </literal><emphasis>hibernate_classpaths</emphasis> "
@@ -1012,19 +1012,19 @@
 msgstr ""
 
 #. Tag: title
-#: toolset_guide.xml:423
+#: toolset_guide.xml:447
 #, no-c-format
 msgid "<literal>SchemaUpdate</literal> Command Line Options"
 msgstr "<literal>SchemaUpdate</literal> Options de ligne de commande"
 
 #. Tag: entry
-#: toolset_guide.xml:440
+#: toolset_guide.xml:464
 #, no-c-format
 msgid "don't export the script to the database"
 msgstr "ne pas exporter vers la base de données"
 
 #. Tag: entry
-#: toolset_guide.xml:452 toolset_guide.xml:513
+#: toolset_guide.xml:476 toolset_guide.xml:537
 #, fuzzy, no-c-format
 msgid "specify a <literal>.cfg.xml</literal> file"
 msgstr ""
@@ -1034,14 +1034,14 @@
 "indique un fichier <placeholder-1/>"
 
 #. Tag: para
-#: toolset_guide.xml:458
+#: toolset_guide.xml:482
 #, no-c-format
 msgid "You may embed <literal>SchemaUpdate</literal> in your application:"
 msgstr ""
 "Vous pouvez intégrer <literal>SchemaUpdate</literal> dans votre application :"
 
 #. Tag: programlisting
-#: toolset_guide.xml:462
+#: toolset_guide.xml:486
 #, no-c-format
 msgid ""
 "<![CDATA[Configuration cfg = ....;\n"
@@ -1049,20 +1049,20 @@
 msgstr ""
 
 #. Tag: title
-#: toolset_guide.xml:467
+#: toolset_guide.xml:491
 #, 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:469
+#: toolset_guide.xml:493
 #, 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:473
+#: toolset_guide.xml:497
 #, no-c-format
 msgid ""
 "<![CDATA[<target name=\"schemaupdate\">\n"
@@ -1081,13 +1081,13 @@
 msgstr ""
 
 #. Tag: title
-#: toolset_guide.xml:478
+#: toolset_guide.xml:502
 #, no-c-format
 msgid "Schema validation"
 msgstr "Validation du schéma"
 
 #. Tag: para
-#: toolset_guide.xml:480
+#: toolset_guide.xml:504
 #, no-c-format
 msgid ""
 "The <literal>SchemaValidator</literal> tool will validate that the existing "
@@ -1103,7 +1103,7 @@
 "utile pour tester."
 
 #. Tag: para
-#: toolset_guide.xml:486
+#: toolset_guide.xml:510
 #, no-c-format
 msgid ""
 "<literal>java -cp </literal><emphasis>hibernate_classpaths</emphasis> "
@@ -1112,13 +1112,13 @@
 msgstr ""
 
 #. Tag: title
-#: toolset_guide.xml:492
+#: toolset_guide.xml:516
 #, no-c-format
 msgid "<literal>SchemaValidator</literal> Command Line Options"
 msgstr "<literal>SchemaValidator</literal> Options de ligne de commande"
 
 #. Tag: para
-#: toolset_guide.xml:519
+#: toolset_guide.xml:543
 #, no-c-format
 msgid "You may embed <literal>SchemaValidator</literal> in your application:"
 msgstr ""
@@ -1126,7 +1126,7 @@
 "application:"
 
 #. Tag: programlisting
-#: toolset_guide.xml:523
+#: toolset_guide.xml:547
 #, no-c-format
 msgid ""
 "<![CDATA[Configuration cfg = ....;\n"
@@ -1134,20 +1134,20 @@
 msgstr ""
 
 #. Tag: title
-#: toolset_guide.xml:528
+#: toolset_guide.xml:552
 #, no-c-format
 msgid "Using Ant for schema validation"
 msgstr "Utiliser Ant pour la validation du Schéma"
 
 #. Tag: para
-#: toolset_guide.xml:530
+#: toolset_guide.xml:554
 #, 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:534
+#: toolset_guide.xml:558
 #, no-c-format
 msgid ""
 "<![CDATA[<target name=\"schemavalidate\">\n"

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	2008-08-14 15:28:13 UTC (rev 15066)
+++ core/trunk/documentation/manual/src/main/docbook/fr-FR/content/transactions.po	2008-08-14 15:35:40 UTC (rev 15067)
@@ -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: 2008-08-14 15:28+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,13 +11,13 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: transactions.xml:5
+#: transactions.xml:29
 #, no-c-format
 msgid "Transactions And Concurrency"
 msgstr "Transactions et accès concurrents"
 
 #. Tag: para
-#: transactions.xml:7
+#: transactions.xml:31
 #, no-c-format
 msgid ""
 "The most important point about Hibernate and concurrency control is that it "
@@ -34,7 +34,7 @@
 "transaction de la base de données que vous utilisez."
 
 #. Tag: para
-#: transactions.xml:14
+#: transactions.xml:38
 #, no-c-format
 msgid ""
 "Hibernate does not lock objects in memory. Your application can expect the "
@@ -52,7 +52,7 @@
 "de valeurs scalaires)."
 
 #. Tag: para
-#: transactions.xml:22
+#: transactions.xml:46
 #, no-c-format
 msgid ""
 "In addition to versioning for automatic optimistic concurrency control, "
@@ -67,7 +67,7 @@
 "plus tard dans ce chapitre."
 
 #. Tag: para
-#: transactions.xml:29
+#: transactions.xml:53
 #, no-c-format
 msgid ""
 "We start the discussion of concurrency control in Hibernate with the "
@@ -82,13 +82,13 @@
 "transactions applicatives."
 
 #. Tag: title
-#: transactions.xml:36
+#: transactions.xml:60
 #, no-c-format
 msgid "Session and transaction scopes"
 msgstr "Gestion de session et délimitation de transactions"
 
 #. Tag: para
-#: transactions.xml:38
+#: transactions.xml:62
 #, no-c-format
 msgid ""
 "A <literal>SessionFactory</literal> is an expensive-to-create, threadsafe "
@@ -103,7 +103,7 @@
 "l'application, et être partagé par tous les threads d'une application."
 
 #. Tag: para
-#: transactions.xml:44
+#: transactions.xml:68
 #, no-c-format
 msgid ""
 "A <literal>Session</literal> is an inexpensive, non-threadsafe object that "
@@ -121,7 +121,7 @@
 "nécessaire."
 
 #. Tag: para
-#: transactions.xml:52
+#: transactions.xml:76
 #, no-c-format
 msgid ""
 "To complete this picture you also have to think about database transactions. "
@@ -141,7 +141,7 @@
 "ce que l'unité de travail soit achevée."
 
 #. Tag: para
-#: transactions.xml:61
+#: transactions.xml:85
 #, no-c-format
 msgid ""
 "What is the scope of a unit of work? Can a single Hibernate "
@@ -158,13 +158,13 @@
 "transactions à la base de données?"
 
 #. Tag: title
-#: transactions.xml:69
+#: transactions.xml:93
 #, no-c-format
 msgid "Unit of work"
 msgstr "Unité de travail"
 
 #. Tag: para
-#: transactions.xml:71
+#: transactions.xml:95
 #, no-c-format
 msgid ""
 "First, don't use the <emphasis>session-per-operation</emphasis> antipattern, "
@@ -203,12 +203,12 @@
 "faire évoluer."
 
 #. Tag: para
-#: transactions.xml:87
-#, no-c-format
+#: transactions.xml:111
+#, 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 "
@@ -233,13 +233,13 @@
 "majorité des applications."
 
 #. Tag: para
-#: transactions.xml:99
-#, no-c-format
+#: transactions.xml:123
+#, 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 "
+"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 "
@@ -263,7 +263,7 @@
 "facilité l'utilisation et la portabilité du code."
 
 #. Tag: para
-#: transactions.xml:112
+#: transactions.xml:136
 #, no-c-format
 msgid ""
 "Your application code can access a \"current session\" to process the "
@@ -282,7 +282,7 @@
 "\"architecture-current-session\"/>."
 
 #. Tag: para
-#: transactions.xml:120
+#: transactions.xml:144
 #, no-c-format
 msgid ""
 "Sometimes it is convenient to extend the scope of a <literal>Session</"
@@ -309,13 +309,13 @@
 "emphasis> pattern.."
 
 #. Tag: title
-#: transactions.xml:135
+#: transactions.xml:159
 #, no-c-format
 msgid "Long conversations"
 msgstr "Longue conversation"
 
 #. Tag: para
-#: transactions.xml:137
+#: transactions.xml:161
 #, no-c-format
 msgid ""
 "The session-per-request pattern is not the only useful concept you can use "
@@ -333,7 +333,7 @@
 "Considérez l'exemple suivant:"
 
 #. Tag: para
-#: transactions.xml:147
+#: transactions.xml:171
 #, no-c-format
 msgid ""
 "The first screen of a dialog opens, the data seen by the user has been "
@@ -345,7 +345,7 @@
 "transaction de base de données. L'usager est libre de modifier ces objets."
 
 #. Tag: para
-#: transactions.xml:154
+#: transactions.xml:178
 #, no-c-format
 msgid ""
 "The user clicks \"Save\" after 5 minutes and expects his modifications to be "
@@ -358,7 +358,7 @@
 "produite durant ce laps de temps."
 
 #. Tag: para
-#: transactions.xml:162
+#: transactions.xml:186
 #, no-c-format
 msgid ""
 "We call this unit of work, from the point of view of the user, a long "
@@ -372,7 +372,7 @@
 "application."
 
 #. Tag: para
-#: transactions.xml:168
+#: transactions.xml:192
 #, no-c-format
 msgid ""
 "A first naive implementation might keep the <literal>Session</literal> and "
@@ -391,11 +391,11 @@
 "de gérer un grand nombre d'usagers concurrents."
 
 #. Tag: para
-#: transactions.xml:176
-#, no-c-format
+#: transactions.xml:200
+#, 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 "
+"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 "
@@ -415,12 +415,12 @@
 "certaines fonctionnalités d'Hibernate:"
 
 #. Tag: para
-#: transactions.xml:189
-#, no-c-format
+#: transactions.xml:213
+#, 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 "
+"concurrent modification occurred during user think time. Usually we only "
 "check at the end of the conversation."
 msgstr ""
 "<emphasis>Versionnage Automatique</emphasis> - Hibernate peut gérer "
@@ -429,7 +429,7 @@
 "d'un usager."
 
 #. Tag: para
-#: transactions.xml:197
+#: transactions.xml:221
 #, no-c-format
 msgid ""
 "<emphasis>Detached Objects</emphasis> - If you decide to use the already "
@@ -449,8 +449,8 @@
 "automatique est utilisé afin d'isoler les modifications concurrentes."
 
 #. Tag: para
-#: transactions.xml:207
-#, no-c-format
+#: transactions.xml:231
+#, fuzzy, no-c-format
 msgid ""
 "<emphasis>Extended (or Long) Session</emphasis> - The Hibernate "
 "<literal>Session</literal> may be disconnected from the underlying JDBC "
@@ -459,7 +459,7 @@
 "<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."
+"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,7 +470,7 @@
 "automatique est utilisé afin d'isoler les modifications concurrentes."
 
 #. Tag: para
-#: transactions.xml:220
+#: transactions.xml:244
 #, no-c-format
 msgid ""
 "Both <emphasis>session-per-request-with-detached-objects</emphasis> and "
@@ -485,13 +485,13 @@
 "section au sujet du contrôle optimiste de concurrence."
 
 #. Tag: title
-#: transactions.xml:229
+#: transactions.xml:253
 #, no-c-format
 msgid "Considering object identity"
 msgstr "L'identité des objets"
 
 #. Tag: para
-#: transactions.xml:231
+#: transactions.xml:255
 #, no-c-format
 msgid ""
 "An application may concurrently access the same persistent state in two "
@@ -506,31 +506,31 @@
 "donc deux notions de l'identité d'un objet:"
 
 #. Tag: term
-#: transactions.xml:240
+#: transactions.xml:264
 #, no-c-format
 msgid "Database Identity"
 msgstr "Identité BD"
 
 #. Tag: literal
-#: transactions.xml:243
+#: transactions.xml:267
 #, no-c-format
 msgid "foo.getId().equals( bar.getId() )"
 msgstr "foo.getId().equals( bar.getId() )"
 
 #. Tag: term
-#: transactions.xml:248
+#: transactions.xml:272
 #, no-c-format
 msgid "JVM Identity"
 msgstr "Identité JVM"
 
 #. Tag: literal
-#: transactions.xml:251
+#: transactions.xml:275
 #, no-c-format
 msgid "foo==bar"
 msgstr "foo==bar"
 
 #. Tag: para
-#: transactions.xml:257
+#: transactions.xml:281
 #, fuzzy, no-c-format
 msgid ""
 "Then for objects attached to a <emphasis>particular</emphasis> "
@@ -554,7 +554,7 @@
 "literal> est appelé."
 
 #. Tag: para
-#: transactions.xml:266
+#: transactions.xml:290
 #, no-c-format
 msgid ""
 "This approach leaves Hibernate and the database to worry about concurrency; "
@@ -577,7 +577,7 @@
 "<literal>== </literal> pour comparer des objets."
 
 #. Tag: para
-#: transactions.xml:275
+#: transactions.xml:299
 #, no-c-format
 msgid ""
 "However, an application that uses <literal>==</literal> outside of a "
@@ -625,13 +625,13 @@
 "l'identité et de l'égalité en Java."
 
 #. Tag: title
-#: transactions.xml:296
+#: transactions.xml:320
 #, no-c-format
 msgid "Common issues"
 msgstr "Problèmes communs"
 
 #. Tag: para
-#: transactions.xml:298
+#: transactions.xml:322
 #, no-c-format
 msgid ""
 "Never use the anti-patterns <emphasis>session-per-user-session</emphasis> or "
@@ -649,7 +649,7 @@
 "implications de chacun des patterns avant de prendre votre décision."
 
 #. Tag: para
-#: transactions.xml:307
+#: transactions.xml:331
 #, no-c-format
 msgid ""
 "A <literal>Session</literal> is not thread-safe. Things which are supposed "
@@ -672,7 +672,7 @@
 "literal> ."
 
 #. Tag: para
-#: transactions.xml:318
+#: transactions.xml:342
 #, no-c-format
 msgid ""
 "An exception thrown by Hibernate means you have to rollback your database "
@@ -696,7 +696,7 @@
 "non traitables et requièrent la reprise du processus d?affaire ayant échoué.)"
 
 #. Tag: para
-#: transactions.xml:330
+#: transactions.xml:354
 #, no-c-format
 msgid ""
 "The <literal>Session</literal> caches every object that is in persistent "
@@ -725,16 +725,16 @@
 "information périmée."
 
 #. Tag: title
-#: transactions.xml:348
+#: transactions.xml:372
 #, no-c-format
 msgid "Database transaction demarcation"
 msgstr "Démarcation des transactions"
 
 #. Tag: para
-#: transactions.xml:350
-#, no-c-format
+#: transactions.xml:374
+#, 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 "
@@ -754,7 +754,7 @@
 "de lecture."
 
 #. Tag: para
-#: transactions.xml:360
+#: transactions.xml:384
 #, no-c-format
 msgid ""
 "A Hibernate application can run in non-managed (i.e. standalone, simple Web- "
@@ -785,13 +785,13 @@
 "flush()</literal> sont faits automatiquement."
 
 #. Tag: para
-#: transactions.xml:370
-#, no-c-format
+#: transactions.xml:394
+#, 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 "
+"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."
@@ -804,7 +804,7 @@
 "Bean (EJB avec transactions gérées automatiquement par le container EJB)."
 
 #. Tag: para
-#: transactions.xml:379
+#: transactions.xml:403
 #, no-c-format
 msgid ""
 "Usually, ending a <literal>Session</literal> involves four distinct phases:"
@@ -813,31 +813,31 @@
 "<literal>Session</literal>"
 
 #. Tag: para
-#: transactions.xml:385
+#: transactions.xml:409
 #, no-c-format
 msgid "flush the session"
 msgstr "flush de la session"
 
 #. Tag: para
-#: transactions.xml:390
+#: transactions.xml:414
 #, no-c-format
 msgid "commit the transaction"
 msgstr "commit de la transaction"
 
 #. Tag: para
-#: transactions.xml:395
+#: transactions.xml:419
 #, no-c-format
 msgid "close the session"
 msgstr "Fermeture de la session (Close)"
 
 #. Tag: para
-#: transactions.xml:400
+#: transactions.xml:424
 #, no-c-format
 msgid "handle exceptions"
 msgstr "Gestion des exceptions"
 
 #. Tag: para
-#: transactions.xml:406
+#: transactions.xml:430
 #, no-c-format
 msgid ""
 "Flushing the session has been discussed earlier, we'll now have a closer "
@@ -850,13 +850,13 @@
 "J2EE."
 
 #. Tag: title
-#: transactions.xml:413
+#: transactions.xml:437
 #, no-c-format
 msgid "Non-managed environment"
 msgstr "Environnement non managé"
 
 #. Tag: para
-#: transactions.xml:415
+#: transactions.xml:439
 #, no-c-format
 msgid ""
 "If a Hibernate persistence layer runs in a non-managed environment, database "
@@ -870,7 +870,7 @@
 "la transaction se fera donc de la manière suivante:"
 
 #. Tag: programlisting
-#: transactions.xml:422
+#: transactions.xml:446
 #, no-c-format
 msgid ""
 "<![CDATA[// Non-managed environment idiom\n"
@@ -894,7 +894,7 @@
 msgstr ""
 
 #. Tag: para
-#: transactions.xml:424
+#: transactions.xml:448
 #, no-c-format
 msgid ""
 "You don't have to <literal>flush()</literal> the <literal>Session</literal> "
@@ -915,7 +915,7 @@
 "managé ET les environnements JTA."
 
 #. Tag: para
-#: transactions.xml:433
+#: transactions.xml:457
 #, no-c-format
 msgid ""
 "A much more flexible solution is Hibernate's built-in \"current session\" "
@@ -925,7 +925,7 @@
 "que nous avons déjà rencontré:"
 
 #. Tag: programlisting
-#: transactions.xml:438
+#: transactions.xml:462
 #, no-c-format
 msgid ""
 "<![CDATA[// Non-managed environment idiom with getCurrentSession()\n"
@@ -944,7 +944,7 @@
 msgstr ""
 
 #. Tag: para
-#: transactions.xml:440
+#: transactions.xml:464
 #, no-c-format
 msgid ""
 "You will very likely never see these code snippets in a regular application; "
@@ -968,7 +968,7 @@
 "tard dans ce chapitre."
 
 #. Tag: para
-#: transactions.xml:450
+#: transactions.xml:474
 #, no-c-format
 msgid ""
 "Note that you should select <literal>org.hibernate.transaction."
@@ -982,13 +982,13 @@
 "current_session_context_class</literal>."
 
 #. Tag: title
-#: transactions.xml:459
+#: transactions.xml:483
 #, no-c-format
 msgid "Using JTA"
 msgstr "Utilisation de JTA"
 
 #. Tag: para
-#: transactions.xml:461
+#: transactions.xml:485
 #, no-c-format
 msgid ""
 "If your persistence layer runs in an application server (e.g. behind EJB "
@@ -1003,7 +1003,7 @@
 "Hibernate propose deux stratégies pour réussir cette intégration."
 
 #. Tag: para
-#: transactions.xml:468
+#: transactions.xml:492
 #, no-c-format
 msgid ""
 "If you use bean-managed transactions (BMT) Hibernate will tell the "
@@ -1018,7 +1018,7 @@
 "les deux types d'environnements."
 
 #. Tag: programlisting
-#: transactions.xml:474
+#: transactions.xml:498
 #, no-c-format
 msgid ""
 "<![CDATA[// BMT idiom\n"
@@ -1042,7 +1042,7 @@
 msgstr ""
 
 #. Tag: para
-#: transactions.xml:476
+#: transactions.xml:500
 #, no-c-format
 msgid ""
 "If you want to use a transaction-bound <literal>Session</literal>, that is, "
@@ -1052,7 +1052,7 @@
 msgstr "Ou encore, avec la gestion automatique de contexte:"
 
 #. Tag: programlisting
-#: transactions.xml:482
+#: transactions.xml:506
 #, no-c-format
 msgid ""
 "<![CDATA[// BMT idiom with getCurrentSession()\n"
@@ -1075,18 +1075,18 @@
 msgstr ""
 
 #. Tag: para
-#: transactions.xml:484
-#, no-c-format
+#: transactions.xml:508
+#, fuzzy, no-c-format
 msgid ""
 "With CMT, transaction demarcation is done in session bean deployment "
-"descriptors, not programatically, hence, the code is reduced to:"
+"descriptors, not programmatically, hence, 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:489
+#: transactions.xml:513
 #, no-c-format
 msgid ""
 "<![CDATA[// CMT idiom\n"
@@ -1098,7 +1098,7 @@
 msgstr ""
 
 #. Tag: para
-#: transactions.xml:491
+#: transactions.xml:515
 #, no-c-format
 msgid ""
 "In a CMT/EJB even rollback happens automatically, since an unhandled "
@@ -1115,8 +1115,8 @@
 "<literal>Transaction</literal> d'Hibernate dans CMT.</emphasis>"
 
 #. Tag: para
-#: transactions.xml:499
-#, no-c-format
+#: transactions.xml:523
+#, fuzzy, no-c-format
 msgid ""
 "Note that you should choose <literal>org.hibernate.transaction."
 "JTATransactionFactory</literal> if you use JTA directly (BMT), and "
@@ -1125,7 +1125,7 @@
 "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>."
+"compatibility), or 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,8 +1139,8 @@
 "versions précédentes)."
 
 #. Tag: para
-#: transactions.xml:508
-#, no-c-format
+#: transactions.xml:532
+#, 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</"
@@ -1150,7 +1150,7 @@
 "<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 "
+"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.)"
@@ -1170,13 +1170,13 @@
 "CMT.)"
 
 #. Tag: title
-#: transactions.xml:524
+#: transactions.xml:548
 #, no-c-format
 msgid "Exception handling"
 msgstr "Gestion des exceptions"
 
 #. Tag: para
-#: transactions.xml:526
+#: transactions.xml:550
 #, no-c-format
 msgid ""
 "If the <literal>Session</literal> throws an exception (including any "
@@ -1199,7 +1199,7 @@
 "<literal>close()</literal> dans un bloc <literal>finally</literal> ."
 
 #. Tag: para
-#: transactions.xml:537
+#: transactions.xml:561
 #, no-c-format
 msgid ""
 "The <literal>HibernateException</literal>, which wraps most of the errors "
@@ -1227,12 +1227,12 @@
 "non traitables et vous devez les traiter comme telles."
 
 #. Tag: para
-#: transactions.xml:549
-#, no-c-format
+#: transactions.xml:573
+#, 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 "
@@ -1261,7 +1261,7 @@
 "Les sous-types standard de <literal>JDBCException</literal> sont:"
 
 #. Tag: para
-#: transactions.xml:565
+#: transactions.xml:589
 #, no-c-format
 msgid ""
 "<literal>JDBCConnectionException</literal> - indicates an error with the "
@@ -1271,7 +1271,7 @@
 "communication avec la couche JDBC sous-jacente."
 
 #. Tag: para
-#: transactions.xml:571
+#: transactions.xml:595
 #, no-c-format
 msgid ""
 "<literal>SQLGrammarException</literal> - indicates a grammar or syntax "
@@ -1281,7 +1281,7 @@
 "de syntaxe avec la requête SQL envoyée."
 
 #. Tag: para
-#: transactions.xml:577
+#: transactions.xml:601
 #, no-c-format
 msgid ""
 "<literal>ConstraintViolationException</literal> - indicates some form of "
@@ -1291,7 +1291,7 @@
 "contrainte d'intégrité."
 
 #. Tag: para
-#: transactions.xml:583
+#: transactions.xml:607
 #, no-c-format
 msgid ""
 "<literal>LockAcquisitionException</literal> - indicates an error acquiring a "
@@ -1301,7 +1301,7 @@
 "verrouillage lors de l'éxécution de la requête."
 
 #. Tag: para
-#: transactions.xml:589
+#: transactions.xml:613
 #, no-c-format
 msgid ""
 "<literal>GenericJDBCException</literal> - a generic exception which did not "
@@ -1311,14 +1311,14 @@
 "d'une autre catégorie."
 
 #. Tag: title
-#: transactions.xml:599
+#: transactions.xml:623
 #, no-c-format
 msgid "Transaction timeout"
 msgstr "Timeout de transaction"
 
 #. Tag: para
-#: transactions.xml:601
-#, no-c-format
+#: transactions.xml:625
+#, 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. "
@@ -1328,7 +1328,7 @@
 "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 "
+"transaction timeout to JTA. This functionality is abstracted by the "
 "Hibernate <literal>Transaction</literal> object."
 msgstr ""
 "L'un des avantages fournis par les environnements transactionnels JTA (tels "
@@ -1345,7 +1345,7 @@
 "est abstraite par l'objet <literal>Transaction</literal> ."
 
 #. Tag: programlisting
-#: transactions.xml:614
+#: transactions.xml:638
 #, no-c-format
 msgid ""
 "<![CDATA[\n"
@@ -1370,7 +1370,7 @@
 msgstr ""
 
 #. Tag: para
-#: transactions.xml:616
+#: transactions.xml:640
 #, no-c-format
 msgid ""
 "Note that <literal>setTimeout()</literal> may not be called in a CMT bean, "
@@ -1381,13 +1381,13 @@
 "déclarative."
 
 #. Tag: title
-#: transactions.xml:626
+#: transactions.xml:650
 #, no-c-format
 msgid "Optimistic concurrency control"
 msgstr "Contrôle de consurrence optimiste"
 
 #. Tag: para
-#: transactions.xml:628
+#: transactions.xml:652
 #, no-c-format
 msgid ""
 "The only approach that is consistent with high concurrency and high "
@@ -1410,13 +1410,13 @@
 "application en prévenant la perte de mises à jour."
 
 #. Tag: title
-#: transactions.xml:639
+#: transactions.xml:663
 #, no-c-format
 msgid "Application version checking"
 msgstr "Gestion du versionnage au niveau applicatif"
 
 #. Tag: para
-#: transactions.xml:641
+#: transactions.xml:665
 #, no-c-format
 msgid ""
 "In an implementation without much help from Hibernate, each interaction with "
@@ -1437,7 +1437,7 @@
 "chapitre."
 
 #. Tag: programlisting
-#: transactions.xml:650
+#: transactions.xml:674
 #, no-c-format
 msgid ""
 "<![CDATA[// foo is an instance loaded by a previous Session\n"
@@ -1455,7 +1455,7 @@
 msgstr ""
 
 #. Tag: para
-#: transactions.xml:652
+#: transactions.xml:676
 #, no-c-format
 msgid ""
 "The <literal>version</literal> property is mapped using <literal>&lt;"
@@ -1467,7 +1467,7 @@
 "automatiquement à chaque flush() si l'entité doit être mise à jour."
 
 #. Tag: para
-#: transactions.xml:658
+#: transactions.xml:682
 #, no-c-format
 msgid ""
 "Of course, if you are operating in a low-data-concurrency environment and "
@@ -1489,12 +1489,12 @@
 "données."
 
 #. Tag: para
-#: transactions.xml:667
-#, no-c-format
+#: transactions.xml:691
+#, 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. "
+"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 ""
@@ -1508,13 +1508,13 @@
 "versions d'objets."
 
 #. Tag: title
-#: transactions.xml:678
+#: transactions.xml:702
 #, no-c-format
 msgid "Extended session and automatic versioning"
 msgstr "Les sessions longues et le versionnage automatique."
 
 #. Tag: para
-#: transactions.xml:680
+#: transactions.xml:704
 #, no-c-format
 msgid ""
 "A single <literal>Session</literal> instance and its persistent instances "
@@ -1535,7 +1535,7 @@
 "les plus récentes dans la BD."
 
 #. Tag: para
-#: transactions.xml:689
+#: transactions.xml:713
 #, no-c-format
 msgid ""
 "The <literal>Session</literal> is disconnected from any underlying JDBC "
@@ -1552,7 +1552,7 @@
 "rechargement de tous les objets à chaque transaction."
 
 #. Tag: programlisting
-#: transactions.xml:697
+#: transactions.xml:721
 #, no-c-format
 msgid ""
 "<![CDATA[// foo is an instance loaded earlier by the old session\n"
@@ -1567,7 +1567,7 @@
 msgstr ""
 
 #. Tag: para
-#: transactions.xml:698
+#: transactions.xml:722
 #, no-c-format
 msgid ""
 "The <literal>foo</literal> object still knows which <literal>Session</"
@@ -1600,7 +1600,7 @@
 "jour."
 
 #. Tag: para
-#: transactions.xml:713
+#: transactions.xml:737
 #, no-c-format
 msgid ""
 "This pattern is problematic if the <literal>Session</literal> is too big to "
@@ -1616,7 +1616,7 @@
 "utilisant <literal>hibernate.connection.release_mode</literal> ."
 
 #. Tag: para
-#: transactions.xml:723
+#: transactions.xml:747
 #, no-c-format
 msgid ""
 "(Note that earlier Hibernate versions required explicit disconnection and "
@@ -1633,7 +1633,7 @@
 "être rapidement périmés."
 
 #. Tag: para
-#: transactions.xml:729
+#: transactions.xml:753
 #, no-c-format
 msgid ""
 "Also note that you should keep the disconnected <literal>Session</literal> "
@@ -1649,7 +1649,7 @@
 "pas la conserver dans la session <literal>HttpSession</literal> .)"
 
 #. Tag: para
-#: transactions.xml:737
+#: transactions.xml:761
 #, no-c-format
 msgid ""
 "The extended session pattern, or <emphasis>session-per-conversation</"
@@ -1665,13 +1665,13 @@
 "for examples."
 
 #. Tag: title
-#: transactions.xml:747
+#: transactions.xml:771
 #, no-c-format
 msgid "Detached objects and automatic versioning"
 msgstr "Les objets détachés et le versionnage automatique"
 
 #. Tag: para
-#: transactions.xml:749
+#: transactions.xml:773
 #, no-c-format
 msgid ""
 "Each interaction with the persistent store occurs in a new <literal>Session</"
@@ -1692,7 +1692,7 @@
 "literal> , ou <literal>Session.merge()</literal> ."
 
 #. Tag: programlisting
-#: transactions.xml:757
+#: transactions.xml:781
 #, no-c-format
 msgid ""
 "<![CDATA[// foo is an instance loaded by a previous Session\n"
@@ -1706,18 +1706,18 @@
 msgstr ""
 
 #. Tag: para
-#: transactions.xml:759
-#, no-c-format
+#: transactions.xml:783
+#, 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 ""
 "Encore une fois, Hibernate vérifiera la version des instances devant être "
 "actualisées durant le flush(). Une exception sera lancée si des conflits "
 "sont détectés."
 
 #. Tag: para
-#: transactions.xml:764
+#: transactions.xml:788
 #, no-c-format
 msgid ""
 "You may also call <literal>lock()</literal> instead of <literal>update()</"
@@ -1732,13 +1732,13 @@
 "modifié."
 
 #. Tag: title
-#: transactions.xml:773
+#: transactions.xml:797
 #, no-c-format
 msgid "Customizing automatic versioning"
 msgstr "Personnaliser le versionnage automatique"
 
 #. Tag: para
-#: transactions.xml:775
+#: transactions.xml:799
 #, no-c-format
 msgid ""
 "You may disable Hibernate's automatic version increment for particular "
@@ -1752,8 +1752,8 @@
 "d'incrémenter leur numéro de version s'ils sont mis à jour."
 
 #. Tag: para
-#: transactions.xml:782
-#, no-c-format
+#: transactions.xml:806
+#, 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 "
@@ -1761,7 +1761,7 @@
 "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 "
+"<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."
@@ -1782,7 +1782,7 @@
 "request-with-detached- objects</literal> devient alors impossible."
 
 #. Tag: para
-#: transactions.xml:793
+#: transactions.xml:817
 #, no-c-format
 msgid ""
 "Sometimes concurrent modification can be permitted as long as the changes "
@@ -1797,15 +1797,15 @@
 "être actualisés lors du flush()."
 
 #. Tag: para
-#: transactions.xml:799
-#, no-c-format
+#: transactions.xml:823
+#, fuzzy, 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 uneccessary updates. This is usually not a problem, "
+"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\"</"
@@ -1830,17 +1830,17 @@
 "commande d'UPDATE."
 
 #. Tag: title
-#: transactions.xml:817
+#: transactions.xml:841
 #, no-c-format
 msgid "Pessimistic Locking"
 msgstr "Verouillage pessimiste"
 
 #. Tag: para
-#: transactions.xml:819
-#, no-c-format
+#: transactions.xml:843
+#, 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'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."
@@ -1853,7 +1853,7 @@
 "enregistrement et le réobtenir au lancement d'une nouvelle transaction."
 
 #. Tag: para
-#: transactions.xml:826
+#: transactions.xml:850
 #, no-c-format
 msgid ""
 "Hibernate will always use the locking mechanism of the database, never lock "
@@ -1863,7 +1863,7 @@
 "données et ne verrouillera jamais les objets en mémoire!"
 
 #. Tag: para
-#: transactions.xml:831
+#: transactions.xml:855
 #, no-c-format
 msgid ""
 "The <literal>LockMode</literal> class defines the different lock levels that "
@@ -1874,7 +1874,7 @@
 "par les mécanismes suivants:"
 
 #. Tag: para
-#: transactions.xml:838
+#: transactions.xml:862
 #, no-c-format
 msgid ""
 "<literal>LockMode.WRITE</literal> is acquired automatically when Hibernate "
@@ -1884,7 +1884,7 @@
 "actualise ou insert un enregistrement."
 
 #. Tag: para
-#: transactions.xml:844
+#: transactions.xml:868
 #, no-c-format
 msgid ""
 "<literal>LockMode.UPGRADE</literal> may be acquired upon explicit user "
@@ -1896,7 +1896,7 @@
 "base de données supportant cette syntaxe."
 
 #. Tag: para
-#: transactions.xml:850
+#: transactions.xml:874
 #, no-c-format
 msgid ""
 "<literal>LockMode.UPGRADE_NOWAIT</literal> may be acquired upon explicit "
@@ -1908,7 +1908,7 @@
 "Oracle."
 
 #. Tag: para
-#: transactions.xml:856
+#: transactions.xml:880
 #, no-c-format
 msgid ""
 "<literal>LockMode.READ</literal> is acquired automatically when Hibernate "
@@ -1921,7 +1921,7 @@
 "explicitement via une requête."
 
 #. Tag: para
-#: transactions.xml:863
+#: transactions.xml:887
 #, no-c-format
 msgid ""
 "<literal>LockMode.NONE</literal> represents the absence of a lock. All "
@@ -1937,7 +1937,7 @@
 "dans cet état."
 
 #. Tag: para
-#: transactions.xml:872
+#: transactions.xml:896
 #, no-c-format
 msgid ""
 "The \"explicit user request\" is expressed in one of the following ways:"
@@ -1946,7 +1946,7 @@
 "manières suivantes:"
 
 #. Tag: para
-#: transactions.xml:878
+#: transactions.xml:902
 #, no-c-format
 msgid ""
 "A call to <literal>Session.load()</literal>, specifying a <literal>LockMode</"
@@ -1956,19 +1956,19 @@
 "verrouillage <literal>LockMode</literal> ."
 
 #. Tag: para
-#: transactions.xml:883
+#: transactions.xml:907
 #, no-c-format
 msgid "A call to <literal>Session.lock()</literal>."
 msgstr "Un appel à <literal>Session.lock()</literal> ."
 
 #. Tag: para
-#: transactions.xml:888
+#: transactions.xml:912
 #, no-c-format
 msgid "A call to <literal>Query.setLockMode()</literal>."
 msgstr "Une appel à <literal>Query.setLockMode()</literal> ."
 
 #. Tag: para
-#: transactions.xml:894
+#: transactions.xml:918
 #, no-c-format
 msgid ""
 "If <literal>Session.load()</literal> is called with <literal>UPGRADE</"
@@ -1988,7 +1988,7 @@
 "appellera la méthode <literal>lock()</literal> pour cet objet."
 
 #. Tag: para
-#: transactions.xml:903
+#: transactions.xml:927
 #, no-c-format
 msgid ""
 "<literal>Session.lock()</literal> performs a version number check if the "
@@ -2004,7 +2004,7 @@
 "requête <literal>SELECT ... FOR UPDATE</literal> sera utilisée.)"
 
 #. Tag: para
-#: transactions.xml:910
+#: transactions.xml:934
 #, no-c-format
 msgid ""
 "If the database does not support the requested lock mode, Hibernate will use "
@@ -2016,13 +2016,13 @@
 "exception. Ceci assurera la portabilité de votre application."
 
 #. Tag: title
-#: transactions.xml:919
+#: transactions.xml:943
 #, no-c-format
 msgid "Connection Release Modes"
 msgstr "Mode de libération de Connection"
 
 #. Tag: para
-#: transactions.xml:921
+#: transactions.xml:945
 #, no-c-format
 msgid ""
 "The legacy (2.x) behavior of Hibernate in regards to JDBC connection "
@@ -2047,11 +2047,11 @@
 "par <literal>org.hibernate.ConnectionReleaseMode</literal>:"
 
 #. Tag: para
-#: transactions.xml:935
-#, no-c-format
+#: transactions.xml:959
+#, 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 "
+"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."
 msgstr ""
@@ -2060,7 +2060,7 @@
 "jusqu'à ce que la session se ferme."
 
 #. Tag: para
-#: transactions.xml:942
+#: transactions.xml:966
 #, no-c-format
 msgid ""
 "<literal>AFTER_TRANSACTION</literal> - says to release connections after a "
@@ -2070,7 +2070,7 @@
 "après qu'une <literal>org.hibernate.Transaction</literal> se soit achevée."
 
 #. Tag: para
-#: transactions.xml:948
+#: transactions.xml:972
 #, no-c-format
 msgid ""
 "<literal>AFTER_STATEMENT</literal> (also referred to as aggressive release) "
@@ -2087,7 +2087,7 @@
 "de l'utilisation de <literal>org.hibernate.ScrollableResults</literal>."
 
 #. Tag: para
-#: transactions.xml:958
+#: transactions.xml:982
 #, no-c-format
 msgid ""
 "The configuration parameter <literal>hibernate.connection.release_mode</"
@@ -2098,7 +2098,7 @@
 "utiliser. Les valeurs possibles sont:"
 
 #. Tag: para
-#: transactions.xml:965
+#: transactions.xml:989
 #, no-c-format
 msgid ""
 "<literal>auto</literal> (the default) - this choice delegates to the release "
@@ -2119,7 +2119,7 @@
 "une erreur dans le code de l'utilisateur."
 
 #. Tag: para
-#: transactions.xml:975
+#: transactions.xml:999
 #, no-c-format
 msgid ""
 "<literal>on_close</literal> - says to use ConnectionReleaseMode.ON_CLOSE. "
@@ -2131,7 +2131,7 @@
 "versions précédentes, mais ne devrait plus être utilisé."
 
 #. Tag: para
-#: transactions.xml:981
+#: transactions.xml:1005
 #, no-c-format
 msgid ""
 "<literal>after_transaction</literal> - says to use ConnectionReleaseMode."
@@ -2148,7 +2148,7 @@
 "AFTER_STATEMENT."
 
 #. Tag: para
-#: transactions.xml:989
+#: transactions.xml:1013
 #, no-c-format
 msgid ""
 "<literal>after_statement</literal> - says to use ConnectionReleaseMode."

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	2008-08-14 15:28:13 UTC (rev 15066)
+++ core/trunk/documentation/manual/src/main/docbook/fr-FR/content/tutorial.po	2008-08-14 15:35:40 UTC (rev 15067)
@@ -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: 2008-08-14 15:28+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,139 +11,129 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: tutorial.xml:7
+#: tutorial.xml:33
 #, no-c-format
 msgid "Introduction to Hibernate"
 msgstr "Introduction à Hibernate"
 
 #. Tag: title
-#: tutorial.xml:10
+#: tutorial.xml:36
 #, no-c-format
 msgid "Preface"
 msgstr "Préface"
 
 #. Tag: para
-#: tutorial.xml:12
+#: tutorial.xml:38
 #, 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."
+"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."
 msgstr ""
-"Ce chapitre est un didacticiel introductif destiné aux nouveaux utilisateurs "
-"d'Hibernate. Nous commençons avec une simple application en ligne de "
-"commande utilisant une base de données en mémoire, et la développons en "
-"étapes faciles à comprendre."
 
 #. Tag: para
-#: tutorial.xml:18
+#: tutorial.xml:51
 #, 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 "
+"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."
 msgstr ""
-"Ce didacticiel est destiné aux nouveaux utilisateurs d'Hibernate mais "
-"requiert des connaissances Java et SQL. Il est basé sur un didacticiel de "
-"Michael Gloegl, les bibliothèques tierces que nous nommons sont pour les JDK "
-"1.4 et 5.0. Vous pourriez avoir besoin d'autres bibliothèques pour le JDK "
-"1.3."
 
 #. Tag: para
-#: tutorial.xml:24
+#: tutorial.xml:61
 #, no-c-format
 msgid ""
-"The source code for the tutorial is included in the distribution in the "
-"<literal>doc/reference/tutorial/</literal> directory."
+"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."
 msgstr ""
-"Le code source de ce tutoriel est inclus dans la distribution dans le "
-"répertoire <literal>doc/reference/tutorial/</literal>."
 
 #. Tag: title
-#: tutorial.xml:32
+#: tutorial.xml:71
 #, no-c-format
 msgid "Part 1 - The first Hibernate Application"
 msgstr "Partie 1 - Première application Hibernate"
 
 #. Tag: para
-#: tutorial.xml:34
+#: tutorial.xml:73
 #, 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."
+"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."
 msgstr ""
-"D'abord, nous créerons une simple application Hibernate en console. Nous "
-"utilisons une base de données en mémoire (HSQL DB), donc nous n'avons pas à "
-"installer de serveur de base de données."
 
 #. Tag: para
-#: tutorial.xml:39
+#: tutorial.xml:82
 #, 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 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."
 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:44
+#. Tag: programlisting
+#: tutorial.xml:94
 #, 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:"
+"<![CDATA[.\n"
+"<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"
+"\n"
+"    <dependencies>\n"
+"        <dependency>\n"
+"            <groupId>${groupId}</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"
+"    </dependencies>\n"
+"\n"
+"</project>]]>"
 msgstr ""
-"La première chose que nous faisons est de configurer notre répertoire de "
-"développement et de mettre toutes les bibliothèques dont nous avons besoin "
-"dedans. Téléchargez la distribution Hibernate à partir du site web "
-"d'Hibernate. Extrayez le paquet et placez toutes les bibliothèques requises "
-"trouvées dans <literal>/lib</literal> dans le répertoire <literal>/lib</"
-"literal> de votre nouveau répertoire de travail. Il devrait ressembler à ça :"
 
-#. Tag: programlisting
-#: tutorial.xml:52
+#. Tag: para
+#: tutorial.xml:97
 #, 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 ]]>"
+"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."
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:54
+#: tutorial.xml:105
 #, 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.)"
+"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."
 msgstr ""
-"Ceci est l'ensemble minimum de bibliothèques requises (notez que nous avons "
-"aussi copié hibernate3.jar, l'archive principale) pour Hibernate. Lisez le "
-"fichier <literal>README.txt</literal> dans le répertoire <literal>lib/</"
-"literal> de la distribution Hibernate pour plus d'informations à propos des "
-"biliothèques tierces requises et optionnelles. (En fait, log4j n'est pas "
-"requis mais préféré par beaucoup de développeurs.)"
 
 #. Tag: para
-#: tutorial.xml:63
+#: tutorial.xml:112
 #, no-c-format
 msgid ""
 "Next we create a class that represents the event we want to store in "
@@ -153,13 +143,13 @@
 "stocker dans notre base de données."
 
 #. Tag: title
-#: tutorial.xml:68
+#: tutorial.xml:117
 #, no-c-format
 msgid "The first class"
 msgstr "La première classe"
 
 #. Tag: para
-#: tutorial.xml:70
+#: tutorial.xml:119
 #, no-c-format
 msgid ""
 "Our first persistent class is a simple JavaBean class with some properties:"
@@ -168,10 +158,10 @@
 "quelques propriétés :"
 
 #. Tag: programlisting
-#: tutorial.xml:74
+#: tutorial.xml:123
 #, no-c-format
 msgid ""
-"<![CDATA[package events;\n"
+"<![CDATA[package org.hibernate.tutorial.domain;\n"
 "\n"
 "import java.util.Date;\n"
 "\n"
@@ -210,7 +200,7 @@
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:76
+#: tutorial.xml:125
 #, no-c-format
 msgid ""
 "You can see that this class uses standard JavaBean naming conventions for "
@@ -229,7 +219,7 @@
 "classe via reflexion."
 
 #. Tag: para
-#: tutorial.xml:84
+#: tutorial.xml:133
 #, no-c-format
 msgid ""
 "The <literal>id</literal> property holds a unique identifier value for a "
@@ -260,7 +250,7 @@
 "l'ajuster à la conception de votre application."
 
 #. Tag: para
-#: tutorial.xml:96
+#: tutorial.xml:145
 #, no-c-format
 msgid ""
 "The no-argument constructor is a requirement for all persistent classes; "
@@ -276,7 +266,7 @@
 "récupération des données efficaces sans instrumentation du bytecode."
 
 #. Tag: para
-#: tutorial.xml:103
+#: tutorial.xml:152
 #, no-c-format
 msgid ""
 "Place this Java source file in a directory called <literal>src</literal> in "
@@ -288,7 +278,7 @@
 "ressembler à ça :"
 
 #. Tag: programlisting
-#: tutorial.xml:108
+#: tutorial.xml:157
 #, no-c-format
 msgid ""
 "<![CDATA[.\n"
@@ -300,7 +290,7 @@
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:110
+#: tutorial.xml:159
 #, no-c-format
 msgid "In the next step, we tell Hibernate about this persistent class."
 msgstr ""
@@ -308,13 +298,13 @@
 "persistante."
 
 #. Tag: title
-#: tutorial.xml:117
+#: tutorial.xml:166
 #, no-c-format
 msgid "The mapping file"
 msgstr "Le fichier de mapping"
 
 #. Tag: para
-#: tutorial.xml:119
+#: tutorial.xml:168
 #, no-c-format
 msgid ""
 "Hibernate needs to know how to load and store objects of the persistent "
@@ -329,13 +319,13 @@
 "utiliser."
 
 #. Tag: para
-#: tutorial.xml:126
+#: tutorial.xml:175
 #, 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:130
+#: tutorial.xml:179
 #, no-c-format
 msgid ""
 "<![CDATA[<?xml version=\"1.0\"?>\n"
@@ -349,7 +339,7 @@
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:132
+#: tutorial.xml:181
 #, no-c-format
 msgid ""
 "Note that the Hibernate DTD is very sophisticated. You can use it for auto-"
@@ -373,7 +363,7 @@
 "distribution Hibernate."
 
 #. Tag: para
-#: tutorial.xml:143
+#: tutorial.xml:192
 #, no-c-format
 msgid ""
 "We will omit the DTD declaration in future examples to shorten the code. It "
@@ -383,7 +373,7 @@
 "raccourcir le code. Bien sûr il n'est pas optionnel."
 
 #. Tag: para
-#: tutorial.xml:148
+#: tutorial.xml:197
 #, no-c-format
 msgid ""
 "Between the two <literal>hibernate-mapping</literal> tags, include a "
@@ -398,7 +388,7 @@
 "base de données SQL :"
 
 #. Tag: programlisting
-#: tutorial.xml:155
+#: tutorial.xml:204
 #, no-c-format
 msgid ""
 "<![CDATA[<hibernate-mapping>\n"
@@ -411,7 +401,7 @@
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:157
+#: tutorial.xml:206
 #, no-c-format
 msgid ""
 "So far we told Hibernate how to persist and load object of class "
@@ -432,7 +422,7 @@
 "subrogée :"
 
 #. Tag: programlisting
-#: tutorial.xml:165
+#: tutorial.xml:214
 #, no-c-format
 msgid ""
 "<![CDATA[<hibernate-mapping>\n"
@@ -447,10 +437,10 @@
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:167
-#, no-c-format
+#: tutorial.xml:216
+#, fuzzy, no-c-format
 msgid ""
-"The <literal>id</literal> element is the declaration of the identifer "
+"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 "
@@ -475,7 +465,7 @@
 "stratégie que vous avez écrit en extension)."
 
 #. Tag: para
-#: tutorial.xml:180
+#: tutorial.xml:229
 #, no-c-format
 msgid ""
 "Finally we include declarations for the persistent properties of the class "
@@ -487,7 +477,7 @@
 "classe n'est considérée comme persistante :"
 
 #. Tag: programlisting
-#: tutorial.xml:186
+#: tutorial.xml:235
 #, no-c-format
 msgid ""
 "<![CDATA[\n"
@@ -505,7 +495,7 @@
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:188
+#: tutorial.xml:237
 #, no-c-format
 msgid ""
 "Just as with the <literal>id</literal> element, the <literal>name</literal> "
@@ -519,7 +509,7 @@
 "getters/setters utiliser."
 
 #. Tag: para
-#: tutorial.xml:195
+#: tutorial.xml:244
 #, no-c-format
 msgid ""
 "Why does the <literal>date</literal> property mapping include the "
@@ -538,7 +528,7 @@
 "différent pour le mapping."
 
 #. Tag: para
-#: tutorial.xml:204
+#: tutorial.xml:253
 #, no-c-format
 msgid ""
 "The next interesting thing is that the <literal>title</literal> mapping also "
@@ -576,7 +566,7 @@
 "un <literal>timestamp</literal>."
 
 #. Tag: para
-#: tutorial.xml:220
+#: tutorial.xml:269
 #, no-c-format
 msgid ""
 "This mapping file should be saved as <literal>Event.hbm.xml</literal>, right "
@@ -593,7 +583,7 @@
 "structure du répertoire devrait ressembler à ça :"
 
 #. Tag: programlisting
-#: tutorial.xml:228
+#: tutorial.xml:277
 #, no-c-format
 msgid ""
 "<![CDATA[.\n"
@@ -606,19 +596,19 @@
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:230
+#: 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:237
+#: tutorial.xml:286
 #, no-c-format
 msgid "Hibernate configuration"
 msgstr "Configuration d'Hibernate"
 
 #. Tag: para
-#: tutorial.xml:239
+#: tutorial.xml:288
 #, no-c-format
 msgid ""
 "We now have a persistent class and its mapping file in place. It is time to "
@@ -636,7 +626,7 @@
 "répertoire <literal>lib/</literal> du dossier de développement."
 
 #. Tag: para
-#: tutorial.xml:247
+#: tutorial.xml:296
 #, no-c-format
 msgid ""
 "Create a directory called <literal>data</literal> in the root of the "
@@ -659,7 +649,7 @@
 "répertoire <literal>data/</literal> et redémarrez HSQL DB à nouveau."
 
 #. Tag: para
-#: tutorial.xml:257
+#: tutorial.xml:306
 #, no-c-format
 msgid ""
 "Hibernate is the layer in your application which connects to this database, "
@@ -682,7 +672,7 @@
 "logiciel de gestion de pools JDBC tiers avec une qualité de production."
 
 #. Tag: para
-#: tutorial.xml:267
+#: tutorial.xml:316
 #, no-c-format
 msgid ""
 "For Hibernate's configuration, we can use a simple <literal>hibernate."
@@ -697,7 +687,7 @@
 "de configuration XML :"
 
 #. Tag: programlisting
-#: tutorial.xml:273
+#: tutorial.xml:322
 #, no-c-format
 msgid ""
 "<![CDATA[<?xml version='1.0' encoding='utf-8'?>\n"
@@ -746,7 +736,7 @@
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:275
+#: tutorial.xml:324
 #, no-c-format
 msgid ""
 "Note that this XML configuration uses a different DTD. We configure "
@@ -763,7 +753,7 @@
 "configuration différents (pour un démarrage plus facile)."
 
 #. Tag: para
-#: tutorial.xml:283
+#: tutorial.xml:332
 #, no-c-format
 msgid ""
 "The first four <literal>property</literal> elements contain the necessary "
@@ -790,7 +780,7 @@
 "persistantes."
 
 #. Tag: para
-#: tutorial.xml:296
+#: tutorial.xml:345
 #, no-c-format
 msgid ""
 "Copy this file into the source directory, so it will end up in the root of "
@@ -803,13 +793,13 @@
 "appelé <literal>hibernate.cfg.xml</literal> dans la racine du classpath."
 
 #. Tag: title
-#: tutorial.xml:305
+#: tutorial.xml:354
 #, no-c-format
 msgid "Building with Ant"
 msgstr "Construction avec Ant"
 
 #. Tag: para
-#: tutorial.xml:307
+#: tutorial.xml:356
 #, no-c-format
 msgid ""
 "We'll now build the tutorial with Ant. You will need to have Ant installed - "
@@ -830,13 +820,13 @@
 "directement dans le répertoire de développement."
 
 #. Tag: para
-#: tutorial.xml:316
+#: 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:320
+#: tutorial.xml:369
 #, no-c-format
 msgid ""
 "<![CDATA[<project name=\"hibernate-tutorial\" default=\"compile\">\n"
@@ -874,7 +864,7 @@
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:322
+#: tutorial.xml:371
 #, no-c-format
 msgid ""
 "This will tell Ant to add all files in the lib directory ending with "
@@ -889,7 +879,7 @@
 "lancez Ant maintenant, vous devriez obtenir cette sortie :"
 
 #. Tag: programlisting
-#: tutorial.xml:329
+#: tutorial.xml:378
 #, no-c-format
 msgid ""
 "<![CDATA[C:\\hibernateTutorial\\>ant\n"
@@ -906,13 +896,13 @@
 msgstr ""
 
 #. Tag: title
-#: tutorial.xml:334
+#: tutorial.xml:383
 #, no-c-format
 msgid "Startup and helpers"
 msgstr "Démarrage et aides"
 
 #. Tag: para
-#: tutorial.xml:336
+#: tutorial.xml:385
 #, no-c-format
 msgid ""
 "It's time to load and store some <literal>Event</literal> objects, but first "
@@ -935,7 +925,7 @@
 "literal> est un objet global \"thread-safe\", instancié une seule fois."
 
 #. Tag: para
-#: tutorial.xml:346
+#: tutorial.xml:395
 #, no-c-format
 msgid ""
 "We'll create a <literal>HibernateUtil</literal> helper class which takes "
@@ -947,7 +937,7 @@
 "plus facile. Regardons l'implémentation :"
 
 #. Tag: programlisting
-#: tutorial.xml:352
+#: tutorial.xml:401
 #, no-c-format
 msgid ""
 "<![CDATA[package util;\n"
@@ -980,7 +970,7 @@
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:354
+#: tutorial.xml:403
 #, no-c-format
 msgid ""
 "This class does not only produce the global <literal>SessionFactory</"
@@ -996,7 +986,7 @@
 "depuis JNDI dans un serveur d'applications."
 
 #. Tag: para
-#: tutorial.xml:361
+#: tutorial.xml:410
 #, no-c-format
 msgid ""
 "If you give the <literal>SessionFactory</literal> a name in your "
@@ -1014,7 +1004,7 @@
 "référence Hibernate."
 
 #. Tag: para
-#: tutorial.xml:370
+#: tutorial.xml:419
 #, no-c-format
 msgid ""
 "Place <literal>HibernateUtil.java</literal> in the development source "
@@ -1024,7 +1014,7 @@
 "développement, et ensuite <literal>Event.java</literal> :"
 
 #. Tag: programlisting
-#: tutorial.xml:375
+#: tutorial.xml:424
 #, no-c-format
 msgid ""
 "<![CDATA[.\n"
@@ -1042,7 +1032,7 @@
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:377
+#: tutorial.xml:426
 #, no-c-format
 msgid ""
 "This should again compile without problems. We finally need to configure a "
@@ -1067,7 +1057,7 @@
 "affiché sur la sortie standard."
 
 #. Tag: para
-#: tutorial.xml:387
+#: tutorial.xml:436
 #, no-c-format
 msgid ""
 "The tutorial infrastructure is complete - and we are ready to do some real "
@@ -1077,13 +1067,13 @@
 "effectuer un travail réel avec Hibernate."
 
 #. Tag: title
-#: tutorial.xml:395
+#: tutorial.xml:444
 #, no-c-format
 msgid "Loading and storing objects"
 msgstr "Charger et stocker des objets"
 
 #. Tag: para
-#: tutorial.xml:397
+#: tutorial.xml:446
 #, no-c-format
 msgid ""
 "Finally, we can use Hibernate to load and store objects. We write an "
@@ -1095,7 +1085,7 @@
 "méthode <literal>main()</literal> :"
 
 #. Tag: programlisting
-#: tutorial.xml:402
+#: tutorial.xml:451
 #, no-c-format
 msgid ""
 "<![CDATA[package events;\n"
@@ -1137,7 +1127,7 @@
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:404
+#: tutorial.xml:453
 #, no-c-format
 msgid ""
 "We create a new <literal>Event</literal> object, and hand it over to "
@@ -1152,7 +1142,7 @@
 "literal> avant de lancer ça."
 
 #. Tag: para
-#: tutorial.xml:411
+#: tutorial.xml:460
 #, no-c-format
 msgid ""
 "A <literal>Session</literal> is a single unit of work. For now we'll keep "
@@ -1171,7 +1161,7 @@
 "<literal>Session</literal> Hibernate."
 
 #. Tag: para
-#: tutorial.xml:419
+#: tutorial.xml:468
 #, no-c-format
 msgid ""
 "What does <literal>sessionFactory.getCurrentSession()</literal> do? First, "
@@ -1196,7 +1186,7 @@
 "thread java courant d'exécution. Ceci n'est pas totalement vrai."
 
 #. Tag: para
-#: tutorial.xml:430
+#: tutorial.xml:479
 #, no-c-format
 msgid ""
 "A <literal>Session</literal> begins when it is first needed, when the first "
@@ -1223,7 +1213,7 @@
 "d'utiliser Hibernate."
 
 #. Tag: para
-#: tutorial.xml:441
+#: tutorial.xml:490
 #, no-c-format
 msgid ""
 "Related to the unit of work scope, should the Hibernate <literal>Session</"
@@ -1249,7 +1239,7 @@
 "an anti-pattern. A real (web) application is shown later in this tutorial."
 
 #. Tag: para
-#: tutorial.xml:452
+#: tutorial.xml:501
 #, no-c-format
 msgid ""
 "Have a look at <xref linkend=\"transactions\"/> for more information about "
@@ -1261,7 +1251,7 @@
 "erreurs et rollback sur l'exemple précédent."
 
 #. Tag: para
-#: tutorial.xml:458
+#: tutorial.xml:507
 #, no-c-format
 msgid ""
 "To run this first routine we have to add a callable target to the Ant build "
@@ -1271,7 +1261,7 @@
 "dans le fichier de construction de Ant :"
 
 #. Tag: programlisting
-#: tutorial.xml:462
+#: tutorial.xml:511
 #, no-c-format
 msgid ""
 "<![CDATA[<target name=\"run\" depends=\"compile\">\n"
@@ -1284,7 +1274,7 @@
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:464
+#: tutorial.xml:513
 #, no-c-format
 msgid ""
 "The value of the <literal>action</literal> argument is set on the command "
@@ -1294,13 +1284,13 @@
 "commande qui appelle la cible :"
 
 #. Tag: programlisting
-#: tutorial.xml:469
+#: tutorial.xml:518
 #, no-c-format
 msgid "<![CDATA[C:\\hibernateTutorial\\>ant run -Daction=store]]>"
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:471
+#: tutorial.xml:520
 #, no-c-format
 msgid ""
 "You should see, after compilation, Hibernate starting up and, depending on "
@@ -1312,7 +1302,7 @@
 "trouverez la ligne suivante :"
 
 #. Tag: programlisting
-#: tutorial.xml:476
+#: tutorial.xml:525
 #, no-c-format
 msgid ""
 "<![CDATA[[java] Hibernate: insert into EVENTS (EVENT_DATE, title, EVENT_ID) "
@@ -1320,7 +1310,7 @@
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:478
+#: tutorial.xml:527
 #, no-c-format
 msgid ""
 "This is the <literal>INSERT</literal> executed by Hibernate, the question "
@@ -1334,7 +1324,7 @@
 "<literal>log4j.properties</literal>."
 
 #. Tag: para
-#: tutorial.xml:484
+#: 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 "
@@ -1344,7 +1334,7 @@
 "ajoutons une option à la méthode principale :"
 
 #. Tag: programlisting
-#: tutorial.xml:488
+#: tutorial.xml:537
 #, no-c-format
 msgid ""
 "<![CDATA[if (args[0].equals(\"store\")) {\n"
@@ -1361,14 +1351,14 @@
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:490
+#: tutorial.xml:539
 #, no-c-format
 msgid "We also add a new <literal>listEvents() method</literal>:"
 msgstr ""
 "Nous ajoutons aussi une nouvelle méthode <literal>listEvents()</literal> :"
 
 #. Tag: programlisting
-#: tutorial.xml:494
+#: tutorial.xml:543
 #, no-c-format
 msgid ""
 "<![CDATA[private List listEvents() {\n"
@@ -1387,7 +1377,7 @@
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:496
+#: tutorial.xml:545
 #, no-c-format
 msgid ""
 "What we do here is use an HQL (Hibernate Query Language) query to load all "
@@ -1403,13 +1393,13 @@
 "Vous pouvez créer des requêtes plus complexes avec HQL, bien sûr."
 
 #. Tag: para
-#: tutorial.xml:503
+#: tutorial.xml:552
 #, 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:509
+#: tutorial.xml:558
 #, no-c-format
 msgid ""
 "Run <literal>ant run -Daction=store</literal> to store something into the "
@@ -1421,12 +1411,12 @@
 "de la base de données grâce à hbm2ddl."
 
 #. Tag: para
-#: tutorial.xml:515
-#, no-c-format
+#: 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 continous unit testing, but another run of hbm2ddl would "
+"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"
@@ -1441,7 +1431,7 @@
 "lorsque la SessionFactory est construite\"."
 
 #. Tag: para
-#: tutorial.xml:525
+#: tutorial.xml:574
 #, no-c-format
 msgid ""
 "If you now call Ant with <literal>-Daction=list</literal>, you should see "
@@ -1453,7 +1443,7 @@
 "bien sûr aussi appeler l'action <literal>store</literal> plusieurs fois."
 
 #. Tag: para
-#: tutorial.xml:531
+#: tutorial.xml:580
 #, no-c-format
 msgid ""
 "Note: Most new Hibernate users fail at this point and we see questions about "
@@ -1471,13 +1461,13 @@
 "mapping and/or database schema, you have to re-enable hbm2ddl once again."
 
 #. Tag: title
-#: tutorial.xml:544
+#: tutorial.xml:593
 #, no-c-format
 msgid "Part 2 - Mapping associations"
 msgstr "Partie 2 - Mapper des associations"
 
 #. Tag: para
-#: tutorial.xml:546
+#: tutorial.xml:595
 #, no-c-format
 msgid ""
 "We mapped a persistent entity class to a table. Let's build on this and add "
@@ -1490,20 +1480,20 @@
 "ils participent."
 
 #. Tag: title
-#: tutorial.xml:552
+#: tutorial.xml:601
 #, no-c-format
 msgid "Mapping the Person class"
 msgstr "Mapper la classe Person"
 
 #. Tag: para
-#: tutorial.xml:554
+#: tutorial.xml:603
 #, no-c-format
 msgid "The first cut of the <literal>Person</literal> class is simple:"
 msgstr ""
 "La première version de la classe <literal>Person</literal> est simple :"
 
 #. Tag: programlisting
-#: tutorial.xml:558
+#: tutorial.xml:607
 #, no-c-format
 msgid ""
 "<![CDATA[package events;\n"
@@ -1523,7 +1513,7 @@
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:560
+#: tutorial.xml:609
 #, no-c-format
 msgid ""
 "Create a new mapping file called <literal>Person.hbm.xml</literal> (don't "
@@ -1533,7 +1523,7 @@
 "(n'oubliez pas la référence à la DTD)"
 
 #. Tag: programlisting
-#: tutorial.xml:565
+#: tutorial.xml:614
 #, no-c-format
 msgid ""
 "<![CDATA[<hibernate-mapping>\n"
@@ -1551,14 +1541,14 @@
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:567
+#: tutorial.xml:616
 #, 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:571
+#: tutorial.xml:620
 #, no-c-format
 msgid ""
 "<![CDATA[<mapping resource=\"events/Event.hbm.xml\"/>\n"
@@ -1566,7 +1556,7 @@
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:573
+#: tutorial.xml:622
 #, no-c-format
 msgid ""
 "We'll now create an association between these two entities. Obviously, "
@@ -1580,13 +1570,13 @@
 "traiter sont : direction, cardinalité et comportement de la collection."
 
 #. Tag: title
-#: tutorial.xml:583
+#: tutorial.xml:632
 #, no-c-format
 msgid "A unidirectional Set-based association"
 msgstr "Une association unidirectionnelle basée sur Set"
 
 #. Tag: para
-#: tutorial.xml:585
+#: tutorial.xml:634
 #, no-c-format
 msgid ""
 "We'll add a collection of events to the <literal>Person</literal> class. "
@@ -1604,7 +1594,7 @@
 "contiendra pas d'éléments dupliqués et l'ordre ne nous importe pas."
 
 #. Tag: para
-#: tutorial.xml:592
+#: tutorial.xml:641
 #, no-c-format
 msgid ""
 "We need a unidirectional, many-valued associations, implemented with a "
@@ -1616,7 +1606,7 @@
 "les classes Java et mappons les :"
 
 #. Tag: programlisting
-#: tutorial.xml:597
+#: tutorial.xml:646
 #, no-c-format
 msgid ""
 "<![CDATA[public class Person {\n"
@@ -1634,7 +1624,7 @@
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:599
+#: tutorial.xml:648
 #, no-c-format
 msgid ""
 "Before we map this association, think about the other side. Clearly, we "
@@ -1661,7 +1651,7 @@
 "conséquent nous utilisons un mapping Hibernate many-to-many:"
 
 #. Tag: programlisting
-#: tutorial.xml:610
+#: tutorial.xml:659
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"events.Person\" table=\"PERSON\">\n"
@@ -1681,7 +1671,7 @@
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:612
+#: tutorial.xml:661
 #, no-c-format
 msgid ""
 "Hibernate supports all kinds of collection mappings, a <literal>&lt;set&gt;</"
@@ -1711,13 +1701,13 @@
 "collection)."
 
 #. Tag: para
-#: tutorial.xml:624
+#: tutorial.xml:673
 #, 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:628
+#: tutorial.xml:677
 #, no-c-format
 msgid ""
 "<![CDATA[\n"
@@ -1736,13 +1726,13 @@
 msgstr ""
 
 #. Tag: title
-#: tutorial.xml:633
+#: tutorial.xml:682
 #, no-c-format
 msgid "Working the association"
 msgstr "Travailler avec l'association"
 
 #. Tag: para
-#: tutorial.xml:635
+#: tutorial.xml:684
 #, no-c-format
 msgid ""
 "Let's bring some people and events together in a new method in "
@@ -1752,7 +1742,7 @@
 "méthode dans <literal>EventManager</literal> :"
 
 #. Tag: programlisting
-#: tutorial.xml:639
+#: tutorial.xml:688
 #, no-c-format
 msgid ""
 "<![CDATA[private void addPersonToEvent(Long personId, Long eventId) {\n"
@@ -1771,7 +1761,7 @@
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:641
+#: tutorial.xml:690
 #, no-c-format
 msgid ""
 "After loading a <literal>Person</literal> and an <literal>Event</literal>, "
@@ -1811,7 +1801,7 @@
 "configuration pour la classe <literal>CurrentSessionContext</literal>."
 
 #. Tag: para
-#: tutorial.xml:656
+#: tutorial.xml:705
 #, no-c-format
 msgid ""
 "You might of course load person and event in different units of work. Or you "
@@ -1828,7 +1818,7 @@
 "détachée:"
 
 #. Tag: programlisting
-#: tutorial.xml:663
+#: tutorial.xml:712
 #, no-c-format
 msgid ""
 "<![CDATA[private void addPersonToEvent(Long personId, Long eventId) {\n"
@@ -1866,7 +1856,7 @@
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:665
+#: tutorial.xml:714
 #, no-c-format
 msgid ""
 "The call to <literal>update</literal> makes a detached object persistent "
@@ -1883,7 +1873,7 @@
 "pour retourner cet identifiant)."
 
 #. Tag: para
-#: tutorial.xml:672
+#: tutorial.xml:721
 #, no-c-format
 msgid ""
 "Well, this is not much use in our current situation, but it's an important "
@@ -1902,7 +1892,7 @@
 "d'un événement - la méthode <literal>save()</literal> les retourne."
 
 #. Tag: programlisting
-#: tutorial.xml:680
+#: tutorial.xml:729
 #, no-c-format
 msgid ""
 "<![CDATA[else if (args[0].equals(\"addpersontoevent\")) {\n"
@@ -1915,7 +1905,7 @@
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:682
+#: tutorial.xml:731
 #, no-c-format
 msgid ""
 "This was an example of an association between two equally important classes, "
@@ -1947,7 +1937,7 @@
 "<literal>Address</literal> ou <literal>MonetaryAmount</literal>, par exemple."
 
 #. Tag: para
-#: tutorial.xml:695
+#: tutorial.xml:744
 #, no-c-format
 msgid ""
 "You can also design a collection of value types. This is conceptually very "
@@ -1959,13 +1949,13 @@
 "entités, mais très ressemblant en Java."
 
 #. Tag: title
-#: tutorial.xml:703
+#: tutorial.xml:752
 #, no-c-format
 msgid "Collection of values"
 msgstr "Collection de valeurs"
 
 #. Tag: para
-#: tutorial.xml:705
+#: tutorial.xml:754
 #, no-c-format
 msgid ""
 "We add a collection of value typed objects to the <literal>Person</literal> "
@@ -1979,7 +1969,7 @@
 "encore un <literal>Set</literal> :"
 
 #. Tag: programlisting
-#: tutorial.xml:710
+#: tutorial.xml:759
 #, no-c-format
 msgid ""
 "<![CDATA[private Set emailAddresses = new HashSet();\n"
@@ -1994,13 +1984,13 @@
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:712
+#: tutorial.xml:761
 #, no-c-format
 msgid "The mapping of this <literal>Set</literal>:"
 msgstr "Le mapping de ce <literal>Set</literal> :"
 
 #. Tag: programlisting
-#: tutorial.xml:716
+#: tutorial.xml:765
 #, no-c-format
 msgid ""
 "<![CDATA[<set name=\"emailAddresses\" table=\"PERSON_EMAIL_ADDR\">\n"
@@ -2010,7 +2000,7 @@
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:718
+#: tutorial.xml:767
 #, no-c-format
 msgid ""
 "The difference compared with the earlier mapping is the <literal>element</"
@@ -2037,13 +2027,13 @@
 "valeurs de <literal>String</literal> seront réellement stockées."
 
 #. Tag: para
-#: tutorial.xml:728
+#: tutorial.xml:777
 #, no-c-format
 msgid "Have a look at the updated schema:"
 msgstr "Regardons le schéma mis à jour :"
 
 #. Tag: programlisting
-#: tutorial.xml:732
+#: tutorial.xml:781
 #, no-c-format
 msgid ""
 "<![CDATA[\n"
@@ -2069,7 +2059,7 @@
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:734
+#: tutorial.xml:783
 #, no-c-format
 msgid ""
 "You can see that the primary key of the collection table is in fact a "
@@ -2083,7 +2073,7 @@
 "exactement la sémantique dont nous avons besoin pour un ensemble en Java."
 
 #. Tag: para
-#: tutorial.xml:740
+#: tutorial.xml:789
 #, no-c-format
 msgid ""
 "You can now try and add elements to this collection, just like we did before "
@@ -2094,7 +2084,7 @@
 "événements. C'est le même code en Java."
 
 #. Tag: programlisting
-#: tutorial.xml:745
+#: tutorial.xml:794
 #, no-c-format
 msgid ""
 "<![CDATA[private void addEmailToPerson(Long personId, String emailAddress) "
@@ -2114,10 +2104,10 @@
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:747
-#, no-c-format
+#: tutorial.xml:796
+#, fuzzy, no-c-format
 msgid ""
-"This time we didnt' use a <emphasis>fetch</emphasis> query to initialize the "
+"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."
@@ -2129,13 +2119,13 @@
 "chargement aggressif."
 
 #. Tag: title
-#: tutorial.xml:757
+#: tutorial.xml:806
 #, no-c-format
 msgid "Bi-directional associations"
 msgstr "Associations bidirectionnelles"
 
 #. Tag: para
-#: tutorial.xml:759
+#: tutorial.xml:808
 #, no-c-format
 msgid ""
 "Next we are going to map a bi-directional association - making the "
@@ -2154,7 +2144,7 @@
 "vues et récupérées de toutes les manières possibles."
 
 #. Tag: para
-#: tutorial.xml:767
+#: tutorial.xml:816
 #, no-c-format
 msgid ""
 "First, add a collection of participants to the <literal>Event</literal> "
@@ -2164,7 +2154,7 @@
 "literal> :"
 
 #. Tag: programlisting
-#: tutorial.xml:771
+#: tutorial.xml:820
 #, no-c-format
 msgid ""
 "<![CDATA[private Set participants = new HashSet();\n"
@@ -2179,7 +2169,7 @@
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:773
+#: tutorial.xml:822
 #, no-c-format
 msgid ""
 "Now map this side of the association too, in <literal>Event.hbm.xml</"
@@ -2189,7 +2179,7 @@
 "xml</literal>."
 
 #. Tag: programlisting
-#: tutorial.xml:777
+#: tutorial.xml:826
 #, no-c-format
 msgid ""
 "<![CDATA[<set name=\"participants\" table=\"PERSON_EVENT\" inverse=\"true"
@@ -2200,7 +2190,7 @@
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:779
+#: tutorial.xml:828
 #, no-c-format
 msgid ""
 "As you see, these are normal <literal>set</literal> mappings in both mapping "
@@ -2218,7 +2208,7 @@
 "mapping de la collection des <literal>Event</literal>s."
 
 #. Tag: para
-#: tutorial.xml:787
+#: tutorial.xml:836
 #, no-c-format
 msgid ""
 "What this means is that Hibernate should take the other side - the "
@@ -2233,13 +2223,13 @@
 "est créé."
 
 #. Tag: title
-#: tutorial.xml:796
+#: tutorial.xml:845
 #, no-c-format
 msgid "Working bi-directional links"
 msgstr "Travailler avec des liens bidirectionnels"
 
 #. Tag: para
-#: tutorial.xml:798
+#: tutorial.xml:847
 #, no-c-format
 msgid ""
 "First, keep in mind that Hibernate does not affect normal Java semantics. "
@@ -2264,10 +2254,10 @@
 "vous ne devriez jamais oublier de le faire."
 
 #. Tag: para
-#: tutorial.xml:808
-#, no-c-format
+#: tutorial.xml:857
+#, fuzzy, no-c-format
 msgid ""
-"Many developers program defensive and create link management methods to "
+"Many developers program defensively and create link management methods to "
 "correctly set both sides, e.g. in <literal>Person</literal>:"
 msgstr ""
 "Beaucoup de développeurs programment de manière défensive et créent des "
@@ -2275,7 +2265,7 @@
 "exemple dans <literal>Person</literal> :"
 
 #. Tag: programlisting
-#: tutorial.xml:813
+#: tutorial.xml:862
 #, no-c-format
 msgid ""
 "<![CDATA[protected Set getEvents() {\n"
@@ -2298,7 +2288,7 @@
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:815
+#: tutorial.xml:864
 #, no-c-format
 msgid ""
 "Notice that the get and set methods for the collection are now protected - "
@@ -2314,7 +2304,7 @@
 "probablement faire de même avec la collection de l'autre côté."
 
 #. Tag: para
-#: tutorial.xml:822
+#: tutorial.xml:871
 #, no-c-format
 msgid ""
 "What about the <literal>inverse</literal> mapping attribute? For you, and "
@@ -2349,20 +2339,20 @@
 "vers-plusieurs vous pouvez choisir n'importe quel côté, il n'y a pas de "
 "différence."
 
-#. 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:889
 #, no-c-format
 msgid "Part 3 - The EventManager web application"
 msgstr "Part 3 - L'application web EventManager"
 
 #. Tag: para
-#: tutorial.xml:846
+#: tutorial.xml:891
+#, 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 "
@@ -2379,13 +2369,13 @@
 "pour saisir d'autres évènements."
 
 #. Tag: title
-#: tutorial.xml:854
+#: tutorial.xml:903
 #, no-c-format
 msgid "Writing the basic servlet"
 msgstr "Ecrire la servlet de base"
 
 #. Tag: para
-#: tutorial.xml:856
+#: tutorial.xml:905
 #, no-c-format
 msgid ""
 "Create a new class in your source directory, in the <literal>events</"
@@ -2395,7 +2385,7 @@
 "<literal>events</literal>:"
 
 #. Tag: programlisting
-#: tutorial.xml:861
+#: tutorial.xml:910
 #, no-c-format
 msgid ""
 "<![CDATA[package events;\n"
@@ -2409,7 +2399,7 @@
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:863
+#: tutorial.xml:912
 #, no-c-format
 msgid ""
 "The servlet handles HTTP <literal>GET</literal> requests only, hence, the "
@@ -2419,7 +2409,7 @@
 "method we implement is <literal>doGet()</literal>:"
 
 #. Tag: programlisting
-#: tutorial.xml:868
+#: tutorial.xml:917
 #, no-c-format
 msgid ""
 "<![CDATA[protected void doGet(HttpServletRequest request,\n"
@@ -2449,7 +2439,7 @@
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:870
+#: tutorial.xml:919
 #, fuzzy, no-c-format
 msgid ""
 "The pattern we are applying here is called <emphasis>session-per-request</"
@@ -2470,7 +2460,7 @@
 "n'utilisons pas le mode auto-commit dans les applications)."
 
 #. Tag: para
-#: tutorial.xml:879
+#: tutorial.xml:928
 #, no-c-format
 msgid ""
 "Do <emphasis>not</emphasis> use a new Hibernate <literal>Session</literal> "
@@ -2485,7 +2475,7 @@
 "the current Java thread."
 
 #. Tag: para
-#: tutorial.xml:886
+#: tutorial.xml:935
 #, no-c-format
 msgid ""
 "Next, the possible actions of the request are processed and the response "
@@ -2495,11 +2485,11 @@
 "HTML est rendue. Nous en parlerons plus tard."
 
 #. Tag: para
-#: tutorial.xml:891
+#: tutorial.xml:940
 #, 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 "
+"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 "
@@ -2518,20 +2508,20 @@
 "pour le rendu de vos vues."
 
 #. Tag: title
-#: tutorial.xml:905
+#: tutorial.xml:954
 #, no-c-format
 msgid "Processing and rendering"
 msgstr "Procéder et rendre"
 
 #. Tag: para
-#: tutorial.xml:907
+#: tutorial.xml:956
 #, no-c-format
 msgid ""
 "Let's implement the processing of the request and rendering of the page."
 msgstr "Implémentons l'exécution de la requête et le rendu de la page."
 
 #. Tag: programlisting
-#: tutorial.xml:911
+#: tutorial.xml:960
 #, no-c-format
 msgid ""
 "<![CDATA[// Write HTML header\n"
@@ -2563,7 +2553,7 @@
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:913
+#: tutorial.xml:962
 #, fuzzy, no-c-format
 msgid ""
 "Granted, this coding style with a mix of Java and HTML would not scale in a "
@@ -2582,7 +2572,7 @@
 "fait que sortir de l'HTML:"
 
 #. Tag: programlisting
-#: tutorial.xml:922
+#: tutorial.xml:971
 #, no-c-format
 msgid ""
 "<![CDATA[private void printEventForm(PrintWriter out) {\n"
@@ -2597,7 +2587,7 @@
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:924
+#: tutorial.xml:973
 #, no-c-format
 msgid ""
 "The <literal>listEvents()</literal> method uses the Hibernate "
@@ -2607,7 +2597,7 @@
 "literal> Hibernate liée au thread courant pour exécuter la requête:"
 
 #. Tag: programlisting
-#: tutorial.xml:930
+#: tutorial.xml:979
 #, no-c-format
 msgid ""
 "<![CDATA[private void listEvents(PrintWriter out, SimpleDateFormat "
@@ -2637,7 +2627,7 @@
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:932
+#: tutorial.xml:981
 #, no-c-format
 msgid ""
 "Finally, the <literal>store</literal> action is dispatched to the "
@@ -2649,7 +2639,7 @@
 "<literal>Session</literal> du thread courant:"
 
 #. Tag: programlisting
-#: tutorial.xml:938
+#: tutorial.xml:987
 #, no-c-format
 msgid ""
 "<![CDATA[protected void createAndStoreEvent(String title, Date theDate) {\n"
@@ -2663,13 +2653,13 @@
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:940
-#, no-c-format
+#: tutorial.xml:989
+#, 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 "
+"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 "
@@ -2685,13 +2675,13 @@
 "Voir le wiki Hibernate pour plus d'exemples."
 
 #. Tag: title
-#: tutorial.xml:954
+#: tutorial.xml:1003
 #, no-c-format
 msgid "Deploying and testing"
 msgstr "Déployer et tester"
 
 #. Tag: para
-#: tutorial.xml:956
+#: tutorial.xml:1005
 #, no-c-format
 msgid ""
 "To deploy this application you have to create a web archive, a WAR. Add the "
@@ -2701,7 +2691,7 @@
 "Ajoutez la cible Ant suivante dans votre <literal>build.xml</literal>:"
 
 #. Tag: programlisting
-#: tutorial.xml:961
+#: tutorial.xml:1010
 #, no-c-format
 msgid ""
 "<![CDATA[<target name=\"war\" depends=\"compile\">\n"
@@ -2716,7 +2706,7 @@
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:963
+#: tutorial.xml:1012
 #, no-c-format
 msgid ""
 "This target creates a file called <literal>hibernate-tutorial.war</literal> "
@@ -2730,7 +2720,7 @@
 "racine de votre projet:"
 
 #. Tag: programlisting
-#: tutorial.xml:969
+#: tutorial.xml:1018
 #, no-c-format
 msgid ""
 "<![CDATA[<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
@@ -2753,14 +2743,14 @@
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:971
-#, no-c-format
+#: tutorial.xml:1020
+#, 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."
+"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 "
@@ -2771,7 +2761,7 @@
 "pour la compilation et sera exclue du paackage WAR."
 
 #. Tag: para
-#: tutorial.xml:979
+#: tutorial.xml:1028
 #, no-c-format
 msgid ""
 "To build and deploy call <literal>ant war</literal> in your project "
@@ -2788,7 +2778,7 @@
 "application."
 
 #. Tag: para
-#: tutorial.xml:987
+#: tutorial.xml:1036
 #, no-c-format
 msgid ""
 "Once deployed and Tomcat is running, access the application at "
@@ -2806,13 +2796,13 @@
 "vérifier qu'aucune exception ne survienne."
 
 #. Tag: title
-#: tutorial.xml:1000
+#: tutorial.xml:1049
 #, no-c-format
 msgid "Summary"
 msgstr "Résumé"
 
 #. Tag: para
-#: tutorial.xml:1002
+#: tutorial.xml:1051
 #, no-c-format
 msgid ""
 "This tutorial covered the basics of writing a simple standalone Hibernate "
@@ -2822,7 +2812,7 @@
 "Hibernate ainsi qu'une petite application web."
 
 #. Tag: para
-#: tutorial.xml:1007
+#: tutorial.xml:1056
 #, no-c-format
 msgid ""
 "If you already feel confident with Hibernate, continue browsing through the "
@@ -2841,10 +2831,89 @@
 "fonctionnalités des requêtes (<xref linkend=\"objectstate-querying\"/>)."
 
 #. Tag: para
-#: tutorial.xml:1015
+#: 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 ""
+#~ "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 ""
+#~ "Ce chapitre est un didacticiel introductif destiné aux nouveaux "
+#~ "utilisateurs d'Hibernate. Nous commençons avec une simple application en "
+#~ "ligne de commande utilisant une base de données en mémoire, et la "
+#~ "développons en étapes faciles à comprendre."
+
+#~ 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 ""
+#~ "Ce didacticiel est destiné aux nouveaux utilisateurs d'Hibernate mais "
+#~ "requiert des connaissances Java et SQL. Il est basé sur un didacticiel de "
+#~ "Michael Gloegl, les bibliothèques tierces que nous nommons sont pour les "
+#~ "JDK 1.4 et 5.0. Vous pourriez avoir besoin d'autres bibliothèques pour le "
+#~ "JDK 1.3."
+
+#~ msgid ""
+#~ "The source code for the tutorial is included in the distribution in the "
+#~ "<literal>doc/reference/tutorial/</literal> directory."
+#~ msgstr ""
+#~ "Le code source de ce tutoriel est inclus dans la distribution dans le "
+#~ "répertoire <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 ""
+#~ "D'abord, nous créerons une simple application Hibernate en console. Nous "
+#~ "utilisons une base de données en mémoire (HSQL DB), donc nous n'avons pas "
+#~ "à 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 "
+#~ "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 première chose que nous faisons est de configurer notre répertoire de "
+#~ "développement et de mettre toutes les bibliothèques dont nous avons "
+#~ "besoin dedans. Téléchargez la distribution Hibernate à partir du site web "
+#~ "d'Hibernate. Extrayez le paquet et placez toutes les bibliothèques "
+#~ "requises trouvées dans <literal>/lib</literal> dans le répertoire "
+#~ "<literal>/lib</literal> de votre nouveau répertoire de travail. Il "
+#~ "devrait ressembler à ça :"
+
+#~ 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 ""
+#~ "Ceci est l'ensemble minimum de bibliothèques requises (notez que nous "
+#~ "avons aussi copié hibernate3.jar, l'archive principale) pour Hibernate. "
+#~ "Lisez le fichier <literal>README.txt</literal> dans le répertoire "
+#~ "<literal>lib/</literal> de la distribution Hibernate pour plus "
+#~ "d'informations à propos des biliothèques tierces requises et "
+#~ "optionnelles. (En fait, log4j n'est pas requis mais préféré par beaucoup "
+#~ "de développeurs.)"

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	2008-08-14 15:28:13 UTC (rev 15066)
+++ core/trunk/documentation/manual/src/main/docbook/fr-FR/content/xml.po	2008-08-14 15:35:40 UTC (rev 15067)
@@ -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: 2008-08-14 15:28+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,13 +11,13 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: xml.xml:5
+#: xml.xml:29
 #, no-c-format
 msgid "XML Mapping"
 msgstr "Mapping XML"
 
 #. Tag: emphasis
-#: xml.xml:7
+#: xml.xml:31
 #, no-c-format
 msgid ""
 "Note that this is an experimental feature in Hibernate 3.0 and is under "
@@ -27,13 +27,13 @@
 "en développement extrêmement actif."
 
 #. Tag: title
-#: xml.xml:13
+#: xml.xml:37
 #, no-c-format
 msgid "Working with XML data"
 msgstr "Travailler avec des données XML"
 
 #. Tag: para
-#: xml.xml:15
+#: xml.xml:39
 #, no-c-format
 msgid ""
 "Hibernate lets you work with persistent XML data in much the same way you "
@@ -47,7 +47,7 @@
 "relationnelles au niveau objet, à la place des 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 @@
 "(merge() n'est pas encore supporté)."
 
 #. Tag: para
-#: xml.xml:32
+#: xml.xml:56
 #, no-c-format
 msgid ""
 "This feature has many applications including data import/export, "
@@ -78,7 +78,7 @@
 "données, l'externalisation d'entités via JMS ou SOAP et les rapports XSLT."
 
 #. Tag: para
-#: xml.xml:37
+#: xml.xml:61
 #, no-c-format
 msgid ""
 "A single mapping may be used to simultaneously map properties of a class and "
@@ -91,19 +91,19 @@
 "XML."
 
 #. Tag: title
-#: xml.xml:44
+#: xml.xml:68
 #, no-c-format
 msgid "Specifying XML and class mapping together"
 msgstr "Spécifier le mapping XML et le mapping d'une classe ensemble"
 
 #. Tag: para
-#: xml.xml:46
+#: xml.xml:70
 #, no-c-format
 msgid "Here is an example of mapping a POJO and XML simultaneously:"
 msgstr "Voici un exemple de mapping d'un POJO et du XML simultanément :"
 
 #. Tag: programlisting
-#: xml.xml:50
+#: xml.xml:74
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Account\" \n"
@@ -129,19 +129,19 @@
 msgstr ""
 
 #. Tag: title
-#: xml.xml:54
+#: xml.xml:78
 #, no-c-format
 msgid "Specifying only an XML mapping"
 msgstr "Spécifier seulement un mapping XML"
 
 #. Tag: para
-#: xml.xml:56
+#: xml.xml:80
 #, no-c-format
 msgid "Here is an example where there is no POJO class:"
 msgstr "Voici un exemple dans lequel il n'y a pas de class POJO :"
 
 #. Tag: programlisting
-#: xml.xml:60
+#: xml.xml:84
 #, no-c-format
 msgid ""
 "<![CDATA[<class entity-name=\"Account\" \n"
@@ -170,7 +170,7 @@
 msgstr ""
 
 #. Tag: para
-#: xml.xml:62
+#: xml.xml:86
 #, no-c-format
 msgid ""
 "This mapping allows you to access the data as a dom4j tree, or as a graph of "
@@ -183,13 +183,13 @@
 "être référées des dans requêtes HQL."
 
 #. Tag: title
-#: xml.xml:73
+#: xml.xml:97
 #, no-c-format
 msgid "XML mapping metadata"
 msgstr "Métadonnées du mapping XML"
 
 #. Tag: para
-#: xml.xml:75
+#: xml.xml:99
 #, no-c-format
 msgid ""
 "Many Hibernate mapping elements accept the <literal>node</literal> "
@@ -203,26 +203,26 @@
 "l'attribut <literal>node</literal> doit être un des suivants :"
 
 #. Tag: para
-#: xml.xml:84
+#: xml.xml:108
 #, 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:87
+#: xml.xml:111
 #, 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:90
+#: xml.xml:114
 #, 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:93
+#: xml.xml:117
 #, no-c-format
 msgid ""
 "<literal>\"element-name/@attribute-name\"</literal> - map to the named "
@@ -232,7 +232,7 @@
 "nommé de l'attribut nommé"
 
 #. Tag: para
-#: xml.xml:100
+#: xml.xml:124
 #, no-c-format
 msgid ""
 "For collections and single valued associations, there is an additional "
@@ -253,7 +253,7 @@
 "de points, et les collections n'appraîtront simplement pas."
 
 #. Tag: para
-#: xml.xml:110
+#: xml.xml:134
 #, no-c-format
 msgid ""
 "You should be careful not to leave <literal>embed-xml=\"true\"</literal> for "
@@ -264,7 +264,7 @@
 "circurlaires."
 
 #. Tag: programlisting
-#: xml.xml:115
+#: xml.xml:139
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Customer\" \n"
@@ -304,7 +304,7 @@
 msgstr ""
 
 #. Tag: para
-#: xml.xml:117
+#: xml.xml:141
 #, no-c-format
 msgid ""
 "in this case, we have decided to embed the collection of account ids, but "
@@ -314,7 +314,7 @@
 "compte, mais pas les données actuelles du compte. La requête HQL suivante :"
 
 #. 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 :"
@@ -322,13 +322,13 @@
 msgstr ""
 
 #. Tag: para
-#: xml.xml:124
+#: xml.xml:148
 #, no-c-format
 msgid "Would return datasets such as this:"
 msgstr "devrait retourner l'ensemble de données suivant :"
 
 #. Tag: programlisting
-#: xml.xml:128
+#: xml.xml:152
 #, no-c-format
 msgid ""
 "<![CDATA[<customer id=\"123456789\">\n"
@@ -344,7 +344,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-"
@@ -355,7 +355,7 @@
 "plus à ça :"
 
 #. Tag: programlisting
-#: xml.xml:135
+#: xml.xml:159
 #, no-c-format
 msgid ""
 "<![CDATA[<customer id=\"123456789\">\n"
@@ -377,13 +377,13 @@
 msgstr ""
 
 #. Tag: title
-#: xml.xml:141
+#: xml.xml:165
 #, no-c-format
 msgid "Manipulating XML data"
 msgstr "Manipuler des données XML"
 
 #. Tag: para
-#: xml.xml:143
+#: xml.xml:167
 #, no-c-format
 msgid ""
 "Let's rearead and update XML documents in the application. We do this by "
@@ -393,7 +393,7 @@
 "faisons ça en obtenant une session dom4j :"
 
 #. Tag: programlisting
-#: xml.xml:148
+#: xml.xml:172
 #, no-c-format
 msgid ""
 "<![CDATA[Document doc = ....;\n"
@@ -417,7 +417,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: xml.xml:150
+#: xml.xml:174
 #, no-c-format
 msgid ""
 "<![CDATA[Session session = factory.openSession();\n"
@@ -439,7 +439,7 @@
 msgstr ""
 
 #. Tag: para
-#: xml.xml:152
+#: xml.xml:176
 #, no-c-format
 msgid ""
 "It is extremely useful to combine this feature with Hibernate's "

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	2008-08-14 15:28:13 UTC (rev 15066)
+++ core/trunk/documentation/manual/src/main/docbook/ja-JP/content/transactions.po	2008-08-14 15:35:40 UTC (rev 15067)
@@ -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: 2008-08-14 15:28+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,13 +11,13 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: transactions.xml:5
+#: transactions.xml:29
 #, no-c-format
 msgid "Transactions And Concurrency"
 msgstr "トランザクションと並行性"
 
 #. Tag: para
-#: transactions.xml:7
+#: transactions.xml:31
 #, no-c-format
 msgid ""
 "The most important point about Hibernate and concurrency control is that it "
@@ -32,7 +32,7 @@
 "ランザクション分離の仕様を 少し時間をかけて勉強することを強く推奨します。"
 
 #. Tag: para
-#: transactions.xml:14
+#: transactions.xml:38
 #, no-c-format
 msgid ""
 "Hibernate does not lock objects in memory. Your application can expect the "
@@ -49,7 +49,7 @@
 "(スカラー値を返すようなレポートクエリは違います)。"
 
 #. Tag: para
-#: transactions.xml:22
+#: transactions.xml:46
 #, no-c-format
 msgid ""
 "In addition to versioning for automatic optimistic concurrency control, "
@@ -63,7 +63,7 @@
 "ます。"
 
 #. Tag: para
-#: transactions.xml:29
+#: transactions.xml:53
 #, no-c-format
 msgid ""
 "We start the discussion of concurrency control in Hibernate with the "
@@ -77,13 +77,13 @@
 "行制御の議論を始めます。"
 
 #. Tag: title
-#: transactions.xml:36
+#: transactions.xml:60
 #, no-c-format
 msgid "Session and transaction scopes"
 msgstr "sessionスコープとtransactionスコープ"
 
 #. Tag: para
-#: transactions.xml:38
+#: transactions.xml:62
 #, no-c-format
 msgid ""
 "A <literal>SessionFactory</literal> is an expensive-to-create, threadsafe "
@@ -97,7 +97,7 @@
 "スタンスから1度だけ生成します。"
 
 #. Tag: para
-#: transactions.xml:44
+#: transactions.xml:68
 #, no-c-format
 msgid ""
 "A <literal>Session</literal> is an inexpensive, non-threadsafe object that "
@@ -114,7 +114,7 @@
 "でリソースを消費しません。"
 
 #. Tag: para
-#: transactions.xml:52
+#: transactions.xml:76
 #, no-c-format
 msgid ""
 "To complete this picture you also have to think about database transactions. "
@@ -132,7 +132,7 @@
 "るのは、たいていの場合よい設計とはいえません。"
 
 #. Tag: para
-#: transactions.xml:61
+#: transactions.xml:85
 #, no-c-format
 msgid ""
 "What is the scope of a unit of work? Can a single Hibernate "
@@ -148,13 +148,13 @@
 "境界をどのように分けるのでしょうか?"
 
 #. Tag: title
-#: transactions.xml:69
+#: transactions.xml:93
 #, no-c-format
 msgid "Unit of work"
 msgstr "作業単位(Unit of work)"
 
 #. Tag: para
-#: transactions.xml:71
+#: transactions.xml:95
 #, no-c-format
 msgid ""
 "First, don't use the <emphasis>session-per-operation</emphasis> antipattern, "
@@ -189,12 +189,12 @@
 "ん。 後者は保守性や拡張性もよりすぐれています。"
 
 #. Tag: para
-#: transactions.xml:87
-#, no-c-format
+#: transactions.xml:111
+#, 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 "
@@ -215,13 +215,13 @@
 "す。 このモデルは多くのアプリケーションに完全に適合します。"
 
 #. Tag: para
-#: transactions.xml:99
-#, no-c-format
+#: transactions.xml:123
+#, 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 "
+"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 "
@@ -243,7 +243,7 @@
 "ほうがよいです。"
 
 #. Tag: para
-#: transactions.xml:112
+#: transactions.xml:136
 #, no-c-format
 msgid ""
 "Your application code can access a \"current session\" to process the "
@@ -261,7 +261,7 @@
 "current-session\"/> を参照してください)。"
 
 #. Tag: para
-#: transactions.xml:120
+#: transactions.xml:144
 #, no-c-format
 msgid ""
 "Sometimes it is convenient to extend the scope of a <literal>Session</"
@@ -286,13 +286,13 @@
 "いては、 HibernateのWebサイトやフォーラムを参照してください。"
 
 #. Tag: title
-#: transactions.xml:135
+#: transactions.xml:159
 #, no-c-format
 msgid "Long conversations"
 msgstr "長い対話"
 
 #. Tag: para
-#: transactions.xml:137
+#: transactions.xml:161
 #, no-c-format
 msgid ""
 "The session-per-request pattern is not the only useful concept you can use "
@@ -308,7 +308,7 @@
 "まで渡ることは許されません。 次の例をよく考えてみてください。"
 
 #. Tag: para
-#: transactions.xml:147
+#: transactions.xml:171
 #, no-c-format
 msgid ""
 "The first screen of a dialog opens, the data seen by the user has been "
@@ -320,7 +320,7 @@
 "ブジェクトを自由に修正できます。"
 
 #. Tag: para
-#: transactions.xml:154
+#: transactions.xml:178
 #, no-c-format
 msgid ""
 "The user clicks \"Save\" after 5 minutes and expects his modifications to be "
@@ -332,7 +332,7 @@
 "待します。"
 
 #. Tag: para
-#: transactions.xml:162
+#: transactions.xml:186
 #, no-c-format
 msgid ""
 "We call this unit of work, from the point of view of the user, a long "
@@ -345,7 +345,7 @@
 "リケーションにこれを実装する方法はたくさんあります。"
 
 #. Tag: para
-#: transactions.xml:168
+#: transactions.xml:192
 #, no-c-format
 msgid ""
 "A first naive implementation might keep the <literal>Session</literal> and "
@@ -362,11 +362,11 @@
 "す。"
 
 #. Tag: para
-#: transactions.xml:176
-#, no-c-format
+#: transactions.xml:200
+#, 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 "
+"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 "
@@ -384,12 +384,12 @@
 "ば、特に簡単です。"
 
 #. Tag: para
-#: transactions.xml:189
-#, no-c-format
+#: transactions.xml:213
+#, 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 "
+"concurrent modification occurred during user think time. Usually we only "
 "check at the end of the conversation."
 msgstr ""
 "<emphasis>自動バージョニング</emphasis> - Hibernateは自動的に楽観的同時実行制"
@@ -397,7 +397,7 @@
 "きます。 通常、対話の終了時にチェックするだけです。"
 
 #. Tag: para
-#: transactions.xml:197
+#: transactions.xml:221
 #, no-c-format
 msgid ""
 "<emphasis>Detached Objects</emphasis> - If you decide to use the already "
@@ -416,8 +416,8 @@
 "きます。"
 
 #. Tag: para
-#: transactions.xml:207
-#, no-c-format
+#: transactions.xml:231
+#, fuzzy, no-c-format
 msgid ""
 "<emphasis>Extended (or Long) Session</emphasis> - The Hibernate "
 "<literal>Session</literal> may be disconnected from the underlying JDBC "
@@ -426,7 +426,7 @@
 "<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."
+"be flushed automatically, but explicitly."
 msgstr ""
 "<emphasis>拡張(もしくは、長い)セッション</emphasis> - Hibernateの "
 "<literal>Session</literal> は、 データベーストランザクションをコミットした"
@@ -438,7 +438,7 @@
 "を自動的にフラッシュさせず、 明示的にフラッシュします。"
 
 #. Tag: para
-#: transactions.xml:220
+#: transactions.xml:244
 #, no-c-format
 msgid ""
 "Both <emphasis>session-per-request-with-detached-objects</emphasis> and "
@@ -452,13 +452,13 @@
 "します。"
 
 #. Tag: title
-#: transactions.xml:229
+#: transactions.xml:253
 #, no-c-format
 msgid "Considering object identity"
 msgstr "オブジェクト識別子を考える"
 
 #. Tag: para
-#: transactions.xml:231
+#: transactions.xml:255
 #, no-c-format
 msgid ""
 "An application may concurrently access the same persistent state in two "
@@ -472,31 +472,31 @@
 "識別子には2つの異なる概念があるということになります。"
 
 #. Tag: term
-#: transactions.xml:240
+#: transactions.xml:264
 #, no-c-format
 msgid "Database Identity"
 msgstr "データベース識別子"
 
 #. Tag: literal
-#: transactions.xml:243
+#: transactions.xml:267
 #, no-c-format
 msgid "foo.getId().equals( bar.getId() )"
 msgstr "foo.getId().equals( bar.getId() )"
 
 #. Tag: term
-#: transactions.xml:248
+#: transactions.xml:272
 #, no-c-format
 msgid "JVM Identity"
 msgstr "JVM識別子"
 
 #. Tag: literal
-#: transactions.xml:251
+#: transactions.xml:275
 #, no-c-format
 msgid "foo==bar"
 msgstr "foo==bar"
 
 #. Tag: para
-#: transactions.xml:257
+#: transactions.xml:281
 #, fuzzy, no-c-format
 msgid ""
 "Then for objects attached to a <emphasis>particular</emphasis> "
@@ -518,7 +518,7 @@
 "す。"
 
 #. Tag: para
-#: transactions.xml:266
+#: transactions.xml:290
 #, no-c-format
 msgid ""
 "This approach leaves Hibernate and the database to worry about concurrency; "
@@ -538,7 +538,7 @@
 "めに、 <literal>==</literal> を安全に使用できます。"
 
 #. Tag: para
-#: transactions.xml:275
+#: transactions.xml:299
 #, no-c-format
 msgid ""
 "However, an application that uses <literal>==</literal> outside of a "
@@ -580,13 +580,13 @@
 "ジェクトの識別子や等価性を どのように実装すべきかということです。"
 
 #. Tag: title
-#: transactions.xml:296
+#: transactions.xml:320
 #, no-c-format
 msgid "Common issues"
 msgstr "一般的な問題"
 
 #. Tag: para
-#: transactions.xml:298
+#: transactions.xml:322
 #, no-c-format
 msgid ""
 "Never use the anti-patterns <emphasis>session-per-user-session</emphasis> or "
@@ -601,7 +601,7 @@
 "現します。 設計を決定する前に、裏の意味を理解するようにしてください。"
 
 #. Tag: para
-#: transactions.xml:307
+#: transactions.xml:331
 #, no-c-format
 msgid ""
 "A <literal>Session</literal> is not thread-safe. Things which are supposed "
@@ -623,7 +623,7 @@
 "れます。"
 
 #. Tag: para
-#: transactions.xml:318
+#: transactions.xml:342
 #, no-c-format
 msgid ""
 "An exception thrown by Hibernate means you have to rollback your database "
@@ -646,7 +646,7 @@
 "ないからです。 とにかくロールバックした後にやり直すべきです。"
 
 #. Tag: para
-#: transactions.xml:330
+#: transactions.xml:354
 #, no-c-format
 msgid ""
 "The <literal>Session</literal> caches every object that is in persistent "
@@ -672,16 +672,16 @@
 "す。"
 
 #. Tag: title
-#: transactions.xml:348
+#: transactions.xml:372
 #, no-c-format
 msgid "Database transaction demarcation"
 msgstr "データベーストランザクション境界"
 
 #. Tag: para
-#: transactions.xml:350
-#, no-c-format
+#: transactions.xml:374
+#, 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 "
@@ -700,7 +700,7 @@
 "込みであっても)パフォーマンスがすぐれています。"
 
 #. Tag: para
-#: transactions.xml:360
+#: transactions.xml:384
 #, no-c-format
 msgid ""
 "A Hibernate application can run in non-managed (i.e. standalone, simple Web- "
@@ -725,13 +725,13 @@
 "せん。"
 
 #. Tag: para
-#: transactions.xml:370
-#, no-c-format
+#: transactions.xml:394
+#, 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 "
+"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."
@@ -744,7 +744,7 @@
 "を強く推奨します。"
 
 #. Tag: para
-#: transactions.xml:379
+#: transactions.xml:403
 #, no-c-format
 msgid ""
 "Usually, ending a <literal>Session</literal> involves four distinct phases:"
@@ -752,31 +752,31 @@
 "通常、<literal>Session</literal> 終了は、4つの異なるフェーズを含みます。"
 
 #. Tag: para
-#: transactions.xml:385
+#: transactions.xml:409
 #, no-c-format
 msgid "flush the session"
 msgstr "セッションのフラッシュ"
 
 #. Tag: para
-#: transactions.xml:390
+#: transactions.xml:414
 #, no-c-format
 msgid "commit the transaction"
 msgstr "トランザクションのコミット"
 
 #. Tag: para
-#: transactions.xml:395
+#: transactions.xml:419
 #, no-c-format
 msgid "close the session"
 msgstr "セッションのクローズ"
 
 #. Tag: para
-#: transactions.xml:400
+#: transactions.xml:424
 #, no-c-format
 msgid "handle exceptions"
 msgstr "例外のハンドリング"
 
 #. Tag: para
-#: transactions.xml:406
+#: transactions.xml:430
 #, no-c-format
 msgid ""
 "Flushing the session has been discussed earlier, we'll now have a closer "
@@ -788,13 +788,13 @@
 "グをもっと詳しく見ていきましょう。"
 
 #. Tag: title
-#: transactions.xml:413
+#: transactions.xml:437
 #, no-c-format
 msgid "Non-managed environment"
 msgstr "管理されていない環境"
 
 #. Tag: para
-#: transactions.xml:415
+#: transactions.xml:439
 #, no-c-format
 msgid ""
 "If a Hibernate persistence layer runs in a non-managed environment, database "
@@ -808,7 +808,7 @@
 "します。 セッション/トランザクション制御のイディオムは次のようになります。"
 
 #. Tag: programlisting
-#: transactions.xml:422
+#: transactions.xml:446
 #, no-c-format
 msgid ""
 "<![CDATA[// Non-managed environment idiom\n"
@@ -832,7 +832,7 @@
 msgstr ""
 
 #. Tag: para
-#: transactions.xml:424
+#: transactions.xml:448
 #, no-c-format
 msgid ""
 "You don't have to <literal>flush()</literal> the <literal>Session</literal> "
@@ -853,7 +853,7 @@
 "きます。"
 
 #. Tag: para
-#: transactions.xml:433
+#: transactions.xml:457
 #, no-c-format
 msgid ""
 "A much more flexible solution is Hibernate's built-in \"current session\" "
@@ -863,7 +863,7 @@
 "コンテキスト管理です。 言葉で説明するより下記を見たほうが速いでしょう。"
 
 #. Tag: programlisting
-#: transactions.xml:438
+#: transactions.xml:462
 #, no-c-format
 msgid ""
 "<![CDATA[// Non-managed environment idiom with getCurrentSession()\n"
@@ -882,7 +882,7 @@
 msgstr ""
 
 #. Tag: para
-#: transactions.xml:440
+#: transactions.xml:464
 #, no-c-format
 msgid ""
 "You will very likely never see these code snippets in a regular application; "
@@ -904,7 +904,7 @@
 "の章の後のほうで議論します。"
 
 #. Tag: para
-#: transactions.xml:450
+#: transactions.xml:474
 #, no-c-format
 msgid ""
 "Note that you should select <literal>org.hibernate.transaction."
@@ -918,13 +918,13 @@
 "\"thread\"</literal> とするとよいでしょう。"
 
 #. Tag: title
-#: transactions.xml:459
+#: transactions.xml:483
 #, no-c-format
 msgid "Using JTA"
 msgstr "JTAを使用する"
 
 #. Tag: para
-#: transactions.xml:461
+#: transactions.xml:485
 #, no-c-format
 msgid ""
 "If your persistence layer runs in an application server (e.g. behind EJB "
@@ -940,7 +940,7 @@
 "供します。"
 
 #. Tag: para
-#: transactions.xml:468
+#: transactions.xml:492
 #, no-c-format
 msgid ""
 "If you use bean-managed transactions (BMT) Hibernate will tell the "
@@ -954,7 +954,7 @@
 "じになります。"
 
 #. Tag: programlisting
-#: transactions.xml:474
+#: transactions.xml:498
 #, no-c-format
 msgid ""
 "<![CDATA[// BMT idiom\n"
@@ -978,7 +978,7 @@
 msgstr ""
 
 #. Tag: para
-#: transactions.xml:476
+#: transactions.xml:500
 #, no-c-format
 msgid ""
 "If you want to use a transaction-bound <literal>Session</literal>, that is, "
@@ -992,7 +992,7 @@
 "う。"
 
 #. Tag: programlisting
-#: transactions.xml:482
+#: transactions.xml:506
 #, no-c-format
 msgid ""
 "<![CDATA[// BMT idiom with getCurrentSession()\n"
@@ -1015,18 +1015,18 @@
 msgstr ""
 
 #. Tag: para
-#: transactions.xml:484
-#, no-c-format
+#: transactions.xml:508
+#, fuzzy, no-c-format
 msgid ""
 "With CMT, transaction demarcation is done in session bean deployment "
-"descriptors, not programatically, hence, the code is reduced to:"
+"descriptors, not programmatically, hence, the code is reduced to:"
 msgstr ""
 "CMTでは、トランザクション境界をセッションBeanのデプロイメントディスクリプタで"
 "定義し、 プログラムでは行いません。 ゆえに、コードは次のように少なくなりま"
 "す。"
 
 #. Tag: programlisting
-#: transactions.xml:489
+#: transactions.xml:513
 #, no-c-format
 msgid ""
 "<![CDATA[// CMT idiom\n"
@@ -1038,7 +1038,7 @@
 msgstr ""
 
 #. Tag: para
-#: transactions.xml:491
+#: transactions.xml:515
 #, no-c-format
 msgid ""
 "In a CMT/EJB even rollback happens automatically, since an unhandled "
@@ -1056,8 +1056,8 @@
 "という意味です。</emphasis>"
 
 #. Tag: para
-#: transactions.xml:499
-#, no-c-format
+#: transactions.xml:523
+#, fuzzy, no-c-format
 msgid ""
 "Note that you should choose <literal>org.hibernate.transaction."
 "JTATransactionFactory</literal> if you use JTA directly (BMT), and "
@@ -1066,7 +1066,7 @@
 "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>."
+"compatibility), or set to <literal>\"jta\"</literal>."
 msgstr ""
 "Hibernateのトランザクションファクトリを設定する際に、 JTAを直接使う(BMTの)"
 "場合は <literal>org.hibernate.transaction.JTATransactionFactory</literal> "
@@ -1078,8 +1078,8 @@
 "<literal>\"jta\"</literal> をセットしてください。"
 
 #. Tag: para
-#: transactions.xml:508
-#, no-c-format
+#: transactions.xml:532
+#, 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</"
@@ -1089,7 +1089,7 @@
 "<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 "
+"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.)"
@@ -1108,13 +1108,13 @@
 "()</literal> の使用を避けるのは容易です。)"
 
 #. Tag: title
-#: transactions.xml:524
+#: transactions.xml:548
 #, no-c-format
 msgid "Exception handling"
 msgstr "例外ハンドリング"
 
 #. Tag: para
-#: transactions.xml:526
+#: transactions.xml:550
 #, no-c-format
 msgid ""
 "If the <literal>Session</literal> throws an exception (including any "
@@ -1136,7 +1136,7 @@
 "<literal>Session</literal> を確実に閉じてください。"
 
 #. Tag: para
-#: transactions.xml:537
+#: transactions.xml:561
 #, no-c-format
 msgid ""
 "The <literal>HibernateException</literal>, which wraps most of the errors "
@@ -1161,12 +1161,12 @@
 "意してください。 これらもまた、回復不可能であり、適切な処理を実施すべきです。"
 
 #. Tag: para
-#: transactions.xml:549
-#, no-c-format
+#: transactions.xml:573
+#, 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 "
@@ -1194,7 +1194,7 @@
 "します。"
 
 #. Tag: para
-#: transactions.xml:565
+#: transactions.xml:589
 #, no-c-format
 msgid ""
 "<literal>JDBCConnectionException</literal> - indicates an error with the "
@@ -1204,7 +1204,7 @@
 "ます。"
 
 #. Tag: para
-#: transactions.xml:571
+#: transactions.xml:595
 #, no-c-format
 msgid ""
 "<literal>SQLGrammarException</literal> - indicates a grammar or syntax "
@@ -1214,7 +1214,7 @@
 "を表します。"
 
 #. Tag: para
-#: transactions.xml:577
+#: transactions.xml:601
 #, no-c-format
 msgid ""
 "<literal>ConstraintViolationException</literal> - indicates some form of "
@@ -1224,7 +1224,7 @@
 "反を表します。"
 
 #. Tag: para
-#: transactions.xml:583
+#: transactions.xml:607
 #, no-c-format
 msgid ""
 "<literal>LockAcquisitionException</literal> - indicates an error acquiring a "
@@ -1234,7 +1234,7 @@
 "要なロックレベルを得る際のエラーを表します。"
 
 #. Tag: para
-#: transactions.xml:589
+#: transactions.xml:613
 #, no-c-format
 msgid ""
 "<literal>GenericJDBCException</literal> - a generic exception which did not "
@@ -1244,14 +1244,14 @@
 "な例外です。"
 
 #. Tag: title
-#: transactions.xml:599
+#: transactions.xml:623
 #, no-c-format
 msgid "Transaction timeout"
 msgstr "トランザクションのタイムアウト"
 
 #. Tag: para
-#: transactions.xml:601
-#, no-c-format
+#: transactions.xml:625
+#, 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. "
@@ -1261,7 +1261,7 @@
 "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 "
+"transaction timeout to JTA. This functionality is abstracted by the "
 "Hibernate <literal>Transaction</literal> object."
 msgstr ""
 "EJBのような管理された環境が提供するきわめて重要な特徴の1つは、 トランザク"
@@ -1276,7 +1276,7 @@
 "<literal>Transaction</literal> オブジェクトに よって抽象化されています。"
 
 #. Tag: programlisting
-#: transactions.xml:614
+#: transactions.xml:638
 #, no-c-format
 msgid ""
 "<![CDATA[\n"
@@ -1301,7 +1301,7 @@
 msgstr ""
 
 #. Tag: para
-#: transactions.xml:616
+#: transactions.xml:640
 #, no-c-format
 msgid ""
 "Note that <literal>setTimeout()</literal> may not be called in a CMT bean, "
@@ -1311,13 +1311,13 @@
 "てください。 トランザクションタイムアウトは宣言的に定義されるべきです。"
 
 #. Tag: title
-#: transactions.xml:626
+#: transactions.xml:650
 #, no-c-format
 msgid "Optimistic concurrency control"
 msgstr "楽観的同時実行制御"
 
 #. Tag: para
-#: transactions.xml:628
+#: transactions.xml:652
 #, no-c-format
 msgid ""
 "The only approach that is consistent with high concurrency and high "
@@ -1338,13 +1338,13 @@
 "クションの中で更新を失うことを防ぐ 利点も持っています。"
 
 #. Tag: title
-#: transactions.xml:639
+#: transactions.xml:663
 #, no-c-format
 msgid "Application version checking"
 msgstr "アプリケーションによるバージョンチェック"
 
 #. Tag: para
-#: transactions.xml:641
+#: transactions.xml:665
 #, no-c-format
 msgid ""
 "In an implementation without much help from Hibernate, each interaction with "
@@ -1364,7 +1364,7 @@
 "も似ているアプローチです。"
 
 #. Tag: programlisting
-#: transactions.xml:650
+#: transactions.xml:674
 #, no-c-format
 msgid ""
 "<![CDATA[// foo is an instance loaded by a previous Session\n"
@@ -1382,7 +1382,7 @@
 msgstr ""
 
 #. Tag: para
-#: transactions.xml:652
+#: transactions.xml:676
 #, no-c-format
 msgid ""
 "The <literal>version</literal> property is mapped using <literal>&lt;"
@@ -1395,7 +1395,7 @@
 "メントします。"
 
 #. Tag: para
-#: transactions.xml:658
+#: transactions.xml:682
 #, no-c-format
 msgid ""
 "Of course, if you are operating in a low-data-concurrency environment and "
@@ -1413,12 +1413,12 @@
 "競合した変更をマージする機会が ないまま、更新を失う経験をするためです。"
 
 #. Tag: para
-#: transactions.xml:667
-#, no-c-format
+#: transactions.xml:691
+#, 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. "
+"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 ""
@@ -1429,13 +1429,13 @@
 "literal> か 分離されたインスタンスを自動的にバージョンチェックします。"
 
 #. Tag: title
-#: transactions.xml:678
+#: transactions.xml:702
 #, no-c-format
 msgid "Extended session and automatic versioning"
 msgstr "拡張セッションと自動バージョニング"
 
 #. Tag: para
-#: transactions.xml:680
+#: transactions.xml:704
 #, no-c-format
 msgid ""
 "A single <literal>Session</literal> instance and its persistent instances "
@@ -1454,7 +1454,7 @@
 "データでビジネス対話を 再スタートする機会をユーザーに提供することです)。"
 
 #. Tag: para
-#: transactions.xml:689
+#: transactions.xml:713
 #, no-c-format
 msgid ""
 "The <literal>Session</literal> is disconnected from any underlying JDBC "
@@ -1470,7 +1470,7 @@
 "ベーストランザクションの中で インスタンスを再読み込みする必要はありません。"
 
 #. Tag: programlisting
-#: transactions.xml:697
+#: transactions.xml:721
 #, no-c-format
 msgid ""
 "<![CDATA[// foo is an instance loaded earlier by the old session\n"
@@ -1485,7 +1485,7 @@
 msgstr ""
 
 #. Tag: para
-#: transactions.xml:698
+#: transactions.xml:722
 #, no-c-format
 msgid ""
 "The <literal>foo</literal> object still knows which <literal>Session</"
@@ -1520,7 +1520,7 @@
 "て、対話を終わらせるために、 セッションも <literal>close()</literal> します。"
 
 #. Tag: para
-#: transactions.xml:713
+#: transactions.xml:737
 #, no-c-format
 msgid ""
 "This pattern is problematic if the <literal>Session</literal> is too big to "
@@ -1540,7 +1540,7 @@
 "literal> を使うべきです。 なぜなら、すぐに新鮮でないデータを持つためです。"
 
 #. Tag: para
-#: transactions.xml:723
+#: transactions.xml:747
 #, no-c-format
 msgid ""
 "(Note that earlier Hibernate versions required explicit disconnection and "
@@ -1552,7 +1552,7 @@
 "した。 なぜなら、トランザクションの開始と終了は同じ効果があるためです。)"
 
 #. Tag: para
-#: transactions.xml:729
+#: transactions.xml:753
 #, no-c-format
 msgid ""
 "Also note that you should keep the disconnected <literal>Session</literal> "
@@ -1568,7 +1568,7 @@
 "(別の層へのシリアライズもしないでください)。"
 
 #. Tag: para
-#: transactions.xml:737
+#: transactions.xml:761
 #, no-c-format
 msgid ""
 "The extended session pattern, or <emphasis>session-per-conversation</"
@@ -1583,13 +1583,13 @@
 "給する必要があります。 Hibernate Wikiにある例を参照してください。"
 
 #. Tag: title
-#: transactions.xml:747
+#: transactions.xml:771
 #, no-c-format
 msgid "Detached objects and automatic versioning"
 msgstr "デタッチされたオブジェクトと自動バージョニング"
 
 #. Tag: para
-#: transactions.xml:749
+#: transactions.xml:773
 #, no-c-format
 msgid ""
 "Each interaction with the persistent store occurs in a new <literal>Session</"
@@ -1609,7 +1609,7 @@
 "スを再追加します。"
 
 #. Tag: programlisting
-#: transactions.xml:757
+#: transactions.xml:781
 #, no-c-format
 msgid ""
 "<![CDATA[// foo is an instance loaded by a previous Session\n"
@@ -1623,17 +1623,17 @@
 msgstr ""
 
 #. Tag: para
-#: transactions.xml:759
-#, no-c-format
+#: transactions.xml:783
+#, 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 ""
 "この場合もやはり、Hibernateはフラッシュする際に、インスタンスのバージョンを"
 "チェックします。 更新の競合が発生した場合には、例外を投げます。"
 
 #. Tag: para
-#: transactions.xml:764
+#: transactions.xml:788
 #, no-c-format
 msgid ""
 "You may also call <literal>lock()</literal> instead of <literal>update()</"
@@ -1647,13 +1647,13 @@
 "し、バージョンチェックを実施します)。"
 
 #. Tag: title
-#: transactions.xml:773
+#: transactions.xml:797
 #, no-c-format
 msgid "Customizing automatic versioning"
 msgstr "自動バージョニングのカスタマイズ"
 
 #. Tag: para
-#: transactions.xml:775
+#: transactions.xml:799
 #, no-c-format
 msgid ""
 "You may disable Hibernate's automatic version increment for particular "
@@ -1667,8 +1667,8 @@
 "バージョンをインクリメントしません。"
 
 #. Tag: para
-#: transactions.xml:782
-#, no-c-format
+#: transactions.xml:806
+#, 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 "
@@ -1676,7 +1676,7 @@
 "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 "
+"<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."
@@ -1694,7 +1694,7 @@
 "<literal>Session</literal> を使う場合です。"
 
 #. Tag: para
-#: transactions.xml:793
+#: transactions.xml:817
 #, no-c-format
 msgid ""
 "Sometimes concurrent modification can be permitted as long as the changes "
@@ -1708,15 +1708,15 @@
 "ティフィールドのみを比較します。"
 
 #. Tag: para
-#: transactions.xml:799
-#, no-c-format
+#: transactions.xml:823
+#, fuzzy, 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 uneccessary updates. This is usually not a problem, "
+"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\"</"
@@ -1737,17 +1737,17 @@
 "更新する前に、 必ずインスタンスを <literal>SELECT</literal> します。"
 
 #. Tag: title
-#: transactions.xml:817
+#: transactions.xml:841
 #, no-c-format
 msgid "Pessimistic Locking"
 msgstr "悲観的ロック"
 
 #. Tag: para
-#: transactions.xml:819
-#, no-c-format
+#: transactions.xml:843
+#, 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'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."
@@ -1759,7 +1759,7 @@
 "どき望むかもしれません。"
 
 #. Tag: para
-#: transactions.xml:826
+#: transactions.xml:850
 #, no-c-format
 msgid ""
 "Hibernate will always use the locking mechanism of the database, never lock "
@@ -1769,7 +1769,7 @@
 "クトを決してロックしません!"
 
 #. Tag: para
-#: transactions.xml:831
+#: transactions.xml:855
 #, no-c-format
 msgid ""
 "The <literal>LockMode</literal> class defines the different lock levels that "
@@ -1779,7 +1779,7 @@
 "を定義します。 以下の仕組みにより、ロックを獲得できます。"
 
 #. Tag: para
-#: transactions.xml:838
+#: transactions.xml:862
 #, no-c-format
 msgid ""
 "<literal>LockMode.WRITE</literal> is acquired automatically when Hibernate "
@@ -1789,7 +1789,7 @@
 "に自動的に得られます。"
 
 #. Tag: para
-#: transactions.xml:844
+#: transactions.xml:868
 #, no-c-format
 msgid ""
 "<literal>LockMode.UPGRADE</literal> may be acquired upon explicit user "
@@ -1801,7 +1801,7 @@
 "より得られるかもしれません。"
 
 #. Tag: para
-#: transactions.xml:850
+#: transactions.xml:874
 #, no-c-format
 msgid ""
 "<literal>LockMode.UPGRADE_NOWAIT</literal> may be acquired upon explicit "
@@ -1813,7 +1813,7 @@
 "求により得られるかもしれません。"
 
 #. Tag: para
-#: transactions.xml:856
+#: transactions.xml:880
 #, no-c-format
 msgid ""
 "<literal>LockMode.READ</literal> is acquired automatically when Hibernate "
@@ -1825,7 +1825,7 @@
 "要求により、再取得されます。"
 
 #. Tag: para
-#: transactions.xml:863
+#: transactions.xml:887
 #, no-c-format
 msgid ""
 "<literal>LockMode.NONE</literal> represents the absence of a lock. All "
@@ -1841,14 +1841,14 @@
 "も、このロックモードで出発します。"
 
 #. Tag: para
-#: transactions.xml:872
+#: transactions.xml:896
 #, no-c-format
 msgid ""
 "The \"explicit user request\" is expressed in one of the following ways:"
 msgstr "「明示的なユーザー要求」とは、下記の方法の1つで言い表せます。"
 
 #. Tag: para
-#: transactions.xml:878
+#: transactions.xml:902
 #, no-c-format
 msgid ""
 "A call to <literal>Session.load()</literal>, specifying a <literal>LockMode</"
@@ -1858,19 +1858,19 @@
 "び出し。"
 
 #. Tag: para
-#: transactions.xml:883
+#: transactions.xml:907
 #, no-c-format
 msgid "A call to <literal>Session.lock()</literal>."
 msgstr "<literal>Session.lock()</literal> の呼び出し。"
 
 #. Tag: para
-#: transactions.xml:888
+#: transactions.xml:912
 #, no-c-format
 msgid "A call to <literal>Query.setLockMode()</literal>."
 msgstr "<literal>Query.setLockMode()</literal> の呼び出し。"
 
 #. Tag: para
-#: transactions.xml:894
+#: transactions.xml:918
 #, no-c-format
 msgid ""
 "If <literal>Session.load()</literal> is called with <literal>UPGRADE</"
@@ -1890,7 +1890,7 @@
 "ジェクトのために、<literal>lock()</literal> を呼び出します。"
 
 #. Tag: para
-#: transactions.xml:903
+#: transactions.xml:927
 #, no-c-format
 msgid ""
 "<literal>Session.lock()</literal> performs a version number check if the "
@@ -1906,7 +1906,7 @@
 "合、 <literal>SELECT ... FOR UPDATE</literal> が使われます。)"
 
 #. Tag: para
-#: transactions.xml:910
+#: transactions.xml:934
 #, no-c-format
 msgid ""
 "If the database does not support the requested lock mode, Hibernate will use "
@@ -1918,13 +1918,13 @@
 "ションがポータブルであることを保証します。"
 
 #. Tag: title
-#: transactions.xml:919
+#: transactions.xml:943
 #, no-c-format
 msgid "Connection Release Modes"
 msgstr "コネクション開放モード"
 
 #. Tag: para
-#: transactions.xml:921
+#: transactions.xml:945
 #, no-c-format
 msgid ""
 "The legacy (2.x) behavior of Hibernate in regards to JDBC connection "
@@ -1948,11 +1948,11 @@
 "ConnectionReleaseMode</literal> に 列挙された値により確認されます。"
 
 #. Tag: para
-#: transactions.xml:935
-#, no-c-format
+#: transactions.xml:959
+#, 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 "
+"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."
 msgstr ""
@@ -1961,7 +1961,7 @@
 "得ます。 そして、セッションが閉じられるまで、コネクションを保持します。"
 
 #. Tag: para
-#: transactions.xml:942
+#: transactions.xml:966
 #, no-c-format
 msgid ""
 "<literal>AFTER_TRANSACTION</literal> - says to release connections after a "
@@ -1971,7 +1971,7 @@
 "literal> が完了した後、 コネクションを開放します。"
 
 #. Tag: para
-#: transactions.xml:948
+#: transactions.xml:972
 #, no-c-format
 msgid ""
 "<literal>AFTER_STATEMENT</literal> (also referred to as aggressive release) "
@@ -1988,7 +1988,7 @@
 "ScrollableResults</literal> が使われる場合のみです。"
 
 #. Tag: para
-#: transactions.xml:958
+#: transactions.xml:982
 #, no-c-format
 msgid ""
 "The configuration parameter <literal>hibernate.connection.release_mode</"
@@ -1999,7 +1999,7 @@
 "通りです。"
 
 #. Tag: para
-#: transactions.xml:965
+#: transactions.xml:989
 #, no-c-format
 msgid ""
 "<literal>auto</literal> (the default) - this choice delegates to the release "
@@ -2020,7 +2020,7 @@
 "すいからです。"
 
 #. Tag: para
-#: transactions.xml:975
+#: transactions.xml:999
 #, no-c-format
 msgid ""
 "<literal>on_close</literal> - says to use ConnectionReleaseMode.ON_CLOSE. "
@@ -2031,7 +2031,7 @@
 "設定は後方互換のために残されていますが、使わないことを強く勧めます。"
 
 #. Tag: para
-#: transactions.xml:981
+#: transactions.xml:1005
 #, no-c-format
 msgid ""
 "<literal>after_transaction</literal> - says to use ConnectionReleaseMode."
@@ -2047,7 +2047,7 @@
 "ことに注意してください。"
 
 #. Tag: para
-#: transactions.xml:989
+#: transactions.xml:1013
 #, no-c-format
 msgid ""
 "<literal>after_statement</literal> - says to use ConnectionReleaseMode."

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	2008-08-14 15:28:13 UTC (rev 15066)
+++ core/trunk/documentation/manual/src/main/docbook/ko-KR/content/transactions.po	2008-08-14 15:35:40 UTC (rev 15067)
@@ -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: 2008-08-14 15:28+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,13 +11,13 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: transactions.xml:5
+#: transactions.xml:29
 #, no-c-format
 msgid "Transactions And Concurrency"
 msgstr "트랜잭션들과 동시성"
 
 #. Tag: para
-#: transactions.xml:7
+#: transactions.xml:31
 #, no-c-format
 msgid ""
 "The most important point about Hibernate and concurrency control is that it "
@@ -32,7 +32,7 @@
 "랜잭션 격리 명세에 약간의 시간을 할애할 것을 매우 권장한다."
 
 #. Tag: para
-#: transactions.xml:14
+#: transactions.xml:38
 #, no-c-format
 msgid ""
 "Hibernate does not lock objects in memory. Your application can expect the "
@@ -49,7 +49,7 @@
 "읽기를 제공한다."
 
 #. Tag: para
-#: transactions.xml:22
+#: transactions.xml:46
 #, no-c-format
 msgid ""
 "In addition to versioning for automatic optimistic concurrency control, "
@@ -63,7 +63,7 @@
 "이 장의 뒷부분에서 논의된다."
 
 #. Tag: para
-#: transactions.xml:29
+#: transactions.xml:53
 #, no-c-format
 msgid ""
 "We start the discussion of concurrency control in Hibernate with the "
@@ -77,13 +77,13 @@
 "시작한다."
 
 #. Tag: title
-#: transactions.xml:36
+#: transactions.xml:60
 #, no-c-format
 msgid "Session and transaction scopes"
 msgstr "세션 영역과 트랜잭션 영역"
 
 #. Tag: para
-#: transactions.xml:38
+#: transactions.xml:62
 #, no-c-format
 msgid ""
 "A <literal>SessionFactory</literal> is an expensive-to-create, threadsafe "
@@ -97,7 +97,7 @@
 "생성된다."
 
 #. Tag: para
-#: transactions.xml:44
+#: transactions.xml:68
 #, no-c-format
 msgid ""
 "A <literal>Session</literal> is an inexpensive, non-threadsafe object that "
@@ -113,7 +113,7 @@
 "지 않을 것이므로, 사용될 때까지 리소스들을 소비하지 않는다."
 
 #. Tag: para
-#: transactions.xml:52
+#: transactions.xml:76
 #, no-c-format
 msgid ""
 "To complete this picture you also have to think about database transactions. "
@@ -131,7 +131,7 @@
 "는 것은 대개 결코 좋은 설계는 아니다."
 
 #. Tag: para
-#: transactions.xml:61
+#: transactions.xml:85
 #, no-c-format
 msgid ""
 "What is the scope of a unit of work? Can a single Hibernate "
@@ -146,13 +146,13 @@
 "그리고 당신은 데이터베이스 트랜잭션 경계들을 어떻게 한정하는가?"
 
 #. Tag: title
-#: transactions.xml:69
+#: transactions.xml:93
 #, no-c-format
 msgid "Unit of work"
 msgstr "작업 단위"
 
 #. Tag: para
-#: transactions.xml:71
+#: transactions.xml:95
 #, no-c-format
 msgid ""
 "First, don't use the <emphasis>session-per-operation</emphasis> antipattern, "
@@ -187,12 +187,12 @@
 "씬 더 유지가능하고 확장적이다."
 
 #. Tag: para
-#: transactions.xml:87
-#, no-c-format
+#: transactions.xml:111
+#, 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 "
@@ -213,13 +213,13 @@
 "적합하다."
 
 #. Tag: para
-#: transactions.xml:99
-#, no-c-format
+#: transactions.xml:123
+#, 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 "
+"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 "
@@ -241,7 +241,7 @@
 "literal>을 선호하라."
 
 #. Tag: para
-#: transactions.xml:112
+#: transactions.xml:136
 #, no-c-format
 msgid ""
 "Your application code can access a \"current session\" to process the "
@@ -259,7 +259,7 @@
 "session\"/>을 보라."
 
 #. Tag: para
-#: transactions.xml:120
+#: transactions.xml:144
 #, no-c-format
 msgid ""
 "Sometimes it is convenient to extend the scope of a <literal>Session</"
@@ -284,13 +284,13 @@
 "emphasis> 패턴을 둘러싼 팁들과 예제들은 Hibernate 웹 사이트와 포럼을 보라."
 
 #. Tag: title
-#: transactions.xml:135
+#: transactions.xml:159
 #, no-c-format
 msgid "Long conversations"
 msgstr "장기간의 대화"
 
 #. Tag: para
-#: transactions.xml:137
+#: transactions.xml:161
 #, no-c-format
 msgid ""
 "The session-per-request pattern is not the only useful concept you can use "
@@ -306,7 +306,7 @@
 "용되지 않는다. 다음 예제를 검토하자:"
 
 #. Tag: para
-#: transactions.xml:147
+#: transactions.xml:171
 #, no-c-format
 msgid ""
 "The first screen of a dialog opens, the data seen by the user has been "
@@ -318,7 +318,7 @@
 "객체들을 변경시키는 것이 자유롭다."
 
 #. Tag: para
-#: transactions.xml:154
+#: transactions.xml:178
 #, no-c-format
 msgid ""
 "The user clicks \"Save\" after 5 minutes and expects his modifications to be "
@@ -330,7 +330,7 @@
 "를 기대한다."
 
 #. Tag: para
-#: transactions.xml:162
+#: transactions.xml:186
 #, no-c-format
 msgid ""
 "We call this unit of work, from the point of view of the user, a long "
@@ -344,7 +344,7 @@
 "재한다."
 
 #. Tag: para
-#: transactions.xml:168
+#: transactions.xml:192
 #, no-c-format
 msgid ""
 "A first naive implementation might keep the <literal>Session</literal> and "
@@ -360,11 +360,11 @@
 "용 숫자를 높이는 것을 허용하지 않을 것이기 때문이다."
 
 #. Tag: para
-#: transactions.xml:176
-#, no-c-format
+#: transactions.xml:200
+#, 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 "
+"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 "
@@ -383,12 +383,12 @@
 "쉽다:"
 
 #. Tag: para
-#: transactions.xml:189
-#, no-c-format
+#: transactions.xml:213
+#, 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 "
+"concurrent modification occurred during user think time. Usually we only "
 "check at the end of the conversation."
 msgstr ""
 "<emphasis>자동적인 버전화</emphasis> - Hibernate는 당신을 위해 자동적인 "
@@ -397,7 +397,7 @@
 "의 끝에서 체크한다."
 
 #. Tag: para
-#: transactions.xml:197
+#: transactions.xml:221
 #, no-c-format
 msgid ""
 "<emphasis>Detached Objects</emphasis> - If you decide to use the already "
@@ -416,8 +416,8 @@
 "변경들을 격리시키는데 사용된다."
 
 #. Tag: para
-#: transactions.xml:207
-#, no-c-format
+#: transactions.xml:231
+#, fuzzy, no-c-format
 msgid ""
 "<emphasis>Extended (or Long) Session</emphasis> - The Hibernate "
 "<literal>Session</literal> may be disconnected from the underlying JDBC "
@@ -426,7 +426,7 @@
 "<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."
+"be flushed automatically, but explicitly."
 msgstr ""
 "<emphasis>확장된 (또는 Long) Session</emphasis> - Hibernate "
 "<emphasis>Session</emphasis>은 데이터베이스 트랜잭션이 커밋된 후에 기본 JDBC "
@@ -437,7 +437,7 @@
 "flush되는 것이 허용되지 않지만 명시적으로 flush되는 것은 허용된다."
 
 #. Tag: para
-#: transactions.xml:220
+#: transactions.xml:244
 #, no-c-format
 msgid ""
 "Both <emphasis>session-per-request-with-detached-objects</emphasis> and "
@@ -451,13 +451,13 @@
 "한다."
 
 #. Tag: title
-#: transactions.xml:229
+#: transactions.xml:253
 #, no-c-format
 msgid "Considering object identity"
 msgstr "객체 identity 고려하기"
 
 #. Tag: para
-#: transactions.xml:231
+#: transactions.xml:255
 #, no-c-format
 msgid ""
 "An application may concurrently access the same persistent state in two "
@@ -471,31 +471,31 @@
 "identity에 대한 두 개의 다른 개념들이 존재한다:"
 
 #. Tag: term
-#: transactions.xml:240
+#: transactions.xml:264
 #, no-c-format
 msgid "Database Identity"
 msgstr "데이터베이스 Identity"
 
 #. Tag: literal
-#: transactions.xml:243
+#: transactions.xml:267
 #, no-c-format
 msgid "foo.getId().equals( bar.getId() )"
 msgstr "foo.getId().equals( bar.getId() )"
 
 #. Tag: term
-#: transactions.xml:248
+#: transactions.xml:272
 #, no-c-format
 msgid "JVM Identity"
 msgstr "JVM Identity"
 
 #. Tag: literal
-#: transactions.xml:251
+#: transactions.xml:275
 #, no-c-format
 msgid "foo==bar"
 msgstr "foo==bar"
 
 #. Tag: para
-#: transactions.xml:257
+#: transactions.xml:281
 #, fuzzy, no-c-format
 msgid ""
 "Then for objects attached to a <emphasis>particular</emphasis> "
@@ -516,7 +516,7 @@
 "여, optimistic 접근법을 사용하여 해결된다."
 
 #. Tag: para
-#: transactions.xml:266
+#: transactions.xml:290
 #, no-c-format
 msgid ""
 "This approach leaves Hibernate and the database to worry about concurrency; "
@@ -536,7 +536,7 @@
 "<literal>==</literal>를 안전하게 사용할 수가 있다."
 
 #. Tag: para
-#: transactions.xml:275
+#: transactions.xml:299
 #, no-c-format
 msgid ""
 "However, an application that uses <literal>==</literal> outside of a "
@@ -580,13 +580,13 @@
 "가 구현되어야 하는 방법임을 노트하라."
 
 #. Tag: title
-#: transactions.xml:296
+#: transactions.xml:320
 #, no-c-format
 msgid "Common issues"
 msgstr "공통된 쟁점들"
 
 #. Tag: para
-#: transactions.xml:298
+#: transactions.xml:322
 #, no-c-format
 msgid ""
 "Never use the anti-patterns <emphasis>session-per-user-session</emphasis> or "
@@ -602,7 +602,7 @@
 "들을 확실히 이해하라:"
 
 #. Tag: para
-#: transactions.xml:307
+#: transactions.xml:331
 #, no-c-format
 msgid ""
 "A <literal>Session</literal> is not thread-safe. Things which are supposed "
@@ -624,7 +624,7 @@
 "에서 동일한 <literal>Session</literal>을 사용할 수도 있다."
 
 #. Tag: para
-#: transactions.xml:318
+#: transactions.xml:342
 #, no-c-format
 msgid ""
 "An exception thrown by Hibernate means you have to rollback your database "
@@ -647,7 +647,7 @@
 "이 아니고 당신이 어떻게든 롤백 후에 시작해야 하기 때문이다."
 
 #. Tag: para
-#: transactions.xml:330
+#: transactions.xml:354
 #, no-c-format
 msgid ""
 "The <literal>Session</literal> caches every object that is in persistent "
@@ -673,16 +673,16 @@
 "데이터에 대한 높은 확률을 의미한다."
 
 #. Tag: title
-#: transactions.xml:348
+#: transactions.xml:372
 #, no-c-format
 msgid "Database transaction demarcation"
 msgstr "데이터베이스 트랜잭션 경계 설정"
 
 #. Tag: para
-#: transactions.xml:350
-#, no-c-format
+#: transactions.xml:374
+#, 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 "
@@ -701,7 +701,7 @@
 "작은 트랜잭션들의 경우보다는 더 좋게 수행될 것이다."
 
 #. Tag: para
-#: transactions.xml:360
+#: transactions.xml:384
 #, no-c-format
 msgid ""
 "A Hibernate application can run in non-managed (i.e. standalone, simple Web- "
@@ -725,13 +725,13 @@
 "더 이상 필요하지 않다."
 
 #. Tag: para
-#: transactions.xml:370
-#, no-c-format
+#: transactions.xml:394
+#, 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 "
+"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."
@@ -745,7 +745,7 @@
 "한 그것의 사용을 강력하게 권장한다."
 
 #. Tag: para
-#: transactions.xml:379
+#: transactions.xml:403
 #, no-c-format
 msgid ""
 "Usually, ending a <literal>Session</literal> involves four distinct phases:"
@@ -753,31 +753,31 @@
 "대개 <literal>Session</literal> 종료는 네 개의 구분되는 단계들을 수반한다:"
 
 #. Tag: para
-#: transactions.xml:385
+#: transactions.xml:409
 #, no-c-format
 msgid "flush the session"
 msgstr "세션을 flush 시킨다"
 
 #. Tag: para
-#: transactions.xml:390
+#: transactions.xml:414
 #, no-c-format
 msgid "commit the transaction"
 msgstr "트랜잭션을 커밋 시킨다"
 
 #. Tag: para
-#: transactions.xml:395
+#: transactions.xml:419
 #, no-c-format
 msgid "close the session"
 msgstr "세션을 닫는다"
 
 #. Tag: para
-#: transactions.xml:400
+#: transactions.xml:424
 #, no-c-format
 msgid "handle exceptions"
 msgstr "예외상황들을 처리한다"
 
 #. Tag: para
-#: transactions.xml:406
+#: transactions.xml:430
 #, no-c-format
 msgid ""
 "Flushing the session has been discussed earlier, we'll now have a closer "
@@ -789,13 +789,13 @@
 "다."
 
 #. Tag: title
-#: transactions.xml:413
+#: transactions.xml:437
 #, no-c-format
 msgid "Non-managed environment"
 msgstr "관리되지 않는 환경"
 
 #. Tag: para
-#: transactions.xml:415
+#: transactions.xml:439
 #, no-c-format
 msgid ""
 "If a Hibernate persistence layer runs in a non-managed environment, database "
@@ -809,7 +809,7 @@
 "transaction 처리 관용구는 다음과 같다:"
 
 #. Tag: programlisting
-#: transactions.xml:422
+#: transactions.xml:446
 #, no-c-format
 msgid ""
 "<![CDATA[// Non-managed environment idiom\n"
@@ -833,7 +833,7 @@
 msgstr ""
 
 #. Tag: para
-#: transactions.xml:424
+#: transactions.xml:448
 #, no-c-format
 msgid ""
 "You don't have to <literal>flush()</literal> the <literal>Session</literal> "
@@ -853,7 +853,7 @@
 "에서 이식성이 있고 실행된다."
 
 #. Tag: para
-#: transactions.xml:433
+#: transactions.xml:457
 #, no-c-format
 msgid ""
 "A much more flexible solution is Hibernate's built-in \"current session\" "
@@ -863,7 +863,7 @@
 "재 세션\" 컨텍스트 관리이다:"
 
 #. Tag: programlisting
-#: transactions.xml:438
+#: transactions.xml:462
 #, no-c-format
 msgid ""
 "<![CDATA[// Non-managed environment idiom with getCurrentSession()\n"
@@ -882,7 +882,7 @@
 msgstr ""
 
 #. Tag: para
-#: transactions.xml:440
+#: transactions.xml:464
 #, no-c-format
 msgid ""
 "You will very likely never see these code snippets in a regular application; "
@@ -904,7 +904,7 @@
 "부분에서 논의된다."
 
 #. Tag: para
-#: transactions.xml:450
+#: transactions.xml:474
 #, no-c-format
 msgid ""
 "Note that you should select <literal>org.hibernate.transaction."
@@ -917,13 +917,13 @@
 "current_session_context_class</literal>를 선택해야 함을 노트하라."
 
 #. Tag: title
-#: transactions.xml:459
+#: transactions.xml:483
 #, no-c-format
 msgid "Using JTA"
 msgstr "JTA 사용하기"
 
 #. Tag: para
-#: transactions.xml:461
+#: transactions.xml:485
 #, no-c-format
 msgid ""
 "If your persistence layer runs in an application server (e.g. behind EJB "
@@ -939,7 +939,7 @@
 "방도들을 제공한다."
 
 #. Tag: para
-#: transactions.xml:468
+#: transactions.xml:492
 #, no-c-format
 msgid ""
 "If you use bean-managed transactions (BMT) Hibernate will tell the "
@@ -953,7 +953,7 @@
 "non-managed 환경과 동일하다."
 
 #. Tag: programlisting
-#: transactions.xml:474
+#: transactions.xml:498
 #, no-c-format
 msgid ""
 "<![CDATA[// BMT idiom\n"
@@ -977,7 +977,7 @@
 msgstr ""
 
 #. Tag: para
-#: transactions.xml:476
+#: transactions.xml:500
 #, no-c-format
 msgid ""
 "If you want to use a transaction-bound <literal>Session</literal>, that is, "
@@ -990,7 +990,7 @@
 "당신은 JTA <literal>UserTransaction</literal> API를 직접 사용해야 할 것이다:"
 
 #. Tag: programlisting
-#: transactions.xml:482
+#: transactions.xml:506
 #, no-c-format
 msgid ""
 "<![CDATA[// BMT idiom with getCurrentSession()\n"
@@ -1013,17 +1013,17 @@
 msgstr ""
 
 #. Tag: para
-#: transactions.xml:484
-#, no-c-format
+#: transactions.xml:508
+#, fuzzy, no-c-format
 msgid ""
 "With CMT, transaction demarcation is done in session bean deployment "
-"descriptors, not programatically, hence, the code is reduced to:"
+"descriptors, not programmatically, hence, the code is reduced to:"
 msgstr ""
 "CMT의 경우, 트랜잭션 관할[경계 설정]은 프로그램 상이 아닌, session bean 배치 "
 "디스크립터들 속에서 행해진다. 그러므로 코드는 다음으로 감소된다:"
 
 #. Tag: programlisting
-#: transactions.xml:489
+#: transactions.xml:513
 #, no-c-format
 msgid ""
 "<![CDATA[// CMT idiom\n"
@@ -1035,7 +1035,7 @@
 msgstr ""
 
 #. Tag: para
-#: transactions.xml:491
+#: transactions.xml:515
 #, no-c-format
 msgid ""
 "In a CMT/EJB even rollback happens automatically, since an unhandled "
@@ -1054,8 +1054,8 @@
 "emphasis>"
 
 #. Tag: para
-#: transactions.xml:499
-#, no-c-format
+#: transactions.xml:523
+#, fuzzy, no-c-format
 msgid ""
 "Note that you should choose <literal>org.hibernate.transaction."
 "JTATransactionFactory</literal> if you use JTA directly (BMT), and "
@@ -1064,7 +1064,7 @@
 "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>."
+"compatibility), or set to <literal>\"jta\"</literal>."
 msgstr ""
 "당신이 Hibernate의 트랜잭션 팩토리를 구성할 때, 당신이 JTA를 직접 사용할 경우"
 "(BMT) 당신은 <literal>org.hibernate.transaction.JTATransactionFactory</"
@@ -1076,8 +1076,8 @@
 "또는 <literal>\"jta\"</literal>로 설정되도록 하라."
 
 #. Tag: para
-#: transactions.xml:508
-#, no-c-format
+#: transactions.xml:532
+#, 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</"
@@ -1087,7 +1087,7 @@
 "<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 "
+"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.)"
@@ -1106,13 +1106,13 @@
 "쉽게 피할 수 있다.)"
 
 #. Tag: title
-#: transactions.xml:524
+#: transactions.xml:548
 #, no-c-format
 msgid "Exception handling"
 msgstr "예외상황 처리"
 
 #. Tag: para
-#: transactions.xml:526
+#: transactions.xml:550
 #, no-c-format
 msgid ""
 "If the <literal>Session</literal> throws an exception (including any "
@@ -1134,7 +1134,7 @@
 "를 호출하여 닫혀지도록 확실히 하라."
 
 #. Tag: para
-#: transactions.xml:537
+#: transactions.xml:561
 #, no-c-format
 msgid ""
 "The <literal>HibernateException</literal>, which wraps most of the errors "
@@ -1160,12 +1160,12 @@
 "가능하지 않고 적절한 액션이 취해져야 한다."
 
 #. Tag: para
-#: transactions.xml:549
-#, no-c-format
+#: transactions.xml:573
+#, 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 "
@@ -1192,7 +1192,7 @@
 "를 보라). 표준 <literal>JDBCException</literal> 서브타입은 다음과 같다:"
 
 #. Tag: para
-#: transactions.xml:565
+#: transactions.xml:589
 #, no-c-format
 msgid ""
 "<literal>JDBCConnectionException</literal> - indicates an error with the "
@@ -1202,7 +1202,7 @@
 "타낸다."
 
 #. Tag: para
-#: transactions.xml:571
+#: transactions.xml:595
 #, no-c-format
 msgid ""
 "<literal>SQLGrammarException</literal> - indicates a grammar or syntax "
@@ -1212,7 +1212,7 @@
 "제점을 나타낸다."
 
 #. Tag: para
-#: transactions.xml:577
+#: transactions.xml:601
 #, no-c-format
 msgid ""
 "<literal>ConstraintViolationException</literal> - indicates some form of "
@@ -1222,7 +1222,7 @@
 "떤 형식을 나타낸다."
 
 #. Tag: para
-#: transactions.xml:583
+#: transactions.xml:607
 #, no-c-format
 msgid ""
 "<literal>LockAcquisitionException</literal> - indicates an error acquiring a "
@@ -1232,7 +1232,7 @@
 "필수적인 잠금 레벨을 획득하는 오류를 나타낸다."
 
 #. Tag: para
-#: transactions.xml:589
+#: transactions.xml:613
 #, no-c-format
 msgid ""
 "<literal>GenericJDBCException</literal> - a generic exception which did not "
@@ -1242,14 +1242,14 @@
 "되지 않았던 일반적인 예외상황."
 
 #. Tag: title
-#: transactions.xml:599
+#: transactions.xml:623
 #, no-c-format
 msgid "Transaction timeout"
 msgstr "트랜잭션 타임아웃"
 
 #. Tag: para
-#: transactions.xml:601
-#, no-c-format
+#: transactions.xml:625
+#, 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. "
@@ -1259,7 +1259,7 @@
 "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 "
+"transaction timeout to JTA. This functionality is abstracted by the "
 "Hibernate <literal>Transaction</literal> object."
 msgstr ""
 "관리되지 않는 코드에 대해서는 결코 제공되지 않는 EJB와 같이 관리되는 환경에 "
@@ -1274,7 +1274,7 @@
 "다."
 
 #. Tag: programlisting
-#: transactions.xml:614
+#: transactions.xml:638
 #, no-c-format
 msgid ""
 "<![CDATA[\n"
@@ -1299,7 +1299,7 @@
 msgstr ""
 
 #. Tag: para
-#: transactions.xml:616
+#: transactions.xml:640
 #, no-c-format
 msgid ""
 "Note that <literal>setTimeout()</literal> may not be called in a CMT bean, "
@@ -1309,13 +1309,13 @@
 "라. 여기서 트랜잭션 타임아웃들은 선언적으로 정의되어야 한다."
 
 #. Tag: title
-#: transactions.xml:626
+#: transactions.xml:650
 #, no-c-format
 msgid "Optimistic concurrency control"
 msgstr "Optimistic 동시성 제어"
 
 #. Tag: para
-#: transactions.xml:628
+#: transactions.xml:652
 #, no-c-format
 msgid ""
 "The only approach that is consistent with high concurrency and high "
@@ -1336,13 +1336,13 @@
 "지하는 이점을 갖고 있다."
 
 #. Tag: title
-#: transactions.xml:639
+#: transactions.xml:663
 #, no-c-format
 msgid "Application version checking"
 msgstr "어플리케이션 버전 체킹"
 
 #. Tag: para
-#: transactions.xml:641
+#: transactions.xml:665
 #, no-c-format
 msgid ""
 "In an implementation without much help from Hibernate, each interaction with "
@@ -1360,7 +1360,7 @@
 "자신의 버전 체킹을 수행하도록 어플리케이션에게 강제시킨다."
 
 #. Tag: programlisting
-#: transactions.xml:650
+#: transactions.xml:674
 #, no-c-format
 msgid ""
 "<![CDATA[// foo is an instance loaded by a previous Session\n"
@@ -1378,7 +1378,7 @@
 msgstr ""
 
 #. Tag: para
-#: transactions.xml:652
+#: transactions.xml:676
 #, no-c-format
 msgid ""
 "The <literal>version</literal> property is mapped using <literal>&lt;"
@@ -1390,7 +1390,7 @@
 "킬 것이다."
 
 #. Tag: para
-#: transactions.xml:658
+#: transactions.xml:682
 #, no-c-format
 msgid ""
 "Of course, if you are operating in a low-data-concurrency environment and "
@@ -1408,12 +1408,12 @@
 "들을 병합시킬 기회 없이 업데이트들 손실을 겪을 수도 있기 때문이다."
 
 #. Tag: para
-#: transactions.xml:667
-#, no-c-format
+#: transactions.xml:691
+#, 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. "
+"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,13 +1424,13 @@
 "전 체킹을 제공한다."
 
 #. Tag: title
-#: transactions.xml:678
+#: transactions.xml:702
 #, no-c-format
 msgid "Extended session and automatic versioning"
 msgstr "확장된 세션과 자동적인 버전화"
 
 #. Tag: para
-#: transactions.xml:680
+#: transactions.xml:704
 #, no-c-format
 msgid ""
 "A single <literal>Session</literal> instance and its persistent instances "
@@ -1454,7 +1454,7 @@
 "되지 않은 데이터를 가지고 비지니스 대화를 재시작하는 기회이다)."
 
 #. Tag: para
-#: transactions.xml:689
+#: transactions.xml:713
 #, no-c-format
 msgid ""
 "The <literal>Session</literal> is disconnected from any underlying JDBC "
@@ -1470,7 +1470,7 @@
 "스들을 다시 로드시킬 필요가 없다."
 
 #. Tag: programlisting
-#: transactions.xml:697
+#: transactions.xml:721
 #, no-c-format
 msgid ""
 "<![CDATA[// foo is an instance loaded earlier by the old session\n"
@@ -1485,7 +1485,7 @@
 msgstr ""
 
 #. Tag: para
-#: transactions.xml:698
+#: transactions.xml:722
 #, no-c-format
 msgid ""
 "The <literal>foo</literal> object still knows which <literal>Session</"
@@ -1521,7 +1521,7 @@
 "<literal>close()</literal>할 것이다."
 
 #. Tag: para
-#: transactions.xml:713
+#: transactions.xml:737
 #, no-c-format
 msgid ""
 "This pattern is problematic if the <literal>Session</literal> is too big to "
@@ -1541,7 +1541,7 @@
 "은 또한 곧 실없는 데이터가 될 것이기 때문이다."
 
 #. Tag: para
-#: transactions.xml:723
+#: transactions.xml:747
 #, no-c-format
 msgid ""
 "(Note that earlier Hibernate versions required explicit disconnection and "
@@ -1553,7 +1553,7 @@
 "효과를 가지므로, 이들 방법들은 진부하게 되었다.)"
 
 #. Tag: para
-#: transactions.xml:729
+#: transactions.xml:753
 #, no-c-format
 msgid ""
 "Also note that you should keep the disconnected <literal>Session</literal> "
@@ -1569,7 +1569,7 @@
 "에 전송하지 말라 (또는 그것을 별도의 티어에 직렬화 시키지도 말라)."
 
 #. Tag: para
-#: transactions.xml:737
+#: transactions.xml:761
 #, no-c-format
 msgid ""
 "The extended session pattern, or <emphasis>session-per-conversation</"
@@ -1584,13 +1584,13 @@
 "며, 예제들은 Hibernate Wiki를 보라."
 
 #. Tag: title
-#: transactions.xml:747
+#: transactions.xml:771
 #, no-c-format
 msgid "Detached objects and automatic versioning"
 msgstr "Detached 객체들과 자동적인 버전화"
 
 #. Tag: para
-#: transactions.xml:749
+#: transactions.xml:773
 #, no-c-format
 msgid ""
 "Each interaction with the persistent store occurs in a new <literal>Session</"
@@ -1609,7 +1609,7 @@
 "()</literal>를 사용하여 그것들을 다시 첨부시킨다."
 
 #. Tag: programlisting
-#: transactions.xml:757
+#: transactions.xml:781
 #, no-c-format
 msgid ""
 "<![CDATA[// foo is an instance loaded by a previous Session\n"
@@ -1623,17 +1623,17 @@
 msgstr ""
 
 #. Tag: para
-#: transactions.xml:759
-#, no-c-format
+#: transactions.xml:783
+#, 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 ""
 "다시, Hibernate는 flush 동안에 인스턴스 버전들을 체크할 것이고 업데이트 충돌"
 "이 발생할 경우에 예외상황을 던질 것이다."
 
 #. Tag: para
-#: transactions.xml:764
+#: transactions.xml:788
 #, no-c-format
 msgid ""
 "You may also call <literal>lock()</literal> instead of <literal>update()</"
@@ -1647,13 +1647,13 @@
 "용할 수 있다."
 
 #. Tag: title
-#: transactions.xml:773
+#: transactions.xml:797
 #, no-c-format
 msgid "Customizing automatic versioning"
 msgstr "자동적인 버전화를 맞춤화 시키기"
 
 #. Tag: para
-#: transactions.xml:775
+#: transactions.xml:799
 #, no-c-format
 msgid ""
 "You may disable Hibernate's automatic version increment for particular "
@@ -1667,8 +1667,8 @@
 "dirty 일 경우에 더 이상 버전을 증가시키지 않을 것이다."
 
 #. Tag: para
-#: transactions.xml:782
-#, no-c-format
+#: transactions.xml:806
+#, 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 "
@@ -1676,7 +1676,7 @@
 "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 "
+"<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."
@@ -1693,7 +1693,7 @@
 "으로만 동작함을 노트하라."
 
 #. Tag: para
-#: transactions.xml:793
+#: transactions.xml:817
 #, no-c-format
 msgid ""
 "Sometimes concurrent modification can be permitted as long as the changes "
@@ -1707,15 +1707,15 @@
 "비교만 할 것이다."
 
 #. Tag: para
-#: transactions.xml:799
-#, no-c-format
+#: transactions.xml:823
+#, fuzzy, 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 uneccessary updates. This is usually not a problem, "
+"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\"</"
@@ -1737,17 +1737,17 @@
 "징을 맞춤화 시킬 수 있다."
 
 #. Tag: title
-#: transactions.xml:817
+#: transactions.xml:841
 #, no-c-format
 msgid "Pessimistic Locking"
 msgstr "Pessimistic 잠금"
 
 #. Tag: para
-#: transactions.xml:819
-#, no-c-format
+#: transactions.xml:843
+#, 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'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."
@@ -1759,7 +1759,7 @@
 "작 시에 잠금들을 다시 얻고자 원할 수도 있다."
 
 #. Tag: para
-#: transactions.xml:826
+#: transactions.xml:850
 #, no-c-format
 msgid ""
 "Hibernate will always use the locking mechanism of the database, never lock "
@@ -1769,7 +1769,7 @@
 "을 항상 사용할 것이다!"
 
 #. Tag: para
-#: transactions.xml:831
+#: transactions.xml:855
 #, no-c-format
 msgid ""
 "The <literal>LockMode</literal> class defines the different lock levels that "
@@ -1779,7 +1779,7 @@
 "금 레벨들을 정의한다. 잠금은 다음 메커니즘들에 의해 얻어진다:"
 
 #. Tag: para
-#: transactions.xml:838
+#: transactions.xml:862
 #, no-c-format
 msgid ""
 "<literal>LockMode.WRITE</literal> is acquired automatically when Hibernate "
@@ -1789,7 +1789,7 @@
 "insert 할 때 자동적으로 획득된다."
 
 #. Tag: para
-#: transactions.xml:844
+#: transactions.xml:868
 #, no-c-format
 msgid ""
 "<literal>LockMode.UPGRADE</literal> may be acquired upon explicit user "
@@ -1801,7 +1801,7 @@
 "literal>를 사용하여 명시적인 사용자 요청 상에서 얻어질 수 있다."
 
 #. Tag: para
-#: transactions.xml:850
+#: transactions.xml:874
 #, no-c-format
 msgid ""
 "<literal>LockMode.UPGRADE_NOWAIT</literal> may be acquired upon explicit "
@@ -1813,7 +1813,7 @@
 "도 있다."
 
 #. Tag: para
-#: transactions.xml:856
+#: transactions.xml:880
 #, no-c-format
 msgid ""
 "<literal>LockMode.READ</literal> is acquired automatically when Hibernate "
@@ -1825,7 +1825,7 @@
 "질 수도 있다. 명시적인 사용자 요청에 의해 다시 얻어질 수도 있다."
 
 #. Tag: para
-#: transactions.xml:863
+#: transactions.xml:887
 #, no-c-format
 msgid ""
 "<literal>LockMode.NONE</literal> represents the absence of a lock. All "
@@ -1840,14 +1840,14 @@
 "출을 통해 세션과 연관된 객체들이 또한 이 잠금 모드로 시작된다."
 
 #. Tag: para
-#: transactions.xml:872
+#: transactions.xml:896
 #, no-c-format
 msgid ""
 "The \"explicit user request\" is expressed in one of the following ways:"
 msgstr "\"명시적인 사용자 요청\"은 다음 방법들 중 하나로 표현된다:"
 
 #. Tag: para
-#: transactions.xml:878
+#: transactions.xml:902
 #, no-c-format
 msgid ""
 "A call to <literal>Session.load()</literal>, specifying a <literal>LockMode</"
@@ -1857,19 +1857,19 @@
 "한 호출."
 
 #. Tag: para
-#: transactions.xml:883
+#: transactions.xml:907
 #, no-c-format
 msgid "A call to <literal>Session.lock()</literal>."
 msgstr "<literal>Session.lock()</literal>에 대한 호출."
 
 #. Tag: para
-#: transactions.xml:888
+#: transactions.xml:912
 #, no-c-format
 msgid "A call to <literal>Query.setLockMode()</literal>."
 msgstr "<literal>Query.setLockMode()</literal>에 대한 호출."
 
 #. Tag: para
-#: transactions.xml:894
+#: transactions.xml:918
 #, no-c-format
 msgid ""
 "If <literal>Session.load()</literal> is called with <literal>UPGRADE</"
@@ -1888,7 +1888,7 @@
 "그 객체에 대해 <literal>lock()</literal>을 호출한다."
 
 #. Tag: para
-#: transactions.xml:903
+#: transactions.xml:927
 #, no-c-format
 msgid ""
 "<literal>Session.lock()</literal> performs a version number check if the "
@@ -1904,7 +1904,7 @@
 "literal>가 사용된다.)"
 
 #. Tag: para
-#: transactions.xml:910
+#: transactions.xml:934
 #, no-c-format
 msgid ""
 "If the database does not support the requested lock mode, Hibernate will use "
@@ -1916,13 +1916,13 @@
 "이 이식 가능할 것임을 확실히 해준다."
 
 #. Tag: title
-#: transactions.xml:919
+#: transactions.xml:943
 #, no-c-format
 msgid "Connection Release Modes"
 msgstr "연결 해제 모드들"
 
 #. Tag: para
-#: transactions.xml:921
+#: transactions.xml:945
 #, no-c-format
 msgid ""
 "The legacy (2.x) behavior of Hibernate in regards to JDBC connection "
@@ -1946,11 +1946,11 @@
 "ConnectionReleaseMode</literal>의 열거된 값들에 의해 식별된다:"
 
 #. Tag: para
-#: transactions.xml:935
-#, no-c-format
+#: transactions.xml:959
+#, 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 "
+"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."
 msgstr ""
@@ -1959,7 +1959,7 @@
 "넥션을 보관할 필요가 있을 때 하나의 커넥션을 획득한다."
 
 #. Tag: para
-#: transactions.xml:942
+#: transactions.xml:966
 #, no-c-format
 msgid ""
 "<literal>AFTER_TRANSACTION</literal> - says to release connections after a "
@@ -1969,7 +1969,7 @@
 "Transaction</literal>이 완료된 후에 연결들을 해제하라고 말한다."
 
 #. Tag: para
-#: transactions.xml:948
+#: transactions.xml:972
 #, no-c-format
 msgid ""
 "<literal>AFTER_STATEMENT</literal> (also referred to as aggressive release) "
@@ -1986,7 +1986,7 @@
 "ScrollableResults</literal>의 사용을 통해서이다."
 
 #. Tag: para
-#: transactions.xml:958
+#: transactions.xml:982
 #, no-c-format
 msgid ""
 "The configuration parameter <literal>hibernate.connection.release_mode</"
@@ -1996,7 +1996,7 @@
 "release_mode</literal>가 사용된다. 가능한 값들은 다음과 같다:"
 
 #. Tag: para
-#: transactions.xml:965
+#: transactions.xml:989
 #, no-c-format
 msgid ""
 "<literal>auto</literal> (the default) - this choice delegates to the release "
@@ -2017,7 +2017,7 @@
 "다."
 
 #. Tag: para
-#: transactions.xml:975
+#: transactions.xml:999
 #, no-c-format
 msgid ""
 "<literal>on_close</literal> - says to use ConnectionReleaseMode.ON_CLOSE. "
@@ -2029,7 +2029,7 @@
 "는다."
 
 #. Tag: para
-#: transactions.xml:981
+#: transactions.xml:1005
 #, no-c-format
 msgid ""
 "<literal>after_transaction</literal> - says to use ConnectionReleaseMode."
@@ -2045,7 +2045,7 @@
 "AFTER_STATEMENT인 것처럼 해제될 것임을 또한 노트하라."
 
 #. Tag: para
-#: transactions.xml:989
+#: transactions.xml:1013
 #, no-c-format
 msgid ""
 "<literal>after_statement</literal> - says to use ConnectionReleaseMode."

Modified: core/trunk/documentation/manual/src/main/docbook/pot/content/architecture.pot
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/pot/content/architecture.pot	2008-08-14 15:28:13 UTC (rev 15066)
+++ core/trunk/documentation/manual/src/main/docbook/pot/content/architecture.pot	2008-08-14 15:35:40 UTC (rev 15067)
@@ -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: 2008-08-14 15:28+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/pot/content/association_mapping.pot
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/pot/content/association_mapping.pot	2008-08-14 15:28:13 UTC (rev 15066)
+++ core/trunk/documentation/manual/src/main/docbook/pot/content/association_mapping.pot	2008-08-14 15:35:40 UTC (rev 15067)
@@ -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: 2008-08-14 15:28+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/pot/content/basic_mapping.pot
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/pot/content/basic_mapping.pot	2008-08-14 15:28:13 UTC (rev 15066)
+++ core/trunk/documentation/manual/src/main/docbook/pot/content/basic_mapping.pot	2008-08-14 15:35:40 UTC (rev 15067)
@@ -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: 2008-08-14 15:28+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/pot/content/batch.pot
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/pot/content/batch.pot	2008-08-14 15:28:13 UTC (rev 15066)
+++ core/trunk/documentation/manual/src/main/docbook/pot/content/batch.pot	2008-08-14 15:35:40 UTC (rev 15067)
@@ -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: 2008-08-14 15:28+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/pot/content/best_practices.pot
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/pot/content/best_practices.pot	2008-08-14 15:28:13 UTC (rev 15066)
+++ core/trunk/documentation/manual/src/main/docbook/pot/content/best_practices.pot	2008-08-14 15:35:40 UTC (rev 15067)
@@ -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: 2008-08-14 15:28+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/pot/content/collection_mapping.pot
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/pot/content/collection_mapping.pot	2008-08-14 15:28:13 UTC (rev 15066)
+++ core/trunk/documentation/manual/src/main/docbook/pot/content/collection_mapping.pot	2008-08-14 15:35:40 UTC (rev 15067)
@@ -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: 2008-08-14 15:28+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/pot/content/component_mapping.pot
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/pot/content/component_mapping.pot	2008-08-14 15:28:13 UTC (rev 15066)
+++ core/trunk/documentation/manual/src/main/docbook/pot/content/component_mapping.pot	2008-08-14 15:35:40 UTC (rev 15067)
@@ -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: 2008-08-14 15:28+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/pot/content/configuration.pot
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/pot/content/configuration.pot	2008-08-14 15:28:13 UTC (rev 15066)
+++ core/trunk/documentation/manual/src/main/docbook/pot/content/configuration.pot	2008-08-14 15:35:40 UTC (rev 15067)
@@ -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: 2008-08-14 15:28+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"
@@ -1514,191 +1514,185 @@
 #. Tag: para
 #: configuration.xml:1208
 #, no-c-format
-msgid "Hibernate logs various events using Apache commons-logging."
+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."
 msgstr ""
 
 #. Tag: para
-#: configuration.xml:1212
+#: configuration.xml:1219
 #, 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."
-msgstr ""
-
-#. Tag: para
-#: 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:"
 msgstr ""
 
 #. Tag: title
-#: configuration.xml:1231
+#: configuration.xml:1228
 #, no-c-format
 msgid "Hibernate Log Categories"
 msgstr ""
 
 #. Tag: entry
-#: configuration.xml:1237
+#: configuration.xml:1234
 #, no-c-format
 msgid "Category"
 msgstr ""
 
 #. Tag: entry
-#: configuration.xml:1238
+#: configuration.xml:1235
 #, no-c-format
 msgid "Function"
 msgstr ""
 
 #. Tag: literal
-#: configuration.xml:1243
+#: configuration.xml:1240
 #, no-c-format
 msgid "org.hibernate.SQL"
 msgstr ""
 
 #. Tag: entry
-#: configuration.xml:1244
+#: configuration.xml:1241
 #, no-c-format
 msgid "Log all SQL DML statements as they are executed"
 msgstr ""
 
 #. Tag: literal
-#: configuration.xml:1247
+#: configuration.xml:1244
 #, no-c-format
 msgid "org.hibernate.type"
 msgstr ""
 
 #. Tag: entry
-#: configuration.xml:1248
+#: configuration.xml:1245
 #, no-c-format
 msgid "Log all JDBC parameters"
 msgstr ""
 
 #. Tag: literal
-#: configuration.xml:1251
+#: configuration.xml:1248
 #, no-c-format
 msgid "org.hibernate.tool.hbm2ddl"
 msgstr ""
 
 #. Tag: entry
-#: configuration.xml:1252
+#: configuration.xml:1249
 #, no-c-format
 msgid "Log all SQL DDL statements as they are executed"
 msgstr ""
 
 #. Tag: literal
-#: configuration.xml:1255
+#: configuration.xml:1252
 #, no-c-format
 msgid "org.hibernate.pretty"
 msgstr ""
 
 #. Tag: entry
-#: configuration.xml:1256
+#: configuration.xml:1253
 #, 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:1262
+#: configuration.xml:1259
 #, no-c-format
 msgid "org.hibernate.cache"
 msgstr ""
 
 #. Tag: entry
-#: configuration.xml:1263
+#: configuration.xml:1260
 #, no-c-format
 msgid "Log all second-level cache activity"
 msgstr ""
 
 #. Tag: literal
-#: configuration.xml:1266
+#: configuration.xml:1263
 #, no-c-format
 msgid "org.hibernate.transaction"
 msgstr ""
 
 #. Tag: entry
-#: configuration.xml:1267
+#: configuration.xml:1264
 #, no-c-format
 msgid "Log transaction related activity"
 msgstr ""
 
 #. Tag: literal
-#: configuration.xml:1270
+#: configuration.xml:1267
 #, no-c-format
 msgid "org.hibernate.jdbc"
 msgstr ""
 
 #. Tag: entry
-#: configuration.xml:1271
+#: configuration.xml:1268
 #, no-c-format
 msgid "Log all JDBC resource acquisition"
 msgstr ""
 
 #. Tag: literal
-#: configuration.xml:1274
+#: configuration.xml:1271
 #, no-c-format
 msgid "org.hibernate.hql.ast.AST"
 msgstr ""
 
 #. Tag: entry
-#: configuration.xml:1275
+#: configuration.xml:1272
 #, no-c-format
 msgid "Log HQL and SQL ASTs during query parsing"
 msgstr ""
 
 #. Tag: literal
-#: configuration.xml:1280
+#: configuration.xml:1277
 #, no-c-format
 msgid "org.hibernate.secure"
 msgstr ""
 
 #. Tag: entry
-#: configuration.xml:1281
+#: configuration.xml:1278
 #, no-c-format
 msgid "Log all JAAS authorization requests"
 msgstr ""
 
 #. Tag: literal
-#: configuration.xml:1284
+#: configuration.xml:1281
 #, no-c-format
 msgid "org.hibernate"
 msgstr ""
 
 #. Tag: entry
-#: configuration.xml:1285
+#: configuration.xml:1282
 #, no-c-format
 msgid "Log everything (a lot of information, but very useful for troubleshooting)"
 msgstr ""
 
 #. Tag: para
-#: configuration.xml:1294
+#: configuration.xml:1291
 #, 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:1304
+#: configuration.xml:1301
 #, no-c-format
 msgid "Implementing a <literal>NamingStrategy</literal>"
 msgstr ""
 
 #. Tag: para
-#: configuration.xml:1306
+#: configuration.xml:1303
 #, 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:1311
+#: configuration.xml:1308
 #, 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."
 msgstr ""
 
 #. Tag: para
-#: configuration.xml:1320
+#: configuration.xml:1317
 #, no-c-format
 msgid "You may specify a different strategy by calling <literal>Configuration.setNamingStrategy()</literal> before adding mappings:"
 msgstr ""
 
 #. Tag: programlisting
-#: configuration.xml:1325
+#: configuration.xml:1322
 #, no-c-format
 msgid ""
       "<![CDATA[SessionFactory sf = new Configuration()\n"
@@ -1709,31 +1703,31 @@
 msgstr ""
 
 #. Tag: para
-#: configuration.xml:1327
+#: configuration.xml:1324
 #, 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:1335
+#: configuration.xml:1332
 #, no-c-format
 msgid "XML configuration file"
 msgstr ""
 
 #. Tag: para
-#: configuration.xml:1337
+#: configuration.xml:1334
 #, 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:1344
+#: configuration.xml:1341
 #, 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:"
 msgstr ""
 
 #. Tag: programlisting
-#: configuration.xml:1349
+#: configuration.xml:1346
 #, no-c-format
 msgid ""
       "<![CDATA[<?xml version='1.0' encoding='utf-8'?>\n"
@@ -1771,31 +1765,31 @@
 msgstr ""
 
 #. Tag: para
-#: configuration.xml:1351
+#: configuration.xml:1348
 #, 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."
 msgstr ""
 
 #. Tag: para
-#: configuration.xml:1360
+#: configuration.xml:1357
 #, no-c-format
 msgid "With the XML configuration, starting Hibernate is then as simple as"
 msgstr ""
 
 #. Tag: programlisting
-#: configuration.xml:1364
+#: configuration.xml:1361
 #, no-c-format
 msgid "<![CDATA[SessionFactory sf = new Configuration().configure().buildSessionFactory();]]>"
 msgstr ""
 
 #. Tag: para
-#: configuration.xml:1366
+#: configuration.xml:1363
 #, no-c-format
 msgid "You can pick a different XML configuration file using"
 msgstr ""
 
 #. Tag: programlisting
-#: configuration.xml:1370
+#: configuration.xml:1367
 #, no-c-format
 msgid ""
       "<![CDATA[SessionFactory sf = new Configuration()\n"
@@ -1804,331 +1798,331 @@
 msgstr ""
 
 #. Tag: title
-#: configuration.xml:1375
+#: configuration.xml:1372
 #, no-c-format
 msgid "J2EE Application Server integration"
 msgstr ""
 
 #. Tag: para
-#: configuration.xml:1377
+#: configuration.xml:1374
 #, no-c-format
 msgid "Hibernate has the following integration points for J2EE infrastructure:"
 msgstr ""
 
 #. Tag: para
-#: configuration.xml:1383
+#: configuration.xml:1380
 #, 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."
 msgstr ""
 
 #. Tag: para
-#: configuration.xml:1398
+#: configuration.xml:1395
 #, 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:1407
+#: configuration.xml:1404
 #, 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)."
 msgstr ""
 
 #. Tag: para
-#: configuration.xml:1420
+#: configuration.xml:1417
 #, 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)."
 msgstr ""
 
 #. Tag: para
-#: configuration.xml:1431
+#: configuration.xml:1428
 #, 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:1438
+#: configuration.xml:1435
 #, no-c-format
 msgid "Transaction strategy configuration"
 msgstr ""
 
 #. Tag: para
-#: configuration.xml:1440
+#: configuration.xml:1437
 #, 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."
 msgstr ""
 
 #. Tag: para
-#: configuration.xml:1448
+#: configuration.xml:1445
 #, 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:1455
+#: configuration.xml:1452
 #, no-c-format
 msgid "There are three standard (built-in) choices:"
 msgstr ""
 
 #. Tag: literal
-#: configuration.xml:1461
+#: configuration.xml:1458
 #, no-c-format
 msgid "org.hibernate.transaction.JDBCTransactionFactory"
 msgstr ""
 
 #. Tag: para
-#: configuration.xml:1463
+#: configuration.xml:1460
 #, no-c-format
 msgid "delegates to database (JDBC) transactions (default)"
 msgstr ""
 
 #. Tag: literal
-#: configuration.xml:1467
+#: configuration.xml:1464
 #, no-c-format
 msgid "org.hibernate.transaction.JTATransactionFactory"
 msgstr ""
 
 #. Tag: para
-#: configuration.xml:1469
+#: configuration.xml:1466
 #, 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."
 msgstr ""
 
 #. Tag: literal
-#: configuration.xml:1477
+#: configuration.xml:1474
 #, no-c-format
 msgid "org.hibernate.transaction.CMTTransactionFactory"
 msgstr ""
 
 #. Tag: para
-#: configuration.xml:1479
+#: configuration.xml:1476
 #, no-c-format
 msgid "delegates to container-managed JTA transactions"
 msgstr ""
 
 #. Tag: para
-#: configuration.xml:1484
+#: configuration.xml:1481
 #, no-c-format
 msgid "You may also define your own transaction strategies (for a CORBA transaction service, for example)."
 msgstr ""
 
 #. Tag: para
-#: configuration.xml:1489
+#: configuration.xml:1486
 #, 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:"
 msgstr ""
 
 #. Tag: title
-#: configuration.xml:1497
+#: configuration.xml:1494
 #, no-c-format
 msgid "JTA TransactionManagers"
 msgstr ""
 
 #. Tag: entry
-#: configuration.xml:1503
+#: configuration.xml:1500
 #, no-c-format
 msgid "Transaction Factory"
 msgstr ""
 
 #. Tag: entry
-#: configuration.xml:1504
+#: configuration.xml:1501
 #, no-c-format
 msgid "Application Server"
 msgstr ""
 
 #. Tag: literal
-#: configuration.xml:1509
+#: configuration.xml:1506
 #, no-c-format
 msgid "org.hibernate.transaction.JBossTransactionManagerLookup"
 msgstr ""
 
 #. Tag: entry
-#: configuration.xml:1510
+#: configuration.xml:1507
 #, no-c-format
 msgid "JBoss"
 msgstr ""
 
 #. Tag: literal
-#: configuration.xml:1513
+#: configuration.xml:1510
 #, no-c-format
 msgid "org.hibernate.transaction.WeblogicTransactionManagerLookup"
 msgstr ""
 
 #. Tag: entry
-#: configuration.xml:1514
+#: configuration.xml:1511
 #, no-c-format
 msgid "Weblogic"
 msgstr ""
 
 #. Tag: literal
-#: configuration.xml:1517
+#: configuration.xml:1514
 #, no-c-format
 msgid "org.hibernate.transaction.WebSphereTransactionManagerLookup"
 msgstr ""
 
 #. Tag: entry
-#: configuration.xml:1518
+#: configuration.xml:1515
 #, no-c-format
 msgid "WebSphere"
 msgstr ""
 
 #. Tag: literal
-#: configuration.xml:1521
+#: configuration.xml:1518
 #, no-c-format
 msgid "org.hibernate.transaction.WebSphereExtendedJTATransactionLookup"
 msgstr ""
 
 #. Tag: entry
-#: configuration.xml:1522
+#: configuration.xml:1519
 #, no-c-format
 msgid "WebSphere 6"
 msgstr ""
 
 #. Tag: literal
-#: configuration.xml:1525
+#: configuration.xml:1522
 #, no-c-format
 msgid "org.hibernate.transaction.OrionTransactionManagerLookup"
 msgstr ""
 
 #. Tag: entry
-#: configuration.xml:1526
+#: configuration.xml:1523
 #, no-c-format
 msgid "Orion"
 msgstr ""
 
 #. Tag: literal
-#: configuration.xml:1529
+#: configuration.xml:1526
 #, no-c-format
 msgid "org.hibernate.transaction.ResinTransactionManagerLookup"
 msgstr ""
 
 #. Tag: entry
-#: configuration.xml:1530
+#: configuration.xml:1527
 #, no-c-format
 msgid "Resin"
 msgstr ""
 
 #. Tag: literal
-#: configuration.xml:1533
+#: configuration.xml:1530
 #, no-c-format
 msgid "org.hibernate.transaction.JOTMTransactionManagerLookup"
 msgstr ""
 
 #. Tag: entry
-#: configuration.xml:1534
+#: configuration.xml:1531
 #, no-c-format
 msgid "JOTM"
 msgstr ""
 
 #. Tag: literal
-#: configuration.xml:1537
+#: configuration.xml:1534
 #, no-c-format
 msgid "org.hibernate.transaction.JOnASTransactionManagerLookup"
 msgstr ""
 
 #. Tag: entry
-#: configuration.xml:1538
+#: configuration.xml:1535
 #, no-c-format
 msgid "JOnAS"
 msgstr ""
 
 #. Tag: literal
-#: configuration.xml:1541
+#: configuration.xml:1538
 #, no-c-format
 msgid "org.hibernate.transaction.JRun4TransactionManagerLookup"
 msgstr ""
 
 #. Tag: entry
-#: configuration.xml:1542
+#: configuration.xml:1539
 #, no-c-format
 msgid "JRun4"
 msgstr ""
 
 #. Tag: literal
-#: configuration.xml:1545
+#: configuration.xml:1542
 #, no-c-format
 msgid "org.hibernate.transaction.BESTransactionManagerLookup"
 msgstr ""
 
 #. Tag: entry
-#: configuration.xml:1546
+#: configuration.xml:1543
 #, no-c-format
 msgid "Borland ES"
 msgstr ""
 
 #. Tag: title
-#: configuration.xml:1555
+#: configuration.xml:1552
 #, no-c-format
 msgid "JNDI-bound <literal>SessionFactory</literal>"
 msgstr ""
 
 #. Tag: para
-#: configuration.xml:1557
+#: configuration.xml:1554
 #, 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!"
 msgstr ""
 
 #. Tag: para
-#: configuration.xml:1564
+#: configuration.xml:1561
 #, 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.)"
 msgstr ""
 
 #. Tag: para
-#: configuration.xml:1572
+#: configuration.xml:1569
 #, 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:1579
+#: configuration.xml:1576
 #, 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)."
 msgstr ""
 
 #. Tag: para
-#: configuration.xml:1586
+#: configuration.xml:1583
 #, 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."
 msgstr ""
 
 #. Tag: para
-#: configuration.xml:1591
+#: configuration.xml:1588
 #, 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."
 msgstr ""
 
 #. Tag: title
-#: configuration.xml:1603
+#: configuration.xml:1600
 #, no-c-format
 msgid "Current Session context management with JTA"
 msgstr ""
 
 #. Tag: para
-#: configuration.xml:1605
+#: configuration.xml:1602
 #, 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."
 msgstr ""
 
 #. Tag: title
-#: configuration.xml:1628
+#: configuration.xml:1625
 #, no-c-format
 msgid "JMX deployment"
 msgstr ""
 
 #. Tag: para
-#: configuration.xml:1630
+#: configuration.xml:1627
 #, 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>."
 msgstr ""
 
 #. Tag: para
-#: configuration.xml:1638
+#: configuration.xml:1635
 #, 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:"
 msgstr ""
 
 #. Tag: programlisting
-#: configuration.xml:1645
+#: configuration.xml:1642
 #, no-c-format
 msgid ""
       "<![CDATA[<?xml version=\"1.0\"?>\n"
@@ -2176,7 +2170,7 @@
 msgstr ""
 
 #. Tag: para
-#: configuration.xml:1647
+#: configuration.xml:1644
 #, 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."
 msgstr ""

Modified: core/trunk/documentation/manual/src/main/docbook/pot/content/events.pot
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/pot/content/events.pot	2008-08-14 15:28:13 UTC (rev 15066)
+++ core/trunk/documentation/manual/src/main/docbook/pot/content/events.pot	2008-08-14 15:35:40 UTC (rev 15067)
@@ -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: 2008-08-14 15:28+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/pot/content/example_mappings.pot
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/pot/content/example_mappings.pot	2008-08-14 15:28:13 UTC (rev 15066)
+++ core/trunk/documentation/manual/src/main/docbook/pot/content/example_mappings.pot	2008-08-14 15:35:40 UTC (rev 15067)
@@ -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: 2008-08-14 15:28+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/pot/content/example_parentchild.pot
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/pot/content/example_parentchild.pot	2008-08-14 15:28:13 UTC (rev 15066)
+++ core/trunk/documentation/manual/src/main/docbook/pot/content/example_parentchild.pot	2008-08-14 15:35:40 UTC (rev 15067)
@@ -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: 2008-08-14 15:28+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/pot/content/example_weblog.pot
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/pot/content/example_weblog.pot	2008-08-14 15:28:13 UTC (rev 15066)
+++ core/trunk/documentation/manual/src/main/docbook/pot/content/example_weblog.pot	2008-08-14 15:35:40 UTC (rev 15067)
@@ -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: 2008-08-14 15:28+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/pot/content/filters.pot
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/pot/content/filters.pot	2008-08-14 15:28:13 UTC (rev 15066)
+++ core/trunk/documentation/manual/src/main/docbook/pot/content/filters.pot	2008-08-14 15:35:40 UTC (rev 15067)
@@ -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: 2008-08-14 15:28+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/pot/content/inheritance_mapping.pot
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/pot/content/inheritance_mapping.pot	2008-08-14 15:28:13 UTC (rev 15066)
+++ core/trunk/documentation/manual/src/main/docbook/pot/content/inheritance_mapping.pot	2008-08-14 15:35:40 UTC (rev 15067)
@@ -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: 2008-08-14 15:28+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/pot/content/performance.pot
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/pot/content/performance.pot	2008-08-14 15:28:13 UTC (rev 15066)
+++ core/trunk/documentation/manual/src/main/docbook/pot/content/performance.pot	2008-08-14 15:35:40 UTC (rev 15067)
@@ -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: 2008-08-14 15:28+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/pot/content/persistent_classes.pot
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/pot/content/persistent_classes.pot	2008-08-14 15:28:13 UTC (rev 15066)
+++ core/trunk/documentation/manual/src/main/docbook/pot/content/persistent_classes.pot	2008-08-14 15:35:40 UTC (rev 15067)
@@ -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: 2008-08-14 15:28+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/pot/content/preface.pot
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/pot/content/preface.pot	2008-08-14 15:28:13 UTC (rev 15066)
+++ core/trunk/documentation/manual/src/main/docbook/pot/content/preface.pot	2008-08-14 15:35:40 UTC (rev 15067)
@@ -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: 2008-08-14 15:28+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/pot/content/query_criteria.pot
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/pot/content/query_criteria.pot	2008-08-14 15:28:13 UTC (rev 15066)
+++ core/trunk/documentation/manual/src/main/docbook/pot/content/query_criteria.pot	2008-08-14 15:35:40 UTC (rev 15067)
@@ -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: 2008-08-14 15:28+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/pot/content/query_hql.pot
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/pot/content/query_hql.pot	2008-08-14 15:28:13 UTC (rev 15066)
+++ core/trunk/documentation/manual/src/main/docbook/pot/content/query_hql.pot	2008-08-14 15:35:40 UTC (rev 15067)
@@ -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: 2008-08-14 15:28+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/pot/content/query_sql.pot
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/pot/content/query_sql.pot	2008-08-14 15:28:13 UTC (rev 15066)
+++ core/trunk/documentation/manual/src/main/docbook/pot/content/query_sql.pot	2008-08-14 15:35:40 UTC (rev 15067)
@@ -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: 2008-08-14 15:28+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/pot/content/session_api.pot
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/pot/content/session_api.pot	2008-08-14 15:28:13 UTC (rev 15066)
+++ core/trunk/documentation/manual/src/main/docbook/pot/content/session_api.pot	2008-08-14 15:35:40 UTC (rev 15067)
@@ -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: 2008-08-14 15:28+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/pot/content/toolset_guide.pot
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/pot/content/toolset_guide.pot	2008-08-14 15:28:13 UTC (rev 15066)
+++ core/trunk/documentation/manual/src/main/docbook/pot/content/toolset_guide.pot	2008-08-14 15:35:40 UTC (rev 15067)
@@ -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: 2008-08-14 15:28+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/pot/content/transactions.pot
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/pot/content/transactions.pot	2008-08-14 15:28:13 UTC (rev 15066)
+++ core/trunk/documentation/manual/src/main/docbook/pot/content/transactions.pot	2008-08-14 15:35:40 UTC (rev 15067)
@@ -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: 2008-08-14 15:28+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/pot/content/tutorial.pot
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/pot/content/tutorial.pot	2008-08-14 15:28:13 UTC (rev 15066)
+++ core/trunk/documentation/manual/src/main/docbook/pot/content/tutorial.pot	2008-08-14 15:35:40 UTC (rev 15067)
@@ -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: 2008-08-14 15:28+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,106 +15,115 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: tutorial.xml:31
+#: tutorial.xml:33
 #, no-c-format
 msgid "Introduction to Hibernate"
 msgstr ""
 
 #. Tag: title
-#: tutorial.xml:34
+#: tutorial.xml:36
 #, no-c-format
 msgid "Preface"
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:36
+#: tutorial.xml:38
 #, 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."
+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."
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:42
+#: tutorial.xml:51
 #, 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."
+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."
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:48
+#: tutorial.xml:61
 #, no-c-format
-msgid "The source code for the tutorial is included in the distribution in the <literal>doc/reference/tutorial/</literal> directory."
+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."
 msgstr ""
 
 #. Tag: title
-#: tutorial.xml:56
+#: tutorial.xml:71
 #, no-c-format
 msgid "Part 1 - The first Hibernate Application"
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:58
+#: tutorial.xml:73
 #, 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."
+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."
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:63
+#: tutorial.xml:82
 #, 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."
+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."
 msgstr ""
 
-#. Tag: para
-#: tutorial.xml:68
-#, 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:"
-msgstr ""
-
 #. Tag: programlisting
-#: tutorial.xml:76
+#: 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 ]]>"
+      "<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"
+      "\n"
+      "    <dependencies>\n"
+      "        <dependency>\n"
+      "            <groupId>${groupId}</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"
+      "    </dependencies>\n"
+      "\n"
+      "</project>]]>"
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:78
+#: 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.)"
+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."
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:87
+#: tutorial.xml:105
 #, 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."
+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:92
+#: tutorial.xml:117
 #, no-c-format
 msgid "The first class"
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:94
+#: tutorial.xml:119
 #, no-c-format
 msgid "Our first persistent class is a simple JavaBean class with some properties:"
 msgstr ""
 
 #. Tag: programlisting
-#: tutorial.xml:98
+#: tutorial.xml:123
 #, no-c-format
 msgid ""
-      "<![CDATA[package events;\n"
+      "<![CDATA[package org.hibernate.tutorial.domain;\n"
       "\n"
       "import java.util.Date;\n"
       "\n"
@@ -153,31 +162,31 @@
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:100
+#: tutorial.xml:125
 #, 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."
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:108
+#: tutorial.xml:133
 #, 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."
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:120
+#: tutorial.xml:145
 #, 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."
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:127
+#: tutorial.xml:152
 #, 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:"
 msgstr ""
 
 #. Tag: programlisting
-#: tutorial.xml:132
+#: tutorial.xml:157
 #, no-c-format
 msgid ""
       "<![CDATA[.\n"
@@ -189,31 +198,31 @@
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:134
+#: tutorial.xml:159
 #, no-c-format
 msgid "In the next step, we tell Hibernate about this persistent class."
 msgstr ""
 
 #. Tag: title
-#: tutorial.xml:141
+#: tutorial.xml:166
 #, no-c-format
 msgid "The mapping file"
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:143
+#: tutorial.xml:168
 #, 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:150
+#: tutorial.xml:175
 #, no-c-format
 msgid "The basic structure of a mapping file looks like this:"
 msgstr ""
 
 #. Tag: programlisting
-#: tutorial.xml:154
+#: tutorial.xml:179
 #, no-c-format
 msgid ""
       "<![CDATA[<?xml version=\"1.0\"?>\n"
@@ -227,25 +236,25 @@
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:156
+#: tutorial.xml:181
 #, 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."
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:167
+#: tutorial.xml:192
 #, no-c-format
 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:172
+#: tutorial.xml:197
 #, 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:"
 msgstr ""
 
 #. Tag: programlisting
-#: tutorial.xml:179
+#: tutorial.xml:204
 #, no-c-format
 msgid ""
       "<![CDATA[<hibernate-mapping>\n"
@@ -258,13 +267,13 @@
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:181
+#: tutorial.xml:206
 #, 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:"
 msgstr ""
 
 #. Tag: programlisting
-#: tutorial.xml:189
+#: tutorial.xml:214
 #, no-c-format
 msgid ""
       "<![CDATA[<hibernate-mapping>\n"
@@ -279,19 +288,19 @@
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:191
+#: tutorial.xml:216
 #, 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)."
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:204
+#: tutorial.xml:229
 #, 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:"
 msgstr ""
 
 #. Tag: programlisting
-#: tutorial.xml:210
+#: tutorial.xml:235
 #, no-c-format
 msgid ""
       "<![CDATA[\n"
@@ -309,31 +318,31 @@
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:212
+#: tutorial.xml:237
 #, 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>."
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:219
+#: tutorial.xml:244
 #, 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."
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:228
+#: tutorial.xml:253
 #, 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."
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:244
+#: tutorial.xml:269
 #, 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:"
 msgstr ""
 
 #. Tag: programlisting
-#: tutorial.xml:252
+#: tutorial.xml:277
 #, no-c-format
 msgid ""
       "<![CDATA[.\n"
@@ -346,43 +355,43 @@
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:254
+#: tutorial.xml:279
 #, no-c-format
 msgid "We continue with the main configuration of Hibernate."
 msgstr ""
 
 #. Tag: title
-#: tutorial.xml:261
+#: tutorial.xml:286
 #, no-c-format
 msgid "Hibernate configuration"
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:263
+#: tutorial.xml:288
 #, 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."
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:271
+#: tutorial.xml:296
 #, 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."
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:281
+#: tutorial.xml:306
 #, 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."
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:291
+#: tutorial.xml:316
 #, 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:"
 msgstr ""
 
 #. Tag: programlisting
-#: tutorial.xml:297
+#: tutorial.xml:322
 #, no-c-format
 msgid ""
       "<![CDATA[<?xml version='1.0' encoding='utf-8'?>\n"
@@ -426,43 +435,43 @@
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:299
+#: tutorial.xml:324
 #, 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)."
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:307
+#: tutorial.xml:332
 #, 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."
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:320
+#: tutorial.xml:345
 #, 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."
 msgstr ""
 
 #. Tag: title
-#: tutorial.xml:329
+#: tutorial.xml:354
 #, no-c-format
 msgid "Building with Ant"
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:331
+#: tutorial.xml:356
 #, 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."
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:340
+#: tutorial.xml:365
 #, no-c-format
 msgid "A basic build file looks like this:"
 msgstr ""
 
 #. Tag: programlisting
-#: tutorial.xml:344
+#: tutorial.xml:369
 #, no-c-format
 msgid ""
       "<![CDATA[<project name=\"hibernate-tutorial\" default=\"compile\">\n"
@@ -500,13 +509,13 @@
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:346
+#: 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 ""
 
 #. Tag: programlisting
-#: tutorial.xml:353
+#: tutorial.xml:378
 #, no-c-format
 msgid ""
       "<![CDATA[C:\\hibernateTutorial\\>ant\n"
@@ -523,25 +532,25 @@
 msgstr ""
 
 #. Tag: title
-#: tutorial.xml:358
+#: tutorial.xml:383
 #, no-c-format
 msgid "Startup and helpers"
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:360
+#: tutorial.xml:385
 #, 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."
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:370
+#: tutorial.xml:395
 #, 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:"
 msgstr ""
 
 #. Tag: programlisting
-#: tutorial.xml:376
+#: tutorial.xml:401
 #, no-c-format
 msgid ""
       "<![CDATA[package util;\n"
@@ -572,25 +581,25 @@
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:378
+#: tutorial.xml:403
 #, 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."
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:385
+#: tutorial.xml:410
 #, 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."
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:394
+#: tutorial.xml:419
 #, no-c-format
 msgid "Place <literal>HibernateUtil.java</literal> in the development source directory, in a package next to <literal>events</literal>:"
 msgstr ""
 
 #. Tag: programlisting
-#: tutorial.xml:399
+#: tutorial.xml:424
 #, no-c-format
 msgid ""
       "<![CDATA[.\n"
@@ -608,31 +617,31 @@
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:401
+#: 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 ""
 
 #. Tag: para
-#: tutorial.xml:411
+#: tutorial.xml:436
 #, no-c-format
 msgid "The tutorial infrastructure is complete - and we are ready to do some real work with Hibernate."
 msgstr ""
 
 #. Tag: title
-#: tutorial.xml:419
+#: tutorial.xml:444
 #, no-c-format
 msgid "Loading and storing objects"
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:421
+#: tutorial.xml:446
 #, 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:"
 msgstr ""
 
 #. Tag: programlisting
-#: tutorial.xml:426
+#: tutorial.xml:451
 #, no-c-format
 msgid ""
       "<![CDATA[package events;\n"
@@ -673,49 +682,49 @@
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:428
+#: tutorial.xml:453
 #, 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."
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:435
+#: tutorial.xml:460
 #, 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>."
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:443
+#: tutorial.xml:468
 #, 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."
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:454
+#: tutorial.xml:479
 #, 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)."
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:465
+#: tutorial.xml:490
 #, 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."
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:476
+#: tutorial.xml:501
 #, 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."
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:482
+#: tutorial.xml:507
 #, no-c-format
 msgid "To run this first routine we have to add a callable target to the Ant build file:"
 msgstr ""
 
 #. Tag: programlisting
-#: tutorial.xml:486
+#: tutorial.xml:511
 #, no-c-format
 msgid ""
       "<![CDATA[<target name=\"run\" depends=\"compile\">\n"
@@ -727,43 +736,43 @@
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:488
+#: tutorial.xml:513
 #, no-c-format
 msgid "The value of the <literal>action</literal> argument is set on the command line when calling the target:"
 msgstr ""
 
 #. Tag: programlisting
-#: tutorial.xml:493
+#: tutorial.xml:518
 #, no-c-format
 msgid "<![CDATA[C:\\hibernateTutorial\\>ant run -Daction=store]]>"
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:495
+#: tutorial.xml:520
 #, 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:"
 msgstr ""
 
 #. Tag: programlisting
-#: tutorial.xml:500
+#: tutorial.xml:525
 #, no-c-format
 msgid "<![CDATA[[java] Hibernate: insert into EVENTS (EVENT_DATE, title, EVENT_ID) values (?, ?, ?)]]>"
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:502
+#: tutorial.xml:527
 #, 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>."
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:508
+#: 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:"
 msgstr ""
 
 #. Tag: programlisting
-#: tutorial.xml:512
+#: tutorial.xml:537
 #, no-c-format
 msgid ""
       "<![CDATA[if (args[0].equals(\"store\")) {\n"
@@ -780,13 +789,13 @@
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:514
+#: tutorial.xml:539
 #, no-c-format
 msgid "We also add a new <literal>listEvents() method</literal>:"
 msgstr ""
 
 #. Tag: programlisting
-#: tutorial.xml:518
+#: tutorial.xml:543
 #, no-c-format
 msgid ""
       "<![CDATA[private List listEvents() {\n"
@@ -804,67 +813,67 @@
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:520
+#: tutorial.xml:545
 #, 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."
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:527
+#: tutorial.xml:552
 #, no-c-format
 msgid "Now, to execute and test all of this, follow these steps:"
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:533
+#: 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:539
+#: 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:549
+#: 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:555
+#: 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:568
+#: tutorial.xml:593
 #, no-c-format
 msgid "Part 2 - Mapping associations"
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:570
+#: tutorial.xml:595
 #, 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."
 msgstr ""
 
 #. Tag: title
-#: tutorial.xml:576
+#: tutorial.xml:601
 #, no-c-format
 msgid "Mapping the Person class"
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:578
+#: tutorial.xml:603
 #, no-c-format
 msgid "The first cut of the <literal>Person</literal> class is simple:"
 msgstr ""
 
 #. Tag: programlisting
-#: tutorial.xml:582
+#: tutorial.xml:607
 #, no-c-format
 msgid ""
       "<![CDATA[package events;\n"
@@ -884,13 +893,13 @@
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:584
+#: tutorial.xml:609
 #, no-c-format
 msgid "Create a new mapping file called <literal>Person.hbm.xml</literal> (don't forget the DTD reference at the top):"
 msgstr ""
 
 #. Tag: programlisting
-#: tutorial.xml:589
+#: tutorial.xml:614
 #, no-c-format
 msgid ""
       "<![CDATA[<hibernate-mapping>\n"
@@ -908,13 +917,13 @@
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:591
+#: tutorial.xml:616
 #, no-c-format
 msgid "Finally, add the new mapping to Hibernate's configuration:"
 msgstr ""
 
 #. Tag: programlisting
-#: tutorial.xml:595
+#: tutorial.xml:620
 #, no-c-format
 msgid ""
       "<![CDATA[<mapping resource=\"events/Event.hbm.xml\"/>\n"
@@ -922,31 +931,31 @@
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:597
+#: tutorial.xml:622
 #, 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."
 msgstr ""
 
 #. Tag: title
-#: tutorial.xml:607
+#: tutorial.xml:632
 #, no-c-format
 msgid "A unidirectional Set-based association"
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:609
+#: tutorial.xml:634
 #, 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."
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:616
+#: 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:621
+#: tutorial.xml:646
 #, no-c-format
 msgid ""
       "<![CDATA[public class Person {\n"
@@ -964,13 +973,13 @@
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:623
+#: tutorial.xml:648
 #, 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:"
 msgstr ""
 
 #. Tag: programlisting
-#: tutorial.xml:634
+#: tutorial.xml:659
 #, no-c-format
 msgid ""
       "<![CDATA[<class name=\"events.Person\" table=\"PERSON\">\n"
@@ -990,19 +999,19 @@
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:636
+#: tutorial.xml:661
 #, 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)."
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:648
+#: tutorial.xml:673
 #, no-c-format
 msgid "The database schema for this mapping is therefore:"
 msgstr ""
 
 #. Tag: programlisting
-#: tutorial.xml:652
+#: tutorial.xml:677
 #, no-c-format
 msgid ""
       "<![CDATA[\n"
@@ -1021,19 +1030,19 @@
 msgstr ""
 
 #. Tag: title
-#: tutorial.xml:657
+#: tutorial.xml:682
 #, no-c-format
 msgid "Working the association"
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:659
+#: tutorial.xml:684
 #, no-c-format
 msgid "Let's bring some people and events together in a new method in <literal>EventManager</literal>:"
 msgstr ""
 
 #. Tag: programlisting
-#: tutorial.xml:663
+#: tutorial.xml:688
 #, no-c-format
 msgid ""
       "<![CDATA[private void addPersonToEvent(Long personId, Long eventId) {\n"
@@ -1051,19 +1060,19 @@
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:665
+#: tutorial.xml:690
 #, 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."
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:680
+#: tutorial.xml:705
 #, 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:"
 msgstr ""
 
 #. Tag: programlisting
-#: tutorial.xml:687
+#: tutorial.xml:712
 #, no-c-format
 msgid ""
       "<![CDATA[private void addPersonToEvent(Long personId, Long eventId) {\n"
@@ -1096,19 +1105,19 @@
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:689
+#: tutorial.xml:714
 #, 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."
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:696
+#: tutorial.xml:721
 #, 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):"
 msgstr ""
 
 #. Tag: programlisting
-#: tutorial.xml:704
+#: tutorial.xml:729
 #, no-c-format
 msgid ""
       "<![CDATA[else if (args[0].equals(\"addpersontoevent\")) {\n"
@@ -1120,31 +1129,31 @@
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:706
+#: tutorial.xml:731
 #, 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."
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:719
+#: tutorial.xml:744
 #, 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."
 msgstr ""
 
 #. Tag: title
-#: tutorial.xml:727
+#: tutorial.xml:752
 #, no-c-format
 msgid "Collection of values"
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:729
+#: tutorial.xml:754
 #, 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>:"
 msgstr ""
 
 #. Tag: programlisting
-#: tutorial.xml:734
+#: tutorial.xml:759
 #, no-c-format
 msgid ""
       "<![CDATA[private Set emailAddresses = new HashSet();\n"
@@ -1159,13 +1168,13 @@
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:736
+#: tutorial.xml:761
 #, no-c-format
 msgid "The mapping of this <literal>Set</literal>:"
 msgstr ""
 
 #. Tag: programlisting
-#: tutorial.xml:740
+#: tutorial.xml:765
 #, no-c-format
 msgid ""
       "<![CDATA[<set name=\"emailAddresses\" table=\"PERSON_EMAIL_ADDR\">\n"
@@ -1175,19 +1184,19 @@
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:742
+#: tutorial.xml:767
 #, 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."
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:752
+#: tutorial.xml:777
 #, no-c-format
 msgid "Have a look at the updated schema:"
 msgstr ""
 
 #. Tag: programlisting
-#: tutorial.xml:756
+#: tutorial.xml:781
 #, no-c-format
 msgid ""
       "<![CDATA[\n"
@@ -1206,19 +1215,19 @@
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:758
+#: tutorial.xml:783
 #, 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."
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:764
+#: tutorial.xml:789
 #, 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:"
 msgstr ""
 
 #. Tag: programlisting
-#: tutorial.xml:769
+#: tutorial.xml:794
 #, no-c-format
 msgid ""
       "<![CDATA[private void addEmailToPerson(Long personId, String emailAddress) {\n"
@@ -1236,31 +1245,31 @@
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:771
+#: tutorial.xml:796
 #, 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."
 msgstr ""
 
 #. Tag: title
-#: tutorial.xml:781
+#: tutorial.xml:806
 #, no-c-format
 msgid "Bi-directional associations"
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:783
+#: tutorial.xml:808
 #, 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."
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:791
+#: tutorial.xml:816
 #, no-c-format
 msgid "First, add a collection of participants to the <literal>Event</literal> Event class:"
 msgstr ""
 
 #. Tag: programlisting
-#: tutorial.xml:795
+#: tutorial.xml:820
 #, no-c-format
 msgid ""
       "<![CDATA[private Set participants = new HashSet();\n"
@@ -1275,13 +1284,13 @@
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:797
+#: tutorial.xml:822
 #, no-c-format
 msgid "Now map this side of the association too, in <literal>Event.hbm.xml</literal>."
 msgstr ""
 
 #. Tag: programlisting
-#: tutorial.xml:801
+#: tutorial.xml:826
 #, no-c-format
 msgid ""
       "<![CDATA[<set name=\"participants\" table=\"PERSON_EVENT\" inverse=\"true\">\n"
@@ -1291,37 +1300,37 @@
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:803
+#: tutorial.xml:828
 #, 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."
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:811
+#: tutorial.xml:836
 #, 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 ."
 msgstr ""
 
 #. Tag: title
-#: tutorial.xml:820
+#: tutorial.xml:845
 #, no-c-format
 msgid "Working bi-directional links"
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:822
+#: tutorial.xml:847
 #, 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."
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:832
+#: tutorial.xml:857
 #, no-c-format
 msgid "Many developers program defensively and create link management methods to correctly set both sides, e.g. in <literal>Person</literal>:"
 msgstr ""
 
 #. Tag: programlisting
-#: tutorial.xml:837
+#: tutorial.xml:862
 #, no-c-format
 msgid ""
       "<![CDATA[protected Set getEvents() {\n"
@@ -1344,49 +1353,49 @@
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:839
+#: tutorial.xml:864
 #, 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."
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:846
+#: tutorial.xml:871
 #, 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."
 msgstr ""
 
 #. Tag: title
-#: tutorial.xml:864
+#: tutorial.xml:889
 #, no-c-format
 msgid "Part 3 - The EventManager web application"
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:866
+#: tutorial.xml:891
 #, no-c-format
 msgid "Let's turn the following discussion into a small web application..."
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:870
+#: 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:878
+#: tutorial.xml:903
 #, no-c-format
 msgid "Writing the basic servlet"
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:880
+#: tutorial.xml:905
 #, no-c-format
 msgid "Create a new class in your source directory, in the <literal>events</literal> package:"
 msgstr ""
 
 #. Tag: programlisting
-#: tutorial.xml:885
+#: tutorial.xml:910
 #, no-c-format
 msgid ""
       "<![CDATA[package events;\n"
@@ -1400,13 +1409,13 @@
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:887
+#: 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:892
+#: tutorial.xml:917
 #, no-c-format
 msgid ""
       "<![CDATA[protected void doGet(HttpServletRequest request,\n"
@@ -1436,43 +1445,43 @@
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:894
+#: tutorial.xml:919
 #, 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)."
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:903
+#: tutorial.xml:928
 #, 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:910
+#: tutorial.xml:935
 #, 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."
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:915
+#: tutorial.xml:940
 #, 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."
 msgstr ""
 
 #. Tag: title
-#: tutorial.xml:929
+#: tutorial.xml:954
 #, no-c-format
 msgid "Processing and rendering"
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:931
+#: tutorial.xml:956
 #, no-c-format
 msgid "Let's implement the processing of the request and rendering of the page."
 msgstr ""
 
 #. Tag: programlisting
-#: tutorial.xml:935
+#: tutorial.xml:960
 #, no-c-format
 msgid ""
       "<![CDATA[// Write HTML header\n"
@@ -1504,13 +1513,13 @@
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:937
+#: tutorial.xml:962
 #, 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:"
 msgstr ""
 
 #. Tag: programlisting
-#: tutorial.xml:946
+#: tutorial.xml:971
 #, no-c-format
 msgid ""
       "<![CDATA[private void printEventForm(PrintWriter out) {\n"
@@ -1524,13 +1533,13 @@
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:948
+#: tutorial.xml:973
 #, 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:954
+#: tutorial.xml:979
 #, no-c-format
 msgid ""
       "<![CDATA[private void listEvents(PrintWriter out, SimpleDateFormat dateFormatter) {\n"
@@ -1557,13 +1566,13 @@
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:956
+#: tutorial.xml:981
 #, 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:962
+#: tutorial.xml:987
 #, no-c-format
 msgid ""
       "<![CDATA[protected void createAndStoreEvent(String title, Date theDate) {\n"
@@ -1577,25 +1586,25 @@
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:964
+#: tutorial.xml:989
 #, 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."
 msgstr ""
 
 #. Tag: title
-#: tutorial.xml:978
+#: tutorial.xml:1003
 #, no-c-format
 msgid "Deploying and testing"
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:980
+#: tutorial.xml:1005
 #, 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>:"
 msgstr ""
 
 #. Tag: programlisting
-#: tutorial.xml:985
+#: tutorial.xml:1010
 #, no-c-format
 msgid ""
       "<![CDATA[<target name=\"war\" depends=\"compile\">\n"
@@ -1610,13 +1619,13 @@
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:987
+#: 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:993
+#: tutorial.xml:1018
 #, no-c-format
 msgid ""
       "<![CDATA[<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
@@ -1638,43 +1647,43 @@
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:995
+#: tutorial.xml:1020
 #, 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."
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:1003
+#: 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 ""
 
 #. Tag: para
-#: tutorial.xml:1011
+#: tutorial.xml:1036
 #, 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:1024
+#: tutorial.xml:1049
 #, no-c-format
 msgid "Summary"
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:1026
+#: tutorial.xml:1051
 #, no-c-format
 msgid "This tutorial covered the basics of writing a simple standalone Hibernate application and a small web application."
 msgstr ""
 
 #. Tag: para
-#: tutorial.xml:1031
+#: 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:1039
+#: 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	2008-08-14 15:28:13 UTC (rev 15066)
+++ core/trunk/documentation/manual/src/main/docbook/pot/content/xml.pot	2008-08-14 15:35:40 UTC (rev 15067)
@@ -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: 2008-08-14 15:28+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/zh-CN/content/architecture.po
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/zh-CN/content/architecture.po	2008-08-14 15:28:13 UTC (rev 15066)
+++ core/trunk/documentation/manual/src/main/docbook/zh-CN/content/architecture.po	2008-08-14 15:35:40 UTC (rev 15067)
@@ -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: 2008-08-14 15:28+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
-#: architecture.xml:21
+#: architecture.xml:30
 #, no-c-format
 msgid "Architecture"
 msgstr "体系结构(Architecture)"
 
 #. Tag: title
-#: architecture.xml:24
+#: architecture.xml:33
 #, no-c-format
 msgid "Overview"
 msgstr "概况(Overview)"
 
 #. Tag: para
-#: architecture.xml:26
+#: architecture.xml:35
 #, no-c-format
 msgid "A (very) high-level view of the Hibernate architecture:"
 msgstr "一个非常简要的Hibernate体系结构的概要图:"
 
 #. Tag: para
-#: architecture.xml:39
+#: architecture.xml:48
 #, no-c-format
 msgid ""
 "This diagram shows Hibernate using the database and configuration data to "
@@ -39,7 +39,7 @@
 "及持久的对象)。"
 
 #. Tag: para
-#: architecture.xml:44
+#: architecture.xml:53
 #, no-c-format
 msgid ""
 "We would like to show a more detailed view of the runtime architecture. "
@@ -54,7 +54,7 @@
 "子集:"
 
 #. Tag: para
-#: architecture.xml:61
+#: architecture.xml:70
 #, no-c-format
 msgid ""
 "The \"full cream\" architecture abstracts the application away from the "
@@ -64,19 +64,19 @@
 "Hibernate来处理这些细节。"
 
 #. Tag: para
-#: architecture.xml:75
+#: architecture.xml:84
 #, fuzzy, no-c-format
 msgid "Heres some definitions of the objects in the diagrams:"
 msgstr "图中各个对象的定义如下: <placeholder-1/>"
 
 #. Tag: term
-#: architecture.xml:80
+#: architecture.xml:89
 #, no-c-format
 msgid "SessionFactory (<literal>org.hibernate.SessionFactory</literal>)"
 msgstr "SessionFactory (<literal>org.hibernate.SessionFactory</literal>)"
 
 #. Tag: para
-#: architecture.xml:82
+#: architecture.xml:91
 #, no-c-format
 msgid ""
 "A threadsafe (immutable) cache of compiled mappings for a single database. A "
@@ -91,13 +91,13 @@
 "选的二级缓存。"
 
 #. Tag: term
-#: architecture.xml:92
+#: architecture.xml:101
 #, no-c-format
 msgid "Session (<literal>org.hibernate.Session</literal>)"
 msgstr "Session (<literal>org.hibernate.Session</literal>)"
 
 #. Tag: para
-#: architecture.xml:94
+#: architecture.xml:103
 #, no-c-format
 msgid ""
 "A single-threaded, short-lived object representing a conversation between "
@@ -111,13 +111,13 @@
 "化对象的必选(第一级)缓存,在遍历对象图或者根据持久化标识查找对象时会用到。"
 
 #. Tag: term
-#: architecture.xml:104
+#: architecture.xml:113
 #, no-c-format
 msgid "Persistent objects and collections"
 msgstr "持久的对象及其集合"
 
 #. Tag: para
-#: architecture.xml:106
+#: architecture.xml:115
 #, no-c-format
 msgid ""
 "Short-lived, single threaded objects containing persistent state and "
@@ -134,13 +134,13 @@
 "据传输对象。)"
 
 #. Tag: term
-#: architecture.xml:117
+#: architecture.xml:126
 #, no-c-format
 msgid "Transient and detached objects and collections"
 msgstr "瞬态(transient)和脱管(detached)的对象及其集合"
 
 #. Tag: para
-#: architecture.xml:119
+#: architecture.xml:128
 #, no-c-format
 msgid ""
 "Instances of persistent classes that are not currently associated with a "
@@ -153,13 +153,13 @@
 "关闭而脱离持久化的对象。"
 
 #. Tag: term
-#: architecture.xml:128
+#: architecture.xml:137
 #, no-c-format
 msgid "Transaction (<literal>org.hibernate.Transaction</literal>)"
 msgstr "事务Transaction (<literal>org.hibernate.Transaction</literal>)"
 
 #. Tag: para
-#: architecture.xml:130
+#: architecture.xml:139
 #, no-c-format
 msgid ""
 "(Optional) A single-threaded, short-lived object used by the application to "
@@ -176,7 +176,7 @@
 "<literal>Transaction</literal>对象,事务边界的开启与关闭是必不可少的。"
 
 #. Tag: term
-#: architecture.xml:141
+#: architecture.xml:150
 #, no-c-format
 msgid ""
 "ConnectionProvider (<literal>org.hibernate.connection.ConnectionProvider</"
@@ -186,7 +186,7 @@
 "literal>)"
 
 #. Tag: para
-#: architecture.xml:143
+#: architecture.xml:152
 #, no-c-format
 msgid ""
 "(Optional) A factory for (and pool of) JDBC connections. Abstracts "
@@ -199,7 +199,7 @@
 "仅供开发者扩展/实现用,并不暴露给应用程序使用。"
 
 #. Tag: term
-#: architecture.xml:151
+#: architecture.xml:160
 #, no-c-format
 msgid ""
 "TransactionFactory (<literal>org.hibernate.TransactionFactory</literal>)"
@@ -207,7 +207,7 @@
 "TransactionFactory (<literal>org.hibernate.TransactionFactory</literal>)"
 
 #. Tag: para
-#: architecture.xml:153
+#: architecture.xml:162
 #, no-c-format
 msgid ""
 "(Optional) A factory for <literal>Transaction</literal> instances. Not "
@@ -217,13 +217,13 @@
 "实现用,并不暴露给应用程序使用。"
 
 #. Tag: emphasis
-#: architecture.xml:160
+#: architecture.xml:169
 #, no-c-format
 msgid "Extension Interfaces"
 msgstr "扩展接口"
 
 #. Tag: para
-#: architecture.xml:162
+#: architecture.xml:171
 #, no-c-format
 msgid ""
 "Hibernate offers many optional extension interfaces you can implement to "
@@ -234,7 +234,7 @@
 "为。 具体请参考API文档。"
 
 #. Tag: para
-#: architecture.xml:171
+#: architecture.xml:180
 #, no-c-format
 msgid ""
 "Given a \"lite\" architecture, the application bypasses the "
@@ -246,13 +246,13 @@
 "literal> 等API直接跟JTA或JDBC打交道。"
 
 #. Tag: title
-#: architecture.xml:179
+#: architecture.xml:188
 #, no-c-format
 msgid "Instance states"
 msgstr "实例状态"
 
 #. Tag: para
-#: architecture.xml:180
+#: architecture.xml:189
 #, no-c-format
 msgid ""
 "An instance of a persistent classes may be in one of three different states, "
@@ -265,13 +265,13 @@
 "<literal>Session</literal>对象就是这个所谓的持久化上下文:"
 
 #. Tag: term
-#: architecture.xml:188
+#: architecture.xml:197
 #, no-c-format
 msgid "transient"
 msgstr "瞬态(transient)"
 
 #. Tag: para
-#: architecture.xml:190
+#: architecture.xml:199
 #, no-c-format
 msgid ""
 "The instance is not, and has never been associated with any persistence "
@@ -279,13 +279,13 @@
 msgstr "该实例从未与任何持久化上下文关联过。它没有持久化标识(相当于主键值)。"
 
 #. Tag: term
-#: architecture.xml:198
+#: architecture.xml:207
 #, no-c-format
 msgid "persistent"
 msgstr "持久化(persistent)"
 
 #. Tag: para
-#: architecture.xml:200
+#: architecture.xml:209
 #, no-c-format
 msgid ""
 "The instance is currently associated with a persistence context. It has a "
@@ -299,18 +299,18 @@
 "保证</emphasis>持久化标识与Java标识(其值代表对象在内存中的位置)等价。"
 
 #. Tag: term
-#: architecture.xml:212
+#: architecture.xml:221
 #, no-c-format
 msgid "detached"
 msgstr "脱管(detached)"
 
 #. Tag: para
-#: architecture.xml:214
-#, no-c-format
+#: architecture.xml:223
+#, 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. "
+"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."
 msgstr ""
@@ -320,13 +320,13 @@
 "系。"
 
 #. Tag: title
-#: architecture.xml:229
+#: architecture.xml:238
 #, no-c-format
 msgid "JMX Integration"
 msgstr "JMX整合"
 
 #. Tag: para
-#: architecture.xml:231
+#: architecture.xml:240
 #, no-c-format
 msgid ""
 "JMX is the J2EE standard for management of Java components. Hibernate may be "
@@ -338,7 +338,7 @@
 "hibernate.jmx.HibernateService</literal>。"
 
 #. Tag: para
-#: architecture.xml:237
+#: architecture.xml:246
 #, no-c-format
 msgid ""
 "For an example how to deploy Hibernate as a JMX service on the JBoss "
@@ -350,7 +350,7 @@
 "处:"
 
 #. Tag: para
-#: architecture.xml:245
+#: architecture.xml:254
 #, no-c-format
 msgid ""
 "<emphasis>Session Management:</emphasis> The Hibernate <literal>Session</"
@@ -371,7 +371,7 @@
 "用<literal>HibernateContext</literal>来访问<literal>Session</literal>。"
 
 #. Tag: para
-#: architecture.xml:257
+#: architecture.xml:266
 #, no-c-format
 msgid ""
 "<emphasis>HAR deployment:</emphasis> Usually you deploy the Hibernate JMX "
@@ -389,14 +389,14 @@
 "你的HAR文件中所有的映射文件。"
 
 #. Tag: para
-#: architecture.xml:268
+#: architecture.xml:277
 #, no-c-format
 msgid ""
 "Consult the JBoss AS user guide for more information about these options."
 msgstr "这些选项更多的描述,请参考JBoss 应用程序用户指南。"
 
 #. Tag: para
-#: architecture.xml:272
+#: architecture.xml:281
 #, no-c-format
 msgid ""
 "Another feature available as a JMX service are runtime Hibernate statistics. "
@@ -406,13 +406,13 @@
 "参看 <xref linkend=\"configuration-optional-statistics\"/>."
 
 #. Tag: title
-#: architecture.xml:279
+#: architecture.xml:288
 #, no-c-format
 msgid "JCA Support"
 msgstr "对JCA的支持"
 
 #. Tag: para
-#: architecture.xml:280
+#: architecture.xml:289
 #, no-c-format
 msgid ""
 "Hibernate may also be configured as a JCA connector. Please see the website "
@@ -423,13 +423,13 @@
 "请注意,Hibernate对JCA的支持,仍处于实验性阶段。"
 
 #. Tag: title
-#: architecture.xml:287
+#: architecture.xml:296
 #, no-c-format
 msgid "Contextual Sessions"
 msgstr "上下文相关的(Contextual)Session"
 
 #. Tag: para
-#: architecture.xml:288
+#: architecture.xml:297
 #, no-c-format
 msgid ""
 "Most applications using Hibernate need some form of \"contextual\" sessions, "
@@ -452,7 +452,7 @@
 "session。"
 
 #. Tag: para
-#: architecture.xml:297
+#: architecture.xml:306
 #, no-c-format
 msgid ""
 "Starting with version 3.0.1, Hibernate added the <literal>SessionFactory."
@@ -475,7 +475,7 @@
 "<literal>JTA</literal>的上下文相关session可以满足你一切需要。"
 
 #. Tag: para
-#: architecture.xml:307
+#: architecture.xml:316
 #, no-c-format
 msgid ""
 "However, as of version 3.1, the processing behind <literal>SessionFactory."
@@ -492,7 +492,7 @@
 "下文(scope and context)的定义进行拔插。"
 
 #. Tag: para
-#: architecture.xml:314
+#: architecture.xml:323
 #, no-c-format
 msgid ""
 "See the Javadocs for the <literal>org.hibernate.context."
@@ -508,7 +508,7 @@
 "session。Hibernate内置了此接口的三种实现。"
 
 #. Tag: para
-#: architecture.xml:324
+#: architecture.xml:333
 #, no-c-format
 msgid ""
 "<literal>org.hibernate.context.JTASessionContext</literal> - current "
@@ -521,7 +521,7 @@
 "情请参阅Javadoc。"
 
 #. Tag: para
-#: architecture.xml:332
+#: architecture.xml:341
 #, no-c-format
 msgid ""
 "<literal>org.hibernate.context.ThreadLocalSessionContext</literal> - current "
@@ -532,7 +532,7 @@
 "session通过当前执行的线程来跟踪和界定。详情也请参阅Javadoc。"
 
 #. Tag: para
-#: architecture.xml:338
+#: architecture.xml:347
 #, no-c-format
 msgid ""
 "<literal>org.hibernate.context.ManagedSessionContext</literal> - current "
@@ -546,14 +546,14 @@
 "者关闭(close)任何<literal>Session</literal>。"
 
 #. Tag: para
-#: architecture.xml:347
-#, no-c-format
+#: architecture.xml:356
+#, 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 "
+"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 "
@@ -571,7 +571,7 @@
 "示例代码。"
 
 #. Tag: para
-#: architecture.xml:359
+#: architecture.xml:368
 #, no-c-format
 msgid ""
 "The <literal>hibernate.current_session_context_class</literal> configuration "

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	2008-08-14 15:28:13 UTC (rev 15066)
+++ core/trunk/documentation/manual/src/main/docbook/zh-CN/content/basic_mapping.po	2008-08-14 15:35:40 UTC (rev 15067)
@@ -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: 2008-08-14 15:28+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
-#: basic_mapping.xml:5
+#: basic_mapping.xml:29
 #, no-c-format
 msgid "Basic O/R Mapping"
 msgstr "对象/关系数据库映射基础(Basic O/R Mapping)"
 
 #. Tag: title
-#: basic_mapping.xml:8
+#: basic_mapping.xml:32
 #, no-c-format
 msgid "Mapping declaration"
 msgstr "映射定义(Mapping declaration)"
 
 #. Tag: para
-#: basic_mapping.xml:10
+#: basic_mapping.xml:34
 #, no-c-format
 msgid ""
 "Object/relational mappings are usually defined in an XML document. The "
@@ -36,7 +36,7 @@
 "档是按照持久化类的定义来创建的, 而非表的定义。"
 
 #. Tag: para
-#: basic_mapping.xml:17
+#: basic_mapping.xml:41
 #, no-c-format
 msgid ""
 "Note that, even though many Hibernate users choose to write the XML by hand, "
@@ -47,13 +47,13 @@
 "映射文档, 包括XDoclet,Middlegen和AndroMDA。"
 
 #. Tag: para
-#: basic_mapping.xml:23
+#: basic_mapping.xml:47
 #, no-c-format
 msgid "Lets kick off with an example mapping:"
 msgstr "让我们从一个映射的例子开始:"
 
 #. Tag: programlisting
-#: basic_mapping.xml:27
+#: basic_mapping.xml:51
 #, no-c-format
 msgid ""
 "<![CDATA[<?xml version=\"1.0\"?>\n"
@@ -123,7 +123,7 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:29
+#: basic_mapping.xml:53
 #, no-c-format
 msgid ""
 "We will now discuss the content of the mapping document. We will only "
@@ -137,13 +137,13 @@
 "影响导出的数据库schema结果。 (比如,<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
+#: basic_mapping.xml:66
 #, no-c-format
 msgid ""
 "All XML mappings should declare the doctype shown. The actual DTD may be "
@@ -160,13 +160,13 @@
 "的classpath目录检查XML文件里的DTD声明。"
 
 #. Tag: title
-#: basic_mapping.xml:52
+#: basic_mapping.xml:76
 #, no-c-format
 msgid "EntityResolver"
 msgstr "EntityResolver"
 
 #. Tag: para
-#: basic_mapping.xml:53
+#: basic_mapping.xml:77
 #, no-c-format
 msgid ""
 "As mentioned previously, Hibernate will first attempt to resolve DTDs in its "
@@ -187,7 +187,7 @@
 "认两种不同的 systenId命名空间。"
 
 #. Tag: para
-#: basic_mapping.xml:61
+#: basic_mapping.xml:85
 #, no-c-format
 msgid ""
 "a <literal>hibernate namespace</literal> is recognized whenever the resolver "
@@ -200,7 +200,7 @@
 "就试图通过加载Hibernate类的classloader来查找这些实体。"
 
 #. Tag: para
-#: basic_mapping.xml:70
+#: basic_mapping.xml:94
 #, no-c-format
 msgid ""
 "a <literal>user namespace</literal> is recognized whenever the resolver "
@@ -214,13 +214,13 @@
 "文的classloader和(2)加载Hibernate class的classloader来查找这些实体。"
 
 #. Tag: para
-#: basic_mapping.xml:79
+#: basic_mapping.xml:103
 #, no-c-format
 msgid "An example of utilizing user namespacing:"
 msgstr "使用user namespace(用户命名空间)的例子:"
 
 #. Tag: programlisting
-#: basic_mapping.xml:82
+#: basic_mapping.xml:106
 #, no-c-format
 msgid ""
 "<![CDATA[<?xml version=\"1.0\"?>\n"
@@ -241,24 +241,24 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:83
+#: basic_mapping.xml:107
 #, fuzzy, no-c-format
 msgid ""
 "Where <literal>types.xml</literal> is a resource in the <literal>your."
-"domain</literal> package and contains a custom <xref linkend=\"mapping-types-"
-"custom\"/>typedef."
+"domain</literal> package and contains a custom <link linkend=\"mapping-types-"
+"custom\">typedef</link>."
 msgstr ""
 "<literal>types.xml</literal>是<literal>your.domain</literal>包中的一个资源,"
 "它包含了一个定制的<xref linkend=\"mapping-types-custom\">typedef</xref>。"
 
 #. Tag: title
-#: basic_mapping.xml:91
+#: basic_mapping.xml:115
 #, no-c-format
 msgid "hibernate-mapping"
 msgstr "hibernate-mapping"
 
 #. Tag: para
-#: basic_mapping.xml:93
+#: basic_mapping.xml:117
 #, no-c-format
 msgid ""
 "This element has several optional attributes. The <literal>schema</literal> "
@@ -280,7 +280,7 @@
 "语言中可以使用 非全限定名的类名。"
 
 #. Tag: programlisting
-#: basic_mapping.xml:114
+#: basic_mapping.xml:138
 #, no-c-format
 msgid ""
 "<![CDATA[<hibernate-mapping\n"
@@ -295,19 +295,19 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:117
+#: basic_mapping.xml:141
 #, no-c-format
 msgid "<literal>schema</literal> (optional): The name of a database schema."
 msgstr "<literal>schema</literal> (可选): 数据库schema的名称。"
 
 #. Tag: para
-#: basic_mapping.xml:122
+#: basic_mapping.xml:146
 #, no-c-format
 msgid "<literal>catalog</literal> (optional): The name of a database catalog."
 msgstr "<literal>catalog</literal> (可选): 数据库catalog的名称。"
 
 #. Tag: para
-#: basic_mapping.xml:127
+#: basic_mapping.xml:151
 #, no-c-format
 msgid ""
 "<literal>default-cascade</literal> (optional - defaults to <literal>none</"
@@ -317,7 +317,7 @@
 "默认的级联风格。"
 
 #. Tag: para
-#: basic_mapping.xml:133
+#: basic_mapping.xml:157
 #, no-c-format
 msgid ""
 "<literal>default-access</literal> (optional - defaults to <literal>property</"
@@ -329,7 +329,7 @@
 "<literal>PropertyAccessor</literal>接口 自定义。"
 
 #. Tag: para
-#: basic_mapping.xml:140
+#: basic_mapping.xml:164
 #, no-c-format
 msgid ""
 "<literal>default-lazy</literal> (optional - defaults to <literal>true</"
@@ -341,7 +341,7 @@
 "么样的默认加载风格。"
 
 #. Tag: para
-#: basic_mapping.xml:147
+#: basic_mapping.xml:171
 #, no-c-format
 msgid ""
 "<literal>auto-import</literal> (optional - defaults to <literal>true</"
@@ -352,7 +352,7 @@
 "我们是否可以在查询语言中使用非全限定的类名(仅限于本映射文件中的类)。"
 
 #. Tag: para
-#: basic_mapping.xml:154
+#: basic_mapping.xml:178
 #, no-c-format
 msgid ""
 "<literal>package</literal> (optional): Specifies a package prefix to assume "
@@ -362,7 +362,7 @@
 "限定的类名, 就使用这个作为包名。"
 
 #. Tag: para
-#: basic_mapping.xml:162
+#: basic_mapping.xml:186
 #, no-c-format
 msgid ""
 "If you have two persistent classes with the same (unqualified) name, you "
@@ -374,7 +374,7 @@
 "你把一个“import过”的名字同时对应两个类, Hibernate会抛出一个异常。"
 
 #. Tag: para
-#: basic_mapping.xml:168
+#: basic_mapping.xml:192
 #, no-c-format
 msgid ""
 "Note that the <literal>hibernate-mapping</literal> element allows you to "
@@ -392,13 +392,13 @@
 "或者如果使用继承,<literal>Animal.hbm.xml</literal>。"
 
 #. Tag: title
-#: basic_mapping.xml:181
+#: basic_mapping.xml:205
 #, no-c-format
 msgid "<title>class</title>"
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:183
+#: basic_mapping.xml:207
 #, no-c-format
 msgid ""
 "You may declare a persistent class using the <literal>class</literal> "
@@ -406,7 +406,7 @@
 msgstr "你可以使用<literal>class</literal>元素来定义一个持久化类:"
 
 #. Tag: programlisting
-#: basic_mapping.xml:211
+#: basic_mapping.xml:235
 #, no-c-format
 msgid ""
 "<![CDATA[<class\n"
@@ -436,7 +436,7 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:214
+#: basic_mapping.xml:238
 #, no-c-format
 msgid ""
 "<literal>name</literal> (optional): The fully qualified Java class name of "
@@ -447,7 +447,7 @@
 "属性不存在,Hibernate将假定这是一个非POJO的实体映射。"
 
 #. Tag: para
-#: basic_mapping.xml:221
+#: basic_mapping.xml:245
 #, no-c-format
 msgid ""
 "<literal>table</literal> (optional - defaults to the unqualified class "
@@ -456,7 +456,7 @@
 "<literal>table</literal> (可选 - 默认是类的非全限定名): 对应的数据库表名。"
 
 #. Tag: para
-#: basic_mapping.xml:227
+#: basic_mapping.xml:251
 #, no-c-format
 msgid ""
 "<literal>discriminator-value</literal> (optional - defaults to the class "
@@ -469,7 +469,7 @@
 "和 <literal>not null</literal>。"
 
 #. Tag: para
-#: basic_mapping.xml:234
+#: basic_mapping.xml:258
 #, no-c-format
 msgid ""
 "<literal>mutable</literal> (optional, defaults to <literal>true</literal>): "
@@ -479,7 +479,7 @@
 "的实例是可变的或者不可变的。"
 
 #. Tag: para
-#: basic_mapping.xml:240 basic_mapping.xml:2204
+#: basic_mapping.xml:264 basic_mapping.xml:2228
 #, fuzzy, no-c-format
 msgid ""
 "<literal>schema</literal> (optional): Override the schema name specified by "
@@ -493,7 +493,7 @@
 "literal>元素指定的模式名称。"
 
 #. Tag: para
-#: basic_mapping.xml:246 basic_mapping.xml:2210
+#: basic_mapping.xml:270 basic_mapping.xml:2234
 #, fuzzy, no-c-format
 msgid ""
 "<literal>catalog</literal> (optional): Override the catalog name specified "
@@ -507,7 +507,7 @@
 "mapping&gt;</literal>元素指定的目录名称。"
 
 #. Tag: para
-#: basic_mapping.xml:252
+#: basic_mapping.xml:276
 #, no-c-format
 msgid ""
 "<literal>proxy</literal> (optional): Specifies an interface to use for lazy "
@@ -517,7 +517,7 @@
 "可以在这里使用该类自己的名字。"
 
 #. Tag: para
-#: basic_mapping.xml:258
+#: basic_mapping.xml:282
 #, no-c-format
 msgid ""
 "<literal>dynamic-update</literal> (optional, defaults to <literal>false</"
@@ -529,7 +529,7 @@
 "过的字段。"
 
 #. Tag: para
-#: basic_mapping.xml:265
+#: basic_mapping.xml:289
 #, no-c-format
 msgid ""
 "<literal>dynamic-insert</literal> (optional, defaults to <literal>false</"
@@ -541,7 +541,7 @@
 "空值字段。"
 
 #. Tag: para
-#: basic_mapping.xml:272
+#: basic_mapping.xml:296
 #, no-c-format
 msgid ""
 "<literal>select-before-update</literal> (optional, defaults to "
@@ -562,7 +562,7 @@
 "<literal>UPDATE</literal>。"
 
 #. Tag: para
-#: basic_mapping.xml:282
+#: basic_mapping.xml:306
 #, no-c-format
 msgid ""
 "<literal>polymorphism</literal> (optional, defaults to <literal>implicit</"
@@ -574,7 +574,7 @@
 "承策略中用到-译注)。"
 
 #. Tag: para
-#: basic_mapping.xml:288
+#: basic_mapping.xml:312
 #, no-c-format
 msgid ""
 "<literal>where</literal> (optional) specify an arbitrary SQL <literal>WHERE</"
@@ -584,7 +584,7 @@
 "件, 在抓取这个类的对象时会一直增加这个条件。"
 
 #. Tag: para
-#: basic_mapping.xml:294
+#: basic_mapping.xml:318
 #, no-c-format
 msgid ""
 "<literal>persister</literal> (optional): Specifies a custom "
@@ -594,7 +594,7 @@
 "literal>。"
 
 #. Tag: para
-#: basic_mapping.xml:299
+#: basic_mapping.xml:323
 #, no-c-format
 msgid ""
 "<literal>batch-size</literal> (optional, defaults to <literal>1</literal>) "
@@ -604,7 +604,7 @@
 "根据标识符(identifier)抓取实例时使用的\"batch size\"(批次抓取数量)。"
 
 #. Tag: para
-#: basic_mapping.xml:305
+#: basic_mapping.xml:329
 #, no-c-format
 msgid ""
 "<literal>optimistic-lock</literal> (optional, defaults to <literal>version</"
@@ -614,7 +614,7 @@
 "<literal>version</literal>): 决定乐观锁定的策略。"
 
 #. Tag: para
-#: basic_mapping.xml:311
+#: basic_mapping.xml:335
 #, no-c-format
 msgid ""
 "<literal>lazy</literal> (optional): Lazy fetching may be completely disabled "
@@ -624,7 +624,7 @@
 "所有的延迟加载(Lazy fetching)功能将被全部禁用(disabled)。"
 
 #. Tag: para
-#: basic_mapping.xml:317
+#: basic_mapping.xml:341
 #, no-c-format
 msgid ""
 "<literal>entity-name</literal> (optional, defaults to the class name): "
@@ -640,7 +640,7 @@
 "\"persistent-classes-dynamicmodels\"/> and <xref linkend=\"xml\"/>。"
 
 #. Tag: para
-#: basic_mapping.xml:327
+#: basic_mapping.xml:351
 #, no-c-format
 msgid ""
 "<literal>check</literal> (optional): A SQL expression used to generate a "
@@ -651,7 +651,7 @@
 "加多行(multi-row)约束<emphasis>检查</emphasis>。"
 
 #. Tag: para
-#: basic_mapping.xml:333
+#: basic_mapping.xml:357
 #, no-c-format
 msgid ""
 "<literal>rowid</literal> (optional): Hibernate can use so called ROWIDs on "
@@ -666,7 +666,7 @@
 "重点, 它代表了一个存储元组(tuple)的物理位置。"
 
 #. Tag: para
-#: basic_mapping.xml:341
+#: basic_mapping.xml:365
 #, no-c-format
 msgid ""
 "<literal>subselect</literal> (optional): Maps an immutable and read-only "
@@ -678,7 +678,7 @@
 "但最好不要这样做。更多的介绍请看下面内容。"
 
 #. Tag: para
-#: basic_mapping.xml:348
+#: basic_mapping.xml:372
 #, no-c-format
 msgid ""
 "<literal>abstract</literal> (optional): Used to mark abstract superclasses "
@@ -688,7 +688,7 @@
 "literal>的继承结构 (hierarchies)中标识抽象超类。"
 
 #. Tag: para
-#: basic_mapping.xml:356
+#: basic_mapping.xml:380
 #, no-c-format
 msgid ""
 "It is perfectly acceptable for the named persistent class to be an "
@@ -703,7 +703,7 @@
 "定类名,<literal>比如:Foo$Bar</literal>。"
 
 #. Tag: para
-#: basic_mapping.xml:363
+#: basic_mapping.xml:387
 #, no-c-format
 msgid ""
 "Immutable classes, <literal>mutable=\"false\"</literal>, may not be updated "
@@ -714,7 +714,7 @@
 "这可以让Hibernate做一些小小的性能优化。"
 
 #. Tag: para
-#: basic_mapping.xml:368
+#: basic_mapping.xml:392
 #, no-c-format
 msgid ""
 "The optional <literal>proxy</literal> attribute enables lazy initialization "
@@ -728,7 +728,7 @@
 "的持久化对象才会被装载。参见下面的“用于延迟装载的代理”。"
 
 #. Tag: para
-#: basic_mapping.xml:375
+#: basic_mapping.xml:399
 #, no-c-format
 msgid ""
 "<emphasis>Implicit</emphasis> polymorphism means that instances of the class "
@@ -756,7 +756,7 @@
 "型”的类,只包含部分表字段)。"
 
 #. Tag: para
-#: basic_mapping.xml:387
+#: basic_mapping.xml:411
 #, no-c-format
 msgid ""
 "The <literal>persister</literal> attribute lets you customize the "
@@ -776,7 +776,7 @@
 "literal>,这是一个简单的例子 (“持久化”到一个<literal>Hashtable</literal>)。"
 
 #. Tag: para
-#: basic_mapping.xml:398
+#: basic_mapping.xml:422
 #, no-c-format
 msgid ""
 "Note that the <literal>dynamic-update</literal> and <literal>dynamic-insert</"
@@ -792,7 +792,7 @@
 "否能够提高效率要视情形而定。请用你的智慧决定是否使用。"
 
 #. Tag: para
-#: basic_mapping.xml:406
+#: basic_mapping.xml:430
 #, no-c-format
 msgid ""
 "Use of <literal>select-before-update</literal> will usually decrease "
@@ -805,7 +805,7 @@
 "库不必要的触发update。 这就很有用了。"
 
 #. Tag: para
-#: basic_mapping.xml:412
+#: basic_mapping.xml:436
 #, no-c-format
 msgid ""
 "If you enable <literal>dynamic-update</literal>, you will have a choice of "
@@ -814,19 +814,19 @@
 "如果你打开了<literal>dynamic-update</literal>,你可以选择几种乐观锁定的策略:"
 
 #. Tag: para
-#: basic_mapping.xml:418
+#: basic_mapping.xml:442
 #, no-c-format
 msgid "<literal>version</literal> check the version/timestamp columns"
 msgstr "<literal>version(版本检查)</literal> 检查version/timestamp字段"
 
 #. Tag: para
-#: basic_mapping.xml:423
+#: basic_mapping.xml:447
 #, no-c-format
 msgid "<literal>all</literal> check all columns"
 msgstr "<literal>all(全部)</literal> 检查全部字段"
 
 #. Tag: para
-#: basic_mapping.xml:428
+#: basic_mapping.xml:452
 #, no-c-format
 msgid ""
 "<literal>dirty</literal> check the changed columns, allowing some concurrent "
@@ -834,13 +834,13 @@
 msgstr "<literal>dirty(脏检查)</literal>只检察修改过的字段"
 
 #. Tag: para
-#: basic_mapping.xml:433
+#: basic_mapping.xml:457
 #, no-c-format
 msgid "<literal>none</literal> do not use optimistic locking"
 msgstr "<literal>none(不检查)</literal>不使用乐观锁定"
 
 #. Tag: para
-#: basic_mapping.xml:438
+#: basic_mapping.xml:462
 #, no-c-format
 msgid ""
 "We <emphasis>very</emphasis> strongly recommend that you use version/"
@@ -854,7 +854,7 @@
 "外进行操作的策略(例如: 在使用<literal>Session.merge()</literal>的时候)。"
 
 #. Tag: para
-#: basic_mapping.xml:445
+#: basic_mapping.xml:469
 #, no-c-format
 msgid ""
 "There is no difference between a view and a base table for a Hibernate "
@@ -870,7 +870,7 @@
 "(immutable)并且是 只读的实体到一个给定的SQL子查询表达式:"
 
 #. Tag: programlisting
-#: basic_mapping.xml:453
+#: basic_mapping.xml:477
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Summary\">\n"
@@ -888,7 +888,7 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:455
+#: basic_mapping.xml:479
 #, no-c-format
 msgid ""
 "Declare the tables to synchronize this entity with, ensuring that auto-flush "
@@ -901,13 +901,13 @@
 "literal>在属性元素 和一个嵌套映射元素中都可见。"
 
 #. Tag: title
-#: basic_mapping.xml:465
+#: basic_mapping.xml:489
 #, no-c-format
 msgid "<title>id</title>"
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:467
+#: basic_mapping.xml:491
 #, no-c-format
 msgid ""
 "Mapped classes <emphasis>must</emphasis> declare the primary key column of "
@@ -921,7 +921,7 @@
 "literal> 元素定义了该属性到数据库表主键字段的映射。"
 
 #. Tag: programlisting
-#: basic_mapping.xml:482
+#: basic_mapping.xml:506
 #, no-c-format
 msgid ""
 "<![CDATA[<id\n"
@@ -937,21 +937,21 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:485
+#: basic_mapping.xml:509
 #, no-c-format
 msgid ""
 "<literal>name</literal> (optional): The name of the identifier property."
 msgstr "<literal>name</literal> (可选): 标识属性的名字。"
 
 #. Tag: para
-#: basic_mapping.xml:490
+#: basic_mapping.xml:514
 #, 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:495
+#: basic_mapping.xml:519
 #, no-c-format
 msgid ""
 "<literal>column</literal> (optional - defaults to the property name): The "
@@ -959,7 +959,7 @@
 msgstr "<literal>column</literal> (可选 - 默认为属性名): 主键字段的名字。"
 
 #. Tag: para
-#: basic_mapping.xml:501
+#: basic_mapping.xml:525
 #, no-c-format
 msgid ""
 "<literal>unsaved-value</literal> (optional - defaults to a \"sensible\" "
@@ -973,9 +973,9 @@
 "例区分开来。"
 
 #. 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: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
 #, fuzzy, no-c-format
 msgid ""
 "<literal>access</literal> (optional - defaults to <literal>property</"
@@ -1011,7 +1011,7 @@
 "Hibernate 用来访问属性值的策略。"
 
 #. Tag: para
-#: basic_mapping.xml:517
+#: basic_mapping.xml:541
 #, no-c-format
 msgid ""
 "If the <literal>name</literal> attribute is missing, it is assumed that the "
@@ -1019,7 +1019,7 @@
 msgstr "如果 <literal>name</literal>属性不存在,会认为这个类没有标识属性。"
 
 #. Tag: para
-#: basic_mapping.xml:522
+#: basic_mapping.xml:546
 #, no-c-format
 msgid ""
 "The <literal>unsaved-value</literal> attribute is almost never needed in "
@@ -1027,7 +1027,7 @@
 msgstr "<literal>unsaved-value</literal> 属性在Hibernate3中几乎不再需要。"
 
 #. Tag: para
-#: basic_mapping.xml:526
+#: basic_mapping.xml:550
 #, no-c-format
 msgid ""
 "There is an alternative <literal>&lt;composite-id&gt;</literal> declaration "
@@ -1038,13 +1038,13 @@
 "数据。 我们强烈不建议使用这种方式。"
 
 #. Tag: title
-#: basic_mapping.xml:532
+#: basic_mapping.xml:556
 #, no-c-format
 msgid "Generator"
 msgstr "Generator"
 
 #. Tag: para
-#: basic_mapping.xml:534
+#: basic_mapping.xml:558
 #, no-c-format
 msgid ""
 "The optional <literal>&lt;generator&gt;</literal> child element names a Java "
@@ -1058,7 +1058,7 @@
 "数, 用<literal>&lt;param&gt;</literal>元素来传递。"
 
 #. Tag: programlisting
-#: basic_mapping.xml:541
+#: basic_mapping.xml:565
 #, no-c-format
 msgid ""
 "<![CDATA[<id name=\"id\" type=\"long\" column=\"cat_id\">\n"
@@ -1070,7 +1070,7 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:543
+#: basic_mapping.xml:567
 #, fuzzy, no-c-format
 msgid ""
 "All generators implement the interface <literal>org.hibernate.id."
@@ -1085,13 +1085,13 @@
 "<placeholder-1/>"
 
 #. Tag: literal
-#: basic_mapping.xml:551
+#: basic_mapping.xml:575
 #, no-c-format
 msgid "increment"
 msgstr "increment"
 
 #. Tag: para
-#: basic_mapping.xml:553
+#: basic_mapping.xml:577
 #, no-c-format
 msgid ""
 "generates identifiers of type <literal>long</literal>, <literal>short</"
@@ -1104,13 +1104,13 @@
 "用。 <emphasis>在集群下不要使用。</emphasis>"
 
 #. Tag: literal
-#: basic_mapping.xml:562
+#: basic_mapping.xml:586
 #, no-c-format
 msgid "identity"
 msgstr "identity"
 
 #. Tag: para
-#: basic_mapping.xml:564
+#: basic_mapping.xml:588
 #, no-c-format
 msgid ""
 "supports identity columns in DB2, MySQL, MS SQL Server, Sybase and "
@@ -1122,13 +1122,13 @@
 "<literal>int</literal>类型的。"
 
 #. Tag: literal
-#: basic_mapping.xml:572
+#: basic_mapping.xml:596
 #, no-c-format
 msgid "sequence"
 msgstr "sequence"
 
 #. Tag: para
-#: basic_mapping.xml:574
+#: basic_mapping.xml:598
 #, no-c-format
 msgid ""
 "uses a sequence in DB2, PostgreSQL, Oracle, SAP DB, McKoi or a generator in "
@@ -1140,13 +1140,13 @@
 "<literal>short</literal>或者 <literal>int</literal>类型的。"
 
 #. Tag: literal
-#: basic_mapping.xml:582
+#: basic_mapping.xml:606
 #, no-c-format
 msgid "hilo"
 msgstr "hilo"
 
 #. Tag: para
-#: basic_mapping.xml:584
+#: basic_mapping.xml:608
 #, no-c-format
 msgid ""
 "uses a hi/lo algorithm to efficiently generate identifiers of type "
@@ -1162,13 +1162,13 @@
 "高位值的来源。 高/低位算法生成的标识符只在一个特定的数据库中是唯一的。"
 
 #. Tag: literal
-#: basic_mapping.xml:594
+#: basic_mapping.xml:618
 #, no-c-format
 msgid "seqhilo"
 msgstr "seqhilo"
 
 #. Tag: para
-#: basic_mapping.xml:596
+#: basic_mapping.xml:620
 #, no-c-format
 msgid ""
 "uses a hi/lo algorithm to efficiently generate identifiers of type "
@@ -1180,13 +1180,13 @@
 "(sequence)的名字。"
 
 #. Tag: literal
-#: basic_mapping.xml:604
+#: basic_mapping.xml:628
 #, no-c-format
 msgid "uuid"
 msgstr "uuid"
 
 #. Tag: para
-#: basic_mapping.xml:606
+#: basic_mapping.xml:630
 #, no-c-format
 msgid ""
 "uses a 128-bit UUID algorithm to generate identifiers of type string, unique "
@@ -1197,25 +1197,25 @@
 "了IP地址)。UUID被编码为一个32位16进制数字的字符串。"
 
 #. Tag: literal
-#: basic_mapping.xml:614
+#: basic_mapping.xml:638
 #, no-c-format
 msgid "guid"
 msgstr "guid"
 
 #. Tag: para
-#: basic_mapping.xml:616
+#: basic_mapping.xml:640
 #, 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:646
 #, no-c-format
 msgid "native"
 msgstr "native"
 
 #. Tag: para
-#: basic_mapping.xml:624
+#: basic_mapping.xml:648
 #, no-c-format
 msgid ""
 "picks <literal>identity</literal>, <literal>sequence</literal> or "
@@ -1226,13 +1226,13 @@
 "literal> 或者<literal>hilo</literal>中的一个。"
 
 #. Tag: literal
-#: basic_mapping.xml:632
+#: basic_mapping.xml:656
 #, no-c-format
 msgid "assigned"
 msgstr "assigned"
 
 #. Tag: para
-#: basic_mapping.xml:634
+#: basic_mapping.xml:658
 #, no-c-format
 msgid ""
 "lets the application to assign an identifier to the object before "
@@ -1243,13 +1243,13 @@
 "<literal>&lt;generator&gt;</literal>元素没有指定时的默认生成策略。"
 
 #. Tag: literal
-#: basic_mapping.xml:642
+#: basic_mapping.xml:666
 #, no-c-format
 msgid "select"
 msgstr "select"
 
 #. Tag: para
-#: basic_mapping.xml:644
+#: basic_mapping.xml:668
 #, no-c-format
 msgid ""
 "retrieves a primary key assigned by a database trigger by selecting the row "
@@ -1257,13 +1257,13 @@
 msgstr "通过数据库触发器选择一些唯一主键的行并返回主键值来分配一个主键。"
 
 #. Tag: literal
-#: basic_mapping.xml:651
+#: basic_mapping.xml:675
 #, no-c-format
 msgid "foreign"
 msgstr "foreign"
 
 #. Tag: para
-#: basic_mapping.xml:653
+#: basic_mapping.xml:677
 #, no-c-format
 msgid ""
 "uses the identifier of another associated object. Usually used in "
@@ -1274,13 +1274,13 @@
 "联合起来使用。"
 
 #. Tag: literal
-#: basic_mapping.xml:660
+#: basic_mapping.xml:684
 #, no-c-format
 msgid "sequence-identity"
 msgstr "sequence-identity"
 
 #. Tag: para
-#: basic_mapping.xml:662
+#: basic_mapping.xml:686
 #, no-c-format
 msgid ""
 "a specialized sequence generation strategy which utilizes a database "
@@ -1297,13 +1297,13 @@
 "statements are disabled due to a bug in the Oracle drivers.)"
 
 #. Tag: title
-#: basic_mapping.xml:679
+#: basic_mapping.xml:703
 #, no-c-format
 msgid "Hi/lo algorithm"
 msgstr "高/低位算法(Hi/Lo Algorithm)"
 
 #. Tag: para
-#: basic_mapping.xml:680
+#: basic_mapping.xml:704
 #, no-c-format
 msgid ""
 "The <literal>hilo</literal> and <literal>seqhilo</literal> generators "
@@ -1318,7 +1318,7 @@
 "情况下)。"
 
 #. Tag: programlisting
-#: basic_mapping.xml:687
+#: basic_mapping.xml:711
 #, no-c-format
 msgid ""
 "<![CDATA[<id name=\"id\" type=\"long\" column=\"cat_id\">\n"
@@ -1331,7 +1331,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: basic_mapping.xml:689
+#: basic_mapping.xml:713
 #, no-c-format
 msgid ""
 "<![CDATA[<id name=\"id\" type=\"long\" column=\"cat_id\">\n"
@@ -1343,7 +1343,7 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:691
+#: basic_mapping.xml:715
 #, no-c-format
 msgid ""
 "Unfortunately, you can't use <literal>hilo</literal> when supplying your own "
@@ -1357,13 +1357,13 @@
 "须正确地配置 <literal>hibernate.transaction.manager_lookup_class</literal>。"
 
 #. Tag: title
-#: basic_mapping.xml:700
+#: basic_mapping.xml:724
 #, no-c-format
 msgid "UUID algorithm"
 msgstr "UUID算法(UUID Algorithm )"
 
 #. Tag: para
-#: basic_mapping.xml:701
+#: basic_mapping.xml:725
 #, no-c-format
 msgid ""
 "The UUID contains: IP address, startup time of the JVM (accurate to a "
@@ -1376,13 +1376,13 @@
 "用JNI的前提下的能做的最好实现了。"
 
 #. Tag: title
-#: basic_mapping.xml:710
+#: basic_mapping.xml:734
 #, no-c-format
 msgid "Identity columns and sequences"
 msgstr "标识字段和序列(Identity columns and Sequences)"
 
 #. Tag: para
-#: basic_mapping.xml:711
+#: basic_mapping.xml:735
 #, no-c-format
 msgid ""
 "For databases which support identity columns (DB2, MySQL, Sybase, MS SQL), "
@@ -1397,7 +1397,7 @@
 "literal>风格的关键字生成。 这两种方式对于插入一个新的对象都需要两次SQL查询。"
 
 #. Tag: programlisting
-#: basic_mapping.xml:719
+#: basic_mapping.xml:743
 #, no-c-format
 msgid ""
 "<![CDATA[<id name=\"id\" type=\"long\" column=\"person_id\">\n"
@@ -1408,7 +1408,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: basic_mapping.xml:721
+#: basic_mapping.xml:745
 #, no-c-format
 msgid ""
 "<![CDATA[<id name=\"id\" type=\"long\" column=\"person_id\" unsaved-value=\"0"
@@ -1418,7 +1418,7 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:723
+#: basic_mapping.xml:747
 #, no-c-format
 msgid ""
 "For cross-platform development, the <literal>native</literal> strategy will "
@@ -1431,13 +1431,13 @@
 "择哪一个,这取决于底层数据库的支持能力。"
 
 #. Tag: title
-#: basic_mapping.xml:732
+#: basic_mapping.xml:756
 #, no-c-format
 msgid "Assigned identifiers"
 msgstr "程序分配的标识符(Assigned Identifiers)"
 
 #. Tag: para
-#: basic_mapping.xml:733
+#: basic_mapping.xml:757
 #, no-c-format
 msgid ""
 "If you want the application to assign identifiers (as opposed to having "
@@ -1455,7 +1455,7 @@
 "注)。这是没有指定<literal>&lt;generator&gt;</literal>元素时的默认行为"
 
 #. Tag: para
-#: basic_mapping.xml:742
+#: basic_mapping.xml:766
 #, no-c-format
 msgid ""
 "Choosing the <literal>assigned</literal> generator makes Hibernate use "
@@ -1470,20 +1470,20 @@
 "来确定一个实例是瞬时的(transient) 还是脱管的(detached)。"
 
 #. Tag: title
-#: basic_mapping.xml:752
+#: basic_mapping.xml:776
 #, no-c-format
 msgid "Primary keys assigned by triggers"
 msgstr "触发器实现的主键生成器(Primary keys assigned by triggers)"
 
 #. Tag: para
-#: basic_mapping.xml:753
+#: basic_mapping.xml:777
 #, no-c-format
 msgid ""
 "For legacy schemas only (Hibernate does not generate DDL with triggers)."
 msgstr "仅仅用于遗留的schema中 (Hibernate不能使用触发器生成DDL)。"
 
 #. Tag: programlisting
-#: basic_mapping.xml:757
+#: basic_mapping.xml:781
 #, no-c-format
 msgid ""
 "<![CDATA[<id name=\"id\" type=\"long\" column=\"person_id\">\n"
@@ -1494,7 +1494,7 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:759
+#: basic_mapping.xml:783
 #, no-c-format
 msgid ""
 "In the above example, there is a unique valued property named "
@@ -1507,13 +1507,13 @@
 "的代理键(surrogate key) 的值由触发器生成。"
 
 #. Tag: title
-#: basic_mapping.xml:771
+#: basic_mapping.xml:795
 #, no-c-format
 msgid "Enhanced identifier generators"
 msgstr "Enhanced identifier generators"
 
 #. Tag: para
-#: basic_mapping.xml:773
+#: basic_mapping.xml:797
 #, no-c-format
 msgid ""
 "Starting with release 3.2.3, there are 2 new generators which represent a re-"
@@ -1533,7 +1533,7 @@
 "current releases and can be referenced by FQN."
 
 #. Tag: para
-#: basic_mapping.xml:781
+#: basic_mapping.xml:805
 #, fuzzy, no-c-format
 msgid ""
 "The first of these new generators is <literal>org.hibernate.id.enhanced."
@@ -1570,7 +1570,7 @@
 "<placeholder-1/>"
 
 #. Tag: para
-#: basic_mapping.xml:795
+#: basic_mapping.xml:819
 #, no-c-format
 msgid ""
 "<literal>sequence_name</literal> (optional, defaults to "
@@ -1582,7 +1582,7 @@
 "to be used."
 
 #. Tag: para
-#: basic_mapping.xml:801
+#: basic_mapping.xml:825
 #, no-c-format
 msgid ""
 "<literal>initial_value</literal> (optional, defaults to <literal>1</"
@@ -1596,7 +1596,7 @@
 "\"STARTS WITH\"."
 
 #. Tag: para
-#: basic_mapping.xml:808
+#: basic_mapping.xml:832
 #, no-c-format
 msgid ""
 "<literal>increment_size</literal> (optional, defaults to <literal>1</"
@@ -1610,7 +1610,7 @@
 "named \"INCREMENT BY\"."
 
 #. Tag: para
-#: basic_mapping.xml:815
+#: basic_mapping.xml:839
 #, no-c-format
 msgid ""
 "<literal>force_table_use</literal> (optional, defaults to <literal>false</"
@@ -1622,7 +1622,7 @@
 "though the dialect might support sequence?"
 
 #. Tag: para
-#: basic_mapping.xml:822
+#: basic_mapping.xml:846
 #, no-c-format
 msgid ""
 "<literal>value_column</literal> (optional, defaults to <literal>next_val</"
@@ -1634,7 +1634,7 @@
 "table which is used to hold the value."
 
 #. Tag: para
-#: basic_mapping.xml:829
+#: basic_mapping.xml:853
 #, fuzzy, no-c-format
 msgid ""
 "<literal>optimizer</literal> (optional, defaults to <literal>none</"
@@ -1643,7 +1643,7 @@
 "<literal>cascade</literal> (可选 -默认是<literal>none</literal>): 级联的类型"
 
 #. Tag: para
-#: basic_mapping.xml:836
+#: basic_mapping.xml:860
 #, fuzzy, no-c-format
 msgid ""
 "The second of these new generators is <literal>org.hibernate.id.enhanced."
@@ -1669,7 +1669,7 @@
 "parameters: <placeholder-1/>"
 
 #. Tag: para
-#: basic_mapping.xml:846
+#: basic_mapping.xml:870
 #, no-c-format
 msgid ""
 "<literal>table_name</literal> (optional, defaults to "
@@ -1679,7 +1679,7 @@
 "<literal>hibernate_sequences</literal>): The name of the table to be used."
 
 #. Tag: para
-#: basic_mapping.xml:852
+#: basic_mapping.xml:876
 #, no-c-format
 msgid ""
 "<literal>value_column_name</literal> (optional, defaults to "
@@ -1691,7 +1691,7 @@
 "used to hold the value."
 
 #. Tag: para
-#: basic_mapping.xml:858
+#: basic_mapping.xml:882
 #, no-c-format
 msgid ""
 "<literal>segment_column_name</literal> (optional, defaults to "
@@ -1705,7 +1705,7 @@
 "identifies which increment value to use."
 
 #. Tag: para
-#: basic_mapping.xml:865
+#: basic_mapping.xml:889
 #, no-c-format
 msgid ""
 "<literal>segment_value</literal> (optional, defaults to <literal>default</"
@@ -1717,7 +1717,7 @@
 "pull increment values for this generator."
 
 #. Tag: para
-#: basic_mapping.xml:872
+#: basic_mapping.xml:896
 #, no-c-format
 msgid ""
 "<literal>segment_value_length</literal> (optional, defaults to <literal>255</"
@@ -1729,7 +1729,7 @@
 "segment key column."
 
 #. Tag: para
-#: basic_mapping.xml:878
+#: basic_mapping.xml:902
 #, no-c-format
 msgid ""
 "<literal>initial_value</literal> (optional, defaults to <literal>1</"
@@ -1739,7 +1739,7 @@
 "literal>): The initial value to be retrieved from the table."
 
 #. Tag: para
-#: basic_mapping.xml:884
+#: basic_mapping.xml:908
 #, no-c-format
 msgid ""
 "<literal>increment_size</literal> (optional, defaults to <literal>1</"
@@ -1749,7 +1749,7 @@
 "literal>): The value by which subsequent calls to the table should differ."
 
 #. Tag: para
-#: basic_mapping.xml:890
+#: basic_mapping.xml:914
 #, fuzzy, no-c-format
 msgid ""
 "<literal>optimizer</literal> (optional, defaults to <literal></literal>): See"
@@ -1757,13 +1757,13 @@
 "<literal>cascade</literal> (可选 -默认是<literal>none</literal>): 级联的类型"
 
 #. Tag: title
-#: basic_mapping.xml:900
+#: basic_mapping.xml:924
 #, no-c-format
 msgid "Identifier generator optimization"
 msgstr "Identifier generator optimization"
 
 #. Tag: para
-#: basic_mapping.xml:901
+#: basic_mapping.xml:925
 #, fuzzy, no-c-format
 msgid ""
 "For identifier generators which store values in the database, it is "
@@ -1783,7 +1783,7 @@
 "\"/> support this notion. <placeholder-1/>"
 
 #. Tag: para
-#: basic_mapping.xml:909
+#: basic_mapping.xml:933
 #, no-c-format
 msgid ""
 "<literal>none</literal> (generally this is the default if no optimizer was "
@@ -1795,7 +1795,7 @@
 "each and every request."
 
 #. Tag: para
-#: basic_mapping.xml:915
+#: basic_mapping.xml:939
 #, no-c-format
 msgid ""
 "<literal>hilo</literal>: applies a hi/lo algorithm around the database "
@@ -1813,7 +1813,7 @@
 "define a group \"hi value\"."
 
 #. Tag: para
-#: basic_mapping.xml:924
+#: basic_mapping.xml:948
 #, no-c-format
 msgid ""
 "<literal>pooled</literal>: like was discussed for <literal>hilo</literal>, "
@@ -1831,13 +1831,13 @@
 "refers to the values coming from the database."
 
 #. Tag: title
-#: basic_mapping.xml:937
+#: basic_mapping.xml:961
 #, no-c-format
 msgid "composite-id"
 msgstr "composite-id"
 
 #. Tag: programlisting
-#: basic_mapping.xml:939
+#: basic_mapping.xml:963
 #, no-c-format
 msgid ""
 "<![CDATA[<composite-id\n"
@@ -1856,7 +1856,7 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:941
+#: basic_mapping.xml:965
 #, no-c-format
 msgid ""
 "For a table with a composite key, you may map multiple properties of the "
@@ -1869,7 +1869,7 @@
 "性映射和<literal>&lt;key-many-to-one&gt;</literal>属性映射作为子元素。"
 
 #. Tag: programlisting
-#: basic_mapping.xml:948
+#: basic_mapping.xml:972
 #, no-c-format
 msgid ""
 "<![CDATA[<composite-id>\n"
@@ -1879,7 +1879,7 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:950
+#: basic_mapping.xml:974
 #, no-c-format
 msgid ""
 "Your persistent class <emphasis>must</emphasis> override <literal>equals()</"
@@ -1891,7 +1891,7 @@
 "<literal>Serializable</literal>接口也是必须的。"
 
 #. Tag: para
-#: basic_mapping.xml:956
+#: basic_mapping.xml:980
 #, no-c-format
 msgid ""
 "Unfortunately, this approach to composite identifiers means that a "
@@ -1909,7 +1909,7 @@
 "这种用法。"
 
 #. Tag: para
-#: basic_mapping.xml:965
+#: basic_mapping.xml:989
 #, no-c-format
 msgid ""
 "A second approach is what we call a <emphasis>mapped</emphasis> composite "
@@ -1922,7 +1922,7 @@
 "属性不但在持久化类出现,还形成一个独立的标识符类。"
 
 #. Tag: programlisting
-#: basic_mapping.xml:971
+#: basic_mapping.xml:995
 #, no-c-format
 msgid ""
 "<![CDATA[<composite-id class=\"MedicareId\" mapped=\"true\">\n"
@@ -1932,7 +1932,7 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:973
+#: basic_mapping.xml:997
 #, no-c-format
 msgid ""
 "In this example, both the composite identifier class, <literal>MedicareId</"
@@ -1949,14 +1949,14 @@
 "<literal>Serializable</literal>接口。这种方法的缺点是出现了明显的代码重复。"
 
 #. Tag: para
-#: basic_mapping.xml:982
+#: basic_mapping.xml:1006
 #, no-c-format
 msgid ""
 "The following attributes are used to specify a mapped composite identifier:"
 msgstr "下面列出的属性是用来指定一个映射式组合标识符的:"
 
 #. Tag: para
-#: basic_mapping.xml:988
+#: basic_mapping.xml:1012
 #, no-c-format
 msgid ""
 "<literal>mapped</literal> (optional, defaults to <literal>false</literal>): "
@@ -1968,7 +1968,7 @@
 "个映射式组合标识符,其包含的属性映射同时在实体类和组合标识符类中出现。"
 
 #. Tag: para
-#: basic_mapping.xml:996
+#: basic_mapping.xml:1020
 #, no-c-format
 msgid ""
 "<literal>class</literal> (optional, but required for a mapped composite "
@@ -1978,7 +1978,7 @@
 "类使用的类名."
 
 #. Tag: para
-#: basic_mapping.xml:1003
+#: basic_mapping.xml:1027
 #, no-c-format
 msgid ""
 "We will describe a third, even more convenient approach where the composite "
@@ -1991,7 +1991,7 @@
 "三种方法有效:"
 
 #. Tag: para
-#: basic_mapping.xml:1011
+#: basic_mapping.xml:1035
 #, no-c-format
 msgid ""
 "<literal>name</literal> (optional, required for this approach): A property "
@@ -2001,7 +2001,7 @@
 "型的名字 (参阅第9章)."
 
 #. Tag: para
-#: basic_mapping.xml:1023
+#: basic_mapping.xml:1047
 #, no-c-format
 msgid ""
 "<literal>class</literal> (optional - defaults to the property type "
@@ -2012,7 +2012,7 @@
 "合标识符的组件类的类名(参阅下一节)"
 
 #. Tag: para
-#: basic_mapping.xml:1030
+#: basic_mapping.xml:1054
 #, no-c-format
 msgid ""
 "This third approach, an <emphasis>identifier component</emphasis> is the one "
@@ -2022,13 +2022,13 @@
 "对几乎所有应用都推荐使用的方式。"
 
 #. Tag: title
-#: basic_mapping.xml:1038
+#: basic_mapping.xml:1062
 #, no-c-format
 msgid "discriminator"
 msgstr "鉴别器(discriminator)"
 
 #. Tag: para
-#: basic_mapping.xml:1040
+#: basic_mapping.xml:1064
 #, no-c-format
 msgid ""
 "The <literal>&lt;discriminator&gt;</literal> element is required for "
@@ -2050,7 +2050,7 @@
 "<literal>true_false</literal>."
 
 #. Tag: programlisting
-#: basic_mapping.xml:1058
+#: basic_mapping.xml:1082
 #, no-c-format
 msgid ""
 "<![CDATA[<discriminator\n"
@@ -2063,7 +2063,7 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:1061
+#: basic_mapping.xml:1085
 #, no-c-format
 msgid ""
 "<literal>column</literal> (optional - defaults to <literal>class</literal>) "
@@ -2073,7 +2073,7 @@
 "的名字"
 
 #. Tag: para
-#: basic_mapping.xml:1067
+#: basic_mapping.xml:1091
 #, no-c-format
 msgid ""
 "<literal>type</literal> (optional - defaults to <literal>string</literal>) a "
@@ -2083,7 +2083,7 @@
 "Hibernate字段类型的名字"
 
 #. Tag: para
-#: basic_mapping.xml:1073
+#: basic_mapping.xml:1097
 #, no-c-format
 msgid ""
 "<literal>force</literal> (optional - defaults to <literal>false</literal>) "
@@ -2094,7 +2094,7 @@
 "制\"Hibernate指定允许的鉴别器值,即使当取得的所有实例都是根类的。"
 
 #. Tag: para
-#: basic_mapping.xml:1080
+#: basic_mapping.xml:1104
 #, no-c-format
 msgid ""
 "<literal>insert</literal> (optional - defaults to <literal>true</literal>) "
@@ -2108,7 +2108,7 @@
 "不包含该列)"
 
 #. Tag: para
-#: basic_mapping.xml:1088
+#: basic_mapping.xml:1112
 #, no-c-format
 msgid ""
 "<literal>formula</literal> (optional) an arbitrary SQL expression that is "
@@ -2119,7 +2119,7 @@
 "体子类-译注)时执行。可用于基于内容的鉴别器。"
 
 #. Tag: para
-#: basic_mapping.xml:1096
+#: basic_mapping.xml:1120
 #, no-c-format
 msgid ""
 "Actual values of the discriminator column are specified by the "
@@ -2131,7 +2131,7 @@
 "的。"
 
 #. Tag: para
-#: basic_mapping.xml:1102
+#: basic_mapping.xml:1126
 #, no-c-format
 msgid ""
 "The <literal>force</literal> attribute is (only) useful if the table "
@@ -2142,7 +2142,7 @@
 "化类的附加辨别器值。 这种情况不会经常遇到。"
 
 #. Tag: para
-#: basic_mapping.xml:1108
+#: basic_mapping.xml:1132
 #, no-c-format
 msgid ""
 "Using the <literal>formula</literal> attribute you can declare an arbitrary "
@@ -2152,7 +2152,7 @@
 "的类型。"
 
 #. Tag: programlisting
-#: basic_mapping.xml:1113
+#: basic_mapping.xml:1137
 #, no-c-format
 msgid ""
 "<![CDATA[<discriminator\n"
@@ -2161,13 +2161,13 @@
 msgstr ""
 
 #. Tag: title
-#: basic_mapping.xml:1118
+#: basic_mapping.xml:1142
 #, no-c-format
 msgid "version (optional)"
 msgstr "版本(version)(可选)"
 
 #. Tag: para
-#: basic_mapping.xml:1120
+#: basic_mapping.xml:1144
 #, no-c-format
 msgid ""
 "The <literal>&lt;version&gt;</literal> element is optional and indicates "
@@ -2179,7 +2179,7 @@
 "别有用。(见后)"
 
 #. Tag: programlisting
-#: basic_mapping.xml:1136
+#: basic_mapping.xml:1160
 #, no-c-format
 msgid ""
 "<![CDATA[<version\n"
@@ -2195,7 +2195,7 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:1139
+#: basic_mapping.xml:1163
 #, no-c-format
 msgid ""
 "<literal>column</literal> (optional - defaults to the property name): The "
@@ -2204,14 +2204,14 @@
 "<literal>column</literal> (可选 - 默认为属性名): 指定持有版本号的字段名。"
 
 #. Tag: para
-#: basic_mapping.xml:1145
+#: basic_mapping.xml:1169
 #, no-c-format
 msgid ""
 "<literal>name</literal>: The name of a property of the persistent class."
 msgstr "<literal>name</literal>: 持久化类的属性名。"
 
 #. Tag: para
-#: basic_mapping.xml:1150
+#: basic_mapping.xml:1174
 #, no-c-format
 msgid ""
 "<literal>type</literal> (optional - defaults to <literal>integer</literal>): "
@@ -2221,7 +2221,7 @@
 "类型。"
 
 #. Tag: para
-#: basic_mapping.xml:1162
+#: basic_mapping.xml:1186
 #, no-c-format
 msgid ""
 "<literal>unsaved-value</literal> (optional - defaults to <literal>undefined</"
@@ -2236,20 +2236,20 @@
 "开来。 (<literal>undefined</literal>指明应被使用的标识属性值。)"
 
 #. Tag: para
-#: basic_mapping.xml:1171
+#: basic_mapping.xml:1195
 #, 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 <xref linkend=\"mapping-generated\"/"
-">generated properties."
+"by the database. See the discussion of <link linkend=\"mapping-generated"
+"\">generated properties</link>."
 msgstr ""
 "<literal>generated</literal> (可选 - 默认是 <literal>never</literal>): 表明此"
 "版本属性值是否实际上是由数据库生成的。请参阅<xref linkend=\"mapping-generated"
 "\">generated properties</xref>部分的讨论。"
 
 #. Tag: para
-#: basic_mapping.xml:1178
+#: basic_mapping.xml:1202
 #, no-c-format
 msgid ""
 "<literal>insert</literal> (optional - defaults to <literal>true</literal>): "
@@ -2262,7 +2262,7 @@
 "候,才可以设置为<literal>false</literal>。"
 
 #. Tag: para
-#: basic_mapping.xml:1188
+#: basic_mapping.xml:1212
 #, no-c-format
 msgid ""
 "Version numbers may be of Hibernate type <literal>long</literal>, "
@@ -2274,7 +2274,7 @@
 "literal>。"
 
 #. Tag: para
-#: basic_mapping.xml:1193
+#: basic_mapping.xml:1217
 #, no-c-format
 msgid ""
 "A version or timestamp property should never be null for a detached "
@@ -2293,13 +2293,13 @@
 "identifiers) 或复合主键时非常有用!</emphasis>"
 
 #. Tag: title
-#: basic_mapping.xml:1204
+#: basic_mapping.xml:1228
 #, no-c-format
 msgid "timestamp (optional)"
 msgstr "timestamp (可选)"
 
 #. Tag: para
-#: basic_mapping.xml:1206
+#: basic_mapping.xml:1230
 #, no-c-format
 msgid ""
 "The optional <literal>&lt;timestamp&gt;</literal> element indicates that the "
@@ -2313,7 +2313,7 @@
 "然, 有时候应用程序可能在其他方面使用时间戳。"
 
 #. Tag: programlisting
-#: basic_mapping.xml:1222
+#: basic_mapping.xml:1246
 #, no-c-format
 msgid ""
 "<![CDATA[<timestamp\n"
@@ -2328,7 +2328,7 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:1225
+#: basic_mapping.xml:1249
 #, no-c-format
 msgid ""
 "<literal>column</literal> (optional - defaults to the property name): The "
@@ -2336,7 +2336,7 @@
 msgstr "<literal>column</literal> (可选 - 默认为属性名): 持有时间戳的字段名。"
 
 #. Tag: para
-#: basic_mapping.xml:1231
+#: basic_mapping.xml:1255
 #, no-c-format
 msgid ""
 "<literal>name</literal>: The name of a JavaBeans style property of Java type "
@@ -2347,7 +2347,7 @@
 "<literal>Date</literal> 或者 <literal>Timestamp</literal>的。"
 
 #. Tag: para
-#: basic_mapping.xml:1244
+#: basic_mapping.xml:1268
 #, no-c-format
 msgid ""
 "<literal>unsaved-value</literal> (optional - defaults to <literal>null</"
@@ -2362,7 +2362,7 @@
 "(<literal>undefined</literal> 指明使用标识属性值进行这种判断。)"
 
 #. Tag: para
-#: basic_mapping.xml:1253
+#: basic_mapping.xml:1277
 #, no-c-format
 msgid ""
 "<literal>source</literal> (optional - defaults to <literal>vm</literal>): "
@@ -2382,20 +2382,20 @@
 "Oracle 8)。"
 
 #. Tag: para
-#: basic_mapping.xml:1265
+#: basic_mapping.xml:1289
 #, fuzzy, 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 <xref linkend=\"mapping-"
-"generated\"/>generated properties."
+"generated by the database. See the discussion of <link linkend=\"mapping-"
+"generated\">generated properties</link>."
 msgstr ""
 "<literal>generated</literal> (可选 - 默认是 <literal>never</literal>): 指出时"
 "间戳值是否实际上是由数据库生成的.请参阅<xref linkend=\"mapping-generated"
 "\">generated properties</xref>的讨论。"
 
 #. Tag: para
-#: basic_mapping.xml:1274
+#: basic_mapping.xml:1298
 #, no-c-format
 msgid ""
 "Note that <literal>&lt;timestamp&gt;</literal> is equivalent to <literal>&lt;"
@@ -2409,13 +2409,13 @@
 "价的。"
 
 #. Tag: title
-#: basic_mapping.xml:1284
+#: basic_mapping.xml:1308
 #, no-c-format
 msgid "property"
 msgstr "property"
 
 #. Tag: para
-#: basic_mapping.xml:1286
+#: basic_mapping.xml:1310
 #, no-c-format
 msgid ""
 "The <literal>&lt;property&gt;</literal> element declares a persistent, "
@@ -2425,7 +2425,7 @@
 "属性。"
 
 #. Tag: programlisting
-#: basic_mapping.xml:1308
+#: basic_mapping.xml:1332
 #, no-c-format
 msgid ""
 "<![CDATA[<property\n"
@@ -2451,7 +2451,7 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:1311
+#: basic_mapping.xml:1335
 #, no-c-format
 msgid ""
 "<literal>name</literal>: the name of the property, with an initial lowercase "
@@ -2459,7 +2459,7 @@
 msgstr "<literal>name</literal>: 属性的名字,以小写字母开头。"
 
 #. Tag: para
-#: basic_mapping.xml:1317
+#: basic_mapping.xml:1341
 #, no-c-format
 msgid ""
 "<literal>column</literal> (optional - defaults to the property name): the "
@@ -2470,14 +2470,14 @@
 "以通过嵌套的<literal>&lt;column&gt;</literal>元素指定。"
 
 #. Tag: para
-#: basic_mapping.xml:1324
+#: basic_mapping.xml:1348
 #, 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
+#: basic_mapping.xml:1353
 #, no-c-format
 msgid ""
 "<literal>update, insert</literal> (optional - defaults to <literal>true</"
@@ -2494,7 +2494,7 @@
 "某些其他属性,或者通过一个trigger(触发器)或其他程序生成。"
 
 #. Tag: para
-#: basic_mapping.xml:1338
+#: basic_mapping.xml:1362
 #, no-c-format
 msgid ""
 "<literal>formula</literal> (optional): an SQL expression that defines the "
@@ -2505,7 +2505,7 @@
 "(computed)</emphasis> 属性的值。计算属性没有和它对应的数据库字段。"
 
 #. Tag: para
-#: basic_mapping.xml:1351
+#: basic_mapping.xml:1375
 #, no-c-format
 msgid ""
 "<literal>lazy</literal> (optional - defaults to <literal>false</literal>): "
@@ -2517,7 +2517,7 @@
 "码增强)。"
 
 #. Tag: para
-#: basic_mapping.xml:1358
+#: basic_mapping.xml:1382
 #, no-c-format
 msgid ""
 "<literal>unique</literal> (optional): Enable the DDL generation of a unique "
@@ -2528,7 +2528,7 @@
 "它作为<literal>property-ref</literal>引用的目标。"
 
 #. Tag: para
-#: basic_mapping.xml:1365
+#: basic_mapping.xml:1389
 #, no-c-format
 msgid ""
 "<literal>not-null</literal> (optional): Enable the DDL generation of a "
@@ -2538,7 +2538,7 @@
 "(nullability)的约束。"
 
 #. Tag: para
-#: basic_mapping.xml:1371
+#: basic_mapping.xml:1395
 #, no-c-format
 msgid ""
 "<literal>optimistic-lock</literal> (optional - defaults to <literal>true</"
@@ -2551,26 +2551,26 @@
 "决定这个属性发生脏数据时版本(version)的值是否增长。"
 
 #. Tag: para
-#: basic_mapping.xml:1379
+#: basic_mapping.xml:1403
 #, fuzzy, 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 <xref linkend=\"mapping-generated\"/"
-">generated properties."
+"database. See the discussion of <link linkend=\"mapping-generated"
+"\">generated properties</link>."
 msgstr ""
 "<literal>generated</literal> (可选 - 默认为 <literal>never</literal>): 表明此"
 "属性值是否实际上是由数据库生成的。请参阅<xref linkend=\"mapping-generated"
 "\">generated properties</xref>的讨论。"
 
 #. Tag: para
-#: basic_mapping.xml:1388
+#: basic_mapping.xml:1412
 #, no-c-format
 msgid "<emphasis>typename</emphasis> could be:"
 msgstr "<emphasis>typename</emphasis>可以是如下几种:"
 
 #. Tag: para
-#: basic_mapping.xml:1394
+#: basic_mapping.xml:1418
 #, no-c-format
 msgid ""
 "The name of a Hibernate basic type (eg. <literal>integer, string, character, "
@@ -2580,7 +2580,7 @@
 "timestamp, float, binary, serializable, object, blob</literal>)。"
 
 #. Tag: para
-#: basic_mapping.xml:1400
+#: basic_mapping.xml:1424
 #, no-c-format
 msgid ""
 "The name of a Java class with a default basic type (eg. <literal>int, float, "
@@ -2592,13 +2592,13 @@
 "literal>)。"
 
 #. Tag: para
-#: basic_mapping.xml:1406
+#: basic_mapping.xml:1430
 #, no-c-format
 msgid "The name of a serializable Java class."
 msgstr "一个可以序列化的Java类的名字。"
 
 #. Tag: para
-#: basic_mapping.xml:1411
+#: basic_mapping.xml:1435
 #, no-c-format
 msgid ""
 "The class name of a custom type (eg. <literal>com.illflow.type.MyCustomType</"
@@ -2608,7 +2608,7 @@
 "literal>)。"
 
 #. Tag: para
-#: basic_mapping.xml:1417
+#: basic_mapping.xml:1441
 #, no-c-format
 msgid ""
 "If you do not specify a type, Hibernate will use reflection upon the named "
@@ -2626,7 +2626,7 @@
 "TIMESTAMP</literal>,或者为了指定一个自定义类型。)"
 
 #. Tag: para
-#: basic_mapping.xml:1427
+#: basic_mapping.xml:1451
 #, no-c-format
 msgid ""
 "The <literal>access</literal> attribute lets you control how Hibernate will "
@@ -2645,7 +2645,7 @@
 "策略类的名字。"
 
 #. Tag: para
-#: basic_mapping.xml:1436
+#: basic_mapping.xml:1460
 #, no-c-format
 msgid ""
 "An especially powerful feature are derived properties. These properties are "
@@ -2659,7 +2659,7 @@
 "翻译成一个SQL查询的<literal>SELECT</literal> 子查询语句。"
 
 #. Tag: programlisting
-#: basic_mapping.xml:1443
+#: basic_mapping.xml:1467
 #, no-c-format
 msgid ""
 "<![CDATA[\n"
@@ -2672,7 +2672,7 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:1445
+#: basic_mapping.xml:1469
 #, no-c-format
 msgid ""
 "Note that you can reference the entities own table by not declaring an alias "
@@ -2685,13 +2685,13 @@
 "嵌套的<literal>&lt;formula&gt;</literal>映射元素。"
 
 #. Tag: title
-#: basic_mapping.xml:1455
+#: basic_mapping.xml:1479
 #, no-c-format
 msgid "many-to-one"
 msgstr "多对一(many-to-one)"
 
 #. Tag: para
-#: basic_mapping.xml:1457
+#: basic_mapping.xml:1481
 #, no-c-format
 msgid ""
 "An ordinary association to another persistent class is declared using a "
@@ -2704,7 +2704,7 @@
 "引用目标表的 主键字段。"
 
 #. Tag: programlisting
-#: basic_mapping.xml:1485
+#: basic_mapping.xml:1509
 #, no-c-format
 msgid ""
 "<![CDATA[<many-to-one\n"
@@ -2733,7 +2733,7 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:1488 basic_mapping.xml:1669 basic_mapping.xml:1855
+#: basic_mapping.xml:1512 basic_mapping.xml:1693 basic_mapping.xml:1879
 #, fuzzy, no-c-format
 msgid "<literal>name</literal>: The name of the property."
 msgstr ""
@@ -2745,7 +2745,7 @@
 "<literal>name</literal>: 属性名"
 
 #. Tag: para
-#: basic_mapping.xml:1493 basic_mapping.xml:2284
+#: basic_mapping.xml:1517 basic_mapping.xml:2308
 #, fuzzy, no-c-format
 msgid ""
 "<literal>column</literal> (optional): The name of the foreign key column. "
@@ -2760,7 +2760,7 @@
 "<literal>&lt;column&gt;</literal>指定。"
 
 #. Tag: para
-#: basic_mapping.xml:1500 basic_mapping.xml:1674
+#: basic_mapping.xml:1524 basic_mapping.xml:1698
 #, fuzzy, no-c-format
 msgid ""
 "<literal>class</literal> (optional - defaults to the property type "
@@ -2774,7 +2774,7 @@
 "名字。"
 
 #. Tag: para
-#: basic_mapping.xml:1506
+#: basic_mapping.xml:1530
 #, no-c-format
 msgid ""
 "<literal>cascade</literal> (optional): Specifies which operations should be "
@@ -2784,7 +2784,7 @@
 "对象。"
 
 #. Tag: para
-#: basic_mapping.xml:1512 basic_mapping.xml:1695
+#: basic_mapping.xml:1536 basic_mapping.xml:1719
 #, fuzzy, no-c-format
 msgid ""
 "<literal>fetch</literal> (optional - defaults to <literal>select</literal>): "
@@ -2799,7 +2799,7 @@
 "抓取或者序列选择抓取选择其一."
 
 #. Tag: para
-#: basic_mapping.xml:1518
+#: basic_mapping.xml:1542
 #, no-c-format
 msgid ""
 "<literal>update, insert</literal> (optional - defaults to <literal>true</"
@@ -2816,7 +2816,7 @@
 "得到 或者通过trigger(触发器)、或其他程序生成。"
 
 #. Tag: para
-#: basic_mapping.xml:1527
+#: basic_mapping.xml:1551
 #, no-c-format
 msgid ""
 "<literal>property-ref</literal>: (optional) The name of a property of the "
@@ -2827,7 +2827,7 @@
 "本外键相对应。 如果没有指定,会使用对方关联类的主键。"
 
 #. Tag: para
-#: basic_mapping.xml:1540
+#: basic_mapping.xml:1564
 #, no-c-format
 msgid ""
 "<literal>unique</literal> (optional): Enable the DDL generation of a unique "
@@ -2840,7 +2840,7 @@
 "一的效果。"
 
 #. Tag: para
-#: basic_mapping.xml:1548
+#: basic_mapping.xml:1572
 #, no-c-format
 msgid ""
 "<literal>not-null</literal> (optional): Enable the DDL generation of a "
@@ -2849,7 +2849,7 @@
 "<literal>not-null</literal> (可选): 使用DDL为外键字段生成一个非空约束。"
 
 #. Tag: para
-#: basic_mapping.xml:1554
+#: basic_mapping.xml:1578
 #, no-c-format
 msgid ""
 "<literal>optimistic-lock</literal> (optional - defaults to <literal>true</"
@@ -2862,7 +2862,7 @@
 "决定这个属性发生脏数据时版本(version)的值是否增长。"
 
 #. Tag: para
-#: basic_mapping.xml:1562
+#: basic_mapping.xml:1586
 #, no-c-format
 msgid ""
 "<literal>lazy</literal> (optional - defaults to <literal>proxy</literal>): "
@@ -2878,7 +2878,7 @@
 "强)。 <literal>lazy=\"false\"</literal>指定此关联总是被预先抓取。"
 
 #. Tag: para
-#: basic_mapping.xml:1572
+#: basic_mapping.xml:1596
 #, no-c-format
 msgid ""
 "<literal>not-found</literal> (optional - defaults to <literal>exception</"
@@ -2891,7 +2891,7 @@
 "视为一个空(null)关联。"
 
 #. Tag: para
-#: basic_mapping.xml:1579 basic_mapping.xml:1733
+#: basic_mapping.xml:1603 basic_mapping.xml:1757
 #, no-c-format
 msgid ""
 "<literal>entity-name</literal> (optional): The entity name of the associated "
@@ -2899,7 +2899,7 @@
 msgstr "<literal>entity-name</literal> (可选): 被关联的类的实体名。"
 
 #. Tag: para
-#: basic_mapping.xml:1585
+#: basic_mapping.xml:1608
 #, no-c-format
 msgid ""
 "<literal>formula</literal> (optional): an SQL expression that defines the "
@@ -2909,7 +2909,7 @@
 "算出的)</emphasis>外键值。"
 
 #. Tag: para
-#: basic_mapping.xml:1592
+#: basic_mapping.xml:1616
 #, no-c-format
 msgid ""
 "Setting a value of the <literal>cascade</literal> attribute to any "
@@ -2935,14 +2935,14 @@
 "儿(orphan delete,删除不再被引用的值)."
 
 #. Tag: para
-#: basic_mapping.xml:1605
+#: basic_mapping.xml:1629
 #, no-c-format
 msgid ""
 "A typical <literal>many-to-one</literal> declaration looks as simple as this:"
 msgstr "一个典型的简单<literal>many-to-one</literal>定义例子:"
 
 #. Tag: programlisting
-#: basic_mapping.xml:1609
+#: basic_mapping.xml:1633
 #, no-c-format
 msgid ""
 "<![CDATA[<many-to-one name=\"product\" class=\"Product\" column=\"PRODUCT_ID"
@@ -2950,7 +2950,7 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:1611
+#: basic_mapping.xml:1635
 #, no-c-format
 msgid ""
 "The <literal>property-ref</literal> attribute should only be used for "
@@ -2968,7 +2968,7 @@
 "SchemaExport工具进行的DDL生成。)"
 
 #. Tag: programlisting
-#: basic_mapping.xml:1620
+#: basic_mapping.xml:1644
 #, no-c-format
 msgid ""
 "<![CDATA[<property name=\"serialNumber\" unique=\"true\" type=\"string\" "
@@ -2976,13 +2976,13 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:1622
+#: basic_mapping.xml:1646
 #, 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:1650
 #, no-c-format
 msgid ""
 "<![CDATA[<many-to-one name=\"product\" property-ref=\"serialNumber\" column="
@@ -2990,13 +2990,13 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:1628
+#: basic_mapping.xml:1652
 #, no-c-format
 msgid "This is certainly not encouraged, however."
 msgstr "当然,我们决不鼓励这种用法。"
 
 #. Tag: para
-#: basic_mapping.xml:1632
+#: basic_mapping.xml:1656
 #, no-c-format
 msgid ""
 "If the referenced unique key comprises multiple properties of the associated "
@@ -3007,7 +3007,7 @@
 "properties&gt;</literal>的元素 里面映射所有关联的属性。"
 
 #. Tag: para
-#: basic_mapping.xml:1637
+#: basic_mapping.xml:1661
 #, no-c-format
 msgid ""
 "If the referenced unique key is the property of a component, you may specify "
@@ -3015,7 +3015,7 @@
 msgstr "假若被引用的唯一主键是组件的属性,你可以指定属性路径:"
 
 #. Tag: programlisting
-#: basic_mapping.xml:1641
+#: basic_mapping.xml:1665
 #, no-c-format
 msgid ""
 "<![CDATA[<many-to-one name=\"owner\" property-ref=\"identity.ssn\" column="
@@ -3023,13 +3023,13 @@
 msgstr ""
 
 #. Tag: title
-#: basic_mapping.xml:1646
+#: basic_mapping.xml:1670
 #, no-c-format
 msgid "one-to-one"
 msgstr "一对一"
 
 #. Tag: para
-#: basic_mapping.xml:1648
+#: basic_mapping.xml:1672
 #, no-c-format
 msgid ""
 "A one-to-one association to another persistent class is declared using a "
@@ -3038,7 +3038,7 @@
 "持久化对象之间一对一的关联关系是通过<literal>one-to-one</literal>元素定义的。"
 
 #. Tag: programlisting
-#: basic_mapping.xml:1666
+#: basic_mapping.xml:1690
 #, no-c-format
 msgid ""
 "<![CDATA[<one-to-one\n"
@@ -3059,7 +3059,7 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:1680
+#: basic_mapping.xml:1704
 #, no-c-format
 msgid ""
 "<literal>cascade</literal> (optional) specifies which operations should be "
@@ -3069,7 +3069,7 @@
 "象。"
 
 #. Tag: para
-#: basic_mapping.xml:1686
+#: basic_mapping.xml:1710
 #, no-c-format
 msgid ""
 "<literal>constrained</literal> (optional) specifies that a foreign key "
@@ -3085,7 +3085,7 @@
 "顺序以及 决定该关联能否被委托(也在schema export tool中被使用)."
 
 #. Tag: para
-#: basic_mapping.xml:1701
+#: basic_mapping.xml:1725
 #, no-c-format
 msgid ""
 "<literal>property-ref</literal>: (optional) The name of a property of the "
@@ -3096,7 +3096,7 @@
 "类的主键相对应。如果没有指定,会使用对方关联类的主键。"
 
 #. Tag: para
-#: basic_mapping.xml:1714
+#: basic_mapping.xml:1738
 #, no-c-format
 msgid ""
 "<literal>formula</literal> (optional): Almost all one to one associations "
@@ -3111,7 +3111,7 @@
 "找到例子)"
 
 #. Tag: para
-#: basic_mapping.xml:1722
+#: basic_mapping.xml:1746
 #, no-c-format
 msgid ""
 "<literal>lazy</literal> (optional - defaults to <literal>proxy</literal>): "
@@ -3131,25 +3131,25 @@
 "会采取预先抓取!</emphasis>"
 
 #. Tag: para
-#: basic_mapping.xml:1740
+#: basic_mapping.xml:1764
 #, no-c-format
 msgid "There are two varieties of one-to-one association:"
 msgstr "有两种不同的一对一关联:"
 
 #. Tag: para
-#: basic_mapping.xml:1744
+#: basic_mapping.xml:1768
 #, no-c-format
 msgid "primary key associations"
 msgstr "主键关联"
 
 #. Tag: para
-#: basic_mapping.xml:1747
+#: basic_mapping.xml:1771
 #, no-c-format
 msgid "unique foreign key associations"
 msgstr "惟一外键关联"
 
 #. Tag: para
-#: basic_mapping.xml:1752
+#: basic_mapping.xml:1776
 #, no-c-format
 msgid ""
 "Primary key associations don't need an extra table column; if two rows are "
@@ -3163,7 +3163,7 @@
 "它们被赋予同样的标识值!"
 
 #. Tag: para
-#: basic_mapping.xml:1759
+#: basic_mapping.xml:1783
 #, no-c-format
 msgid ""
 "For a primary key association, add the following mappings to "
@@ -3173,13 +3173,13 @@
 "键一对一关联:"
 
 #. Tag: programlisting
-#: basic_mapping.xml:1764
+#: basic_mapping.xml:1788
 #, no-c-format
 msgid "<![CDATA[<one-to-one name=\"person\" class=\"Person\"/>]]>"
 msgstr ""
 
 #. Tag: programlisting
-#: basic_mapping.xml:1765
+#: basic_mapping.xml:1789
 #, no-c-format
 msgid ""
 "<![CDATA[<one-to-one name=\"employee\" class=\"Employee\" constrained=\"true"
@@ -3187,7 +3187,7 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:1767
+#: basic_mapping.xml:1791
 #, no-c-format
 msgid ""
 "Now we must ensure that the primary keys of related rows in the PERSON and "
@@ -3198,7 +3198,7 @@
 "<literal>foreign</literal>的特殊的hibernate标识符生成策略:"
 
 #. Tag: programlisting
-#: basic_mapping.xml:1773
+#: basic_mapping.xml:1797
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"person\" table=\"PERSON\">\n"
@@ -3215,7 +3215,7 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:1775
+#: basic_mapping.xml:1799
 #, no-c-format
 msgid ""
 "A newly saved instance of <literal>Person</literal> is then assigned the "
@@ -3228,7 +3228,7 @@
 "实例同样的关键字值。"
 
 #. Tag: para
-#: basic_mapping.xml:1781
+#: basic_mapping.xml:1805
 #, no-c-format
 msgid ""
 "Alternatively, a foreign key with a unique constraint, from "
@@ -3239,7 +3239,7 @@
 "<literal>Person</literal>的例子,如果使用这种关联方式,可以表达成:"
 
 #. Tag: programlisting
-#: basic_mapping.xml:1786
+#: basic_mapping.xml:1810
 #, no-c-format
 msgid ""
 "<![CDATA[<many-to-one name=\"person\" class=\"Person\" column=\"PERSON_ID\" "
@@ -3247,7 +3247,7 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:1788
+#: basic_mapping.xml:1812
 #, no-c-format
 msgid ""
 "And this association may be made bidirectional by adding the following to "
@@ -3256,7 +3256,7 @@
 "如果在<literal>Person</literal>的映射加入下面几句,这种关联就是双向的:"
 
 #. Tag: programlisting
-#: basic_mapping.xml:1793
+#: basic_mapping.xml:1817
 #, no-c-format
 msgid ""
 "<![CDATA[<one-to-one name=\"employee\" class=\"Employee\" property-ref="
@@ -3264,13 +3264,13 @@
 msgstr ""
 
 #. Tag: title
-#: basic_mapping.xml:1798
+#: basic_mapping.xml:1822
 #, no-c-format
 msgid "natural-id"
 msgstr "自然ID(natural-id)"
 
 #. Tag: programlisting
-#: basic_mapping.xml:1800
+#: basic_mapping.xml:1824
 #, no-c-format
 msgid ""
 "<![CDATA[<natural-id mutable=\"true|false\"/>\n"
@@ -3281,7 +3281,7 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:1802
+#: basic_mapping.xml:1826
 #, no-c-format
 msgid ""
 "Even though we recommend the use of surrogate keys as primary keys, you "
@@ -3300,7 +3300,7 @@
 "解)。"
 
 #. Tag: para
-#: basic_mapping.xml:1811
+#: basic_mapping.xml:1835
 #, no-c-format
 msgid ""
 "We strongly recommend that you implement <literal>equals()</literal> and "
@@ -3311,14 +3311,14 @@
 "方法,来比较实体的自然键属性。"
 
 #. Tag: para
-#: basic_mapping.xml:1816
+#: basic_mapping.xml:1840
 #, no-c-format
 msgid ""
 "This mapping is not intended for use with entities with natural primary keys."
 msgstr "这一映射不是为了把自然键作为主键而准备的。"
 
 #. Tag: para
-#: basic_mapping.xml:1822
+#: basic_mapping.xml:1846
 #, no-c-format
 msgid ""
 "<literal>mutable</literal> (optional, defaults to <literal>false</literal>): "
@@ -3329,13 +3329,13 @@
 "下,自然标识属性被假定为不可变的(常量)。"
 
 #. Tag: title
-#: basic_mapping.xml:1832
+#: basic_mapping.xml:1856
 #, no-c-format
 msgid "component, dynamic-component"
 msgstr "组件(component), 动态组件(dynamic-component)"
 
 #. Tag: para
-#: basic_mapping.xml:1834
+#: basic_mapping.xml:1858
 #, no-c-format
 msgid ""
 "The <literal>&lt;component&gt;</literal> element maps properties of a child "
@@ -3348,7 +3348,7 @@
 "的“Components”一章。"
 
 #. Tag: programlisting
-#: basic_mapping.xml:1852
+#: basic_mapping.xml:1876
 #, no-c-format
 msgid ""
 "<![CDATA[<component\n"
@@ -3370,7 +3370,7 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:1860
+#: basic_mapping.xml:1884
 #, no-c-format
 msgid ""
 "<literal>class</literal> (optional - defaults to the property type "
@@ -3380,7 +3380,7 @@
 "字。"
 
 #. Tag: para
-#: basic_mapping.xml:1866 basic_mapping.xml:1955
+#: basic_mapping.xml:1890 basic_mapping.xml:1979
 #, fuzzy, no-c-format
 msgid ""
 "<literal>insert</literal>: Do the mapped columns appear in SQL "
@@ -3394,7 +3394,7 @@
 "literal>语句中?"
 
 #. Tag: para
-#: basic_mapping.xml:1872 basic_mapping.xml:1961
+#: basic_mapping.xml:1896 basic_mapping.xml:1985
 #, fuzzy, no-c-format
 msgid ""
 "<literal>update</literal>: Do the mapped columns appear in SQL "
@@ -3408,7 +3408,7 @@
 "literal>语句中?"
 
 #. Tag: para
-#: basic_mapping.xml:1884
+#: basic_mapping.xml:1908
 #, no-c-format
 msgid ""
 "<literal>lazy</literal> (optional - defaults to <literal>false</literal>): "
@@ -3419,7 +3419,7 @@
 "应在实例变量第一次被访问的时候延迟加载(需要编译时字节码装置器)"
 
 #. Tag: para
-#: basic_mapping.xml:1891
+#: basic_mapping.xml:1915
 #, no-c-format
 msgid ""
 "<literal>optimistic-lock</literal> (optional - defaults to <literal>true</"
@@ -3432,7 +3432,7 @@
 "(Version)"
 
 #. Tag: para
-#: basic_mapping.xml:1899 basic_mapping.xml:1975
+#: basic_mapping.xml:1923 basic_mapping.xml:1999
 #, no-c-format
 msgid ""
 "<literal>unique</literal> (optional - defaults to <literal>false</literal>): "
@@ -3443,7 +3443,7 @@
 "射的所有字段上都有唯一性约束"
 
 #. Tag: para
-#: basic_mapping.xml:1908
+#: basic_mapping.xml:1932
 #, no-c-format
 msgid ""
 "The child <literal>&lt;property&gt;</literal> tags map properties of the "
@@ -3453,7 +3453,7 @@
 "射。"
 
 #. Tag: para
-#: basic_mapping.xml:1913
+#: basic_mapping.xml:1937
 #, no-c-format
 msgid ""
 "The <literal>&lt;component&gt;</literal> element allows a <literal>&lt;"
@@ -3464,7 +3464,7 @@
 "literal>子元素,在组件类内部就可以有一个指向其容器的实体的反向引用。"
 
 #. Tag: para
-#: basic_mapping.xml:1919
+#: basic_mapping.xml:1943
 #, no-c-format
 msgid ""
 "The <literal>&lt;dynamic-component&gt;</literal> element allows a "
@@ -3476,13 +3476,13 @@
 "dynamic\"/>."
 
 #. Tag: title
-#: basic_mapping.xml:1928
+#: basic_mapping.xml:1952
 #, no-c-format
 msgid "properties"
 msgstr "properties"
 
 #. Tag: para
-#: basic_mapping.xml:1930
+#: basic_mapping.xml:1954
 #, no-c-format
 msgid ""
 "The <literal>&lt;properties&gt;</literal> element allows the definition of a "
@@ -3497,7 +3497,7 @@
 "一种方便途径。"
 
 #. Tag: programlisting
-#: basic_mapping.xml:1946
+#: basic_mapping.xml:1970
 #, no-c-format
 msgid ""
 "<![CDATA[<properties\n"
@@ -3515,7 +3515,7 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:1949
+#: basic_mapping.xml:1973
 #, no-c-format
 msgid ""
 "<literal>name</literal>: The logical name of the grouping - <emphasis>not</"
@@ -3525,7 +3525,7 @@
 "的名称."
 
 #. Tag: para
-#: basic_mapping.xml:1967
+#: basic_mapping.xml:1991
 #, no-c-format
 msgid ""
 "<literal>optimistic-lock</literal> (optional - defaults to <literal>true</"
@@ -3538,7 +3538,7 @@
 "(Version)"
 
 #. Tag: para
-#: basic_mapping.xml:1984
+#: basic_mapping.xml:2008
 #, no-c-format
 msgid ""
 "For example, if we have the following <literal>&lt;properties&gt;</literal> "
@@ -3546,7 +3546,7 @@
 msgstr "例如,如果我们有如下的<literal>&lt;properties&gt;</literal>映射:"
 
 #. Tag: programlisting
-#: basic_mapping.xml:1988
+#: basic_mapping.xml:2012
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Person\">\n"
@@ -3562,7 +3562,7 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:1990
+#: basic_mapping.xml:2014
 #, no-c-format
 msgid ""
 "Then we might have some legacy data association which refers to this unique "
@@ -3572,7 +3572,7 @@
 "一键,而不是主键。"
 
 #. Tag: programlisting
-#: basic_mapping.xml:1995
+#: basic_mapping.xml:2019
 #, no-c-format
 msgid ""
 "<![CDATA[<many-to-one name=\"person\"\n"
@@ -3584,7 +3584,7 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:1997
+#: basic_mapping.xml:2021
 #, no-c-format
 msgid ""
 "We don't recommend the use of this kind of thing outside the context of "
@@ -3592,13 +3592,13 @@
 msgstr "我们并不推荐这样使用,除非在映射遗留数据的情况下。"
 
 #. Tag: title
-#: basic_mapping.xml:2005
+#: basic_mapping.xml:2029
 #, no-c-format
 msgid "subclass"
 msgstr "子类(subclass)"
 
 #. Tag: para
-#: basic_mapping.xml:2007
+#: basic_mapping.xml:2031
 #, no-c-format
 msgid ""
 "Finally, polymorphic persistence requires the declaration of each subclass "
@@ -3609,7 +3609,7 @@
 "表”的策略来说,就需要使用<literal>&lt;subclass&gt;</literal>定义。"
 
 #. Tag: programlisting
-#: basic_mapping.xml:2020
+#: basic_mapping.xml:2044
 #, no-c-format
 msgid ""
 "<![CDATA[<subclass\n"
@@ -3629,14 +3629,14 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:2023 basic_mapping.xml:2081 basic_mapping.xml:2144
+#: basic_mapping.xml:2047 basic_mapping.xml:2105 basic_mapping.xml:2168
 #, no-c-format
 msgid ""
 "<literal>name</literal>: The fully qualified class name of the subclass."
 msgstr "<literal>name</literal>: 子类的全限定名。"
 
 #. Tag: para
-#: basic_mapping.xml:2028
+#: basic_mapping.xml:2052
 #, no-c-format
 msgid ""
 "<literal>discriminator-value</literal> (optional - defaults to the class "
@@ -3646,7 +3646,7 @@
 "区分每个独立的子类的值。"
 
 #. Tag: para
-#: basic_mapping.xml:2034 basic_mapping.xml:2091 basic_mapping.xml:2154
+#: basic_mapping.xml:2058 basic_mapping.xml:2115 basic_mapping.xml:2178
 #, fuzzy, no-c-format
 msgid ""
 "<literal>proxy</literal> (optional): Specifies a class or interface to use "
@@ -3663,7 +3663,7 @@
 "用。"
 
 #. Tag: para
-#: basic_mapping.xml:2040 basic_mapping.xml:2097 basic_mapping.xml:2160
+#: basic_mapping.xml:2064 basic_mapping.xml:2121 basic_mapping.xml:2184
 #, fuzzy, no-c-format
 msgid ""
 "<literal>lazy</literal> (optional, defaults to <literal>true</literal>): "
@@ -3680,7 +3680,7 @@
 "<literal>lazy=\"false\"</literal> 禁止使用延迟装载。"
 
 #. Tag: para
-#: basic_mapping.xml:2048
+#: basic_mapping.xml:2072
 #, no-c-format
 msgid ""
 "Each subclass should declare its own persistent properties and subclasses. "
@@ -3695,7 +3695,7 @@
 "果没有指定,就会使用Java类的全限定名。"
 
 #. Tag: para
-#: basic_mapping.xml:2056 basic_mapping.xml:2114 basic_mapping.xml:2172
+#: basic_mapping.xml:2080 basic_mapping.xml:2138 basic_mapping.xml:2196
 #, fuzzy, no-c-format
 msgid ""
 "For information about inheritance mappings, see <xref linkend=\"inheritance"
@@ -3709,13 +3709,13 @@
 "更多关于继承映射的信息,参考<xref linkend=\"inheritance\"/>。"
 
 #. Tag: title
-#: basic_mapping.xml:2063
+#: basic_mapping.xml:2087
 #, no-c-format
 msgid "joined-subclass"
 msgstr "连接的子类(joined-subclass)"
 
 #. Tag: para
-#: basic_mapping.xml:2065
+#: basic_mapping.xml:2089
 #, no-c-format
 msgid ""
 "Alternatively, each subclass may be mapped to its own table (table-per-"
@@ -3728,7 +3728,7 @@
 "素。"
 
 #. Tag: programlisting
-#: basic_mapping.xml:2078
+#: basic_mapping.xml:2102
 #, no-c-format
 msgid ""
 "<![CDATA[<joined-subclass\n"
@@ -3754,7 +3754,7 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:2086 basic_mapping.xml:2149
+#: basic_mapping.xml:2110 basic_mapping.xml:2173
 #, fuzzy, no-c-format
 msgid "<literal>table</literal>: The name of the subclass table."
 msgstr ""
@@ -3764,7 +3764,7 @@
 "<literal>table</literal>: 子类的表名"
 
 #. Tag: para
-#: basic_mapping.xml:2105
+#: basic_mapping.xml:2129
 #, no-c-format
 msgid ""
 "No discriminator column is required for this mapping strategy. Each subclass "
@@ -3777,7 +3777,7 @@
 "的映射可以被用如下方式重写:"
 
 #. Tag: programlisting
-#: basic_mapping.xml:2112
+#: basic_mapping.xml:2136
 #, no-c-format
 msgid ""
 "<![CDATA[<?xml version=\"1.0\"?>\n"
@@ -3815,13 +3815,13 @@
 msgstr ""
 
 #. Tag: title
-#: basic_mapping.xml:2121
+#: basic_mapping.xml:2145
 #, no-c-format
 msgid "union-subclass"
 msgstr "联合子类(union-subclass)"
 
 #. Tag: para
-#: basic_mapping.xml:2123
+#: basic_mapping.xml:2147
 #, no-c-format
 msgid ""
 "A third option is to map only the concrete classes of an inheritance "
@@ -3841,7 +3841,7 @@
 "的关联),你需要使用<literal>&lt;union-subclass&gt;</literal>映射。"
 
 #. Tag: programlisting
-#: basic_mapping.xml:2141
+#: basic_mapping.xml:2165
 #, no-c-format
 msgid ""
 "<![CDATA[<union-subclass\n"
@@ -3866,20 +3866,20 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:2168
+#: basic_mapping.xml:2192
 #, no-c-format
 msgid ""
 "No discriminator column or key column is required for this mapping strategy."
 msgstr "这种映射策略不需要指定辨别标志(discriminator)字段。"
 
 #. Tag: title
-#: basic_mapping.xml:2179
+#: basic_mapping.xml:2203
 #, no-c-format
 msgid "join"
 msgstr "连接(join)"
 
 #. Tag: para
-#: basic_mapping.xml:2181
+#: basic_mapping.xml:2205
 #, no-c-format
 msgid ""
 "Using the <literal>&lt;join&gt;</literal> element, it is possible to map "
@@ -3890,7 +3890,7 @@
 "一个类的属性映射到多张表中。"
 
 #. Tag: programlisting
-#: basic_mapping.xml:2195
+#: basic_mapping.xml:2219
 #, no-c-format
 msgid ""
 "<![CDATA[<join\n"
@@ -3909,13 +3909,13 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:2199
+#: basic_mapping.xml:2223
 #, no-c-format
 msgid "<literal>table</literal>: The name of the joined table."
 msgstr "<literal>table</literal>: 被连接表的名称。"
 
 #. Tag: para
-#: basic_mapping.xml:2216
+#: basic_mapping.xml:2240
 #, no-c-format
 msgid ""
 "<literal>fetch</literal> (optional - defaults to <literal>join</literal>): "
@@ -3937,7 +3937,7 @@
 "join&gt;</literal>,依然会使用内连接得到。"
 
 #. Tag: para
-#: basic_mapping.xml:2229
+#: basic_mapping.xml:2253
 #, no-c-format
 msgid ""
 "<literal>inverse</literal> (optional - defaults to <literal>false</"
@@ -3948,7 +3948,7 @@
 "开,Hibernate 不会插入或者更新此连接定义的属性。"
 
 #. Tag: para
-#: basic_mapping.xml:2236
+#: basic_mapping.xml:2260
 #, no-c-format
 msgid ""
 "<literal>optional</literal> (optional - defaults to <literal>false</"
@@ -3961,7 +3961,7 @@
 "接来得到这些属性。"
 
 #. Tag: para
-#: basic_mapping.xml:2245
+#: basic_mapping.xml:2269
 #, no-c-format
 msgid ""
 "For example, the address information for a person can be mapped to a "
@@ -3971,7 +3971,7 @@
 "的值类型语义):"
 
 #. Tag: programlisting
-#: basic_mapping.xml:2250
+#: basic_mapping.xml:2274
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Person\"\n"
@@ -3989,7 +3989,7 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:2252
+#: basic_mapping.xml:2276
 #, no-c-format
 msgid ""
 "This feature is often only useful for legacy data models, we recommend fewer "
@@ -4001,13 +4001,13 @@
 "型。然而,在单独的继承树上切换继承映射策略是有用的,后面会解释这点。"
 
 #. Tag: title
-#: basic_mapping.xml:2262
+#: basic_mapping.xml:2286
 #, no-c-format
 msgid "<title>key</title>"
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:2264
+#: basic_mapping.xml:2288
 #, no-c-format
 msgid ""
 "We've seen the <literal>&lt;key&gt;</literal> element crop up a few times "
@@ -4020,7 +4020,7 @@
 "经常使用。"
 
 #. Tag: programlisting
-#: basic_mapping.xml:2280
+#: basic_mapping.xml:2304
 #, no-c-format
 msgid ""
 "<![CDATA[<key\n"
@@ -4034,7 +4034,7 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:2291
+#: basic_mapping.xml:2315
 #, no-c-format
 msgid ""
 "<literal>on-delete</literal> (optional, defaults to <literal>noaction</"
@@ -4045,7 +4045,7 @@
 "外键关联是否打开数据库级别的级联删除。"
 
 #. Tag: para
-#: basic_mapping.xml:2298
+#: basic_mapping.xml:2322
 #, no-c-format
 msgid ""
 "<literal>property-ref</literal> (optional): Specifies that the foreign key "
@@ -4056,7 +4056,7 @@
 "给遗留数据)。"
 
 #. Tag: para
-#: basic_mapping.xml:2305
+#: basic_mapping.xml:2329
 #, no-c-format
 msgid ""
 "<literal>not-null</literal> (optional): Specifies that the foreign key "
@@ -4067,7 +4067,7 @@
 "键都是主键的一部分)。"
 
 #. Tag: para
-#: basic_mapping.xml:2312
+#: basic_mapping.xml:2336
 #, no-c-format
 msgid ""
 "<literal>update</literal> (optional): Specifies that the foreign key should "
@@ -4078,7 +4078,7 @@
 "都是主键的一部分)。"
 
 #. Tag: para
-#: basic_mapping.xml:2319
+#: basic_mapping.xml:2343
 #, no-c-format
 msgid ""
 "<literal>unique</literal> (optional): Specifies that the foreign key should "
@@ -4089,7 +4089,7 @@
 "键都是主键的一部分)。"
 
 #. Tag: para
-#: basic_mapping.xml:2327
+#: basic_mapping.xml:2351
 #, no-c-format
 msgid ""
 "We recommend that for systems where delete performance is important, all "
@@ -4105,7 +4105,7 @@
 "性会绕过 Hibernate 通常对版本数据(versioned data)采用的乐观锁策略。"
 
 #. Tag: para
-#: basic_mapping.xml:2335
+#: basic_mapping.xml:2359
 #, no-c-format
 msgid ""
 "The <literal>not-null</literal> and <literal>update</literal> attributes are "
@@ -4120,13 +4120,13 @@
 "定义此键字段。"
 
 #. Tag: title
-#: basic_mapping.xml:2345
+#: basic_mapping.xml:2369
 #, no-c-format
 msgid "column and formula elements"
 msgstr "字段和规则元素(column and formula elements)"
 
 #. Tag: para
-#: basic_mapping.xml:2346
+#: basic_mapping.xml:2370
 #, no-c-format
 msgid ""
 "Any mapping element which accepts a <literal>column</literal> attribute will "
@@ -4139,7 +4139,7 @@
 "换<literal>&lt;formula&gt;</literal>属性。"
 
 #. Tag: programlisting
-#: basic_mapping.xml:2352
+#: basic_mapping.xml:2376
 #, no-c-format
 msgid ""
 "<![CDATA[<column\n"
@@ -4157,13 +4157,13 @@
 msgstr ""
 
 #. Tag: programlisting
-#: basic_mapping.xml:2354
+#: basic_mapping.xml:2378
 #, no-c-format
 msgid "<![CDATA[<formula>SQL expression</formula>]]>"
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:2356
+#: basic_mapping.xml:2380
 #, no-c-format
 msgid ""
 "<literal>column</literal> and <literal>formula</literal> attributes may even "
@@ -4174,7 +4174,7 @@
 "属性或关联映射中被合并来表达,例如,一些奇异的连接条件。"
 
 #. Tag: programlisting
-#: basic_mapping.xml:2362
+#: basic_mapping.xml:2386
 #, no-c-format
 msgid ""
 "<![CDATA[<many-to-one name=\"homeAddress\" class=\"Address\"\n"
@@ -4185,13 +4185,13 @@
 msgstr ""
 
 #. Tag: title
-#: basic_mapping.xml:2367
+#: basic_mapping.xml:2391
 #, no-c-format
 msgid "import"
 msgstr "引用(import)"
 
 #. Tag: para
-#: basic_mapping.xml:2369
+#: basic_mapping.xml:2393
 #, no-c-format
 msgid ""
 "Suppose your application has two persistent classes with the same name, and "
@@ -4205,13 +4205,13 @@
 "式地“import(引用)”。你甚至可以引用没有被明确映射的类和接口。"
 
 #. Tag: programlisting
-#: basic_mapping.xml:2376
+#: basic_mapping.xml:2400
 #, no-c-format
 msgid "<![CDATA[<import class=\"java.lang.Object\" rename=\"Universe\"/>]]>"
 msgstr ""
 
 #. Tag: programlisting
-#: basic_mapping.xml:2383
+#: basic_mapping.xml:2407
 #, no-c-format
 msgid ""
 "<![CDATA[<import\n"
@@ -4221,7 +4221,7 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:2386
+#: basic_mapping.xml:2410
 #, no-c-format
 msgid ""
 "<literal>class</literal>: The fully qualified class name of of any Java "
@@ -4229,7 +4229,7 @@
 msgstr "<literal>class</literal>: 任何Java类的全限定名。"
 
 #. Tag: para
-#: basic_mapping.xml:2391
+#: basic_mapping.xml:2415
 #, no-c-format
 msgid ""
 "<literal>rename</literal> (optional - defaults to the unqualified class "
@@ -4239,13 +4239,13 @@
 "名字。"
 
 #. Tag: title
-#: basic_mapping.xml:2402
+#: basic_mapping.xml:2426
 #, no-c-format
 msgid "<title>any</title>"
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:2404
+#: basic_mapping.xml:2428
 #, no-c-format
 msgid ""
 "There is one further type of property mapping. The <literal>&lt;any&gt;</"
@@ -4264,7 +4264,7 @@
 "用它(比如,审计log,用户会话数据等等)。"
 
 #. Tag: para
-#: basic_mapping.xml:2414
+#: basic_mapping.xml:2438
 #, no-c-format
 msgid ""
 "The <literal>meta-type</literal> attribute lets the application specify a "
@@ -4278,7 +4278,7 @@
 "识符属性。 你必须指定从meta-type的值到类名的映射。"
 
 #. Tag: programlisting
-#: basic_mapping.xml:2421
+#: basic_mapping.xml:2445
 #, no-c-format
 msgid ""
 "<![CDATA[<any name=\"being\" id-type=\"long\" meta-type=\"string\">\n"
@@ -4291,7 +4291,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: basic_mapping.xml:2432
+#: basic_mapping.xml:2456
 #, no-c-format
 msgid ""
 "<![CDATA[<any\n"
@@ -4312,19 +4312,19 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:2435
+#: basic_mapping.xml:2459
 #, no-c-format
 msgid "<literal>name</literal>: the property name."
 msgstr "<literal>name</literal>: 属性名"
 
 #. Tag: para
-#: basic_mapping.xml:2440
+#: basic_mapping.xml:2464
 #, no-c-format
 msgid "<literal>id-type</literal>: the identifier type."
 msgstr "<literal>id-type</literal>: 标识符类型"
 
 #. Tag: para
-#: basic_mapping.xml:2445
+#: basic_mapping.xml:2469
 #, no-c-format
 msgid ""
 "<literal>meta-type</literal> (optional - defaults to <literal>string</"
@@ -4334,7 +4334,7 @@
 "别标志(discriminator)映射的任何类型"
 
 #. Tag: para
-#: basic_mapping.xml:2451
+#: basic_mapping.xml:2475
 #, no-c-format
 msgid ""
 "<literal>cascade</literal> (optional- defaults to <literal>none</literal>): "
@@ -4343,7 +4343,7 @@
 "<literal>cascade</literal> (可选 -默认是<literal>none</literal>): 级联的类型"
 
 #. Tag: para
-#: basic_mapping.xml:2463
+#: basic_mapping.xml:2487
 #, no-c-format
 msgid ""
 "<literal>optimistic-lock</literal> (optional - defaults to <literal>true</"
@@ -4356,19 +4356,19 @@
 "(Version)"
 
 #. Tag: title
-#: basic_mapping.xml:2478
+#: basic_mapping.xml:2502
 #, no-c-format
 msgid "Hibernate Types"
 msgstr "Hibernate 的类型"
 
 #. Tag: title
-#: basic_mapping.xml:2481
+#: basic_mapping.xml:2505
 #, no-c-format
 msgid "Entities and values"
 msgstr "实体(Entities)和值(values)"
 
 #. Tag: para
-#: basic_mapping.xml:2483
+#: basic_mapping.xml:2507
 #, no-c-format
 msgid ""
 "To understand the behaviour of various Java language-level objects with "
@@ -4377,7 +4377,7 @@
 "为了理解很多与持久化服务相关的Java语言级对象的行为,我们需要把它们分为两类:"
 
 #. Tag: para
-#: basic_mapping.xml:2488
+#: basic_mapping.xml:2512
 #, no-c-format
 msgid ""
 "An <emphasis>entity</emphasis> exists independently of any other objects "
@@ -4397,7 +4397,7 @@
 "大系统中的使用方法。实体支持循环引用和交叉引用,它们也可以加上版本信息。"
 
 #. Tag: para
-#: basic_mapping.xml:2499
+#: basic_mapping.xml:2523
 #, no-c-format
 msgid ""
 "An entity's persistent state consists of references to other entities and "
@@ -4417,7 +4417,7 @@
 "息。值没有独立的标识,所以他们不能被两个实体或者集合共享。"
 
 #. Tag: para
-#: basic_mapping.xml:2510
+#: basic_mapping.xml:2534
 #, no-c-format
 msgid ""
 "Up until now, we've been using the term \"persistent class\" to refer to "
@@ -4441,13 +4441,13 @@
 "索是共享引用指向这个类的单一实例,而组合或聚合通常被转化为值类型。"
 
 #. Tag: para
-#: basic_mapping.xml:2524
+#: basic_mapping.xml:2548
 #, no-c-format
 msgid "We'll revisit both concepts throughout the documentation."
 msgstr "我们会在本文档中重复碰到这两个概念。"
 
 #. Tag: para
-#: basic_mapping.xml:2528
+#: basic_mapping.xml:2552
 #, no-c-format
 msgid ""
 "The challenge is to map the Java type system (and the developers' definition "
@@ -4472,19 +4472,19 @@
 "们会看到这点。"
 
 #. Tag: para
-#: basic_mapping.xml:2541
+#: basic_mapping.xml:2565
 #, no-c-format
 msgid "All built-in Hibernate types except collections support null semantics."
 msgstr "所有的Hibernate内建类型,除了collections以外,都支持空(null)语义。"
 
 #. Tag: title
-#: basic_mapping.xml:2548
+#: basic_mapping.xml:2572
 #, no-c-format
 msgid "Basic value types"
 msgstr "基本值类型"
 
 #. Tag: para
-#: basic_mapping.xml:2550
+#: basic_mapping.xml:2574
 #, fuzzy, no-c-format
 msgid ""
 "The built-in <emphasis>basic mapping types</emphasis> may be roughly "
@@ -4492,7 +4492,7 @@
 msgstr "内建的 <emphasis>基本映射类型</emphasis>可以大致分为 <placeholder-1/>"
 
 #. Tag: literal
-#: basic_mapping.xml:2555
+#: basic_mapping.xml:2579
 #, no-c-format
 msgid ""
 "integer, long, short, float, double, character, byte, boolean, yes_no, "
@@ -4502,7 +4502,7 @@
 "true_false"
 
 #. Tag: para
-#: basic_mapping.xml:2558
+#: basic_mapping.xml:2582
 #, no-c-format
 msgid ""
 "Type mappings from Java primitives or wrapper classes to appropriate (vendor-"
@@ -4516,13 +4516,13 @@
 "法。"
 
 #. Tag: literal
-#: basic_mapping.xml:2567
+#: basic_mapping.xml:2591
 #, no-c-format
 msgid "string"
 msgstr "string"
 
 #. Tag: para
-#: basic_mapping.xml:2569
+#: basic_mapping.xml:2593
 #, no-c-format
 msgid ""
 "A type mapping from <literal>java.lang.String</literal> to <literal>VARCHAR</"
@@ -4532,13 +4532,13 @@
 "Oracle的 <literal>VARCHAR2</literal>)的映射。"
 
 #. Tag: literal
-#: basic_mapping.xml:2576
+#: basic_mapping.xml:2600
 #, no-c-format
 msgid "date, time, timestamp"
 msgstr "date, time, timestamp"
 
 #. Tag: para
-#: basic_mapping.xml:2578
+#: basic_mapping.xml:2602
 #, no-c-format
 msgid ""
 "Type mappings from <literal>java.util.Date</literal> and its subclasses to "
@@ -4549,13 +4549,13 @@
 "<literal>TIME</literal> 和<literal>TIMESTAMP</literal> (或等价类型)的映射。"
 
 #. Tag: literal
-#: basic_mapping.xml:2586
+#: basic_mapping.xml:2610
 #, no-c-format
 msgid "calendar, calendar_date"
 msgstr "calendar, calendar_date"
 
 #. Tag: para
-#: basic_mapping.xml:2588
+#: basic_mapping.xml:2612
 #, no-c-format
 msgid ""
 "Type mappings from <literal>java.util.Calendar</literal> to SQL types "
@@ -4565,13 +4565,13 @@
 "literal>和 <literal>DATE</literal>(或等价类型)的映射。"
 
 #. Tag: literal
-#: basic_mapping.xml:2596
+#: basic_mapping.xml:2620
 #, no-c-format
 msgid "big_decimal, big_integer"
 msgstr "big_decimal, big_integer"
 
 #. Tag: para
-#: basic_mapping.xml:2598
+#: basic_mapping.xml:2622
 #, no-c-format
 msgid ""
 "Type mappings from <literal>java.math.BigDecimal</literal> and <literal>java."
@@ -4583,13 +4583,13 @@
 "类型)的映射。"
 
 #. Tag: literal
-#: basic_mapping.xml:2606
+#: basic_mapping.xml:2630
 #, no-c-format
 msgid "locale, timezone, currency"
 msgstr "locale, timezone, currency"
 
 #. Tag: para
-#: basic_mapping.xml:2608
+#: basic_mapping.xml:2632
 #, no-c-format
 msgid ""
 "Type mappings from <literal>java.util.Locale</literal>, <literal>java.util."
@@ -4606,13 +4606,13 @@
 "literal>的实例被影射为它的<literal>ID</literal>。"
 
 #. Tag: literal
-#: basic_mapping.xml:2620
+#: basic_mapping.xml:2644
 #, fuzzy, no-c-format
 msgid "<literal>class</literal>"
 msgstr "<literal>all(全部)</literal> 检查全部字段"
 
 #. Tag: para
-#: basic_mapping.xml:2622
+#: basic_mapping.xml:2646
 #, no-c-format
 msgid ""
 "A type mapping from <literal>java.lang.Class</literal> to <literal>VARCHAR</"
@@ -4624,25 +4624,25 @@
 "射为它的全限定名。"
 
 #. Tag: literal
-#: basic_mapping.xml:2630
+#: basic_mapping.xml:2654
 #, no-c-format
 msgid "binary"
 msgstr "binary"
 
 #. Tag: para
-#: basic_mapping.xml:2632
+#: basic_mapping.xml:2656
 #, no-c-format
 msgid "Maps byte arrays to an appropriate SQL binary type."
 msgstr "把字节数组(byte arrays)映射为对应的 SQL二进制类型。"
 
 #. Tag: literal
-#: basic_mapping.xml:2638
+#: basic_mapping.xml:2662
 #, no-c-format
 msgid "text"
 msgstr "text"
 
 #. Tag: para
-#: basic_mapping.xml:2640
+#: basic_mapping.xml:2664
 #, no-c-format
 msgid ""
 "Maps long Java strings to a SQL <literal>CLOB</literal> or <literal>TEXT</"
@@ -4652,13 +4652,13 @@
 "型。"
 
 #. Tag: literal
-#: basic_mapping.xml:2647
+#: basic_mapping.xml:2671
 #, no-c-format
 msgid "serializable"
 msgstr "serializable"
 
 #. Tag: para
-#: basic_mapping.xml:2649
+#: basic_mapping.xml:2673
 #, no-c-format
 msgid ""
 "Maps serializable Java types to an appropriate SQL binary type. You may also "
@@ -4669,13 +4669,13 @@
 "型的可序列化Java类或者接口指定Hibernate类型<literal>serializable</literal>。"
 
 #. Tag: literal
-#: basic_mapping.xml:2658
+#: basic_mapping.xml:2682
 #, no-c-format
 msgid "clob, blob"
 msgstr "clob, blob"
 
 #. Tag: para
-#: basic_mapping.xml:2660
+#: basic_mapping.xml:2684
 #, no-c-format
 msgid ""
 "Type mappings for the JDBC classes <literal>java.sql.Clob</literal> and "
@@ -4688,7 +4688,7 @@
 "是无法重用的。(而且, 驱动程序对这种类型的支持充满着补丁和前后矛盾。)"
 
 #. Tag: literal
-#: basic_mapping.xml:2670
+#: basic_mapping.xml:2694
 #, no-c-format
 msgid ""
 "imm_date, imm_time, imm_timestamp, imm_calendar, imm_calendar_date, "
@@ -4698,7 +4698,7 @@
 "imm_serializable, imm_binary"
 
 #. Tag: para
-#: basic_mapping.xml:2674
+#: basic_mapping.xml:2698
 #, no-c-format
 msgid ""
 "Type mappings for what are usually considered mutable Java types, where "
@@ -4716,7 +4716,7 @@
 "个新的(不一样的)对象。"
 
 #. Tag: para
-#: basic_mapping.xml:2689
+#: basic_mapping.xml:2713
 #, no-c-format
 msgid ""
 "Unique identifiers of entities and collections may be of any basic type "
@@ -4728,7 +4728,7 @@
 "后面会说到。)"
 
 #. Tag: para
-#: basic_mapping.xml:2695
+#: basic_mapping.xml:2719
 #, no-c-format
 msgid ""
 "The basic value types have corresponding <literal>Type</literal> constants "
@@ -4741,13 +4741,13 @@
 "<literal>string</literal> 类型。"
 
 #. Tag: title
-#: basic_mapping.xml:2704
+#: basic_mapping.xml:2728
 #, no-c-format
 msgid "Custom value types"
 msgstr "自定义值类型"
 
 #. Tag: para
-#: basic_mapping.xml:2706
+#: basic_mapping.xml:2730
 #, no-c-format
 msgid ""
 "It is relatively easy for developers to create their own value types. For "
@@ -4770,7 +4770,7 @@
 "literal>。"
 
 #. Tag: para
-#: basic_mapping.xml:2717
+#: basic_mapping.xml:2741
 #, no-c-format
 msgid ""
 "To implement a custom type, implement either <literal>org.hibernate."
@@ -4785,7 +4785,7 @@
 "DoubleStringType</literal>这个例子,看看它是怎么做的。"
 
 #. Tag: programlisting
-#: basic_mapping.xml:2725
+#: basic_mapping.xml:2749
 #, no-c-format
 msgid ""
 "<![CDATA[<property name=\"twoStrings\" type=\"org.hibernate.test."
@@ -4796,7 +4796,7 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:2727
+#: basic_mapping.xml:2751
 #, no-c-format
 msgid ""
 "Notice the use of <literal>&lt;column&gt;</literal> tags to map a property "
@@ -4806,7 +4806,7 @@
 "法。"
 
 #. Tag: para
-#: basic_mapping.xml:2732
+#: basic_mapping.xml:2756
 #, no-c-format
 msgid ""
 "The <literal>CompositeUserType</literal>, <literal>EnhancedUserType</"
@@ -4819,7 +4819,7 @@
 "接口为更特殊的使用方式提供支持。"
 
 #. Tag: para
-#: basic_mapping.xml:2738
+#: basic_mapping.xml:2762
 #, no-c-format
 msgid ""
 "You may even supply parameters to a <literal>UserType</literal> in the "
@@ -4834,7 +4834,7 @@
 "使用<literal>&lt;type&gt;</literal>元素。"
 
 #. Tag: programlisting
-#: basic_mapping.xml:2746
+#: basic_mapping.xml:2770
 #, no-c-format
 msgid ""
 "<![CDATA[<property name=\"priority\">\n"
@@ -4845,7 +4845,7 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:2748
+#: basic_mapping.xml:2772
 #, no-c-format
 msgid ""
 "The <literal>UserType</literal> can now retrieve the value for the parameter "
@@ -4856,7 +4856,7 @@
 "象中得到<literal>default</literal> 参数的值。"
 
 #. Tag: para
-#: basic_mapping.xml:2753
+#: basic_mapping.xml:2777
 #, no-c-format
 msgid ""
 "If you use a certain <literal>UserType</literal> very often, it may be "
@@ -4870,7 +4870,7 @@
 "类型赋予一个名称,并且如果此类型是参数化的,还可以包含一系列默认的参数值。"
 
 #. Tag: programlisting
-#: basic_mapping.xml:2760
+#: basic_mapping.xml:2784
 #, no-c-format
 msgid ""
 "<![CDATA[<typedef class=\"com.mycompany.usertypes.DefaultValueIntegerType\" "
@@ -4880,13 +4880,13 @@
 msgstr ""
 
 #. Tag: programlisting
-#: basic_mapping.xml:2762
+#: basic_mapping.xml:2786
 #, no-c-format
 msgid "<![CDATA[<property name=\"priority\" type=\"default_zero\"/>]]>"
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:2764
+#: basic_mapping.xml:2788
 #, no-c-format
 msgid ""
 "It is also possible to override the parameters supplied in a typedef on a "
@@ -4894,7 +4894,7 @@
 msgstr "也可以根据具体案例通过属性映射中的类型参数覆盖在typedef中提供的参数。"
 
 #. Tag: para
-#: basic_mapping.xml:2769
+#: basic_mapping.xml:2793
 #, no-c-format
 msgid ""
 "Even though Hibernate's rich range of built-in types and support for "
@@ -4915,13 +4915,13 @@
 "方法时,它可以保证映射文件不需要修改。"
 
 #. Tag: title
-#: basic_mapping.xml:2785
+#: basic_mapping.xml:2809
 #, no-c-format
 msgid "Mapping a class more than once"
 msgstr "多次映射同一个类"
 
 #. Tag: para
-#: basic_mapping.xml:2786
+#: basic_mapping.xml:2810
 #, no-c-format
 msgid ""
 "It is possible to provide more than one mapping for a particular persistent "
@@ -4937,7 +4937,7 @@
 "时,允许你指定这个entity name(实体名字)。"
 
 #. Tag: programlisting
-#: basic_mapping.xml:2794
+#: basic_mapping.xml:2818
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Contract\" table=\"Contracts\"\n"
@@ -4960,7 +4960,7 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:2796
+#: basic_mapping.xml:2820
 #, no-c-format
 msgid ""
 "Notice how associations are now specified using <literal>entity-name</"
@@ -4970,13 +4970,13 @@
 "literal>的。"
 
 #. Tag: title
-#: basic_mapping.xml:2804
+#: basic_mapping.xml:2828
 #, no-c-format
 msgid "SQL quoted identifiers"
 msgstr "SQL中引号包围的标识符"
 
 #. Tag: para
-#: basic_mapping.xml:2805
+#: basic_mapping.xml:2829
 #, no-c-format
 msgid ""
 "You may force Hibernate to quote an identifier in the generated SQL by "
@@ -4991,7 +4991,7 @@
 "SQL Server中是括号,MySQL中是反向引号)。"
 
 #. Tag: programlisting
-#: basic_mapping.xml:2812
+#: basic_mapping.xml:2836
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"LineItem\" table=\"`Line Item`\">\n"
@@ -5003,13 +5003,13 @@
 msgstr ""
 
 #. Tag: title
-#: basic_mapping.xml:2818
+#: basic_mapping.xml:2842
 #, no-c-format
 msgid "Metadata alternatives"
 msgstr "其他元数据(Metadata)"
 
 #. Tag: para
-#: basic_mapping.xml:2820
+#: basic_mapping.xml:2844
 #, no-c-format
 msgid ""
 "XML isn't for everyone, and so there are some alternative ways to define O/R "
@@ -5019,13 +5019,13 @@
 "法。"
 
 #. Tag: title
-#: basic_mapping.xml:2825
+#: basic_mapping.xml:2849
 #, no-c-format
 msgid "Using XDoclet markup"
 msgstr "使用 XDoclet 标记"
 
 #. Tag: para
-#: basic_mapping.xml:2827
+#: basic_mapping.xml:2851
 #, no-c-format
 msgid ""
 "Many Hibernate users prefer to embed mapping information directly in "
@@ -5040,7 +5040,7 @@
 "类的例子。"
 
 #. Tag: programlisting
-#: basic_mapping.xml:2834
+#: basic_mapping.xml:2858
 #, no-c-format
 msgid ""
 "<![CDATA[package eg;\n"
@@ -5150,19 +5150,19 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:2836
+#: basic_mapping.xml:2860
 #, no-c-format
 msgid "See the Hibernate web site for more examples of XDoclet and Hibernate."
 msgstr "参考Hibernate网站更多的Xdoclet和Hibernate的例子"
 
 #. Tag: title
-#: basic_mapping.xml:2843
+#: basic_mapping.xml:2867
 #, no-c-format
 msgid "Using JDK 5.0 Annotations"
 msgstr "使用 JDK 5.0 的注解(Annotation)"
 
 #. Tag: para
-#: basic_mapping.xml:2845
+#: basic_mapping.xml:2869
 #, no-c-format
 msgid ""
 "JDK 5.0 introduced XDoclet-style annotations at the language level, type-"
@@ -5185,13 +5185,13 @@
 "部分下载,支持EJB3 (JSR-220)和Hibernate3的元数据。"
 
 #. Tag: para
-#: basic_mapping.xml:2856
+#: basic_mapping.xml:2880
 #, 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:2860
+#: basic_mapping.xml:2884
 #, no-c-format
 msgid ""
 "<![CDATA[@Entity(access = AccessType.FIELD)\n"
@@ -5219,7 +5219,7 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:2862
+#: basic_mapping.xml:2886
 #, no-c-format
 msgid ""
 "Note that support for JDK 5.0 Annotations (and JSR-220) is still work in "
@@ -5230,13 +5230,13 @@
 "参阅Hibernate Annotations 模块。"
 
 #. Tag: title
-#: basic_mapping.xml:2871
+#: basic_mapping.xml:2895
 #, no-c-format
 msgid "Generated Properties"
 msgstr "数据库生成属性(Generated Properties)"
 
 #. Tag: para
-#: basic_mapping.xml:2872
+#: basic_mapping.xml:2896
 #, no-c-format
 msgid ""
 "Generated properties are properties which have their values generated by the "
@@ -5255,14 +5255,14 @@
 "句,会立刻执行一条select来获得生成的值。"
 
 #. Tag: para
-#: basic_mapping.xml:2881
+#: basic_mapping.xml:2905
 #, fuzzy, no-c-format
 msgid ""
 "Properties marked as generated must additionally be non-insertable and non-"
-"updateable. Only <xref linkend=\"mapping-declaration-version\"/>versions, "
-"<xref linkend=\"mapping-declaration-timestamp\"/>timestamps, and <xref "
-"linkend=\"mapping-declaration-property\"/>simple properties can be marked as "
-"generated."
+"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 ""
 "被标明为generated的属性还必须是 non-insertable和 non-updateable的。只有<xref "
 "linkend=\"mapping-declaration-version\">versions</xref>,<xref linkend="
@@ -5271,7 +5271,7 @@
 "generated。"
 
 #. Tag: para
-#: basic_mapping.xml:2888
+#: basic_mapping.xml:2912
 #, no-c-format
 msgid ""
 "<literal>never</literal> (the default) - means that the given property value "
@@ -5279,15 +5279,15 @@
 msgstr "<literal>never</literal> (默认) 标明此属性值不是从数据库中生成。"
 
 #. Tag: para
-#: basic_mapping.xml:2892
+#: basic_mapping.xml:2916
 #, 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 "
-"<xref linkend=\"mapping-declaration-version\"/>version and <xref linkend="
-"\"mapping-declaration-timestamp\"/>timestamp properties can be marked as "
-"generated, this option is not available there..."
+"<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..."
 msgstr ""
 "<literal>insert</literal> - 标明此属性值在insert的时候生成,但是不会在随后的"
 "update时重新生成。比如说创建日期就归属于这类。注意虽然<xref linkend="
@@ -5296,7 +5296,7 @@
 "这个选项..."
 
 #. Tag: para
-#: basic_mapping.xml:2900
+#: basic_mapping.xml:2924
 #, no-c-format
 msgid ""
 "<literal>always</literal> - states that the property value is generated both "
@@ -5304,13 +5304,13 @@
 msgstr "<literal>always</literal> - 标明此属性值在insert和update时都会被生成。"
 
 #. Tag: title
-#: basic_mapping.xml:2907
+#: basic_mapping.xml:2931
 #, no-c-format
 msgid "Auxiliary Database Objects"
 msgstr "辅助数据库对象(Auxiliary Database Objects)"
 
 #. Tag: para
-#: basic_mapping.xml:2908
+#: basic_mapping.xml:2932
 #, no-c-format
 msgid ""
 "Allows CREATE and DROP of arbitrary database objects, in conjunction with "
@@ -5335,7 +5335,7 @@
 "ALTER, INSERT,等等)。本质上有两种模式来定义辅助数据库对象..."
 
 #. Tag: para
-#: basic_mapping.xml:2917
+#: basic_mapping.xml:2941
 #, no-c-format
 msgid ""
 "The first mode is to explicitly list the CREATE and DROP commands out in the "
@@ -5343,7 +5343,7 @@
 msgstr "第一种模式是在映射文件中显式声明CREATE和DROP命令:"
 
 #. Tag: programlisting
-#: basic_mapping.xml:2921
+#: basic_mapping.xml:2945
 #, no-c-format
 msgid ""
 "<![CDATA[<hibernate-mapping>\n"
@@ -5356,7 +5356,7 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:2922
+#: basic_mapping.xml:2946
 #, no-c-format
 msgid ""
 "The second mode is to supply a custom class which knows how to construct the "
@@ -5367,7 +5367,7 @@
 "现<literal>org.hibernate.mapping.AuxiliaryDatabaseObject</literal>接口。"
 
 #. Tag: programlisting
-#: basic_mapping.xml:2927
+#: basic_mapping.xml:2951
 #, no-c-format
 msgid ""
 "<![CDATA[<hibernate-mapping>\n"
@@ -5379,7 +5379,7 @@
 msgstr ""
 
 #. Tag: para
-#: basic_mapping.xml:2928
+#: basic_mapping.xml:2952
 #, no-c-format
 msgid ""
 "Additionally, these database objects can be optionally scoped such that they "
@@ -5387,7 +5387,7 @@
 msgstr "还有,这些数据库对象可以特别指定为仅在特定的方言中才使用。"
 
 #. Tag: programlisting
-#: basic_mapping.xml:2932
+#: basic_mapping.xml:2956
 #, no-c-format
 msgid ""
 "<![CDATA[<hibernate-mapping>\n"

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	2008-08-14 15:28:13 UTC (rev 15066)
+++ core/trunk/documentation/manual/src/main/docbook/zh-CN/content/batch.po	2008-08-14 15:35:40 UTC (rev 15067)
@@ -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: 2008-08-14 15:28+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,13 +11,13 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: batch.xml:5
+#: batch.xml:29
 #, no-c-format
 msgid "Batch processing"
 msgstr "批量处理(Batch processing)"
 
 #. Tag: para
-#: batch.xml:7
+#: batch.xml:31
 #, no-c-format
 msgid ""
 "A naive approach to inserting 100 000 rows in the database using Hibernate "
@@ -26,7 +26,7 @@
 "使用Hibernate将 100 000 条记录插入到数据库的一个很自然的做法可能是这样的"
 
 #. Tag: programlisting
-#: batch.xml:12
+#: batch.xml:36
 #, no-c-format
 msgid ""
 "<![CDATA[Session session = sessionFactory.openSession();\n"
@@ -40,7 +40,7 @@
 msgstr ""
 
 #. Tag: para
-#: batch.xml:14
+#: batch.xml:38
 #, no-c-format
 msgid ""
 "This would fall over with an <literal>OutOfMemoryException</literal> "
@@ -54,7 +54,7 @@
 "故。"
 
 #. Tag: para
-#: batch.xml:20
+#: batch.xml:44
 #, no-c-format
 msgid ""
 "In this chapter we'll show you how to avoid this problem. First, however, if "
@@ -67,13 +67,13 @@
 "数量(batch size)参数设置到一个合适值 (比如,10-50之间):"
 
 #. Tag: programlisting
-#: batch.xml:27
+#: batch.xml:51
 #, no-c-format
 msgid "<![CDATA[hibernate.jdbc.batch_size 20]]>"
 msgstr ""
 
 #. Tag: para
-#: batch.xml:29
+#: batch.xml:53
 #, no-c-format
 msgid ""
 "Note that Hibernate disables insert batching at the JDBC level transparently "
@@ -83,7 +83,7 @@
 "明的关闭插入语句的批量执行。"
 
 #. Tag: para
-#: batch.xml:34
+#: batch.xml:58
 #, no-c-format
 msgid ""
 "You also might like to do this kind of work in a process where interaction "
@@ -91,13 +91,13 @@
 msgstr "你也可能想在执行批量处理时关闭二级缓存:"
 
 #. Tag: programlisting
-#: batch.xml:39
+#: batch.xml:63
 #, no-c-format
 msgid "<![CDATA[hibernate.cache.use_second_level_cache false]]>"
 msgstr ""
 
 #. Tag: para
-#: batch.xml:41
+#: batch.xml:65
 #, no-c-format
 msgid ""
 "However, this is not absolutely necessary, since we can explicitly set the "
@@ -108,13 +108,13 @@
 "闭与二级缓存的交互。"
 
 #. Tag: title
-#: batch.xml:47
+#: batch.xml:71
 #, no-c-format
 msgid "Batch inserts"
 msgstr "批量插入(Batch inserts)"
 
 #. Tag: para
-#: batch.xml:49
+#: batch.xml:73
 #, no-c-format
 msgid ""
 "When making new objects persistent, you must <literal>flush()</literal> and "
@@ -125,7 +125,7 @@
 "稍后调用 <literal>clear()</literal> 来控制第一级缓存的大小。"
 
 #. Tag: programlisting
-#: batch.xml:55
+#: batch.xml:79
 #, no-c-format
 msgid ""
 "<![CDATA[Session session = sessionFactory.openSession();\n"
@@ -146,13 +146,13 @@
 msgstr ""
 
 #. Tag: title
-#: batch.xml:60
+#: batch.xml:84
 #, no-c-format
 msgid "Batch updates"
 msgstr "批量更新(Batch updates)"
 
 #. Tag: para
-#: batch.xml:62
+#: batch.xml:86
 #, no-c-format
 msgid ""
 "For retrieving and updating data the same ideas apply. In addition, you need "
@@ -163,7 +163,7 @@
 "使用 <literal>scroll()</literal> 方法以便充分利用服务器端游标所带来的好处。"
 
 #. Tag: programlisting
-#: batch.xml:68
+#: batch.xml:92
 #, no-c-format
 msgid ""
 "<![CDATA[Session session = sessionFactory.openSession();\n"
@@ -188,13 +188,13 @@
 msgstr ""
 
 #. Tag: title
-#: batch.xml:73
+#: batch.xml:97
 #, no-c-format
 msgid "The StatelessSession interface"
 msgstr "StatelessSession (无状态session)接口"
 
 #. Tag: para
-#: batch.xml:74
+#: batch.xml:98
 #, no-c-format
 msgid ""
 "Alternatively, Hibernate provides a command-oriented API that may be used "
@@ -221,7 +221,7 @@
 "session是低层的抽象,和低层JDBC相当接近。"
 
 #. Tag: programlisting
-#: batch.xml:89
+#: batch.xml:113
 #, no-c-format
 msgid ""
 "<![CDATA[StatelessSession session = sessionFactory.openStatelessSession();\n"
@@ -240,7 +240,7 @@
 msgstr ""
 
 #. Tag: para
-#: batch.xml:91
+#: batch.xml:115
 #, no-c-format
 msgid ""
 "Note that in this code example, the <literal>Customer</literal> instances "
@@ -251,7 +251,7 @@
 "(detach)。它们与任何持久化上下文都没有关系。"
 
 #. Tag: para
-#: batch.xml:97
+#: batch.xml:121
 #, no-c-format
 msgid ""
 "The <literal>insert(), update()</literal> and <literal>delete()</literal> "
@@ -270,13 +270,13 @@
 "saveOrUpdate()</literal> 和<literal>delete()</literal> 操作有很大的不同。"
 
 #. Tag: title
-#: batch.xml:110
+#: batch.xml:134
 #, no-c-format
 msgid "DML-style operations"
 msgstr "DML(数据操作语言)风格的操作(DML-style operations)"
 
 #. Tag: para
-#: batch.xml:112
+#: batch.xml:136
 #, fuzzy, no-c-format
 msgid ""
 "As already discussed, automatic and transparent object/relational mapping is "
@@ -286,8 +286,8 @@
 "<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 (<xref "
-"linkend=\"queryhql\"/>HQL)."
+"execution which are 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</"
@@ -304,7 +304,7 @@
 "的方法。"
 
 #. Tag: para
-#: batch.xml:122
+#: batch.xml:146
 #, no-c-format
 msgid ""
 "The pseudo-syntax for <literal>UPDATE</literal> and <literal>DELETE</"
@@ -316,13 +316,13 @@
 "literal> 有几点说明:"
 
 #. Tag: para
-#: batch.xml:130
+#: batch.xml:154
 #, no-c-format
 msgid "In the from-clause, the FROM keyword is optional"
 msgstr "在FROM子句(from-clause)中,FROM关键字是可选的"
 
 #. Tag: para
-#: batch.xml:135
+#: batch.xml:159
 #, no-c-format
 msgid ""
 "There can only be a single entity named in the from-clause; it can "
@@ -335,10 +335,10 @@
 "性引用都是非法的。"
 
 #. Tag: para
-#: batch.xml:143
+#: batch.xml:167
 #, fuzzy, no-c-format
 msgid ""
-"No <xref linkend=\"queryhql-joins-forms\"/>joins (either implicit or "
+"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."
 msgstr ""
@@ -347,13 +347,13 @@
 "句中使用子查询,子查询本身可以包含join。"
 
 #. Tag: para
-#: batch.xml:150
+#: batch.xml:174
 #, no-c-format
 msgid "The where-clause is also optional."
 msgstr "整个WHERE子句是可选的。"
 
 #. Tag: para
-#: batch.xml:156
+#: batch.xml:180
 #, no-c-format
 msgid ""
 "As an example, to execute an HQL <literal>UPDATE</literal>, use the "
@@ -366,7 +366,7 @@
 "<literal>PreparedStatement.executeUpdate()</literal>):"
 
 #. Tag: programlisting
-#: batch.xml:162
+#: batch.xml:186
 #, no-c-format
 msgid ""
 "<![CDATA[Session session = sessionFactory.openSession();\n"
@@ -385,12 +385,12 @@
 msgstr ""
 
 #. Tag: para
-#: batch.xml:164
+#: batch.xml:188
 #, fuzzy, no-c-format
 msgid ""
-"HQL <literal>UPDATE</literal> statements, by default do not effect the <xref "
-"linkend=\"mapping-declaration-version\"/>version or the <xref linkend="
-"\"mapping-declaration-timestamp\"/>timestamp property values for the "
+"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 "
@@ -407,7 +407,7 @@
 "现的。"
 
 #. Tag: programlisting
-#: batch.xml:174
+#: batch.xml:198
 #, no-c-format
 msgid ""
 "<![CDATA[Session session = sessionFactory.openSession();\n"
@@ -423,7 +423,7 @@
 msgstr ""
 
 #. Tag: para
-#: batch.xml:176
+#: batch.xml:200
 #, no-c-format
 msgid ""
 "Note that custom version types (<literal>org.hibernate.usertype."
@@ -434,7 +434,7 @@
 "literal>)不允许和<literal>update versioned</literal>语句联用。"
 
 #. Tag: para
-#: batch.xml:181
+#: batch.xml:205
 #, no-c-format
 msgid ""
 "To execute an HQL <literal>DELETE</literal>, use the same <literal>Query."
@@ -444,7 +444,7 @@
 "()</literal> 方法:"
 
 #. Tag: programlisting
-#: batch.xml:186
+#: batch.xml:210
 #, no-c-format
 msgid ""
 "<![CDATA[Session session = sessionFactory.openSession();\n"
@@ -460,7 +460,7 @@
 msgstr ""
 
 #. Tag: para
-#: batch.xml:188
+#: batch.xml:212
 #, no-c-format
 msgid ""
 "The <literal>int</literal> value returned by the <literal>Query.executeUpdate"
@@ -483,7 +483,7 @@
 "有继承关系的joined-subclass映射方式的子类的表。"
 
 #. Tag: para
-#: batch.xml:199
+#: batch.xml:223
 #, no-c-format
 msgid ""
 "The pseudo-syntax for <literal>INSERT</literal> statements is: "
@@ -494,7 +494,7 @@
 "properties_list select_statement</literal>. 要注意的是:"
 
 #. Tag: para
-#: batch.xml:207
+#: batch.xml:231
 #, no-c-format
 msgid ""
 "Only the INSERT INTO ... SELECT ... form is supported; not the INSERT "
@@ -503,7 +503,7 @@
 "只支持INSERT INTO ... SELECT ...形式,不支持INSERT INTO ... VALUES ...形式."
 
 #. Tag: para
-#: batch.xml:210
+#: batch.xml:234
 #, no-c-format
 msgid ""
 "The properties_list is analogous to the <literal>column speficiation</"
@@ -519,7 +519,7 @@
 "的属性无意义。换句话说,<literal>INSERT</literal>天生不支持多态。"
 
 #. Tag: para
-#: batch.xml:220
+#: batch.xml:244
 #, no-c-format
 msgid ""
 "select_statement can be any valid HQL select query, with the caveat that the "
@@ -542,7 +542,7 @@
 "可能不加区分或者可以处理这种转换。"
 
 #. Tag: para
-#: batch.xml:232
+#: batch.xml:256
 #, no-c-format
 msgid ""
 "For the id property, the insert statement gives you two options. You can "
@@ -570,7 +570,7 @@
 "它没有得到其值的途径。"
 
 #. Tag: para
-#: batch.xml:247
+#: batch.xml:271
 #, no-c-format
 msgid ""
 "For properties mapped as either <literal>version</literal> or "
@@ -587,13 +587,13 @@
 "(种子值)</literal>)。"
 
 #. Tag: para
-#: batch.xml:257
+#: batch.xml:281
 #, no-c-format
 msgid "An example HQL <literal>INSERT</literal> statement execution:"
 msgstr "执行HQL <literal>INSERT</literal>语句的例子如下:"
 
 #. Tag: programlisting
-#: batch.xml:261
+#: batch.xml:285
 #, 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	2008-08-14 15:28:13 UTC (rev 15066)
+++ core/trunk/documentation/manual/src/main/docbook/zh-CN/content/best_practices.po	2008-08-14 15:35:40 UTC (rev 15067)
@@ -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: 2008-08-14 15:28+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,13 +11,13 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: best_practices.xml:5
+#: best_practices.xml:29
 #, no-c-format
 msgid "Best Practices"
 msgstr "最佳实践(Best Practices)"
 
 #. Tag: term
-#: best_practices.xml:9
+#: best_practices.xml:33
 #, no-c-format
 msgid ""
 "Write fine-grained classes and map them using <literal>&lt;component&gt;</"
@@ -26,7 +26,7 @@
 "设计细颗粒度的持久类并且使用<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</"
@@ -39,13 +39,13 @@
 "literal>. 这将有利于代码重用和简化代码重构(refactoring)的工作。"
 
 #. Tag: term
-#: best_practices.xml:19
+#: best_practices.xml:43
 #, no-c-format
 msgid "Declare identifier properties on persistent classes."
 msgstr "对持久类声明标识符属性( identifier properties)。"
 
 #. Tag: para
-#: best_practices.xml:21
+#: best_practices.xml:45
 #, no-c-format
 msgid ""
 "Hibernate makes identifier properties optional. There are all sorts of "
@@ -56,13 +56,13 @@
 "建议标识符应该是“人造”的(自动生成,不涉及业务含义)。"
 
 #. Tag: term
-#: best_practices.xml:29
+#: best_practices.xml:53
 #, no-c-format
 msgid "Identify natural keys."
 msgstr "使用自然键(natural keys)标识"
 
 #. 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;"
@@ -75,13 +75,13 @@
 "自然键的属性进行比较。"
 
 #. Tag: term
-#: best_practices.xml:39
+#: best_practices.xml:63
 #, no-c-format
 msgid "Place each class mapping in its own file."
 msgstr "为每个持久类写一个映射文件"
 
 #. Tag: para
-#: best_practices.xml:41
+#: best_practices.xml:65
 #, no-c-format
 msgid ""
 "Don't use a single monolithic mapping document. Map <literal>com.eg.Foo</"
@@ -93,25 +93,25 @@
 "别有意义。"
 
 #. Tag: term
-#: best_practices.xml:49
+#: best_practices.xml:73
 #, 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
+#: best_practices.xml:81
 #, no-c-format
 msgid "Consider externalising query strings."
 msgstr "考虑把查询字符串放在程序外面"
 
 #. Tag: para
-#: best_practices.xml:59
+#: best_practices.xml:83
 #, no-c-format
 msgid ""
 "This is a good practice if your queries call non-ANSI-standard SQL "
@@ -122,13 +122,13 @@
 "串放在映射文件中可以让程序具有更好的可移植性。"
 
 #. Tag: term
-#: best_practices.xml:67
+#: best_practices.xml:91
 #, no-c-format
 msgid "Use bind variables."
 msgstr "使用绑定变量"
 
 #. Tag: para
-#: best_practices.xml:69
+#: best_practices.xml:93
 #, no-c-format
 msgid ""
 "As in JDBC, always replace non-constant values by \"?\". Never use string "
@@ -139,13 +139,13 @@
 "串值来构造非常量值!更好的办法是在查询中使用命名参数。"
 
 #. Tag: term
-#: best_practices.xml:77
+#: best_practices.xml:101
 #, no-c-format
 msgid "Don't manage your own JDBC connections."
 msgstr "不要自己来管理JDBC connections"
 
 #. Tag: para
-#: best_practices.xml:79
+#: best_practices.xml:103
 #, no-c-format
 msgid ""
 "Hibernate lets the application manage JDBC connections. This approach should "
@@ -158,13 +158,13 @@
 "现<literal>org.hibernate.connection.ConnectionProvider</literal>"
 
 #. Tag: term
-#: best_practices.xml:87
+#: best_practices.xml:111
 #, no-c-format
 msgid "Consider using a custom type."
 msgstr "考虑使用用户自定义类型(custom type)"
 
 #. Tag: para
-#: best_practices.xml:89
+#: best_practices.xml:113
 #, no-c-format
 msgid ""
 "Suppose you have a Java type, say from some library, that needs to be "
@@ -179,13 +179,13 @@
 "互转换。"
 
 #. Tag: term
-#: best_practices.xml:98
+#: best_practices.xml:122
 #, no-c-format
 msgid "Use hand-coded JDBC in bottlenecks."
 msgstr "在性能瓶颈的地方使用硬编码的JDBC"
 
 #. Tag: para
-#: best_practices.xml:100
+#: best_practices.xml:124
 #, no-c-format
 msgid ""
 "In performance-critical areas of the system, some kinds of operations might "
@@ -210,13 +210,13 @@
 "connection provider。"
 
 #. Tag: term
-#: best_practices.xml:110
+#: best_practices.xml:134
 #, no-c-format
 msgid "Understand <literal>Session</literal> flushing."
 msgstr "理解<literal>Session</literal>清洗( flushing)"
 
 #. Tag: para
-#: best_practices.xml:112
+#: best_practices.xml:136
 #, no-c-format
 msgid ""
 "From time to time the Session synchronizes its persistent state with the "
@@ -230,13 +230,13 @@
 "作,或者更进一步,在一个特定的transaction中改变查询和其它操作的顺序。"
 
 #. Tag: term
-#: best_practices.xml:121
+#: best_practices.xml:145
 #, no-c-format
 msgid "In a three tiered architecture, consider using detached objects."
 msgstr "在三层结构中,考虑使用托管对象(detached object)"
 
 #. Tag: para
-#: best_practices.xml:123
+#: best_practices.xml:147
 #, no-c-format
 msgid ""
 "When using a servlet / session bean architecture, you could pass persistent "
@@ -251,13 +251,13 @@
 "()</literal>来与数据库同步。"
 
 #. Tag: term
-#: best_practices.xml:132
+#: best_practices.xml:156
 #, no-c-format
 msgid "In a two tiered architecture, consider using long persistence contexts."
 msgstr "在两层结构中,考虑使用长持久上下文(long persistence contexts)."
 
 #. Tag: para
-#: best_practices.xml:134
+#: best_practices.xml:158
 #, no-c-format
 msgid ""
 "Database Transactions have to be as short as possible for best scalability. "
@@ -282,13 +282,13 @@
 "(Application Transaction)中,否则你的数据可能会过期失效。"
 
 #. Tag: term
-#: best_practices.xml:148
+#: best_practices.xml:172
 #, no-c-format
 msgid "Don't treat exceptions as recoverable."
 msgstr "不要把异常看成可恢复的"
 
 #. Tag: para
-#: best_practices.xml:150
+#: best_practices.xml:174
 #, no-c-format
 msgid ""
 "This is more of a necessary practice than a \"best\" practice. When an "
@@ -306,13 +306,13 @@
 "存在,应该使用<literal>Session.get()</literal>或者进行一次查询."
 
 #. Tag: term
-#: best_practices.xml:160
+#: best_practices.xml:184
 #, no-c-format
 msgid "Prefer lazy fetching for associations."
 msgstr "对于关联优先考虑lazy fetching"
 
 #. Tag: para
-#: best_practices.xml:162
+#: best_practices.xml:186
 #, no-c-format
 msgid ""
 "Use eager fetching sparingly. Use proxies and lazy collections for most "
@@ -331,7 +331,7 @@
 "fetch</literal>。"
 
 #. Tag: term
-#: best_practices.xml:172
+#: best_practices.xml:196
 #, no-c-format
 msgid ""
 "Use the <emphasis>open session in view</emphasis> pattern, or a disciplined "
@@ -341,7 +341,7 @@
 "配期(assembly phase)</emphasis>策略来避免再次抓取数据带来的问题"
 
 #. Tag: para
-#: best_practices.xml:177
+#: best_practices.xml:201
 #, no-c-format
 msgid ""
 "Hibernate frees the developer from writing tedious <emphasis>Data Transfer "
@@ -367,13 +367,13 @@
 "化数据访问的基本需求。"
 
 #. Tag: term
-#: best_practices.xml:191
+#: best_practices.xml:215
 #, no-c-format
 msgid "Consider abstracting your business logic from Hibernate."
 msgstr "考虑把Hibernate代码从业务逻辑代码中抽象出来"
 
 #. Tag: para
-#: best_practices.xml:193
+#: best_practices.xml:217
 #, no-c-format
 msgid ""
 "Hide (Hibernate) data-access code behind an interface. Combine the "
@@ -390,13 +390,13 @@
 "的应用程序并不适合。)"
 
 #. Tag: term
-#: best_practices.xml:203
+#: best_practices.xml:227
 #, no-c-format
 msgid "Don't use exotic association mappings."
 msgstr "不要用怪异的连接映射"
 
 #. Tag: para
-#: best_practices.xml:205
+#: best_practices.xml:229
 #, no-c-format
 msgid ""
 "Good usecases for a real many-to-many associations are rare. Most of the "
@@ -412,13 +412,13 @@
 "是否真的必须这么做。"
 
 #. Tag: term
-#: best_practices.xml:215
+#: best_practices.xml:239
 #, 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/zh-CN/content/collection_mapping.po
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/zh-CN/content/collection_mapping.po	2008-08-14 15:28:13 UTC (rev 15066)
+++ core/trunk/documentation/manual/src/main/docbook/zh-CN/content/collection_mapping.po	2008-08-14 15:35:40 UTC (rev 15067)
@@ -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: 2008-08-14 15:28+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
-#: collection_mapping.xml:5
+#: collection_mapping.xml:29
 #, no-c-format
 msgid "Collection Mapping"
 msgstr "集合类(Collections)映射"
 
 #. 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
+#: collection_mapping.xml:34
 #, no-c-format
 msgid ""
 "Hibernate requires that persistent collection-valued fields be declared as "
@@ -42,7 +42,7 @@
 "文版本的reference是惟一标准的参考资料。)"
 
 #. Tag: programlisting
-#: collection_mapping.xml:15
+#: collection_mapping.xml:39
 #, no-c-format
 msgid ""
 "<![CDATA[public class Product {\n"
@@ -57,7 +57,7 @@
 msgstr ""
 
 #. Tag: para
-#: collection_mapping.xml:17
+#: collection_mapping.xml:41
 #, no-c-format
 msgid ""
 "The actual interface might be <literal>java.util.Set</literal>, "
@@ -74,7 +74,7 @@
 "编写 <literal>org.hibernate.usertype.UserCollectionType</literal>的实现.)"
 
 #. Tag: para
-#: collection_mapping.xml:26
+#: collection_mapping.xml:50
 #, no-c-format
 msgid ""
 "Notice how we initialized the instance variable with an instance of "
@@ -92,7 +92,7 @@
 "察下面的错误:"
 
 #. Tag: programlisting
-#: collection_mapping.xml:36
+#: collection_mapping.xml:60
 #, no-c-format
 msgid ""
 "<![CDATA[Cat cat = new DomesticCat();\n"
@@ -107,7 +107,7 @@
 msgstr ""
 
 #. Tag: para
-#: collection_mapping.xml:38
+#: collection_mapping.xml:62
 #, no-c-format
 msgid ""
 "The persistent collections injected by Hibernate behave like "
@@ -120,7 +120,7 @@
 "<literal>TreeSet</literal> or <literal>ArrayList</literal>。"
 
 #. Tag: para
-#: collection_mapping.xml:45
+#: collection_mapping.xml:69
 #, no-c-format
 msgid ""
 "Collections instances have the usual behavior of value types. They are "
@@ -139,7 +139,7 @@
 "合不加区别。"
 
 #. Tag: para
-#: collection_mapping.xml:56
+#: collection_mapping.xml:80
 #, no-c-format
 msgid ""
 "You shouldn't have to worry much about any of this. Use persistent "
@@ -150,15 +150,28 @@
 "类。只是要确认你理解了双向关联的语义(后文讨论)。"
 
 #. 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
+#: 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."
+msgstr ""
+"任何值集合或者多对多关联需要专用的具有一个或多个外键字段的"
+"<emphasis>collection table</emphasis>、一个或多个<emphasis>collection "
+"element column</emphasis>,以及还可能有一个或多个索引字段。"
+
+#. 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>."
@@ -167,7 +180,7 @@
 "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,13 +237,13 @@
 msgstr ""
 
 #. Tag: para
-#: collection_mapping.xml:103
+#: collection_mapping.xml:135
 #, no-c-format
 msgid "<literal>name</literal> the collection property name"
 msgstr "<literal>name</literal> 集合属性的名称"
 
 #. Tag: para
-#: collection_mapping.xml:108
+#: collection_mapping.xml:140
 #, no-c-format
 msgid ""
 "<literal>table</literal> (optional - defaults to property name) the name of "
@@ -240,7 +253,7 @@
 "对多的关联关系中使用)"
 
 #. Tag: para
-#: collection_mapping.xml:114
+#: collection_mapping.xml:146
 #, no-c-format
 msgid ""
 "<literal>schema</literal> (optional) the name of a table schema to override "
@@ -250,7 +263,7 @@
 "schema"
 
 #. Tag: para
-#: collection_mapping.xml:120
+#: collection_mapping.xml:152
 #, no-c-format
 msgid ""
 "<literal>lazy</literal> (optional - defaults to <literal>true</literal>) may "
@@ -263,7 +276,7 @@
 "(适用于非常大的集合)"
 
 #. Tag: para
-#: collection_mapping.xml:129
+#: collection_mapping.xml:161
 #, no-c-format
 msgid ""
 "<literal>inverse</literal> (optional - defaults to <literal>false</literal>) "
@@ -273,7 +286,7 @@
 "合作为双向关联关系中的方向一端。"
 
 #. Tag: para
-#: collection_mapping.xml:135
+#: collection_mapping.xml:167
 #, no-c-format
 msgid ""
 "<literal>cascade</literal> (optional - defaults to <literal>none</literal>) "
@@ -283,7 +296,7 @@
 "子实体"
 
 #. Tag: para
-#: collection_mapping.xml:141
+#: collection_mapping.xml:173
 #, no-c-format
 msgid ""
 "<literal>sort</literal> (optional) specify a sorted collection with "
@@ -293,7 +306,7 @@
 "(<literal>natural</literal>)或者给定一个用来比较的类。"
 
 #. Tag: para
-#: collection_mapping.xml:147
+#: collection_mapping.xml:179
 #, no-c-format
 msgid ""
 "<literal>order-by</literal> (optional, JDK1.4 only) specify a table column "
@@ -305,7 +318,7 @@
 "上asc或者desc(可选), 定义Map,Set和Bag的迭代顺序"
 
 #. Tag: para
-#: collection_mapping.xml:154
+#: collection_mapping.xml:186
 #, no-c-format
 msgid ""
 "<literal>where</literal> (optional) specify an arbitrary SQL <literal>WHERE</"
@@ -317,7 +330,7 @@
 "有用)"
 
 #. Tag: para
-#: collection_mapping.xml:161
+#: collection_mapping.xml:193
 #, no-c-format
 msgid ""
 "<literal>fetch</literal> (optional, defaults to <literal>select</literal>) "
@@ -328,7 +341,7 @@
 "抓取、通过后续select抓取和通过后续subselect抓取之间选择。"
 
 #. Tag: para
-#: collection_mapping.xml:168
+#: collection_mapping.xml:200
 #, no-c-format
 msgid ""
 "<literal>batch-size</literal> (optional, defaults to <literal>1</literal>) "
@@ -338,7 +351,7 @@
 "加载取得集合实例的批处理块大小(\"batch size\")。"
 
 #. Tag: para
-#: collection_mapping.xml:174
+#: collection_mapping.xml:206
 #, no-c-format
 msgid ""
 "<literal>access</literal> (optional - defaults to <literal>property</"
@@ -349,7 +362,7 @@
 "使用的策略"
 
 #. Tag: para
-#: collection_mapping.xml:180
+#: collection_mapping.xml:212
 #, no-c-format
 msgid ""
 "<literal>optimistic-lock</literal> (optional - defaults to <literal>true</"
@@ -362,7 +375,7 @@
 "常是有理的)"
 
 #. Tag: para
-#: collection_mapping.xml:188
+#: collection_mapping.xml:220
 #, no-c-format
 msgid ""
 "<literal>mutable</literal> (optional - defaults to <literal>true</literal>): "
@@ -374,13 +387,13 @@
 "些小的性能优化)。"
 
 #. 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
+#: collection_mapping.xml:232
 #, no-c-format
 msgid ""
 "Collection instances are distinguished in the database by the foreign key of "
@@ -394,7 +407,7 @@
 "字段通过<literal>&lt;key&gt;</literal> 元素映射。"
 
 #. Tag: para
-#: collection_mapping.xml:208
+#: collection_mapping.xml:240
 #, no-c-format
 msgid ""
 "There may be a nullability constraint on the foreign key column. For most "
@@ -407,26 +420,26 @@
 "\"</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
+#: collection_mapping.xml:249
 #, no-c-format
 msgid ""
 "The foreign key constraint may 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;</"
@@ -434,13 +447,13 @@
 msgstr "对<literal>&lt;key&gt;</literal> 元素的完整定义,请参阅前面的章节。"
 
 #. 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
+#: collection_mapping.xml:265
 #, no-c-format
 msgid ""
 "Collections may contain almost any other Hibernate type, including all basic "
@@ -458,7 +471,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</"
@@ -475,13 +488,13 @@
 "literal>映射。前两种用于使用值语义映射元素,后两种用于映射实体关联。"
 
 #. 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
+#: collection_mapping.xml:288
 #, no-c-format
 msgid ""
 "All collection mappings, except those with set and bag semantics, need an "
@@ -507,7 +520,7 @@
 "始)。"
 
 #. Tag: sect2
-#: collection_mapping.xml:267
+#: collection_mapping.xml:299
 #, no-c-format
 msgid ""
 "<programlistingco> <areaspec> <area id=\"index1\" coords=\"2 45\"/> <area id="
@@ -553,7 +566,7 @@
 msgstr ""
 
 #. Tag: para
-#: collection_mapping.xml:348
+#: collection_mapping.xml:380
 #, no-c-format
 msgid ""
 "If your table doesn't have an index column, and you still wish to use "
@@ -564,27 +577,14 @@
 msgstr ""
 "值集合于多对多关联(Collections of values and many-to-many associations)"
 
-#. 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 ""
-"任何值集合或者多对多关联需要专用的具有一个或多个外键字段的"
-"<emphasis>collection table</emphasis>、一个或多个<emphasis>collection "
-"element column</emphasis>,以及还可能有一个或多个索引字段。"
-
 #. Tag: title
-#: collection_mapping.xml:364
+#: collection_mapping.xml:390
 #, no-c-format
 msgid "Collections of values and many-to-many associations"
 msgstr "对于一个值集合, 我们使用<literal>&lt;element&gt;</literal>标签。"
 
 #. Tag: para
-#: collection_mapping.xml:366
+#: collection_mapping.xml:392
 #, no-c-format
 msgid ""
 "Any collection of values or many-to-many association requires a dedicated "
@@ -594,7 +594,7 @@
 msgstr "<literal>column</literal>(可选):保存集合元素值的字段名。"
 
 #. Tag: para
-#: collection_mapping.xml:373
+#: collection_mapping.xml:399
 #, no-c-format
 msgid ""
 "For a collection of values, we use the <literal>&lt;element&gt;</literal> "
@@ -602,7 +602,7 @@
 msgstr "<literal>formula</literal> (可选): 用于计算元素的SQL公式"
 
 #. Tag: sect2
-#: collection_mapping.xml:375
+#: collection_mapping.xml:401
 #, no-c-format
 msgid ""
 "<programlistingco> <areaspec> <area id=\"element1b\" coords=\"2 50\"/> <area "
@@ -673,14 +673,14 @@
 msgstr ""
 
 #. Tag: para
-#: collection_mapping.xml:480
+#: collection_mapping.xml:506
 #, no-c-format
 msgid "Some examples, first, a set of strings:"
 msgstr ""
 "包含一组整数的bag(还设置了<literal>order-by</literal>参数指定了迭代的顺序):"
 
 #. Tag: programlisting
-#: collection_mapping.xml:484
+#: collection_mapping.xml:510
 #, no-c-format
 msgid ""
 "<![CDATA[<set name=\"names\" table=\"person_names\">\n"
@@ -690,7 +690,7 @@
 msgstr ""
 
 #. Tag: para
-#: collection_mapping.xml:486
+#: collection_mapping.xml:512
 #, no-c-format
 msgid ""
 "A bag containing integers (with an iteration order determined by the "
@@ -700,7 +700,7 @@
 "的对象(life cycle objects),<literal>cascade=\"all\"</literal>):"
 
 #. Tag: programlisting
-#: collection_mapping.xml:491
+#: collection_mapping.xml:517
 #, no-c-format
 msgid ""
 "<![CDATA[<bag name=\"sizes\" \n"
@@ -712,13 +712,13 @@
 msgstr ""
 
 #. Tag: para
-#: collection_mapping.xml:493
+#: collection_mapping.xml:519
 #, no-c-format
 msgid "An array of entities - in this case, a many to many association:"
 msgstr "一个map,通过字符串的索引来指明日期:"
 
 #. Tag: programlisting
-#: collection_mapping.xml:497
+#: collection_mapping.xml:523
 #, no-c-format
 msgid ""
 "<![CDATA[<array name=\"addresses\" \n"
@@ -731,13 +731,13 @@
 msgstr ""
 
 #. Tag: para
-#: collection_mapping.xml:499
+#: collection_mapping.xml:525
 #, no-c-format
 msgid "A map from string indices to dates:"
 msgstr "一个组件的列表:(下一章讨论)"
 
 #. Tag: programlisting
-#: collection_mapping.xml:503
+#: collection_mapping.xml:529
 #, no-c-format
 msgid ""
 "<![CDATA[<map name=\"holidays\" \n"
@@ -751,13 +751,13 @@
 msgstr ""
 
 #. Tag: para
-#: collection_mapping.xml:505
+#: collection_mapping.xml:531
 #, no-c-format
 msgid "A list of components (discussed in the next chapter):"
 msgstr "一对多关联(One-to-many Associations)"
 
 #. Tag: programlisting
-#: collection_mapping.xml:509
+#: collection_mapping.xml:535
 #, no-c-format
 msgid ""
 "<![CDATA[<list name=\"carComponents\" \n"
@@ -773,7 +773,7 @@
 msgstr ""
 
 #. Tag: title
-#: collection_mapping.xml:514
+#: collection_mapping.xml:540
 #, no-c-format
 msgid "One-to-many associations"
 msgstr ""
@@ -781,7 +781,7 @@
 "表,而没有中间集合表。 这个关系模型失去了一些Java集合的语义:"
 
 #. Tag: para
-#: collection_mapping.xml:516
+#: collection_mapping.xml:542
 #, no-c-format
 msgid ""
 "A <emphasis>one to many association</emphasis> links the tables of two "
@@ -790,7 +790,7 @@
 msgstr "一个被包含的实体的实例只能被包含在一个集合的实例中"
 
 #. Tag: para
-#: collection_mapping.xml:524
+#: collection_mapping.xml:550
 #, no-c-format
 msgid ""
 "An instance of the contained entity class may not belong to more than one "
@@ -798,7 +798,7 @@
 msgstr "一个被包含的实体的实例只能对应于集合索引的一个值中"
 
 #. Tag: para
-#: collection_mapping.xml:530
+#: collection_mapping.xml:556
 #, no-c-format
 msgid ""
 "An instance of the contained entity class may not appear at more than one "
@@ -809,7 +809,7 @@
 "one-to-many&gt;</literal>标记指明了一个一对多的关联。"
 
 #. Tag: para
-#: collection_mapping.xml:537
+#: collection_mapping.xml:563
 #, no-c-format
 msgid ""
 "An association from <literal>Product</literal> to <literal>Part</literal> "
@@ -819,7 +819,7 @@
 msgstr "<literal>class</literal>(必须):被关联类的名称。"
 
 #. Tag: programlisting
-#: collection_mapping.xml:550
+#: collection_mapping.xml:576
 #, no-c-format
 msgid ""
 "<![CDATA[<one-to-many \n"
@@ -832,7 +832,7 @@
 msgstr ""
 
 #. Tag: para
-#: collection_mapping.xml:553
+#: collection_mapping.xml:579
 #, fuzzy, no-c-format
 msgid "<literal>class</literal> (required): The name of the associated class."
 msgstr ""
@@ -847,7 +847,7 @@
 "行作为一个空关联处理。"
 
 #. Tag: para
-#: collection_mapping.xml:558
+#: collection_mapping.xml:584
 #, no-c-format
 msgid ""
 "<literal>not-found</literal> (optional - defaults to <literal>exception</"
@@ -859,7 +859,7 @@
 "<literal>class</literal>的替代。"
 
 #. Tag: para
-#: collection_mapping.xml:565
+#: collection_mapping.xml:591
 #, fuzzy, no-c-format
 msgid ""
 "<literal>entity-name</literal> (optional): The entity name of the associated "
@@ -872,7 +872,7 @@
 "例子"
 
 #. Tag: para
-#: collection_mapping.xml:573
+#: collection_mapping.xml:599
 #, no-c-format
 msgid ""
 "Notice that the <literal>&lt;one-to-many&gt;</literal> element does not need "
@@ -883,7 +883,7 @@
 "指定表名。"
 
 #. Tag: para
-#: collection_mapping.xml:579
+#: collection_mapping.xml:605
 #, no-c-format
 msgid ""
 "<emphasis>Very important note:</emphasis> If the foreign key column of a "
@@ -901,7 +901,7 @@
 "关联的讨论。"
 
 #. Tag: para
-#: collection_mapping.xml:588
+#: collection_mapping.xml:614
 #, no-c-format
 msgid ""
 "This example shows a map of <literal>Part</literal> entities by name (where "
@@ -913,7 +913,7 @@
 "中的基于公式的索引的用法。"
 
 #. Tag: programlisting
-#: collection_mapping.xml:594
+#: collection_mapping.xml:620
 #, no-c-format
 msgid ""
 "<![CDATA[<map name=\"parts\"\n"
@@ -925,19 +925,19 @@
 msgstr ""
 
 #. Tag: title
-#: collection_mapping.xml:600
+#: collection_mapping.xml:626
 #, no-c-format
 msgid "Advanced collection mappings"
 msgstr "高级集合映射(Advanced collection mappings)"
 
 #. Tag: title
-#: collection_mapping.xml:603
+#: collection_mapping.xml:629
 #, no-c-format
 msgid "Sorted collections"
 msgstr "有序集合(Sorted collections)"
 
 #. Tag: para
-#: collection_mapping.xml:605
+#: collection_mapping.xml:631
 #, no-c-format
 msgid ""
 "Hibernate supports collections implementing <literal>java.util.SortedMap</"
@@ -948,7 +948,7 @@
 "SortedSet</literal>的集合。 你必须在映射文件中指定一个比较器:"
 
 #. Tag: programlisting
-#: collection_mapping.xml:610
+#: collection_mapping.xml:636
 #, no-c-format
 msgid ""
 "<![CDATA[<set name=\"aliases\" \n"
@@ -966,7 +966,7 @@
 msgstr ""
 
 #. Tag: para
-#: collection_mapping.xml:612
+#: collection_mapping.xml:638
 #, no-c-format
 msgid ""
 "Allowed values of the <literal>sort</literal> attribute are "
@@ -978,7 +978,7 @@
 "的类的名称。"
 
 #. Tag: para
-#: collection_mapping.xml:618
+#: collection_mapping.xml:644
 #, no-c-format
 msgid ""
 "Sorted collections actually behave like <literal>java.util.TreeSet</literal> "
@@ -988,7 +988,7 @@
 "util.TreeMap</literal>。"
 
 #. Tag: para
-#: collection_mapping.xml:623
+#: collection_mapping.xml:649
 #, no-c-format
 msgid ""
 "If you want the database itself to order the collection elements use the "
@@ -1005,7 +1005,7 @@
 "中。"
 
 #. Tag: programlisting
-#: collection_mapping.xml:632
+#: collection_mapping.xml:658
 #, no-c-format
 msgid ""
 "<![CDATA[<set name=\"aliases\" table=\"person_aliases\" order-by=\"lower"
@@ -1022,7 +1022,7 @@
 msgstr ""
 
 #. Tag: para
-#: collection_mapping.xml:634
+#: collection_mapping.xml:660
 #, no-c-format
 msgid ""
 "Note that the value of the <literal>order-by</literal> attribute is an SQL "
@@ -1031,7 +1031,7 @@
 "注意: 这个<literal>order-by</literal>属性的值是一个SQL排序子句而不是HQL的!"
 
 #. Tag: para
-#: collection_mapping.xml:639
+#: collection_mapping.xml:665
 #, no-c-format
 msgid ""
 "Associations may even be sorted by some arbitrary criteria at runtime using "
@@ -1040,7 +1040,7 @@
 "关联还可以在运行时使用集合<literal>filter()</literal>根据任意的条件来排序。"
 
 #. Tag: programlisting
-#: collection_mapping.xml:644
+#: collection_mapping.xml:670
 #, no-c-format
 msgid ""
 "<![CDATA[sortedUsers = s.createFilter( group.getUsers(), \"order by this.name"
@@ -1048,13 +1048,13 @@
 msgstr ""
 
 #. Tag: title
-#: collection_mapping.xml:649
+#: collection_mapping.xml:675
 #, no-c-format
 msgid "Bidirectional associations"
 msgstr "双向关联(Bidirectional associations)"
 
 #. Tag: para
-#: collection_mapping.xml:651
+#: collection_mapping.xml:677
 #, fuzzy, no-c-format
 msgid ""
 "A <emphasis>bidirectional association</emphasis> allows navigation from both "
@@ -1065,31 +1065,31 @@
 "中, 支持两种类型的双向关联: <placeholder-1/>"
 
 #. Tag: term
-#: collection_mapping.xml:658
+#: collection_mapping.xml:684
 #, no-c-format
 msgid "one-to-many"
 msgstr "一对多(one-to-many)"
 
 #. Tag: para
-#: collection_mapping.xml:660
+#: collection_mapping.xml:686
 #, no-c-format
 msgid "set or bag valued at one end, single-valued at the other"
 msgstr "Set或者bag值在一端, 单独值(非集合)在另外一端"
 
 #. Tag: term
-#: collection_mapping.xml:666
+#: collection_mapping.xml:692
 #, no-c-format
 msgid "many-to-many"
 msgstr "多对多(many-to-many)"
 
 #. Tag: para
-#: collection_mapping.xml:668
+#: collection_mapping.xml:694
 #, no-c-format
 msgid "set or bag valued at both ends"
 msgstr "两端都是set或bag值"
 
 #. Tag: para
-#: collection_mapping.xml:677
+#: collection_mapping.xml:703
 #, no-c-format
 msgid ""
 "You may specify a bidirectional many-to-many association simply by mapping "
@@ -1102,7 +1102,7 @@
 "择,但它不能是一个索引集合)。"
 
 #. Tag: para
-#: collection_mapping.xml:684
+#: collection_mapping.xml:710
 #, no-c-format
 msgid ""
 "Here's an example of a bidirectional many-to-many association; each category "
@@ -1112,7 +1112,7 @@
 "items可以属于很多categories:"
 
 #. Tag: programlisting
-#: collection_mapping.xml:689
+#: collection_mapping.xml:715
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Category\">\n"
@@ -1137,7 +1137,7 @@
 msgstr ""
 
 #. Tag: para
-#: collection_mapping.xml:691
+#: collection_mapping.xml:717
 #, no-c-format
 msgid ""
 "Changes made only to the inverse end of the association are <emphasis>not</"
@@ -1152,7 +1152,7 @@
 "让你更容易理解:"
 
 #. Tag: programlisting
-#: collection_mapping.xml:699
+#: collection_mapping.xml:725
 #, no-c-format
 msgid ""
 "<![CDATA[\n"
@@ -1167,7 +1167,7 @@
 msgstr ""
 
 #. Tag: para
-#: collection_mapping.xml:701
+#: collection_mapping.xml:727
 #, no-c-format
 msgid ""
 "The non-inverse side is used to save the in-memory representation to the "
@@ -1175,7 +1175,7 @@
 msgstr "非反向端用于把内存中的表示保存到数据库中。"
 
 #. Tag: para
-#: collection_mapping.xml:705
+#: collection_mapping.xml:731
 #, no-c-format
 msgid ""
 "You may define a bidirectional one-to-many association by mapping a one-to-"
@@ -1187,7 +1187,7 @@
 "literal>。"
 
 #. Tag: programlisting
-#: collection_mapping.xml:711
+#: collection_mapping.xml:737
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Parent\">\n"
@@ -1210,7 +1210,7 @@
 msgstr ""
 
 #. Tag: para
-#: collection_mapping.xml:713
+#: collection_mapping.xml:739
 #, no-c-format
 msgid ""
 "Mapping one end of an association with <literal>inverse=\"true\"</literal> "
@@ -1220,13 +1220,13 @@
 "交的概念!"
 
 #. Tag: title
-#: collection_mapping.xml:721
+#: collection_mapping.xml:747
 #, no-c-format
 msgid "Bidirectional associations with indexed collections"
 msgstr "双向关联,涉及有序集合类"
 
 #. Tag: para
-#: collection_mapping.xml:722
+#: collection_mapping.xml:748
 #, no-c-format
 msgid ""
 "A bidirectional association where one end is represented as a <literal>&lt;"
@@ -1240,7 +1240,7 @@
 "们仍然可以在集合类映射上使用<literal>inverse=\"true\"</literal>:"
 
 #. Tag: programlisting
-#: collection_mapping.xml:729
+#: collection_mapping.xml:755
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Parent\">\n"
@@ -1267,7 +1267,7 @@
 msgstr ""
 
 #. Tag: para
-#: collection_mapping.xml:731
+#: collection_mapping.xml:757
 #, no-c-format
 msgid ""
 "But, if there is no such property on the child class, we can't think of the "
@@ -1281,7 +1281,7 @@
 "<literal>inverse=\"true\"</literal>。我们需要这样用:"
 
 #. Tag: programlisting
-#: collection_mapping.xml:738
+#: collection_mapping.xml:764
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Parent\">\n"
@@ -1309,7 +1309,7 @@
 msgstr ""
 
 #. Tag: para
-#: collection_mapping.xml:740
+#: collection_mapping.xml:766
 #, no-c-format
 msgid ""
 "Note that in this mapping, the collection-valued end of the association is "
@@ -1320,13 +1320,13 @@
 "really result in some unnecessary update statements?"
 
 #. Tag: title
-#: collection_mapping.xml:748
+#: collection_mapping.xml:774
 #, no-c-format
 msgid "Ternary associations"
 msgstr "三重关联(Ternary associations)"
 
 #. Tag: para
-#: collection_mapping.xml:750
+#: collection_mapping.xml:776
 #, no-c-format
 msgid ""
 "There are three possible approaches to mapping a ternary association. One is "
@@ -1336,7 +1336,7 @@
 "把一个关联作为其索引:"
 
 #. Tag: programlisting
-#: collection_mapping.xml:755
+#: collection_mapping.xml:781
 #, no-c-format
 msgid ""
 "<![CDATA[<map name=\"contracts\">\n"
@@ -1347,7 +1347,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: collection_mapping.xml:757
+#: collection_mapping.xml:783
 #, no-c-format
 msgid ""
 "<![CDATA[<map name=\"connections\">\n"
@@ -1358,7 +1358,7 @@
 msgstr ""
 
 #. Tag: para
-#: collection_mapping.xml:759
+#: collection_mapping.xml:785
 #, no-c-format
 msgid ""
 "A second approach is to simply remodel the association as an entity class. "
@@ -1367,7 +1367,7 @@
 "第二种方法是简单的把关联重新建模为一个实体类。这使我们最经常使用的方法。"
 
 #. Tag: para
-#: collection_mapping.xml:764
+#: collection_mapping.xml:790
 #, no-c-format
 msgid ""
 "A final alternative is to use composite elements, which we will discuss "
@@ -1375,13 +1375,13 @@
 msgstr "最后一种选择是使用复合元素,我们会在后面讨论"
 
 #. Tag: literal
-#: collection_mapping.xml:771
+#: collection_mapping.xml:797
 #, no-c-format
 msgid "Using an &lt;idbag&gt;"
 msgstr "使用&lt;idbag&gt;"
 
 #. Tag: para
-#: collection_mapping.xml:773
+#: collection_mapping.xml:799
 #, no-c-format
 msgid ""
 "If you've fully embraced our view that composite keys are a bad thing and "
@@ -1403,7 +1403,7 @@
 "个使用代用标识符的表去。"
 
 #. Tag: para
-#: collection_mapping.xml:784
+#: collection_mapping.xml:810
 #, no-c-format
 msgid ""
 "The <literal>&lt;idbag&gt;</literal> element lets you map a <literal>List</"
@@ -1413,7 +1413,7 @@
 "literal> (或<literal>Collection</literal>)。"
 
 #. Tag: programlisting
-#: collection_mapping.xml:789
+#: collection_mapping.xml:815
 #, no-c-format
 msgid ""
 "<![CDATA[<idbag name=\"lovers\" table=\"LOVERS\">\n"
@@ -1426,7 +1426,7 @@
 msgstr ""
 
 #. Tag: para
-#: collection_mapping.xml:791
+#: collection_mapping.xml:817
 #, no-c-format
 msgid ""
 "As you can see, an <literal>&lt;idbag&gt;</literal> has a synthetic id "
@@ -1439,7 +1439,7 @@
 "你取得某个特定行的人造关键字。"
 
 #. Tag: para
-#: collection_mapping.xml:798
+#: collection_mapping.xml:824
 #, no-c-format
 msgid ""
 "Note that the update performance of an <literal>&lt;idbag&gt;</literal> is "
@@ -1452,7 +1452,7 @@
 "就如同处理一个list, map或者set一样。"
 
 #. Tag: para
-#: collection_mapping.xml:805
+#: collection_mapping.xml:831
 #, no-c-format
 msgid ""
 "In the current implementation, the <literal>native</literal> identifier "
@@ -1463,13 +1463,13 @@
 "<literal>&lt;idbag&gt;</literal>集合的标识符。"
 
 #. Tag: title
-#: collection_mapping.xml:829
+#: collection_mapping.xml:855
 #, no-c-format
 msgid "Collection examples"
 msgstr "集合例子(Collection example)"
 
 #. Tag: para
-#: collection_mapping.xml:831
+#: collection_mapping.xml:857
 #, no-c-format
 msgid ""
 "The previous sections are pretty confusing. So lets look at an example. This "
@@ -1477,7 +1477,7 @@
 msgstr "在前面的几个章节的确非常令人迷惑。 因此让我们来看一个例子。这个类:"
 
 #. Tag: programlisting
-#: collection_mapping.xml:836
+#: collection_mapping.xml:862
 #, no-c-format
 msgid ""
 "<![CDATA[package eg;\n"
@@ -1499,7 +1499,7 @@
 msgstr ""
 
 #. Tag: para
-#: collection_mapping.xml:838
+#: collection_mapping.xml:864
 #, no-c-format
 msgid ""
 "has a collection of <literal>Child</literal> instances. If each child has at "
@@ -1509,7 +1509,7 @@
 "实例, 那么最自然的映射是一个one-to-many的关联关系:"
 
 #. Tag: programlisting
-#: collection_mapping.xml:844
+#: collection_mapping.xml:870
 #, no-c-format
 msgid ""
 "<![CDATA[<hibernate-mapping>\n"
@@ -1535,13 +1535,13 @@
 msgstr ""
 
 #. Tag: para
-#: collection_mapping.xml:846
+#: collection_mapping.xml:872
 #, no-c-format
 msgid "This maps to the following table definitions:"
 msgstr "在以下的表定义中反应了这个映射关系:"
 
 #. Tag: programlisting
-#: collection_mapping.xml:850
+#: collection_mapping.xml:876
 #, no-c-format
 msgid ""
 "<![CDATA[create table parent ( id bigint not null primary key )\n"
@@ -1551,7 +1551,7 @@
 msgstr ""
 
 #. Tag: para
-#: collection_mapping.xml:852
+#: collection_mapping.xml:878
 #, no-c-format
 msgid ""
 "If the parent is <emphasis>required</emphasis>, use a bidirectional one-to-"
@@ -1561,7 +1561,7 @@
 "了:"
 
 #. Tag: programlisting
-#: collection_mapping.xml:857
+#: collection_mapping.xml:883
 #, no-c-format
 msgid ""
 "<![CDATA[<hibernate-mapping>\n"
@@ -1589,13 +1589,13 @@
 msgstr ""
 
 #. Tag: para
-#: collection_mapping.xml:859
+#: collection_mapping.xml:885
 #, 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:889
 #, no-c-format
 msgid ""
 "<![CDATA[create table parent ( id bigint not null primary key )\n"
@@ -1607,7 +1607,7 @@
 msgstr ""
 
 #. Tag: para
-#: collection_mapping.xml:865
+#: collection_mapping.xml:891
 #, no-c-format
 msgid ""
 "Alternatively, if you absolutely insist that this association should be "
@@ -1618,7 +1618,7 @@
 "literal>映射声明<literal>NOT NULL</literal>约束:"
 
 #. Tag: programlisting
-#: collection_mapping.xml:871
+#: collection_mapping.xml:897
 #, no-c-format
 msgid ""
 "<![CDATA[<hibernate-mapping>\n"
@@ -1644,7 +1644,7 @@
 msgstr ""
 
 #. Tag: para
-#: collection_mapping.xml:873
+#: collection_mapping.xml:899
 #, no-c-format
 msgid ""
 "On the other hand, if a child might have multiple parents, a many-to-many "
@@ -1653,7 +1653,7 @@
 "另外一方面,如果一个子实例可能有多个父实例, 那么就应该使用many-to-many关联:"
 
 #. Tag: programlisting
-#: collection_mapping.xml:878
+#: collection_mapping.xml:904
 #, no-c-format
 msgid ""
 "<![CDATA[<hibernate-mapping>\n"
@@ -1679,13 +1679,13 @@
 msgstr ""
 
 #. Tag: para
-#: collection_mapping.xml:880
+#: collection_mapping.xml:906
 #, no-c-format
 msgid "Table definitions:"
 msgstr "表定义:"
 
 #. Tag: programlisting
-#: collection_mapping.xml:884
+#: collection_mapping.xml:910
 #, no-c-format
 msgid ""
 "<![CDATA[create table parent ( id bigint not null primary key )\n"
@@ -1700,7 +1700,7 @@
 msgstr ""
 
 #. Tag: para
-#: collection_mapping.xml:886
+#: collection_mapping.xml:912
 #, no-c-format
 msgid ""
 "For more examples and a complete walk-through a parent/child relationship "
@@ -1710,7 +1710,7 @@
 "parentchild\"/>."
 
 #. Tag: para
-#: collection_mapping.xml:891
+#: collection_mapping.xml:917
 #, no-c-format
 msgid ""
 "Even more exotic association mappings are possible, we will catalog all "

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	2008-08-14 15:28:13 UTC (rev 15066)
+++ core/trunk/documentation/manual/src/main/docbook/zh-CN/content/events.po	2008-08-14 15:35:40 UTC (rev 15067)
@@ -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: 2008-08-14 15:28+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,13 +11,13 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: events.xml:5
+#: events.xml:29
 #, no-c-format
 msgid "Interceptors and events"
 msgstr "拦截器与事件(Interceptors and events)"
 
 #. Tag: para
-#: events.xml:7
+#: events.xml:31
 #, no-c-format
 msgid ""
 "It is often useful for the application to react to certain events that occur "
@@ -28,13 +28,13 @@
 "用的功能 以及允许对Hibernate功能进行扩展。"
 
 #. Tag: title
-#: events.xml:14
+#: events.xml:38
 #, no-c-format
 msgid "Interceptors"
 msgstr "拦截器(Interceptors)"
 
 #. Tag: para
-#: events.xml:16
+#: events.xml:40
 #, no-c-format
 msgid ""
 "The <literal>Interceptor</literal> interface provides callbacks from the "
@@ -57,7 +57,7 @@
 "性。"
 
 #. Tag: para
-#: events.xml:27
+#: events.xml:51
 #, no-c-format
 msgid ""
 "You may either implement <literal>Interceptor</literal> directly or (better) "
@@ -67,7 +67,7 @@
 "<literal>EmptyInterceptor</literal>。"
 
 #. Tag: programlisting
-#: events.xml:32
+#: events.xml:56
 #, no-c-format
 msgid ""
 "<![CDATA[package org.hibernate.test;\n"
@@ -156,7 +156,7 @@
 msgstr ""
 
 #. Tag: para
-#: events.xml:34
+#: events.xml:58
 #, no-c-format
 msgid ""
 "Interceptors come in two flavors: <literal>Session</literal>-scoped and "
@@ -166,7 +166,7 @@
 "<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 "
@@ -178,13 +178,13 @@
 "范围内的拦截器。"
 
 #. 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
+#: events.xml:71
 #, no-c-format
 msgid ""
 "A <literal>SessionFactory</literal>-scoped interceptor is registered with "
@@ -204,20 +204,20 @@
 "session可能并发使用这个拦截器,要因此小心不要保存与session相关的状态。"
 
 #. 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 "事件系统(Event system)"
 
 #. Tag: para
-#: events.xml:63
+#: events.xml:87
 #, no-c-format
 msgid ""
 "If you have to react to particular events in your persistence layer, you may "
@@ -228,7 +228,7 @@
 "统可以用来替代拦截器,也可以作为拦截器的补充来使用。"
 
 #. Tag: para
-#: events.xml:69
+#: events.xml:93
 #, no-c-format
 msgid ""
 "Essentially all of the methods of the <literal>Session</literal> interface "
@@ -258,7 +258,7 @@
 "<literal>Session</literal>的<literal>load()</literal>方法的请求。"
 
 #. Tag: para
-#: events.xml:84
+#: events.xml:108
 #, no-c-format
 msgid ""
 "The listeners should be considered effectively singletons; meaning, they are "
@@ -269,7 +269,7 @@
 "一个监听器实例,因此监听器 不应该保存任何状态(也就是不应该使用成员变量)。"
 
 #. Tag: para
-#: events.xml:89
+#: events.xml:113
 #, no-c-format
 msgid ""
 "A custom listener should implement the appropriate interface for the event "
@@ -289,7 +289,7 @@
 "定制的加载事件(load event)的监听器:"
 
 #. Tag: programlisting
-#: events.xml:99
+#: events.xml:123
 #, no-c-format
 msgid ""
 "<![CDATA[public class MyLoadListener implements LoadEventListener {\n"
@@ -306,7 +306,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 "
@@ -316,7 +316,7 @@
 "器。"
 
 #. Tag: programlisting
-#: events.xml:106
+#: events.xml:130
 #, no-c-format
 msgid ""
 "<![CDATA[<hibernate-configuration>\n"
@@ -332,13 +332,13 @@
 msgstr ""
 
 #. Tag: para
-#: events.xml:108
+#: events.xml:132
 #, no-c-format
 msgid "Instead, you may register it programmatically:"
 msgstr "看看用另一种方式,通过编程的方式来注册它。"
 
 #. Tag: programlisting
-#: events.xml:112
+#: events.xml:136
 #, no-c-format
 msgid ""
 "<![CDATA[Configuration cfg = new Configuration();\n"
@@ -348,7 +348,7 @@
 msgstr ""
 
 #. Tag: para
-#: events.xml:114
+#: events.xml:138
 #, no-c-format
 msgid ""
 "Listeners registered declaratively cannot share instances. If the same class "
@@ -363,7 +363,7 @@
 "程的方式来进行注册。"
 
 #. Tag: para
-#: events.xml:122
+#: events.xml:146
 #, no-c-format
 msgid ""
 "Why implement an interface and define the specific type during "
@@ -377,13 +377,13 @@
 "听的事件,可以让启用或者禁用对某个事件的监听的配置工作简单些。"
 
 #. Tag: title
-#: events.xml:132
+#: events.xml:156
 #, no-c-format
 msgid "Hibernate declarative security"
 msgstr "Hibernate的声明式安全机制"
 
 #. Tag: para
-#: events.xml:133
+#: events.xml:157
 #, no-c-format
 msgid ""
 "Usually, declarative security in Hibernate applications is managed in a "
@@ -396,7 +396,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 "
@@ -406,7 +406,7 @@
 "的功能。"
 
 #. Tag: programlisting
-#: events.xml:144
+#: events.xml:168
 #, no-c-format
 msgid ""
 "<![CDATA[<listener type=\"pre-delete\" class=\"org.hibernate.secure."
@@ -420,7 +420,7 @@
 msgstr ""
 
 #. Tag: para
-#: events.xml:146
+#: events.xml:170
 #, no-c-format
 msgid ""
 "Note that <literal>&lt;listener type=\"...\" class=\"...\"/&gt;</literal> is "
@@ -433,7 +433,7 @@
 "event&gt;</literal>的简写,对每一个事件类型都必须严格的有一个监听器与之对应。"
 
 #. Tag: para
-#: events.xml:152
+#: events.xml:176
 #, no-c-format
 msgid ""
 "Next, still in <literal>hibernate.cfg.xml</literal>, bind the permissions to "
@@ -442,7 +442,7 @@
 "接下来,仍然在<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,"
@@ -451,7 +451,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 provider所定义的角色的名字。"

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	2008-08-14 15:28:13 UTC (rev 15066)
+++ core/trunk/documentation/manual/src/main/docbook/zh-CN/content/example_mappings.po	2008-08-14 15:35:40 UTC (rev 15067)
@@ -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: 2008-08-14 15:28+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
-#: example_mappings.xml:20
+#: example_mappings.xml:29
 #, no-c-format
 msgid "Example: Various Mappings"
 msgstr "示例:复杂映射实例"
 
 #. Tag: para
-#: example_mappings.xml:22
+#: example_mappings.xml:31
 #, no-c-format
 msgid "This chapters shows off some more complex association mappings."
 msgstr "本章展示了一些较为复杂的关系映射。"
 
 #. Tag: title
-#: example_mappings.xml:27
+#: example_mappings.xml:36
 #, no-c-format
 msgid "Employer/Employee"
 msgstr "Employer(雇主)/Employee(雇员)"
 
 #. Tag: para
-#: example_mappings.xml:29
+#: example_mappings.xml:38
 #, no-c-format
 msgid ""
 "The following model of the relationship between <literal>Employer</literal> "
@@ -43,13 +43,13 @@
 "同的雇员和雇主可能会有多个雇佣时间段。 对于金额和雇员姓名,用Components建模。"
 
 #. Tag: para
-#: example_mappings.xml:46
+#: example_mappings.xml:55
 #, no-c-format
 msgid "Heres a possible mapping document:"
 msgstr "映射文件可能是这样:"
 
 #. Tag: programlisting
-#: example_mappings.xml:50
+#: example_mappings.xml:59
 #, no-c-format
 msgid ""
 "<![CDATA[<hibernate-mapping>\n"
@@ -105,14 +105,14 @@
 msgstr ""
 
 #. Tag: para
-#: example_mappings.xml:52
+#: example_mappings.xml:61
 #, no-c-format
 msgid ""
 "And heres the table schema generated by <literal>SchemaExport</literal>."
 msgstr "用<literal>SchemaExport</literal>生成表结构。"
 
 #. Tag: programlisting
-#: example_mappings.xml:56
+#: example_mappings.xml:65
 #, no-c-format
 msgid ""
 "<![CDATA[create table employers (\n"
@@ -153,13 +153,13 @@
 msgstr ""
 
 #. Tag: title
-#: example_mappings.xml:61
+#: example_mappings.xml:70
 #, no-c-format
 msgid "Author/Work"
 msgstr "Author(作家)/Work(作品)"
 
 #. Tag: para
-#: example_mappings.xml:63
+#: example_mappings.xml:72
 #, no-c-format
 msgid ""
 "Consider the following model of the relationships between <literal>Work</"
@@ -177,14 +177,14 @@
 "literal>继承<literal>Person</literal>。"
 
 #. Tag: para
-#: example_mappings.xml:81
+#: example_mappings.xml:90
 #, no-c-format
 msgid ""
 "The following mapping document correctly represents these relationships:"
 msgstr "下面的映射文件正确的描述了这些关系:"
 
 #. Tag: programlisting
-#: example_mappings.xml:85
+#: example_mappings.xml:94
 #, no-c-format
 msgid ""
 "<![CDATA[<hibernate-mapping>\n"
@@ -241,7 +241,7 @@
 msgstr ""
 
 #. Tag: para
-#: example_mappings.xml:87
+#: example_mappings.xml:96
 #, no-c-format
 msgid ""
 "There are four tables in this mapping. <literal>works</literal>, "
@@ -256,7 +256,7 @@
 "<literal>SchemaExport</literal>生成的。"
 
 #. Tag: programlisting
-#: example_mappings.xml:95
+#: example_mappings.xml:104
 #, no-c-format
 msgid ""
 "<![CDATA[create table works (\n"
@@ -297,13 +297,13 @@
 msgstr ""
 
 #. Tag: title
-#: example_mappings.xml:100
+#: example_mappings.xml:109
 #, no-c-format
 msgid "Customer/Order/Product"
 msgstr "Customer(客户)/Order(订单)/Product(产品)"
 
 #. Tag: para
-#: example_mappings.xml:102
+#: example_mappings.xml:111
 #, no-c-format
 msgid ""
 "Now consider a model of the relationships between <literal>Customer</"
@@ -325,13 +325,13 @@
 "Hibernate,这叫做组合元素。"
 
 #. Tag: para
-#: example_mappings.xml:122
+#: example_mappings.xml:131
 #, no-c-format
 msgid "The mapping document:"
 msgstr "映射文件如下:"
 
 #. Tag: programlisting
-#: example_mappings.xml:126
+#: example_mappings.xml:135
 #, no-c-format
 msgid ""
 "<![CDATA[<hibernate-mapping>\n"
@@ -374,7 +374,7 @@
 msgstr ""
 
 #. Tag: para
-#: example_mappings.xml:128
+#: example_mappings.xml:137
 #, no-c-format
 msgid ""
 "<literal>customers</literal>, <literal>orders</literal>, "
@@ -388,7 +388,7 @@
 "literal>也作为连接orders 和 products的关联表。"
 
 #. Tag: programlisting
-#: example_mappings.xml:135
+#: example_mappings.xml:144
 #, no-c-format
 msgid ""
 "<![CDATA[create table customers (\n"
@@ -428,13 +428,13 @@
 msgstr ""
 
 #. Tag: title
-#: example_mappings.xml:140
+#: example_mappings.xml:149
 #, no-c-format
 msgid "Miscellaneous example mappings"
 msgstr "杂例"
 
 #. Tag: para
-#: example_mappings.xml:142
+#: example_mappings.xml:151
 #, no-c-format
 msgid ""
 "These examples are all taken from the Hibernate test suite. You will find "
@@ -445,19 +445,19 @@
 "以参考Hibernate的<literal>test</literal>目录。"
 
 #. Tag: para
-#: example_mappings.xml:148
+#: 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:151
+#: example_mappings.xml:160
 #, no-c-format
 msgid "\"Typed\" one-to-one association"
 msgstr "\"Typed\" one-to-one association"
 
 #. Tag: programlisting
-#: example_mappings.xml:152
+#: example_mappings.xml:161
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Person\">\n"
@@ -489,13 +489,13 @@
 msgstr ""
 
 #. Tag: title
-#: example_mappings.xml:156
+#: example_mappings.xml:165
 #, no-c-format
 msgid "Composite key example"
 msgstr "Composite key example"
 
 #. Tag: programlisting
-#: example_mappings.xml:157
+#: example_mappings.xml:166
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Customer\">\n"
@@ -614,14 +614,14 @@
 msgstr ""
 
 #. Tag: title
-#: example_mappings.xml:161
+#: example_mappings.xml:170
 #, 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:162
+#: example_mappings.xml:171
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"User\" table=\"`User`\">\n"
@@ -662,13 +662,13 @@
 msgstr ""
 
 #. Tag: title
-#: example_mappings.xml:166
+#: example_mappings.xml:175
 #, no-c-format
 msgid "Content based discrimination"
 msgstr "Content based discrimination"
 
 #. Tag: programlisting
-#: example_mappings.xml:167
+#: example_mappings.xml:176
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Person\"\n"
@@ -724,13 +724,13 @@
 msgstr ""
 
 #. Tag: title
-#: example_mappings.xml:171
+#: example_mappings.xml:180
 #, no-c-format
 msgid "Associations on alternate keys"
 msgstr "Associations on alternate keys"
 
 #. Tag: programlisting
-#: example_mappings.xml:172
+#: example_mappings.xml:181
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Person\">\n"

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	2008-08-14 15:28:13 UTC (rev 15066)
+++ core/trunk/documentation/manual/src/main/docbook/zh-CN/content/example_parentchild.po	2008-08-14 15:35:40 UTC (rev 15067)
@@ -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: 2008-08-14 15:28+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,13 +11,13 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: example_parentchild.xml:5
+#: example_parentchild.xml:29
 #, no-c-format
 msgid "Example: Parent/Child"
 msgstr "示例:父子关系(Parent Child Relationships)"
 
 #. Tag: para
-#: example_parentchild.xml:7
+#: example_parentchild.xml:31
 #, no-c-format
 msgid ""
 "One of the very first things that new users try to do with Hibernate is to "
@@ -47,13 +47,13 @@
 "优美的parent / child关系。这一点也不难!"
 
 #. Tag: title
-#: example_parentchild.xml:21
+#: example_parentchild.xml:45
 #, no-c-format
 msgid "A note about collections"
 msgstr "关于collections需要注意的一点"
 
 #. Tag: para
-#: example_parentchild.xml:23
+#: example_parentchild.xml:47
 #, no-c-format
 msgid ""
 "Hibernate collections are considered to be a logical part of their owning "
@@ -64,7 +64,7 @@
 "要!它主要体现为以下几点:"
 
 #. Tag: para
-#: example_parentchild.xml:30
+#: example_parentchild.xml:54
 #, no-c-format
 msgid ""
 "When we remove / add an object from / to a collection, the version number of "
@@ -72,7 +72,7 @@
 msgstr "当删除或增加collection中对象的时候,collection所属者的版本值会递增。"
 
 #. Tag: para
-#: example_parentchild.xml:36
+#: example_parentchild.xml:60
 #, no-c-format
 msgid ""
 "If an object that was removed from a collection is an instance of a value "
@@ -86,7 +86,7 @@
 "被删除。同样的,向collection增加一个value type的实例将会使之立即被持久化。"
 
 #. Tag: para
-#: example_parentchild.xml:44
+#: example_parentchild.xml:68
 #, no-c-format
 msgid ""
 "On the other hand, if an entity is removed from a collection (a one-to-many "
@@ -101,7 +101,7 @@
 "使与它关联的实体消失掉!同样的,向collection增加一个实体不会使之被持久化。"
 
 #. Tag: para
-#: example_parentchild.xml:54
+#: example_parentchild.xml:78
 #, no-c-format
 msgid ""
 "Instead, the default behaviour is that adding an entity to a collection "
@@ -115,13 +115,13 @@
 "关系则是完全不适合的,在这种关系下,子对象的生存绑定于父对象的生存周期。"
 
 #. 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> "
@@ -129,7 +129,7 @@
 msgstr "假设我们要实现一个简单的从Parent到Child的&lt;one-to-many&gt;关联。"
 
 #. Tag: programlisting
-#: example_parentchild.xml:71
+#: example_parentchild.xml:95
 #, no-c-format
 msgid ""
 "<![CDATA[<set name=\"children\">\n"
@@ -139,13 +139,13 @@
 msgstr ""
 
 #. Tag: para
-#: example_parentchild.xml:73
+#: example_parentchild.xml:97
 #, 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"
@@ -156,20 +156,20 @@
 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>"
 msgstr "一条<literal>INSERT</literal>语句,为<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 "
@@ -179,7 +179,7 @@
 "literal>的连接"
 
 #. Tag: para
-#: example_parentchild.xml:95
+#: example_parentchild.xml:119
 #, no-c-format
 msgid ""
 "This is not only inefficient, but also violates any <literal>NOT NULL</"
@@ -192,7 +192,7 @@
 "束的问题:"
 
 #. Tag: programlisting
-#: example_parentchild.xml:101
+#: example_parentchild.xml:125
 #, no-c-format
 msgid ""
 "<![CDATA[<set name=\"children\">\n"
@@ -202,13 +202,13 @@
 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
+#: example_parentchild.xml:130
 #, no-c-format
 msgid ""
 "The underlying cause of this behaviour is that the link (the foreign key "
@@ -222,7 +222,7 @@
 "INSERT语句中被创建。因此解决的办法就是把这个连接添加到Child的映射中。"
 
 #. 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\"/"
@@ -230,7 +230,7 @@
 msgstr ""
 
 #. Tag: para
-#: example_parentchild.xml:115
+#: example_parentchild.xml:139
 #, no-c-format
 msgid ""
 "(We also need to add the <literal>parent</literal> property to the "
@@ -239,7 +239,7 @@
 "(我们还需要为类<literal>Child</literal>添加<literal>parent</literal>属性)"
 
 #. Tag: para
-#: example_parentchild.xml:119
+#: example_parentchild.xml:143
 #, no-c-format
 msgid ""
 "Now that the <literal>Child</literal> entity is managing the state of the "
@@ -250,7 +250,7 @@
 "接,我们使用<literal>inverse</literal>属性。"
 
 #. Tag: programlisting
-#: example_parentchild.xml:124
+#: example_parentchild.xml:148
 #, no-c-format
 msgid ""
 "<![CDATA[<set name=\"children\" inverse=\"true\">\n"
@@ -260,13 +260,13 @@
 msgstr ""
 
 #. Tag: para
-#: example_parentchild.xml:126
+#: example_parentchild.xml:150
 #, 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"
@@ -278,13 +278,13 @@
 msgstr ""
 
 #. Tag: para
-#: example_parentchild.xml:132
+#: example_parentchild.xml:156
 #, no-c-format
 msgid "And now, only one SQL <literal>INSERT</literal> would be issued!"
 msgstr "现在,只会有一条<literal>INSERT</literal>语句被执行!"
 
 #. Tag: para
-#: example_parentchild.xml:136
+#: example_parentchild.xml:160
 #, no-c-format
 msgid ""
 "To tighten things up a bit, we could create an <literal>addChild()</literal> "
@@ -294,7 +294,7 @@
 "<literal>addChild()</literal>方法。"
 
 #. Tag: programlisting
-#: example_parentchild.xml:141
+#: example_parentchild.xml:165
 #, no-c-format
 msgid ""
 "<![CDATA[public void addChild(Child c) {\n"
@@ -304,13 +304,13 @@
 msgstr ""
 
 #. Tag: para
-#: example_parentchild.xml:143
+#: example_parentchild.xml:167
 #, no-c-format
 msgid "Now, the code to add a <literal>Child</literal> looks like"
 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"
@@ -321,13 +321,13 @@
 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
+#: example_parentchild.xml:178
 #, no-c-format
 msgid ""
 "The explicit call to <literal>save()</literal> is still annoying. We will "
@@ -337,7 +337,7 @@
 "题。"
 
 #. Tag: programlisting
-#: example_parentchild.xml:159
+#: example_parentchild.xml:183
 #, no-c-format
 msgid ""
 "<![CDATA[<set name=\"children\" inverse=\"true\" cascade=\"all\">\n"
@@ -347,13 +347,13 @@
 msgstr ""
 
 #. Tag: para
-#: example_parentchild.xml:161
+#: example_parentchild.xml:185
 #, 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"
@@ -363,7 +363,7 @@
 msgstr ""
 
 #. Tag: para
-#: example_parentchild.xml:167
+#: example_parentchild.xml:191
 #, no-c-format
 msgid ""
 "Similarly, we don't need to iterate over the children when saving or "
@@ -374,7 +374,7 @@
 "下面的代码会删除对象<literal>p</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"
@@ -383,13 +383,13 @@
 msgstr ""
 
 #. Tag: para
-#: example_parentchild.xml:174
+#: example_parentchild.xml:198
 #, no-c-format
 msgid "However, this 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"
@@ -400,7 +400,7 @@
 msgstr ""
 
 #. Tag: para
-#: example_parentchild.xml:180
+#: example_parentchild.xml:204
 #, no-c-format
 msgid ""
 "will not remove <literal>c</literal> from the database; it will ony remove "
@@ -413,7 +413,7 @@
 "式调用<literal>delete()</literal>来删除<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"
@@ -424,7 +424,7 @@
 msgstr ""
 
 #. Tag: para
-#: example_parentchild.xml:188
+#: example_parentchild.xml:212
 #, no-c-format
 msgid ""
 "Now, in our case, a <literal>Child</literal> can't really exist without its "
@@ -437,7 +437,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"
@@ -448,7 +448,7 @@
 msgstr ""
 
 #. Tag: para
-#: example_parentchild.xml:196
+#: example_parentchild.xml:220
 #, no-c-format
 msgid ""
 "Note: even though the collection mapping specifies <literal>inverse=\"true"
@@ -463,7 +463,7 @@
 "literal>是不够的。"
 
 #. Tag: title
-#: example_parentchild.xml:206
+#: example_parentchild.xml:230
 #, no-c-format
 msgid "Cascades and <literal>unsaved-value</literal>"
 msgstr ""
@@ -471,7 +471,7 @@
 "literal>)"
 
 #. Tag: para
-#: example_parentchild.xml:208
+#: example_parentchild.xml:232
 #, no-c-format
 msgid ""
 "Suppose we loaded up a <literal>Parent</literal> in one <literal>Session</"
@@ -499,7 +499,7 @@
 "的了。</emphasis>"
 
 #. Tag: para
-#: example_parentchild.xml:220
+#: example_parentchild.xml:244
 #, no-c-format
 msgid ""
 "The following code will update <literal>parent</literal> and <literal>child</"
@@ -509,7 +509,7 @@
 "插入<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"
@@ -521,7 +521,7 @@
 msgstr ""
 
 #. Tag: para
-#: example_parentchild.xml:227
+#: example_parentchild.xml:251
 #, no-c-format
 msgid ""
 "Well, that's all very well for the case of a generated identifier, but what "
@@ -539,13 +539,13 @@
 "查询第二级缓存,或者最坏的情况,查询数据库,来确认是否此行存在。"
 
 #. Tag: title
-#: example_parentchild.xml:260
+#: example_parentchild.xml:284
 #, no-c-format
 msgid "Conclusion"
 msgstr "结论"
 
 #. Tag: para
-#: example_parentchild.xml:262
+#: example_parentchild.xml:286
 #, no-c-format
 msgid ""
 "There is quite a bit to digest here and it might look confusing first time "
@@ -556,7 +556,7 @@
 "常好。大部分Hibernate应用程序都会经常用到父子对象模式。"
 
 #. Tag: para
-#: example_parentchild.xml:267
+#: example_parentchild.xml:291
 #, no-c-format
 msgid ""
 "We mentioned an alternative in the first paragraph. None of the above issues "

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	2008-08-14 15:28:13 UTC (rev 15066)
+++ core/trunk/documentation/manual/src/main/docbook/zh-CN/content/example_weblog.po	2008-08-14 15:35:40 UTC (rev 15067)
@@ -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: 2008-08-14 15:28+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
-#: 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
+#: example_weblog.xml:34
 #, no-c-format
 msgid ""
 "The persistent classes represent a weblog, and an item posted in a weblog. "
@@ -34,7 +34,7 @@
 "型,但是我们会用一个有序包(ordered bag)而非集合(set)。"
 
 #. Tag: programlisting
-#: example_weblog.xml:16
+#: example_weblog.xml:40
 #, no-c-format
 msgid ""
 "<![CDATA[package eg;\n"
@@ -68,7 +68,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: example_weblog.xml:18
+#: example_weblog.xml:42
 #, no-c-format
 msgid ""
 "<![CDATA[package eg;\n"
@@ -117,19 +117,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
+#: example_weblog.xml:49
 #, no-c-format
 msgid "The XML mappings should now be quite straightforward."
 msgstr "下列的XML映射应该是很直白的。"
 
 #. Tag: programlisting
-#: example_weblog.xml:29
+#: example_weblog.xml:53
 #, no-c-format
 msgid ""
 "<![CDATA[<?xml version=\"1.0\"?>\n"
@@ -174,7 +174,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: example_weblog.xml:31
+#: example_weblog.xml:55
 #, no-c-format
 msgid ""
 "<![CDATA[<?xml version=\"1.0\"?>\n"
@@ -223,13 +223,13 @@
 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
+#: example_weblog.xml:62
 #, no-c-format
 msgid ""
 "The following class demonstrates some of the kinds of things we can do with "
@@ -237,7 +237,7 @@
 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/zh-CN/content/filters.po
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/zh-CN/content/filters.po	2008-08-14 15:28:13 UTC (rev 15066)
+++ core/trunk/documentation/manual/src/main/docbook/zh-CN/content/filters.po	2008-08-14 15:35:40 UTC (rev 15067)
@@ -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: 2008-08-14 15:28+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,13 +11,13 @@
 "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
+#: filters.xml:31
 #, no-c-format
 msgid ""
 "Hibernate3 provides an innovative new approach to handling data with "
@@ -31,13 +31,13 @@
 "Hibernate session您可以选择是否启用(或禁用)某个过滤器。"
 
 #. Tag: title
-#: filters.xml:14
+#: filters.xml:38
 #, no-c-format
 msgid "Hibernate filters"
 msgstr "Hibernate 过滤器(filters)"
 
 #. Tag: para
-#: filters.xml:16
+#: filters.xml:40
 #, no-c-format
 msgid ""
 "Hibernate3 adds the ability to pre-define filter criteria and attach those "
@@ -56,7 +56,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 "
@@ -69,7 +69,7 @@
 "def/&gt;</literal>节点:"
 
 #. Tag: programlisting
-#: filters.xml:32
+#: filters.xml:56
 #, no-c-format
 msgid ""
 "<![CDATA[<filter-def name=\"myFilter\">\n"
@@ -78,13 +78,13 @@
 msgstr ""
 
 #. Tag: para
-#: filters.xml:34
+#: filters.xml:58
 #, no-c-format
 msgid "Then, this filter can be attached to a class:"
 msgstr "定义好之后,就可以在某个类中使用这个过滤器:"
 
 #. Tag: programlisting
-#: filters.xml:38
+#: filters.xml:62
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"myClass\" ...>\n"
@@ -95,13 +95,13 @@
 msgstr ""
 
 #. Tag: para
-#: filters.xml:40
+#: filters.xml:64
 #, no-c-format
 msgid "or, to a collection:"
 msgstr "也可以在某个集合使用它:"
 
 #. Tag: programlisting
-#: filters.xml:44
+#: filters.xml:68
 #, no-c-format
 msgid ""
 "<![CDATA[<set ...>\n"
@@ -111,22 +111,22 @@
 msgstr ""
 
 #. Tag: para
-#: filters.xml:46
+#: filters.xml:70
 #, no-c-format
 msgid "or, even 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 "
+"enableFilter()</literal> method, which returns an instance of the "
 "<literal>Filter</literal> interface. Using the simple filter defined above, "
 "this would look like:"
 msgstr ""
@@ -138,7 +138,7 @@
 "literal>的实例。以上文定义的过滤器为例:"
 
 #. Tag: programlisting
-#: filters.xml:59
+#: filters.xml:83
 #, no-c-format
 msgid ""
 "<![CDATA[session.enableFilter(\"myFilter\").setParameter(\"myFilterParam\", "
@@ -146,7 +146,7 @@
 msgstr ""
 
 #. Tag: para
-#: filters.xml:61
+#: filters.xml:85
 #, no-c-format
 msgid ""
 "Note that methods on the org.hibernate.Filter interface do allow the method-"
@@ -156,14 +156,14 @@
 "之后设定Filter参数这个“方法链”) Hibernate的其他部分也大多有这个特性。"
 
 #. Tag: para
-#: filters.xml:65
+#: filters.xml:89
 #, no-c-format
 msgid ""
 "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"
@@ -201,7 +201,7 @@
 msgstr ""
 
 #. Tag: para
-#: filters.xml:71
+#: filters.xml:95
 #, no-c-format
 msgid ""
 "Then, in order to ensure that you always get back currently effective "
@@ -212,7 +212,7 @@
 "作之前先开启过滤器即可:"
 
 #. Tag: programlisting
-#: filters.xml:76
+#: filters.xml:100
 #, no-c-format
 msgid ""
 "<![CDATA[Session session = ...;\n"
@@ -226,7 +226,7 @@
 msgstr ""
 
 #. Tag: para
-#: filters.xml:78
+#: filters.xml:102
 #, no-c-format
 msgid ""
 "In the HQL above, even though we only explicitly mentioned a salary "
@@ -238,7 +238,7 @@
 "将仅返回那些目前雇用 关系处于生效期的,并且薪水高于一百万美刀的雇员的数据。"
 
 #. Tag: para
-#: filters.xml:84
+#: filters.xml:108
 #, no-c-format
 msgid ""
 "Note: if you plan on using filters with outer joining (either through HQL or "
@@ -251,7 +251,7 @@
 "joining)。并且通常来说,先写参数, 然后是操作符,最后写数据库字段名。"
 
 #. Tag: para
-#: filters.xml:91
+#: filters.xml:115
 #, no-c-format
 msgid ""
 "After being defined a filter might be attached to multiple entities and/or "
@@ -265,7 +265,7 @@
 "&gt;</literal>被用来定义一个默认条件,它可能作为属性或者CDATA出现:"
 
 #. Tag: programlisting
-#: filters.xml:98
+#: filters.xml:122
 #, no-c-format
 msgid ""
 "<![CDATA[<filter-def name=\"myFilter\" condition=\"abc > xyz\">...</filter-"
@@ -274,7 +274,7 @@
 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 "

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	2008-08-14 15:28:13 UTC (rev 15066)
+++ core/trunk/documentation/manual/src/main/docbook/zh-CN/content/inheritance_mapping.po	2008-08-14 15:35:40 UTC (rev 15067)
@@ -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: 2008-08-14 15:28+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
+#: inheritance_mapping.xml:29
 #, no-c-format
 msgid "Inheritance Mapping"
 msgstr "继承映射(Inheritance Mappings)"
 
 #. Tag: title
-#: inheritance_mapping.xml:8
+#: inheritance_mapping.xml:32
 #, 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 ""
@@ -45,13 +45,13 @@
 "每个子类一张表"
 
 #. 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 "
@@ -59,13 +59,13 @@
 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
+#: inheritance_mapping.xml:69
 #, no-c-format
 msgid ""
 "It is possible to use different mapping strategies for different branches of "
@@ -89,7 +89,7 @@
 "<literal>&lt;join&gt;</literal>来实现的(见后)。"
 
 #. Tag: para
-#: inheritance_mapping.xml:59
+#: inheritance_mapping.xml:83
 #, no-c-format
 msgid ""
 "It is possible to define <literal>subclass</literal>, <literal>union-"
@@ -112,7 +112,7 @@
 "但在每个映射文件里,超类必须在子类之前定义。"
 
 #. Tag: programlisting
-#: inheritance_mapping.xml:70
+#: inheritance_mapping.xml:94
 #, no-c-format
 msgid ""
 "<![CDATA[\n"
@@ -125,13 +125,13 @@
 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
+#: inheritance_mapping.xml:100
 #, no-c-format
 msgid ""
 "Suppose we have an interface <literal>Payment</literal>, with implementors "
@@ -145,7 +145,7 @@
 "hierarchy)的映射代码如下所示:"
 
 #. Tag: programlisting
-#: inheritance_mapping.xml:83
+#: inheritance_mapping.xml:107
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Payment\" table=\"PAYMENT\">\n"
@@ -169,7 +169,7 @@
 msgstr ""
 
 #. Tag: para
-#: inheritance_mapping.xml:85
+#: inheritance_mapping.xml:109
 #, no-c-format
 msgid ""
 "Exactly one table is required. There is one big limitation of this mapping "
@@ -180,19 +180,19 @@
 "如<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
+#: inheritance_mapping.xml:120
 #, no-c-format
 msgid "A table per subclass mapping would look like:"
 msgstr "对于上例中的几个类而言,采用“每个子类一张表”的映射策略,代码如下所示:"
 
 #. Tag: programlisting
-#: inheritance_mapping.xml:100
+#: inheritance_mapping.xml:124
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Payment\" table=\"PAYMENT\">\n"
@@ -218,7 +218,7 @@
 msgstr ""
 
 #. Tag: para
-#: inheritance_mapping.xml:102
+#: inheritance_mapping.xml:126
 #, no-c-format
 msgid ""
 "Four tables are required. The three subclass tables have primary key "
@@ -228,13 +228,13 @@
 "需要四张表。三个子类表通过主键关联到超类表(因而关系模型实际上是一对一关联)。"
 
 #. Tag: title
-#: inheritance_mapping.xml:111
+#: inheritance_mapping.xml:135
 #, no-c-format
 msgid "Table per subclass, using a discriminator"
 msgstr "每个子类一张表(Table per subclass),使用辨别标志(Discriminator)"
 
 #. Tag: para
-#: inheritance_mapping.xml:113
+#: inheritance_mapping.xml:137
 #, no-c-format
 msgid ""
 "Note that Hibernate's implementation of table per subclass requires no "
@@ -254,7 +254,7 @@
 "<literal>&lt;join&gt;</literal>,如下所示:"
 
 #. Tag: programlisting
-#: inheritance_mapping.xml:125
+#: inheritance_mapping.xml:149
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Payment\" table=\"PAYMENT\">\n"
@@ -287,7 +287,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 "
@@ -299,13 +299,13 @@
 "的数据。"
 
 #. Tag: title
-#: inheritance_mapping.xml:136
+#: inheritance_mapping.xml:160
 #, no-c-format
 msgid "Mixing table per class hierarchy with table per subclass"
 msgstr "混合使用“每个类分层结构一张表”和“每个子类一张表”"
 
 #. Tag: para
-#: inheritance_mapping.xml:138
+#: inheritance_mapping.xml:162
 #, no-c-format
 msgid ""
 "You may even mix the table per hierarchy and table per subclass strategies "
@@ -315,7 +315,7 @@
 "策略:"
 
 #. Tag: programlisting
-#: inheritance_mapping.xml:143
+#: inheritance_mapping.xml:167
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Payment\" table=\"PAYMENT\">\n"
@@ -341,7 +341,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 "
@@ -352,7 +352,7 @@
 "<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"
@@ -360,13 +360,13 @@
 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
+#: inheritance_mapping.xml:182
 #, no-c-format
 msgid ""
 "There are two ways we could go about mapping the table per concrete class "
@@ -376,7 +376,7 @@
 "<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"
@@ -399,7 +399,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 "
@@ -409,7 +409,7 @@
 "定义相应字段。"
 
 #. Tag: para
-#: inheritance_mapping.xml:170
+#: inheritance_mapping.xml:194
 #, no-c-format
 msgid ""
 "The limitation of this approach is that if a property is mapped on the "
@@ -425,7 +425,7 @@
 "联合子类所共用."
 
 #. Tag: para
-#: inheritance_mapping.xml:179
+#: inheritance_mapping.xml:203
 #, no-c-format
 msgid ""
 "If your superclass is abstract, map it with <literal>abstract=\"true\"</"
@@ -438,19 +438,19 @@
 "literal>),来保存超类的实例。"
 
 #. Tag: title
-#: inheritance_mapping.xml:189
+#: inheritance_mapping.xml:213
 #, no-c-format
 msgid "Table per concrete class, using implicit polymorphism"
 msgstr "每个具体类一张表,使用隐式多态"
 
 #. 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"
@@ -479,7 +479,7 @@
 msgstr ""
 
 #. Tag: para
-#: inheritance_mapping.xml:197
+#: inheritance_mapping.xml:221
 #, no-c-format
 msgid ""
 "Notice that nowhere do we mention the <literal>Payment</literal> interface "
@@ -496,7 +496,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 "
@@ -506,7 +506,7 @@
 "<literal>UNION</literal>的SQL语句。"
 
 #. Tag: para
-#: inheritance_mapping.xml:212
+#: inheritance_mapping.xml:236
 #, no-c-format
 msgid ""
 "For this mapping strategy, a polymorphic association to <literal>Payment</"
@@ -516,7 +516,7 @@
 "<literal>Payment</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"
@@ -529,13 +529,13 @@
 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
+#: inheritance_mapping.xml:248
 #, no-c-format
 msgid ""
 "There is one further thing to notice about this mapping. Since the "
@@ -551,7 +551,7 @@
 "<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"
@@ -584,7 +584,7 @@
 msgstr ""
 
 #. Tag: para
-#: inheritance_mapping.xml:234
+#: inheritance_mapping.xml:258
 #, no-c-format
 msgid ""
 "Once again, we don't mention <literal>Payment</literal> explicitly. If we "
@@ -603,13 +603,13 @@
 "<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
+#: inheritance_mapping.xml:275
 #, no-c-format
 msgid ""
 "There are certain limitations to the \"implicit polymorphism\" approach to "
@@ -622,7 +622,7 @@
 "没有那 么严格。"
 
 #. 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 "
@@ -630,128 +630,128 @@
 msgstr "下面表格中列出了在Hibernte中“每个具体类一张表”的策略和隐式多态的限制。"
 
 #. 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:300
 #, no-c-format
 msgid "Inheritance strategy"
 msgstr "继承策略(Inheritance strategy)"
 
 #. Tag: entry
-#: inheritance_mapping.xml:277
+#: inheritance_mapping.xml:301
 #, no-c-format
 msgid "Polymorphic many-to-one"
 msgstr "多态多对一"
 
 #. Tag: entry
-#: inheritance_mapping.xml:278
+#: inheritance_mapping.xml:302
 #, no-c-format
 msgid "Polymorphic one-to-one"
 msgstr "多态一对一"
 
 #. Tag: entry
-#: inheritance_mapping.xml:279
+#: inheritance_mapping.xml:303
 #, no-c-format
 msgid "Polymorphic one-to-many"
 msgstr "多态一对多"
 
 #. Tag: entry
-#: inheritance_mapping.xml:280
+#: inheritance_mapping.xml:304
 #, no-c-format
 msgid "Polymorphic many-to-many"
 msgstr "多态多对多"
 
 #. Tag: entry
-#: inheritance_mapping.xml:281
+#: inheritance_mapping.xml:305
 #, no-c-format
 msgid "Polymorphic <literal>load()/get()</literal>"
 msgstr ""
 
 #. Tag: entry
-#: inheritance_mapping.xml:282
+#: inheritance_mapping.xml:306
 #, no-c-format
 msgid "Polymorphic queries"
 msgstr "多态查询"
 
 #. Tag: entry
-#: inheritance_mapping.xml:283
+#: inheritance_mapping.xml:307
 #, no-c-format
 msgid "Polymorphic joins"
 msgstr "多态连接(join)"
 
 #. Tag: entry
-#: inheritance_mapping.xml:284
+#: inheritance_mapping.xml:308
 #, no-c-format
 msgid "Outer join fetching"
 msgstr "外连接(Outer join)读取"
 
 #. Tag: entry
-#: inheritance_mapping.xml:289
+#: inheritance_mapping.xml:313
 #, no-c-format
 msgid "table per class-hierarchy"
 msgstr "每个类分层结构一张表"
 
 #. Tag: literal
-#: inheritance_mapping.xml:290 inheritance_mapping.xml:301
-#: inheritance_mapping.xml:312
+#: inheritance_mapping.xml:314 inheritance_mapping.xml:325
+#: inheritance_mapping.xml:336
 #, 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:315 inheritance_mapping.xml:326
+#: inheritance_mapping.xml:337
 #, 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:316 inheritance_mapping.xml:327
 #, 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:317 inheritance_mapping.xml:328
+#: inheritance_mapping.xml:339
 #, 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:318 inheritance_mapping.xml:329
+#: inheritance_mapping.xml:340
 #, 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:319 inheritance_mapping.xml:330
+#: inheritance_mapping.xml:341 inheritance_mapping.xml:352
 #, 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:320 inheritance_mapping.xml:331
+#: inheritance_mapping.xml:342
 #, 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:321 inheritance_mapping.xml:332
+#: inheritance_mapping.xml:343
 #, no-c-format
 msgid "supported"
 msgstr "支持"
 
 #. Tag: entry
-#: inheritance_mapping.xml:300
+#: inheritance_mapping.xml:324
 #, fuzzy, no-c-format
 msgid "<entry>table per subclass</entry>"
 msgstr ""
@@ -761,13 +761,13 @@
 "每个子类一张表"
 
 #. Tag: entry
-#: inheritance_mapping.xml:311
+#: inheritance_mapping.xml:335
 #, no-c-format
 msgid "table per concrete-class (union-subclass)"
 msgstr "每个具体类一张表(union-subclass)"
 
 #. Tag: entry
-#: inheritance_mapping.xml:314
+#: inheritance_mapping.xml:338
 #, no-c-format
 msgid ""
 "<literal>&lt;one-to-many&gt;</literal> (for <literal>inverse=\"true\"</"
@@ -775,32 +775,32 @@
 msgstr ""
 
 #. Tag: entry
-#: inheritance_mapping.xml:322
+#: inheritance_mapping.xml:346
 #, no-c-format
 msgid "table per concrete class (implicit polymorphism)"
 msgstr "每个具体类一张表(隐式多态)"
 
 #. Tag: literal
-#: inheritance_mapping.xml:323
+#: inheritance_mapping.xml:347
 #, 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:348 inheritance_mapping.xml:349
+#: inheritance_mapping.xml:353 inheritance_mapping.xml:354
 #, no-c-format
 msgid "not supported"
 msgstr "不支持"
 
 #. Tag: literal
-#: inheritance_mapping.xml:326
+#: inheritance_mapping.xml:350
 #, no-c-format
 msgid "&lt;many-to-any&gt;"
 msgstr "&lt;many-to-any&gt;"
 
 #. Tag: literal
-#: inheritance_mapping.xml:327
+#: inheritance_mapping.xml:351
 #, 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	2008-08-14 15:28:13 UTC (rev 15066)
+++ core/trunk/documentation/manual/src/main/docbook/zh-CN/content/performance.po	2008-08-14 15:35:40 UTC (rev 15067)
@@ -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: 2008-08-14 15:28+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
-#: 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 "抓取策略(Fetching strategies)"
 
 #. Tag: para
-#: performance.xml:10
+#: performance.xml:34
 #, no-c-format
 msgid ""
 "A <emphasis>fetching strategy</emphasis> is the strategy Hibernate will use "
@@ -37,13 +37,13 @@
 "件查询(Criteria Query)</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
+#: performance.xml:47
 #, no-c-format
 msgid ""
 "<emphasis>Join fetching</emphasis> - Hibernate retrieves the associated "
@@ -55,7 +55,7 @@
 "得对象的关联实例或者关联集合。"
 
 #. Tag: para
-#: performance.xml:30
+#: performance.xml:54
 #, no-c-format
 msgid ""
 "<emphasis>Select fetching</emphasis> - a second <literal>SELECT</literal> is "
@@ -69,7 +69,7 @@
 "真正访问关联关系的时候,才会执行第二条select语句。"
 
 #. Tag: para
-#: performance.xml:39
+#: performance.xml:63
 #, no-c-format
 msgid ""
 "<emphasis>Subselect fetching</emphasis> - a second <literal>SELECT</literal> "
@@ -85,7 +85,7 @@
 "句。"
 
 #. Tag: para
-#: performance.xml:48
+#: performance.xml:72
 #, no-c-format
 msgid ""
 "<emphasis>Batch fetching</emphasis> - an optimization strategy for select "
@@ -98,13 +98,13 @@
 "批对象实例或集合。"
 
 #. Tag: para
-#: performance.xml:57
+#: performance.xml:81
 #, no-c-format
 msgid "Hibernate also distinguishes between:"
 msgstr "Hibernate会区分下列各种情况:"
 
 #. Tag: para
-#: performance.xml:63
+#: performance.xml:87
 #, no-c-format
 msgid ""
 "<emphasis>Immediate fetching</emphasis> - an association, collection or "
@@ -114,7 +114,7 @@
 "合或属性被立即抓取。"
 
 #. Tag: para
-#: performance.xml:69
+#: performance.xml:93
 #, no-c-format
 msgid ""
 "<emphasis>Lazy collection fetching</emphasis> - a collection is fetched when "
@@ -125,7 +125,7 @@
 "合进行了一次操作时,集合才被抓取。(对集合而言这是默认行为。)"
 
 #. Tag: para
-#: performance.xml:76
+#: performance.xml:100
 #, no-c-format
 msgid ""
 "<emphasis>\"Extra-lazy\" collection fetching</emphasis> - individual "
@@ -138,7 +138,7 @@
 "要,Hibernate不会试图去把整个集合都抓取到内存里来(适用于非常大的集合)。"
 
 #. Tag: para
-#: performance.xml:84
+#: performance.xml:108
 #, no-c-format
 msgid ""
 "<emphasis>Proxy fetching</emphasis> - a single-valued association is fetched "
@@ -149,7 +149,7 @@
 "个方法被调用,而非对其关键字进行get操作时才抓取。"
 
 #. Tag: para
-#: performance.xml:91
+#: performance.xml:115
 #, no-c-format
 msgid ""
 "<emphasis>\"No-proxy\" fetching</emphasis> - a single-valued association is "
@@ -166,7 +166,7 @@
 "到。"
 
 #. Tag: para
-#: performance.xml:101
+#: performance.xml:125
 #, no-c-format
 msgid ""
 "<emphasis>Lazy attribute fetching</emphasis> - an attribute or single valued "
@@ -178,7 +178,7 @@
 "方法很少是必要的。"
 
 #. Tag: para
-#: performance.xml:110
+#: performance.xml:134
 #, no-c-format
 msgid ""
 "We have two orthogonal notions here: <emphasis>when</emphasis> is the "
@@ -193,13 +193,13 @@
 "定类的某个脱管的实例,知道有哪些数据是可以使用的。"
 
 #. Tag: title
-#: performance.xml:119
+#: performance.xml:143
 #, no-c-format
 msgid "Working with lazy associations"
 msgstr "操作延迟加载的关联"
 
 #. Tag: para
-#: performance.xml:121
+#: performance.xml:145
 #, no-c-format
 msgid ""
 "By default, Hibernate3 uses lazy select fetching for collections and lazy "
@@ -210,7 +210,7 @@
 "抓取。对几乎是所有的应用而言,其绝大多数的关联,这种策略都是有效的。"
 
 #. Tag: para
-#: performance.xml:127
+#: performance.xml:151
 #, no-c-format
 msgid ""
 "<emphasis>Note:</emphasis> if you set <literal>hibernate."
@@ -223,7 +223,7 @@
 "(这种优化也可能会在更细化的级别打开)。"
 
 #. Tag: para
-#: performance.xml:134
+#: performance.xml:158
 #, no-c-format
 msgid ""
 "However, lazy fetching poses one problem that you must be aware of. Access "
@@ -234,7 +234,7 @@
 "外调用延迟集合会导致一次意外。比如:"
 
 #. Tag: programlisting
-#: performance.xml:140
+#: performance.xml:164
 #, no-c-format
 msgid ""
 "<![CDATA[s = sessions.openSession();\n"
@@ -251,7 +251,7 @@
 msgstr ""
 
 #. Tag: para
-#: performance.xml:142
+#: performance.xml:166
 #, no-c-format
 msgid ""
 "Since the permissions collection was not initialized when the "
@@ -266,7 +266,7 @@
 "前。"
 
 #. Tag: para
-#: performance.xml:150
+#: performance.xml:174
 #, no-c-format
 msgid ""
 "Alternatively, we could use a non-lazy collection or association, by "
@@ -282,7 +282,7 @@
 "入整个数据库到内存中!"
 
 #. Tag: para
-#: performance.xml:159
+#: performance.xml:183
 #, no-c-format
 msgid ""
 "On the other hand, we often want to choose join fetching (which is non-lazy "
@@ -297,13 +297,13 @@
 "关联相一致的。"
 
 #. Tag: title
-#: performance.xml:170
+#: performance.xml:194
 #, no-c-format
 msgid "Tuning fetch strategies"
 msgstr "调整抓取策略(Tuning fetch strategies)"
 
 #. Tag: para
-#: performance.xml:172
+#: performance.xml:196
 #, no-c-format
 msgid ""
 "Select fetching (the default) is extremely vulnerable to N+1 selects "
@@ -313,7 +313,7 @@
 "中定义使用连接抓取:"
 
 #. Tag: programlisting
-#: performance.xml:177
+#: performance.xml:201
 #, no-c-format
 msgid ""
 "<![CDATA[<set name=\"permissions\" \n"
@@ -324,13 +324,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 "
@@ -339,31 +339,31 @@
 "在映射文档中定义的<literal>抓取</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 "条件查询"
 
 #. 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
+#: performance.xml:232
 #, no-c-format
 msgid ""
 "No matter what fetching strategy you use, the defined non-lazy graph is "
@@ -374,7 +374,7 @@
 "意味着在一条HQL查询后紧跟着一系列的查询。"
 
 #. Tag: para
-#: performance.xml:214
+#: performance.xml:238
 #, no-c-format
 msgid ""
 "Usually, we don't use the mapping document to customize fetching. Instead, "
@@ -391,7 +391,7 @@
 "<literal>setFetchMode(FetchMode.JOIN)</literal>语句。"
 
 #. Tag: para
-#: performance.xml:223
+#: performance.xml:247
 #, no-c-format
 msgid ""
 "If you ever feel like you wish you could change the fetching strategy used "
@@ -402,7 +402,7 @@
 "<literal>load()</literal>语句中的数据抓取策略。例如:"
 
 #. Tag: programlisting
-#: performance.xml:229
+#: performance.xml:253
 #, no-c-format
 msgid ""
 "<![CDATA[User user = (User) session.createCriteria(User.class)\n"
@@ -412,7 +412,7 @@
 msgstr ""
 
 #. Tag: para
-#: performance.xml:231
+#: performance.xml:255
 #, no-c-format
 msgid ""
 "(This is Hibernate's equivalent of what some ORM solutions call a \"fetch "
@@ -421,7 +421,7 @@
 "(这就是其他ORM解决方案的“抓取计划(fetch plan)”在Hibernate中的等价物。)"
 
 #. Tag: para
-#: performance.xml:235
+#: performance.xml:259
 #, no-c-format
 msgid ""
 "A completely different way to avoid problems with N+1 selects is to use the "
@@ -429,13 +429,13 @@
 msgstr "截然不同的一种避免N+1次查询的方法是,使用二级缓存。"
 
 #. Tag: title
-#: performance.xml:243
+#: performance.xml:267
 #, no-c-format
 msgid "Single-ended association proxies"
 msgstr "单端关联代理(Single-ended association proxies)"
 
 #. Tag: para
-#: performance.xml:245
+#: performance.xml:269
 #, no-c-format
 msgid ""
 "Lazy fetching for collections is implemented using Hibernate's own "
@@ -450,7 +450,7 @@
 "在运行期二进制级(通过优异的CGLIB库), 为持久对象实现了延迟载入代理。"
 
 #. Tag: para
-#: performance.xml:253
+#: performance.xml:277
 #, no-c-format
 msgid ""
 "By default, Hibernate3 generates proxies (at startup) for all persistent "
@@ -462,7 +462,7 @@
 "one)</literal> 关联的延迟抓取。"
 
 #. Tag: para
-#: performance.xml:259
+#: performance.xml:283
 #, no-c-format
 msgid ""
 "The mapping file may declare an interface to use as the proxy interface for "
@@ -477,7 +477,7 @@
 "样的构造函数</emphasis>"
 
 #. Tag: para
-#: performance.xml:266
+#: performance.xml:290
 #, no-c-format
 msgid ""
 "There are some gotchas to be aware of when extending this approach to "
@@ -485,7 +485,7 @@
 msgstr "在如此方式定义一个多态类的时候,有许多值得注意的常见性的问题,例如:"
 
 #. Tag: programlisting
-#: performance.xml:271
+#: performance.xml:295
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Cat\" proxy=\"Cat\">\n"
@@ -497,7 +497,7 @@
 msgstr ""
 
 #. Tag: para
-#: performance.xml:273
+#: performance.xml:297
 #, no-c-format
 msgid ""
 "Firstly, instances of <literal>Cat</literal> will never be castable to "
@@ -508,7 +508,7 @@
 "literal>, 即使它本身就是<literal>DomesticCat</literal>实例。"
 
 #. Tag: programlisting
-#: performance.xml:279
+#: performance.xml:303
 #, no-c-format
 msgid ""
 "<![CDATA[Cat cat = (Cat) session.load(Cat.class, id);  // instantiate a "
@@ -521,13 +521,13 @@
 msgstr ""
 
 #. Tag: para
-#: performance.xml:281
+#: performance.xml:305
 #, no-c-format
 msgid "Secondly, it is possible to break proxy <literal>==</literal>."
 msgstr "其次,代理的“<literal>==</literal>”可能不再成立。"
 
 #. Tag: programlisting
-#: performance.xml:285
+#: performance.xml:309
 #, no-c-format
 msgid ""
 "<![CDATA[Cat cat = (Cat) session.load(Cat.class, id);            // "
@@ -539,7 +539,7 @@
 msgstr ""
 
 #. Tag: para
-#: performance.xml:287
+#: performance.xml:311
 #, no-c-format
 msgid ""
 "However, the situation is not quite as bad as it looks. Even though we now "
@@ -550,7 +550,7 @@
 "指向这两个不同的代理对象, 但实际上,其底层应该是同一个实例对象:"
 
 #. Tag: programlisting
-#: performance.xml:292
+#: performance.xml:316
 #, no-c-format
 msgid ""
 "<![CDATA[cat.setWeight(11.0);  // hit the db to initialize the proxy\n"
@@ -558,7 +558,7 @@
 msgstr ""
 
 #. Tag: para
-#: performance.xml:294
+#: performance.xml:318
 #, no-c-format
 msgid ""
 "Third, you may not use a CGLIB proxy for a <literal>final</literal> class or "
@@ -566,7 +566,7 @@
 msgstr "第三,你不能对“final类”或“具有final方法的类”使用CGLIB代理。"
 
 #. Tag: para
-#: performance.xml:299
+#: performance.xml:323
 #, no-c-format
 msgid ""
 "Finally, if your persistent object acquires any resources upon instantiation "
@@ -579,7 +579,7 @@
 "类。"
 
 #. Tag: para
-#: performance.xml:305
+#: performance.xml:329
 #, no-c-format
 msgid ""
 "These problems are all due to fundamental limitations in Java's single "
@@ -592,7 +592,7 @@
 "映射文档中再指定这些接口。例如:"
 
 #. Tag: programlisting
-#: performance.xml:311
+#: performance.xml:335
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"CatImpl\" proxy=\"Cat\">\n"
@@ -604,7 +604,7 @@
 msgstr ""
 
 #. Tag: para
-#: performance.xml:313
+#: performance.xml:337
 #, no-c-format
 msgid ""
 "where <literal>CatImpl</literal> implements the interface <literal>Cat</"
@@ -621,7 +621,7 @@
 "<literal>list()</literal>并不会返回代理对象。)"
 
 #. Tag: programlisting
-#: performance.xml:321
+#: performance.xml:345
 #, no-c-format
 msgid ""
 "<![CDATA[Cat cat = (Cat) session.load(CatImpl.class, catid);\n"
@@ -631,7 +631,7 @@
 msgstr ""
 
 #. Tag: para
-#: performance.xml:323
+#: performance.xml:347
 #, no-c-format
 msgid ""
 "Relationships are also lazily initialized. This means you must declare any "
@@ -642,14 +642,14 @@
 "<literal>Cat</literal>,而不是<literal>CatImpl</literal>。"
 
 #. Tag: para
-#: performance.xml:328
+#: performance.xml:352
 #, no-c-format
 msgid ""
 "Certain operations do <emphasis>not</emphasis> require proxy initialization"
 msgstr "但是,在有些方法中是<emphasis>不需要</emphasis>使用代理的。例如:"
 
 #. Tag: para
-#: performance.xml:334
+#: performance.xml:358
 #, no-c-format
 msgid ""
 "<literal>equals()</literal>, if the persistent class does not override "
@@ -659,7 +659,7 @@
 "literal>方法。"
 
 #. Tag: para
-#: performance.xml:340
+#: performance.xml:364
 #, no-c-format
 msgid ""
 "<literal>hashCode()</literal>, if the persistent class does not override "
@@ -669,13 +669,13 @@
 "literal>方法。"
 
 #. Tag: para
-#: performance.xml:346
+#: performance.xml:370
 #, no-c-format
 msgid "The identifier getter method"
 msgstr "标志符的getter方法。"
 
 #. Tag: para
-#: performance.xml:352
+#: performance.xml:376
 #, no-c-format
 msgid ""
 "Hibernate will detect persistent classes that override <literal>equals()</"
@@ -685,7 +685,7 @@
 "()</literal>方法的持久化类。"
 
 #. Tag: para
-#: performance.xml:357
+#: performance.xml:381
 #, no-c-format
 msgid ""
 "By choosing <literal>lazy=\"no-proxy\"</literal> instead of the default "
@@ -698,13 +698,13 @@
 "强,并且所有的操作都会导致立刻进行代理初始化。"
 
 #. Tag: title
-#: performance.xml:367
+#: performance.xml:391
 #, no-c-format
 msgid "Initializing collections and proxies"
 msgstr "实例化集合和代理(Initializing collections and proxies)"
 
 #. Tag: para
-#: performance.xml:369
+#: performance.xml:393
 #, no-c-format
 msgid ""
 "A <literal>LazyInitializationException</literal> will be thrown by Hibernate "
@@ -717,7 +717,7 @@
 "下,访问一个实体所拥有的集合,或者访问其指向代理的属性时,会引发此异常。"
 
 #. Tag: para
-#: performance.xml:375
+#: performance.xml:399
 #, no-c-format
 msgid ""
 "Sometimes we need to ensure that a proxy or collection is initialized before "
@@ -732,7 +732,7 @@
 "也不符合通常的代码规范。"
 
 #. Tag: para
-#: performance.xml:382
+#: performance.xml:406
 #, no-c-format
 msgid ""
 "The static methods <literal>Hibernate.initialize()</literal> and "
@@ -750,7 +750,7 @@
 "合具有同样的功能。"
 
 #. Tag: para
-#: performance.xml:391
+#: performance.xml:415
 #, no-c-format
 msgid ""
 "Another option is to keep the <literal>Session</literal> open until all "
@@ -768,7 +768,7 @@
 "题。有两种方法可以解决此问题:"
 
 #. Tag: para
-#: performance.xml:402
+#: performance.xml:426
 #, no-c-format
 msgid ""
 "In a web-based application, a servlet filter can be used to close the "
@@ -789,7 +789,7 @@
 "的, 请参见Hibernate wiki上的\"Open Session in View\"模式,你可以找到示例。"
 
 #. Tag: para
-#: performance.xml:415
+#: performance.xml:439
 #, no-c-format
 msgid ""
 "In an application with a separate business tier, the business logic must "
@@ -815,7 +815,7 @@
 "那么这项任务将会变得简单的多。"
 
 #. Tag: para
-#: performance.xml:430
+#: performance.xml:454
 #, no-c-format
 msgid ""
 "You may also attach a previously loaded object to a new <literal>Session</"
@@ -830,7 +830,7 @@
 "务,因为这将引入一个特殊的事务语义。"
 
 #. Tag: para
-#: performance.xml:440
+#: performance.xml:464
 #, no-c-format
 msgid ""
 "Sometimes you don't want to initialize a large collection, but still need "
@@ -840,7 +840,7 @@
 "小)、或者集合的部分内容。"
 
 #. Tag: para
-#: performance.xml:445
+#: performance.xml:469
 #, no-c-format
 msgid ""
 "You can use a collection filter to get the size of a collection without "
@@ -848,7 +848,7 @@
 msgstr "你可以使用集合过滤器得到其集合的大小,而不必实例化整个集合:"
 
 #. Tag: programlisting
-#: performance.xml:449
+#: performance.xml:473
 #, no-c-format
 msgid ""
 "<![CDATA[( (Integer) s.createFilter( collection, \"select count(*)\" ).list"
@@ -856,7 +856,7 @@
 msgstr ""
 
 #. Tag: para
-#: performance.xml:451
+#: performance.xml:475
 #, no-c-format
 msgid ""
 "The <literal>createFilter()</literal> method is also used to efficiently "
@@ -867,7 +867,7 @@
 "容,而无需实例化整个集合:"
 
 #. Tag: programlisting
-#: performance.xml:456
+#: performance.xml:480
 #, no-c-format
 msgid ""
 "<![CDATA[s.createFilter( lazyCollection, \"\").setFirstResult(0)."
@@ -875,13 +875,13 @@
 msgstr ""
 
 #. Tag: title
-#: performance.xml:461
+#: performance.xml:485
 #, no-c-format
 msgid "Using batch fetching"
 msgstr "使用批量抓取(Using batch fetching)"
 
 #. Tag: para
-#: performance.xml:463
+#: performance.xml:487
 #, no-c-format
 msgid ""
 "Hibernate can make efficient use of batch fetching, that is, Hibernate can "
@@ -895,7 +895,7 @@
 "你可以在两种批量抓取方案之间进行选择:在类级别和集合级别。"
 
 #. Tag: para
-#: performance.xml:469
+#: performance.xml:493
 #, no-c-format
 msgid ""
 "Batch fetching for classes/entities is easier to understand. Imagine you "
@@ -920,25 +920,25 @@
 "改变其行为:"
 
 #. Tag: programlisting
-#: performance.xml:479
+#: performance.xml:503
 #, no-c-format
 msgid "<![CDATA[<class name=\"Person\" batch-size=\"10\">...</class>]]>"
 msgstr ""
 
 #. Tag: para
-#: performance.xml:481
+#: performance.xml:505
 #, no-c-format
 msgid ""
 "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:509
+#, fuzzy, 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>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 "
@@ -952,7 +952,7 @@
 "取, 那么,Hibernate将可以预先抓取整个集合。请看例子:"
 
 #. Tag: programlisting
-#: performance.xml:494
+#: performance.xml:518
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Person\">\n"
@@ -963,7 +963,7 @@
 msgstr ""
 
 #. Tag: para
-#: performance.xml:496
+#: performance.xml:520
 #, no-c-format
 msgid ""
 "With a <literal>batch-size</literal> of 3, Hibernate will load 3, 3, 3, 1 "
@@ -977,7 +977,7 @@
 "数。"
 
 #. Tag: para
-#: performance.xml:502
+#: performance.xml:526
 #, no-c-format
 msgid ""
 "Batch fetching of collections is particularly useful if you have a nested "
@@ -991,13 +991,13 @@
 "path)</emphasis>(××) 是更好的解决方法。)"
 
 #. Tag: title
-#: performance.xml:511
+#: performance.xml:535
 #, no-c-format
 msgid "Using subselect fetching"
 msgstr "使用子查询抓取(Using subselect fetching)"
 
 #. Tag: para
-#: performance.xml:513
+#: performance.xml:537
 #, no-c-format
 msgid ""
 "If one lazy collection or single-valued proxy has to be fetched, Hibernate "
@@ -1009,13 +1009,13 @@
 "载。"
 
 #. Tag: title
-#: performance.xml:524
+#: performance.xml:548
 #, no-c-format
 msgid "Using lazy property fetching"
 msgstr "使用延迟属性抓取(Using lazy property fetching)"
 
 #. Tag: para
-#: performance.xml:526
+#: performance.xml:550
 #, no-c-format
 msgid ""
 "Hibernate3 supports the lazy fetching of individual properties. This "
@@ -1032,7 +1032,7 @@
 "有用,例如在原有表中拥有几百列数据、数据模型无法改动的情况下。"
 
 #. Tag: para
-#: performance.xml:535
+#: performance.xml:559
 #, no-c-format
 msgid ""
 "To enable lazy property loading, set the <literal>lazy</literal> attribute "
@@ -1042,7 +1042,7 @@
 "入。"
 
 #. Tag: programlisting
-#: performance.xml:540
+#: performance.xml:564
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Document\">\n"
@@ -1058,7 +1058,7 @@
 msgstr ""
 
 #. Tag: para
-#: performance.xml:542
+#: performance.xml:566
 #, no-c-format
 msgid ""
 "Lazy property loading requires buildtime bytecode instrumentation! If your "
@@ -1070,13 +1070,13 @@
 "属性的延迟设置,仍然将其直接载入。"
 
 #. Tag: para
-#: performance.xml:548
+#: performance.xml:572
 #, no-c-format
 msgid "For bytecode instrumentation, use the following Ant task:"
 msgstr "你可以在Ant的Task中,进行如下定义,对持久类代码加入“二进制指令。”"
 
 #. Tag: programlisting
-#: performance.xml:552
+#: performance.xml:576
 #, no-c-format
 msgid ""
 "<![CDATA[<target name=\"instrument\" depends=\"compile\">\n"
@@ -1096,20 +1096,20 @@
 msgstr ""
 
 #. Tag: para
-#: performance.xml:554
-#, no-c-format
+#: performance.xml:578
+#, 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."
+"certainly a preferred solution."
 msgstr ""
 "还有一种可以优化的方法,它使用HQL或条件查询的投影(projection)特性,可以避免"
 "读取非必要的列, 这一点至少对只读事务是非常有用的。它无需在代码构建时“二进制"
 "指令”处理,因此是一个更加值得选择的解决方法。"
 
 #. Tag: para
-#: performance.xml:561
+#: performance.xml:585
 #, no-c-format
 msgid ""
 "You may force the usual eager fetching of properties using <literal>fetch "
@@ -1118,13 +1118,13 @@
 "有时你需要在HQL中通过<literal>抓取所有属性</literal>,强行抓取所有内容。"
 
 #. Tag: title
-#: performance.xml:571
+#: performance.xml:595
 #, no-c-format
 msgid "The Second Level Cache"
 msgstr "二级缓存(The Second Level Cache)"
 
 #. Tag: para
-#: performance.xml:573
+#: performance.xml:597
 #, no-c-format
 msgid ""
 "A Hibernate <literal>Session</literal> is a transaction-level cache of "
@@ -1142,7 +1142,7 @@
 "(即使可以将缓存数据设定为定期失效)。"
 
 #. Tag: para
-#: performance.xml:581
+#: performance.xml:605
 #, no-c-format
 msgid ""
 "You have the option to tell Hibernate which caching implementation to use by "
@@ -1161,162 +1161,180 @@
 "意,在3.2版本之前,默认使用EhCache 作为缓存实现,但从3.2起就不再这样了。"
 
 #. Tag: title
-#: performance.xml:592
+#: performance.xml:616
 #, no-c-format
 msgid "Cache Providers"
 msgstr "缓存策略提供商(Cache Providers)"
 
 #. Tag: entry
-#: performance.xml:601 performance.xml:774
+#: performance.xml:625 performance.xml:813
 #, no-c-format
 msgid "Cache"
 msgstr "Cache"
 
 #. Tag: entry
-#: performance.xml:602
+#: performance.xml:626
 #, no-c-format
 msgid "Provider class"
 msgstr "Provider class"
 
 #. Tag: entry
-#: performance.xml:603
+#: performance.xml:627
 #, no-c-format
 msgid "Type"
 msgstr "Type"
 
 #. Tag: entry
-#: performance.xml:604
+#: performance.xml:628
 #, no-c-format
 msgid "Cluster Safe"
 msgstr "Cluster Safe"
 
 #. Tag: entry
-#: performance.xml:605
+#: performance.xml:629
 #, no-c-format
 msgid "Query Cache Supported"
 msgstr "Query Cache Supported"
 
 #. Tag: entry
-#: performance.xml:610 performance.xml:783
+#: performance.xml:634 performance.xml:822
 #, no-c-format
 msgid "Hashtable (not intended for production use)"
 msgstr "Hashtable (not intended for production use)"
 
 #. Tag: literal
-#: performance.xml:611
+#: performance.xml:635
 #, no-c-format
 msgid "org.hibernate.cache.HashtableCacheProvider"
 msgstr "org.hibernate.cache.HashtableCacheProvider"
 
 #. Tag: entry
-#: performance.xml:612
+#: performance.xml:636
 #, 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: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
 #, no-c-format
 msgid "<entry>yes</entry>"
 msgstr ""
 
 #. Tag: entry
-#: performance.xml:617 performance.xml:790
+#: performance.xml:641 performance.xml:829
 #, no-c-format
 msgid "EHCache"
 msgstr "EHCache"
 
 #. Tag: literal
-#: performance.xml:618
+#: performance.xml:642
 #, no-c-format
 msgid "org.hibernate.cache.EhCacheProvider"
 msgstr "org.hibernate.cache.EhCacheProvider"
 
 #. Tag: entry
-#: performance.xml:619 performance.xml:626
+#: performance.xml:643 performance.xml:650
 #, no-c-format
 msgid "memory, disk"
 msgstr "memory, disk"
 
 #. Tag: entry
-#: performance.xml:624 performance.xml:797
+#: performance.xml:648 performance.xml:836
 #, no-c-format
 msgid "OSCache"
 msgstr "OSCache"
 
 #. Tag: literal
-#: performance.xml:625
+#: performance.xml:649
 #, no-c-format
 msgid "org.hibernate.cache.OSCacheProvider"
 msgstr "org.hibernate.cache.OSCacheProvider"
 
 #. Tag: entry
-#: performance.xml:631 performance.xml:804
+#: performance.xml:655 performance.xml:843
 #, no-c-format
 msgid "SwarmCache"
 msgstr "SwarmCache"
 
 #. Tag: literal
-#: performance.xml:632
+#: performance.xml:656
 #, no-c-format
 msgid "org.hibernate.cache.SwarmCacheProvider"
 msgstr "org.hibernate.cache.SwarmCacheProvider"
 
 #. Tag: entry
-#: performance.xml:633
+#: performance.xml:657
 #, no-c-format
 msgid "clustered (ip multicast)"
 msgstr "clustered (ip multicast)"
 
 #. Tag: entry
-#: performance.xml:634
+#: performance.xml:658
 #, 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:662 performance.xml:850
+#, fuzzy, no-c-format
+msgid "JBoss Cache 1.x"
 msgstr "JBoss TreeCache"
 
 #. Tag: literal
-#: performance.xml:639
+#: performance.xml:663
 #, no-c-format
 msgid "org.hibernate.cache.TreeCacheProvider"
 msgstr "org.hibernate.cache.TreeCacheProvider"
 
 #. Tag: entry
-#: performance.xml:640
+#: performance.xml:664 performance.xml:671
 #, no-c-format
 msgid "clustered (ip multicast), transactional"
 msgstr "clustered (ip multicast), transactional"
 
 #. Tag: entry
-#: performance.xml:641
+#: performance.xml:665
 #, no-c-format
 msgid "yes (replication)"
 msgstr "yes (replication)"
 
 #. Tag: entry
-#: performance.xml:642
+#: performance.xml:666 performance.xml:673
 #, no-c-format
 msgid "yes (clock sync req.)"
 msgstr "yes (clock sync req.)"
 
+#. Tag: entry
+#: performance.xml:669 performance.xml:857
+#, fuzzy, no-c-format
+msgid "JBoss Cache 2"
+msgstr "JBoss TreeCache"
+
+#. Tag: literal
+#: performance.xml:670
+#, fuzzy, no-c-format
+msgid "org.hibernate.cache.jbc2.JBossCacheRegionFactory"
+msgstr "org.hibernate.cache.EhCacheProvider"
+
+#. Tag: entry
+#: performance.xml:672
+#, fuzzy, no-c-format
+msgid "yes (replication or invalidation)"
+msgstr "yes (clustered invalidation)"
+
 #. Tag: title
-#: performance.xml:649
+#: performance.xml:680
 #, no-c-format
 msgid "Cache mappings"
 msgstr "缓存映射(Cache mappings)"
 
 #. Tag: para
-#: performance.xml:651
+#: performance.xml:682
 #, no-c-format
 msgid ""
 "The <literal>&lt;cache&gt;</literal> element of a class or collection "
@@ -1324,7 +1342,7 @@
 msgstr "类或者集合映射的“<literal>&lt;cache&gt;</literal>元素”可以有下列形式:"
 
 #. Tag: programlisting
-#: performance.xml:662
+#: performance.xml:693
 #, no-c-format
 msgid ""
 "<![CDATA[<cache \n"
@@ -1335,7 +1353,7 @@
 msgstr ""
 
 #. Tag: para
-#: performance.xml:665
+#: performance.xml:696
 #, no-c-format
 msgid ""
 "<literal>usage</literal> (required) specifies the caching strategy: "
@@ -1347,7 +1365,7 @@
 "literal>或 <literal>read-only</literal>。"
 
 #. Tag: para
-#: performance.xml:674
+#: performance.xml:705
 #, no-c-format
 msgid ""
 "<literal>region</literal> (optional, defaults to the class or collection "
@@ -1357,7 +1375,7 @@
 "role name)) 指定第二级缓存的区域名(name of the second level cache region)"
 
 #. Tag: para
-#: performance.xml:681
+#: performance.xml:712
 #, no-c-format
 msgid ""
 "<literal>include</literal> (optional, defaults to <literal>all</literal>) "
@@ -1370,10 +1388,10 @@
 "的实体的属性可能无法被缓存"
 
 #. Tag: para
-#: performance.xml:691
-#, no-c-format
+#: performance.xml:722
+#, fuzzy, no-c-format
 msgid ""
-"Alternatively (preferrably?), you may specify <literal>&lt;class-cache&gt;</"
+"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>."
 msgstr ""
@@ -1381,7 +1399,7 @@
 "literal>和 <literal>&lt;collection-cache&gt;</literal> 元素。"
 
 #. Tag: para
-#: performance.xml:696
+#: performance.xml:727
 #, no-c-format
 msgid ""
 "The <literal>usage</literal> attribute specifies a <emphasis>cache "
@@ -1391,13 +1409,13 @@
 "concurrency strategy)</emphasis>。"
 
 #. Tag: title
-#: performance.xml:703
+#: performance.xml:734
 #, no-c-format
 msgid "Strategy: read only"
 msgstr "策略:只读缓存(Strategy: read only)"
 
 #. Tag: para
-#: performance.xml:705
+#: performance.xml:736
 #, no-c-format
 msgid ""
 "If your application needs to read but never modify instances of a persistent "
@@ -1410,7 +1428,7 @@
 "中,它也能完美地运作。"
 
 #. Tag: programlisting
-#: performance.xml:711
+#: performance.xml:742
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"eg.Immutable\" mutable=\"false\">\n"
@@ -1420,13 +1438,13 @@
 msgstr ""
 
 #. Tag: title
-#: performance.xml:717
+#: performance.xml:748
 #, no-c-format
 msgid "Strategy: read/write"
 msgstr "策略:读/写缓存(Strategy: read/write)"
 
 #. Tag: para
-#: performance.xml:719
+#: performance.xml:750
 #, no-c-format
 msgid ""
 "If the application needs to update data, a <literal>read-write</literal> "
@@ -1452,7 +1470,7 @@
 "置的缓存策略并不支持锁定功能。"
 
 #. Tag: programlisting
-#: performance.xml:730
+#: performance.xml:761
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"eg.Cat\" .... >\n"
@@ -1466,13 +1484,13 @@
 msgstr ""
 
 #. Tag: title
-#: performance.xml:735
+#: performance.xml:766
 #, no-c-format
 msgid "Strategy: nonstrict read/write"
 msgstr "策略:非严格读/写缓存(Strategy: nonstrict read/write)"
 
 #. Tag: para
-#: performance.xml:737
+#: performance.xml:768
 #, no-c-format
 msgid ""
 "If the application only occasionally needs to update data (ie. if it is "
@@ -1492,13 +1510,13 @@
 "literal>调用前, 整个事务已经结束。"
 
 #. Tag: title
-#: performance.xml:749
+#: performance.xml:780
 #, no-c-format
 msgid "Strategy: transactional"
 msgstr "策略:事务缓存(transactional)"
 
 #. Tag: para
-#: performance.xml:751
+#: performance.xml:782
 #, no-c-format
 msgid ""
 "The <literal>transactional</literal> cache strategy provides support for "
@@ -1510,11 +1528,26 @@
 "JBoss TreeCache的支持。这样的缓存只能用于JTA环境中,你必须指定 为其"
 "<literal>hibernate.transaction.manager_lookup_class</literal>属性。"
 
+#. Tag: title
+#: performance.xml:791
+#, 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:794
+#, 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:799
+#, fuzzy, no-c-format
+msgid ""
 "The following table shows which providers are compatible with which "
 "concurrency strategies."
 msgstr ""
@@ -1522,44 +1555,44 @@
 "其各自适用的并发策略。"
 
 #. Tag: title
-#: performance.xml:765
+#: performance.xml:804
 #, no-c-format
 msgid "Cache Concurrency Strategy Support"
 msgstr ""
 "各种缓存提供商对缓存并发策略的支持情况(Cache Concurrency Strategy Support)"
 
 #. Tag: entry
-#: performance.xml:775
+#: performance.xml:814
 #, no-c-format
 msgid "read-only"
 msgstr "read-only"
 
 #. Tag: entry
-#: performance.xml:776
+#: performance.xml:815
 #, no-c-format
 msgid "nonstrict-read-write"
 msgstr "nonstrict-read-write"
 
 #. Tag: entry
-#: performance.xml:777
+#: performance.xml:816
 #, no-c-format
 msgid "read-write"
 msgstr "read-write"
 
 #. Tag: entry
-#: performance.xml:778
+#: performance.xml:817
 #, no-c-format
 msgid "transactional"
 msgstr "transactional"
 
 #. Tag: title
-#: performance.xml:824
+#: performance.xml:872
 #, no-c-format
 msgid "Managing the caches"
 msgstr "管理缓存(Managing the caches)"
 
 #. Tag: para
-#: performance.xml:826
+#: performance.xml:874
 #, no-c-format
 msgid ""
 "Whenever you pass an object to <literal>save()</literal>, <literal>update()</"
@@ -1576,7 +1609,7 @@
 "时, 该对象都将被加入到<literal>Session</literal>的内部缓存中。"
 
 #. Tag: para
-#: performance.xml:833
+#: performance.xml:881
 #, no-c-format
 msgid ""
 "When <literal>flush()</literal> is subsequently called, the state of that "
@@ -1591,7 +1624,7 @@
 "<literal>evict()</literal> 方法,从一级缓存中去掉这些对象及其集合。"
 
 #. Tag: programlisting
-#: performance.xml:841
+#: performance.xml:889
 #, no-c-format
 msgid ""
 "<![CDATA[ScrollableResult cats = sess.createQuery(\"from Cat as cat\").scroll"
@@ -1604,7 +1637,7 @@
 msgstr ""
 
 #. Tag: para
-#: performance.xml:843
+#: performance.xml:891
 #, no-c-format
 msgid ""
 "The <literal>Session</literal> also provides a <literal>contains()</literal> "
@@ -1614,7 +1647,7 @@
 "于当前session的缓存中。"
 
 #. Tag: para
-#: performance.xml:848
+#: performance.xml:896
 #, no-c-format
 msgid ""
 "To completely evict all objects from the session cache, call "
@@ -1624,7 +1657,7 @@
 "</literal>。"
 
 #. Tag: para
-#: performance.xml:852
+#: performance.xml:900
 #, no-c-format
 msgid ""
 "For the second-level cache, there are methods defined on "
@@ -1635,7 +1668,7 @@
 "缓存中实例、整个类、集合实例或者整个集合。"
 
 #. Tag: programlisting
-#: performance.xml:858
+#: performance.xml:906
 #, no-c-format
 msgid ""
 "<![CDATA[sessionFactory.evict(Cat.class, catId); //evict a particular Cat\n"
@@ -1647,7 +1680,7 @@
 msgstr ""
 
 #. Tag: para
-#: performance.xml:860
+#: performance.xml:908
 #, no-c-format
 msgid ""
 "The <literal>CacheMode</literal> controls how a particular session interacts "
@@ -1656,7 +1689,7 @@
 "<literal>CacheMode</literal>参数用于控制具体的Session如何与二级缓存进行交互。"
 
 #. Tag: para
-#: performance.xml:867
+#: performance.xml:915
 #, no-c-format
 msgid ""
 "<literal>CacheMode.NORMAL</literal> - read items from and write items to the "
@@ -1664,7 +1697,7 @@
 msgstr "<literal>CacheMode.NORMAL</literal> - 从二级缓存中读、写数据。"
 
 #. Tag: para
-#: performance.xml:872
+#: performance.xml:920
 #, no-c-format
 msgid ""
 "<literal>CacheMode.GET</literal> - read items from the second-level cache, "
@@ -1674,7 +1707,7 @@
 "缓存写数据。"
 
 #. Tag: para
-#: performance.xml:878
+#: performance.xml:926
 #, no-c-format
 msgid ""
 "<literal>CacheMode.PUT</literal> - write items to the second-level cache, "
@@ -1684,7 +1717,7 @@
 "据。"
 
 #. Tag: para
-#: performance.xml:884
+#: performance.xml:932
 #, no-c-format
 msgid ""
 "<literal>CacheMode.REFRESH</literal> - write items to the second-level "
@@ -1697,7 +1730,7 @@
 "级缓存从数据库中读取数据,刷新缓存内容。"
 
 #. Tag: para
-#: performance.xml:892
+#: performance.xml:940
 #, no-c-format
 msgid ""
 "To browse the contents of a second-level or query cache region, use the "
@@ -1707,7 +1740,7 @@
 "(Statistics)</literal> API。"
 
 #. Tag: programlisting
-#: performance.xml:897
+#: performance.xml:945
 #, no-c-format
 msgid ""
 "<![CDATA[Map cacheEntries = sessionFactory.getStatistics()\n"
@@ -1716,7 +1749,7 @@
 msgstr ""
 
 #. Tag: para
-#: performance.xml:899
+#: performance.xml:947
 #, no-c-format
 msgid ""
 "You'll need to enable statistics, and, optionally, force Hibernate to keep "
@@ -1726,7 +1759,7 @@
 "存内容。"
 
 #. Tag: programlisting
-#: performance.xml:904
+#: performance.xml:952
 #, no-c-format
 msgid ""
 "<![CDATA[hibernate.generate_statistics true\n"
@@ -1734,13 +1767,13 @@
 msgstr ""
 
 #. Tag: title
-#: performance.xml:909
+#: performance.xml:957
 #, no-c-format
 msgid "The Query Cache"
 msgstr "查询缓存(The Query Cache)"
 
 #. Tag: para
-#: performance.xml:911
+#: performance.xml:959
 #, no-c-format
 msgid ""
 "Query result sets may also be cached. This is only useful for queries that "
@@ -1751,13 +1784,13 @@
 "处。 要使用查询缓存,首先你必须打开它:"
 
 #. Tag: programlisting
-#: performance.xml:916
+#: performance.xml:964
 #, no-c-format
 msgid "<![CDATA[hibernate.cache.use_query_cache true]]>"
 msgstr ""
 
 #. Tag: para
-#: performance.xml:918
+#: performance.xml:966
 #, no-c-format
 msgid ""
 "This setting causes the creation of two new cache regions - one holding "
@@ -1776,7 +1809,7 @@
 "识符属性的值、以及各值类型的结果。 所以查询缓存通常会和二级缓存一起使用。"
 
 #. Tag: para
-#: performance.xml:928
+#: performance.xml:976
 #, no-c-format
 msgid ""
 "Most queries do not benefit from caching, so by default queries are not "
@@ -1789,7 +1822,7 @@
 "调用会让查询在执行过程中时先从缓存中查找结果, 并将自己的结果集放到缓存中去。"
 
 #. Tag: para
-#: performance.xml:935
+#: performance.xml:983
 #, no-c-format
 msgid ""
 "If you require fine-grained control over query cache expiration policies, "
@@ -1800,7 +1833,7 @@
 "setCacheRegion()</literal>方法, 为每个查询指定其命名的缓存区域。"
 
 #. Tag: programlisting
-#: performance.xml:941
+#: performance.xml:989
 #, no-c-format
 msgid ""
 "<![CDATA[List blogs = sess.createQuery(\"from Blog blog where blog.blogger "
@@ -1813,7 +1846,7 @@
 msgstr ""
 
 #. Tag: para
-#: performance.xml:943
+#: performance.xml:991
 #, no-c-format
 msgid ""
 "If the query should force a refresh of its query cache region, you should "
@@ -1831,13 +1864,13 @@
 "同样可以清除查询缓存区域。"
 
 #. Tag: title
-#: performance.xml:955
+#: performance.xml:1003
 #, no-c-format
 msgid "Understanding Collection performance"
 msgstr "理解集合性能(Understanding Collection performance)"
 
 #. Tag: para
-#: performance.xml:957
+#: performance.xml:1005
 #, no-c-format
 msgid ""
 "We've already spent quite some time talking about collections. In this "
@@ -1848,37 +1881,37 @@
 "宜。"
 
 #. Tag: title
-#: performance.xml:964
+#: performance.xml:1012
 #, no-c-format
 msgid "Taxonomy"
 msgstr "分类(Taxonomy)"
 
 #. Tag: para
-#: performance.xml:966
+#: performance.xml:1014
 #, no-c-format
 msgid "Hibernate defines three basic kinds of collections:"
 msgstr "Hibernate定义了三种基本类型的集合:"
 
 #. Tag: para
-#: performance.xml:970
+#: performance.xml:1018
 #, no-c-format
 msgid "collections of values"
 msgstr "值数据集合"
 
 #. Tag: para
-#: performance.xml:973
+#: performance.xml:1021
 #, no-c-format
 msgid "one to many associations"
 msgstr "一对多关联"
 
 #. Tag: para
-#: performance.xml:976
+#: performance.xml:1024
 #, no-c-format
 msgid "many to many associations"
 msgstr "多对多关联"
 
 #. Tag: para
-#: performance.xml:980
+#: performance.xml:1028
 #, no-c-format
 msgid ""
 "This classification distinguishes the various table and foreign key "
@@ -1893,25 +1926,25 @@
 "删除集合行数据的主键的结构”。 因此得到了如下的分类:"
 
 #. Tag: para
-#: performance.xml:991
+#: performance.xml:1039
 #, no-c-format
 msgid "indexed collections"
 msgstr "有序集合类"
 
 #. Tag: para
-#: performance.xml:994
+#: performance.xml:1042
 #, no-c-format
 msgid "sets"
 msgstr "集合(sets)"
 
 #. Tag: para
-#: performance.xml:997
+#: performance.xml:1045
 #, no-c-format
 msgid "bags"
 msgstr "包(bags)"
 
 #. Tag: para
-#: performance.xml:1001
+#: performance.xml:1049
 #, no-c-format
 msgid ""
 "All indexed collections (maps, lists, arrays) have a primary key consisting "
@@ -1926,13 +1959,13 @@
 "以迅速找到该行数据。"
 
 #. Tag: para
-#: performance.xml:1009
-#, no-c-format
+#: performance.xml:1057
+#, 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 "
+"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 "
@@ -1947,7 +1980,7 @@
 "键, 你必须把所有的字段都声明为<literal>not-null=\"true\"</literal>。)"
 
 #. Tag: para
-#: performance.xml:1020
+#: performance.xml:1068
 #, no-c-format
 msgid ""
 "<literal>&lt;idbag&gt;</literal> mappings define a surrogate key, so they "
@@ -1957,7 +1990,7 @@
 "新。事实上, <literal>&lt;idbag&gt;</literal>拥有着最好的性能表现。"
 
 #. Tag: para
-#: performance.xml:1025
+#: performance.xml:1073
 #, no-c-format
 msgid ""
 "Bags are the worst case. Since a bag permits duplicate element values and "
@@ -1972,7 +2005,7 @@
 "个集合。 因此Bag是非常低效的。"
 
 #. Tag: para
-#: performance.xml:1033
+#: performance.xml:1081
 #, no-c-format
 msgid ""
 "Note that for a one-to-many association, the \"primary key\" may not be the "
@@ -1985,14 +2018,14 @@
 "何进行“定位”的。)"
 
 #. Tag: title
-#: performance.xml:1043
+#: performance.xml:1091
 #, no-c-format
 msgid ""
 "Lists, maps, idbags and sets are the most efficient collections to update"
 msgstr "Lists, maps 和sets用于更新效率最高"
 
 #. Tag: para
-#: performance.xml:1045
+#: performance.xml:1093
 #, no-c-format
 msgid ""
 "From the discussion above, it should be clear that indexed collections and "
@@ -2003,7 +2036,7 @@
 "拥有最好的性能。"
 
 #. Tag: para
-#: performance.xml:1051
+#: performance.xml:1099
 #, no-c-format
 msgid ""
 "There is, arguably, one more advantage that indexed collections have over "
@@ -2021,7 +2054,7 @@
 "时“改变”才有效。再次强调:这段讨论对“一对多关联”并不适用。"
 
 #. Tag: para
-#: performance.xml:1060
+#: performance.xml:1108
 #, no-c-format
 msgid ""
 "After observing that arrays cannot be lazy, we would conclude that lists, "
@@ -2035,7 +2068,7 @@
 "因为“set”的语义在关系模型中是最自然的。"
 
 #. Tag: para
-#: performance.xml:1068
+#: performance.xml:1116
 #, no-c-format
 msgid ""
 "However, in well-designed Hibernate domain models, we usually see that most "
@@ -2049,13 +2082,13 @@
 "会在多对一的这一端进行处理。因此对于此类情况,无需考虑其集合的更新性能。"
 
 #. Tag: title
-#: performance.xml:1078
+#: performance.xml:1126
 #, no-c-format
 msgid "Bags and lists are the most efficient inverse collections"
 msgstr "Bag和list是反向集合类中效率最高的"
 
 #. Tag: para
-#: performance.xml:1080
+#: performance.xml:1128
 #, no-c-format
 msgid ""
 "Just before you ditch bags forever, there is a particular case in which bags "
@@ -2076,7 +2109,7 @@
 "于下面的相同代码来说,速度会快得多。"
 
 #. Tag: programlisting
-#: performance.xml:1090
+#: performance.xml:1138
 #, no-c-format
 msgid ""
 "<![CDATA[Parent p = (Parent) sess.load(Parent.class, id);\n"
@@ -2087,13 +2120,13 @@
 msgstr ""
 
 #. Tag: title
-#: performance.xml:1095
+#: performance.xml:1143
 #, no-c-format
 msgid "One shot delete"
 msgstr "一次性删除(One shot delete)"
 
 #. Tag: para
-#: performance.xml:1097
+#: performance.xml:1145
 #, no-c-format
 msgid ""
 "Occasionally, deleting collection elements one by one can be extremely "
@@ -2107,7 +2140,7 @@
 "了。"
 
 #. Tag: para
-#: performance.xml:1104
+#: performance.xml:1152
 #, no-c-format
 msgid ""
 "Suppose we add a single element to a collection of size twenty and then "
@@ -2120,7 +2153,7 @@
 "(除非集合类是一个bag)。 这当然是显而易见的。"
 
 #. Tag: para
-#: performance.xml:1110
+#: performance.xml:1158
 #, no-c-format
 msgid ""
 "However, suppose that we remove eighteen elements, leaving two and then add "
@@ -2129,13 +2162,13 @@
 "但是,假设我们删除了18个数据,只剩下2个,然后新增3个。则有两种处理方式:"
 
 #. Tag: para
-#: performance.xml:1117
+#: performance.xml:1165
 #, no-c-format
 msgid "delete eighteen rows one by one and then insert three rows"
 msgstr "逐一的删除这18个数据,再新增三个;"
 
 #. Tag: para
-#: performance.xml:1120
+#: performance.xml:1168
 #, no-c-format
 msgid ""
 "remove the whole collection (in one SQL <literal>DELETE</literal>) and "
@@ -2143,7 +2176,7 @@
 msgstr "删除整个集合类(只用一句DELETE语句),然后增加5个数据。"
 
 #. Tag: para
-#: performance.xml:1125
+#: performance.xml:1173
 #, no-c-format
 msgid ""
 "Hibernate isn't smart enough to know that the second option is probably "
@@ -2154,7 +2187,7 @@
 "明也是好事,否则可能会引发意外的“数据库触发器”之类的问题。)"
 
 #. Tag: para
-#: performance.xml:1131
+#: performance.xml:1179
 #, no-c-format
 msgid ""
 "Fortunately, you can force this behaviour (ie. the second strategy) at any "
@@ -2167,7 +2200,7 @@
 "用的。"
 
 #. Tag: para
-#: performance.xml:1137
+#: performance.xml:1185
 #, no-c-format
 msgid ""
 "Of course, one-shot-delete does not apply to collections mapped "
@@ -2176,13 +2209,13 @@
 "显然,一次性删除并不适用于被映射为<literal>inverse=\"true\"</literal>的集合。"
 
 #. Tag: title
-#: performance.xml:1146
+#: performance.xml:1194
 #, no-c-format
 msgid "Monitoring performance"
 msgstr "监测性能(Monitoring performance)"
 
 #. Tag: para
-#: performance.xml:1148
+#: performance.xml:1196
 #, no-c-format
 msgid ""
 "Optimization is not much use without monitoring and access to performance "
@@ -2194,13 +2227,13 @@
 "示意图,因此可以从 每个<literal>SessionFactory</literal>抓取其统计数据。"
 
 #. Tag: title
-#: performance.xml:1155
+#: performance.xml:1203
 #, no-c-format
 msgid "Monitoring a SessionFactory"
 msgstr "监测SessionFactory"
 
 #. Tag: para
-#: performance.xml:1157
+#: performance.xml:1205
 #, no-c-format
 msgid ""
 "You can access <literal>SessionFactory</literal> metrics in two ways. Your "
@@ -2212,7 +2245,7 @@
 "<literal>统计</literal>数据。"
 
 #. Tag: para
-#: performance.xml:1163
+#: performance.xml:1211
 #, no-c-format
 msgid ""
 "Hibernate can also use JMX to publish metrics if you enable the "
@@ -2226,7 +2259,7 @@
 "分配一个MBean。下面的代码即是其演示代码:"
 
 #. Tag: programlisting
-#: performance.xml:1170
+#: performance.xml:1218
 #, no-c-format
 msgid ""
 "<![CDATA[// MBean service registration for a specific SessionFactory\n"
@@ -2242,7 +2275,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: performance.xml:1173
+#: performance.xml:1221
 #, no-c-format
 msgid ""
 "<![CDATA[// MBean service registration for all SessionFactory's\n"
@@ -2256,7 +2289,7 @@
 msgstr ""
 
 #. Tag: para
-#: performance.xml:1175
+#: performance.xml:1223
 #, no-c-format
 msgid ""
 "TODO: This doesn't make sense: In the first case, we retrieve and use the "
@@ -2270,7 +2303,7 @@
 "literal> 得到SessionFactory,然后将MBean保存于其中。"
 
 #. Tag: para
-#: performance.xml:1180
+#: performance.xml:1228
 #, no-c-format
 msgid ""
 "You can (de)activate the monitoring for a <literal>SessionFactory</literal>"
@@ -2278,7 +2311,7 @@
 "你可以通过以下方法打开或关闭<literal>SessionFactory</literal>的监测功能:"
 
 #. Tag: para
-#: performance.xml:1185
+#: performance.xml:1233
 #, no-c-format
 msgid ""
 "at configuration time, set <literal>hibernate.generate_statistics</literal> "
@@ -2288,7 +2321,7 @@
 "<literal>true</literal>或<literal>false</literal>;"
 
 #. Tag: para
-#: performance.xml:1192
+#: performance.xml:1240
 #, no-c-format
 msgid ""
 "at runtime: <literal>sf.getStatistics().setStatisticsEnabled(true)</literal> "
@@ -2299,24 +2332,24 @@
 "literal>"
 
 #. Tag: para
-#: performance.xml:1199
-#, no-c-format
+#: performance.xml:1247
+#, 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>方法重置统计数据,调用"
 "<literal>logSummary()</literal> 在日志中记录(info级别)其总结。"
 
 #. Tag: title
-#: performance.xml:1208
+#: performance.xml:1256
 #, no-c-format
 msgid "Metrics"
 msgstr "数据记录(Metrics)"
 
 #. Tag: para
-#: performance.xml:1210
+#: performance.xml:1258
 #, no-c-format
 msgid ""
 "Hibernate provides a number of metrics, from very basic to the specialized "
@@ -2329,7 +2362,7 @@
 "分为三类:"
 
 #. Tag: para
-#: performance.xml:1217
+#: performance.xml:1265
 #, no-c-format
 msgid ""
 "Metrics related to the general <literal>Session</literal> usage, such as "
@@ -2339,7 +2372,7 @@
 "JDBC的连接数等;"
 
 #. Tag: para
-#: performance.xml:1223
+#: performance.xml:1271
 #, no-c-format
 msgid ""
 "Metrics related to he entities, collections, queries, and caches as a whole "
@@ -2347,7 +2380,7 @@
 msgstr "实体、集合、查询、缓存等内容的统一数据记录"
 
 #. Tag: para
-#: performance.xml:1229
+#: performance.xml:1277
 #, no-c-format
 msgid ""
 "Detailed metrics related to a particular entity, collection, query or cache "
@@ -2355,10 +2388,10 @@
 msgstr "和具体实体、集合、查询、缓存相关的详细数据记录"
 
 #. Tag: para
-#: performance.xml:1236
-#, no-c-format
+#: performance.xml:1284
+#, fuzzy, no-c-format
 msgid ""
-"For exampl,e you can check the cache hit, miss, and put ratio of entities, "
+"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 "
@@ -2369,7 +2402,7 @@
 "精度和具体的JVM有关,在有些平台上其精度甚至只能精确到10秒。"
 
 #. Tag: para
-#: performance.xml:1243
+#: performance.xml:1291
 #, no-c-format
 msgid ""
 "Simple getters are used to access the global metrics (i.e. not tied to a "
@@ -2390,7 +2423,7 @@
 "literal>的API文档以抓取更多信息。下面的代码则是个简单的例子:"
 
 #. Tag: programlisting
-#: performance.xml:1253
+#: performance.xml:1301
 #, no-c-format
 msgid ""
 "<![CDATA[Statistics stats = HibernateUtil.sessionFactory.getStatistics();\n"
@@ -2412,7 +2445,7 @@
 msgstr ""
 
 #. Tag: para
-#: performance.xml:1255
+#: performance.xml:1303
 #, no-c-format
 msgid ""
 "To work on all entities, collections, queries and region caches, you can "

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	2008-08-14 15:28:13 UTC (rev 15066)
+++ core/trunk/documentation/manual/src/main/docbook/zh-CN/content/persistent_classes.po	2008-08-14 15:35:40 UTC (rev 15067)
@@ -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: 2008-08-14 15:28+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,13 +11,13 @@
 "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
+#: persistent_classes.xml:31
 #, no-c-format
 msgid ""
 "Persistent classes are classes in an application that implement the entities "
@@ -30,7 +30,7 @@
 "的状态也可能 是瞬时的或脱管的。"
 
 #. Tag: para
-#: persistent_classes.xml:14
+#: persistent_classes.xml:38
 #, no-c-format
 msgid ""
 "Hibernate works best if these classes follow some simple rules, also known "
@@ -45,19 +45,19 @@
 "来表达领域模型: 比如,使用<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
+#: persistent_classes.xml:49
 #, no-c-format
 msgid "Most Java applications require a persistent class representing felines."
 msgstr "大多数Java程序需要用一个持久化类来表示猫科动物。"
 
 #. Tag: programlisting
-#: persistent_classes.xml:29
+#: persistent_classes.xml:53
 #, no-c-format
 msgid ""
 "<![CDATA[package eg;\n"
@@ -141,19 +141,19 @@
 msgstr ""
 
 #. Tag: para
-#: persistent_classes.xml:31
+#: persistent_classes.xml:55
 #, no-c-format
 msgid "There are four main rules to follow here:"
 msgstr "这里要遵循四条主要的规则:"
 
 #. Tag: title
-#: persistent_classes.xml:37
+#: persistent_classes.xml:61
 #, no-c-format
 msgid "Implement a no-argument constructor"
 msgstr "实现一个默认的(即无参数的)构造方法(constructor)"
 
 #. Tag: para
-#: persistent_classes.xml:39
+#: persistent_classes.xml:63
 #, no-c-format
 msgid ""
 "<literal>Cat</literal> has a no-argument constructor. All persistent classes "
@@ -170,13 +170,13 @@
 "emphasis>内可见的。"
 
 #. Tag: title
-#: persistent_classes.xml:49
+#: persistent_classes.xml:73
 #, no-c-format
 msgid "Provide an identifier property (optional)"
 msgstr "提供一个标识属性(identifier property)(可选)"
 
 #. Tag: para
-#: persistent_classes.xml:51
+#: persistent_classes.xml:75
 #, no-c-format
 msgid ""
 "<literal>Cat</literal> has a property called <literal>id</literal>. This "
@@ -194,7 +194,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 "
@@ -205,7 +205,7 @@
 "并不推荐这样做。"
 
 #. Tag: para
-#: persistent_classes.xml:65
+#: persistent_classes.xml:89
 #, no-c-format
 msgid ""
 "In fact, some functionality is available only to classes which declare an "
@@ -213,7 +213,7 @@
 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 "
@@ -223,19 +223,19 @@
 "\"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
+#: persistent_classes.xml:113
 #, no-c-format
 msgid ""
 "We recommend you declare consistently-named identifier properties on "
@@ -246,13 +246,13 @@
 "就是说,不是原始类型)的类型。"
 
 #. 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 "
@@ -263,7 +263,7 @@
 "是,持久 化类或者是非final的,或者是实现了一个所有方法都声明为public的接口。"
 
 #. Tag: para
-#: persistent_classes.xml:102
+#: persistent_classes.xml:126
 #, no-c-format
 msgid ""
 "You can persist <literal>final</literal> classes that do not implement an "
@@ -274,7 +274,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 "
@@ -287,13 +287,13 @@
 "<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 "为持久化字段声明访问器(accessors)和是否可变的标志(mutators)(可选)"
 
 #. Tag: para
-#: persistent_classes.xml:117
+#: persistent_classes.xml:141
 #, no-c-format
 msgid ""
 "<literal>Cat</literal> declares accessor methods for all its persistent "
@@ -313,7 +313,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 "
@@ -325,13 +325,13 @@
 "literal>的get/set方法对 的属性进行持久化。"
 
 #. Tag: title
-#: persistent_classes.xml:138
+#: persistent_classes.xml:162
 #, no-c-format
 msgid "Implementing inheritance"
 msgstr "实现继承(Inheritance)"
 
 #. Tag: para
-#: persistent_classes.xml:140
+#: persistent_classes.xml:164
 #, no-c-format
 msgid ""
 "A subclass must also observe the first and second rules. It inherits its "
@@ -341,7 +341,7 @@
 "性。"
 
 #. Tag: programlisting
-#: persistent_classes.xml:145
+#: persistent_classes.xml:169
 #, no-c-format
 msgid ""
 "<![CDATA[package eg;\n"
@@ -359,14 +359,14 @@
 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
+#: persistent_classes.xml:175
 #, no-c-format
 msgid ""
 "You have to override the <literal>equals()</literal> and <literal>hashCode()"
@@ -376,7 +376,7 @@
 "()</literal>方法:"
 
 #. Tag: para
-#: persistent_classes.xml:157
+#: persistent_classes.xml:181
 #, no-c-format
 msgid ""
 "intend to put instances of persistent classes in a <literal>Set</literal> "
@@ -386,13 +386,13 @@
 "想把持久类的实例放入<literal>Set</literal>中(当表示多值关联时,推荐这么做)"
 
 #. 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
+#: persistent_classes.xml:194
 #, no-c-format
 msgid ""
 "Hibernate guarantees equivalence of persistent identity (database row) and "
@@ -407,7 +407,7 @@
 "<literal>hashCode()</literal>。"
 
 #. Tag: para
-#: persistent_classes.xml:178
+#: persistent_classes.xml:202
 #, no-c-format
 msgid ""
 "The most obvious way is to implement <literal>equals()</literal>/"
@@ -438,7 +438,7 @@
 "是Hibernate的问题,而是一般的Java对象标识和Java对象等价的语义问题。"
 
 #. Tag: para
-#: persistent_classes.xml:192
+#: persistent_classes.xml:216
 #, no-c-format
 msgid ""
 "We recommend implementing <literal>equals()</literal> and <literal>hashCode()"
@@ -453,7 +453,7 @@
 "世界里标识我们的实例(是一个<emphasis>自然的</emphasis>候选码)。"
 
 #. Tag: programlisting
-#: persistent_classes.xml:200
+#: persistent_classes.xml:224
 #, no-c-format
 msgid ""
 "<![CDATA[public class Cat {\n"
@@ -482,7 +482,7 @@
 msgstr ""
 
 #. Tag: para
-#: persistent_classes.xml:202
+#: persistent_classes.xml:226
 #, no-c-format
 msgid ""
 "Note that a business key does not have to be as solid as a database primary "
@@ -494,13 +494,13 @@
 "basics-identity\"/>)。 对业务键而言,不可变或唯一的属性是不错的选择。"
 
 #. Tag: title
-#: persistent_classes.xml:212
+#: persistent_classes.xml:236
 #, no-c-format
 msgid "Dynamic models"
 msgstr "动态模型(Dynamic models)"
 
 #. Tag: emphasis
-#: persistent_classes.xml:215
+#: persistent_classes.xml:239
 #, no-c-format
 msgid ""
 "Note that the following features are currently considered experimental and "
@@ -508,7 +508,7 @@
 msgstr "注意,以下特性在当前处于试验阶段,将来可能会有变化。"
 
 #. Tag: para
-#: persistent_classes.xml:219
+#: persistent_classes.xml:243
 #, no-c-format
 msgid ""
 "Persistent entities don't necessarily have to be represented as POJO classes "
@@ -523,7 +523,7 @@
 "只写映射文件就行了。"
 
 #. Tag: para
-#: persistent_classes.xml:227
+#: persistent_classes.xml:251
 #, no-c-format
 msgid ""
 "By default, Hibernate works in normal POJO mode. You may set a default "
@@ -537,7 +537,7 @@
 "optional-properties\"/>。)"
 
 #. Tag: para
-#: persistent_classes.xml:234
+#: persistent_classes.xml:258
 #, no-c-format
 msgid ""
 "The following examples demonstrates the representation using <literal>Map</"
@@ -548,7 +548,7 @@
 "<literal>entity-name</literal>来代替一个类名(或作为一种附属)。"
 
 #. Tag: programlisting
-#: persistent_classes.xml:240
+#: persistent_classes.xml:264
 #, no-c-format
 msgid ""
 "<![CDATA[<hibernate-mapping>\n"
@@ -587,7 +587,7 @@
 msgstr ""
 
 #. Tag: para
-#: persistent_classes.xml:242
+#: persistent_classes.xml:266
 #, no-c-format
 msgid ""
 "Note that even though associations are declared using target class names, "
@@ -598,7 +598,7 @@
 "是一个动态的实体。"
 
 #. Tag: para
-#: persistent_classes.xml:249
+#: persistent_classes.xml:273
 #, no-c-format
 msgid ""
 "After setting the default entity mode to <literal>dynamic-map</literal> for "
@@ -610,7 +610,7 @@
 "literal>。"
 
 #. Tag: programlisting
-#: persistent_classes.xml:255
+#: persistent_classes.xml:279
 #, no-c-format
 msgid ""
 "<![CDATA[Session s = openSession();\n"
@@ -637,7 +637,7 @@
 msgstr ""
 
 #. Tag: para
-#: persistent_classes.xml:257
+#: persistent_classes.xml:281
 #, no-c-format
 msgid ""
 "The advantages of a dynamic mapping are quick turnaround time for "
@@ -653,7 +653,7 @@
 "的领域模型实现。"
 
 #. Tag: para
-#: persistent_classes.xml:265
+#: persistent_classes.xml:289
 #, no-c-format
 msgid ""
 "Entity representation modes can also be set on a per <literal>Session</"
@@ -661,7 +661,7 @@
 msgstr "实体表示模式也能在每个<literal>Session</literal>的基础上设置:"
 
 #. Tag: programlisting
-#: persistent_classes.xml:270
+#: persistent_classes.xml:294
 #, no-c-format
 msgid ""
 "<![CDATA[Session dynamicSession = pojoSession.getSession(EntityMode.MAP);\n"
@@ -679,7 +679,7 @@
 msgstr ""
 
 #. Tag: para
-#: persistent_classes.xml:273
+#: persistent_classes.xml:297
 #, no-c-format
 msgid ""
 "Please note that the call to <literal>getSession()</literal> using an "
@@ -699,7 +699,7 @@
 "的处理 交给原来的工作单元。"
 
 #. Tag: para
-#: persistent_classes.xml:283
+#: persistent_classes.xml:307
 #, no-c-format
 msgid ""
 "More information about the XML representation capabilities can be found in "
@@ -707,13 +707,13 @@
 msgstr "关于XML表示能力的更多信息可以在<xref linkend=\"xml\"/>中找到。"
 
 #. Tag: title
-#: persistent_classes.xml:291
+#: persistent_classes.xml:315
 #, no-c-format
 msgid "Tuplizers"
 msgstr "元组片断映射(Tuplizers)"
 
 #. Tag: para
-#: persistent_classes.xml:293
+#: persistent_classes.xml:317
 #, no-c-format
 msgid ""
 "<literal>org.hibernate.tuple.Tuplizer</literal>, and its sub-interfaces, are "
@@ -742,7 +742,7 @@
 "面提到的实体的契约,而<literal>ComponentTuplizer</literal>则是针对组件的。"
 
 #. Tag: para
-#: persistent_classes.xml:308
+#: persistent_classes.xml:332
 #, no-c-format
 msgid ""
 "Users may also plug in their own tuplizers. Perhaps you require that a "
@@ -761,7 +761,7 @@
 "到它们期望管理的entity或者component映射中。回到我们的customer entity例子:"
 
 #. Tag: programlisting
-#: persistent_classes.xml:317
+#: persistent_classes.xml:341
 #, no-c-format
 msgid ""
 "<![CDATA[<hibernate-mapping>\n"
@@ -801,8 +801,14 @@
 "}]]>"
 msgstr ""
 
+#. Tag: title
+#: persistent_classes.xml:347
+#, no-c-format
+msgid "Extentsions"
+msgstr ""
+
 #. Tag: para
-#: persistent_classes.xml:322
+#: persistent_classes.xml:348
 #, no-c-format
 msgid ""
 "TODO: Document user-extension framework in the property and proxy packages"

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	2008-08-14 15:28:13 UTC (rev 15066)
+++ core/trunk/documentation/manual/src/main/docbook/zh-CN/content/query_criteria.po	2008-08-14 15:35:40 UTC (rev 15067)
@@ -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: 2008-08-14 15:28+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 Queries)"
 
 #. Tag: para
-#: query_criteria.xml:7
+#: query_criteria.xml:31
 #, no-c-format
 msgid "Hibernate features an intuitive, extensible criteria query API."
 msgstr "具有一个直观的、可扩展的条件查询API是Hibernate的特色。"
 
 #. 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 "
@@ -40,7 +40,7 @@
 "<literal>Session</literal>是 <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"
@@ -49,13 +49,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."
@@ -68,7 +68,7 @@
 "获得某些内置<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"
@@ -78,13 +78,13 @@
 msgstr ""
 
 #. Tag: para
-#: query_criteria.xml:37
+#: query_criteria.xml:61
 #, no-c-format
 msgid "Restrictions may 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"
@@ -97,7 +97,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: query_criteria.xml:43
+#: query_criteria.xml:67
 #, no-c-format
 msgid ""
 "<![CDATA[List cats = sess.createCriteria(Cat.class)\n"
@@ -113,7 +113,7 @@
 msgstr ""
 
 #. Tag: para
-#: query_criteria.xml:45
+#: query_criteria.xml:69
 #, no-c-format
 msgid ""
 "There are quite a range of built-in criterion types (<literal>Restrictions</"
@@ -124,7 +124,7 @@
 "类), 但是尤其有用的是可以允许你直接使用SQL。"
 
 #. Tag: programlisting
-#: query_criteria.xml:50
+#: query_criteria.xml:74
 #, no-c-format
 msgid ""
 "<![CDATA[List cats = sess.createCriteria(Cat.class)\n"
@@ -134,7 +134,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 "
@@ -142,7 +142,7 @@
 msgstr "<literal>{alias}</literal>占位符应当被替换为被查询实体的列别名。"
 
 #. Tag: para
-#: query_criteria.xml:57
+#: query_criteria.xml:81
 #, no-c-format
 msgid ""
 "An alternative approach to obtaining a criterion is to get it from a "
@@ -153,7 +153,7 @@
 "<literal>Property.forName()</literal> 创建一个<literal>Property</literal>。"
 
 #. Tag: programlisting
-#: query_criteria.xml:63
+#: query_criteria.xml:87
 #, no-c-format
 msgid ""
 "<![CDATA[\n"
@@ -171,13 +171,13 @@
 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
+#: query_criteria.xml:94
 #, no-c-format
 msgid ""
 "You may order the results using <literal>org.hibernate.criterion.Order</"
@@ -186,7 +186,7 @@
 "你可以使用<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"
@@ -198,7 +198,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: query_criteria.xml:76
+#: query_criteria.xml:100
 #, no-c-format
 msgid ""
 "<![CDATA[List cats = sess.createCriteria(Cat.class)\n"
@@ -210,13 +210,13 @@
 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 "
@@ -226,7 +226,7 @@
 "立 约束。"
 
 #. Tag: programlisting
-#: query_criteria.xml:88
+#: query_criteria.xml:112
 #, no-c-format
 msgid ""
 "<![CDATA[List cats = sess.createCriteria(Cat.class)\n"
@@ -237,7 +237,7 @@
 msgstr ""
 
 #. Tag: para
-#: query_criteria.xml:90
+#: query_criteria.xml:114
 #, no-c-format
 msgid ""
 "note that the second <literal>createCriteria()</literal> returns a new "
@@ -249,13 +249,13 @@
 "的元素。"
 
 #. Tag: para
-#: query_criteria.xml:96
+#: query_criteria.xml:120
 #, no-c-format
 msgid "The following, alternate form 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"
@@ -266,7 +266,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 "
@@ -276,7 +276,7 @@
 "实例。)"
 
 #. Tag: para
-#: query_criteria.xml:107
+#: query_criteria.xml:131
 #, no-c-format
 msgid ""
 "Note that the kittens collections held by the <literal>Cat</literal> "
@@ -289,7 +289,7 @@
 "你必须使用<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"
@@ -306,13 +306,13 @@
 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
+#: query_criteria.xml:145
 #, no-c-format
 msgid ""
 "You may specify association fetching semantics at runtime using "
@@ -321,7 +321,7 @@
 "你可以使用<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"
@@ -332,7 +332,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</"
@@ -343,13 +343,13 @@
 "literal>。 查看<xref linkend=\"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 "
@@ -359,7 +359,7 @@
 "建一个条件查询。"
 
 #. Tag: programlisting
-#: query_criteria.xml:143
+#: query_criteria.xml:167
 #, no-c-format
 msgid ""
 "<![CDATA[Cat cat = new Cat();\n"
@@ -371,7 +371,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, "
@@ -379,13 +379,13 @@
 msgstr "版本属性、标识符和关联被忽略。默认情况下值为null的属性将被排除。"
 
 #. 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"
@@ -400,13 +400,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 "你甚至可以使用examples在关联对象上放置条件。"
 
 #. Tag: programlisting
-#: query_criteria.xml:160
+#: query_criteria.xml:184
 #, no-c-format
 msgid ""
 "<![CDATA[List results = session.createCriteria(Cat.class)\n"
@@ -417,13 +417,13 @@
 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
+#: query_criteria.xml:190
 #, no-c-format
 msgid ""
 "The class <literal>org.hibernate.criterion.Projections</literal> is a "
@@ -435,7 +435,7 @@
 "()</literal>应用投影到一个查询。"
 
 #. Tag: programlisting
-#: query_criteria.xml:172
+#: query_criteria.xml:196
 #, no-c-format
 msgid ""
 "<![CDATA[List results = session.createCriteria(Cat.class)\n"
@@ -445,7 +445,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: query_criteria.xml:174
+#: query_criteria.xml:198
 #, no-c-format
 msgid ""
 "<![CDATA[List results = session.createCriteria(Cat.class)\n"
@@ -459,7 +459,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 "
@@ -471,7 +471,7 @@
 "子句中。"
 
 #. Tag: para
-#: query_criteria.xml:182
+#: query_criteria.xml:206
 #, no-c-format
 msgid ""
 "An alias may optionally be assigned to a projection, so that the projected "
@@ -482,7 +482,7 @@
 "是两种不同的实现方式:"
 
 #. Tag: programlisting
-#: query_criteria.xml:188
+#: query_criteria.xml:212
 #, no-c-format
 msgid ""
 "<![CDATA[List results = session.createCriteria(Cat.class)\n"
@@ -493,7 +493,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: query_criteria.xml:190
+#: query_criteria.xml:214
 #, no-c-format
 msgid ""
 "<![CDATA[List results = session.createCriteria(Cat.class)\n"
@@ -503,7 +503,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 "
@@ -516,7 +516,7 @@
 "个投影到一个投影列表中时 你可以为它指定一个别名:"
 
 #. Tag: programlisting
-#: query_criteria.xml:199
+#: query_criteria.xml:223
 #, no-c-format
 msgid ""
 "<![CDATA[List results = session.createCriteria(Cat.class)\n"
@@ -532,7 +532,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"
@@ -547,7 +547,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 "
@@ -555,7 +555,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"
@@ -565,7 +565,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: query_criteria.xml:209
+#: query_criteria.xml:233
 #, no-c-format
 msgid ""
 "<![CDATA[List results = session.createCriteria(Cat.class)\n"
@@ -581,13 +581,13 @@
 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
+#: query_criteria.xml:239
 #, no-c-format
 msgid ""
 "The <literal>DetachedCriteria</literal> class lets you create a query "
@@ -598,7 +598,7 @@
 "并且可以使用任意的 <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"
@@ -613,7 +613,7 @@
 msgstr ""
 
 #. Tag: para
-#: query_criteria.xml:222
+#: query_criteria.xml:246
 #, no-c-format
 msgid ""
 "A <literal>DetachedCriteria</literal> may also be used to express a "
@@ -624,7 +624,7 @@
 "以通过 <literal>Subqueries</literal>或者<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"
@@ -635,7 +635,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: query_criteria.xml:230
+#: query_criteria.xml:254
 #, no-c-format
 msgid ""
 "<![CDATA[DetachedCriteria weights = DetachedCriteria.forClass(Cat.class)\n"
@@ -646,13 +646,13 @@
 msgstr ""
 
 #. Tag: para
-#: query_criteria.xml:232
+#: query_criteria.xml:256
 #, no-c-format
 msgid "Even correlated subqueries are possible:"
 msgstr "甚至相互关联的子查询也是有可能的:"
 
 #. Tag: programlisting
-#: query_criteria.xml:236
+#: query_criteria.xml:260
 #, no-c-format
 msgid ""
 "<![CDATA[DetachedCriteria avgWeightForSex = DetachedCriteria.forClass(Cat."
@@ -665,13 +665,13 @@
 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
+#: query_criteria.xml:271
 #, no-c-format
 msgid ""
 "For most queries, including criteria queries, the query cache is not very "
@@ -687,7 +687,7 @@
 "了特别规约。"
 
 #. Tag: para
-#: query_criteria.xml:255
+#: query_criteria.xml:279
 #, no-c-format
 msgid ""
 "First, you should map the natural key of your entity using <literal>&lt;"
@@ -697,7 +697,7 @@
 "键,然后打开第二级缓存。"
 
 #. Tag: programlisting
-#: query_criteria.xml:260
+#: query_criteria.xml:284
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"User\">\n"
@@ -714,7 +714,7 @@
 msgstr ""
 
 #. Tag: para
-#: query_criteria.xml:262
+#: query_criteria.xml:286
 #, no-c-format
 msgid ""
 "Note that this functionality is not intended for use with entities with "
@@ -722,13 +722,13 @@
 msgstr "注意,此功能对具有<emphasis>mutable</emphasis>自然键的entity并不适用。"
 
 #. Tag: para
-#: query_criteria.xml:267
+#: query_criteria.xml:291
 #, no-c-format
 msgid "Next, enable the Hibernate query cache."
 msgstr "然后,打开Hibernate 查询缓存。"
 
 #. Tag: para
-#: query_criteria.xml:271
+#: query_criteria.xml:295
 #, no-c-format
 msgid ""
 "Now, <literal>Restrictions.naturalId()</literal> allows us to make use of "
@@ -738,7 +738,7 @@
 "存算法。"
 
 #. Tag: programlisting
-#: query_criteria.xml:276
+#: query_criteria.xml:300
 #, no-c-format
 msgid ""
 "<![CDATA[session.createCriteria(User.class)\n"

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	2008-08-14 15:28:13 UTC (rev 15066)
+++ core/trunk/documentation/manual/src/main/docbook/zh-CN/content/query_hql.po	2008-08-14 15:35:40 UTC (rev 15067)
@@ -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: 2008-08-14 15:28+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,13 +11,13 @@
 "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查询语言"
 
 #. Tag: para
-#: query_hql.xml:7
+#: query_hql.xml:31
 #, no-c-format
 msgid ""
 "Hibernate is equipped with an extremely powerful query language that (quite "
@@ -30,13 +30,13 @@
 "如继承、多态 和关联之类的概念。"
 
 #. Tag: title
-#: query_hql.xml:14
+#: query_hql.xml:38
 #, no-c-format
 msgid "Case Sensitivity"
 msgstr "大小写敏感性问题"
 
 #. Tag: para
-#: query_hql.xml:16
+#: query_hql.xml:40
 #, no-c-format
 msgid ""
 "Queries are case-insensitive, except for names of Java classes and "
@@ -52,7 +52,7 @@
 "<literal>foo.BARSET</literal>。"
 
 #. Tag: para
-#: query_hql.xml:27
+#: query_hql.xml:51
 #, no-c-format
 msgid ""
 "This manual uses lowercase HQL keywords. Some users find queries with "
@@ -64,25 +64,25 @@
 "比较难看。"
 
 #. 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
+#: query_hql.xml:67
 #, no-c-format
 msgid ""
 "which simply returns all instances of the class <literal>eg.Cat</literal>. "
@@ -94,13 +94,13 @@
 "以我们几乎只使用如下的简单写法:"
 
 #. 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>, "
@@ -111,13 +111,13 @@
 "询语句的其它部分引用到<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
+#: query_hql.xml:83
 #, no-c-format
 msgid ""
 "This query assigns the alias <literal>cat</literal> to <literal>Cat</"
@@ -129,13 +129,13 @@
 "的,我们也可以这样写:"
 
 #. 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
+#: query_hql.xml:91
 #, no-c-format
 msgid ""
 "Multiple classes may appear, resulting in a cartesian product or \"cross\" "
@@ -144,19 +144,19 @@
 "子句中可以同时出现多个类, 其查询结果是产生一个笛卡儿积或产生跨表的连接。"
 
 #. 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
+#: query_hql.xml:98
 #, no-c-format
 msgid ""
 "It is considered good practice to name query aliases using an initial "
@@ -167,13 +167,13 @@
 "准保持了一致 (比如,<literal>domesticCat</literal>)。"
 
 #. Tag: title
-#: query_hql.xml:83
+#: query_hql.xml:107
 #, no-c-format
 msgid "Associations and joins"
 msgstr "关联(Association)与连接(Join)"
 
 #. Tag: para
-#: query_hql.xml:85
+#: query_hql.xml:109
 #, no-c-format
 msgid ""
 "We may also assign aliases to associated entities, or even to elements of a "
@@ -183,7 +183,7 @@
 "关键字<literal>join</literal>。"
 
 #. Tag: programlisting
-#: query_hql.xml:90
+#: query_hql.xml:114
 #, no-c-format
 msgid ""
 "<![CDATA[from Cat as cat\n"
@@ -192,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
+#: query_hql.xml:120
 #, 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 "<literal>inner join</literal>(内连接)"
 
 #. Tag: literal
-#: query_hql.xml:108
+#: query_hql.xml:132
 #, no-c-format
 msgid "left outer join"
 msgstr "<literal>left outer join</literal>(左外连接)"
 
 #. Tag: literal
-#: query_hql.xml:113
+#: query_hql.xml:137
 #, no-c-format
 msgid "right outer join"
 msgstr "<literal>right outer join</literal>(右外连接)"
 
 #. 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 "
@@ -244,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"
@@ -253,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> "
@@ -261,7 +261,7 @@
 msgstr "通过HQL的<literal>with</literal>关键字,你可以提供额外的join条件。"
 
 #. Tag: programlisting
-#: query_hql.xml:135
+#: query_hql.xml:159
 #, no-c-format
 msgid ""
 "<![CDATA[from Cat as cat\n"
@@ -270,7 +270,7 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:137
+#: query_hql.xml:161
 #, no-c-format
 msgid ""
 "In addition, a \"fetch\" join allows associations or collections of values "
@@ -287,7 +287,7 @@
 "息。"
 
 #. Tag: programlisting
-#: query_hql.xml:145
+#: query_hql.xml:169
 #, no-c-format
 msgid ""
 "<![CDATA[from Cat as cat\n"
@@ -296,7 +296,7 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:147
+#: query_hql.xml:171
 #, no-c-format
 msgid ""
 "A fetch join does not usually need to assign an alias, because the "
@@ -311,7 +311,7 @@
 "询的结果中直接返回,但可以通过他们的父对象来访问到他们。"
 
 #. Tag: programlisting
-#: query_hql.xml:155
+#: query_hql.xml:179
 #, no-c-format
 msgid ""
 "<![CDATA[from Cat as cat\n"
@@ -321,7 +321,7 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:157
+#: query_hql.xml:181
 #, no-c-format
 msgid ""
 "Note that the <literal>fetch</literal> construct may not be used in queries "
@@ -351,7 +351,7 @@
 "fetch</literal>是没有意义的。"
 
 #. Tag: para
-#: query_hql.xml:172
+#: query_hql.xml:196
 #, no-c-format
 msgid ""
 "If you are using property-level lazy fetching (with bytecode "
@@ -364,13 +364,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 '%"
@@ -378,13 +378,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> "
@@ -394,7 +394,7 @@
 "<literal>explicit(显式)</literal>。"
 
 #. Tag: para
-#: query_hql.xml:190
+#: query_hql.xml:214
 #, no-c-format
 msgid ""
 "The queries shown in the previous section all use the <literal>explicit</"
@@ -405,7 +405,7 @@
 "句中明确给出了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, "
@@ -418,19 +418,19 @@
 "<literal>implicit</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
+#: query_hql.xml:230
 #, no-c-format
 msgid "Refering to identifier property"
 msgstr "Refering to identifier property"
 
 #. Tag: para
-#: query_hql.xml:208
+#: query_hql.xml:232
 #, no-c-format
 msgid ""
 "There are, generally speaking, 2 ways to refer to an entity's identifier "
@@ -440,7 +440,7 @@
 "property:"
 
 #. Tag: para
-#: query_hql.xml:213
+#: query_hql.xml:237
 #, no-c-format
 msgid ""
 "The special property (lowercase) <literal>id</literal> may be used to "
@@ -452,7 +452,7 @@
 "entity does not define a non-identifier property named id</emphasis>."
 
 #. Tag: para
-#: query_hql.xml:220
+#: query_hql.xml:244
 #, no-c-format
 msgid ""
 "If the entity defines a named identifier property, you may use that property "
@@ -462,7 +462,7 @@
 "name."
 
 #. Tag: para
-#: query_hql.xml:226
+#: query_hql.xml:250
 #, no-c-format
 msgid ""
 "References to composite identifier properties follow the same naming rules. "
@@ -478,7 +478,7 @@
 "identifier property."
 
 #. Tag: para
-#: query_hql.xml:233
+#: query_hql.xml:257
 #, fuzzy, no-c-format
 msgid ""
 "Note: this has changed significantly starting in version 3.2.2. In previous "
@@ -494,13 +494,13 @@
 "could never be referenced in Hibernate queries."
 
 #. Tag: title
-#: query_hql.xml:242
+#: query_hql.xml:266
 #, no-c-format
 msgid "The select clause"
 msgstr "select子句"
 
 #. Tag: para
-#: query_hql.xml:244
+#: query_hql.xml:268
 #, no-c-format
 msgid ""
 "The <literal>select</literal> clause picks which objects and properties to "
@@ -510,7 +510,7 @@
 "下情况:"
 
 #. Tag: programlisting
-#: query_hql.xml:249
+#: query_hql.xml:273
 #, no-c-format
 msgid ""
 "<![CDATA[select mate\n"
@@ -519,7 +519,7 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:251
+#: query_hql.xml:275
 #, no-c-format
 msgid ""
 "The query will select <literal>mate</literal>s of other <literal>Cat</"
@@ -529,13 +529,13 @@
 "猫的配偶) 实际上, 你可以更简洁的用以下的查询语句表达相同的含义:"
 
 #. Tag: programlisting
-#: query_hql.xml:256
+#: query_hql.xml:280
 #, no-c-format
 msgid "<![CDATA[select cat.mate from Cat cat]]>"
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:258
+#: query_hql.xml:282
 #, no-c-format
 msgid ""
 "Queries may return properties of any value type including properties of "
@@ -544,7 +544,7 @@
 "查询语句可以返回值为任何类型的属性,包括返回类型为某种组件(Component)的属性:"
 
 #. Tag: programlisting
-#: query_hql.xml:262
+#: query_hql.xml:286
 #, no-c-format
 msgid ""
 "<![CDATA[select cat.name from DomesticCat cat\n"
@@ -552,13 +552,13 @@
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:264
+#: query_hql.xml:288
 #, no-c-format
 msgid "<![CDATA[select cust.name.firstName from Customer as cust]]>"
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:266
+#: query_hql.xml:290
 #, no-c-format
 msgid ""
 "Queries may return multiple objects and/or properties as an array of type "
@@ -568,7 +568,7 @@
 "中,"
 
 #. Tag: programlisting
-#: query_hql.xml:271
+#: query_hql.xml:295
 #, no-c-format
 msgid ""
 "<![CDATA[select mother, offspr, mate.name\n"
@@ -578,13 +578,13 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:273
+#: query_hql.xml:297
 #, no-c-format
 msgid "or as a <literal>List</literal>,"
 msgstr "或存放在一个<literal>List</literal>对象中,"
 
 #. Tag: programlisting
-#: query_hql.xml:277
+#: query_hql.xml:301
 #, no-c-format
 msgid ""
 "<![CDATA[select new list(mother, offspr, mate.name)\n"
@@ -594,13 +594,13 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:279
+#: query_hql.xml:303
 #, no-c-format
 msgid "or as an actual typesafe Java object,"
 msgstr "也可能直接返回一个实际的类型安全的Java对象,"
 
 #. Tag: programlisting
-#: query_hql.xml:283
+#: query_hql.xml:307
 #, no-c-format
 msgid ""
 "<![CDATA[select new Family(mother, mate, offspr)\n"
@@ -610,7 +610,7 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:285
+#: query_hql.xml:309
 #, no-c-format
 msgid ""
 "assuming that the class <literal>Family</literal> has an appropriate "
@@ -618,14 +618,14 @@
 msgstr "假设类<literal>Family</literal>有一个合适的构造函数."
 
 #. Tag: para
-#: query_hql.xml:289
+#: query_hql.xml:313
 #, no-c-format
 msgid ""
 "You may assign aliases to selected expressions using <literal>as</literal>:"
 msgstr "你可以使用关键字<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 "
@@ -634,7 +634,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</"
@@ -642,7 +642,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, "
@@ -651,7 +651,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."
@@ -660,20 +660,20 @@
 "值映射。"
 
 #. Tag: title
-#: query_hql.xml:308
+#: query_hql.xml:332
 #, no-c-format
 msgid "Aggregate functions"
 msgstr "聚集函数"
 
 #. Tag: para
-#: query_hql.xml:310
+#: query_hql.xml:334
 #, no-c-format
 msgid ""
 "HQL queries may 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"
@@ -682,31 +682,31 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:325
+#: query_hql.xml:349
 #, 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
+#: query_hql.xml:371
 #, no-c-format
 msgid ""
 "You may use arithmetic operators, concatenation, and recognized SQL "
@@ -714,7 +714,7 @@
 msgstr "你可以在选择子句中使用数学操作符、连接以及经过验证的SQL函数:"
 
 #. Tag: programlisting
-#: query_hql.xml:352
+#: query_hql.xml:376
 #, no-c-format
 msgid ""
 "<![CDATA[select cat.weight + sum(kitten.weight)\n"
@@ -724,14 +724,14 @@
 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
+#: query_hql.xml:380
 #, no-c-format
 msgid ""
 "The <literal>distinct</literal> and <literal>all</literal> keywords may be "
@@ -741,7 +741,7 @@
 "有与SQL相同的语义."
 
 #. Tag: programlisting
-#: query_hql.xml:361
+#: query_hql.xml:385
 #, no-c-format
 msgid ""
 "<![CDATA[select distinct cat.name from Cat cat\n"
@@ -750,19 +750,19 @@
 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
+#: query_hql.xml:398
 #, no-c-format
 msgid ""
 "returns instances not only of <literal>Cat</literal>, but also of subclasses "
@@ -778,13 +778,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 "
@@ -792,13 +792,13 @@
 msgstr "接口<literal>Named</literal> 可能被各种各样的持久化类声明:"
 
 #. 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
+#: query_hql.xml:415
 #, no-c-format
 msgid ""
 "Note that these last two queries will require more than one SQL "
@@ -811,13 +811,13 @@
 "能对这样的查询使用<literal>Query.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
+#: query_hql.xml:426
 #, no-c-format
 msgid ""
 "The <literal>where</literal> clause allows you to narrow the list of "
@@ -827,31 +827,31 @@
 "名,你可以使用属性名来直接引用属性:"
 
 #. 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
+#: query_hql.xml:439
 #, no-c-format
 msgid "returns instances of <literal>Cat</literal> named 'Fritz'."
 msgstr "返回名为(属性name等于)'Fritz'的<literal>Cat</literal>类的实例。"
 
 #. Tag: programlisting
-#: query_hql.xml:419
+#: query_hql.xml:443
 #, no-c-format
 msgid ""
 "<![CDATA[select foo\n"
@@ -860,7 +860,7 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:421
+#: query_hql.xml:445
 #, no-c-format
 msgid ""
 "will return all instances of <literal>Foo</literal> for which there exists "
@@ -875,13 +875,13 @@
 "<literal>where</literal>子句非常的强大,考虑如下情况:"
 
 #. Tag: programlisting
-#: query_hql.xml:430
+#: query_hql.xml:454
 #, no-c-format
 msgid "<![CDATA[from Cat cat where cat.mate.name is not null]]>"
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:432
+#: query_hql.xml:456
 #, no-c-format
 msgid ""
 "This query translates to an SQL query with a table (inner) join. If you were "
@@ -891,7 +891,7 @@
 "语句"
 
 #. Tag: programlisting
-#: query_hql.xml:437
+#: query_hql.xml:461
 #, no-c-format
 msgid ""
 "<![CDATA[from Foo foo\n"
@@ -899,14 +899,14 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:439
+#: query_hql.xml:463
 #, no-c-format
 msgid ""
 "you would end up with a query that would require four table joins in SQL."
 msgstr "在SQL中,你为达此目的将需要进行一个四表连接的查询。"
 
 #. Tag: para
-#: query_hql.xml:443
+#: query_hql.xml:467
 #, no-c-format
 msgid ""
 "The <literal>=</literal> operator may be used to compare not only "
@@ -915,13 +915,13 @@
 "<literal>=</literal>运算符不仅可以被用来比较属性的值,也可以用来比较实例:"
 
 #. Tag: programlisting
-#: query_hql.xml:448
+#: query_hql.xml:472
 #, 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:474
 #, no-c-format
 msgid ""
 "<![CDATA[select cat, mate\n"
@@ -930,7 +930,7 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:452
+#: query_hql.xml:476
 #, no-c-format
 msgid ""
 "The special property (lowercase) <literal>id</literal> may be used to "
@@ -941,7 +941,7 @@
 "也可以使用该对象的属性名。)"
 
 #. Tag: programlisting
-#: query_hql.xml:458
+#: query_hql.xml:482
 #, no-c-format
 msgid ""
 "<![CDATA[from Cat as cat where cat.id = 123\n"
@@ -950,13 +950,13 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:460
+#: query_hql.xml:484
 #, no-c-format
 msgid "The second query is efficient. No table join is required!"
 msgstr "第二个查询是有效的。此时不需要进行表连接!"
 
 #. Tag: para
-#: query_hql.xml:464
+#: query_hql.xml:488
 #, no-c-format
 msgid ""
 "Properties of composite identifiers may also be used. Suppose "
@@ -970,7 +970,7 @@
 "成。"
 
 #. Tag: programlisting
-#: query_hql.xml:471
+#: query_hql.xml:495
 #, no-c-format
 msgid ""
 "<![CDATA[from bank.Person person\n"
@@ -979,7 +979,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:473
+#: query_hql.xml:497
 #, no-c-format
 msgid ""
 "<![CDATA[from bank.Account account\n"
@@ -988,13 +988,13 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:475
+#: query_hql.xml:499
 #, no-c-format
 msgid "Once again, the second query requires no table join."
 msgstr "第二个查询也不需要进行表连接。"
 
 #. Tag: para
-#: query_hql.xml:479
+#: query_hql.xml:503
 #, no-c-format
 msgid ""
 "Likewise, the special property <literal>class</literal> accesses the "
@@ -1007,17 +1007,17 @@
 "被转换为该类的鉴别值。"
 
 #. Tag: programlisting
-#: query_hql.xml:485
+#: query_hql.xml:509
 #, 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:511
+#, fuzzy, no-c-format
 msgid ""
 "You may also use components or composite user types, or properties of said "
-"component types. See <xref linkend=\"queryhql-coomponents\"/> for more "
+"component types. See <xref linkend=\"queryhql-components\"/> for more "
 "details."
 msgstr ""
 "你也可以声明一个属性的类型是组件或者复合用户类型(以及由组件构成的组件等"
@@ -1026,7 +1026,7 @@
 "literal>含有一个包含了组件的实体<literal>address</literal>"
 
 #. Tag: para
-#: query_hql.xml:492
+#: query_hql.xml:516
 #, no-c-format
 msgid ""
 "An \"any\" type has the special properties <literal>id</literal> and "
@@ -1039,7 +1039,7 @@
 "literal> 是一个属性,该属性被映射为<literal>&lt;any&gt;</literal>)。"
 
 #. Tag: programlisting
-#: query_hql.xml:498
+#: query_hql.xml:522
 #, no-c-format
 msgid ""
 "<![CDATA[from AuditLog log, Payment payment\n"
@@ -1047,7 +1047,7 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:500
+#: query_hql.xml:524
 #, no-c-format
 msgid ""
 "Notice that <literal>log.item.class</literal> and <literal>payment.class</"
@@ -1058,13 +1058,13 @@
 "<literal>payment.class</literal> 将涉及到完全不同的数据库中的列。"
 
 #. Tag: title
-#: query_hql.xml:508
+#: query_hql.xml:532
 #, no-c-format
 msgid "Expressions"
 msgstr "表达式"
 
 #. Tag: para
-#: query_hql.xml:510
+#: query_hql.xml:534
 #, no-c-format
 msgid ""
 "Expressions allowed in the <literal>where</literal> clause include most of "
@@ -1074,13 +1074,13 @@
 "表达式种类:"
 
 #. Tag: para
-#: query_hql.xml:517
+#: query_hql.xml:541
 #, no-c-format
 msgid "mathematical operators <literal>+, -, *, /</literal>"
 msgstr "数学运算符<literal>+, -, *, /</literal>"
 
 #. Tag: para
-#: query_hql.xml:522
+#: query_hql.xml:546
 #, no-c-format
 msgid ""
 "binary comparison operators <literal>=, &gt;=, &lt;=, &lt;&gt;, !=, like</"
@@ -1088,19 +1088,19 @@
 msgstr "二进制比较运算符<literal>=, &gt;=, &lt;=, &lt;&gt;, !=, like</literal>"
 
 #. Tag: para
-#: query_hql.xml:527
+#: query_hql.xml:551
 #, no-c-format
 msgid "logical operations <literal>and, or, not</literal>"
 msgstr "逻辑运算符<literal>and, or, not</literal>"
 
 #. Tag: para
-#: query_hql.xml:532
+#: query_hql.xml:556
 #, no-c-format
 msgid "Parentheses <literal>( )</literal>, indicating grouping"
 msgstr "Parentheses <literal>( )</literal>, indicating grouping"
 
 #. Tag: para
-#: query_hql.xml:537
+#: query_hql.xml:561
 #, no-c-format
 msgid ""
 "<literal>in</literal>, <literal>not in</literal>, <literal>between</"
@@ -1114,7 +1114,7 @@
 "<literal>member of</literal> and <literal>not member of</literal>"
 
 #. Tag: para
-#: query_hql.xml:550
+#: query_hql.xml:574
 #, no-c-format
 msgid ""
 "\"Simple\" case, <literal>case ... when ... then ... else ... end</literal>, "
@@ -1124,7 +1124,7 @@
 "和 \"搜索\" case, <literal>case when ... then ... else ... end</literal>"
 
 #. Tag: para
-#: query_hql.xml:556
+#: query_hql.xml:580
 #, no-c-format
 msgid ""
 "string concatenation <literal>...||...</literal> or <literal>concat(...,...)"
@@ -1133,7 +1133,7 @@
 "字符串连接符<literal>...||...</literal> or <literal>concat(...,...)</literal>"
 
 #. Tag: para
-#: query_hql.xml:561
+#: query_hql.xml:585
 #, no-c-format
 msgid ""
 "<literal>current_date()</literal>, <literal>current_time()</literal>, "
@@ -1143,7 +1143,7 @@
 "<literal>current_timestamp()</literal>"
 
 #. Tag: para
-#: query_hql.xml:567
+#: query_hql.xml:591
 #, no-c-format
 msgid ""
 "<literal>second(...)</literal>, <literal>minute(...)</literal>, <literal>hour"
@@ -1155,7 +1155,7 @@
 "<literal>year(...)</literal>,"
 
 #. Tag: para
-#: query_hql.xml:574
+#: query_hql.xml:598
 #, no-c-format
 msgid ""
 "Any function or operator defined by EJB-QL 3.0: <literal>substring(), trim"
@@ -1166,13 +1166,13 @@
 "(), length(), locate(), abs(), sqrt(), bit_length(), mod()</literal>"
 
 #. Tag: para
-#: query_hql.xml:580
+#: query_hql.xml:604
 #, 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:609
 #, no-c-format
 msgid ""
 "<literal>str()</literal> for converting numeric or temporal values to a "
@@ -1180,7 +1180,7 @@
 msgstr "<literal>str()</literal> 把数字或者时间值转换为可读的字符串"
 
 #. Tag: para
-#: query_hql.xml:591
+#: query_hql.xml:615
 #, no-c-format
 msgid ""
 "<literal>cast(... as ...)</literal>, where the second argument is the name "
@@ -1193,7 +1193,7 @@
 "literal> 和 <literal>extract()</literal> 被底层数据库支持"
 
 #. Tag: para
-#: query_hql.xml:599
+#: query_hql.xml:623
 #, no-c-format
 msgid ""
 "the HQL <literal>index()</literal> function, that applies to aliases of a "
@@ -1201,7 +1201,7 @@
 msgstr "HQL <literal>index()</literal> 函数,作用于join的有序集合的别名。"
 
 #. Tag: para
-#: query_hql.xml:605
+#: query_hql.xml:629
 #, no-c-format
 msgid ""
 "HQL functions that take collection-valued path expressions: <literal>size(), "
@@ -1216,7 +1216,7 @@
 "exists, any, in</literal>。"
 
 #. Tag: para
-#: query_hql.xml:613
+#: query_hql.xml:637
 #, no-c-format
 msgid ""
 "Any database-supported SQL scalar function like <literal>sign()</literal>, "
@@ -1227,13 +1227,13 @@
 "</literal>, <literal>rtrim()</literal>, <literal>sin()</literal>"
 
 #. Tag: para
-#: query_hql.xml:619
+#: query_hql.xml:643
 #, no-c-format
 msgid "JDBC-style positional parameters <literal>?</literal>"
 msgstr "JDBC风格的参数传入 <literal>?</literal>"
 
 #. Tag: para
-#: query_hql.xml:624
+#: query_hql.xml:648
 #, no-c-format
 msgid ""
 "named parameters <literal>:name</literal>, <literal>:start_date</literal>, "
@@ -1243,7 +1243,7 @@
 "x1</literal>"
 
 #. Tag: para
-#: query_hql.xml:629
+#: query_hql.xml:653
 #, no-c-format
 msgid ""
 "SQL literals <literal>'foo'</literal>, <literal>69</literal>, <literal>6.66E"
@@ -1253,7 +1253,7 @@
 "+2</literal>, <literal>'1970-01-01 10:00:01.0'</literal>"
 
 #. Tag: para
-#: query_hql.xml:635
+#: query_hql.xml:659
 #, no-c-format
 msgid ""
 "Java <literal>public static final</literal> constants <literal>eg.Color."
@@ -1263,7 +1263,7 @@
 "TABBY</literal>"
 
 #. Tag: para
-#: query_hql.xml:641
+#: query_hql.xml:665
 #, no-c-format
 msgid ""
 "<literal>in</literal> and <literal>between</literal> may be used as follows:"
@@ -1271,32 +1271,32 @@
 "关键字<literal>in</literal>与<literal>between</literal>可按如下方法使用:"
 
 #. Tag: programlisting
-#: query_hql.xml:645
+#: query_hql.xml:669
 #, 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:671
 #, no-c-format
 msgid ""
 "<![CDATA[from DomesticCat cat where cat.name in ( 'Foo', 'Bar', 'Baz' )]]>"
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:649
+#: query_hql.xml:673
 #, no-c-format
 msgid "and the negated forms may be written"
 msgstr "而且否定的格式也可以如下书写:"
 
 #. Tag: programlisting
-#: query_hql.xml:653
+#: query_hql.xml:677
 #, 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:679
 #, no-c-format
 msgid ""
 "<![CDATA[from DomesticCat cat where cat.name not in ( 'Foo', 'Bar', 'Baz' )]]"
@@ -1304,7 +1304,7 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:657
+#: query_hql.xml:681
 #, no-c-format
 msgid ""
 "Likewise, <literal>is null</literal> and <literal>is not null</literal> may "
@@ -1314,7 +1314,7 @@
 "来测试空值(null)."
 
 #. Tag: para
-#: query_hql.xml:662
+#: query_hql.xml:686
 #, no-c-format
 msgid ""
 "Booleans may be easily used in expressions by declaring HQL query "
@@ -1324,7 +1324,7 @@
 "式(Booleans)可以在其他表达式中轻松的使用:"
 
 #. Tag: programlisting
-#: query_hql.xml:667
+#: query_hql.xml:691
 #, no-c-format
 msgid ""
 "<![CDATA[<property name=\"hibernate.query.substitutions\">true 1, false 0</"
@@ -1332,7 +1332,7 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:669
+#: query_hql.xml:693
 #, no-c-format
 msgid ""
 "This will replace the keywords <literal>true</literal> and <literal>false</"
@@ -1344,13 +1344,13 @@
 "literal>:"
 
 #. Tag: programlisting
-#: query_hql.xml:674
+#: query_hql.xml:698
 #, no-c-format
 msgid "<![CDATA[from Cat cat where cat.alive = true]]>"
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:676
+#: query_hql.xml:700
 #, no-c-format
 msgid ""
 "You may test the size of a collection with the special property "
@@ -1360,19 +1360,19 @@
 "literal>测试一个集合的大小。"
 
 #. Tag: programlisting
-#: query_hql.xml:681
+#: query_hql.xml:705
 #, no-c-format
 msgid "<![CDATA[from Cat cat where cat.kittens.size > 0]]>"
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:683
+#: query_hql.xml:707
 #, no-c-format
 msgid "<![CDATA[from Cat cat where size(cat.kittens) > 0]]>"
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:685
+#: query_hql.xml:709
 #, no-c-format
 msgid ""
 "For indexed collections, you may refer to the minimum and maximum indices "
@@ -1387,26 +1387,26 @@
 "一个基本数据类型的集合中最小与最大的元素。"
 
 #. Tag: programlisting
-#: query_hql.xml:693
+#: query_hql.xml:717
 #, no-c-format
 msgid ""
 "<![CDATA[from Calendar cal where maxelement(cal.holidays) > current_date]]>"
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:695
+#: query_hql.xml:719
 #, no-c-format
 msgid "<![CDATA[from Order order where maxindex(order.items) > 100]]>"
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:697
+#: query_hql.xml:721
 #, no-c-format
 msgid "<![CDATA[from Order order where minelement(order.items) > 10000]]>"
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:699
+#: query_hql.xml:723
 #, no-c-format
 msgid ""
 "The SQL functions <literal>any, some, all, exists, in</literal> are "
@@ -1419,7 +1419,7 @@
 "函数<literal>any, some, all, exists, in</literal>"
 
 #. Tag: programlisting
-#: query_hql.xml:705
+#: query_hql.xml:729
 #, no-c-format
 msgid ""
 "<![CDATA[select mother from Cat as mother, Cat as kit\n"
@@ -1427,7 +1427,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:707
+#: query_hql.xml:731
 #, no-c-format
 msgid ""
 "<![CDATA[select p from NameList list, Person p\n"
@@ -1435,25 +1435,25 @@
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:709
+#: query_hql.xml:733
 #, no-c-format
 msgid "<![CDATA[from Cat cat where exists elements(cat.kittens)]]>"
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:711
+#: query_hql.xml:735
 #, no-c-format
 msgid "<![CDATA[from Player p where 3 > all elements(p.scores)]]>"
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:713
+#: query_hql.xml:737
 #, no-c-format
 msgid "<![CDATA[from Show show where 'fizard' in indices(show.acts)]]>"
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:715
+#: query_hql.xml:739
 #, no-c-format
 msgid ""
 "Note that these constructs - <literal>size</literal>, <literal>elements</"
@@ -1468,7 +1468,7 @@
 "<literal>maxelement</literal> - 只能在where子句中使用。"
 
 #. Tag: para
-#: query_hql.xml:722
+#: query_hql.xml:746
 #, no-c-format
 msgid ""
 "Elements of indexed collections (arrays, lists, maps) may be referred to by "
@@ -1478,13 +1478,13 @@
 "(只能在where子句中):"
 
 #. Tag: programlisting
-#: query_hql.xml:727
+#: query_hql.xml:751
 #, no-c-format
 msgid "<![CDATA[from Order order where order.items[0].id = 1234]]>"
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:729
+#: query_hql.xml:753
 #, no-c-format
 msgid ""
 "<![CDATA[select person from Person person, Calendar calendar\n"
@@ -1493,7 +1493,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:731
+#: query_hql.xml:755
 #, no-c-format
 msgid ""
 "<![CDATA[select item from Item item, Order order\n"
@@ -1502,7 +1502,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:733
+#: query_hql.xml:757
 #, no-c-format
 msgid ""
 "<![CDATA[select item from Item item, Order order\n"
@@ -1510,7 +1510,7 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:735
+#: query_hql.xml:759
 #, no-c-format
 msgid ""
 "The expression inside <literal>[]</literal> may even be an arithmetic "
@@ -1518,7 +1518,7 @@
 msgstr "在<literal>[]</literal>中的表达式甚至可以是一个算数表达式。"
 
 #. Tag: programlisting
-#: query_hql.xml:739
+#: query_hql.xml:763
 #, no-c-format
 msgid ""
 "<![CDATA[select item from Item item, Order order\n"
@@ -1526,7 +1526,7 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:741
+#: query_hql.xml:765
 #, no-c-format
 msgid ""
 "HQL also provides the built-in <literal>index()</literal> function, for "
@@ -1536,7 +1536,7 @@
 "供内建的<literal>index()</literal>函数,"
 
 #. Tag: programlisting
-#: query_hql.xml:746
+#: query_hql.xml:770
 #, no-c-format
 msgid ""
 "<![CDATA[select item, index(item) from Order order\n"
@@ -1545,19 +1545,19 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:748
+#: query_hql.xml:772
 #, no-c-format
 msgid "Scalar SQL functions supported by the underlying database may be used"
 msgstr "如果底层数据库支持标量的SQL函数,它们也可以被使用"
 
 #. Tag: programlisting
-#: query_hql.xml:752
+#: query_hql.xml:776
 #, no-c-format
 msgid "<![CDATA[from DomesticCat cat where upper(cat.name) like 'FRI%']]>"
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:754
+#: query_hql.xml:778
 #, no-c-format
 msgid ""
 "If you are not yet convinced by all this, think how much longer and less "
@@ -1567,7 +1567,7 @@
 "多少,可读性会下降多少:"
 
 #. Tag: programlisting
-#: query_hql.xml:759
+#: query_hql.xml:783
 #, no-c-format
 msgid ""
 "<![CDATA[select cust\n"
@@ -1580,13 +1580,13 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:761
+#: query_hql.xml:785
 #, no-c-format
 msgid "<emphasis>Hint:</emphasis> something like"
 msgstr "<emphasis>提示:</emphasis> 会像如下的语句"
 
 #. Tag: programlisting
-#: query_hql.xml:765
+#: query_hql.xml:789
 #, no-c-format
 msgid ""
 "<![CDATA[SELECT cust.name, cust.address, cust.phone, cust.id, cust."
@@ -1610,13 +1610,13 @@
 msgstr ""
 
 #. Tag: title
-#: query_hql.xml:770
+#: query_hql.xml:794
 #, no-c-format
 msgid "The order by clause"
 msgstr "order by子句"
 
 #. Tag: para
-#: query_hql.xml:772
+#: query_hql.xml:796
 #, no-c-format
 msgid ""
 "The list returned by a query may be ordered by any property of a returned "
@@ -1626,7 +1626,7 @@
 "(property)进行排序:"
 
 #. Tag: programlisting
-#: query_hql.xml:776
+#: query_hql.xml:800
 #, no-c-format
 msgid ""
 "<![CDATA[from DomesticCat cat\n"
@@ -1634,7 +1634,7 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:778
+#: query_hql.xml:802
 #, no-c-format
 msgid ""
 "The optional <literal>asc</literal> or <literal>desc</literal> indicate "
@@ -1644,13 +1644,13 @@
 "序进行排序."
 
 #. Tag: title
-#: query_hql.xml:785
+#: query_hql.xml:809
 #, no-c-format
 msgid "The group by clause"
 msgstr "group by子句"
 
 #. Tag: para
-#: query_hql.xml:787
+#: query_hql.xml:811
 #, no-c-format
 msgid ""
 "A query that returns aggregate values may be grouped by any property of a "
@@ -1660,7 +1660,7 @@
 "中的任何属性(property)进行分组:"
 
 #. Tag: programlisting
-#: query_hql.xml:791
+#: query_hql.xml:815
 #, no-c-format
 msgid ""
 "<![CDATA[select cat.color, sum(cat.weight), count(cat)\n"
@@ -1669,7 +1669,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:793
+#: query_hql.xml:817
 #, no-c-format
 msgid ""
 "<![CDATA[select foo.id, avg(name), max(name)\n"
@@ -1678,13 +1678,13 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:795
+#: query_hql.xml:819
 #, 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:823
 #, no-c-format
 msgid ""
 "<![CDATA[select cat.color, sum(cat.weight), count(cat)\n"
@@ -1694,7 +1694,7 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:801
+#: query_hql.xml:825
 #, no-c-format
 msgid ""
 "SQL functions and aggregate functions are allowed in the <literal>having</"
@@ -1705,7 +1705,7 @@
 "以出现 在<literal>having</literal>与<literal>order by</literal> 子句中。"
 
 #. Tag: programlisting
-#: query_hql.xml:807
+#: query_hql.xml:831
 #, no-c-format
 msgid ""
 "<![CDATA[select cat\n"
@@ -1717,7 +1717,7 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:809
+#: query_hql.xml:833
 #, no-c-format
 msgid ""
 "Note that neither the <literal>group by</literal> clause nor the "
@@ -1733,13 +1733,13 @@
 "的所有属性都不是聚集的(non-aggregated)。你必须明确的列出所有的非聚集属性。"
 
 #. Tag: title
-#: query_hql.xml:821
+#: query_hql.xml:845
 #, no-c-format
 msgid "Subqueries"
 msgstr "子查询"
 
 #. Tag: para
-#: query_hql.xml:823
+#: query_hql.xml:847
 #, no-c-format
 msgid ""
 "For databases that support subselects, Hibernate supports subqueries within "
@@ -1752,7 +1752,7 @@
 "询中的别名的子查询)也是允许的。"
 
 #. Tag: programlisting
-#: query_hql.xml:829
+#: query_hql.xml:853
 #, no-c-format
 msgid ""
 "<![CDATA[from Cat as fatcat\n"
@@ -1762,7 +1762,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:831
+#: query_hql.xml:855
 #, no-c-format
 msgid ""
 "<![CDATA[from DomesticCat as cat\n"
@@ -1772,7 +1772,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:833
+#: query_hql.xml:857
 #, no-c-format
 msgid ""
 "<![CDATA[from Cat as cat\n"
@@ -1782,7 +1782,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:835
+#: query_hql.xml:859
 #, no-c-format
 msgid ""
 "<![CDATA[from DomesticCat as cat\n"
@@ -1792,7 +1792,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:837
+#: query_hql.xml:861
 #, no-c-format
 msgid ""
 "<![CDATA[select cat.id, (select max(kit.weight) from cat.kitten kit)\n"
@@ -1800,13 +1800,13 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:839
+#: query_hql.xml:863
 #, no-c-format
 msgid "Note that HQL subqueries may occur only in the select or where clauses."
 msgstr "注意,HQL自查询只可以在select或者where子句中出现。"
 
 #. Tag: para
-#: query_hql.xml:843
+#: query_hql.xml:867
 #, no-c-format
 msgid ""
 "Note that subqueries can also utilize <literal>row value constructor</"
@@ -1816,13 +1816,13 @@
 "literal> syntax. See <xref linkend=\"queryhql-tuple\"/> for more details."
 
 #. Tag: title
-#: query_hql.xml:851
+#: query_hql.xml:875
 #, no-c-format
 msgid "HQL examples"
 msgstr "HQL示例"
 
 #. Tag: para
-#: query_hql.xml:853
+#: query_hql.xml:877
 #, no-c-format
 msgid ""
 "Hibernate queries can be quite powerful and complex. In fact, the power of "
@@ -1835,7 +1835,7 @@
 "你能用到的大多数查询比这些要简单的多!"
 
 #. Tag: para
-#: query_hql.xml:859
+#: query_hql.xml:883
 #, no-c-format
 msgid ""
 "The following query returns the order id, number of items and total value of "
@@ -1853,7 +1853,7 @@
 "<literal>CATALOG</literal> 和<literal>PRICE</literal> 库表。"
 
 #. Tag: programlisting
-#: query_hql.xml:868
+#: query_hql.xml:892
 #, no-c-format
 msgid ""
 "<![CDATA[select order.id, sum(price.amount), count(item)\n"
@@ -1877,7 +1877,7 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:870
+#: query_hql.xml:894
 #, no-c-format
 msgid ""
 "What a monster! Actually, in real life, I'm not very keen on subqueries, so "
@@ -1887,7 +1887,7 @@
 "看起来更像这个:"
 
 #. Tag: programlisting
-#: query_hql.xml:875
+#: query_hql.xml:899
 #, no-c-format
 msgid ""
 "<![CDATA[select order.id, sum(price.amount), count(item)\n"
@@ -1906,7 +1906,7 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:877
+#: query_hql.xml:901
 #, no-c-format
 msgid ""
 "The next query counts the number of payments in each status, excluding all "
@@ -1923,7 +1923,7 @@
 "literal> 以及 <literal>PAYMENT_STATUS_CHANGE</literal>。"
 
 #. Tag: programlisting
-#: query_hql.xml:885
+#: query_hql.xml:909
 #, no-c-format
 msgid ""
 "<![CDATA[select count(payment), status.name\n"
@@ -1944,7 +1944,7 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:887
+#: query_hql.xml:911
 #, no-c-format
 msgid ""
 "If I would have mapped the <literal>statusChanges</literal> collection as a "
@@ -1954,7 +1954,7 @@
 "个集合(set), 书写查询语句将更加简单."
 
 #. Tag: programlisting
-#: query_hql.xml:892
+#: query_hql.xml:916
 #, no-c-format
 msgid ""
 "<![CDATA[select count(payment), status.name\n"
@@ -1968,7 +1968,7 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:894
+#: query_hql.xml:918
 #, no-c-format
 msgid ""
 "The next query uses the MS SQL Server <literal>isNull()</literal> function "
@@ -1987,7 +1987,7 @@
 "询。"
 
 #. Tag: programlisting
-#: query_hql.xml:903
+#: query_hql.xml:927
 #, no-c-format
 msgid ""
 "<![CDATA[select account, payment\n"
@@ -2000,14 +2000,14 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:905
+#: query_hql.xml:929
 #, no-c-format
 msgid ""
 "For some databases, we would need to do away with the (correlated) subselect."
 msgstr "对于一些数据库,我们需要弃用(相关的)子选择。"
 
 #. Tag: programlisting
-#: query_hql.xml:909
+#: query_hql.xml:933
 #, no-c-format
 msgid ""
 "<![CDATA[select account, payment\n"
@@ -2021,13 +2021,13 @@
 msgstr ""
 
 #. Tag: title
-#: query_hql.xml:914
+#: query_hql.xml:938
 #, no-c-format
 msgid "Bulk update and delete"
 msgstr "批量的UPDATE和DELETE"
 
 #. Tag: para
-#: query_hql.xml:916
+#: query_hql.xml:940
 #, no-c-format
 msgid ""
 "HQL now supports <literal>update</literal>, <literal>delete</literal> and "
@@ -2039,20 +2039,20 @@
 "direct\"/> 以获得更多信息。"
 
 #. Tag: title
-#: query_hql.xml:924
+#: query_hql.xml:948
 #, no-c-format
 msgid "Tips &amp; Tricks"
 msgstr "小技巧 &amp; 小窍门"
 
 #. Tag: para
-#: query_hql.xml:926
+#: query_hql.xml:950
 #, no-c-format
 msgid ""
 "You can count the number of query results without actually returning them:"
 msgstr "你可以统计查询结果的数目而不必实际的返回他们:"
 
 #. Tag: programlisting
-#: query_hql.xml:930
+#: query_hql.xml:954
 #, no-c-format
 msgid ""
 "<![CDATA[( (Integer) session.createQuery(\"select count(*) from ....\")."
@@ -2060,13 +2060,13 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:932
+#: query_hql.xml:956
 #, 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:960
 #, no-c-format
 msgid ""
 "<![CDATA[select usr.id, usr.name\n"
@@ -2077,7 +2077,7 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:938
+#: query_hql.xml:962
 #, no-c-format
 msgid ""
 "If your database supports subselects, you can place a condition upon "
@@ -2087,19 +2087,19 @@
 "(selection size)指定一个条件:"
 
 #. Tag: programlisting
-#: query_hql.xml:943
+#: query_hql.xml:967
 #, no-c-format
 msgid "<![CDATA[from User usr where size(usr.messages) >= 1]]>"
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:945
+#: query_hql.xml:969
 #, no-c-format
 msgid "If your database doesn't support subselects, use the following query:"
 msgstr "如果你的数据库不支持子选择语句,使用下面的查询:"
 
 #. Tag: programlisting
-#: query_hql.xml:949
+#: query_hql.xml:973
 #, no-c-format
 msgid ""
 "<![CDATA[select usr.id, usr.name\n"
@@ -2110,7 +2110,7 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:951
+#: query_hql.xml:975
 #, no-c-format
 msgid ""
 "As this solution can't return a <literal>User</literal> with zero messages "
@@ -2120,7 +2120,7 @@
 "<literal>User</literal> 类的实例, 所以这种情况下使用下面的格式将是有帮助的:"
 
 #. Tag: programlisting
-#: query_hql.xml:956
+#: query_hql.xml:980
 #, no-c-format
 msgid ""
 "<![CDATA[select usr.id, usr.name\n"
@@ -2131,13 +2131,13 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:958
+#: query_hql.xml:982
 #, no-c-format
 msgid "Properties of a JavaBean can be bound to named query parameters:"
 msgstr "JavaBean的属性可以被绑定到一个命名查询(named query)的参数上:"
 
 #. Tag: programlisting
-#: query_hql.xml:962
+#: query_hql.xml:986
 #, no-c-format
 msgid ""
 "<![CDATA[Query q = s.createQuery(\"from foo Foo as foo where foo.name=:name "
@@ -2147,7 +2147,7 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:964
+#: query_hql.xml:988
 #, no-c-format
 msgid ""
 "Collections are pageable by using the <literal>Query</literal> interface "
@@ -2157,7 +2157,7 @@
 "(Collections)是可以分页的:"
 
 #. Tag: programlisting
-#: query_hql.xml:968
+#: query_hql.xml:992
 #, no-c-format
 msgid ""
 "<![CDATA[Query q = s.createFilter( collection, \"\" ); // the trivial "
@@ -2168,14 +2168,14 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:970
+#: query_hql.xml:994
 #, no-c-format
 msgid "Collection elements may be ordered or grouped using a query filter:"
 msgstr ""
 "通过使用查询过滤器(query filter)可以将集合(Collection)的原素分组或排序:"
 
 #. Tag: programlisting
-#: query_hql.xml:974
+#: query_hql.xml:998
 #, no-c-format
 msgid ""
 "<![CDATA[Collection orderedCollection = s.filter( collection, \"order by "
@@ -2185,13 +2185,13 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:976
+#: query_hql.xml:1000
 #, no-c-format
 msgid "You can find the size of a collection without initializing it:"
 msgstr "不用通过初始化,你就可以知道一个集合(Collection)的大小:"
 
 #. Tag: programlisting
-#: query_hql.xml:980
+#: query_hql.xml:1004
 #, no-c-format
 msgid ""
 "<![CDATA[( (Integer) session.createQuery(\"select count(*) from ....\")."
@@ -2199,13 +2199,13 @@
 msgstr ""
 
 #. Tag: title
-#: query_hql.xml:985
+#: query_hql.xml:1009
 #, no-c-format
 msgid "Components"
 msgstr "translator-credits"
 
 #. Tag: para
-#: query_hql.xml:987
+#: query_hql.xml:1011
 #, no-c-format
 msgid ""
 "Components might be used in just about every way that simple value types can "
@@ -2214,19 +2214,19 @@
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:992 query_hql.xml:1038
+#: query_hql.xml:1016 query_hql.xml:1062
 #, no-c-format
 msgid "<![CDATA[select p.name from Person p]]>"
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:993
+#: query_hql.xml:1017
 #, no-c-format
 msgid "<![CDATA[select p.name.first from Person p]]>"
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:995
+#: query_hql.xml:1019
 #, no-c-format
 msgid ""
 "where the Person's name property is a component. Components can also be used "
@@ -2234,51 +2234,51 @@
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:1000
+#: query_hql.xml:1024
 #, no-c-format
 msgid "<![CDATA[from Person p where p.name = :name]]>"
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:1001
+#: query_hql.xml:1025
 #, no-c-format
 msgid "<![CDATA[from Person p where p.name.first = :firstName]]>"
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:1003
+#: query_hql.xml:1027
 #, 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:1031
 #, no-c-format
 msgid "<![CDATA[from Person p order by p.name]]>"
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:1008
+#: query_hql.xml:1032
 #, no-c-format
 msgid "<![CDATA[from Person p order by p.name.first]]>"
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:1010
+#: query_hql.xml:1034
 #, no-c-format
 msgid ""
-"Another common use of components is in <xref linkend=\"queryhql-tuple\"/>row "
-"value constructors."
+"Another common use of components is in <link linkend=\"queryhql-tuple\">row "
+"value constructors</link>."
 msgstr ""
 
 #. Tag: title
-#: query_hql.xml:1016
+#: query_hql.xml:1040
 #, no-c-format
 msgid "Row value constructor syntax"
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:1018
+#: query_hql.xml:1042
 #, no-c-format
 msgid ""
 "HQL supports the use of ANSI SQL <literal>row value constructor</literal> "
@@ -2289,7 +2289,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:1025
+#: query_hql.xml:1049
 #, no-c-format
 msgid ""
 "<![CDATA[from Person p where p.name.first='John' and p.name."
@@ -2297,7 +2297,7 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:1027
+#: query_hql.xml:1051
 #, no-c-format
 msgid ""
 "That's valid syntax, although a little verbose. It be nice to make this a "
@@ -2305,13 +2305,13 @@
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:1032
+#: query_hql.xml:1056
 #, no-c-format
 msgid "<![CDATA[from Person p where p.name=('John', 'Jingleheimer-Schmidt')]]>"
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:1034
+#: query_hql.xml:1058
 #, no-c-format
 msgid ""
 "It can also be useful to specify this in the <literal>select</literal> "
@@ -2319,7 +2319,7 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:1040
+#: query_hql.xml:1064
 #, no-c-format
 msgid ""
 "Another time using <literal>row value constructor</literal> syntax can be "
@@ -2328,7 +2328,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: query_hql.xml:1045
+#: query_hql.xml:1069
 #, no-c-format
 msgid ""
 "<![CDATA[from Cat as cat\n"
@@ -2338,7 +2338,7 @@
 msgstr ""
 
 #. Tag: para
-#: query_hql.xml:1047
+#: query_hql.xml:1071
 #, no-c-format
 msgid ""
 "One thing to consider when deciding if you want to use this syntax is that "

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	2008-08-14 15:28:13 UTC (rev 15066)
+++ core/trunk/documentation/manual/src/main/docbook/zh-CN/content/session_api.po	2008-08-14 15:35:40 UTC (rev 15067)
@@ -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: 2008-08-14 15:28+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,13 +11,13 @@
 "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
+#: session_api.xml:31
 #, no-c-format
 msgid ""
 "Hibernate is a full object/relational mapping solution that not only shields "
@@ -33,7 +33,7 @@
 "Hibernate采用了更自然的面向对象的视角来持久化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 "
@@ -47,19 +47,19 @@
 "发者在进行系统性能调优的时候才需要进行了解。"
 
 #. Tag: title
-#: session_api.xml:24
+#: session_api.xml:48
 #, no-c-format
 msgid "Hibernate object states"
 msgstr "Hibernate对象状态(object states)"
 
 #. Tag: para
-#: session_api.xml:26
+#: session_api.xml:50
 #, no-c-format
 msgid "Hibernate defines and supports the following object states:"
 msgstr "Hibernate定义并支持下列对象状态(state):"
 
 #. Tag: para
-#: session_api.xml:32
+#: session_api.xml:56
 #, no-c-format
 msgid ""
 "<emphasis>Transient</emphasis> - an object is transient if it has just been "
@@ -80,7 +80,7 @@
 "为持久(Persistent)状态。(Hibernate会自动执行必要的SQL语句)"
 
 #. Tag: para
-#: session_api.xml:44
+#: session_api.xml:68
 #, no-c-format
 msgid ""
 "<emphasis>Persistent</emphasis> - a persistent instance has a representation "
@@ -102,7 +102,7 @@
 "literal>语句。"
 
 #. Tag: para
-#: session_api.xml:55
+#: session_api.xml:79
 #, no-c-format
 msgid ""
 "<emphasis>Detached</emphasis> - a detached instance is an object that has "
@@ -125,7 +125,7 @@
 "作单元(unit of work)。"
 
 #. Tag: para
-#: session_api.xml:69
+#: session_api.xml:93
 #, no-c-format
 msgid ""
 "We'll now discuss the states and state transitions (and the Hibernate "
@@ -135,13 +135,13 @@
 "发状态转换的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 "
@@ -153,7 +153,7 @@
 "变为<emphasis>持久(Persistent)</emphasis>的。"
 
 #. Tag: programlisting
-#: session_api.xml:86
+#: session_api.xml:110
 #, no-c-format
 msgid ""
 "<![CDATA[DomesticCat fritz = new DomesticCat();\n"
@@ -164,7 +164,7 @@
 msgstr ""
 
 #. Tag: para
-#: session_api.xml:88
+#: session_api.xml:112
 #, no-c-format
 msgid ""
 "If <literal>Cat</literal> has a generated identifier, the identifier is "
@@ -185,7 +185,7 @@
 "义,使用<literal>persist()</literal>替代<literal>save()</literal>。"
 
 #. Tag: para
-#: session_api.xml:100
+#: session_api.xml:124
 #, no-c-format
 msgid ""
 "<literal>persist()</literal> makes a transient instance persistent. However, "
@@ -205,7 +205,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 "
@@ -221,7 +221,7 @@
 "running conversation with an extended Session/persistence context."
 
 #. Tag: para
-#: session_api.xml:121
+#: session_api.xml:145
 #, no-c-format
 msgid ""
 "Alternatively, you may assign the identifier using an overloaded version of "
@@ -229,7 +229,7 @@
 msgstr "此外,你可以用一个重载版本的<literal>save()</literal>方法。"
 
 #. Tag: programlisting
-#: session_api.xml:126
+#: session_api.xml:150
 #, no-c-format
 msgid ""
 "<![CDATA[DomesticCat pk = new DomesticCat();\n"
@@ -242,7 +242,7 @@
 msgstr ""
 
 #. Tag: para
-#: session_api.xml:128
+#: session_api.xml:152
 #, no-c-format
 msgid ""
 "If the object you make persistent has associated objects (e.g. the "
@@ -261,7 +261,7 @@
 "kitten),那么可能会违反<literal>NOT NULL</literal>约束。"
 
 #. Tag: para
-#: session_api.xml:138
+#: session_api.xml:162
 #, no-c-format
 msgid ""
 "Usually you don't bother with this detail, as you'll very likely use "
@@ -276,13 +276,13 @@
 "情。 传播性持久化(transitive persistence)将在本章稍后讨论。"
 
 #. Tag: title
-#: session_api.xml:149
+#: session_api.xml:173
 #, no-c-format
 msgid "Loading an object"
 msgstr "装载对象"
 
 #. Tag: para
-#: session_api.xml:151
+#: session_api.xml:175
 #, no-c-format
 msgid ""
 "The <literal>load()</literal> methods of <literal>Session</literal> gives "
@@ -296,13 +296,13 @@
 "加载其数据(state)。"
 
 #. 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"
@@ -312,14 +312,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 ""
 "此外, 你可以把数据(state)加载到指定的对象实例上(覆盖掉该实例原来的数据)。"
 
 #. Tag: programlisting
-#: session_api.xml:166
+#: session_api.xml:190
 #, no-c-format
 msgid ""
 "<![CDATA[Cat cat = new DomesticCat();\n"
@@ -329,7 +329,7 @@
 msgstr ""
 
 #. Tag: para
-#: session_api.xml:168
+#: session_api.xml:192
 #, no-c-format
 msgid ""
 "Note that <literal>load()</literal> will throw an unrecoverable exception if "
@@ -351,7 +351,7 @@
 "数据)。"
 
 #. Tag: para
-#: session_api.xml:179
+#: session_api.xml:203
 #, no-c-format
 msgid ""
 "If you are not certain that a matching row exists, you should use the "
@@ -362,7 +362,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"
@@ -374,7 +374,7 @@
 msgstr ""
 
 #. Tag: para
-#: session_api.xml:187
+#: session_api.xml:211
 #, no-c-format
 msgid ""
 "You may even load an object using an SQL <literal>SELECT ... FOR UPDATE</"
@@ -385,13 +385,13 @@
 "FOR UPDATE</literal>装载对象。 请查阅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
+#: session_api.xml:218
 #, no-c-format
 msgid ""
 "Note that any associated instances or contained collections are "
@@ -404,7 +404,7 @@
 "者<literal>all</literal>作为关联(association)的级联风格(cascade style)。"
 
 #. 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, "
@@ -415,7 +415,7 @@
 "果你使用数据库触发器功能来处理对象的某些属性,这个方法就很有用了。"
 
 #. Tag: programlisting
-#: session_api.xml:207
+#: session_api.xml:231
 #, no-c-format
 msgid ""
 "<![CDATA[sess.save(cat);\n"
@@ -424,7 +424,7 @@
 msgstr ""
 
 #. Tag: para
-#: session_api.xml:209
+#: session_api.xml:233
 #, no-c-format
 msgid ""
 "An important question usually appears at this point: How much does Hibernate "
@@ -437,13 +437,13 @@
 "strategy)</emphasis>,会在<xref 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
+#: session_api.xml:245
 #, no-c-format
 msgid ""
 "If you don't know the identifiers of the objects you are looking for, you "
@@ -460,13 +460,13 @@
 "集(result set)转化为对象的支持。"
 
 #. 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."
@@ -481,7 +481,7 @@
 "象:"
 
 #. Tag: programlisting
-#: session_api.xml:240
+#: session_api.xml:264
 #, no-c-format
 msgid ""
 "<![CDATA[List cats = session.createQuery(\n"
@@ -511,7 +511,7 @@
 msgstr ""
 
 #. Tag: para
-#: session_api.xml:242
+#: session_api.xml:266
 #, no-c-format
 msgid ""
 "A query is usually executed by invoking <literal>list()</literal>, the "
@@ -530,13 +530,13 @@
 "次根对象(他们的集合类都被初始化了)。你可以通过一个集合来过滤这些重复对象。"
 
 #. Tag: title
-#: session_api.xml:254
+#: session_api.xml:278
 #, no-c-format
 msgid "Iterating results"
 msgstr "迭代式获取结果(Iterating results)"
 
 #. Tag: para
-#: session_api.xml:256
+#: session_api.xml:280
 #, no-c-format
 msgid ""
 "Occasionally, you might be able to achieve better performance by executing "
@@ -557,7 +557,7 @@
 "持久化标识执行<emphasis>n</emphasis>条附加的select语句实例化实际的对象。"
 
 #. Tag: programlisting
-#: session_api.xml:268
+#: session_api.xml:292
 #, no-c-format
 msgid ""
 "<![CDATA[// fetch ids\n"
@@ -576,13 +576,13 @@
 msgstr ""
 
 #. Tag: title
-#: session_api.xml:272
+#: session_api.xml:296
 #, no-c-format
 msgid "Queries that return tuples"
 msgstr "返回元组(tuples)的查询"
 
 #. Tag: para
-#: session_api.xml:274
+#: session_api.xml:298
 #, no-c-format
 msgid ""
 "Hibernate queries sometimes return tuples of objects, in which case each "
@@ -592,7 +592,7 @@
 "(tuples),每个元组(tuples)以数组的形式返回:"
 
 #. Tag: programlisting
-#: session_api.xml:279
+#: session_api.xml:303
 #, no-c-format
 msgid ""
 "<![CDATA[Iterator kittensAndMothers = sess.createQuery(\n"
@@ -610,13 +610,13 @@
 msgstr ""
 
 #. Tag: title
-#: session_api.xml:284
+#: session_api.xml:308
 #, no-c-format
 msgid "Scalar results"
 msgstr "标量(Scalar)结果"
 
 #. Tag: para
-#: session_api.xml:286
+#: session_api.xml:310
 #, no-c-format
 msgid ""
 "Queries may specify a property of a class in the <literal>select</literal> "
@@ -628,7 +628,7 @@
 "(persistent state)的实体)。"
 
 #. Tag: programlisting
-#: session_api.xml:292
+#: session_api.xml:316
 #, no-c-format
 msgid ""
 "<![CDATA[Iterator results = sess.createQuery(\n"
@@ -648,13 +648,13 @@
 msgstr ""
 
 #. Tag: title
-#: session_api.xml:297
+#: session_api.xml:321
 #, no-c-format
 msgid "Bind parameters"
 msgstr "绑定参数"
 
 #. Tag: para
-#: session_api.xml:299
+#: session_api.xml:323
 #, no-c-format
 msgid ""
 "Methods on <literal>Query</literal> are provided for binding values to named "
@@ -670,26 +670,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 "命名参数(named parameters)与其在查询串中出现的顺序无关"
 
 #. Tag: para
-#: session_api.xml:315
+#: session_api.xml:339
 #, no-c-format
 msgid "they may 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"
@@ -700,7 +700,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: session_api.xml:328
+#: session_api.xml:352
 #, no-c-format
 msgid ""
 "<![CDATA[//positional parameter\n"
@@ -710,7 +710,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: session_api.xml:330
+#: session_api.xml:354
 #, no-c-format
 msgid ""
 "<![CDATA[//named parameter list\n"
@@ -724,13 +724,13 @@
 msgstr ""
 
 #. Tag: title
-#: session_api.xml:335
+#: session_api.xml:359
 #, no-c-format
 msgid "Pagination"
 msgstr "分页"
 
 #. Tag: para
-#: session_api.xml:337
+#: session_api.xml:361
 #, no-c-format
 msgid ""
 "If you need to specify bounds upon your result set (the maximum number of "
@@ -741,7 +741,7 @@
 "<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"
@@ -751,7 +751,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 "
@@ -761,13 +761,13 @@
 "SQL)。"
 
 #. 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
+#: session_api.xml:379
 #, no-c-format
 msgid ""
 "If your JDBC driver supports scrollable <literal>ResultSet</literal>s, the "
@@ -780,7 +780,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 "
@@ -810,7 +810,7 @@
 msgstr ""
 
 #. Tag: para
-#: session_api.xml:364
+#: session_api.xml:388
 #, no-c-format
 msgid ""
 "Note that an open database connection (and cursor) is required for this "
@@ -822,13 +822,13 @@
 "<literal>setFirstResult()</literal>"
 
 #. 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
+#: session_api.xml:399
 #, no-c-format
 msgid ""
 "You may also define named queries in the mapping document. (Remember to use "
@@ -839,7 +839,7 @@
 "解释为XML标记(markup)的字符,别忘了用<literal>CDATA</literal>包裹起来。)"
 
 #. Tag: programlisting
-#: session_api.xml:381
+#: session_api.xml:405
 #, no-c-format
 msgid ""
 "<![CDATA[<query name=\"ByNameAndMaximumWeight\"><![CDATA[\n"
@@ -850,13 +850,13 @@
 msgstr ""
 
 #. Tag: para
-#: session_api.xml:383
+#: session_api.xml:407
 #, no-c-format
 msgid "Parameter binding and executing is done programatically:"
 msgstr "参数绑定及执行以编程方式(programatically)完成:"
 
 #. Tag: programlisting
-#: session_api.xml:387
+#: session_api.xml:411
 #, no-c-format
 msgid ""
 "<![CDATA[Query q = sess.getNamedQuery(\"ByNameAndMaximumWeight\");\n"
@@ -866,7 +866,7 @@
 msgstr ""
 
 #. Tag: para
-#: session_api.xml:389
+#: session_api.xml:413
 #, no-c-format
 msgid ""
 "Note that the actual program code is independent of the query language that "
@@ -878,7 +878,7 @@
 "管理,达到迁移的目的。"
 
 #. Tag: para
-#: session_api.xml:395
+#: session_api.xml:419
 #, no-c-format
 msgid ""
 "Also note that a query declaration inside a <literal>&lt;hibernate-"
@@ -893,13 +893,13 @@
 "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
+#: session_api.xml:433
 #, no-c-format
 msgid ""
 "A collection <emphasis>filter</emphasis> is a special type of query that may "
@@ -911,7 +911,7 @@
 "素。"
 
 #. Tag: programlisting
-#: session_api.xml:415
+#: session_api.xml:439
 #, no-c-format
 msgid ""
 "<![CDATA[Collection blackKittens = session.createFilter(\n"
@@ -923,7 +923,7 @@
 msgstr ""
 
 #. Tag: para
-#: session_api.xml:417
+#: session_api.xml:441
 #, no-c-format
 msgid ""
 "The returned collection is considered a bag, and it's a copy of the given "
@@ -935,7 +935,7 @@
 "我们期待的行为一致)。"
 
 #. Tag: para
-#: session_api.xml:423
+#: session_api.xml:447
 #, no-c-format
 msgid ""
 "Observe that filters do not require a <literal>from</literal> clause (though "
@@ -946,7 +946,7 @@
 "以加上)。过滤器(filter)不限定于只能返回集合元素本身。"
 
 #. Tag: programlisting
-#: session_api.xml:428
+#: session_api.xml:452
 #, no-c-format
 msgid ""
 "<![CDATA[Collection blackKittenMates = session.createFilter(\n"
@@ -956,7 +956,7 @@
 msgstr ""
 
 #. Tag: para
-#: session_api.xml:430
+#: 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 "
@@ -965,7 +965,7 @@
 "即使无条件的过滤器(filter)也是有意义的。例如,用于加载一个大集合的子集:"
 
 #. Tag: programlisting
-#: session_api.xml:435
+#: session_api.xml:459
 #, no-c-format
 msgid ""
 "<![CDATA[Collection tenKittens = session.createFilter(\n"
@@ -975,13 +975,13 @@
 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
+#: session_api.xml:466
 #, no-c-format
 msgid ""
 "HQL is extremely powerful but some developers prefer to build queries "
@@ -994,7 +994,7 @@
 "<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"
@@ -1004,7 +1004,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</"
@@ -1015,13 +1015,13 @@
 "再<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
+#: session_api.xml:484
 #, no-c-format
 msgid ""
 "You may express a query in SQL, using <literal>createSQLQuery()</literal> "
@@ -1036,7 +1036,7 @@
 "果你选择使用Hibernate的API, 你必须把SQL别名用大括号包围起来:"
 
 #. Tag: programlisting
-#: session_api.xml:468
+#: session_api.xml:492
 #, no-c-format
 msgid ""
 "<![CDATA[List cats = session.createSQLQuery(\"SELECT {cat.*} FROM CAT {cat} "
@@ -1046,7 +1046,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: session_api.xml:470
+#: session_api.xml:494
 #, no-c-format
 msgid ""
 "<![CDATA[List cats = session.createSQLQuery(\n"
@@ -1059,7 +1059,7 @@
 msgstr ""
 
 #. Tag: para
-#: session_api.xml:472
+#: session_api.xml:496
 #, no-c-format
 msgid ""
 "SQL queries may contain named and positional parameters, just like Hibernate "
@@ -1070,13 +1070,13 @@
 "linkend=\"querysql\"/>找到更多关于Hibernate中原生SQL(native SQL)的信息。"
 
 #. Tag: title
-#: session_api.xml:483
+#: session_api.xml:507
 #, no-c-format
 msgid "Modifying persistent objects"
 msgstr "修改持久对象"
 
 #. Tag: para
-#: session_api.xml:485
+#: session_api.xml:509
 #, no-c-format
 msgid ""
 "<emphasis>Transactional persistent instances</emphasis> (ie. objects loaded, "
@@ -1098,7 +1098,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"
@@ -1108,7 +1108,7 @@
 msgstr ""
 
 #. Tag: para
-#: session_api.xml:498
+#: session_api.xml:522
 #, no-c-format
 msgid ""
 "Sometimes this programming model is inefficient since it would require both "
@@ -1122,7 +1122,7 @@
 "更新的状态)。 为此Hibernate提供了另一种途径,使用脱管(detached)实例。"
 
 #. Tag: emphasis
-#: session_api.xml:506
+#: session_api.xml:530
 #, fuzzy, no-c-format
 msgid ""
 "Note that Hibernate does not offer its own API for direct execution of "
@@ -1145,13 +1145,13 @@
 ">,寻找一些可用的批量(batch)操作技巧。"
 
 #. Tag: title
-#: session_api.xml:521
+#: session_api.xml:545
 #, no-c-format
 msgid "Modifying detached objects"
 msgstr "修改脱管(Detached)对象"
 
 #. Tag: para
-#: session_api.xml:523
+#: session_api.xml:547
 #, no-c-format
 msgid ""
 "Many applications need to retrieve an object in one transaction, send it to "
@@ -1165,7 +1165,7 @@
 "的数据来保证这些“长“工作单元之间的隔离。"
 
 #. Tag: para
-#: session_api.xml:530
+#: session_api.xml:554
 #, no-c-format
 msgid ""
 "Hibernate supports this model by providing for reattachment of detached "
@@ -1176,7 +1176,7 @@
 "()</literal> 重新关联脱管实例的办法来支持这种模型。"
 
 #. Tag: programlisting
-#: session_api.xml:536
+#: session_api.xml:560
 #, no-c-format
 msgid ""
 "<![CDATA[// in the first session\n"
@@ -1193,7 +1193,7 @@
 msgstr ""
 
 #. Tag: para
-#: session_api.xml:538
+#: session_api.xml:562
 #, no-c-format
 msgid ""
 "If the <literal>Cat</literal> with identifier <literal>catId</literal> had "
@@ -1205,7 +1205,7 @@
 "(reattach)的时候会抛出一个异常。"
 
 #. Tag: para
-#: session_api.xml:544
+#: session_api.xml:568
 #, no-c-format
 msgid ""
 "Use <literal>update()</literal> if you are sure that the session does not "
@@ -1223,7 +1223,7 @@
 "先被执行。"
 
 #. Tag: para
-#: session_api.xml:553
+#: session_api.xml:577
 #, no-c-format
 msgid ""
 "The application should individually <literal>update()</literal> detached "
@@ -1239,7 +1239,7 @@
 "\"objectstate-transitive\"/>。"
 
 #. Tag: para
-#: session_api.xml:560
+#: session_api.xml:584
 #, no-c-format
 msgid ""
 "The <literal>lock()</literal> method also allows an application to "
@@ -1250,7 +1250,7 @@
 "过,该脱管(detached)的对象必须是没有修改过的!"
 
 #. Tag: programlisting
-#: session_api.xml:565
+#: session_api.xml:589
 #, no-c-format
 msgid ""
 "<![CDATA[//just reassociate:\n"
@@ -1262,7 +1262,7 @@
 msgstr ""
 
 #. Tag: para
-#: session_api.xml:567
+#: session_api.xml:591
 #, no-c-format
 msgid ""
 "Note that <literal>lock()</literal> can be used with various "
@@ -1275,7 +1275,7 @@
 "<literal>lock()</literal>的唯一用途。"
 
 #. Tag: para
-#: session_api.xml:574
+#: session_api.xml:598
 #, no-c-format
 msgid ""
 "Other models for long units of work are discussed in <xref linkend="
@@ -1285,13 +1285,13 @@
 "讨论。"
 
 #. Tag: title
-#: session_api.xml:581
+#: session_api.xml:605
 #, no-c-format
 msgid "Automatic state detection"
 msgstr "自动状态检测"
 
 #. Tag: para
-#: session_api.xml:583
+#: session_api.xml:607
 #, no-c-format
 msgid ""
 "Hibernate users have requested a general purpose method that either saves a "
@@ -1304,7 +1304,7 @@
 "<literal>saveOrUpdate()</literal>方法实现了这个功能。"
 
 #. Tag: programlisting
-#: session_api.xml:590
+#: session_api.xml:614
 #, no-c-format
 msgid ""
 "<![CDATA[// in the first session\n"
@@ -1322,7 +1322,7 @@
 msgstr ""
 
 #. Tag: para
-#: session_api.xml:592
+#: session_api.xml:616
 #, no-c-format
 msgid ""
 "The usage and semantics of <literal>saveOrUpdate()</literal> seems to be "
@@ -1338,7 +1338,7 @@
 "<literal>merge()</literal>。有些程序从来不用这些方法。"
 
 #. Tag: para
-#: session_api.xml:600
+#: session_api.xml:624
 #, no-c-format
 msgid ""
 "Usually <literal>update()</literal> or <literal>saveOrUpdate()</literal> are "
@@ -1348,31 +1348,31 @@
 "literal>:"
 
 #. Tag: para
-#: session_api.xml:607
+#: session_api.xml:631
 #, no-c-format
 msgid "the application loads an object in the first session"
 msgstr "程序在第一个session中加载对象"
 
 #. Tag: para
-#: session_api.xml:612
+#: session_api.xml:636
 #, no-c-format
 msgid "the object is passed up to the UI tier"
 msgstr "该对象被传递到表现层"
 
 #. Tag: para
-#: session_api.xml:617
+#: session_api.xml:641
 #, no-c-format
 msgid "some modifications are made to the object"
 msgstr "对象发生了一些改动"
 
 #. Tag: para
-#: session_api.xml:622
+#: session_api.xml:646
 #, 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:651
 #, no-c-format
 msgid ""
 "the application persists these modifications by calling <literal>update()</"
@@ -1380,19 +1380,19 @@
 msgstr "程序调用第二个session的<literal>update()</literal>方法持久这些改动"
 
 #. Tag: para
-#: session_api.xml:634
+#: session_api.xml:658
 #, no-c-format
 msgid "<literal>saveOrUpdate()</literal> does the following:"
 msgstr "<literal>saveOrUpdate()</literal>做下面的事:"
 
 #. Tag: para
-#: session_api.xml:640
+#: session_api.xml:664
 #, no-c-format
 msgid "if the object is already persistent in this session, do nothing"
 msgstr "如果对象已经在本session中持久化了,不做任何事"
 
 #. Tag: para
-#: session_api.xml:645
+#: session_api.xml:669
 #, no-c-format
 msgid ""
 "if another object associated with the session has the same identifier, throw "
@@ -1401,14 +1401,14 @@
 "如果另一个与本session关联的对象拥有相同的持久化标识(identifier),抛出一个异常"
 
 #. Tag: para
-#: session_api.xml:651
+#: session_api.xml:675
 #, 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:656
+#: session_api.xml:680
 #, no-c-format
 msgid ""
 "if the object's identifier has the value assigned to a newly instantiated "
@@ -1418,7 +1418,7 @@
 "<literal>save()</literal>"
 
 #. Tag: para
-#: session_api.xml:662
+#: session_api.xml:686
 #, no-c-format
 msgid ""
 "if the object is versioned (by a <literal>&lt;version&gt;</literal> or "
@@ -1431,19 +1431,19 @@
 "对象,<literal>save()</literal>它。"
 
 #. Tag: para
-#: session_api.xml:670
+#: session_api.xml:694
 #, no-c-format
 msgid "otherwise <literal>update()</literal> the object"
 msgstr "否则<literal>update()</literal> 这个对象"
 
 #. Tag: para
-#: session_api.xml:676
+#: session_api.xml:700
 #, no-c-format
 msgid "and <literal>merge()</literal> is very different:"
 msgstr "<literal>merge()</literal>可非常不同:"
 
 #. Tag: para
-#: session_api.xml:682
+#: session_api.xml:706
 #, no-c-format
 msgid ""
 "if there is a persistent instance with the same identifier currently "
@@ -1454,7 +1454,7 @@
 "旧有的持久实例"
 
 #. Tag: para
-#: session_api.xml:689
+#: session_api.xml:713
 #, no-c-format
 msgid ""
 "if there is no persistent instance currently associated with the session, "
@@ -1463,13 +1463,13 @@
 "如果session没有相应的持久实例,则尝试从数据库中加载,或创建新的持久化实例"
 
 #. Tag: para
-#: session_api.xml:695
+#: session_api.xml:719
 #, no-c-format
 msgid "the persistent instance is returned"
 msgstr "最后返回该持久实例"
 
 #. Tag: para
-#: session_api.xml:700
+#: session_api.xml:724
 #, no-c-format
 msgid ""
 "the given instance does not become associated with the session, it remains "
@@ -1477,13 +1477,13 @@
 msgstr "用户给出的这个对象没有被关联到session上,它依旧是脱管的"
 
 #. Tag: title
-#: session_api.xml:710
+#: session_api.xml:734
 #, no-c-format
 msgid "Deleting persistent objects"
 msgstr "删除持久对象"
 
 #. Tag: para
-#: session_api.xml:712
+#: session_api.xml:736
 #, no-c-format
 msgid ""
 "<literal>Session.delete()</literal> will remove an object's state from the "
@@ -1496,13 +1496,13 @@
 "<literal>delete()</literal>的用途是把一个持久实例变成瞬时(transient)实例。"
 
 #. Tag: programlisting
-#: session_api.xml:719
+#: session_api.xml:743
 #, no-c-format
 msgid "<![CDATA[sess.delete(cat);]]>"
 msgstr ""
 
 #. Tag: para
-#: session_api.xml:721
+#: session_api.xml:745
 #, no-c-format
 msgid ""
 "You may delete objects in any order you like, without risk of foreign key "
@@ -1515,13 +1515,13 @@
 "你删除了父对象,但是忘记删除孩子们。"
 
 #. Tag: title
-#: session_api.xml:732
+#: session_api.xml:756
 #, no-c-format
 msgid "Replicating object between two different datastores"
 msgstr "在两个不同数据库间复制对象"
 
 #. Tag: para
-#: session_api.xml:734
+#: session_api.xml:758
 #, no-c-format
 msgid ""
 "It is occasionally useful to be able to take a graph of persistent instances "
@@ -1532,7 +1532,7 @@
 "不同的数据库中的操作。"
 
 #. Tag: programlisting
-#: session_api.xml:740
+#: session_api.xml:764
 #, no-c-format
 msgid ""
 "<![CDATA[//retrieve a cat from one database\n"
@@ -1551,7 +1551,7 @@
 msgstr ""
 
 #. Tag: para
-#: session_api.xml:742
+#: session_api.xml:766
 #, no-c-format
 msgid ""
 "The <literal>ReplicationMode</literal> determines how <literal>replicate()</"
@@ -1561,7 +1561,7 @@
 "<literal>replicate()</literal>如何处理。"
 
 #. Tag: para
-#: session_api.xml:749
+#: session_api.xml:773
 #, no-c-format
 msgid ""
 "<literal>ReplicationMode.IGNORE</literal> - ignore the object when there is "
@@ -1569,7 +1569,7 @@
 msgstr "<literal>ReplicationMode.IGNORE</literal> - 忽略它"
 
 #. Tag: para
-#: session_api.xml:755
+#: session_api.xml:779
 #, no-c-format
 msgid ""
 "<literal>ReplicationMode.OVERWRITE</literal> - overwrite any existing "
@@ -1577,7 +1577,7 @@
 msgstr "<literal>ReplicationMode.OVERWRITE</literal> - 覆盖相同的行"
 
 #. Tag: para
-#: session_api.xml:761
+#: session_api.xml:785
 #, no-c-format
 msgid ""
 "<literal>ReplicationMode.EXCEPTION</literal> - throw an exception if there "
@@ -1585,7 +1585,7 @@
 msgstr "<literal>ReplicationMode.EXCEPTION</literal> - 抛出异常"
 
 #. Tag: para
-#: session_api.xml:767
+#: session_api.xml:791
 #, no-c-format
 msgid ""
 "<literal>ReplicationMode.LATEST_VERSION</literal> - overwrite the row if its "
@@ -1596,7 +1596,7 @@
 "盖,否则忽略"
 
 #. Tag: para
-#: session_api.xml:775
+#: session_api.xml:799
 #, no-c-format
 msgid ""
 "Usecases for this feature include reconciling data entered into different "
@@ -1609,13 +1609,13 @@
 "Consistent,Isolated and Durable的缩写)"
 
 #. Tag: title
-#: session_api.xml:784
+#: session_api.xml:808
 #, no-c-format
 msgid "Flushing the Session"
 msgstr "Session刷出(flush)"
 
 #. Tag: para
-#: session_api.xml:786
+#: session_api.xml:810
 #, no-c-format
 msgid ""
 "From time to time the <literal>Session</literal> will execute the SQL "
@@ -1628,31 +1628,31 @@
 "默认会在下面的时间点执行:"
 
 #. Tag: para
-#: session_api.xml:795
+#: session_api.xml:819
 #, no-c-format
 msgid "before some query executions"
 msgstr "在某些查询执行之前"
 
 #. Tag: para
-#: session_api.xml:800
+#: session_api.xml:824
 #, 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:829
 #, no-c-format
 msgid "from <literal>Session.flush()</literal>"
 msgstr "在调用<literal>Session.flush()</literal>的时候"
 
 #. Tag: para
-#: session_api.xml:811
+#: session_api.xml:835
 #, no-c-format
 msgid "The SQL statements are issued in the following order"
 msgstr "涉及的SQL语句会按照下面的顺序发出执行:"
 
 #. Tag: para
-#: session_api.xml:817
+#: session_api.xml:841
 #, no-c-format
 msgid ""
 "all entity insertions, in the same order the corresponding objects were "
@@ -1662,31 +1662,31 @@
 "的时间顺序"
 
 #. Tag: para
-#: session_api.xml:823
+#: session_api.xml:847
 #, no-c-format
 msgid "all entity updates"
 msgstr "所有对实体进行更新的语句"
 
 #. Tag: para
-#: session_api.xml:828
+#: session_api.xml:852
 #, no-c-format
 msgid "all collection deletions"
 msgstr "所有进行集合删除的语句"
 
 #. Tag: para
-#: session_api.xml:833
+#: session_api.xml:857
 #, no-c-format
 msgid "all collection element deletions, updates and insertions"
 msgstr "所有对集合元素进行删除,更新或者插入的语句"
 
 #. Tag: para
-#: session_api.xml:838
+#: session_api.xml:862
 #, no-c-format
 msgid "all collection insertions"
 msgstr "所有进行集合插入的语句"
 
 #. Tag: para
-#: session_api.xml:843
+#: session_api.xml:867
 #, no-c-format
 msgid ""
 "all entity deletions, in the same order the corresponding objects were "
@@ -1696,7 +1696,7 @@
 "literal>的时间顺序"
 
 #. Tag: para
-#: session_api.xml:850
+#: session_api.xml:874
 #, no-c-format
 msgid ""
 "(An exception is that objects using <literal>native</literal> ID generation "
@@ -1706,7 +1706,7 @@
 "识)的话,它们一执行save就会被插入。)"
 
 #. Tag: para
-#: session_api.xml:855
+#: session_api.xml:879
 #, no-c-format
 msgid ""
 "Except when you explicity <literal>flush()</literal>, there are absolutely "
@@ -1722,7 +1722,7 @@
 "据,也不会返回错误数据。"
 
 #. Tag: para
-#: session_api.xml:863
+#: session_api.xml:887
 #, no-c-format
 msgid ""
 "It is possible to change the default behavior so that flush occurs less "
@@ -1743,7 +1743,7 @@
 "longsession\"/>)."
 
 #. Tag: programlisting
-#: session_api.xml:873
+#: session_api.xml:897
 #, no-c-format
 msgid ""
 "<![CDATA[sess = sf.openSession();\n"
@@ -1763,7 +1763,7 @@
 msgstr ""
 
 #. Tag: para
-#: session_api.xml:875
+#: session_api.xml:899
 #, no-c-format
 msgid ""
 "During flush, an exception might occur (e.g. if a DML operation violates a "
@@ -1776,13 +1776,13 @@
 "论。"
 
 #. Tag: title
-#: session_api.xml:884
+#: session_api.xml:908
 #, no-c-format
 msgid "Transitive persistence"
 msgstr "传播性持久化(transitive persistence)"
 
 #. Tag: para
-#: session_api.xml:886
+#: session_api.xml:910
 #, no-c-format
 msgid ""
 "It is quite cumbersome to save, delete, or reattach individual objects, "
@@ -1793,7 +1793,7 @@
 "彼此关联的对象的时候。 一个常见的例子是父子关系。考虑下面的例子:"
 
 #. Tag: para
-#: session_api.xml:892
+#: session_api.xml:916
 #, no-c-format
 msgid ""
 "If the children in a parent/child relationship would be value typed (e.g. a "
@@ -1813,7 +1813,7 @@
 "Hibernate会在数据库中删除这个子对象。"
 
 #. Tag: para
-#: session_api.xml:903
+#: session_api.xml:927
 #, no-c-format
 msgid ""
 "Now consider the same scenario with parent and child objects being entities, "
@@ -1831,7 +1831,7 @@
 "久化(persistence by reachability)</emphasis>的策略。"
 
 #. Tag: para
-#: session_api.xml:912
+#: session_api.xml:936
 #, no-c-format
 msgid ""
 "For each basic operation of the Hibernate session - including "
@@ -1850,26 +1850,26 @@
 "文件中指出这一点。例如:"
 
 #. Tag: programlisting
-#: session_api.xml:921
+#: session_api.xml:945
 #, no-c-format
 msgid "<![CDATA[<one-to-one name=\"person\" cascade=\"persist\"/>]]>"
 msgstr ""
 
 #. Tag: para
-#: session_api.xml:923
+#: session_api.xml:947
 #, no-c-format
 msgid "Cascade styles my be combined:"
 msgstr "级联风格(cascade style)是可组合的:"
 
 #. Tag: programlisting
-#: session_api.xml:927
+#: session_api.xml:951
 #, no-c-format
 msgid ""
 "<![CDATA[<one-to-one name=\"person\" cascade=\"persist,delete,lock\"/>]]>"
 msgstr ""
 
 #. Tag: para
-#: session_api.xml:929
+#: session_api.xml:953
 #, no-c-format
 msgid ""
 "You may even use <literal>cascade=\"all\"</literal> to specify that "
@@ -1882,7 +1882,7 @@
 "literal>,即任何操作都不会被级联(cascaded)。"
 
 #. Tag: para
-#: session_api.xml:935
+#: session_api.xml:959
 #, no-c-format
 msgid ""
 "A special cascade style, <literal>delete-orphan</literal>, applies only to "
@@ -1895,13 +1895,13 @@
 "关联中删除的对象。"
 
 #. Tag: para
-#: session_api.xml:942
+#: session_api.xml:966
 #, no-c-format
 msgid "Recommendations:"
 msgstr "建议:"
 
 #. Tag: para
-#: session_api.xml:948
+#: session_api.xml:972
 #, no-c-format
 msgid ""
 "It doesn't usually make sense to enable cascade on a <literal>&lt;many-to-"
@@ -1915,7 +1915,7 @@
 "用。"
 
 #. Tag: para
-#: session_api.xml:956
+#: session_api.xml:980
 #, no-c-format
 msgid ""
 "If the child object's lifespan is bounded by the lifespan of the parent "
@@ -1927,7 +1927,7 @@
 "object)</emphasis>。"
 
 #. Tag: para
-#: session_api.xml:963
+#: session_api.xml:987
 #, no-c-format
 msgid ""
 "Otherwise, you might not need cascade at all. But if you think that you will "
@@ -1940,7 +1940,7 @@
 "\"persist,merge,save-update\"</literal>。"
 
 #. Tag: para
-#: session_api.xml:971
+#: session_api.xml:995
 #, no-c-format
 msgid ""
 "Mapping an association (either a single valued association, or a collection) "
@@ -1953,7 +1953,7 @@
 "父对象进行save/update/delete操作就会导致子对象也进行save/update/delete操作。"
 
 #. Tag: para
-#: session_api.xml:977
+#: session_api.xml:1001
 #, no-c-format
 msgid ""
 "Futhermore, a mere reference to a child from a persistent parent will result "
@@ -1971,7 +1971,7 @@
 "对象被自动删除。 父子关系的级联(cascading)操作准确语义如下:"
 
 #. Tag: para
-#: session_api.xml:988
+#: session_api.xml:1012
 #, no-c-format
 msgid ""
 "If a parent is passed to <literal>persist()</literal>, all children are "
@@ -1981,7 +1981,7 @@
 "<literal>persist()</literal>"
 
 #. Tag: para
-#: session_api.xml:994
+#: session_api.xml:1018
 #, no-c-format
 msgid ""
 "If a parent is passed to <literal>merge()</literal>, all children are passed "
@@ -1991,7 +1991,7 @@
 "</literal>"
 
 #. Tag: para
-#: session_api.xml:1000
+#: session_api.xml:1024
 #, no-c-format
 msgid ""
 "If a parent is passed to <literal>save()</literal>, <literal>update()</"
@@ -2003,7 +2003,7 @@
 "()</literal>"
 
 #. Tag: para
-#: session_api.xml:1006
+#: session_api.xml:1030
 #, no-c-format
 msgid ""
 "If a transient or detached child becomes referenced by a persistent parent, "
@@ -2013,7 +2013,7 @@
 "象将会被<literal>saveOrUpdate()</literal>"
 
 #. Tag: para
-#: session_api.xml:1012
+#: session_api.xml:1036
 #, no-c-format
 msgid ""
 "If a parent is deleted, all children are passed to <literal>delete()</"
@@ -2021,7 +2021,7 @@
 msgstr "如果父对象被删除,那么所有子对象也会被<literal>delete()</literal>"
 
 #. Tag: para
-#: session_api.xml:1017
+#: session_api.xml:1041
 #, no-c-format
 msgid ""
 "If a child is dereferenced by a persistent parent, <emphasis>nothing special "
@@ -2035,7 +2035,7 @@
 "式调用delete()删除子对象。"
 
 #. Tag: para
-#: session_api.xml:1026
+#: session_api.xml:1050
 #, no-c-format
 msgid ""
 "Finally, note that cascading of operations can be applied to an object graph "
@@ -2052,13 +2052,13 @@
 "flush的时候才作用到所有可触及的被关联对象上的。"
 
 #. Tag: title
-#: session_api.xml:1038
+#: session_api.xml:1062
 #, no-c-format
 msgid "Using metadata"
 msgstr "使用元数据"
 
 #. Tag: para
-#: session_api.xml:1040
+#: session_api.xml:1064
 #, no-c-format
 msgid ""
 "Hibernate requires a very rich meta-level model of all entity and value "
@@ -2075,7 +2075,7 @@
 "些被关联的实体)。"
 
 #. Tag: para
-#: session_api.xml:1047
+#: session_api.xml:1071
 #, no-c-format
 msgid ""
 "Hibernate exposes metadata via the <literal>ClassMetadata</literal> and "
@@ -2088,7 +2088,7 @@
 "访问元数据。 可以通过<literal>SessionFactory</literal>获取元数据接口的实例。"
 
 #. Tag: programlisting
-#: session_api.xml:1054
+#: session_api.xml:1078
 #, 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	2008-08-14 15:28:13 UTC (rev 15066)
+++ core/trunk/documentation/manual/src/main/docbook/zh-CN/content/toolset_guide.po	2008-08-14 15:35:40 UTC (rev 15067)
@@ -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: 2008-08-14 15:28+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,13 +11,13 @@
 "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
+#: toolset_guide.xml:31
 #, no-c-format
 msgid ""
 "Roundtrip engineering with Hibernate is possible using a set of Eclipse "
@@ -26,7 +26,7 @@
 "可以通过一系列Eclipse插件、命令行工具和Ant任务来进行与Hibernate关联的转换。"
 
 #. Tag: para
-#: toolset_guide.xml:12
+#: toolset_guide.xml:36
 #, no-c-format
 msgid ""
 "The <emphasis>Hibernate Tools</emphasis> currently include plugins for the "
@@ -37,7 +37,7 @@
 "的插件,用于与现存数据库的逆向工程。"
 
 #. Tag: para
-#: toolset_guide.xml:18
+#: toolset_guide.xml:42
 #, no-c-format
 msgid ""
 "<emphasis>Mapping Editor:</emphasis> An editor for Hibernate XML mapping "
@@ -50,7 +50,7 @@
 "方便得多。"
 
 #. Tag: para
-#: toolset_guide.xml:23
+#: toolset_guide.xml:47
 #, no-c-format
 msgid ""
 "<emphasis>Console:</emphasis> The console is a new view in Eclipse. In "
@@ -64,7 +64,7 @@
 "数据库执行HQL查询,并直接在Eclipse中浏览结果。"
 
 #. Tag: para
-#: toolset_guide.xml:30
+#: toolset_guide.xml:54
 #, no-c-format
 msgid ""
 "<emphasis>Development Wizards:</emphasis> Several wizards are provided with "
@@ -80,13 +80,13 @@
 "制的模版。"
 
 #. Tag: emphasis
-#: toolset_guide.xml:38
+#: toolset_guide.xml:62
 #, no-c-format
 msgid "Ant Tasks:"
 msgstr "Ant Tasks:"
 
 #. Tag: para
-#: toolset_guide.xml:43
+#: toolset_guide.xml:67
 #, no-c-format
 msgid ""
 "Please refer to the <emphasis>Hibernate Tools</emphasis> package and it's "
@@ -95,7 +95,7 @@
 "要得到更多信息,请查阅 <emphasis>Hibernate Tools</emphasis> 包及其文档。"
 
 #. Tag: para
-#: toolset_guide.xml:48
+#: toolset_guide.xml:72
 #, no-c-format
 msgid ""
 "However, the Hibernate main package comes bundled with an integrated tool "
@@ -107,13 +107,13 @@
 "literal>。"
 
 #. Tag: title
-#: toolset_guide.xml:55
+#: toolset_guide.xml:79
 #, no-c-format
 msgid "Automatic schema generation"
 msgstr "Schema自动生成(Automatic schema generation)"
 
 #. Tag: para
-#: toolset_guide.xml:57
+#: toolset_guide.xml:81
 #, no-c-format
 msgid ""
 "DDL may be generated from your mapping files by a Hibernate utility. The "
@@ -126,7 +126,7 @@
 "也会同时生成。"
 
 #. Tag: para
-#: toolset_guide.xml:64
+#: toolset_guide.xml:88
 #, no-c-format
 msgid ""
 "You <emphasis>must</emphasis> specify a SQL <literal>Dialect</literal> via "
@@ -138,19 +138,19 @@
 "应商高度相关的。"
 
 #. Tag: para
-#: toolset_guide.xml:70
+#: toolset_guide.xml:94
 #, no-c-format
 msgid "First, customize your mapping files to improve the generated schema."
 msgstr "首先,要定制你的映射文件,来改善生成的schema。"
 
 #. Tag: title
-#: toolset_guide.xml:75
+#: toolset_guide.xml:99
 #, no-c-format
 msgid "Customizing the schema"
 msgstr "对schema定制化(Customizing the schema)"
 
 #. Tag: para
-#: toolset_guide.xml:77
+#: toolset_guide.xml:101
 #, no-c-format
 msgid ""
 "Many Hibernate mapping elements define optional attributes named "
@@ -163,19 +163,19 @@
 "个属性设置字段的长度、精度、小数点位数。"
 
 #. 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
+#: toolset_guide.xml:111
 #, no-c-format
 msgid ""
 "Some tags also accept a <literal>not-null</literal> attribute (for "
@@ -188,14 +188,14 @@
 "<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\" "
@@ -203,7 +203,7 @@
 msgstr ""
 
 #. Tag: para
-#: toolset_guide.xml:97
+#: toolset_guide.xml:121
 #, no-c-format
 msgid ""
 "A <literal>unique-key</literal> attribute may be used to group columns in a "
@@ -218,7 +218,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="
@@ -227,7 +227,7 @@
 msgstr ""
 
 #. Tag: para
-#: toolset_guide.xml:107
+#: toolset_guide.xml:131
 #, no-c-format
 msgid ""
 "An <literal>index</literal> attribute specifies the name of an index that "
@@ -239,7 +239,7 @@
 "index。"
 
 #. Tag: programlisting
-#: toolset_guide.xml:113
+#: toolset_guide.xml:137
 #, no-c-format
 msgid ""
 "<![CDATA[<property name=\"lastName\" index=\"CustName\"/>\n"
@@ -247,7 +247,7 @@
 msgstr ""
 
 #. Tag: para
-#: toolset_guide.xml:115
+#: toolset_guide.xml:139
 #, no-c-format
 msgid ""
 "A <literal>foreign-key</literal> attribute may be used to override the name "
@@ -256,7 +256,7 @@
 "<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\"/"
@@ -264,7 +264,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> "
@@ -274,7 +274,7 @@
 "的类型时特别有用。"
 
 #. Tag: programlisting
-#: toolset_guide.xml:127
+#: toolset_guide.xml:151
 #, no-c-format
 msgid ""
 "<![CDATA[<property name=\"name\" type=\"my.customtypes.Name\"/>\n"
@@ -287,7 +287,7 @@
 msgstr ""
 
 #. Tag: para
-#: toolset_guide.xml:129
+#: toolset_guide.xml:153
 #, no-c-format
 msgid ""
 "The <literal>default</literal> attribute lets you specify a default value "
@@ -298,7 +298,7 @@
 "之前,你应该将同样的值赋于对应的属性)。"
 
 #. Tag: programlisting
-#: toolset_guide.xml:135
+#: toolset_guide.xml:159
 #, no-c-format
 msgid ""
 "<![CDATA[<property name=\"credits\" type=\"integer\" insert=\"false\">\n"
@@ -307,7 +307,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"
@@ -316,7 +316,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 "
@@ -326,7 +326,7 @@
 "映射。"
 
 #. Tag: programlisting
-#: toolset_guide.xml:144
+#: toolset_guide.xml:168
 #, no-c-format
 msgid ""
 "<![CDATA[<property name=\"balance\" type=\"float\">\n"
@@ -335,7 +335,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 "
@@ -343,7 +343,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"
@@ -352,7 +352,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"
@@ -362,151 +362,151 @@
 msgstr ""
 
 #. Tag: title
-#: toolset_guide.xml:156
+#: toolset_guide.xml:180
 #, no-c-format
 msgid "Summary"
 msgstr "Summary"
 
 #. Tag: entry
-#: toolset_guide.xml:163
+#: toolset_guide.xml:187
 #, no-c-format
 msgid "Attribute"
 msgstr "属性(Attribute)"
 
 #. Tag: entry
-#: toolset_guide.xml:164
+#: toolset_guide.xml:188
 #, no-c-format
 msgid "Values"
 msgstr "值(Values)"
 
 #. Tag: entry
-#: toolset_guide.xml:165
+#: toolset_guide.xml:189
 #, no-c-format
 msgid "Interpretation"
 msgstr "解释(Interpretation)"
 
 #. Tag: literal
-#: toolset_guide.xml:170
+#: toolset_guide.xml:194
 #, no-c-format
 msgid "length"
 msgstr "length"
 
 #. Tag: entry
-#: toolset_guide.xml:171 toolset_guide.xml:176 toolset_guide.xml:181
+#: toolset_guide.xml:195 toolset_guide.xml:200 toolset_guide.xml:205
 #, no-c-format
 msgid "number"
 msgstr "数字"
 
 #. Tag: entry
-#: toolset_guide.xml:172
+#: toolset_guide.xml:196
 #, no-c-format
 msgid "column length"
 msgstr "字段长度"
 
 #. Tag: literal
-#: toolset_guide.xml:175
+#: toolset_guide.xml:199
 #, no-c-format
 msgid "precision"
 msgstr "precision"
 
 #. Tag: entry
-#: toolset_guide.xml:177
+#: toolset_guide.xml:201
 #, no-c-format
 msgid "column decimal precision"
 msgstr "精度(decimal precision)"
 
 #. Tag: literal
-#: toolset_guide.xml:180
+#: toolset_guide.xml:204
 #, no-c-format
 msgid "scale"
 msgstr "scale"
 
 #. Tag: entry
-#: toolset_guide.xml:182
+#: toolset_guide.xml:206
 #, no-c-format
 msgid "column decimal scale"
 msgstr "小数点位数(decimal scale)"
 
 #. Tag: literal
-#: toolset_guide.xml:185
+#: toolset_guide.xml:209
 #, no-c-format
 msgid "not-null"
 msgstr "not-null"
 
 #. Tag: literal
-#: toolset_guide.xml:186 toolset_guide.xml:191
+#: toolset_guide.xml:210 toolset_guide.xml:215
 #, no-c-format
 msgid "true|false"
 msgstr "true|false"
 
 #. Tag: entry
-#: toolset_guide.xml:187
+#: toolset_guide.xml:211
 #, no-c-format
 msgid "specfies that the column should be non-nullable"
 msgstr "指明字段是否应该是非空的"
 
 #. Tag: literal
-#: toolset_guide.xml:190
+#: toolset_guide.xml:214
 #, no-c-format
 msgid "unique"
 msgstr "unique"
 
 #. Tag: entry
-#: toolset_guide.xml:192
+#: toolset_guide.xml:216
 #, no-c-format
 msgid "specifies that the column should have a unique constraint"
 msgstr "指明是否该字段具有惟一约束"
 
 #. Tag: literal
-#: toolset_guide.xml:195
+#: toolset_guide.xml:219
 #, no-c-format
 msgid "index"
 msgstr "index"
 
 #. Tag: literal
-#: toolset_guide.xml:196
+#: toolset_guide.xml:220
 #, no-c-format
 msgid "index_name"
 msgstr "index_name"
 
 #. Tag: entry
-#: toolset_guide.xml:197
+#: toolset_guide.xml:221
 #, no-c-format
 msgid "specifies the name of a (multi-column) index"
 msgstr "指明一个(多字段)的索引(index)的名字"
 
 #. Tag: literal
-#: toolset_guide.xml:200
+#: toolset_guide.xml:224
 #, no-c-format
 msgid "unique-key"
 msgstr "unique-key"
 
 #. Tag: literal
-#: toolset_guide.xml:201
+#: toolset_guide.xml:225
 #, no-c-format
 msgid "unique_key_name"
 msgstr "unique_key_name"
 
 #. Tag: entry
-#: toolset_guide.xml:202
+#: toolset_guide.xml:226
 #, no-c-format
 msgid "specifies the name of a multi-column unique constraint"
 msgstr "指明多字段惟一约束的名字(参见上面的说明)"
 
 #. Tag: literal
-#: toolset_guide.xml:205
+#: toolset_guide.xml:229
 #, no-c-format
 msgid "foreign-key"
 msgstr "foreign-key"
 
 #. Tag: literal
-#: toolset_guide.xml:206
+#: toolset_guide.xml:230
 #, no-c-format
 msgid "foreign_key_name"
 msgstr "foreign_key_name"
 
 #. Tag: entry
-#: toolset_guide.xml:207
+#: toolset_guide.xml:231
 #, fuzzy, no-c-format
 msgid ""
 "specifies the name of the foreign key constraint generated for an "
@@ -520,19 +520,19 @@
 "<placeholder-6/>时会被忽略。"
 
 #. Tag: literal
-#: toolset_guide.xml:217
+#: toolset_guide.xml:241
 #, no-c-format
 msgid "sql-type"
 msgstr "sql-type"
 
 #. Tag: literal
-#: toolset_guide.xml:218
+#: toolset_guide.xml:242
 #, no-c-format
 msgid "SQL column type"
 msgstr "SQL 字段类型"
 
 #. Tag: entry
-#: toolset_guide.xml:219
+#: toolset_guide.xml:243
 #, fuzzy, no-c-format
 msgid ""
 "overrides the default column type (attribute of <literal>&lt;column&gt;</"
@@ -540,13 +540,13 @@
 msgstr "覆盖默认的字段类型(只能用于<placeholder-1/>属性)"
 
 #. Tag: literal
-#: toolset_guide.xml:225
+#: toolset_guide.xml:249
 #, no-c-format
 msgid "default"
 msgstr "default"
 
 #. Tag: entry
-#: toolset_guide.xml:226 toolset_guide.xml:233
+#: toolset_guide.xml:250 toolset_guide.xml:257
 #, fuzzy, no-c-format
 msgid "SQL expression"
 msgstr ""
@@ -556,25 +556,25 @@
 "SQL 表达式"
 
 #. Tag: entry
-#: toolset_guide.xml:227
+#: toolset_guide.xml:251
 #, no-c-format
 msgid "specify a default value for the column"
 msgstr "为字段指定默认值"
 
 #. Tag: literal
-#: toolset_guide.xml:232
+#: toolset_guide.xml:256
 #, no-c-format
 msgid "check"
 msgstr "check"
 
 #. Tag: entry
-#: toolset_guide.xml:234
+#: toolset_guide.xml:258
 #, 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:266
 #, no-c-format
 msgid ""
 "The <literal>&lt;comment&gt;</literal> element allows you to specify "
@@ -583,7 +583,7 @@
 "<literal>&lt;comment&gt;</literal>元素可以让你在生成的schema中加入注释。"
 
 #. Tag: programlisting
-#: toolset_guide.xml:247
+#: toolset_guide.xml:271
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Customer\" table=\"CurCust\">\n"
@@ -593,7 +593,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: toolset_guide.xml:249
+#: toolset_guide.xml:273
 #, no-c-format
 msgid ""
 "<![CDATA[<property name=\"balance\">\n"
@@ -604,7 +604,7 @@
 msgstr ""
 
 #. Tag: para
-#: toolset_guide.xml:251
+#: toolset_guide.xml:275
 #, no-c-format
 msgid ""
 "This results in a <literal>comment on table</literal> or <literal>comment on "
@@ -614,13 +614,13 @@
 "<literal>comment on column</literal>语句(假若支持的话)。"
 
 #. Tag: title
-#: toolset_guide.xml:260
+#: toolset_guide.xml:284
 #, no-c-format
 msgid "Running the tool"
 msgstr "运行该工具"
 
 #. Tag: para
-#: toolset_guide.xml:262
+#: toolset_guide.xml:286
 #, no-c-format
 msgid ""
 "The <literal>SchemaExport</literal> tool writes a DDL script to standard out "
@@ -630,7 +630,7 @@
 "句。"
 
 #. Tag: para
-#: toolset_guide.xml:267
+#: toolset_guide.xml:291
 #, no-c-format
 msgid ""
 "<literal>java -cp </literal><emphasis>hibernate_classpaths</emphasis> "
@@ -639,20 +639,20 @@
 msgstr ""
 
 #. Tag: title
-#: toolset_guide.xml:273
+#: toolset_guide.xml:297
 #, 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:303 toolset_guide.xml:453 toolset_guide.xml:522
 #, 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:304 toolset_guide.xml:391 toolset_guide.xml:454
+#: toolset_guide.xml:523
 #, fuzzy, no-c-format
 msgid "Description"
 msgstr ""
@@ -666,97 +666,97 @@
 "描述"
 
 #. Tag: literal
-#: toolset_guide.xml:285 toolset_guide.xml:435
+#: toolset_guide.xml:309 toolset_guide.xml:459
 #, no-c-format
 msgid "--quiet"
 msgstr "--quiet"
 
 #. Tag: entry
-#: toolset_guide.xml:286 toolset_guide.xml:436
+#: toolset_guide.xml:310 toolset_guide.xml:460
 #, no-c-format
 msgid "don't output the script to stdout"
 msgstr "不要把脚本输出到stdout"
 
 #. Tag: literal
-#: toolset_guide.xml:289
+#: toolset_guide.xml:313
 #, no-c-format
 msgid "--drop"
 msgstr "--drop"
 
 #. Tag: entry
-#: toolset_guide.xml:290
+#: toolset_guide.xml:314
 #, no-c-format
 msgid "only drop the tables"
 msgstr "只进行drop tables的步骤"
 
 #. Tag: literal
-#: toolset_guide.xml:293
+#: toolset_guide.xml:317
 #, no-c-format
 msgid "--create"
 msgstr "--create"
 
 #. Tag: entry
-#: toolset_guide.xml:294
+#: toolset_guide.xml:318
 #, no-c-format
 msgid "only create the tables"
 msgstr "只创建表"
 
 #. Tag: literal
-#: toolset_guide.xml:297 toolset_guide.xml:439
+#: toolset_guide.xml:321 toolset_guide.xml:463
 #, no-c-format
 msgid "--text"
 msgstr "--text"
 
 #. Tag: entry
-#: toolset_guide.xml:298
+#: toolset_guide.xml:322
 #, no-c-format
 msgid "don't export to the database"
 msgstr "不执行在数据库中运行的步骤"
 
 #. Tag: literal
-#: toolset_guide.xml:301
+#: toolset_guide.xml:325
 #, no-c-format
 msgid "--output=my_schema.ddl"
 msgstr "--output=my_schema.ddl"
 
 #. Tag: entry
-#: toolset_guide.xml:302
+#: toolset_guide.xml:326
 #, 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:329 toolset_guide.xml:467 toolset_guide.xml:528
 #, 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:330 toolset_guide.xml:468 toolset_guide.xml:529
 #, 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:333 toolset_guide.xml:475 toolset_guide.xml:536
 #, no-c-format
 msgid "--config=hibernate.cfg.xml"
 msgstr "--config=hibernate.cfg.xml"
 
 #. Tag: entry
-#: toolset_guide.xml:310
+#: toolset_guide.xml:334
 #, 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:337 toolset_guide.xml:471 toolset_guide.xml:532
 #, 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:338 toolset_guide.xml:472 toolset_guide.xml:533
 #, fuzzy, no-c-format
 msgid "read database properties from a file"
 msgstr ""
@@ -768,37 +768,37 @@
 "从文件中读取数据库属性"
 
 #. Tag: literal
-#: toolset_guide.xml:317
+#: toolset_guide.xml:341
 #, no-c-format
 msgid "--format"
 msgstr "--format"
 
 #. Tag: entry
-#: toolset_guide.xml:318
+#: toolset_guide.xml:342
 #, no-c-format
 msgid "format the generated SQL nicely in the script"
 msgstr "把脚本中的SQL语句对齐和美化"
 
 #. Tag: literal
-#: toolset_guide.xml:321
+#: toolset_guide.xml:345
 #, no-c-format
 msgid "--delimiter=;"
 msgstr "--delimiter=;"
 
 #. Tag: entry
-#: toolset_guide.xml:322
+#: toolset_guide.xml:346
 #, no-c-format
 msgid "set an end of line delimiter for the script"
 msgstr "为脚本设置行结束符"
 
 #. Tag: para
-#: toolset_guide.xml:328
+#: toolset_guide.xml:352
 #, no-c-format
 msgid "You may even embed <literal>SchemaExport</literal> in your application:"
 msgstr "你甚至可以在你的应用程序中嵌入<literal>SchemaExport</literal>工具:"
 
 #. Tag: programlisting
-#: toolset_guide.xml:332
+#: toolset_guide.xml:356
 #, no-c-format
 msgid ""
 "<![CDATA[Configuration cfg = ....;\n"
@@ -806,19 +806,19 @@
 msgstr ""
 
 #. Tag: title
-#: toolset_guide.xml:337
+#: toolset_guide.xml:361
 #, no-c-format
 msgid "Properties"
 msgstr "属性(Properties)"
 
 #. Tag: para
-#: toolset_guide.xml:339
+#: toolset_guide.xml:363
 #, no-c-format
 msgid "Database properties may be specified"
 msgstr "可以通过如下方式指定数据库属性:"
 
 #. Tag: para
-#: toolset_guide.xml:345
+#: toolset_guide.xml:369
 #, no-c-format
 msgid ""
 "as system properties with <literal>-D</literal><emphasis>&lt;property&gt;</"
@@ -826,13 +826,13 @@
 msgstr "通过<literal>-D</literal><emphasis>&lt;property&gt;</emphasis>系统参数"
 
 #. Tag: para
-#: toolset_guide.xml:348
+#: toolset_guide.xml:372
 #, no-c-format
 msgid "in <literal>hibernate.properties</literal>"
 msgstr "在<literal>hibernate.properties</literal>文件中"
 
 #. Tag: para
-#: toolset_guide.xml:351
+#: toolset_guide.xml:375
 #, no-c-format
 msgid "in a named properties file with <literal>--properties</literal>"
 msgstr ""
@@ -840,98 +840,98 @@
 "指定"
 
 #. Tag: para
-#: toolset_guide.xml:355
+#: toolset_guide.xml:379
 #, no-c-format
 msgid "The needed properties are:"
 msgstr "所需的参数包括:"
 
 #. Tag: title
-#: toolset_guide.xml:360
+#: toolset_guide.xml:384
 #, no-c-format
 msgid "SchemaExport Connection Properties"
 msgstr "SchemaExport 连接属性"
 
 #. Tag: entry
-#: toolset_guide.xml:366
+#: toolset_guide.xml:390
 #, no-c-format
 msgid "Property Name"
 msgstr "属性名"
 
 #. Tag: literal
-#: toolset_guide.xml:372
+#: toolset_guide.xml:396
 #, no-c-format
 msgid "hibernate.connection.driver_class"
 msgstr "hibernate.connection.driver_class"
 
 #. Tag: entry
-#: toolset_guide.xml:373
+#: toolset_guide.xml:397
 #, no-c-format
 msgid "jdbc driver class"
 msgstr "jdbc driver class"
 
 #. Tag: literal
-#: toolset_guide.xml:376
+#: toolset_guide.xml:400
 #, no-c-format
 msgid "hibernate.connection.url"
 msgstr "hibernate.connection.url"
 
 #. Tag: entry
-#: toolset_guide.xml:377
+#: toolset_guide.xml:401
 #, no-c-format
 msgid "jdbc url"
 msgstr "jdbc url"
 
 #. Tag: literal
-#: toolset_guide.xml:380
+#: toolset_guide.xml:404
 #, no-c-format
 msgid "hibernate.connection.username"
 msgstr "hibernate.connection.username"
 
 #. Tag: entry
-#: toolset_guide.xml:381
+#: toolset_guide.xml:405
 #, no-c-format
 msgid "database user"
 msgstr "database user"
 
 #. Tag: literal
-#: toolset_guide.xml:384
+#: toolset_guide.xml:408
 #, no-c-format
 msgid "hibernate.connection.password"
 msgstr "hibernate.connection.password"
 
 #. Tag: entry
-#: toolset_guide.xml:385
+#: toolset_guide.xml:409
 #, no-c-format
 msgid "user password"
 msgstr "user password"
 
 #. Tag: literal
-#: toolset_guide.xml:388
+#: toolset_guide.xml:412
 #, no-c-format
 msgid "hibernate.dialect"
 msgstr "hibernate.dialect"
 
 #. Tag: entry
-#: toolset_guide.xml:389
+#: toolset_guide.xml:413
 #, no-c-format
 msgid "dialect"
 msgstr "方言(dialect)"
 
 #. Tag: title
-#: toolset_guide.xml:398
+#: toolset_guide.xml:422
 #, no-c-format
 msgid "Using Ant"
 msgstr "使用Ant(Using Ant)"
 
 #. Tag: para
-#: toolset_guide.xml:400
+#: toolset_guide.xml:424
 #, 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:404
+#: toolset_guide.xml:428
 #, no-c-format
 msgid ""
 "<![CDATA[<target name=\"schemaexport\">\n"
@@ -954,13 +954,13 @@
 msgstr ""
 
 #. Tag: title
-#: toolset_guide.xml:409
+#: toolset_guide.xml:433
 #, no-c-format
 msgid "Incremental schema updates"
 msgstr "对schema的增量更新(Incremental schema updates)"
 
 #. Tag: para
-#: toolset_guide.xml:411
+#: toolset_guide.xml:435
 #, no-c-format
 msgid ""
 "The <literal>SchemaUpdate</literal> tool will update an existing schema with "
@@ -973,7 +973,7 @@
 "有JDBC驱动都有效。"
 
 #. Tag: para
-#: toolset_guide.xml:417
+#: toolset_guide.xml:441
 #, no-c-format
 msgid ""
 "<literal>java -cp </literal><emphasis>hibernate_classpaths</emphasis> "
@@ -982,19 +982,19 @@
 msgstr ""
 
 #. Tag: title
-#: toolset_guide.xml:423
+#: toolset_guide.xml:447
 #, no-c-format
 msgid "<literal>SchemaUpdate</literal> Command Line Options"
 msgstr "<literal>SchemaUpdate</literal>命令行选项"
 
 #. Tag: entry
-#: toolset_guide.xml:440
+#: toolset_guide.xml:464
 #, no-c-format
 msgid "don't export the script to the database"
 msgstr "不把脚本输出到数据库"
 
 #. Tag: entry
-#: toolset_guide.xml:452 toolset_guide.xml:513
+#: toolset_guide.xml:476 toolset_guide.xml:537
 #, fuzzy, no-c-format
 msgid "specify a <literal>.cfg.xml</literal> file"
 msgstr ""
@@ -1004,13 +1004,13 @@
 "指定一个<placeholder-1/>文件"
 
 #. Tag: para
-#: toolset_guide.xml:458
+#: toolset_guide.xml:482
 #, no-c-format
 msgid "You may embed <literal>SchemaUpdate</literal> in your application:"
 msgstr "你可以在你的应用程序中嵌入<literal>SchemaUpdate</literal>工具:"
 
 #. Tag: programlisting
-#: toolset_guide.xml:462
+#: toolset_guide.xml:486
 #, no-c-format
 msgid ""
 "<![CDATA[Configuration cfg = ....;\n"
@@ -1018,19 +1018,19 @@
 msgstr ""
 
 #. Tag: title
-#: toolset_guide.xml:467
+#: toolset_guide.xml:491
 #, no-c-format
 msgid "Using Ant for incremental schema updates"
 msgstr "用Ant来增量更新schema(Using Ant for incremental schema updates)"
 
 #. Tag: para
-#: toolset_guide.xml:469
+#: toolset_guide.xml:493
 #, 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:497
 #, no-c-format
 msgid ""
 "<![CDATA[<target name=\"schemaupdate\">\n"
@@ -1049,13 +1049,13 @@
 msgstr ""
 
 #. Tag: title
-#: toolset_guide.xml:478
+#: toolset_guide.xml:502
 #, no-c-format
 msgid "Schema validation"
 msgstr "Schema 校验"
 
 #. Tag: para
-#: toolset_guide.xml:480
+#: toolset_guide.xml:504
 #, no-c-format
 msgid ""
 "The <literal>SchemaValidator</literal> tool will validate that the existing "
@@ -1069,7 +1069,7 @@
 "是对所有的JDBC驱动都适用。这一工具在测试的时候特别有用。"
 
 #. Tag: para
-#: toolset_guide.xml:486
+#: toolset_guide.xml:510
 #, no-c-format
 msgid ""
 "<literal>java -cp </literal><emphasis>hibernate_classpaths</emphasis> "
@@ -1078,19 +1078,19 @@
 msgstr ""
 
 #. Tag: title
-#: toolset_guide.xml:492
+#: toolset_guide.xml:516
 #, no-c-format
 msgid "<literal>SchemaValidator</literal> Command Line Options"
 msgstr "<literal>SchemaValidator</literal>命令行参数"
 
 #. Tag: para
-#: toolset_guide.xml:519
+#: toolset_guide.xml:543
 #, no-c-format
 msgid "You may embed <literal>SchemaValidator</literal> in your application:"
 msgstr "你可以在你的应用程序中嵌入<literal>SchemaValidator</literal>:"
 
 #. Tag: programlisting
-#: toolset_guide.xml:523
+#: toolset_guide.xml:547
 #, no-c-format
 msgid ""
 "<![CDATA[Configuration cfg = ....;\n"
@@ -1098,19 +1098,19 @@
 msgstr ""
 
 #. Tag: title
-#: toolset_guide.xml:528
+#: toolset_guide.xml:552
 #, no-c-format
 msgid "Using Ant for schema validation"
 msgstr "使用Ant进行schema校验"
 
 #. Tag: para
-#: toolset_guide.xml:530
+#: toolset_guide.xml:554
 #, 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:558
 #, no-c-format
 msgid ""
 "<![CDATA[<target name=\"schemavalidate\">\n"

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	2008-08-14 15:28:13 UTC (rev 15066)
+++ core/trunk/documentation/manual/src/main/docbook/zh-CN/content/transactions.po	2008-08-14 15:35:40 UTC (rev 15067)
@@ -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: 2008-08-14 15:28+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,13 +11,13 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
-#: transactions.xml:5
+#: transactions.xml:29
 #, no-c-format
 msgid "Transactions And Concurrency"
 msgstr "事务和并发"
 
 #. Tag: para
-#: transactions.xml:7
+#: transactions.xml:31
 #, no-c-format
 msgid ""
 "The most important point about Hibernate and concurrency control is that it "
@@ -31,7 +31,7 @@
 "使用 的数据库系统的事务隔离规范。"
 
 #. Tag: para
-#: transactions.xml:14
+#: transactions.xml:38
 #, no-c-format
 msgid ""
 "Hibernate does not lock objects in memory. Your application can expect the "
@@ -47,7 +47,7 @@
 "能,<literal>Session</literal>同时也是事务范围内的缓存(cache)。"
 
 #. Tag: para
-#: transactions.xml:22
+#: transactions.xml:46
 #, no-c-format
 msgid ""
 "In addition to versioning for automatic optimistic concurrency control, "
@@ -60,7 +60,7 @@
 "面会讨论乐观并发控制和这个API。"
 
 #. Tag: para
-#: transactions.xml:29
+#: transactions.xml:53
 #, no-c-format
 msgid ""
 "We start the discussion of concurrency control in Hibernate with the "
@@ -73,13 +73,13 @@
 "应用 程序的长事务。"
 
 #. Tag: title
-#: transactions.xml:36
+#: transactions.xml:60
 #, no-c-format
 msgid "Session and transaction scopes"
 msgstr "Session和事务范围(transaction scope)"
 
 #. Tag: para
-#: transactions.xml:38
+#: transactions.xml:62
 #, no-c-format
 msgid ""
 "A <literal>SessionFactory</literal> is an expensive-to-create, threadsafe "
@@ -92,7 +92,7 @@
 "<literal>Configuraion</literal>的实例来创建。"
 
 #. Tag: para
-#: transactions.xml:44
+#: transactions.xml:68
 #, no-c-format
 msgid ""
 "A <literal>Session</literal> is an inexpensive, non-threadsafe object that "
@@ -108,7 +108,7 @@
 "此假若不使用的时候它不消费任何资源。"
 
 #. Tag: para
-#: transactions.xml:52
+#: transactions.xml:76
 #, no-c-format
 msgid ""
 "To complete this picture you also have to think about database transactions. "
@@ -123,7 +123,7 @@
 "数据库事务开着,直到整个工作单元完成才关闭这个事务,这绝不是一个好的设计。"
 
 #. Tag: para
-#: transactions.xml:61
+#: transactions.xml:85
 #, no-c-format
 msgid ""
 "What is the scope of a unit of work? Can a single Hibernate "
@@ -138,13 +138,13 @@
 "<literal>Session</literal>?,你又如何划分数据库事务的边界呢?"
 
 #. Tag: title
-#: transactions.xml:69
+#: transactions.xml:93
 #, no-c-format
 msgid "Unit of work"
 msgstr "操作单元(Unit of work)"
 
 #. Tag: para
-#: transactions.xml:71
+#: transactions.xml:95
 #, no-c-format
 msgid ""
 "First, don't use the <emphasis>session-per-operation</emphasis> antipattern, "
@@ -173,12 +173,12 @@
 "为,因为很多小的事务比一个清晰定义的工作单元性能差。后者也更容易维护和扩展。"
 
 #. Tag: para
-#: transactions.xml:87
-#, no-c-format
+#: transactions.xml:111
+#, 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 "
@@ -197,13 +197,13 @@
 "这种模式对 于大多数应用程序来说是很棒的。"
 
 #. Tag: para
-#: transactions.xml:99
-#, no-c-format
+#: transactions.xml:123
+#, 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 "
+"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 "
@@ -222,7 +222,7 @@
 "移植性都有好处。"
 
 #. Tag: para
-#: transactions.xml:112
+#: transactions.xml:136
 #, no-c-format
 msgid ""
 "Your application code can access a \"current session\" to process the "
@@ -238,7 +238,7 @@
 "时,必须配置它,请参见<xref linkend=\"architecture-current-session\"/>。"
 
 #. Tag: para
-#: transactions.xml:120
+#: transactions.xml:144
 #, no-c-format
 msgid ""
 "Sometimes it is convenient to extend the scope of a <literal>Session</"
@@ -260,13 +260,13 @@
 "坛,你可以找到<emphasis>Open Session in View</emphasis>这一模式的提示和示例。"
 
 #. Tag: title
-#: transactions.xml:135
+#: transactions.xml:159
 #, no-c-format
 msgid "Long conversations"
 msgstr "长对话"
 
 #. Tag: para
-#: transactions.xml:137
+#: transactions.xml:161
 #, no-c-format
 msgid ""
 "The session-per-request pattern is not the only useful concept you can use "
@@ -281,7 +281,7 @@
 "面的例子:"
 
 #. Tag: para
-#: transactions.xml:147
+#: transactions.xml:171
 #, no-c-format
 msgid ""
 "The first screen of a dialog opens, the data seen by the user has been "
@@ -292,7 +292,7 @@
 "literal> 和数据 库事务载入(load)的。用户可以随意修改对话框中的数据对象。"
 
 #. Tag: para
-#: transactions.xml:154
+#: transactions.xml:178
 #, no-c-format
 msgid ""
 "The user clicks \"Save\" after 5 minutes and expects his modifications to be "
@@ -303,7 +303,7 @@
 "这个信息的人,不会出现 修改冲突。"
 
 #. Tag: para
-#: transactions.xml:162
+#: transactions.xml:186
 #, no-c-format
 msgid ""
 "We call this unit of work, from the point of view of the user, a long "
@@ -316,7 +316,7 @@
 "transaction)。 在你的应用程序中,可以有很多种方法来实现它。"
 
 #. Tag: para
-#: transactions.xml:168
+#: transactions.xml:192
 #, no-c-format
 msgid ""
 "A first naive implementation might keep the <literal>Session</literal> and "
@@ -331,11 +331,11 @@
 "的数目。"
 
 #. Tag: para
-#: transactions.xml:176
-#, no-c-format
+#: transactions.xml:200
+#, 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 "
+"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 "
@@ -351,12 +351,12 @@
 "Hibernate的下述特性的时候:"
 
 #. Tag: para
-#: transactions.xml:189
-#, no-c-format
+#: transactions.xml:213
+#, 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 "
+"concurrent modification occurred during user think time. Usually we only "
 "check at the end of the conversation."
 msgstr ""
 "<emphasis>自动版本化</emphasis> - Hibernate能够自动进行乐观并发控制 ,如果在"
@@ -364,7 +364,7 @@
 "时才检查。"
 
 #. Tag: para
-#: transactions.xml:197
+#: transactions.xml:221
 #, no-c-format
 msgid ""
 "<emphasis>Detached Objects</emphasis> - If you decide to use the already "
@@ -381,8 +381,8 @@
 "request-with-detached-objects</emphasis>。自动版本化被用来隔离并发修改。"
 
 #. Tag: para
-#: transactions.xml:207
-#, no-c-format
+#: transactions.xml:231
+#, fuzzy, no-c-format
 msgid ""
 "<emphasis>Extended (or Long) Session</emphasis> - The Hibernate "
 "<literal>Session</literal> may be disconnected from the underlying JDBC "
@@ -391,7 +391,7 @@
 "<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."
+"be flushed automatically, but explicitly."
 msgstr ""
 "<emphasis>Extended (or Long) Session</emphasis> - Hibernate 的"
 "<literal>Session</literal> 可以在数据库事务提交之后和底层的JDBC连接断开,当一"
@@ -401,7 +401,7 @@
 "literal>通常不允许自动flush,而是明确flush。"
 
 #. Tag: para
-#: transactions.xml:220
+#: transactions.xml:244
 #, no-c-format
 msgid ""
 "Both <emphasis>session-per-request-with-detached-objects</emphasis> and "
@@ -414,13 +414,13 @@
 "并发 控制那部分再进行讨论。"
 
 #. Tag: title
-#: transactions.xml:229
+#: transactions.xml:253
 #, no-c-format
 msgid "Considering object identity"
 msgstr "关注对象标识(Considering object identity)"
 
 #. Tag: para
-#: transactions.xml:231
+#: transactions.xml:255
 #, no-c-format
 msgid ""
 "An application may concurrently access the same persistent state in two "
@@ -433,31 +433,31 @@
 "两种不同的标识语义:"
 
 #. Tag: term
-#: transactions.xml:240
+#: transactions.xml:264
 #, no-c-format
 msgid "Database Identity"
 msgstr "数据库标识"
 
 #. Tag: literal
-#: transactions.xml:243
+#: transactions.xml:267
 #, no-c-format
 msgid "foo.getId().equals( bar.getId() )"
 msgstr "foo.getId().equals( bar.getId() )"
 
 #. Tag: term
-#: transactions.xml:248
+#: transactions.xml:272
 #, no-c-format
 msgid "JVM Identity"
 msgstr "JVM 标识"
 
 #. Tag: literal
-#: transactions.xml:251
+#: transactions.xml:275
 #, no-c-format
 msgid "foo==bar"
 msgstr "foo==bar"
 
 #. Tag: para
-#: transactions.xml:257
+#: transactions.xml:281
 #, fuzzy, no-c-format
 msgid ""
 "Then for objects attached to a <emphasis>particular</emphasis> "
@@ -477,7 +477,7 @@
 "候使用自动版本化和乐 观锁定方法来解决。"
 
 #. Tag: para
-#: transactions.xml:266
+#: transactions.xml:290
 #, no-c-format
 msgid ""
 "This approach leaves Hibernate and the database to worry about concurrency; "
@@ -495,7 +495,7 @@
 "的使用<literal>==</literal>进行对象比较。"
 
 #. Tag: para
-#: transactions.xml:275
+#: transactions.xml:299
 #, no-c-format
 msgid ""
 "However, an application that uses <literal>==</literal> outside of a "
@@ -534,13 +534,13 @@
 "Hibernate的问题,而仅仅是一个关于Java对象标识和判等行为如何实现的问题。"
 
 #. Tag: title
-#: transactions.xml:296
+#: transactions.xml:320
 #, no-c-format
 msgid "Common issues"
 msgstr "常见问题"
 
 #. Tag: para
-#: transactions.xml:298
+#: transactions.xml:322
 #, no-c-format
 msgid ""
 "Never use the anti-patterns <emphasis>session-per-user-session</emphasis> or "
@@ -555,7 +555,7 @@
 "解该模式的应用前提。"
 
 #. Tag: para
-#: transactions.xml:307
+#: transactions.xml:331
 #, no-c-format
 msgid ""
 "A <literal>Session</literal> is not thread-safe. Things which are supposed "
@@ -576,7 +576,7 @@
 "literal>。"
 
 #. Tag: para
-#: transactions.xml:318
+#: transactions.xml:342
 #, no-c-format
 msgid ""
 "An exception thrown by Hibernate means you have to rollback your database "
@@ -597,7 +597,7 @@
 "行。"
 
 #. Tag: para
-#: transactions.xml:330
+#: transactions.xml:354
 #, no-c-format
 msgid ""
 "The <literal>Session</literal> caches every object that is in persistent "
@@ -620,16 +620,16 @@
 "literal>打开也意味着出现脏数据的可能性很高。"
 
 #. Tag: title
-#: transactions.xml:348
+#: transactions.xml:372
 #, no-c-format
 msgid "Database transaction demarcation"
 msgstr "数据库事务声明"
 
 #. Tag: para
-#: transactions.xml:350
-#, no-c-format
+#: transactions.xml:374
+#, 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 "
@@ -645,7 +645,7 @@
 "独的数据库事务总是比很多琐碎的事务性能更好,即时对读数据而言也是一样。"
 
 #. Tag: para
-#: transactions.xml:360
+#: transactions.xml:384
 #, no-c-format
 msgid ""
 "A Hibernate application can run in non-managed (i.e. standalone, simple Web- "
@@ -667,13 +667,13 @@
 "<literal>Session</literal> 的同步也可以自动完成。"
 
 #. Tag: para
-#: transactions.xml:370
-#, no-c-format
+#: transactions.xml:394
+#, 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 "
+"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."
@@ -685,38 +685,38 @@
 "烈 推荐你使用,除非你用CMT session bean。"
 
 #. Tag: para
-#: transactions.xml:379
+#: transactions.xml:403
 #, no-c-format
 msgid ""
 "Usually, ending a <literal>Session</literal> involves four distinct phases:"
 msgstr "通常情况下,结束 <literal>Session</literal> 包含了四个不同的阶段:"
 
 #. Tag: para
-#: transactions.xml:385
+#: transactions.xml:409
 #, no-c-format
 msgid "flush the session"
 msgstr "同步session(flush,刷出到磁盘)"
 
 #. Tag: para
-#: transactions.xml:390
+#: transactions.xml:414
 #, no-c-format
 msgid "commit the transaction"
 msgstr "提交事务"
 
 #. Tag: para
-#: transactions.xml:395
+#: transactions.xml:419
 #, no-c-format
 msgid "close the session"
 msgstr "关闭session"
 
 #. Tag: para
-#: transactions.xml:400
+#: transactions.xml:424
 #, no-c-format
 msgid "handle exceptions"
 msgstr "处理异常"
 
 #. Tag: para
-#: transactions.xml:406
+#: transactions.xml:430
 #, no-c-format
 msgid ""
 "Flushing the session has been discussed earlier, we'll now have a closer "
@@ -727,13 +727,13 @@
 "环境下的事务声明和异常处理。"
 
 #. Tag: title
-#: transactions.xml:413
+#: transactions.xml:437
 #, no-c-format
 msgid "Non-managed environment"
 msgstr "非托管环境"
 
 #. Tag: para
-#: transactions.xml:415
+#: transactions.xml:439
 #, no-c-format
 msgid ""
 "If a Hibernate persistence layer runs in a non-managed environment, database "
@@ -745,7 +745,7 @@
 "非DataSource)连接池机制 来处理。session/transaction处理方式如下所示:"
 
 #. Tag: programlisting
-#: transactions.xml:422
+#: transactions.xml:446
 #, no-c-format
 msgid ""
 "<![CDATA[// Non-managed environment idiom\n"
@@ -769,16 +769,16 @@
 msgstr ""
 
 #. Tag: para
-#: transactions.xml:424
+#: transactions.xml:448
 #, 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 <xref linkend=\"objectstate-flushing"
-"\"/>FlushMode 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."
+"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."
 msgstr ""
 "你不需要显式<literal>flush()</literal><literal>Session</literal> - 对"
 "<literal>commit()</literal>的调用会自动触发session的同步(取决于session的"
@@ -788,7 +788,7 @@
 "下都可以运行。"
 
 #. Tag: para
-#: transactions.xml:433
+#: transactions.xml:457
 #, no-c-format
 msgid ""
 "A much more flexible solution is Hibernate's built-in \"current session\" "
@@ -797,7 +797,7 @@
 "更加灵活的方案是Hibernate内置的\"current session\"上下文管理,前文已经讲过:"
 
 #. Tag: programlisting
-#: transactions.xml:438
+#: transactions.xml:462
 #, no-c-format
 msgid ""
 "<![CDATA[// Non-managed environment idiom with getCurrentSession()\n"
@@ -816,7 +816,7 @@
 msgstr ""
 
 #. Tag: para
-#: transactions.xml:440
+#: transactions.xml:464
 #, no-c-format
 msgid ""
 "You will very likely never see these code snippets in a regular application; "
@@ -836,7 +836,7 @@
 "处理将在本章稍后进行讨论。"
 
 #. Tag: para
-#: transactions.xml:450
+#: transactions.xml:474
 #, no-c-format
 msgid ""
 "Note that you should select <literal>org.hibernate.transaction."
@@ -850,13 +850,13 @@
 "\"thread\"</literal>"
 
 #. Tag: title
-#: transactions.xml:459
+#: transactions.xml:483
 #, no-c-format
 msgid "Using JTA"
 msgstr "使用JTA"
 
 #. Tag: para
-#: transactions.xml:461
+#: transactions.xml:485
 #, no-c-format
 msgid ""
 "If your persistence layer runs in an application server (e.g. behind EJB "
@@ -870,7 +870,7 @@
 "独立的JTA实现,使用它而不使用EJB。Hibernate提供了两种策略进行JTA集成。"
 
 #. Tag: para
-#: transactions.xml:468
+#: transactions.xml:492
 #, no-c-format
 msgid ""
 "If you use bean-managed transactions (BMT) Hibernate will tell the "
@@ -883,7 +883,7 @@
 "环境下是一样的。"
 
 #. Tag: programlisting
-#: transactions.xml:474
+#: transactions.xml:498
 #, no-c-format
 msgid ""
 "<![CDATA[// BMT idiom\n"
@@ -907,7 +907,7 @@
 msgstr ""
 
 #. Tag: para
-#: transactions.xml:476
+#: transactions.xml:500
 #, no-c-format
 msgid ""
 "If you want to use a transaction-bound <literal>Session</literal>, that is, "
@@ -920,7 +920,7 @@
 "JTA <literal>UserTransaction</literal>API。"
 
 #. Tag: programlisting
-#: transactions.xml:482
+#: transactions.xml:506
 #, no-c-format
 msgid ""
 "<![CDATA[// BMT idiom with getCurrentSession()\n"
@@ -943,17 +943,17 @@
 msgstr ""
 
 #. Tag: para
-#: transactions.xml:484
-#, no-c-format
+#: transactions.xml:508
+#, fuzzy, no-c-format
 msgid ""
 "With CMT, transaction demarcation is done in session bean deployment "
-"descriptors, not programatically, hence, the code is reduced to:"
+"descriptors, not programmatically, hence, the code is reduced to:"
 msgstr ""
 "在CMT方式下,事务声明是在session bean的部署描述符中,而不需要编程。 因此,代"
 "码被简化为:"
 
 #. Tag: programlisting
-#: transactions.xml:489
+#: transactions.xml:513
 #, no-c-format
 msgid ""
 "<![CDATA[// CMT idiom\n"
@@ -965,7 +965,7 @@
 msgstr ""
 
 #. Tag: para
-#: transactions.xml:491
+#: transactions.xml:515
 #, no-c-format
 msgid ""
 "In a CMT/EJB even rollback happens automatically, since an unhandled "
@@ -981,8 +981,8 @@
 "literal> API ,你自动得到了绑定到事务的“当前”Session。 </emphasis>"
 
 #. Tag: para
-#: transactions.xml:499
-#, no-c-format
+#: transactions.xml:523
+#, fuzzy, no-c-format
 msgid ""
 "Note that you should choose <literal>org.hibernate.transaction."
 "JTATransactionFactory</literal> if you use JTA directly (BMT), and "
@@ -991,7 +991,7 @@
 "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>."
+"compatibility), or set to <literal>\"jta\"</literal>."
 msgstr ""
 "注意,当你配置Hibernate的transaction factory的时候,在直接使用JTA的时候"
 "(BMT),你应该选择<literal>org.hibernate.transaction.JTATransactionFactory</"
@@ -1002,8 +1002,8 @@
 "<literal>\"jta\"</literal>。"
 
 #. Tag: para
-#: transactions.xml:508
-#, no-c-format
+#: transactions.xml:532
+#, 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</"
@@ -1013,7 +1013,7 @@
 "<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 "
+"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.)"
@@ -1030,13 +1030,13 @@
 "literal>。)"
 
 #. Tag: title
-#: transactions.xml:524
+#: transactions.xml:548
 #, no-c-format
 msgid "Exception handling"
 msgstr "异常处理"
 
 #. Tag: para
-#: transactions.xml:526
+#: transactions.xml:550
 #, no-c-format
 msgid ""
 "If the <literal>Session</literal> throws an exception (including any "
@@ -1056,7 +1056,7 @@
 "</literal>方法,以关闭掉 <literal>Session</literal>。"
 
 #. Tag: para
-#: transactions.xml:537
+#: transactions.xml:561
 #, no-c-format
 msgid ""
 "The <literal>HibernateException</literal>, which wraps most of the errors "
@@ -1080,12 +1080,12 @@
 "处理。"
 
 #. Tag: para
-#: transactions.xml:549
-#, no-c-format
+#: transactions.xml:573
+#, 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 "
@@ -1111,7 +1111,7 @@
 "<literal>JDBCException</literal>子类型是:"
 
 #. Tag: para
-#: transactions.xml:565
+#: transactions.xml:589
 #, no-c-format
 msgid ""
 "<literal>JDBCConnectionException</literal> - indicates an error with the "
@@ -1120,7 +1120,7 @@
 "<literal>JDBCConnectionException</literal> - 指明底层的JDBC通讯出现错误"
 
 #. Tag: para
-#: transactions.xml:571
+#: transactions.xml:595
 #, no-c-format
 msgid ""
 "<literal>SQLGrammarException</literal> - indicates a grammar or syntax "
@@ -1129,7 +1129,7 @@
 "<literal>SQLGrammarException</literal> - 指明发送的SQL语句的语法或者格式错误"
 
 #. Tag: para
-#: transactions.xml:577
+#: transactions.xml:601
 #, no-c-format
 msgid ""
 "<literal>ConstraintViolationException</literal> - indicates some form of "
@@ -1138,7 +1138,7 @@
 "<literal>ConstraintViolationException</literal> - 指明某种类型的约束违例错误"
 
 #. Tag: para
-#: transactions.xml:583
+#: transactions.xml:607
 #, no-c-format
 msgid ""
 "<literal>LockAcquisitionException</literal> - indicates an error acquiring a "
@@ -1148,7 +1148,7 @@
 "需的锁级别时出现的错误。"
 
 #. Tag: para
-#: transactions.xml:589
+#: transactions.xml:613
 #, no-c-format
 msgid ""
 "<literal>GenericJDBCException</literal> - a generic exception which did not "
@@ -1156,14 +1156,14 @@
 msgstr "<literal>GenericJDBCException</literal> - 不属于任何其他种类的原生异常"
 
 #. Tag: title
-#: transactions.xml:599
+#: transactions.xml:623
 #, no-c-format
 msgid "Transaction timeout"
 msgstr "事务超时"
 
 #. Tag: para
-#: transactions.xml:601
-#, no-c-format
+#: transactions.xml:625
+#, 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. "
@@ -1173,7 +1173,7 @@
 "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 "
+"transaction timeout to JTA. This functionality is abstracted by the "
 "Hibernate <literal>Transaction</literal> object."
 msgstr ""
 "EJB这样的托管环境有一项极为重要的特性,而它从未在非托管环境中提供过,那就是事"
@@ -1184,7 +1184,7 @@
 "Hibernate <literal>Transaction</literal>对象进行抽象。"
 
 #. Tag: programlisting
-#: transactions.xml:614
+#: transactions.xml:638
 #, no-c-format
 msgid ""
 "<![CDATA[\n"
@@ -1209,7 +1209,7 @@
 msgstr ""
 
 #. Tag: para
-#: transactions.xml:616
+#: transactions.xml:640
 #, no-c-format
 msgid ""
 "Note that <literal>setTimeout()</literal> may not be called in a CMT bean, "
@@ -1219,13 +1219,13 @@
 "是被声明式定义的。"
 
 #. Tag: title
-#: transactions.xml:626
+#: transactions.xml:650
 #, no-c-format
 msgid "Optimistic concurrency control"
 msgstr "乐观并发控制(Optimistic concurrency control)"
 
 #. Tag: para
-#: transactions.xml:628
+#: transactions.xml:652
 #, no-c-format
 msgid ""
 "The only approach that is consistent with high concurrency and high "
@@ -1244,13 +1244,13 @@
 "单个数据库事务范围内,版本检查也提供了防止更新丢失的好处。"
 
 #. Tag: title
-#: transactions.xml:639
+#: transactions.xml:663
 #, no-c-format
 msgid "Application version checking"
 msgstr "应用程序级别的版本检查(Application version checking)"
 
 #. Tag: para
-#: transactions.xml:641
+#: transactions.xml:665
 #, no-c-format
 msgid ""
 "In an implementation without much help from Hibernate, each interaction with "
@@ -1267,7 +1267,7 @@
 "离,从数据访问的角度来说是最低效的。这种使用方式和 entity EJB最相似。"
 
 #. Tag: programlisting
-#: transactions.xml:650
+#: transactions.xml:674
 #, no-c-format
 msgid ""
 "<![CDATA[// foo is an instance loaded by a previous Session\n"
@@ -1285,7 +1285,7 @@
 msgstr ""
 
 #. Tag: para
-#: transactions.xml:652
+#: transactions.xml:676
 #, no-c-format
 msgid ""
 "The <literal>version</literal> property is mapped using <literal>&lt;"
@@ -1296,7 +1296,7 @@
 "射,如果对象 是脏数据,在同步的时候,Hibernate会自动增加版本号。"
 
 #. Tag: para
-#: transactions.xml:658
+#: transactions.xml:682
 #, no-c-format
 msgid ""
 "Of course, if you are operating in a low-data-concurrency environment and "
@@ -1313,12 +1313,12 @@
 "丢失掉却没 有出错信息,或者需要合并更改冲突的情况。"
 
 #. Tag: para
-#: transactions.xml:667
-#, no-c-format
+#: transactions.xml:691
+#, 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. "
+"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,13 +1329,13 @@
 "检查。"
 
 #. Tag: title
-#: transactions.xml:678
+#: transactions.xml:702
 #, no-c-format
 msgid "Extended session and automatic versioning"
 msgstr "扩展周期的session和自动版本化"
 
 #. Tag: para
-#: transactions.xml:680
+#: transactions.xml:704
 #, no-c-format
 msgid ""
 "A single <literal>Session</literal> instance and its persistent instances "
@@ -1353,7 +1353,7 @@
 "数据情况下重新进行业务对话的机会)。"
 
 #. Tag: para
-#: transactions.xml:689
+#: transactions.xml:713
 #, no-c-format
 msgid ""
 "The <literal>Session</literal> is disconnected from any underlying JDBC "
@@ -1367,7 +1367,7 @@
 "实例 的重新关联,在每个数据库事务中,应用程序也不需要载入读取对象实例。"
 
 #. Tag: programlisting
-#: transactions.xml:697
+#: transactions.xml:721
 #, no-c-format
 msgid ""
 "<![CDATA[// foo is an instance loaded earlier by the old session\n"
@@ -1382,7 +1382,7 @@
 msgstr ""
 
 #. Tag: para
-#: transactions.xml:698
+#: transactions.xml:722
 #, no-c-format
 msgid ""
 "The <literal>foo</literal> object still knows which <literal>Session</"
@@ -1414,7 +1414,7 @@
 "literal>这个session。"
 
 #. Tag: para
-#: transactions.xml:713
+#: transactions.xml:737
 #, no-c-format
 msgid ""
 "This pattern is problematic if the <literal>Session</literal> is too big to "
@@ -1432,7 +1432,7 @@
 "<literal>Session</literal>用于单个对话,因为它很快就会出现脏数据。"
 
 #. Tag: para
-#: transactions.xml:723
+#: transactions.xml:747
 #, no-c-format
 msgid ""
 "(Note that earlier Hibernate versions required explicit disconnection and "
@@ -1444,7 +1444,7 @@
 "效果。)"
 
 #. Tag: para
-#: transactions.xml:729
+#: transactions.xml:753
 #, no-c-format
 msgid ""
 "Also note that you should keep the disconnected <literal>Session</literal> "
@@ -1459,7 +1459,7 @@
 "的层),保存在<literal>HttpSession</literal>中。"
 
 #. Tag: para
-#: transactions.xml:737
+#: transactions.xml:761
 #, no-c-format
 msgid ""
 "The extended session pattern, or <emphasis>session-per-conversation</"
@@ -1474,13 +1474,13 @@
 "Hibernate Wiki以获得示例。"
 
 #. Tag: title
-#: transactions.xml:747
+#: transactions.xml:771
 #, no-c-format
 msgid "Detached objects and automatic versioning"
 msgstr "脱管对象(deatched object)和自动版本化"
 
 #. Tag: para
-#: transactions.xml:749
+#: transactions.xml:773
 #, no-c-format
 msgid ""
 "Each interaction with the persistent store occurs in a new <literal>Session</"
@@ -1499,7 +1499,7 @@
 "该对象实例。"
 
 #. Tag: programlisting
-#: transactions.xml:757
+#: transactions.xml:781
 #, no-c-format
 msgid ""
 "<![CDATA[// foo is an instance loaded by a previous Session\n"
@@ -1513,17 +1513,17 @@
 msgstr ""
 
 #. Tag: para
-#: transactions.xml:759
-#, no-c-format
+#: transactions.xml:783
+#, 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 ""
 "Hibernate会再一次在同步的时候检查对象实例的版本,如果发生更新冲突,就抛出异"
 "常。"
 
 #. Tag: para
-#: transactions.xml:764
+#: transactions.xml:788
 #, no-c-format
 msgid ""
 "You may also call <literal>lock()</literal> instead of <literal>update()</"
@@ -1536,13 +1536,13 @@
 "<literal>update()</literal>操作。"
 
 #. Tag: title
-#: transactions.xml:773
+#: transactions.xml:797
 #, no-c-format
 msgid "Customizing automatic versioning"
 msgstr "定制自动版本化行为"
 
 #. Tag: para
-#: transactions.xml:775
+#: transactions.xml:799
 #, no-c-format
 msgid ""
 "You may disable Hibernate's automatic version increment for particular "
@@ -1555,8 +1555,8 @@
 "的话,如果该属性 脏数据,Hibernate将不再增加版本号。"
 
 #. Tag: para
-#: transactions.xml:782
-#, no-c-format
+#: transactions.xml:806
+#, 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 "
@@ -1564,7 +1564,7 @@
 "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 "
+"<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."
@@ -1579,7 +1579,7 @@
 "request-with-detached-objects模式。"
 
 #. Tag: para
-#: transactions.xml:793
+#: transactions.xml:817
 #, no-c-format
 msgid ""
 "Sometimes concurrent modification can be permitted as long as the changes "
@@ -1592,15 +1592,15 @@
 "literal>,Hibernate在同步的时候将只比较有脏 数据的字段。"
 
 #. Tag: para
-#: transactions.xml:799
-#, no-c-format
+#: transactions.xml:823
+#, fuzzy, 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 uneccessary updates. This is usually not a problem, "
+"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\"</"
@@ -1620,17 +1620,17 @@
 "对象的确是被修改过。"
 
 #. Tag: title
-#: transactions.xml:817
+#: transactions.xml:841
 #, no-c-format
 msgid "Pessimistic Locking"
 msgstr "悲观锁定(Pessimistic Locking)"
 
 #. Tag: para
-#: transactions.xml:819
-#, no-c-format
+#: transactions.xml:843
+#, 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'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."
@@ -1640,7 +1640,7 @@
 "个排它的悲观锁定, 或者在一个新的事务启动的时候,重新进行锁定。"
 
 #. Tag: para
-#: transactions.xml:826
+#: transactions.xml:850
 #, no-c-format
 msgid ""
 "Hibernate will always use the locking mechanism of the database, never lock "
@@ -1648,7 +1648,7 @@
 msgstr "Hibernate总是使用数据库的锁定机制,从不在内存中锁定对象!"
 
 #. Tag: para
-#: transactions.xml:831
+#: transactions.xml:855
 #, no-c-format
 msgid ""
 "The <literal>LockMode</literal> class defines the different lock levels that "
@@ -1658,7 +1658,7 @@
 "可以通过以下的机制来设置:"
 
 #. Tag: para
-#: transactions.xml:838
+#: transactions.xml:862
 #, no-c-format
 msgid ""
 "<literal>LockMode.WRITE</literal> is acquired automatically when Hibernate "
@@ -1668,7 +1668,7 @@
 "WRITE</literal>。"
 
 #. Tag: para
-#: transactions.xml:844
+#: transactions.xml:868
 #, no-c-format
 msgid ""
 "<literal>LockMode.UPGRADE</literal> may be acquired upon explicit user "
@@ -1679,7 +1679,7 @@
 "发送SQL的时候,锁定级别设置为<literal>LockMode.UPGRADE</literal>"
 
 #. Tag: para
-#: transactions.xml:850
+#: transactions.xml:874
 #, no-c-format
 msgid ""
 "<literal>LockMode.UPGRADE_NOWAIT</literal> may be acquired upon explicit "
@@ -1690,7 +1690,7 @@
 "literal> 的时候,锁定级别设置<literal>LockMode.UPGRADE_NOWAIT</literal>"
 
 #. Tag: para
-#: transactions.xml:856
+#: transactions.xml:880
 #, no-c-format
 msgid ""
 "<literal>LockMode.READ</literal> is acquired automatically when Hibernate "
@@ -1702,7 +1702,7 @@
 "进行设置。"
 
 #. Tag: para
-#: transactions.xml:863
+#: transactions.xml:887
 #, no-c-format
 msgid ""
 "<literal>LockMode.NONE</literal> represents the absence of a lock. All "
@@ -1716,14 +1716,14 @@
 "<literal>update()</literal> 或者<literal>saveOrUpdate()</literal>脱离该模式。"
 
 #. Tag: para
-#: transactions.xml:872
+#: transactions.xml:896
 #, no-c-format
 msgid ""
 "The \"explicit user request\" is expressed in one of the following ways:"
 msgstr "\"显式的用户指定\"可以通过以下几种方式之一来表示:"
 
 #. Tag: para
-#: transactions.xml:878
+#: transactions.xml:902
 #, no-c-format
 msgid ""
 "A call to <literal>Session.load()</literal>, specifying a <literal>LockMode</"
@@ -1733,19 +1733,19 @@
 "literal>。"
 
 #. Tag: para
-#: transactions.xml:883
+#: transactions.xml:907
 #, no-c-format
 msgid "A call to <literal>Session.lock()</literal>."
 msgstr "调用<literal>Session.lock()</literal>。"
 
 #. Tag: para
-#: transactions.xml:888
+#: transactions.xml:912
 #, no-c-format
 msgid "A call to <literal>Query.setLockMode()</literal>."
 msgstr "调用<literal>Query.setLockMode()</literal>。"
 
 #. Tag: para
-#: transactions.xml:894
+#: transactions.xml:918
 #, no-c-format
 msgid ""
 "If <literal>Session.load()</literal> is called with <literal>UPGRADE</"
@@ -1764,7 +1764,7 @@
 "literal> 方法。"
 
 #. Tag: para
-#: transactions.xml:903
+#: transactions.xml:927
 #, no-c-format
 msgid ""
 "<literal>Session.lock()</literal> performs a version number check if the "
@@ -1780,7 +1780,7 @@
 "句。)"
 
 #. Tag: para
-#: transactions.xml:910
+#: transactions.xml:934
 #, no-c-format
 msgid ""
 "If the database does not support the requested lock mode, Hibernate will use "
@@ -1791,13 +1791,13 @@
 "异常)。 这一点可以确保应用程序的可移植性。"
 
 #. Tag: title
-#: transactions.xml:919
+#: transactions.xml:943
 #, no-c-format
 msgid "Connection Release Modes"
 msgstr "连接释放模式(Connection Release Modes)"
 
 #. Tag: para
-#: transactions.xml:921
+#: transactions.xml:945
 #, no-c-format
 msgid ""
 "The legacy (2.x) behavior of Hibernate in regards to JDBC connection "
@@ -1819,11 +1819,11 @@
 "literal>的不同枚举值来使用不用的释放模式:"
 
 #. Tag: para
-#: transactions.xml:935
-#, no-c-format
+#: transactions.xml:959
+#, 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 "
+"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."
 msgstr ""
@@ -1831,7 +1831,7 @@
 "在第一次需要进行JDBC操作的时候获取连接,然后持有它,直到session关闭。"
 
 #. Tag: para
-#: transactions.xml:942
+#: transactions.xml:966
 #, no-c-format
 msgid ""
 "<literal>AFTER_TRANSACTION</literal> - says to release connections after a "
@@ -1841,7 +1841,7 @@
 "literal>结束后释放连接。"
 
 #. Tag: para
-#: transactions.xml:948
+#: transactions.xml:972
 #, no-c-format
 msgid ""
 "<literal>AFTER_STATEMENT</literal> (also referred to as aggressive release) "
@@ -1856,7 +1856,7 @@
 "种情形就是使用<literal>org.hibernate.ScrollableResults</literal>。"
 
 #. Tag: para
-#: transactions.xml:958
+#: transactions.xml:982
 #, no-c-format
 msgid ""
 "The configuration parameter <literal>hibernate.connection.release_mode</"
@@ -1866,7 +1866,7 @@
 "种释放模式。可能的值有:"
 
 #. Tag: para
-#: transactions.xml:965
+#: transactions.xml:989
 #, no-c-format
 msgid ""
 "<literal>auto</literal> (the default) - this choice delegates to the release "
@@ -1885,7 +1885,7 @@
 "或者给用户代码带来误导。"
 
 #. Tag: para
-#: transactions.xml:975
+#: transactions.xml:999
 #, no-c-format
 msgid ""
 "<literal>on_close</literal> - says to use ConnectionReleaseMode.ON_CLOSE. "
@@ -1896,7 +1896,7 @@
 "为了向下兼容的,但是已经完全不被鼓励使用了。"
 
 #. Tag: para
-#: transactions.xml:981
+#: transactions.xml:1005
 #, no-c-format
 msgid ""
 "<literal>after_transaction</literal> - says to use ConnectionReleaseMode."
@@ -1911,7 +1911,7 @@
 "态,连接会像AFTER_STATEMENT那样被释放。"
 
 #. Tag: para
-#: transactions.xml:989
+#: transactions.xml:1013
 #, no-c-format
 msgid ""
 "<literal>after_statement</literal> - says to use ConnectionReleaseMode."

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	2008-08-14 15:28:13 UTC (rev 15066)
+++ core/trunk/documentation/manual/src/main/docbook/zh-CN/content/xml.po	2008-08-14 15:35:40 UTC (rev 15067)
@@ -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: 2008-08-14 15:28+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,13 +11,13 @@
 "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
+#: xml.xml:31
 #, no-c-format
 msgid ""
 "Note that this is an experimental feature in Hibernate 3.0 and is under "
@@ -25,13 +25,13 @@
 msgstr "注意这是Hibernate 3.0的一个实验性的特性。这一特性仍在积极开发中。"
 
 #. Tag: title
-#: xml.xml:13
+#: xml.xml:37
 #, no-c-format
 msgid "Working with XML data"
 msgstr "用XML数据进行工作"
 
 #. Tag: para
-#: xml.xml:15
+#: xml.xml:39
 #, no-c-format
 msgid ""
 "Hibernate lets you work with persistent XML data in much the same way you "
@@ -43,7 +43,7 @@
 "析过的XML树 可以被认为是代替POJO的另外一种在对象层面上表示关系型数据的途径."
 
 #. Tag: para
-#: xml.xml:22
+#: xml.xml:46
 #, no-c-format
 msgid ""
 "Hibernate supports dom4j as API for manipulating XML trees. You can write "
@@ -61,7 +61,7 @@
 "(合并操作merge()目前还不支持)。"
 
 #. Tag: para
-#: xml.xml:32
+#: xml.xml:56
 #, no-c-format
 msgid ""
 "This feature has many applications including data import/export, "
@@ -71,7 +71,7 @@
 "及 基于XSLT的报表。"
 
 #. Tag: para
-#: xml.xml:37
+#: xml.xml:61
 #, no-c-format
 msgid ""
 "A single mapping may be used to simultaneously map properties of a class and "
@@ -82,19 +82,19 @@
 "类, 它也可以用来只映射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"
@@ -120,19 +120,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"
@@ -161,7 +161,7 @@
 msgstr ""
 
 #. Tag: para
-#: xml.xml:62
+#: xml.xml:86
 #, no-c-format
 msgid ""
 "This mapping allows you to access the data as a dom4j tree, or as a graph of "
@@ -173,13 +173,13 @@
 "你可以在HQL查询中引用它。"
 
 #. Tag: title
-#: xml.xml:73
+#: xml.xml:97
 #, no-c-format
 msgid "XML mapping metadata"
 msgstr "XML映射元数据"
 
 #. Tag: para
-#: xml.xml:75
+#: xml.xml:99
 #, no-c-format
 msgid ""
 "Many Hibernate mapping elements accept the <literal>node</literal> "
@@ -192,25 +192,25 @@
 "一:"
 
 #. Tag: para
-#: xml.xml:84
+#: xml.xml:108
 #, 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
+#: xml.xml:111
 #, 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
+#: xml.xml:114
 #, no-c-format
 msgid "<literal>\".\"</literal> - map to the parent element"
 msgstr "<literal>\".\"</literal> - 映射为父元素"
 
 #. Tag: para
-#: xml.xml:93
+#: xml.xml:117
 #, no-c-format
 msgid ""
 "<literal>\"element-name/@attribute-name\"</literal> - map to the named "
@@ -220,7 +220,7 @@
 "性"
 
 #. Tag: para
-#: xml.xml:100
+#: xml.xml:124
 #, no-c-format
 msgid ""
 "For collections and single valued associations, there is an additional "
@@ -239,7 +239,7 @@
 "本身不出现),而集合则根本不出现。"
 
 #. Tag: para
-#: xml.xml:110
+#: xml.xml:134
 #, no-c-format
 msgid ""
 "You should be careful not to leave <literal>embed-xml=\"true\"</literal> for "
@@ -249,7 +249,7 @@
 "literal>),因为XML不能很好地处理 循环引用!"
 
 #. Tag: programlisting
-#: xml.xml:115
+#: xml.xml:139
 #, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Customer\" \n"
@@ -289,7 +289,7 @@
 msgstr ""
 
 #. Tag: para
-#: xml.xml:117
+#: xml.xml:141
 #, no-c-format
 msgid ""
 "in this case, we have decided to embed the collection of account ids, but "
@@ -299,7 +299,7 @@
 "据。下面的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 :"
@@ -307,13 +307,13 @@
 msgstr ""
 
 #. Tag: para
-#: xml.xml:124
+#: xml.xml:148
 #, 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"
@@ -329,7 +329,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-"
@@ -339,7 +339,7 @@
 "(<literal>embed-xml=\"true\"</literal>), 则数据看上去就像这样:"
 
 #. Tag: programlisting
-#: xml.xml:135
+#: xml.xml:159
 #, no-c-format
 msgid ""
 "<![CDATA[<customer id=\"123456789\">\n"
@@ -361,13 +361,13 @@
 msgstr ""
 
 #. Tag: title
-#: xml.xml:141
+#: xml.xml:165
 #, no-c-format
 msgid "Manipulating XML data"
 msgstr "操作XML数据"
 
 #. Tag: para
-#: xml.xml:143
+#: xml.xml:167
 #, no-c-format
 msgid ""
 "Let's rearead and update XML documents in the application. We do this by "
@@ -376,7 +376,7 @@
 "让我们来读入和更新应用程序中的XML文档。通过获取一个dom4j会话可以做到这一点:"
 
 #. Tag: programlisting
-#: xml.xml:148
+#: xml.xml:172
 #, no-c-format
 msgid ""
 "<![CDATA[Document doc = ....;\n"
@@ -400,7 +400,7 @@
 msgstr ""
 
 #. Tag: programlisting
-#: xml.xml:150
+#: xml.xml:174
 #, no-c-format
 msgid ""
 "<![CDATA[Session session = factory.openSession();\n"
@@ -422,7 +422,7 @@
 msgstr ""
 
 #. Tag: para
-#: xml.xml:152
+#: xml.xml:176
 #, no-c-format
 msgid ""
 "It is extremely useful to combine this feature with Hibernate's "




More information about the hibernate-commits mailing list