[hibernate-commits] Hibernate SVN: r19988 - in core/trunk/documentation/manual/src/main/docbook: en-US/content and 6 other directories.

hibernate-commits at lists.jboss.org hibernate-commits at lists.jboss.org
Wed Jul 21 01:39:40 EDT 2010


Author: steve.ebersole at jboss.com
Date: 2010-07-21 01:39:40 -0400 (Wed, 21 Jul 2010)
New Revision: 19988

Modified:
   core/trunk/documentation/manual/src/main/docbook/de-DE/content/architecture.po
   core/trunk/documentation/manual/src/main/docbook/en-US/content/architecture.xml
   core/trunk/documentation/manual/src/main/docbook/es-ES/content/architecture.po
   core/trunk/documentation/manual/src/main/docbook/fr-FR/content/architecture.po
   core/trunk/documentation/manual/src/main/docbook/ja-JP/content/architecture.po
   core/trunk/documentation/manual/src/main/docbook/pot/content/architecture.pot
   core/trunk/documentation/manual/src/main/docbook/pt-BR/content/architecture.po
   core/trunk/documentation/manual/src/main/docbook/zh-CN/content/architecture.po
Log:
HHH-5397 - Odds and ends from documentation merge : architecture.xml - removed duplicated discussion of object states


Modified: core/trunk/documentation/manual/src/main/docbook/de-DE/content/architecture.po
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/de-DE/content/architecture.po	2010-07-21 05:38:09 UTC (rev 19987)
+++ core/trunk/documentation/manual/src/main/docbook/de-DE/content/architecture.po	2010-07-21 05:39:40 UTC (rev 19988)
@@ -275,7 +275,7 @@
 msgstr ""
 "Project-Id-Version: Collection_Mapping\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-07-21 05:26+0000\n"
+"POT-Creation-Date: 2010-07-21 05:38+0000\n"
 "PO-Revision-Date: 2007-02-26 10:27+1000\n"
 "Last-Translator: \n"
 "Language-Team:  <de at li.org>\n"
@@ -430,7 +430,8 @@
 "interfacename>. Once the <interfacename>org.hibernate.Session</"
 "interfacename> is closed, they will be detached and free to use in any "
 "application layer (for example, directly as data transfer objects to and "
-"from presentation). See"
+"from presentation). <xref linkend=\"objectstate\"/> discusses transient, "
+"persistent and detached object states."
 msgstr ""
 "Kurzlebige, aus einem Thread bestehende Objekte, die persistenten Status und "
 "Unternehmensfunktionen beinhalten. Dabei kann es sich um gewöhnliche "
@@ -441,20 +442,21 @@
 "Datentransferobjekte einer Präsentation) verwendet werden."
 
 #. Tag: term
-#: architecture.xml:139
+#: architecture.xml:140
 #, no-c-format
 msgid "Transient and detached objects and collections"
 msgstr "Temporäre und abgesetzte Objekte und Collections"
 
 #. Tag: para
-#: architecture.xml:141
+#: architecture.xml:142
 #, fuzzy, no-c-format
 msgid ""
 "Instances of persistent classes that are not currently associated with a "
 "<interfacename>org.hibernate.Session</interfacename>. They may have been "
 "instantiated by the application and not yet persisted, or they may have been "
 "instantiated by a closed <interfacename>org.hibernate.Session</"
-"interfacename>. See"
+"interfacename>. <xref linkend=\"objectstate\"/> discusses transient, "
+"persistent and detached object states."
 msgstr ""
 "Instanzen persistenter Klassen, die zum aktuellen Zeitpunkt mit keiner "
 "<literal>Session</literal> verbunden sind. Sie können von der Anwendung "
@@ -462,13 +464,13 @@
 "geschlossenen <literal>Session</literal> instanziiert worden sein."
 
 #. Tag: term
-#: architecture.xml:151
+#: architecture.xml:152
 #, fuzzy, no-c-format
 msgid "Transaction (<interfacename>org.hibernate.Transaction</interfacename>)"
 msgstr "Transaktion (<literal>org.hibernate.Transaction</literal>)"
 
 #. Tag: para
-#: architecture.xml:153
+#: architecture.xml:154
 #, fuzzy, no-c-format
 msgid ""
 "(Optional) A single-threaded, short-lived object used by the application to "
@@ -488,7 +490,7 @@
 "ist jedoch nie optional!"
 
 #. Tag: term
-#: architecture.xml:164
+#: architecture.xml:165
 #, fuzzy, no-c-format
 msgid ""
 "ConnectionProvider (<interfacename>org.hibernate.connection."
@@ -498,7 +500,7 @@
 "literal>)"
 
 #. Tag: para
-#: architecture.xml:166
+#: architecture.xml:167
 #, fuzzy, no-c-format
 msgid ""
 "(Optional) A factory for, and pool of, JDBC connections. It abstracts the "
@@ -513,7 +515,7 @@
 "ausgesetzt, kann jedoch vom Entwickler erweitert/implementiert werden."
 
 #. Tag: term
-#: architecture.xml:175
+#: architecture.xml:176
 #, fuzzy, no-c-format
 msgid ""
 "TransactionFactory (<interfacename>org.hibernate.TransactionFactory</"
@@ -522,7 +524,7 @@
 "TransactionFactory (<literal>org.hibernate.TransactionFactory</literal>)"
 
 #. Tag: para
-#: architecture.xml:177
+#: architecture.xml:178
 #, fuzzy, no-c-format
 msgid ""
 "(Optional) A factory for <interfacename>org.hibernate.Transaction</"
@@ -534,13 +536,13 @@
 "implementiert werden."
 
 #. Tag: emphasis
-#: architecture.xml:185
+#: architecture.xml:186
 #, fuzzy, no-c-format
 msgid "Extension Interfaces"
 msgstr "Erweiterungsschnittstellen"
 
 #. Tag: para
-#: architecture.xml:187
+#: architecture.xml:188
 #, fuzzy, no-c-format
 msgid ""
 "Hibernate offers a range of optional extension interfaces you can implement "
@@ -553,96 +555,13 @@
 "der API-Dokumentation."
 
 #. Tag: title
-#: architecture.xml:199
-#, no-c-format
-msgid "Instance states"
-msgstr "Instanzstatus"
-
-#. Tag: para
 #: architecture.xml:200
-#, fuzzy, no-c-format
-msgid ""
-"An instance of a persistent class can be in one of three different states. "
-"These states are defined in relation to a <emphasis>persistence context</"
-"emphasis>. The Hibernate <literal>Session</literal> object is the "
-"persistence context. The three different states are as follows:"
-msgstr ""
-"Der Status der Instanz einer persistenten Klasse kann drei Formen haben, die "
-"unter Berücksichtigung eines <emphasis>Persistenzkontexts</emphasis> (sog. "
-"\"Persistence Context\") definiert sind. Das Hibernate <literal>Session</"
-"literal>-Objekt ist der Persistenzkontext:"
-
-#. Tag: term
-#: architecture.xml:208
 #, no-c-format
-msgid "transient"
-msgstr "transient"
-
-#. Tag: para
-#: architecture.xml:210
-#, fuzzy, no-c-format
-msgid ""
-"The instance is not associated with any persistence context. It has no "
-"persistent identity or primary key value."
-msgstr ""
-"Die Instanz ist nicht (und war auch nie) mit einem Persistenzkontext "
-"assoziiert. Sie besitzt keine persistente Identität (Wert des primären "
-"Kernbegriffs)."
-
-#. Tag: term
-#: architecture.xml:218
-#, no-c-format
-msgid "persistent"
-msgstr "persistent"
-
-#. Tag: para
-#: architecture.xml:220
-#, fuzzy, no-c-format
-msgid ""
-"The instance is currently associated with a persistence context. It has a "
-"persistent identity (primary key value) and can have a corresponding row in "
-"the database. For a particular persistence context, Hibernate "
-"<emphasis>guarantees</emphasis> that persistent identity is equivalent to "
-"Java identity in relation to the in-memory location of the object."
-msgstr ""
-"Die Instanz wird zum aktuellen Zeitpunkt mit einem Persistenzkontext "
-"assoziiert. Sie besitzt eine persistente Identität (Wert des primären "
-"Kernbegriffs) und möglicherweise eine korrespondierende Reihe in der "
-"Datenbank. Für einen bestimmten Persistenzkontext <emphasis>garantiert</"
-"emphasis> Hibernate, dass die persistente Identität äquivalent zur Java "
-"Identität (Speicherstelle des Objekts) ist."
-
-#. Tag: term
-#: architecture.xml:232
-#, no-c-format
-msgid "detached"
-msgstr "detached (\"abgesetzt\")"
-
-#. Tag: para
-#: architecture.xml:234
-#, 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 can have a corresponding row in the database. "
-"For detached instances, Hibernate does not guarantee the relationship "
-"between persistent identity and Java identity."
-msgstr ""
-"Die Instanz war vormals mit einem Persistenzkontext assoziiert, aber der "
-"Kontext wurde geschlossen oder die Instanz in einem anderen Vorgang "
-"serialisiert. Sie besitzt eine persistente Identität und möglicherweise eine "
-"korrespondierende Reihe in der Datenbank. Für Instanzen im abgesetzten "
-"Status (\"detached\") garantiert Hibernate keine Verbindung zwischen "
-"persistenter Identität und Java-Identität."
-
-#. Tag: title
-#: architecture.xml:249
-#, no-c-format
 msgid "JMX Integration"
 msgstr "JMX-Integration"
 
 #. Tag: para
-#: architecture.xml:251
+#: architecture.xml:202
 #, fuzzy, no-c-format
 msgid ""
 "JMX is the J2EE standard for the management of Java components. Hibernate "
@@ -656,7 +575,7 @@
 "bereitgestellt."
 
 #. Tag: para
-#: architecture.xml:257
+#: architecture.xml:208
 #, fuzzy, no-c-format
 msgid ""
 "Another feature available as a JMX service is runtime Hibernate statistics. "
@@ -667,13 +586,13 @@
 "Statistiken, siehe <xref linkend=\"configuration-optional-statistics\"/>."
 
 #. Tag: title
-#: architecture.xml:264
+#: architecture.xml:215
 #, fuzzy, no-c-format
 msgid "Contextual sessions"
 msgstr "Kontextbezogene Sessions"
 
 #. Tag: para
-#: architecture.xml:265
+#: architecture.xml:216
 #, fuzzy, no-c-format
 msgid ""
 "Most applications using Hibernate need some form of \"contextual\" session, "
@@ -699,7 +618,7 @@
 "basierte kontextbezogene Sessions bereitstellen."
 
 #. Tag: para
-#: architecture.xml:274
+#: architecture.xml:225
 #, fuzzy, no-c-format
 msgid ""
 "Starting with version 3.0.1, Hibernate added the <literal>SessionFactory."
@@ -726,7 +645,7 @@
 "benötigen dürften."
 
 #. Tag: para
-#: architecture.xml:284
+#: architecture.xml:235
 #, fuzzy, no-c-format
 msgid ""
 "However, as of version 3.1, the processing behind <literal>SessionFactory."
@@ -745,7 +664,7 @@
 "Gültigkeitsbereich und Kontext zu ermöglichen."
 
 #. Tag: para
-#: architecture.xml:291
+#: architecture.xml:242
 #, fuzzy, no-c-format
 msgid ""
 "See the Javadocs for the <literal>org.hibernate.context."
@@ -763,7 +682,7 @@
 "Implementierungen dieses Interface geliefert."
 
 #. Tag: para
-#: architecture.xml:301
+#: architecture.xml:252
 #, fuzzy, no-c-format
 msgid ""
 "<literal>org.hibernate.context.JTASessionContext</literal>: current sessions "
@@ -778,7 +697,7 @@
 "finden Sie in Javadocs."
 
 #. Tag: para
-#: architecture.xml:309
+#: architecture.xml:260
 #, fuzzy, no-c-format
 msgid ""
 "<literal>org.hibernate.context.ThreadLocalSessionContext</literal>:current "
@@ -789,7 +708,7 @@
 "finden Sie weitere Informationen in Javadocs."
 
 #. Tag: para
-#: architecture.xml:315
+#: architecture.xml:266
 #, fuzzy, no-c-format
 msgid ""
 "<literal>org.hibernate.context.ManagedSessionContext</literal>: current "
@@ -804,7 +723,7 @@
 "geräumt oder geschlossen."
 
 #. Tag: para
-#: architecture.xml:324
+#: architecture.xml:275
 #, fuzzy, no-c-format
 msgid ""
 "The first two implementations provide a \"one session - one database "
@@ -835,7 +754,7 @@
 "Code-Beispiele finden Sie unter <xref linkend=\"transactions\"/>."
 
 #. Tag: para
-#: architecture.xml:336
+#: architecture.xml:287
 #, fuzzy, no-c-format
 msgid ""
 "The <literal>hibernate.current_session_context_class</literal> configuration "
@@ -861,8 +780,71 @@
 "Implementierungen, jedoch existieren drei entsprechende Kurznamen \"jta\", "
 "\"thread\" sowie \"managed\"."
 
+#~ msgid "Instance states"
+#~ msgstr "Instanzstatus"
+
 #, fuzzy
 #~ msgid ""
+#~ "An instance of a persistent class can be in one of three different "
+#~ "states. These states are defined in relation to a <emphasis>persistence "
+#~ "context</emphasis>. The Hibernate <literal>Session</literal> object is "
+#~ "the persistence context. The three different states are as follows:"
+#~ msgstr ""
+#~ "Der Status der Instanz einer persistenten Klasse kann drei Formen haben, "
+#~ "die unter Berücksichtigung eines <emphasis>Persistenzkontexts</emphasis> "
+#~ "(sog. \"Persistence Context\") definiert sind. Das Hibernate "
+#~ "<literal>Session</literal>-Objekt ist der Persistenzkontext:"
+
+#~ msgid "transient"
+#~ msgstr "transient"
+
+#, fuzzy
+#~ msgid ""
+#~ "The instance is not associated with any persistence context. It has no "
+#~ "persistent identity or primary key value."
+#~ msgstr ""
+#~ "Die Instanz ist nicht (und war auch nie) mit einem Persistenzkontext "
+#~ "assoziiert. Sie besitzt keine persistente Identität (Wert des primären "
+#~ "Kernbegriffs)."
+
+#~ msgid "persistent"
+#~ msgstr "persistent"
+
+#, fuzzy
+#~ msgid ""
+#~ "The instance is currently associated with a persistence context. It has a "
+#~ "persistent identity (primary key value) and can have a corresponding row "
+#~ "in the database. For a particular persistence context, Hibernate "
+#~ "<emphasis>guarantees</emphasis> that persistent identity is equivalent to "
+#~ "Java identity in relation to the in-memory location of the object."
+#~ msgstr ""
+#~ "Die Instanz wird zum aktuellen Zeitpunkt mit einem Persistenzkontext "
+#~ "assoziiert. Sie besitzt eine persistente Identität (Wert des primären "
+#~ "Kernbegriffs) und möglicherweise eine korrespondierende Reihe in der "
+#~ "Datenbank. Für einen bestimmten Persistenzkontext <emphasis>garantiert</"
+#~ "emphasis> Hibernate, dass die persistente Identität äquivalent zur Java "
+#~ "Identität (Speicherstelle des Objekts) ist."
+
+#~ msgid "detached"
+#~ msgstr "detached (\"abgesetzt\")"
+
+#, fuzzy
+#~ msgid ""
+#~ "The instance was once associated with a persistence context, but that "
+#~ "context was closed, or the instance was serialized to another process. It "
+#~ "has a persistent identity and can have a corresponding row in the "
+#~ "database. For detached instances, Hibernate does not guarantee the "
+#~ "relationship between persistent identity and Java identity."
+#~ msgstr ""
+#~ "Die Instanz war vormals mit einem Persistenzkontext assoziiert, aber der "
+#~ "Kontext wurde geschlossen oder die Instanz in einem anderen Vorgang "
+#~ "serialisiert. Sie besitzt eine persistente Identität und möglicherweise "
+#~ "eine korrespondierende Reihe in der Datenbank. Für Instanzen im "
+#~ "abgesetzten Status (\"detached\") garantiert Hibernate keine Verbindung "
+#~ "zwischen persistenter Identität und Java-Identität."
+
+#, fuzzy
+#~ msgid ""
 #~ "We do not have the scope in this document to provide a more detailed view "
 #~ "of all the runtime architectures available; Hibernate is flexible and "
 #~ "supports several different approaches. We will, however, show the two "

Modified: core/trunk/documentation/manual/src/main/docbook/en-US/content/architecture.xml
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/en-US/content/architecture.xml	2010-07-21 05:38:09 UTC (rev 19987)
+++ core/trunk/documentation/manual/src/main/docbook/en-US/content/architecture.xml	2010-07-21 05:39:40 UTC (rev 19988)
@@ -131,7 +131,8 @@
                                 <interfacename>org.hibernate.Session</interfacename>. Once the
                                 <interfacename>org.hibernate.Session</interfacename> is closed, they will be detached
                                 and free to use in any application layer (for example, directly as data transfer objects
-                                to and from presentation).  See <xref linkend="architecture-states"/>
+                                to and from presentation).  <xref linkend="objectstate"/> discusses transient,
+                                persistent and detached object states.
                             </para>
                         </listitem>
                     </varlistentry>
@@ -143,7 +144,7 @@
                                 <interfacename>org.hibernate.Session</interfacename>. They may have been instantiated by
                                 the application and not yet persisted, or they may have been instantiated by a
                                 closed <interfacename>org.hibernate.Session</interfacename>.
-                                See <xref linkend="architecture-states"/>
+                                <xref linkend="objectstate"/> discusses transient, persistent and detached object states.
                             </para>
                         </listitem>
                     </varlistentry>
@@ -195,56 +196,6 @@
         </section>
     </section>
 
-    <section id="architecture-states">
-        <title>Instance states</title>
-        <para>
-            An instance of a persistent class can be in one of three different states. These states are
-            defined in relation to a <emphasis>persistence context</emphasis>.
-            The Hibernate <literal>Session</literal> object is the persistence context. The three different states are as follows:
-        </para>
-        
-       <variablelist spacing="compact">
-            <varlistentry>
-                <term>transient</term>
-                <listitem>
-                    <para>
-                        The instance is not associated with
-                        any persistence context. It has no persistent identity or
-                        primary key value.
-                    </para>
-                </listitem>
-            </varlistentry>
-            <varlistentry>
-                <term>persistent</term>
-                <listitem>
-                    <para>
-                        The instance is currently associated with a persistence 
-                        context. It has a persistent identity (primary key value)
-                        and can have a corresponding row in the database. For a
-                        particular persistence context, Hibernate 
-                        <emphasis>guarantees</emphasis> that persistent identity
-                        is equivalent to Java identity in relation to the in-memory location of the
-                        object.
-                    </para>
-                </listitem>
-            </varlistentry>
-            <varlistentry>
-                <term>detached</term>
-                <listitem>
-                    <para>
-                        The instance was once associated with a persistence
-                        context, but that context was closed, or the instance
-                        was serialized to another process. It has a persistent 
-                        identity and can have a corresponding row in the database.
-                        For detached instances, Hibernate does not guarantee 
-                        the relationship between persistent identity and
-                        Java identity.
-                    </para>
-                </listitem>
-            </varlistentry>
-        </variablelist>
-    </section>    
-
     <section id="architecture-jmx" revision="1">
         <title>JMX Integration</title>
 

Modified: core/trunk/documentation/manual/src/main/docbook/es-ES/content/architecture.po
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/es-ES/content/architecture.po	2010-07-21 05:38:09 UTC (rev 19987)
+++ core/trunk/documentation/manual/src/main/docbook/es-ES/content/architecture.po	2010-07-21 05:39:40 UTC (rev 19988)
@@ -14,7 +14,7 @@
 msgstr ""
 "Project-Id-Version: architecture\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-07-21 05:26+0000\n"
+"POT-Creation-Date: 2010-07-21 05:38+0000\n"
 "PO-Revision-Date: 2010-03-15 10:16+1000\n"
 "Last-Translator: Angela Garcia <agarcia at redhat.com>\n"
 "Language-Team:  <en at li.org>\n"
@@ -168,7 +168,8 @@
 "interfacename>. Once the <interfacename>org.hibernate.Session</"
 "interfacename> is closed, they will be detached and free to use in any "
 "application layer (for example, directly as data transfer objects to and "
-"from presentation). See"
+"from presentation). <xref linkend=\"objectstate\"/> discusses transient, "
+"persistent and detached object states."
 msgstr ""
 "Objetos de corta vida, mono-hebra contienen un estado persistente así como "
 "una funcionalidad empresarial. Estos pueden ser JavaBeans/POJOs normales. "
@@ -179,20 +180,21 @@
 "desde la presentación)."
 
 #. Tag: term
-#: architecture.xml:139
+#: architecture.xml:140
 #, no-c-format
 msgid "Transient and detached objects and collections"
 msgstr "Objetos y colecciones transitorios y separados"
 
 #. Tag: para
-#: architecture.xml:141
+#: architecture.xml:142
 #, fuzzy, no-c-format
 msgid ""
 "Instances of persistent classes that are not currently associated with a "
 "<interfacename>org.hibernate.Session</interfacename>. They may have been "
 "instantiated by the application and not yet persisted, or they may have been "
 "instantiated by a closed <interfacename>org.hibernate.Session</"
-"interfacename>. See"
+"interfacename>. <xref linkend=\"objectstate\"/> discusses transient, "
+"persistent and detached object states."
 msgstr ""
 "Instancias de clases persistentes que no se encuentran actualmente asociadas "
 "con una <literal>Session</literal>. Pueden haber sido instanciadas por la "
@@ -200,13 +202,13 @@
 "por una <literal>Session</literal> cerrada."
 
 #. Tag: term
-#: architecture.xml:151
+#: architecture.xml:152
 #, fuzzy, no-c-format
 msgid "Transaction (<interfacename>org.hibernate.Transaction</interfacename>)"
 msgstr "Transaction (<literal>org.hibernate.Transaction</literal>)"
 
 #. Tag: para
-#: architecture.xml:153
+#: architecture.xml:154
 #, fuzzy, no-c-format
 msgid ""
 "(Optional) A single-threaded, short-lived object used by the application to "
@@ -226,7 +228,7 @@
 "literal>, nunca es opcional."
 
 #. Tag: term
-#: architecture.xml:164
+#: architecture.xml:165
 #, fuzzy, no-c-format
 msgid ""
 "ConnectionProvider (<interfacename>org.hibernate.connection."
@@ -236,7 +238,7 @@
 "literal>)"
 
 #. Tag: para
-#: architecture.xml:166
+#: architecture.xml:167
 #, fuzzy, no-c-format
 msgid ""
 "(Optional) A factory for, and pool of, JDBC connections. It abstracts the "
@@ -251,7 +253,7 @@
 "implementado por el desarrollador."
 
 #. Tag: term
-#: architecture.xml:175
+#: architecture.xml:176
 #, fuzzy, no-c-format
 msgid ""
 "TransactionFactory (<interfacename>org.hibernate.TransactionFactory</"
@@ -260,7 +262,7 @@
 "TransactionFactory (<literal>org.hibernate.TransactionFactory</literal>)"
 
 #. Tag: para
-#: architecture.xml:177
+#: architecture.xml:178
 #, fuzzy, no-c-format
 msgid ""
 "(Optional) A factory for <interfacename>org.hibernate.Transaction</"
@@ -272,13 +274,13 @@
 "desarrollador. "
 
 #. Tag: emphasis
-#: architecture.xml:185
+#: architecture.xml:186
 #, fuzzy, no-c-format
 msgid "Extension Interfaces"
 msgstr "<emphasis>Interfaces de extensión</emphasis> "
 
 #. Tag: para
-#: architecture.xml:187
+#: architecture.xml:188
 #, no-c-format
 msgid ""
 "Hibernate offers a range of optional extension interfaces you can implement "
@@ -290,95 +292,13 @@
 "Para obtener más detalles, vea la documentación de la API."
 
 #. Tag: title
-#: architecture.xml:199
-#, no-c-format
-msgid "Instance states"
-msgstr "Estados de instancia"
-
-#. Tag: para
 #: architecture.xml:200
 #, no-c-format
-msgid ""
-"An instance of a persistent class can be in one of three different states. "
-"These states are defined in relation to a <emphasis>persistence context</"
-"emphasis>. The Hibernate <literal>Session</literal> object is the "
-"persistence context. The three different states are as follows:"
-msgstr ""
-"Una instancia de una clase persistente puede estar en uno de tres estados "
-"diferentes. Estos estados se definen con respecto a su <emphasis>contexto de "
-"persistencia</emphasis>. El objeto <literal>Session</literal> de Hibernate "
-"es el contexto de persistencia. Los tres estados diferentes son los "
-"siguientes:"
-
-#. Tag: term
-#: architecture.xml:208
-#, no-c-format
-msgid "transient"
-msgstr "transitorio"
-
-#. Tag: para
-#: architecture.xml:210
-#, no-c-format
-msgid ""
-"The instance is not associated with any persistence context. It has no "
-"persistent identity or primary key value."
-msgstr ""
-"La instancia no está asociada con un contexto de persistencia. No tiene "
-"identidad persistente o valor de clave principal."
-
-#. Tag: term
-#: architecture.xml:218
-#, no-c-format
-msgid "persistent"
-msgstr "persistente"
-
-#. Tag: para
-#: architecture.xml:220
-#, no-c-format
-msgid ""
-"The instance is currently associated with a persistence context. It has a "
-"persistent identity (primary key value) and can have a corresponding row in "
-"the database. For a particular persistence context, Hibernate "
-"<emphasis>guarantees</emphasis> that persistent identity is equivalent to "
-"Java identity in relation to the in-memory location of the object."
-msgstr ""
-"La instancia se encuentra actualmente asociada con un contexto de "
-"persistencia. Tiene una identidad persistente (valor de clave principal) y "
-"puede tener una fila correspondiente en la base de datos. Para un contexto "
-"de persistencia en particular, Hibernate <emphasis>garantiza</emphasis> que "
-"la identidad persistente es equivalente a la identidad Java en relación con "
-"la ubicación del objeto."
-
-#. Tag: term
-#: architecture.xml:232
-#, no-c-format
-msgid "detached"
-msgstr "separado"
-
-#. Tag: para
-#: architecture.xml:234
-#, 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 can have a corresponding row in the database. "
-"For detached instances, Hibernate does not guarantee the relationship "
-"between persistent identity and Java identity."
-msgstr ""
-"La instancia estuvo alguna vez asociada con un contexto de persistencia, "
-"pero ese contexto se cerró, o la instancia fue serializada a otro proceso. "
-"Tiene una identidad persistente y puede tener una fila correspondiente en la "
-"base de datos. Para las instancias separadas, Hibernate no establece ninguna "
-"garantía sobre la relación entre identidad persistente e identidad Java."
-
-#. Tag: title
-#: architecture.xml:249
-#, no-c-format
 msgid "JMX Integration"
 msgstr "Integración JMX"
 
 #. Tag: para
-#: architecture.xml:251
+#: architecture.xml:202
 #, no-c-format
 msgid ""
 "JMX is the J2EE standard for the management of Java components. Hibernate "
@@ -392,7 +312,7 @@
 "HibernateService</literal>."
 
 #. Tag: para
-#: architecture.xml:257
+#: architecture.xml:208
 #, fuzzy, no-c-format
 msgid ""
 "Another feature available as a JMX service is runtime Hibernate statistics. "
@@ -404,13 +324,13 @@
 "optional-statistics\" /> para obtener mayor información."
 
 #. Tag: title
-#: architecture.xml:264
+#: architecture.xml:215
 #, no-c-format
 msgid "Contextual sessions"
 msgstr "Sesiones contextuales"
 
 #. Tag: para
-#: architecture.xml:265
+#: architecture.xml:216
 #, no-c-format
 msgid ""
 "Most applications using Hibernate need some form of \"contextual\" session, "
@@ -436,7 +356,7 @@
 "contextuales con base proxy/intercepción."
 
 #. Tag: para
-#: architecture.xml:274
+#: architecture.xml:225
 #, no-c-format
 msgid ""
 "Starting with version 3.0.1, Hibernate added the <literal>SessionFactory."
@@ -462,7 +382,7 @@
 "todo lo que usted necesita utilizar."
 
 #. Tag: para
-#: architecture.xml:284
+#: architecture.xml:235
 #, no-c-format
 msgid ""
 "However, as of version 3.1, the processing behind <literal>SessionFactory."
@@ -481,7 +401,7 @@
 "las sesiones actuales."
 
 #. Tag: para
-#: architecture.xml:291
+#: architecture.xml:242
 #, no-c-format
 msgid ""
 "See the Javadocs for the <literal>org.hibernate.context."
@@ -499,7 +419,7 @@
 "implementaciones de esta interfaz:"
 
 #. Tag: para
-#: architecture.xml:301
+#: architecture.xml:252
 #, no-c-format
 msgid ""
 "<literal>org.hibernate.context.JTASessionContext</literal>: current sessions "
@@ -513,7 +433,7 @@
 "sólamente. Refiérase a los Javadocs para obtener más información."
 
 #. Tag: para
-#: architecture.xml:309
+#: architecture.xml:260
 #, no-c-format
 msgid ""
 "<literal>org.hibernate.context.ThreadLocalSessionContext</literal>:current "
@@ -524,7 +444,7 @@
 "Javadocs para obtener más detalles."
 
 #. Tag: para
-#: architecture.xml:315
+#: architecture.xml:266
 #, no-c-format
 msgid ""
 "<literal>org.hibernate.context.ManagedSessionContext</literal>: current "
@@ -539,7 +459,7 @@
 "<literal>Session</literal>."
 
 #. Tag: para
-#: architecture.xml:324
+#: architecture.xml:275
 #, fuzzy, no-c-format
 msgid ""
 "The first two implementations provide a \"one session - one database "
@@ -571,7 +491,7 @@
 "ejemplos de código."
 
 #. Tag: para
-#: architecture.xml:336
+#: architecture.xml:287
 #, no-c-format
 msgid ""
 "The <literal>hibernate.current_session_context_class</literal> configuration "
@@ -596,7 +516,66 @@
 "de implementación a utilizar. Sin embargo, para las tres implementaciones "
 "incluídas existen tress nombres cortos: \"jta\", \"thread\" y \"managed\"."
 
+#~ msgid "Instance states"
+#~ msgstr "Estados de instancia"
+
 #~ msgid ""
+#~ "An instance of a persistent class can be in one of three different "
+#~ "states. These states are defined in relation to a <emphasis>persistence "
+#~ "context</emphasis>. The Hibernate <literal>Session</literal> object is "
+#~ "the persistence context. The three different states are as follows:"
+#~ msgstr ""
+#~ "Una instancia de una clase persistente puede estar en uno de tres estados "
+#~ "diferentes. Estos estados se definen con respecto a su <emphasis>contexto "
+#~ "de persistencia</emphasis>. El objeto <literal>Session</literal> de "
+#~ "Hibernate es el contexto de persistencia. Los tres estados diferentes son "
+#~ "los siguientes:"
+
+#~ msgid "transient"
+#~ msgstr "transitorio"
+
+#~ msgid ""
+#~ "The instance is not associated with any persistence context. It has no "
+#~ "persistent identity or primary key value."
+#~ msgstr ""
+#~ "La instancia no está asociada con un contexto de persistencia. No tiene "
+#~ "identidad persistente o valor de clave principal."
+
+#~ msgid "persistent"
+#~ msgstr "persistente"
+
+#~ msgid ""
+#~ "The instance is currently associated with a persistence context. It has a "
+#~ "persistent identity (primary key value) and can have a corresponding row "
+#~ "in the database. For a particular persistence context, Hibernate "
+#~ "<emphasis>guarantees</emphasis> that persistent identity is equivalent to "
+#~ "Java identity in relation to the in-memory location of the object."
+#~ msgstr ""
+#~ "La instancia se encuentra actualmente asociada con un contexto de "
+#~ "persistencia. Tiene una identidad persistente (valor de clave principal) "
+#~ "y puede tener una fila correspondiente en la base de datos. Para un "
+#~ "contexto de persistencia en particular, Hibernate <emphasis>garantiza</"
+#~ "emphasis> que la identidad persistente es equivalente a la identidad Java "
+#~ "en relación con la ubicación del objeto."
+
+#~ msgid "detached"
+#~ msgstr "separado"
+
+#~ msgid ""
+#~ "The instance was once associated with a persistence context, but that "
+#~ "context was closed, or the instance was serialized to another process. It "
+#~ "has a persistent identity and can have a corresponding row in the "
+#~ "database. For detached instances, Hibernate does not guarantee the "
+#~ "relationship between persistent identity and Java identity."
+#~ msgstr ""
+#~ "La instancia estuvo alguna vez asociada con un contexto de persistencia, "
+#~ "pero ese contexto se cerró, o la instancia fue serializada a otro "
+#~ "proceso. Tiene una identidad persistente y puede tener una fila "
+#~ "correspondiente en la base de datos. Para las instancias separadas, "
+#~ "Hibernate no establece ninguna garantía sobre la relación entre identidad "
+#~ "persistente e identidad Java."
+
+#~ msgid ""
 #~ "We do not have the scope in this document to provide a more detailed view "
 #~ "of all the runtime architectures available; Hibernate is flexible and "
 #~ "supports several different approaches. We will, however, show the two "

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	2010-07-21 05:38:09 UTC (rev 19987)
+++ core/trunk/documentation/manual/src/main/docbook/fr-FR/content/architecture.po	2010-07-21 05:39:40 UTC (rev 19988)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: architecture\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-07-21 05:26+0000\n"
+"POT-Creation-Date: 2010-07-21 05:38+0000\n"
 "PO-Revision-Date: 2010-01-04 16:40+1000\n"
 "Last-Translator: Corina Roe <croe at redhat.com>\n"
 "Language-Team: French <i18 at redhat.com>\n"
@@ -162,7 +162,8 @@
 "interfacename>. Once the <interfacename>org.hibernate.Session</"
 "interfacename> is closed, they will be detached and free to use in any "
 "application layer (for example, directly as data transfer objects to and "
-"from presentation). See"
+"from presentation). <xref linkend=\"objectstate\"/> discusses transient, "
+"persistent and detached object states."
 msgstr ""
 "Objets mono-threadés à vie courte, contenant état persistant et fonction "
 "commerciale. Ceux-ci sont en général des objets ordinaires de type JavaBean "
@@ -172,20 +173,21 @@
 "couche de l'application (par ex. de et vers la présentation)."
 
 #. Tag: term
-#: architecture.xml:139
+#: architecture.xml:140
 #, no-c-format
 msgid "Transient and detached objects and collections"
 msgstr "Objets et collections éphémères (transient) et détachés"
 
 #. Tag: para
-#: architecture.xml:141
+#: architecture.xml:142
 #, fuzzy, no-c-format
 msgid ""
 "Instances of persistent classes that are not currently associated with a "
 "<interfacename>org.hibernate.Session</interfacename>. They may have been "
 "instantiated by the application and not yet persisted, or they may have been "
 "instantiated by a closed <interfacename>org.hibernate.Session</"
-"interfacename>. See"
+"interfacename>. <xref linkend=\"objectstate\"/> discusses transient, "
+"persistent and detached object states."
 msgstr ""
 "Instances de classes persistantes qui ne sont actuellement pas associées à "
 "une <literal>Session</literal>. Elles ont pu être instanciées par "
@@ -193,13 +195,13 @@
 "instanciées par une <literal>Session</literal> fermée."
 
 #. Tag: term
-#: architecture.xml:151
+#: architecture.xml:152
 #, fuzzy, no-c-format
 msgid "Transaction (<interfacename>org.hibernate.Transaction</interfacename>)"
 msgstr "Transaction (<literal>org.hibernate.Transaction</literal>)"
 
 #. Tag: para
-#: architecture.xml:153
+#: architecture.xml:154
 #, fuzzy, no-c-format
 msgid ""
 "(Optional) A single-threaded, short-lived object used by the application to "
@@ -219,7 +221,7 @@
 "n'est jamais optionnelle. "
 
 #. Tag: term
-#: architecture.xml:164
+#: architecture.xml:165
 #, fuzzy, no-c-format
 msgid ""
 "ConnectionProvider (<interfacename>org.hibernate.connection."
@@ -229,7 +231,7 @@
 "literal>)"
 
 #. Tag: para
-#: architecture.xml:166
+#: architecture.xml:167
 #, fuzzy, no-c-format
 msgid ""
 "(Optional) A factory for, and pool of, JDBC connections. It abstracts the "
@@ -244,7 +246,7 @@
 "mais peut être étendu/implémenté par le développeur. "
 
 #. Tag: term
-#: architecture.xml:175
+#: architecture.xml:176
 #, fuzzy, no-c-format
 msgid ""
 "TransactionFactory (<interfacename>org.hibernate.TransactionFactory</"
@@ -253,7 +255,7 @@
 "TransactionFactory (<literal>org.hibernate.TransactionFactory</literal>)"
 
 #. Tag: para
-#: architecture.xml:177
+#: architecture.xml:178
 #, fuzzy, no-c-format
 msgid ""
 "(Optional) A factory for <interfacename>org.hibernate.Transaction</"
@@ -265,13 +267,13 @@
 "développeur. "
 
 #. Tag: emphasis
-#: architecture.xml:185
+#: architecture.xml:186
 #, fuzzy, no-c-format
 msgid "Extension Interfaces"
 msgstr "<emphasis>Interfaces d'extension</emphasis> "
 
 #. Tag: para
-#: architecture.xml:187
+#: architecture.xml:188
 #, no-c-format
 msgid ""
 "Hibernate offers a range of optional extension interfaces you can implement "
@@ -284,95 +286,13 @@
 "détails. "
 
 #. Tag: title
-#: architecture.xml:199
-#, no-c-format
-msgid "Instance states"
-msgstr "Etats des instances"
-
-#. Tag: para
 #: architecture.xml:200
 #, no-c-format
-msgid ""
-"An instance of a persistent class can be in one of three different states. "
-"These states are defined in relation to a <emphasis>persistence context</"
-"emphasis>. The Hibernate <literal>Session</literal> object is the "
-"persistence context. The three different states are as follows:"
-msgstr ""
-"Une instance d'une classe persistante peut être dans l'un des trois états "
-"suivants, définis par rapport à un <emphasis>contexte de persistance</"
-"emphasis>. L'objet <literal>Session</literal> Hibernate correspond à ce "
-"contexte de persistance. Les trois états distincts sont:"
-
-#. Tag: term
-#: architecture.xml:208
-#, no-c-format
-msgid "transient"
-msgstr "éphémère (transient)"
-
-#. Tag: para
-#: architecture.xml:210
-#, no-c-format
-msgid ""
-"The instance is not associated with any persistence context. It has no "
-"persistent identity or primary key value."
-msgstr ""
-"L'instance n'est pas et n'a jamais été associée à un contexte de "
-"persistance. Elle ne possède pas d'identité persistante (valeur de clé "
-"primaire)."
-
-#. Tag: term
-#: architecture.xml:218
-#, no-c-format
-msgid "persistent"
-msgstr "persistant"
-
-#. Tag: para
-#: architecture.xml:220
-#, no-c-format
-msgid ""
-"The instance is currently associated with a persistence context. It has a "
-"persistent identity (primary key value) and can have a corresponding row in "
-"the database. For a particular persistence context, Hibernate "
-"<emphasis>guarantees</emphasis> that persistent identity is equivalent to "
-"Java identity in relation to the in-memory location of the object."
-msgstr ""
-"L'instance est associée à un contexte de persistance. Elle possède une "
-"identité persistante (valeur de clé primaire) et, peut-être un "
-"enregistrement correspondant dans la base de données. Pour un contexte de "
-"persistance particulier, Hibernate <emphasis>garantit</emphasis> que "
-"l'identité persistante soit équivalente à l'identité Java (emplacement "
-"mémoire de l'objet). "
-
-#. Tag: term
-#: architecture.xml:232
-#, no-c-format
-msgid "detached"
-msgstr "détaché"
-
-#. Tag: para
-#: architecture.xml:234
-#, 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 can have a corresponding row in the database. "
-"For detached instances, Hibernate does not guarantee the relationship "
-"between persistent identity and Java identity."
-msgstr ""
-"L'instance a été associée au contexte de persistance mais ce contexte a été "
-"fermé, ou l'instance a été sérialisée vers un autre processus. Elle possède "
-"une identité persistante et peut-être un enregistrement correspondant dans "
-"la base de données. Pour des instances détachées, Hibernate ne donne aucune "
-"garantie sur la relation entre l'identité persistante et l'identité Java. "
-
-#. Tag: title
-#: architecture.xml:249
-#, no-c-format
 msgid "JMX Integration"
 msgstr "Intégration JMX"
 
 #. Tag: para
-#: architecture.xml:251
+#: architecture.xml:202
 #, no-c-format
 msgid ""
 "JMX is the J2EE standard for the management of Java components. Hibernate "
@@ -386,7 +306,7 @@
 "literal>. "
 
 #. Tag: para
-#: architecture.xml:257
+#: architecture.xml:208
 #, fuzzy, no-c-format
 msgid ""
 "Another feature available as a JMX service is runtime Hibernate statistics. "
@@ -398,13 +318,13 @@
 "linkend=\"configuration-optional-statistics\" />."
 
 #. Tag: title
-#: architecture.xml:264
+#: architecture.xml:215
 #, no-c-format
 msgid "Contextual sessions"
 msgstr "Sessions contextuelles "
 
 #. Tag: para
-#: architecture.xml:265
+#: architecture.xml:216
 #, no-c-format
 msgid ""
 "Most applications using Hibernate need some form of \"contextual\" session, "
@@ -430,7 +350,7 @@
 "l'utilisation de proxy/interception. "
 
 #. Tag: para
-#: architecture.xml:274
+#: architecture.xml:225
 #, no-c-format
 msgid ""
 "Starting with version 3.0.1, Hibernate added the <literal>SessionFactory."
@@ -456,7 +376,7 @@
 "<literal>JTA</literal>. "
 
 #. Tag: para
-#: architecture.xml:284
+#: architecture.xml:235
 #, no-c-format
 msgid ""
 "However, as of version 3.1, the processing behind <literal>SessionFactory."
@@ -475,7 +395,7 @@
 "caractéristiques."
 
 #. Tag: para
-#: architecture.xml:291
+#: architecture.xml:242
 #, no-c-format
 msgid ""
 "See the Javadocs for the <literal>org.hibernate.context."
@@ -492,7 +412,7 @@
 "courante. Hibernate fournit trois implémentations de cette interface :"
 
 #. Tag: para
-#: architecture.xml:301
+#: architecture.xml:252
 #, no-c-format
 msgid ""
 "<literal>org.hibernate.context.JTASessionContext</literal>: current sessions "
@@ -506,7 +426,7 @@
 "javadocs pour pour plus d'informations. "
 
 #. Tag: para
-#: architecture.xml:309
+#: architecture.xml:260
 #, no-c-format
 msgid ""
 "<literal>org.hibernate.context.ThreadLocalSessionContext</literal>:current "
@@ -517,7 +437,7 @@
 "javadocs pour plus d'informations. "
 
 #. Tag: para
-#: architecture.xml:315
+#: architecture.xml:266
 #, no-c-format
 msgid ""
 "<literal>org.hibernate.context.ManagedSessionContext</literal>: current "
@@ -532,7 +452,7 @@
 "ni ne nettoie ou ne ferme une <literal>Session</literal>."
 
 #. Tag: para
-#: architecture.xml:324
+#: architecture.xml:275
 #, fuzzy, no-c-format
 msgid ""
 "The first two implementations provide a \"one session - one database "
@@ -562,7 +482,7 @@
 "et des exemples de code."
 
 #. Tag: para
-#: architecture.xml:336
+#: architecture.xml:287
 #, no-c-format
 msgid ""
 "The <literal>hibernate.current_session_context_class</literal> configuration "
@@ -588,7 +508,66 @@
 "utiliser, toutefois, il y a trois noms brefs correspondants : \"jta\", "
 "\"thread\" et \"managed\"."
 
+#~ msgid "Instance states"
+#~ msgstr "Etats des instances"
+
 #~ msgid ""
+#~ "An instance of a persistent class can be in one of three different "
+#~ "states. These states are defined in relation to a <emphasis>persistence "
+#~ "context</emphasis>. The Hibernate <literal>Session</literal> object is "
+#~ "the persistence context. The three different states are as follows:"
+#~ msgstr ""
+#~ "Une instance d'une classe persistante peut être dans l'un des trois états "
+#~ "suivants, définis par rapport à un <emphasis>contexte de persistance</"
+#~ "emphasis>. L'objet <literal>Session</literal> Hibernate correspond à ce "
+#~ "contexte de persistance. Les trois états distincts sont:"
+
+#~ msgid "transient"
+#~ msgstr "éphémère (transient)"
+
+#~ msgid ""
+#~ "The instance is not associated with any persistence context. It has no "
+#~ "persistent identity or primary key value."
+#~ msgstr ""
+#~ "L'instance n'est pas et n'a jamais été associée à un contexte de "
+#~ "persistance. Elle ne possède pas d'identité persistante (valeur de clé "
+#~ "primaire)."
+
+#~ msgid "persistent"
+#~ msgstr "persistant"
+
+#~ msgid ""
+#~ "The instance is currently associated with a persistence context. It has a "
+#~ "persistent identity (primary key value) and can have a corresponding row "
+#~ "in the database. For a particular persistence context, Hibernate "
+#~ "<emphasis>guarantees</emphasis> that persistent identity is equivalent to "
+#~ "Java identity in relation to the in-memory location of the object."
+#~ msgstr ""
+#~ "L'instance est associée à un contexte de persistance. Elle possède une "
+#~ "identité persistante (valeur de clé primaire) et, peut-être un "
+#~ "enregistrement correspondant dans la base de données. Pour un contexte de "
+#~ "persistance particulier, Hibernate <emphasis>garantit</emphasis> que "
+#~ "l'identité persistante soit équivalente à l'identité Java (emplacement "
+#~ "mémoire de l'objet). "
+
+#~ msgid "detached"
+#~ msgstr "détaché"
+
+#~ msgid ""
+#~ "The instance was once associated with a persistence context, but that "
+#~ "context was closed, or the instance was serialized to another process. It "
+#~ "has a persistent identity and can have a corresponding row in the "
+#~ "database. For detached instances, Hibernate does not guarantee the "
+#~ "relationship between persistent identity and Java identity."
+#~ msgstr ""
+#~ "L'instance a été associée au contexte de persistance mais ce contexte a "
+#~ "été fermé, ou l'instance a été sérialisée vers un autre processus. Elle "
+#~ "possède une identité persistante et peut-être un enregistrement "
+#~ "correspondant dans la base de données. Pour des instances détachées, "
+#~ "Hibernate ne donne aucune garantie sur la relation entre l'identité "
+#~ "persistante et l'identité Java. "
+
+#~ msgid ""
 #~ "We do not have the scope in this document to provide a more detailed view "
 #~ "of all the runtime architectures available; Hibernate is flexible and "
 #~ "supports several different approaches. We will, however, show the two "

Modified: core/trunk/documentation/manual/src/main/docbook/ja-JP/content/architecture.po
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/ja-JP/content/architecture.po	2010-07-21 05:38:09 UTC (rev 19987)
+++ core/trunk/documentation/manual/src/main/docbook/ja-JP/content/architecture.po	2010-07-21 05:39:40 UTC (rev 19988)
@@ -4,7 +4,7 @@
 msgstr ""
 "Project-Id-Version: Collection_Mapping\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-07-21 05:26+0000\n"
+"POT-Creation-Date: 2010-07-21 05:38+0000\n"
 "PO-Revision-Date: 2010-01-13 10:25+1000\n"
 "Last-Translator: Xi HUANG <xhuang at redhat.com>\n"
 "Language-Team:  <en at li.org>\n"
@@ -157,7 +157,8 @@
 "interfacename>. Once the <interfacename>org.hibernate.Session</"
 "interfacename> is closed, they will be detached and free to use in any "
 "application layer (for example, directly as data transfer objects to and "
-"from presentation). See"
+"from presentation). <xref linkend=\"objectstate\"/> discusses transient, "
+"persistent and detached object states."
 msgstr ""
 "永続化状態とビジネス機能を持つ、短命でシングルスレッドのオブジェクト。これは"
 "通常の JavaBeans/POJO のこともありますが、特徴的なことは、その時点での(ただ1"
@@ -167,20 +168,21 @@
 "レゼンテーション層から、またはプレゼンテーション層へ直接使用できます)。"
 
 #. Tag: term
-#: architecture.xml:139
+#: architecture.xml:140
 #, no-c-format
 msgid "Transient and detached objects and collections"
 msgstr "Transient と detached な objects と Collections"
 
 #. Tag: para
-#: architecture.xml:141
+#: architecture.xml:142
 #, fuzzy, no-c-format
 msgid ""
 "Instances of persistent classes that are not currently associated with a "
 "<interfacename>org.hibernate.Session</interfacename>. They may have been "
 "instantiated by the application and not yet persisted, or they may have been "
 "instantiated by a closed <interfacename>org.hibernate.Session</"
-"interfacename>. See"
+"interfacename>. <xref linkend=\"objectstate\"/> discusses transient, "
+"persistent and detached object states."
 msgstr ""
 "現時点では <literal>Session</literal> と関連していない、永続クラスのインスタ"
 "ンス。すでにアプリケーション側でインスタンス化されていて、まだ永続化されてい"
@@ -188,13 +190,13 @@
 "どちらかです。"
 
 #. Tag: term
-#: architecture.xml:151
+#: architecture.xml:152
 #, fuzzy, no-c-format
 msgid "Transaction (<interfacename>org.hibernate.Transaction</interfacename>)"
 msgstr "Transaction (<literal>org.hibernate.Transaction</literal>)"
 
 #. Tag: para
-#: architecture.xml:153
+#: architecture.xml:154
 #, fuzzy, no-c-format
 msgid ""
 "(Optional) A single-threaded, short-lived object used by the application to "
@@ -214,7 +216,7 @@
 "とは、決してオプションではありません。"
 
 #. Tag: term
-#: architecture.xml:164
+#: architecture.xml:165
 #, fuzzy, no-c-format
 msgid ""
 "ConnectionProvider (<interfacename>org.hibernate.connection."
@@ -224,7 +226,7 @@
 "literal>)"
 
 #. Tag: para
-#: architecture.xml:166
+#: architecture.xml:167
 #, fuzzy, no-c-format
 msgid ""
 "(Optional) A factory for, and pool of, JDBC connections. It abstracts the "
@@ -239,7 +241,7 @@
 "または実装することは可能です。"
 
 #. Tag: term
-#: architecture.xml:175
+#: architecture.xml:176
 #, fuzzy, no-c-format
 msgid ""
 "TransactionFactory (<interfacename>org.hibernate.TransactionFactory</"
@@ -248,7 +250,7 @@
 "TransactionFactory (<literal>org.hibernate.TransactionFactory</literal>)"
 
 #. Tag: para
-#: architecture.xml:177
+#: architecture.xml:178
 #, fuzzy, no-c-format
 msgid ""
 "(Optional) A factory for <interfacename>org.hibernate.Transaction</"
@@ -259,13 +261,13 @@
 "ケーションには公開されませんが、開発者が継承または実装することは可能です。"
 
 #. Tag: emphasis
-#: architecture.xml:185
+#: architecture.xml:186
 #, fuzzy, no-c-format
 msgid "Extension Interfaces"
 msgstr "<emphasis>Extension Interfaces</emphasis>"
 
 #. Tag: para
-#: architecture.xml:187
+#: architecture.xml:188
 #, no-c-format
 msgid ""
 "Hibernate offers a range of optional extension interfaces you can implement "
@@ -276,92 +278,13 @@
 "インタフェースを用意しています。詳細は API ドキュメントを参照してください。"
 
 #. Tag: title
-#: architecture.xml:199
-#, no-c-format
-msgid "Instance states"
-msgstr "インスタンスの状態"
-
-#. Tag: para
 #: architecture.xml:200
 #, no-c-format
-msgid ""
-"An instance of a persistent class can be in one of three different states. "
-"These states are defined in relation to a <emphasis>persistence context</"
-"emphasis>. The Hibernate <literal>Session</literal> object is the "
-"persistence context. The three different states are as follows:"
-msgstr ""
-"永続クラスのインスタンスは、次の3つの異なる状態のどれかになります。それは、 "
-"<emphasis>永続コンテキスト</emphasis> によって決まります。 Hibernate の "
-"<literal>Session</literal> オブジェクトが、永続コンテキストになります:"
-
-#. Tag: term
-#: architecture.xml:208
-#, no-c-format
-msgid "transient"
-msgstr "transient"
-
-#. Tag: para
-#: architecture.xml:210
-#, fuzzy, no-c-format
-msgid ""
-"The instance is not associated with any persistence context. It has no "
-"persistent identity or primary key value."
-msgstr ""
-"この状態のインスタンスは、現在もそして過去においても、永続コンテキストに関連"
-"づいていません。また、永続 ID (主キーの値)を 持っていません。"
-
-#. Tag: term
-#: architecture.xml:218
-#, no-c-format
-msgid "persistent"
-msgstr "persistent"
-
-#. Tag: para
-#: architecture.xml:220
-#, no-c-format
-msgid ""
-"The instance is currently associated with a persistence context. It has a "
-"persistent identity (primary key value) and can have a corresponding row in "
-"the database. For a particular persistence context, Hibernate "
-"<emphasis>guarantees</emphasis> that persistent identity is equivalent to "
-"Java identity in relation to the in-memory location of the object."
-msgstr ""
-"この状態のインスタンスは、その時点で永続コンテキストに関連づいています。ま"
-"た、永続 ID (主キーの値)を持ち、たいていはデータベースに対応する行を持って"
-"いるでしょう。特定の永続コンテキストのなかでは、永続 ID が Java の ID (オブ"
-"ジェクトのメモリ上の位置)と同じであることを Hibernate が <emphasis>保証</"
-"emphasis> します。"
-
-#. Tag: term
-#: architecture.xml:232
-#, no-c-format
-msgid "detached"
-msgstr "detached"
-
-#. Tag: para
-#: architecture.xml:234
-#, 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 can have a corresponding row in the database. "
-"For detached instances, Hibernate does not guarantee the relationship "
-"between persistent identity and Java identity."
-msgstr ""
-"この状態のインスタンスは、かつて永続コンテキストに関連づけられたが、そのコン"
-"テキストがクローズされたか、あるいは、他のプロセスにそのインスタンスがシリア"
-"ライズされたかです。このインスタンスは、永続 ID を持ち、たいていはデータベー"
-"スに対応する行を持っているでしょう。分離インスタンスに対しては、永続 ID と "
-"Java の ID との関連は、 Hibernate が保証しません。"
-
-#. Tag: title
-#: architecture.xml:249
-#, no-c-format
 msgid "JMX Integration"
 msgstr "JMX との統合"
 
 #. Tag: para
-#: architecture.xml:251
+#: architecture.xml:202
 #, no-c-format
 msgid ""
 "JMX is the J2EE standard for the management of Java components. Hibernate "
@@ -374,7 +297,7 @@
 "hibernate.jmx.HibernateService</literal> という MBean 実装を用意しています。"
 
 #. Tag: para
-#: architecture.xml:257
+#: architecture.xml:208
 #, fuzzy, no-c-format
 msgid ""
 "Another feature available as a JMX service is runtime Hibernate statistics. "
@@ -385,13 +308,13 @@
 "<xref linkend=\"configuration-optional-statistics\"/> を見てください。"
 
 #. Tag: title
-#: architecture.xml:264
+#: architecture.xml:215
 #, no-c-format
 msgid "Contextual sessions"
 msgstr "コンテキスト上のセッション"
 
 #. Tag: para
-#: architecture.xml:265
+#: architecture.xml:216
 #, no-c-format
 msgid ""
 "Most applications using Hibernate need some form of \"contextual\" session, "
@@ -416,7 +339,7 @@
 "ワークを利用するかのいずれかでした。"
 
 #. Tag: para
-#: architecture.xml:274
+#: architecture.xml:225
 #, fuzzy, no-c-format
 msgid ""
 "Starting with version 3.0.1, Hibernate added the <literal>SessionFactory."
@@ -441,7 +364,7 @@
 "「コンテキスト上のセッション」を使うしかないでしょう。"
 
 #. Tag: para
-#: architecture.xml:284
+#: architecture.xml:235
 #, no-c-format
 msgid ""
 "However, as of version 3.1, the processing behind <literal>SessionFactory."
@@ -459,7 +382,7 @@
 "current_session_context_class</literal> ) が追加されました。"
 
 #. Tag: para
-#: architecture.xml:291
+#: architecture.xml:242
 #, fuzzy, no-c-format
 msgid ""
 "See the Javadocs for the <literal>org.hibernate.context."
@@ -477,7 +400,7 @@
 "す。"
 
 #. Tag: para
-#: architecture.xml:301
+#: architecture.xml:252
 #, no-c-format
 msgid ""
 "<literal>org.hibernate.context.JTASessionContext</literal>: current sessions "
@@ -491,7 +414,7 @@
 "Javadoc を参照してください。"
 
 #. Tag: para
-#: architecture.xml:309
+#: architecture.xml:260
 #, no-c-format
 msgid ""
 "<literal>org.hibernate.context.ThreadLocalSessionContext</literal>:current "
@@ -502,7 +425,7 @@
 "さい。"
 
 #. Tag: para
-#: architecture.xml:315
+#: architecture.xml:266
 #, no-c-format
 msgid ""
 "<literal>org.hibernate.context.ManagedSessionContext</literal>: current "
@@ -517,7 +440,7 @@
 "ラッシュ、クローズしません。"
 
 #. Tag: para
-#: architecture.xml:324
+#: architecture.xml:275
 #, fuzzy, no-c-format
 msgid ""
 "The first two implementations provide a \"one session - one database "
@@ -547,7 +470,7 @@
 "\"transactions\"/> を参照してください。"
 
 #. Tag: para
-#: architecture.xml:336
+#: architecture.xml:287
 #, no-c-format
 msgid ""
 "The <literal>hibernate.current_session_context_class</literal> configuration "
@@ -570,8 +493,64 @@
 "の値には、3つの実装の中から使用する実装クラスの名前を直接指定します。しかし、"
 "\"jta\"、 \"thread\"、 \"managed\"というそれぞれの省略名も用意されています。"
 
+#~ msgid "Instance states"
+#~ msgstr "インスタンスの状態"
+
+#~ msgid ""
+#~ "An instance of a persistent class can be in one of three different "
+#~ "states. These states are defined in relation to a <emphasis>persistence "
+#~ "context</emphasis>. The Hibernate <literal>Session</literal> object is "
+#~ "the persistence context. The three different states are as follows:"
+#~ msgstr ""
+#~ "永続クラスのインスタンスは、次の3つの異なる状態のどれかになります。それ"
+#~ "は、 <emphasis>永続コンテキスト</emphasis> によって決まります。 Hibernate "
+#~ "の <literal>Session</literal> オブジェクトが、永続コンテキストになります:"
+
+#~ msgid "transient"
+#~ msgstr "transient"
+
 #, fuzzy
 #~ msgid ""
+#~ "The instance is not associated with any persistence context. It has no "
+#~ "persistent identity or primary key value."
+#~ msgstr ""
+#~ "この状態のインスタンスは、現在もそして過去においても、永続コンテキストに関"
+#~ "連づいていません。また、永続 ID (主キーの値)を 持っていません。"
+
+#~ msgid "persistent"
+#~ msgstr "persistent"
+
+#~ msgid ""
+#~ "The instance is currently associated with a persistence context. It has a "
+#~ "persistent identity (primary key value) and can have a corresponding row "
+#~ "in the database. For a particular persistence context, Hibernate "
+#~ "<emphasis>guarantees</emphasis> that persistent identity is equivalent to "
+#~ "Java identity in relation to the in-memory location of the object."
+#~ msgstr ""
+#~ "この状態のインスタンスは、その時点で永続コンテキストに関連づいています。ま"
+#~ "た、永続 ID (主キーの値)を持ち、たいていはデータベースに対応する行を持っ"
+#~ "ているでしょう。特定の永続コンテキストのなかでは、永続 ID が Java の ID "
+#~ "(オブジェクトのメモリ上の位置)と同じであることを Hibernate が <emphasis>"
+#~ "保証</emphasis> します。"
+
+#~ msgid "detached"
+#~ msgstr "detached"
+
+#~ msgid ""
+#~ "The instance was once associated with a persistence context, but that "
+#~ "context was closed, or the instance was serialized to another process. It "
+#~ "has a persistent identity and can have a corresponding row in the "
+#~ "database. For detached instances, Hibernate does not guarantee the "
+#~ "relationship between persistent identity and Java identity."
+#~ msgstr ""
+#~ "この状態のインスタンスは、かつて永続コンテキストに関連づけられたが、そのコ"
+#~ "ンテキストがクローズされたか、あるいは、他のプロセスにそのインスタンスがシ"
+#~ "リアライズされたかです。このインスタンスは、永続 ID を持ち、たいていはデー"
+#~ "タベースに対応する行を持っているでしょう。分離インスタンスに対しては、永"
+#~ "続 ID と Java の ID との関連は、 Hibernate が保証しません。"
+
+#, fuzzy
+#~ msgid ""
 #~ "We do not have the scope in this document to provide a more detailed view "
 #~ "of all the runtime architectures available; Hibernate is flexible and "
 #~ "supports several different approaches. We will, however, show the two "

Modified: core/trunk/documentation/manual/src/main/docbook/pot/content/architecture.pot
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/pot/content/architecture.pot	2010-07-21 05:38:09 UTC (rev 19987)
+++ core/trunk/documentation/manual/src/main/docbook/pot/content/architecture.pot	2010-07-21 05:39:40 UTC (rev 19988)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-07-21 05:26+0000\n"
+"POT-Creation-Date: 2010-07-21 05:38+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"
@@ -107,191 +107,143 @@
 #. Tag: para
 #: architecture.xml:128
 #, no-c-format
-msgid "Short-lived, single threaded objects containing persistent state and business function. These can be ordinary JavaBeans/POJOs. They are associated with exactly one <interfacename>org.hibernate.Session</interfacename>. Once the <interfacename>org.hibernate.Session</interfacename> is closed, they will be detached and free to use in any application layer (for example, directly as data transfer objects to and from presentation). See"
+msgid "Short-lived, single threaded objects containing persistent state and business function. These can be ordinary JavaBeans/POJOs. They are associated with exactly one <interfacename>org.hibernate.Session</interfacename>. Once the <interfacename>org.hibernate.Session</interfacename> is closed, they will be detached and free to use in any application layer (for example, directly as data transfer objects to and from presentation). <xref linkend=\"objectstate\"/> discusses transient, persistent and detached object states."
 msgstr ""
 
 #. Tag: term
-#: architecture.xml:139
+#: architecture.xml:140
 #, no-c-format
 msgid "Transient and detached objects and collections"
 msgstr ""
 
 #. Tag: para
-#: architecture.xml:141
+#: architecture.xml:142
 #, no-c-format
-msgid "Instances of persistent classes that are not currently associated with a <interfacename>org.hibernate.Session</interfacename>. They may have been instantiated by the application and not yet persisted, or they may have been instantiated by a closed <interfacename>org.hibernate.Session</interfacename>. See"
+msgid "Instances of persistent classes that are not currently associated with a <interfacename>org.hibernate.Session</interfacename>. They may have been instantiated by the application and not yet persisted, or they may have been instantiated by a closed <interfacename>org.hibernate.Session</interfacename>. <xref linkend=\"objectstate\"/> discusses transient, persistent and detached object states."
 msgstr ""
 
 #. Tag: term
-#: architecture.xml:151
+#: architecture.xml:152
 #, no-c-format
 msgid "Transaction (<interfacename>org.hibernate.Transaction</interfacename>)"
 msgstr ""
 
 #. Tag: para
-#: architecture.xml:153
+#: architecture.xml:154
 #, no-c-format
 msgid "(Optional) A single-threaded, short-lived object used by the application to specify atomic units of work. It abstracts the application from the underlying JDBC, JTA or CORBA transaction. A <interfacename>org.hibernate.Session</interfacename> might span several <interfacename>org.hibernate.Transaction</interfacename>s in some cases. However, transaction demarcation, either using the underlying API or <interfacename>org.hibernate.Transaction</interfacename>, is never optional."
 msgstr ""
 
 #. Tag: term
-#: architecture.xml:164
+#: architecture.xml:165
 #, no-c-format
 msgid "ConnectionProvider (<interfacename>org.hibernate.connection.ConnectionProvider</interfacename>)"
 msgstr ""
 
 #. Tag: para
-#: architecture.xml:166
+#: architecture.xml:167
 #, no-c-format
 msgid "(Optional) A factory for, and pool of, JDBC connections. It abstracts the application from underlying <interfacename>javax.sql.DataSource</interfacename> or <interfacename>java.sql.DriverManager</interfacename>. It is not exposed to application, but it can be extended and/or implemented by the developer."
 msgstr ""
 
 #. Tag: term
-#: architecture.xml:175
+#: architecture.xml:176
 #, no-c-format
 msgid "TransactionFactory (<interfacename>org.hibernate.TransactionFactory</interfacename>)"
 msgstr ""
 
 #. Tag: para
-#: architecture.xml:177
+#: architecture.xml:178
 #, no-c-format
 msgid "(Optional) A factory for <interfacename>org.hibernate.Transaction</interfacename> instances. It is not exposed to the application, but it can be extended and/or implemented by the developer."
 msgstr ""
 
 #. Tag: emphasis
-#: architecture.xml:185
+#: architecture.xml:186
 #, no-c-format
 msgid "Extension Interfaces"
 msgstr ""
 
 #. Tag: para
-#: architecture.xml:187
+#: architecture.xml:188
 #, no-c-format
 msgid "Hibernate offers a range of optional extension interfaces you can implement to customize the behavior of your persistence layer. See the API documentation for details."
 msgstr ""
 
 #. Tag: title
-#: architecture.xml:199
-#, no-c-format
-msgid "Instance states"
-msgstr ""
-
-#. Tag: para
 #: architecture.xml:200
 #, no-c-format
-msgid "An instance of a persistent class can be in one of three different states. These states are defined in relation to a <emphasis>persistence context</emphasis>. The Hibernate <literal>Session</literal> object is the persistence context. The three different states are as follows:"
-msgstr ""
-
-#. Tag: term
-#: architecture.xml:208
-#, no-c-format
-msgid "transient"
-msgstr ""
-
-#. Tag: para
-#: architecture.xml:210
-#, no-c-format
-msgid "The instance is not associated with any persistence context. It has no persistent identity or primary key value."
-msgstr ""
-
-#. Tag: term
-#: architecture.xml:218
-#, no-c-format
-msgid "persistent"
-msgstr ""
-
-#. Tag: para
-#: architecture.xml:220
-#, no-c-format
-msgid "The instance is currently associated with a persistence context. It has a persistent identity (primary key value) and can have a corresponding row in the database. For a particular persistence context, Hibernate <emphasis>guarantees</emphasis> that persistent identity is equivalent to Java identity in relation to the in-memory location of the object."
-msgstr ""
-
-#. Tag: term
-#: architecture.xml:232
-#, no-c-format
-msgid "detached"
-msgstr ""
-
-#. Tag: para
-#: architecture.xml:234
-#, 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 can have a corresponding row in the database. For detached instances, Hibernate does not guarantee the relationship between persistent identity and Java identity."
-msgstr ""
-
-#. Tag: title
-#: architecture.xml:249
-#, no-c-format
 msgid "JMX Integration"
 msgstr ""
 
 #. Tag: para
-#: architecture.xml:251
+#: architecture.xml:202
 #, no-c-format
 msgid "JMX is the J2EE standard for the management of Java components. Hibernate can be managed via a JMX standard service. AN MBean implementation is provided in the distribution: <literal>org.hibernate.jmx.HibernateService</literal>."
 msgstr ""
 
 #. Tag: para
-#: architecture.xml:257
+#: architecture.xml:208
 #, no-c-format
 msgid "Another feature available as a JMX service is runtime Hibernate statistics. See <xref linkend=\"configuration-optional-statistics\"/> for more information."
 msgstr ""
 
 #. Tag: title
-#: architecture.xml:264
+#: architecture.xml:215
 #, no-c-format
 msgid "Contextual sessions"
 msgstr ""
 
 #. Tag: para
-#: architecture.xml:265
+#: architecture.xml:216
 #, no-c-format
 msgid "Most applications using Hibernate need some form of \"contextual\" session, where a given session is in effect throughout the scope of a given context. However, across applications the definition of what constitutes a context is typically different; different contexts define different scopes to the notion of current. Applications using Hibernate prior to version 3.0 tended to utilize either home-grown <literal>ThreadLocal</literal>-based contextual sessions, helper classes such as <literal>HibernateUtil</literal>, or utilized third-party frameworks, such as Spring or Pico, which provided proxy/interception-based contextual sessions."
 msgstr ""
 
 #. Tag: para
-#: architecture.xml:274
+#: architecture.xml:225
 #, no-c-format
 msgid "Starting with version 3.0.1, Hibernate added the <literal>SessionFactory.getCurrentSession()</literal> method. Initially, this assumed usage of <literal>JTA</literal> transactions, where the <literal>JTA</literal> transaction defined both the scope and context of a current session. Given the maturity of the numerous stand-alone <literal>JTA TransactionManager</literal> implementations, most, if not all, applications should be using <literal>JTA</literal> transaction management, whether or not they are deployed into a <literal>J2EE</literal> container. Based on that, the <literal>JTA</literal>-based contextual sessions are all you need to use."
 msgstr ""
 
 #. Tag: para
-#: architecture.xml:284
+#: architecture.xml:235
 #, no-c-format
 msgid "However, as of version 3.1, the processing behind <literal>SessionFactory.getCurrentSession()</literal> is now pluggable. To that end, a new extension interface, <literal>org.hibernate.context.CurrentSessionContext</literal>, and a new configuration parameter, <literal>hibernate.current_session_context_class</literal>, have been added to allow pluggability of the scope and context of defining current sessions."
 msgstr ""
 
 #. Tag: para
-#: architecture.xml:291
+#: architecture.xml:242
 #, no-c-format
 msgid "See the Javadocs for the <literal>org.hibernate.context.CurrentSessionContext</literal> interface for a detailed discussion of its contract. It defines a single method, <literal>currentSession()</literal>, by which the implementation is responsible for tracking the current contextual session. Out-of-the-box, Hibernate comes with three implementations of this interface:"
 msgstr ""
 
 #. Tag: para
-#: architecture.xml:301
+#: architecture.xml:252
 #, no-c-format
 msgid "<literal>org.hibernate.context.JTASessionContext</literal>: current sessions are tracked and scoped by a <literal>JTA</literal> transaction. The processing here is exactly the same as in the older JTA-only approach. See the Javadocs for details."
 msgstr ""
 
 #. Tag: para
-#: architecture.xml:309
+#: architecture.xml:260
 #, no-c-format
 msgid "<literal>org.hibernate.context.ThreadLocalSessionContext</literal>:current sessions are tracked by thread of execution. See the Javadocs for details."
 msgstr ""
 
 #. Tag: para
-#: architecture.xml:315
+#: architecture.xml:266
 #, no-c-format
 msgid "<literal>org.hibernate.context.ManagedSessionContext</literal>: current sessions are tracked by thread of execution. However, you are responsible to bind and unbind a <literal>Session</literal> instance with static methods on this class: it does not open, flush, or close a <literal>Session</literal>."
 msgstr ""
 
 #. Tag: para
-#: architecture.xml:324
+#: architecture.xml:275
 #, no-c-format
 msgid "The first two implementations provide a \"one session - one database transaction\" programming model. This is also known and used as <emphasis>session-per-request</emphasis>. The beginning and end of a Hibernate session is defined by the duration of a database transaction. If you use programmatic transaction demarcation in plain JSE without JTA, you are advised to use the Hibernate <literal>Transaction</literal> API to hide the underlying transaction system from your code. If you use JTA, you can utilize the JTA interfaces to demarcate transactions. If you execute in an EJB container that supports CMT, transaction boundaries are defined declaratively and you do not need any transaction or session demarcation operations in your code. Refer to <xref linkend=\"transactions\"/> for more information and code examples."
 msgstr ""
 
 #. Tag: para
-#: architecture.xml:336
+#: architecture.xml:287
 #, no-c-format
 msgid "The <literal>hibernate.current_session_context_class</literal> configuration parameter defines which <literal>org.hibernate.context.CurrentSessionContext</literal> implementation should be used. For backwards compatibility, if this configuration parameter is not set but a <literal>org.hibernate.transaction.TransactionManagerLookup</literal> is configured, Hibernate will use the <literal>org.hibernate.context.JTASessionContext</literal>. Typically, the value of this parameter would just name the implementation class to use. For the three out-of-the-box implementations, however, there are three corresponding short names: \"jta\", \"thread\", and \"managed\"."
 msgstr ""

Modified: core/trunk/documentation/manual/src/main/docbook/pt-BR/content/architecture.po
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/pt-BR/content/architecture.po	2010-07-21 05:38:09 UTC (rev 19987)
+++ core/trunk/documentation/manual/src/main/docbook/pt-BR/content/architecture.po	2010-07-21 05:39:40 UTC (rev 19988)
@@ -108,7 +108,7 @@
 msgstr ""
 "Project-Id-Version: architecture\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-07-21 05:26+0000\n"
+"POT-Creation-Date: 2010-07-21 05:38+0000\n"
 "PO-Revision-Date: 2010-03-17 10:18+1000\n"
 "Last-Translator: \n"
 "Language-Team:  <en at li.org>\n"
@@ -262,7 +262,8 @@
 "interfacename>. Once the <interfacename>org.hibernate.Session</"
 "interfacename> is closed, they will be detached and free to use in any "
 "application layer (for example, directly as data transfer objects to and "
-"from presentation). See"
+"from presentation). <xref linkend=\"objectstate\"/> discusses transient, "
+"persistent and detached object states."
 msgstr ""
 "Objetos, de vida curta, single threaded contendo estado persistente e função "
 "de negócios. Esses podem ser JavaBeans/POJOs, onde a única coisa especial "
@@ -273,20 +274,21 @@
 "apresentação)."
 
 #. Tag: term
-#: architecture.xml:139
+#: architecture.xml:140
 #, no-c-format
 msgid "Transient and detached objects and collections"
 msgstr "Objetos e coleções desanexados e transientes"
 
 #. Tag: para
-#: architecture.xml:141
+#: architecture.xml:142
 #, fuzzy, no-c-format
 msgid ""
 "Instances of persistent classes that are not currently associated with a "
 "<interfacename>org.hibernate.Session</interfacename>. They may have been "
 "instantiated by the application and not yet persisted, or they may have been "
 "instantiated by a closed <interfacename>org.hibernate.Session</"
-"interfacename>. See"
+"interfacename>. <xref linkend=\"objectstate\"/> discusses transient, "
+"persistent and detached object states."
 msgstr ""
 "Instâncias de classes persistentes que ainda não estão associadas a uma "
 "<literal>Session</literal>. Eles podem ter sido instanciados pela aplicação "
@@ -294,13 +296,13 @@
 "<literal>Session</literal> encerrada."
 
 #. Tag: term
-#: architecture.xml:151
+#: architecture.xml:152
 #, fuzzy, no-c-format
 msgid "Transaction (<interfacename>org.hibernate.Transaction</interfacename>)"
 msgstr "Transaction (<literal>org.hibernate.Transaction</literal>)"
 
 #. Tag: para
-#: architecture.xml:153
+#: architecture.xml:154
 #, fuzzy, no-c-format
 msgid ""
 "(Optional) A single-threaded, short-lived object used by the application to "
@@ -319,7 +321,7 @@
 "<literal>Transaction</literal> subjacentes, nunca é opcional."
 
 #. Tag: term
-#: architecture.xml:164
+#: architecture.xml:165
 #, fuzzy, no-c-format
 msgid ""
 "ConnectionProvider (<interfacename>org.hibernate.connection."
@@ -329,7 +331,7 @@
 "literal>)"
 
 #. Tag: para
-#: architecture.xml:166
+#: architecture.xml:167
 #, fuzzy, no-c-format
 msgid ""
 "(Optional) A factory for, and pool of, JDBC connections. It abstracts the "
@@ -344,7 +346,7 @@
 "estendido pelo programador. "
 
 #. Tag: term
-#: architecture.xml:175
+#: architecture.xml:176
 #, fuzzy, no-c-format
 msgid ""
 "TransactionFactory (<interfacename>org.hibernate.TransactionFactory</"
@@ -353,7 +355,7 @@
 "Transaction Factory (<literal>org.hibernate.TransactionFactory</literal>)"
 
 #. Tag: para
-#: architecture.xml:177
+#: architecture.xml:178
 #, fuzzy, no-c-format
 msgid ""
 "(Optional) A factory for <interfacename>org.hibernate.Transaction</"
@@ -365,13 +367,13 @@
 "programador."
 
 #. Tag: emphasis
-#: architecture.xml:185
+#: architecture.xml:186
 #, fuzzy, no-c-format
 msgid "Extension Interfaces"
 msgstr "<emphasis>Interfaces de Extensão</emphasis>"
 
 #. Tag: para
-#: architecture.xml:187
+#: architecture.xml:188
 #, no-c-format
 msgid ""
 "Hibernate offers a range of optional extension interfaces you can implement "
@@ -383,93 +385,13 @@
 "API para maiores detalhes. "
 
 #. Tag: title
-#: architecture.xml:199
-#, no-c-format
-msgid "Instance states"
-msgstr "Estados de instância"
-
-#. Tag: para
 #: architecture.xml:200
 #, no-c-format
-msgid ""
-"An instance of a persistent class can be in one of three different states. "
-"These states are defined in relation to a <emphasis>persistence context</"
-"emphasis>. The Hibernate <literal>Session</literal> object is the "
-"persistence context. The three different states are as follows:"
-msgstr ""
-"Uma instância de classes persistentes pode estar em um dos três diferentes "
-"estados, que são definidos respeitando um <emphasis>contexto persistente</"
-"emphasis>. O objeto <literal>Session</literal> do Hibernate é o contexto "
-"persistente. Os três diferentes estados são os seguintes:"
-
-#. Tag: term
-#: architecture.xml:208
-#, no-c-format
-msgid "transient"
-msgstr "transiente"
-
-#. Tag: para
-#: architecture.xml:210
-#, no-c-format
-msgid ""
-"The instance is not associated with any persistence context. It has no "
-"persistent identity or primary key value."
-msgstr ""
-"A instância não é associada a nenhum contexto persistente. Não possui uma "
-"identidade persistente ou valor de chave primária."
-
-#. Tag: term
-#: architecture.xml:218
-#, no-c-format
-msgid "persistent"
-msgstr "persistente"
-
-#. Tag: para
-#: architecture.xml:220
-#, no-c-format
-msgid ""
-"The instance is currently associated with a persistence context. It has a "
-"persistent identity (primary key value) and can have a corresponding row in "
-"the database. For a particular persistence context, Hibernate "
-"<emphasis>guarantees</emphasis> that persistent identity is equivalent to "
-"Java identity in relation to the in-memory location of the object."
-msgstr ""
-"A instância está atualmente associada a um contexto persistente. Possui uma "
-"identidade persistente (valor de chave primária) e, talvez, correspondente a "
-"uma fila no banco de dados. Para um contexto persistente em particular, o "
-"Hibernate <emphasis>garante</emphasis> que a identidade persistente é "
-"equivalente à identidade Java (na localização em memória do objeto)."
-
-#. Tag: term
-#: architecture.xml:232
-#, no-c-format
-msgid "detached"
-msgstr "desanexado"
-
-#. Tag: para
-#: architecture.xml:234
-#, 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 can have a corresponding row in the database. "
-"For detached instances, Hibernate does not guarantee the relationship "
-"between persistent identity and Java identity."
-msgstr ""
-"A instância foi associada com um contexto persistente, porém este contexto "
-"foi fechado, ou a instância foi serializada por outro processo. Possui uma "
-"identidade persistente, e, talvez, corresponda a uma fila no banco de dados. "
-"Para instâncias desanexadas, o Hibernate não garante o relacionamento entre "
-"identidade persistente e identidade Java."
-
-#. Tag: title
-#: architecture.xml:249
-#, no-c-format
 msgid "JMX Integration"
 msgstr "Integração JMX"
 
 #. Tag: para
-#: architecture.xml:251
+#: architecture.xml:202
 #, no-c-format
 msgid ""
 "JMX is the J2EE standard for the management of Java components. Hibernate "
@@ -483,7 +405,7 @@
 "HibernateService</literal>."
 
 #. Tag: para
-#: architecture.xml:257
+#: architecture.xml:208
 #, fuzzy, no-c-format
 msgid ""
 "Another feature available as a JMX service is runtime Hibernate statistics. "
@@ -495,13 +417,13 @@
 ">para maiores informações."
 
 #. Tag: title
-#: architecture.xml:264
+#: architecture.xml:215
 #, no-c-format
 msgid "Contextual sessions"
 msgstr "Sessões Contextuais"
 
 #. Tag: para
-#: architecture.xml:265
+#: architecture.xml:216
 #, no-c-format
 msgid ""
 "Most applications using Hibernate need some form of \"contextual\" session, "
@@ -525,7 +447,7 @@
 "baseadas em proxy."
 
 #. Tag: para
-#: architecture.xml:274
+#: architecture.xml:225
 #, no-c-format
 msgid ""
 "Starting with version 3.0.1, Hibernate added the <literal>SessionFactory."
@@ -550,7 +472,7 @@
 "sessões contextuais baseadas em <literal>JTA</literal>. "
 
 #. Tag: para
-#: architecture.xml:284
+#: architecture.xml:235
 #, no-c-format
 msgid ""
 "However, as of version 3.1, the processing behind <literal>SessionFactory."
@@ -569,7 +491,7 @@
 "definição de sessões correntes."
 
 #. Tag: para
-#: architecture.xml:291
+#: architecture.xml:242
 #, no-c-format
 msgid ""
 "See the Javadocs for the <literal>org.hibernate.context."
@@ -586,7 +508,7 @@
 "Hibernate surge com três implementações dessa interface:"
 
 #. Tag: para
-#: architecture.xml:301
+#: architecture.xml:252
 #, no-c-format
 msgid ""
 "<literal>org.hibernate.context.JTASessionContext</literal>: current sessions "
@@ -600,7 +522,7 @@
 "JTA somente. Consulte em Javadocs para maiores detalhes."
 
 #. Tag: para
-#: architecture.xml:309
+#: architecture.xml:260
 #, no-c-format
 msgid ""
 "<literal>org.hibernate.context.ThreadLocalSessionContext</literal>:current "
@@ -611,7 +533,7 @@
 "consulte em Javadocs para maiores detalhes. "
 
 #. Tag: para
-#: architecture.xml:315
+#: architecture.xml:266
 #, no-c-format
 msgid ""
 "<literal>org.hibernate.context.ManagedSessionContext</literal>: current "
@@ -626,7 +548,7 @@
 "uma <literal>Session</literal>. "
 
 #. Tag: para
-#: architecture.xml:324
+#: architecture.xml:275
 #, fuzzy, no-c-format
 msgid ""
 "The first two implementations provide a \"one session - one database "
@@ -656,7 +578,7 @@
 "\" /> para mais informações e exemplos de código."
 
 #. Tag: para
-#: architecture.xml:336
+#: architecture.xml:287
 #, no-c-format
 msgid ""
 "The <literal>hibernate.current_session_context_class</literal> configuration "
@@ -681,7 +603,64 @@
 "para as três implementações fora da caixa, entretanto, há dois pequenos "
 "nomes correspondentes, \"jta\", \"thread\", e \"managed\"."
 
+#~ msgid "Instance states"
+#~ msgstr "Estados de instância"
+
 #~ msgid ""
+#~ "An instance of a persistent class can be in one of three different "
+#~ "states. These states are defined in relation to a <emphasis>persistence "
+#~ "context</emphasis>. The Hibernate <literal>Session</literal> object is "
+#~ "the persistence context. The three different states are as follows:"
+#~ msgstr ""
+#~ "Uma instância de classes persistentes pode estar em um dos três "
+#~ "diferentes estados, que são definidos respeitando um <emphasis>contexto "
+#~ "persistente</emphasis>. O objeto <literal>Session</literal> do Hibernate "
+#~ "é o contexto persistente. Os três diferentes estados são os seguintes:"
+
+#~ msgid "transient"
+#~ msgstr "transiente"
+
+#~ msgid ""
+#~ "The instance is not associated with any persistence context. It has no "
+#~ "persistent identity or primary key value."
+#~ msgstr ""
+#~ "A instância não é associada a nenhum contexto persistente. Não possui uma "
+#~ "identidade persistente ou valor de chave primária."
+
+#~ msgid "persistent"
+#~ msgstr "persistente"
+
+#~ msgid ""
+#~ "The instance is currently associated with a persistence context. It has a "
+#~ "persistent identity (primary key value) and can have a corresponding row "
+#~ "in the database. For a particular persistence context, Hibernate "
+#~ "<emphasis>guarantees</emphasis> that persistent identity is equivalent to "
+#~ "Java identity in relation to the in-memory location of the object."
+#~ msgstr ""
+#~ "A instância está atualmente associada a um contexto persistente. Possui "
+#~ "uma identidade persistente (valor de chave primária) e, talvez, "
+#~ "correspondente a uma fila no banco de dados. Para um contexto persistente "
+#~ "em particular, o Hibernate <emphasis>garante</emphasis> que a identidade "
+#~ "persistente é equivalente à identidade Java (na localização em memória do "
+#~ "objeto)."
+
+#~ msgid "detached"
+#~ msgstr "desanexado"
+
+#~ msgid ""
+#~ "The instance was once associated with a persistence context, but that "
+#~ "context was closed, or the instance was serialized to another process. It "
+#~ "has a persistent identity and can have a corresponding row in the "
+#~ "database. For detached instances, Hibernate does not guarantee the "
+#~ "relationship between persistent identity and Java identity."
+#~ msgstr ""
+#~ "A instância foi associada com um contexto persistente, porém este "
+#~ "contexto foi fechado, ou a instância foi serializada por outro processo. "
+#~ "Possui uma identidade persistente, e, talvez, corresponda a uma fila no "
+#~ "banco de dados. Para instâncias desanexadas, o Hibernate não garante o "
+#~ "relacionamento entre identidade persistente e identidade Java."
+
+#~ msgid ""
 #~ "We do not have the scope in this document to provide a more detailed view "
 #~ "of all the runtime architectures available; Hibernate is flexible and "
 #~ "supports several different approaches. We will, however, show the two "

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	2010-07-21 05:38:09 UTC (rev 19987)
+++ core/trunk/documentation/manual/src/main/docbook/zh-CN/content/architecture.po	2010-07-21 05:39:40 UTC (rev 19988)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: Collection_Mapping\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-07-21 05:26+0000\n"
+"POT-Creation-Date: 2010-07-21 05:38+0000\n"
 "PO-Revision-Date: 2010-03-15 08:47+1000\n"
 "Last-Translator: Xi HUANG <xhuang at redhat.com>\n"
 "Language-Team:  <en at li.org>\n"
@@ -153,7 +153,8 @@
 "interfacename>. Once the <interfacename>org.hibernate.Session</"
 "interfacename> is closed, they will be detached and free to use in any "
 "application layer (for example, directly as data transfer objects to and "
-"from presentation). See"
+"from presentation). <xref linkend=\"objectstate\"/> discusses transient, "
+"persistent and detached object states."
 msgstr ""
 "带有持久化状态的、具有业务功能的单线程对象,此对象生存期很短。这些对象可能是"
 "普通的JavaBeans/POJO,唯一特殊的是他们正与(仅仅一个)<literal>Session</"
@@ -162,33 +163,34 @@
 "据传输对象)。"
 
 #. Tag: term
-#: architecture.xml:139
+#: architecture.xml:140
 #, no-c-format
 msgid "Transient and detached objects and collections"
 msgstr "瞬态(transient)和脱管(detached)的对象及其集合"
 
 #. Tag: para
-#: architecture.xml:141
+#: architecture.xml:142
 #, fuzzy, no-c-format
 msgid ""
 "Instances of persistent classes that are not currently associated with a "
 "<interfacename>org.hibernate.Session</interfacename>. They may have been "
 "instantiated by the application and not yet persisted, or they may have been "
 "instantiated by a closed <interfacename>org.hibernate.Session</"
-"interfacename>. See"
+"interfacename>. <xref linkend=\"objectstate\"/> discusses transient, "
+"persistent and detached object states."
 msgstr ""
 "那些目前没有与 <literal>Session</literal>关联的持久化类实例。他们可能是在被应"
 "用程序实例化后,尚未进行持久化的对象。也可能是因为实例化他们的 "
 "<literal>Session</literal> 已经被关闭而脱离持久化的对象。"
 
 #. Tag: term
-#: architecture.xml:151
+#: architecture.xml:152
 #, fuzzy, no-c-format
 msgid "Transaction (<interfacename>org.hibernate.Transaction</interfacename>)"
 msgstr "事务 Transaction (<literal>org.hibernate.Transaction</literal>)"
 
 #. Tag: para
-#: architecture.xml:153
+#: architecture.xml:154
 #, fuzzy, no-c-format
 msgid ""
 "(Optional) A single-threaded, short-lived object used by the application to "
@@ -206,7 +208,7 @@
 "<literal>Transaction</literal> 对象,事务边界的开启与关闭是必需的。 "
 
 #. Tag: term
-#: architecture.xml:164
+#: architecture.xml:165
 #, fuzzy, no-c-format
 msgid ""
 "ConnectionProvider (<interfacename>org.hibernate.connection."
@@ -216,7 +218,7 @@
 "literal>)"
 
 #. Tag: para
-#: architecture.xml:166
+#: architecture.xml:167
 #, fuzzy, no-c-format
 msgid ""
 "(Optional) A factory for, and pool of, JDBC connections. It abstracts the "
@@ -230,7 +232,7 @@
 "开。仅供开发者扩展/实现用,并不开放给应用程序使用。"
 
 #. Tag: term
-#: architecture.xml:175
+#: architecture.xml:176
 #, fuzzy, no-c-format
 msgid ""
 "TransactionFactory (<interfacename>org.hibernate.TransactionFactory</"
@@ -239,7 +241,7 @@
 "TransactionFactory (<literal>org.hibernate.TransactionFactory</literal>)"
 
 #. Tag: para
-#: architecture.xml:177
+#: architecture.xml:178
 #, fuzzy, no-c-format
 msgid ""
 "(Optional) A factory for <interfacename>org.hibernate.Transaction</"
@@ -250,13 +252,13 @@
 "实现用,并不开发能够给应用程序使用。"
 
 #. Tag: emphasis
-#: architecture.xml:185
+#: architecture.xml:186
 #, fuzzy, no-c-format
 msgid "Extension Interfaces"
 msgstr "<emphasis>扩展接口</emphasis> "
 
 #. Tag: para
-#: architecture.xml:187
+#: architecture.xml:188
 #, no-c-format
 msgid ""
 "Hibernate offers a range of optional extension interfaces you can implement "
@@ -267,89 +269,13 @@
 "为。具体请参考 API 文档。"
 
 #. Tag: title
-#: architecture.xml:199
-#, no-c-format
-msgid "Instance states"
-msgstr "实例状态"
-
-#. Tag: para
 #: architecture.xml:200
 #, no-c-format
-msgid ""
-"An instance of a persistent class can be in one of three different states. "
-"These states are defined in relation to a <emphasis>persistence context</"
-"emphasis>. The Hibernate <literal>Session</literal> object is the "
-"persistence context. The three different states are as follows:"
-msgstr ""
-"一个持久化类的实例可能处于三种不同状态中的某一种。这三种状态的定义则与所谓的"
-"<emphasis>持久化上下文(persistence context)</emphasis>有关。Hibernate 的 "
-"<literal>Session</literal> 对象就是这个所谓的持久化上下文。这三种不同的状态如"
-"下:"
-
-#. Tag: term
-#: architecture.xml:208
-#, no-c-format
-msgid "transient"
-msgstr "瞬态(transient)"
-
-#. Tag: para
-#: architecture.xml:210
-#, no-c-format
-msgid ""
-"The instance is not associated with any persistence context. It has no "
-"persistent identity or primary key value."
-msgstr ""
-"该实例从未与任何持久化上下文关联过。它没有持久化标识(相当于主键值)。 "
-
-#. Tag: term
-#: architecture.xml:218
-#, no-c-format
-msgid "persistent"
-msgstr "持久化(persistent)"
-
-#. Tag: para
-#: architecture.xml:220
-#, no-c-format
-msgid ""
-"The instance is currently associated with a persistence context. It has a "
-"persistent identity (primary key value) and can have a corresponding row in "
-"the database. For a particular persistence context, Hibernate "
-"<emphasis>guarantees</emphasis> that persistent identity is equivalent to "
-"Java identity in relation to the in-memory location of the object."
-msgstr ""
-"实例目前与某个持久化上下文有关联。它拥有持久化标识(相当于主键值),并且可能"
-"在数据库中有一个对应的行。对于某一个特定的持久化上下文,Hibernate <emphasis>"
-"保证</emphasis> 持久化标识与 Java 标识(其值代表对象在内存中的位置)等价。 "
-
-#. Tag: term
-#: architecture.xml:232
-#, no-c-format
-msgid "detached"
-msgstr "脱管(detached)"
-
-#. Tag: para
-#: architecture.xml:234
-#, 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 can have a corresponding row in the database. "
-"For detached instances, Hibernate does not guarantee the relationship "
-"between persistent identity and Java identity."
-msgstr ""
-"实例曾经与某个持久化上下文发生过关联,不过那个上下文被关闭了,或者这个实例是"
-"被序列化(serialize)到另外的进程。它拥有持久化标识,并且在数据库中可能存在一"
-"个对应的行。对于脱管状态的实例,Hibernate 不保证任何持久化标识和 Java 标识的"
-"关系。 "
-
-#. Tag: title
-#: architecture.xml:249
-#, no-c-format
 msgid "JMX Integration"
 msgstr "JMX 整合"
 
 #. Tag: para
-#: architecture.xml:251
+#: architecture.xml:202
 #, no-c-format
 msgid ""
 "JMX is the J2EE standard for the management of Java components. Hibernate "
@@ -362,7 +288,7 @@
 "jmx.HibernateService</literal>。 "
 
 #. Tag: para
-#: architecture.xml:257
+#: architecture.xml:208
 #, fuzzy, no-c-format
 msgid ""
 "Another feature available as a JMX service is runtime Hibernate statistics. "
@@ -373,13 +299,13 @@
 "息。参看 <xref linkend=\"configuration-optional-statistics\"/>。 "
 
 #. Tag: title
-#: architecture.xml:264
+#: architecture.xml:215
 #, no-c-format
 msgid "Contextual sessions"
 msgstr "上下文相关的会话(Contextual Session)"
 
 #. Tag: para
-#: architecture.xml:265
+#: architecture.xml:216
 #, no-c-format
 msgid ""
 "Most applications using Hibernate need some form of \"contextual\" session, "
@@ -402,7 +328,7 @@
 "上下文相关的会话。"
 
 #. Tag: para
-#: architecture.xml:274
+#: architecture.xml:225
 #, no-c-format
 msgid ""
 "Starting with version 3.0.1, Hibernate added the <literal>SessionFactory."
@@ -424,7 +350,7 @@
 "用 <literal>JTA</literal> 的上下文相关的会话可以满足你一切需要。"
 
 #. Tag: para
-#: architecture.xml:284
+#: architecture.xml:235
 #, no-c-format
 msgid ""
 "However, as of version 3.1, the processing behind <literal>SessionFactory."
@@ -441,7 +367,7 @@
 "(scope)和上下文(context)的定义进行拔插。"
 
 #. Tag: para
-#: architecture.xml:291
+#: architecture.xml:242
 #, no-c-format
 msgid ""
 "See the Javadocs for the <literal>org.hibernate.context."
@@ -457,7 +383,7 @@
 "的会话。Hibernate 内置了此接口的三种实现:"
 
 #. Tag: para
-#: architecture.xml:301
+#: architecture.xml:252
 #, no-c-format
 msgid ""
 "<literal>org.hibernate.context.JTASessionContext</literal>: current sessions "
@@ -470,7 +396,7 @@
 "的。详情请参阅 Javadoc。"
 
 #. Tag: para
-#: architecture.xml:309
+#: architecture.xml:260
 #, no-c-format
 msgid ""
 "<literal>org.hibernate.context.ThreadLocalSessionContext</literal>:current "
@@ -480,7 +406,7 @@
 "通过当前执行的线程来跟踪和界定。详情也请参阅 Javadoc。"
 
 #. Tag: para
-#: architecture.xml:315
+#: architecture.xml:266
 #, no-c-format
 msgid ""
 "<literal>org.hibernate.context.ManagedSessionContext</literal>: current "
@@ -494,7 +420,7 @@
 "flush 或者关闭(close)任何 <literal>Session</literal>。"
 
 #. Tag: para
-#: architecture.xml:324
+#: architecture.xml:275
 #, fuzzy, no-c-format
 msgid ""
 "The first two implementations provide a \"one session - one database "
@@ -520,7 +446,7 @@
 "阅读更多的内容和示例代码。 "
 
 #. Tag: para
-#: architecture.xml:336
+#: architecture.xml:287
 #, no-c-format
 msgid ""
 "The <literal>hibernate.current_session_context_class</literal> configuration "
@@ -542,7 +468,60 @@
 "的值指明了要使用的实现类的全名,但那三种内置的实现可以使用简写,即 \"jta\"、"
 "\"thread\" 和 \"managed\"。 "
 
+#~ msgid "Instance states"
+#~ msgstr "实例状态"
+
 #~ msgid ""
+#~ "An instance of a persistent class can be in one of three different "
+#~ "states. These states are defined in relation to a <emphasis>persistence "
+#~ "context</emphasis>. The Hibernate <literal>Session</literal> object is "
+#~ "the persistence context. The three different states are as follows:"
+#~ msgstr ""
+#~ "一个持久化类的实例可能处于三种不同状态中的某一种。这三种状态的定义则与所谓"
+#~ "的<emphasis>持久化上下文(persistence context)</emphasis>有关。Hibernate "
+#~ "的 <literal>Session</literal> 对象就是这个所谓的持久化上下文。这三种不同的"
+#~ "状态如下:"
+
+#~ msgid "transient"
+#~ msgstr "瞬态(transient)"
+
+#~ msgid ""
+#~ "The instance is not associated with any persistence context. It has no "
+#~ "persistent identity or primary key value."
+#~ msgstr ""
+#~ "该实例从未与任何持久化上下文关联过。它没有持久化标识(相当于主键值)。 "
+
+#~ msgid "persistent"
+#~ msgstr "持久化(persistent)"
+
+#~ msgid ""
+#~ "The instance is currently associated with a persistence context. It has a "
+#~ "persistent identity (primary key value) and can have a corresponding row "
+#~ "in the database. For a particular persistence context, Hibernate "
+#~ "<emphasis>guarantees</emphasis> that persistent identity is equivalent to "
+#~ "Java identity in relation to the in-memory location of the object."
+#~ msgstr ""
+#~ "实例目前与某个持久化上下文有关联。它拥有持久化标识(相当于主键值),并且可"
+#~ "能在数据库中有一个对应的行。对于某一个特定的持久化上下文,Hibernate "
+#~ "<emphasis>保证</emphasis> 持久化标识与 Java 标识(其值代表对象在内存中的位"
+#~ "置)等价。 "
+
+#~ msgid "detached"
+#~ msgstr "脱管(detached)"
+
+#~ msgid ""
+#~ "The instance was once associated with a persistence context, but that "
+#~ "context was closed, or the instance was serialized to another process. It "
+#~ "has a persistent identity and can have a corresponding row in the "
+#~ "database. For detached instances, Hibernate does not guarantee the "
+#~ "relationship between persistent identity and Java identity."
+#~ msgstr ""
+#~ "实例曾经与某个持久化上下文发生过关联,不过那个上下文被关闭了,或者这个实例"
+#~ "是被序列化(serialize)到另外的进程。它拥有持久化标识,并且在数据库中可能"
+#~ "存在一个对应的行。对于脱管状态的实例,Hibernate 不保证任何持久化标识和 "
+#~ "Java 标识的关系。 "
+
+#~ msgid ""
 #~ "We do not have the scope in this document to provide a more detailed view "
 #~ "of all the runtime architectures available; Hibernate is flexible and "
 #~ "supports several different approaches. We will, however, show the two "



More information about the hibernate-commits mailing list