From d7443d751785d32ff93ad975ce54673fbea90f9b Mon Sep 17 00:00:00 2001
From: Steve Ebersole <steve@hibernate.org>
Date: Wed, 21 Jul 2010 05:27:58 +0000
Subject: [PATCH] HHH-5397 - Odds and ends from documentation merge :
 architecture.xml + POT and PO

git-svn-id: https://svn.jboss.org/repos/hibernate/core/trunk@19983 1b8cb986-b30d-0410-93ca-fae66ebed9b2
---
 .../docbook/de-DE/content/architecture.po     | 410 +++++++-----
 .../docbook/en-US/content/architecture.xml    | 321 +++++-----
 .../docbook/es-ES/content/architecture.po     | 415 +++++++-----
 .../docbook/fr-FR/content/architecture.po     | 405 +++++++-----
 .../docbook/ja-JP/content/architecture.po     | 398 +++++++-----
 .../main/docbook/pot/content/architecture.pot | 168 ++---
 .../docbook/pt-BR/content/architecture.po     | 422 ++++++++-----
 .../docbook/zh-CN/content/architecture.po     | 596 ++++++++++++++----
 8 files changed, 1921 insertions(+), 1214 deletions(-)

diff --git a/documentation/manual/src/main/docbook/de-DE/content/architecture.po b/documentation/manual/src/main/docbook/de-DE/content/architecture.po
index 49d6c0828c..8d71b038fc 100644
--- a/documentation/manual/src/main/docbook/de-DE/content/architecture.po
+++ b/documentation/manual/src/main/docbook/de-DE/content/architecture.po
@@ -275,7 +275,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Collection_Mapping\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-03-12T00:03:45\n"
+"POT-Creation-Date: 2010-07-21 05:26+0000\n"
 "PO-Revision-Date: 2007-02-26 10:27+1000\n"
 "Last-Translator: \n"
 "Language-Team:  <de@li.org>\n"
@@ -285,28 +285,48 @@ msgstr ""
 "X-Generator: KBabel 1.9.1\n"
 
 #. Tag: title
+#: architecture.xml:34
 #, no-c-format
 msgid "Architecture"
 msgstr "Architektur"
 
 #. Tag: title
+#: architecture.xml:37
 #, no-c-format
 msgid "Overview"
 msgstr "Übersicht"
 
 #. Tag: para
+#: architecture.xml:39
 #, fuzzy, no-c-format
 msgid ""
 "The diagram below provides a high-level view of the Hibernate architecture:"
 msgstr "Eine (sehr) hohe Ansicht der Hibernate-Architektur:"
 
 #. Tag: para
+#: architecture.xml:52
+#, no-c-format
+msgid ""
+"Unfortunately we cannot provide a detailed view of all possible runtime "
+"architectures. Hibernate is sufficiently flexible to be used in a number of "
+"ways in many, many architectures. We will, however, illustrate 2 "
+"specifically since they are extremes."
+msgstr ""
+
+#. Tag: title
+#: architecture.xml:59
+#, fuzzy, no-c-format
+msgid "Minimal architecture"
+msgstr "Architektur"
+
+#. Tag: para
+#: architecture.xml:61
 #, fuzzy, no-c-format
 msgid ""
-"We do not have the scope in this document to provide a more detailed view of "
-"all the runtime architectures available; Hibernate is flexible and supports "
-"several different approaches. We will, however, show the two extremes: "
-"\"minimal\" architecture and \"comprehensive\" architecture."
+"The \"minimal\" architecture has the application manage its own JDBC "
+"connections and provide those connections to Hibernate; additionally the "
+"application manages transactions for itself. This approach uses a minimal "
+"subset of Hibernate APIs."
 msgstr ""
 "Wir würden gerne eine detaillierte Ansicht der Runtime-Architektur zeigen, "
 "jedoch ist Hibernate leider flexibel und unterstützt mehrere "
@@ -315,32 +335,14 @@ msgstr ""
 "Verbindungen und verwaltet ihre eigenen Transaktionen. Diese Vorgehensweise "
 "verwendet einen minimalen Teilsatz der APIs von Hibernate:"
 
-#. Tag: para
-#, fuzzy, no-c-format
-msgid ""
-"This next diagram illustrates how Hibernate utilizes database and "
-"configuration data to provide persistence services, and persistent objects, "
-"to the application."
+#. Tag: title
+#: architecture.xml:77
+#, no-c-format
+msgid "Comprehensive architecture"
 msgstr ""
-"Dieses Diagram zeigt, wie Hibernate die Datenbank und die "
-"Konfigurationsdaten verwendet, um Persistenzdienste (und persistente "
-"Objekte) für die Anwendung zu liefern."
-
-#. Tag: para
-#, fuzzy, no-c-format
-msgid ""
-"The \"minimal\" architecture has the application provide its own JDBC "
-"connections and manage its own transactions. This approach uses a minimal "
-"subset of Hibernate's APIs:"
-msgstr ""
-"Wir würden gerne eine detaillierte Ansicht der Runtime-Architektur zeigen, "
-"jedoch ist Hibernate leider flexibel und unterstützt mehrere "
-"Vorgehensweisen. Daher erläutern wir hier die beiden Extreme. Bei der "
-"\"abgespeckten\" Architektur liefert die Anwendung ihre eigenen JDBC-"
-"Verbindungen und verwaltet ihre eigenen Transaktionen. Diese Vorgehensweise "
-"verwendet einen minimalen Teilsatz der APIs von Hibernate:"
 
 #. Tag: para
+#: architecture.xml:79
 #, fuzzy, no-c-format
 msgid ""
 "The \"comprehensive\" architecture abstracts the application away from the "
@@ -349,26 +351,37 @@ msgstr ""
 "Die \"vollständige\" Architektur zieht die Anwendung von den zu Grunde "
 "liegenden JDBC/JTA APIs ab, so dass Hibernate sich um Details kümmern kann."
 
-#. Tag: para
-#, fuzzy, no-c-format
-msgid "Here are some definitions of the objects depicted in the diagrams:"
+#. Tag: title
+#: architecture.xml:94
+#, no-c-format
+msgid "Basic APIs"
+msgstr ""
+
+#. Tag: para
+#: architecture.xml:95
+#, no-c-format
+msgid ""
+"Here are quick discussions about some of the API objects depicted in the "
+"preceding diagrams (you will see them again in more detail in later "
+"chapters)."
 msgstr ""
-"Nachfolgend sehen Sie einige Definitionen von Objekten innerhalb der "
-"Diagramme:"
 
 #. Tag: term
-#, no-c-format
-msgid "SessionFactory (<literal>org.hibernate.SessionFactory</literal>)"
+#: architecture.xml:100
+#, fuzzy, no-c-format
+msgid ""
+"SessionFactory (<interfacename>org.hibernate.SessionFactory</interfacename>)"
 msgstr "SessionFactory (<literal>org.hibernate.SessionFactory</literal>)"
 
 #. Tag: para
+#: architecture.xml:102
 #, fuzzy, no-c-format
 msgid ""
-"A threadsafe, immutable cache of compiled mappings for a single database. A "
-"factory for <literal>Session</literal> and a client of "
-"<literal>ConnectionProvider</literal>, <literal>SessionFactory</literal> can "
-"hold an optional (second-level) cache of data that is reusable between "
-"transactions at a process, or cluster, level."
+"A thread-safe, immutable cache of compiled mappings for a single database. A "
+"factory for <interfacename>org.hibernate.Session</interfacename> instances. "
+"A client of <interfacename>org.hibernate.connection.ConnectionProvider</"
+"interfacename>. Optionally maintains a <literal>second level cache</literal> "
+"of data that is reusable between transactions at a process or cluster level."
 msgstr ""
 "Ein thread-sicheres (unveränderliches) Cache kompilierter Mappings für eine "
 "einzelne Datenbank. Eine Factory für <literal>Session</literal> und ein "
@@ -377,18 +390,22 @@ msgstr ""
 "wiederverwendet werden kann, sei es auf Prozess- oder auch auf Cluster-Ebene."
 
 #. Tag: term
-#, no-c-format
-msgid "Session (<literal>org.hibernate.Session</literal>)"
+#: architecture.xml:112
+#, fuzzy, no-c-format
+msgid "Session (<interfacename>org.hibernate.Session</interfacename>)"
 msgstr "Session (<literal>org.hibernate.Session</literal>)"
 
 #. Tag: para
+#: architecture.xml:114
 #, fuzzy, no-c-format
 msgid ""
 "A single-threaded, short-lived object representing a conversation between "
-"the application and the persistent store. It wraps a JDBC connection and is "
-"a factory for <literal>Transaction</literal>. <literal>Session</literal> "
-"holds a mandatory first-level cache of persistent objects that are used when "
-"navigating the object graph or looking up objects by identifier."
+"the application and the persistent store. Wraps a JDBC <interfacename>java."
+"sql.Connection</interfacename>. Factory for <interfacename>org.hibernate."
+"Transaction</interfacename>. Maintains a <literal>first level cache</"
+"literal> of persistent the application's persistent objects and collections; "
+"this cache is used when navigating the object graph or looking up objects by "
+"identifier."
 msgstr ""
 "Ein aus einem Thread bestehendes, kurzlebiges Objekt, dass einen Dialog "
 "zwischen der Anwendung und dem persistenten Speicher repräsentiert. Wrappt "
@@ -398,19 +415,22 @@ msgstr ""
 "durch den Bezeichner verwendet werden."
 
 #. Tag: term
+#: architecture.xml:126
 #, no-c-format
 msgid "Persistent objects and collections"
 msgstr "Persistente Objekte und Collections"
 
 #. Tag: para
+#: architecture.xml:128
 #, fuzzy, 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 <literal>Session</literal>. Once the "
-"<literal>Session</literal> is closed, they will be detached and free to use "
-"in any application layer (for example, directly as data transfer objects to "
-"and from presentation)."
+"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"
 msgstr ""
 "Kurzlebige, aus einem Thread bestehende Objekte, die persistenten Status und "
 "Unternehmensfunktionen beinhalten. Dabei kann es sich um gewöhnliche "
@@ -421,17 +441,20 @@ msgstr ""
 "Datentransferobjekte einer Präsentation) verwendet werden."
 
 #. Tag: term
+#: architecture.xml:139
 #, no-c-format
 msgid "Transient and detached objects and collections"
 msgstr "Temporäre und abgesetzte Objekte und Collections"
 
 #. Tag: para
+#: architecture.xml:141
 #, fuzzy, no-c-format
 msgid ""
 "Instances of persistent classes that are not currently associated with a "
-"<literal>Session</literal>. They may have been instantiated by the "
-"application and not yet persisted, or they may have been instantiated by a "
-"closed <literal>Session</literal>."
+"<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"
 msgstr ""
 "Instanzen persistenter Klassen, die zum aktuellen Zeitpunkt mit keiner "
 "<literal>Session</literal> verbunden sind. Sie können von der Anwendung "
@@ -439,19 +462,22 @@ msgstr ""
 "geschlossenen <literal>Session</literal> instanziiert worden sein."
 
 #. Tag: term
-#, no-c-format
-msgid "Transaction (<literal>org.hibernate.Transaction</literal>)"
+#: architecture.xml:151
+#, fuzzy, no-c-format
+msgid "Transaction (<interfacename>org.hibernate.Transaction</interfacename>)"
 msgstr "Transaktion (<literal>org.hibernate.Transaction</literal>)"
 
 #. Tag: para
+#: architecture.xml:153
 #, fuzzy, 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 <literal>Session</literal> "
-"might span several <literal>Transaction</literal>s in some cases. However, "
-"transaction demarcation, either using the underlying API or "
-"<literal>Transaction</literal>, is never optional."
+"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 ""
 "(Optional) Ein aus einem Thread bestehendes, kurzlebiges Objekt, das von der "
 "Anwendung zur Bestimmung elementarer Arbeitseinheiten verwendet wird. "
@@ -462,21 +488,24 @@ msgstr ""
 "ist jedoch nie optional!"
 
 #. Tag: term
-#, no-c-format
+#: architecture.xml:164
+#, fuzzy, no-c-format
 msgid ""
-"ConnectionProvider (<literal>org.hibernate.connection.ConnectionProvider</"
-"literal>)"
+"ConnectionProvider (<interfacename>org.hibernate.connection."
+"ConnectionProvider</interfacename>)"
 msgstr ""
 "ConnectionProvider (<literal>org.hibernate.connection.ConnectionProvider</"
 "literal>)"
 
 #. Tag: para
+#: architecture.xml:166
 #, fuzzy, no-c-format
 msgid ""
 "(Optional) A factory for, and pool of, JDBC connections. It abstracts the "
-"application from underlying <literal>Datasource</literal> or "
-"<literal>DriverManager</literal>. It is not exposed to application, but it "
-"can be extended and/or implemented by the developer."
+"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 ""
 "(Optional) Eine Factory für (und ein Pool von) JDBC-Verbindungen. "
 "Abstrahiert die Anwendung von der zu Grunde liegenden <literal>Datasource</"
@@ -484,29 +513,34 @@ msgstr ""
 "ausgesetzt, kann jedoch vom Entwickler erweitert/implementiert werden."
 
 #. Tag: term
-#, no-c-format
+#: architecture.xml:175
+#, fuzzy, no-c-format
 msgid ""
-"TransactionFactory (<literal>org.hibernate.TransactionFactory</literal>)"
+"TransactionFactory (<interfacename>org.hibernate.TransactionFactory</"
+"interfacename>)"
 msgstr ""
 "TransactionFactory (<literal>org.hibernate.TransactionFactory</literal>)"
 
 #. Tag: para
+#: architecture.xml:177
 #, fuzzy, no-c-format
 msgid ""
-"(Optional) A factory for <literal>Transaction</literal> instances. It is not "
-"exposed to the application, but it can be extended and/or implemented by the "
-"developer."
+"(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 ""
 "(Optional) Eine Factory für <literal>Transaction</literal>-Instanzen. Nicht "
 "der Anwendung ausgesetzt, kann jedoch durch den Entwickler erweitert/"
 "implementiert werden."
 
-#. Tag: term
+#. Tag: emphasis
+#: architecture.xml:185
 #, fuzzy, no-c-format
-msgid "<emphasis>Extension Interfaces</emphasis>"
+msgid "Extension Interfaces"
 msgstr "Erweiterungsschnittstellen"
 
 #. Tag: para
+#: architecture.xml:187
 #, fuzzy, no-c-format
 msgid ""
 "Hibernate offers a range of optional extension interfaces you can implement "
@@ -518,25 +552,14 @@ msgstr ""
 "individuellen Wünschen anpassen können. Weitere Informationen finden Sie in "
 "der API-Dokumentation."
 
-#. Tag: para
-#, fuzzy, no-c-format
-msgid ""
-"Given a \"minimal\" architecture, the application bypasses the "
-"<literal>Transaction</literal>/<literal>TransactionFactory</literal> and/or "
-"<literal>ConnectionProvider</literal> APIs to communicate with JTA or JDBC "
-"directly."
-msgstr ""
-"Bei einer \"abgespeckten\" Architektur umgeht die Anwendung "
-"<literal>Transaction</literal>/<literal>TransactionFactory</literal> und/"
-"oder <literal>ConnectionProvider</literal> APIs kommunizieren direkt mit JTA "
-"oder JDBC."
-
 #. 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. "
@@ -550,11 +573,13 @@ msgstr ""
 "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 "
@@ -565,11 +590,13 @@ msgstr ""
 "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 "
@@ -586,11 +613,13 @@ msgstr ""
 "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 "
@@ -607,11 +636,13 @@ msgstr ""
 "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
 #, fuzzy, no-c-format
 msgid ""
 "JMX is the J2EE standard for the management of Java components. Hibernate "
@@ -625,100 +656,24 @@ msgstr ""
 "bereitgestellt."
 
 #. Tag: para
-#, fuzzy, no-c-format
-msgid ""
-"For an example of how to deploy Hibernate as a JMX service on the JBoss "
-"Application Server, please see the JBoss User Guide. JBoss AS also provides "
-"these benefits if you deploy using JMX:"
-msgstr ""
-"Ein Beispiel wie Hibernate als ein JMX-Dienst auf dem JBoss "
-"Applikationsserver ausgeführt wird, finden Sie im JBoss Benutzerhandbuch. "
-"Auf dem JBoss AS genießen Sie die gleichen Vorteile, wenn Sie JMX verwenden:"
-
-#. Tag: para
-#, fuzzy, no-c-format
-msgid ""
-"<emphasis>Session Management</emphasis>: the Hibernate <literal>Session</"
-"literal>'s life cycle can be automatically bound to the scope of a JTA "
-"transaction. This means that you no longer have to manually open and close "
-"the <literal>Session</literal>; this becomes the job of a JBoss EJB "
-"interceptor. You also do not have to worry about transaction demarcation in "
-"your code (if you would like to write a portable persistence layer use the "
-"optional Hibernate <literal>Transaction</literal> API for this). You call "
-"the <literal>HibernateContext</literal> to access a <literal>Session</"
-"literal>."
-msgstr ""
-"<emphasis>Session Management:</emphasis> Der Lebenszyklus der Hibernate "
-"<literal>Session</literal> kann automatisch an den Gültigkeitsbereich einer "
-"JTA-Transaktion gebunden werden. Das bedeutet, dass Sie die "
-"<literal>Session</literal> nicht mehr manuell öffnen und schließen müssen, "
-"da diese Aufgabe von einem JBoss EJB-Interzeptor übernommen wird. Sie müssen "
-"sich auch nicht um die Transaktionsabgrenzung in Ihrem Code kümmern (außer "
-"natürlich Sie möchten eine übertragbare Persistenzschicht schreiben, in "
-"welchem Fall Sie die optionale Hibernate <literal>Transaction</literal>-API "
-"verwenden). Sie rufen den <literal>HibernateContext</literal> auf, um auf "
-"eine <literal>Session</literal> zuzugreifen."
-
-#. Tag: para
-#, fuzzy, no-c-format
-msgid ""
-"<emphasis>HAR deployment</emphasis>: the Hibernate JMX service is deployed "
-"using a JBoss service deployment descriptor in an EAR and/or SAR file, as it "
-"supports all the usual configuration options of a Hibernate "
-"<literal>SessionFactory</literal>. However, you still need to name all your "
-"mapping files in the deployment descriptor. If you use the optional HAR "
-"deployment, JBoss will automatically detect all mapping files in your HAR "
-"file."
-msgstr ""
-"<emphasis>HAR-Deployment:</emphasis> In der Regel führen Sie den Hibernate "
-"JMX-Dienst unter Verwendung eines JBoss Service Deployment-Deskriptors (in "
-"einer EAR- und/oder SAR-Datei) aus. Dabei werden die üblichen "
-"Konfigurationsoptionen einer Hibernate <literal>SessionFactory</literal> "
-"unterstützt. Sie müssen jedoch noch alle Ihre Mapping-Dateien im Deployment-"
-"Deskriptor benennen. Falls Sie sich für die Benutzung des optionalen HAR-"
-"Deployments entscheiden, wird JBoss automatisch sämtliche Mapping-Dateien in "
-"Ihrer HAR-Datei auffinden."
-
-#. Tag: para
-#, no-c-format
-msgid ""
-"Consult the JBoss AS user guide for more information about these options."
-msgstr ""
-"Weitere Informationen zu diesen Optionen finden Sie im JBoss AS "
-"Benutzerhandbuch."
-
-#. Tag: para
+#: architecture.xml:257
 #, fuzzy, no-c-format
 msgid ""
 "Another feature available as a JMX service is runtime Hibernate statistics. "
-"See <xref linkend=\"configuration-optional-statistics\" /> for more "
+"See <xref linkend=\"configuration-optional-statistics\"/> for more "
 "information."
 msgstr ""
 "Ein weiteres, als JMX-Dienst verfügbares Feature sind Runtime Hibernate "
 "Statistiken, siehe <xref linkend=\"configuration-optional-statistics\"/>."
 
 #. Tag: title
-#, no-c-format
-msgid "JCA Support"
-msgstr "JCA-Support"
-
-#. Tag: para
-#, fuzzy, no-c-format
-msgid ""
-"Hibernate can also be configured as a JCA connector. Please see the website "
-"for more information. Please note, however, that at this stage Hibernate JCA "
-"support is under development."
-msgstr ""
-"Hibernate kann auch als ein JCA-Konnektor konfiguriert werden. Weitere "
-"Informationen dazu finden Sie auf der Website. Bitte beachten Sie, dass der "
-"Hibernate JCA-Support noch als experimentell gilt."
-
-#. Tag: title
+#: architecture.xml:264
 #, fuzzy, no-c-format
 msgid "Contextual sessions"
 msgstr "Kontextbezogene Sessions"
 
 #. Tag: para
+#: architecture.xml:265
 #, fuzzy, no-c-format
 msgid ""
 "Most applications using Hibernate need some form of \"contextual\" session, "
@@ -744,6 +699,7 @@ msgstr ""
 "basierte kontextbezogene Sessions bereitstellen."
 
 #. Tag: para
+#: architecture.xml:274
 #, fuzzy, no-c-format
 msgid ""
 "Starting with version 3.0.1, Hibernate added the <literal>SessionFactory."
@@ -770,6 +726,7 @@ msgstr ""
 "benötigen dürften."
 
 #. Tag: para
+#: architecture.xml:284
 #, fuzzy, no-c-format
 msgid ""
 "However, as of version 3.1, the processing behind <literal>SessionFactory."
@@ -788,6 +745,7 @@ msgstr ""
 "Gültigkeitsbereich und Kontext zu ermöglichen."
 
 #. Tag: para
+#: architecture.xml:291
 #, fuzzy, no-c-format
 msgid ""
 "See the Javadocs for the <literal>org.hibernate.context."
@@ -805,6 +763,7 @@ msgstr ""
 "Implementierungen dieses Interface geliefert."
 
 #. Tag: para
+#: architecture.xml:301
 #, fuzzy, no-c-format
 msgid ""
 "<literal>org.hibernate.context.JTASessionContext</literal>: current sessions "
@@ -819,6 +778,7 @@ msgstr ""
 "finden Sie in Javadocs."
 
 #. Tag: para
+#: architecture.xml:309
 #, fuzzy, no-c-format
 msgid ""
 "<literal>org.hibernate.context.ThreadLocalSessionContext</literal>:current "
@@ -829,6 +789,7 @@ msgstr ""
 "finden Sie weitere Informationen in Javadocs."
 
 #. Tag: para
+#: architecture.xml:315
 #, fuzzy, no-c-format
 msgid ""
 "<literal>org.hibernate.context.ManagedSessionContext</literal>: current "
@@ -843,6 +804,7 @@ msgstr ""
 "geräumt oder geschlossen."
 
 #. Tag: para
+#: architecture.xml:324
 #, fuzzy, no-c-format
 msgid ""
 "The first two implementations provide a \"one session - one database "
@@ -855,7 +817,7 @@ msgid ""
 "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 "
+"operations in your code. Refer to <xref linkend=\"transactions\"/> for more "
 "information and code examples."
 msgstr ""
 "Die ersten beiden Implementierungen bieten ein \"eine Session - eine "
@@ -873,6 +835,7 @@ msgstr ""
 "Code-Beispiele finden Sie unter <xref linkend=\"transactions\"/>."
 
 #. Tag: para
+#: architecture.xml:336
 #, fuzzy, no-c-format
 msgid ""
 "The <literal>hibernate.current_session_context_class</literal> configuration "
@@ -897,3 +860,118 @@ msgstr ""
 "verwendende Implementierungsklasse für die drei gelieferten "
 "Implementierungen, jedoch existieren drei entsprechende Kurznamen \"jta\", "
 "\"thread\" sowie \"managed\"."
+
+#, 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 "
+#~ "extremes: \"minimal\" architecture and \"comprehensive\" architecture."
+#~ msgstr ""
+#~ "Wir würden gerne eine detaillierte Ansicht der Runtime-Architektur "
+#~ "zeigen, jedoch ist Hibernate leider flexibel und unterstützt mehrere "
+#~ "Vorgehensweisen. Daher erläutern wir hier die beiden Extreme. Bei der "
+#~ "\"abgespeckten\" Architektur liefert die Anwendung ihre eigenen JDBC-"
+#~ "Verbindungen und verwaltet ihre eigenen Transaktionen. Diese "
+#~ "Vorgehensweise verwendet einen minimalen Teilsatz der APIs von Hibernate:"
+
+#, fuzzy
+#~ msgid ""
+#~ "This next diagram illustrates how Hibernate utilizes database and "
+#~ "configuration data to provide persistence services, and persistent "
+#~ "objects, to the application."
+#~ msgstr ""
+#~ "Dieses Diagram zeigt, wie Hibernate die Datenbank und die "
+#~ "Konfigurationsdaten verwendet, um Persistenzdienste (und persistente "
+#~ "Objekte) für die Anwendung zu liefern."
+
+#, fuzzy
+#~ msgid "Here are some definitions of the objects depicted in the diagrams:"
+#~ msgstr ""
+#~ "Nachfolgend sehen Sie einige Definitionen von Objekten innerhalb der "
+#~ "Diagramme:"
+
+#, fuzzy
+#~ msgid ""
+#~ "Given a \"minimal\" architecture, the application bypasses the "
+#~ "<literal>Transaction</literal>/<literal>TransactionFactory</literal> and/"
+#~ "or <literal>ConnectionProvider</literal> APIs to communicate with JTA or "
+#~ "JDBC directly."
+#~ msgstr ""
+#~ "Bei einer \"abgespeckten\" Architektur umgeht die Anwendung "
+#~ "<literal>Transaction</literal>/<literal>TransactionFactory</literal> und/"
+#~ "oder <literal>ConnectionProvider</literal> APIs kommunizieren direkt mit "
+#~ "JTA oder JDBC."
+
+#, fuzzy
+#~ msgid ""
+#~ "For an example of how to deploy Hibernate as a JMX service on the JBoss "
+#~ "Application Server, please see the JBoss User Guide. JBoss AS also "
+#~ "provides these benefits if you deploy using JMX:"
+#~ msgstr ""
+#~ "Ein Beispiel wie Hibernate als ein JMX-Dienst auf dem JBoss "
+#~ "Applikationsserver ausgeführt wird, finden Sie im JBoss Benutzerhandbuch. "
+#~ "Auf dem JBoss AS genießen Sie die gleichen Vorteile, wenn Sie JMX "
+#~ "verwenden:"
+
+#, fuzzy
+#~ msgid ""
+#~ "<emphasis>Session Management</emphasis>: the Hibernate <literal>Session</"
+#~ "literal>'s life cycle can be automatically bound to the scope of a JTA "
+#~ "transaction. This means that you no longer have to manually open and "
+#~ "close the <literal>Session</literal>; this becomes the job of a JBoss EJB "
+#~ "interceptor. You also do not have to worry about transaction demarcation "
+#~ "in your code (if you would like to write a portable persistence layer use "
+#~ "the optional Hibernate <literal>Transaction</literal> API for this). You "
+#~ "call the <literal>HibernateContext</literal> to access a "
+#~ "<literal>Session</literal>."
+#~ msgstr ""
+#~ "<emphasis>Session Management:</emphasis> Der Lebenszyklus der Hibernate "
+#~ "<literal>Session</literal> kann automatisch an den Gültigkeitsbereich "
+#~ "einer JTA-Transaktion gebunden werden. Das bedeutet, dass Sie die "
+#~ "<literal>Session</literal> nicht mehr manuell öffnen und schließen "
+#~ "müssen, da diese Aufgabe von einem JBoss EJB-Interzeptor übernommen wird. "
+#~ "Sie müssen sich auch nicht um die Transaktionsabgrenzung in Ihrem Code "
+#~ "kümmern (außer natürlich Sie möchten eine übertragbare Persistenzschicht "
+#~ "schreiben, in welchem Fall Sie die optionale Hibernate "
+#~ "<literal>Transaction</literal>-API verwenden). Sie rufen den "
+#~ "<literal>HibernateContext</literal> auf, um auf eine <literal>Session</"
+#~ "literal> zuzugreifen."
+
+#, fuzzy
+#~ msgid ""
+#~ "<emphasis>HAR deployment</emphasis>: the Hibernate JMX service is "
+#~ "deployed using a JBoss service deployment descriptor in an EAR and/or SAR "
+#~ "file, as it supports all the usual configuration options of a Hibernate "
+#~ "<literal>SessionFactory</literal>. However, you still need to name all "
+#~ "your mapping files in the deployment descriptor. If you use the optional "
+#~ "HAR deployment, JBoss will automatically detect all mapping files in your "
+#~ "HAR file."
+#~ msgstr ""
+#~ "<emphasis>HAR-Deployment:</emphasis> In der Regel führen Sie den "
+#~ "Hibernate JMX-Dienst unter Verwendung eines JBoss Service Deployment-"
+#~ "Deskriptors (in einer EAR- und/oder SAR-Datei) aus. Dabei werden die "
+#~ "üblichen Konfigurationsoptionen einer Hibernate <literal>SessionFactory</"
+#~ "literal> unterstützt. Sie müssen jedoch noch alle Ihre Mapping-Dateien im "
+#~ "Deployment-Deskriptor benennen. Falls Sie sich für die Benutzung des "
+#~ "optionalen HAR-Deployments entscheiden, wird JBoss automatisch sämtliche "
+#~ "Mapping-Dateien in Ihrer HAR-Datei auffinden."
+
+#~ msgid ""
+#~ "Consult the JBoss AS user guide for more information about these options."
+#~ msgstr ""
+#~ "Weitere Informationen zu diesen Optionen finden Sie im JBoss AS "
+#~ "Benutzerhandbuch."
+
+#~ msgid "JCA Support"
+#~ msgstr "JCA-Support"
+
+#, fuzzy
+#~ msgid ""
+#~ "Hibernate can also be configured as a JCA connector. Please see the "
+#~ "website for more information. Please note, however, that at this stage "
+#~ "Hibernate JCA support is under development."
+#~ msgstr ""
+#~ "Hibernate kann auch als ein JCA-Konnektor konfiguriert werden. Weitere "
+#~ "Informationen dazu finden Sie auf der Website. Bitte beachten Sie, dass "
+#~ "der Hibernate JCA-Support noch als experimentell gilt."
diff --git a/documentation/manual/src/main/docbook/en-US/content/architecture.xml b/documentation/manual/src/main/docbook/en-US/content/architecture.xml
index 42ecea839e..53c088a437 100644
--- a/documentation/manual/src/main/docbook/en-US/content/architecture.xml
+++ b/documentation/manual/src/main/docbook/en-US/content/architecture.xml
@@ -2,10 +2,10 @@
 <!--
   ~ Hibernate, Relational Persistence for Idiomatic Java
   ~
-  ~ Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as
+  ~ Copyright (c) 2010, Red Hat Inc. or third-party contributors as
   ~ indicated by the @author tags or express copyright attribution
   ~ statements applied by the authors.  All third-party contributions are
-  ~ distributed under license by Red Hat Middleware LLC.
+  ~ distributed under license by Red Hat Inc.
   ~
   ~ This copyrighted material is made available to anyone wishing to use, modify,
   ~ copy, or redistribute it subject to the terms and conditions of the GNU
@@ -33,7 +33,7 @@
 
     <title>Architecture</title>
 
-    <section id="architecture-overview" revision="1">
+    <section id="architecture-overview">
         <title>Overview</title>
         
         <para>
@@ -50,148 +50,152 @@
         </mediaobject>
 
         <para>
-            We do not have the scope in this document to provide a more detailed view of all the runtime architectures available; 
-            Hibernate is flexible and supports several different approaches. We will, however,
-            show the two extremes: "minimal" architecture and "comprehensive" architecture. 
-	</para>
-
-	<para>
-            This next diagram illustrates how Hibernate utilizes database and configuration data to
-            provide persistence services, and persistent objects, to the application.
+            Unfortunately we cannot provide a detailed view of all possible runtime architectures.  Hibernate is
+            sufficiently flexible to be used in a number of ways in many, many architectures.  We will, however,
+            illustrate 2 specifically since they are extremes.
         </para>
 
-        <para>
-            The "minimal" architecture has the application
-            provide its own JDBC connections and manage its own transactions. This approach
-            uses a minimal subset of Hibernate's APIs:
-        </para>
+        <section id="architecture-overview-minimal">
+            <title>Minimal architecture</title>
 
-        <mediaobject>
-            <imageobject role="fo">
-                <imagedata fileref="images/lite.svg" format="SVG" align="center"/>
-            </imageobject>
-            <imageobject role="html">
-                <imagedata fileref="images/lite.png" format="PNG" align="center"/>
-            </imageobject>
-        </mediaobject>
+            <para>
+                The "minimal" architecture has the application manage its own JDBC connections and provide those
+                connections to Hibernate; additionally the application manages transactions for itself.  This approach
+                uses a minimal subset of Hibernate APIs.
+            </para>
+            <mediaobject>
+                <imageobject role="fo">
+                    <imagedata fileref="images/lite.svg" format="SVG" align="center"/>
+                </imageobject>
+                <imageobject role="html">
+                    <imagedata fileref="images/lite.png" format="PNG" align="center"/>
+                </imageobject>
+            </mediaobject>
+        </section>
 
-        <para>
-            The "comprehensive" architecture abstracts the application away from the
-            underlying JDBC/JTA APIs and allows Hibernate to manage the details.
-        </para>
+        <section id="architecture-overview-comprehensive">
+            <title>Comprehensive architecture</title>
 
-        <mediaobject>
-            <imageobject role="fo">
-                <imagedata fileref="images/full_cream.svg" format="SVG" align="center"/>
-            </imageobject>
-            <imageobject role="html">
-                <imagedata fileref="images/full_cream.png" format="PNG" align="center"/>
-            </imageobject>
-        </mediaobject>
+            <para>
+                The "comprehensive" architecture abstracts the application away from the underlying JDBC/JTA APIs and
+                allows Hibernate to manage the details.
+            </para>
+            <mediaobject>
+                <imageobject role="fo">
+                    <imagedata fileref="images/full_cream.svg" format="SVG" align="center"/>
+                </imageobject>
+                <imageobject role="html">
+                    <imagedata fileref="images/full_cream.png" format="PNG" align="center"/>
+                </imageobject>
+            </mediaobject>
+        </section>
 
-        <para>
-            Here are some definitions of the objects depicted in the diagrams:
-
-            <variablelist spacing="compact">
-                <varlistentry>
-                    <term>SessionFactory (<literal>org.hibernate.SessionFactory</literal>)</term>
-                    <listitem>
-                        <para>
-                            A threadsafe, immutable cache of compiled mappings for a single database.
-                            A factory for <literal>Session</literal> and a client of
-                            <literal>ConnectionProvider</literal>, <literal>SessionFactory</literal> can hold an optional (second-level)
-                            cache of data that is reusable between transactions at a
-                            process, or cluster, level.
-                        </para>
-                    </listitem>
-                </varlistentry>
-                <varlistentry>
-                    <term>Session (<literal>org.hibernate.Session</literal>)</term>
-                    <listitem>
-                        <para>
-                            A single-threaded, short-lived object representing a conversation between
-                            the application and the persistent store. It wraps a JDBC connection and is a factory
-                            for <literal>Transaction</literal>. <literal>Session</literal> holds a mandatory first-level cache
-                            of persistent objects that are used when navigating the object graph or looking up
-                            objects by identifier.
-                        </para>
-                    </listitem>
-                </varlistentry>
-                <varlistentry>
-                    <term>Persistent objects and collections</term>
-                    <listitem>
-                        <para>
-                            Short-lived, single threaded objects containing persistent state and business
-                            function. These can be ordinary JavaBeans/POJOs. They are associated with exactly one
-                            <literal>Session</literal>. Once the <literal>Session</literal> is closed,
-                            they will be detached and free to use in any application layer (for example, directly
-                            as data transfer objects to and from presentation).
-                        </para>
-                    </listitem>
-                </varlistentry>
-                <varlistentry>
-                    <term>Transient and detached objects and collections</term>
-                    <listitem>
-                        <para>
-                            Instances of persistent classes that are not currently associated with a
-                            <literal>Session</literal>. They may have been instantiated by
-                            the application and not yet persisted, or they may have been instantiated by a
-                            closed <literal>Session</literal>.
-                        </para>
-                    </listitem>
-                </varlistentry>
-                <varlistentry>
-                    <term>Transaction (<literal>org.hibernate.Transaction</literal>)</term>
-                    <listitem>
-                        <para>
-                            (Optional) A single-threaded, short-lived object used by the application to
-                            specify atomic units of work. It abstracts the application from the underlying JDBC,
-                            JTA or CORBA transaction. A <literal>Session</literal> might span several
-                            <literal>Transaction</literal>s in some cases. However, transaction demarcation,
-                            either using the underlying API or <literal>Transaction</literal>, is never
-                            optional.
-                        </para>
-                    </listitem>
-                </varlistentry>
-                <varlistentry>
-                    <term>ConnectionProvider (<literal>org.hibernate.connection.ConnectionProvider</literal>)</term>
-                    <listitem>
-                        <para>
-                            (Optional) A factory for, and pool of, JDBC connections. It abstracts the application from
-                            underlying <literal>Datasource</literal> or <literal>DriverManager</literal>.
-                            It is not exposed to application, but it can be extended and/or implemented by the developer.
-                        </para>
-                    </listitem>
-                </varlistentry>
-                <varlistentry>
-                    <term>TransactionFactory (<literal>org.hibernate.TransactionFactory</literal>)</term>
-                    <listitem>
-                        <para>
-                            (Optional) A factory for <literal>Transaction</literal> instances. It is not exposed to the
-                            application, but it can be extended and/or implemented by the developer.
-                        </para>
-                    </listitem>
-                </varlistentry>
-                <varlistentry>
-                    <term><emphasis>Extension Interfaces</emphasis></term>
-                    <listitem>
-                        <para>
-                            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.
-                        </para>
-                    </listitem>
-                </varlistentry>
-            </variablelist>
-        </para>
-
-        <para>
-            Given a "minimal" architecture, the application bypasses the
-            <literal>Transaction</literal>/<literal>TransactionFactory</literal> and/or
-            <literal>ConnectionProvider</literal> APIs to communicate with JTA or JDBC directly.
-        </para>
+        <section id="architecture-overview-terms">
+            <title>Basic APIs</title>
+            <para>
+                Here are quick discussions about some of the API objects depicted in the preceding diagrams (you will
+                see them again in more detail in later chapters).
+                <variablelist spacing="compact">
+                    <varlistentry>
+                        <term>SessionFactory (<interfacename>org.hibernate.SessionFactory</interfacename>)</term>
+                        <listitem>
+                            <para>
+                                A thread-safe, immutable cache of compiled mappings for a single database.
+                                A factory for <interfacename>org.hibernate.Session</interfacename> instances.  A client
+                                of <interfacename>org.hibernate.connection.ConnectionProvider</interfacename>.  Optionally
+                                maintains a <literal>second level cache</literal> of data that is reusable between
+                                transactions at a process or cluster level.
+                            </para>
+                        </listitem>
+                    </varlistentry>
+                    <varlistentry>
+                        <term>Session (<interfacename>org.hibernate.Session</interfacename>)</term>
+                        <listitem>
+                            <para>
+                                A single-threaded, short-lived object representing a conversation between
+                                the application and the persistent store.  Wraps a JDBC
+                                <interfacename>java.sql.Connection</interfacename>.  Factory for
+                                <interfacename>org.hibernate.Transaction</interfacename>.  Maintains a
+                                <literal>first level cache</literal> of persistent the application's persistent objects
+                                and collections; this cache is used when navigating the object graph or looking up
+                                objects by identifier.
+                            </para>
+                        </listitem>
+                    </varlistentry>
+                    <varlistentry>
+                        <term>Persistent objects and collections</term>
+                        <listitem>
+                            <para>
+                                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 <xref linkend="architecture-states"/>
+                            </para>
+                        </listitem>
+                    </varlistentry>
+                    <varlistentry>
+                        <term>Transient and detached objects and collections</term>
+                        <listitem>
+                            <para>
+                                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 <xref linkend="architecture-states"/>
+                            </para>
+                        </listitem>
+                    </varlistentry>
+                    <varlistentry>
+                        <term>Transaction (<interfacename>org.hibernate.Transaction</interfacename>)</term>
+                        <listitem>
+                            <para>
+                                (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.
+                            </para>
+                        </listitem>
+                    </varlistentry>
+                    <varlistentry>
+                        <term>ConnectionProvider (<interfacename>org.hibernate.connection.ConnectionProvider</interfacename>)</term>
+                        <listitem>
+                            <para>
+                                (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.
+                            </para>
+                        </listitem>
+                    </varlistentry>
+                    <varlistentry>
+                        <term>TransactionFactory (<interfacename>org.hibernate.TransactionFactory</interfacename>)</term>
+                        <listitem>
+                            <para>
+                                (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.
+                            </para>
+                        </listitem>
+                    </varlistentry>
+                    <varlistentry>
+                        <term><emphasis>Extension Interfaces</emphasis></term>
+                        <listitem>
+                            <para>
+                                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.
+                            </para>
+                        </listitem>
+                    </varlistentry>
+                </variablelist>
+            </para>
+        </section>
     </section>
 
-    <section id="architecture-states" revision="1">
+    <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
@@ -250,55 +254,12 @@
             <literal>org.hibernate.jmx.HibernateService</literal>.
         </para>
 
-        <para>
-            For an example of how to deploy Hibernate as a JMX service on the JBoss Application Server,
-            please see the JBoss User Guide. JBoss AS also provides these benefits if you deploy
-            using JMX:
-        </para>
-
-        <itemizedlist>
-            <listitem>
-                <para>
-                    <emphasis>Session Management</emphasis>: the Hibernate <literal>Session</literal>'s life cycle
-                    can be automatically bound to the scope of a JTA transaction. This means that you no
-                    longer have to manually open and close the <literal>Session</literal>; this
-                    becomes the job of a JBoss EJB interceptor. You also do not have to worry about
-                    transaction demarcation in your code (if you would like to write a portable
-                    persistence layer use the optional Hibernate <literal>Transaction</literal>
-                    API for this). You call the <literal>HibernateContext</literal> to access a
-                    <literal>Session</literal>.
-                </para>
-            </listitem>
-            <listitem>
-                <para>
-                    <emphasis>HAR deployment</emphasis>: the Hibernate JMX service is deployed using a JBoss
-                    service deployment descriptor in an EAR and/or SAR file, as it supports all the usual
-                    configuration options of a Hibernate <literal>SessionFactory</literal>. However, you still
-                    need to name all your mapping files in the deployment descriptor. If you use
-                    the optional HAR deployment, JBoss will automatically detect all mapping files in your
-                    HAR file.
-                </para>
-            </listitem>
-        </itemizedlist>
-
-        <para>
-            Consult the JBoss AS user guide for more information about these options.
-        </para>
-
         <para>
             Another feature available as a JMX service is runtime Hibernate statistics. See
             <xref linkend="configuration-optional-statistics"/> for more information.
         </para>
     </section>
 
-    <section id="architecture-jca" revision="1">
-        <title>JCA Support</title>
-        <para>
-            Hibernate can also be configured as a JCA connector. Please see the website for more
-            information. Please note, however, that at this stage Hibernate JCA support is under development.
-        </para>
-    </section>
-
     <section id="architecture-current-session" revision="2">
         <title>Contextual sessions</title>
         <para>
diff --git a/documentation/manual/src/main/docbook/es-ES/content/architecture.po b/documentation/manual/src/main/docbook/es-ES/content/architecture.po
index 63bfed921e..642483d31e 100644
--- a/documentation/manual/src/main/docbook/es-ES/content/architecture.po
+++ b/documentation/manual/src/main/docbook/es-ES/content/architecture.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: architecture\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-03-12T00:03:45\n"
+"POT-Creation-Date: 2010-07-21 05:26+0000\n"
 "PO-Revision-Date: 2010-03-15 10:16+1000\n"
 "Last-Translator: Angela Garcia <agarcia@redhat.com>\n"
 "Language-Team:  <en@li.org>\n"
@@ -24,58 +24,63 @@ msgstr ""
 "X-Generator: KBabel 1.11.4\n"
 
 #. Tag: title
+#: architecture.xml:34
 #, no-c-format
 msgid "Architecture"
 msgstr "Arquitectura"
 
 #. Tag: title
+#: architecture.xml:37
 #, no-c-format
 msgid "Overview"
 msgstr "Sinopsis"
 
 #. Tag: para
+#: architecture.xml:39
 #, no-c-format
-msgid "The diagram below provides a high-level view of the Hibernate architecture:"
+msgid ""
+"The diagram below provides a high-level view of the Hibernate architecture:"
 msgstr ""
 "El diagrama a continuación brinda una perspectiva a alto nivel de la "
 "arquitectura de Hibernate:"
 
 #. Tag: para
+#: architecture.xml:52
 #, no-c-format
 msgid ""
-"We do not have the scope in this document to provide a more detailed view of "
-"all the runtime architectures available; Hibernate is flexible and supports "
-"several different approaches. We will, however, show the two extremes: "
-"\"minimal\" architecture and \"comprehensive\" architecture."
+"Unfortunately we cannot provide a detailed view of all possible runtime "
+"architectures. Hibernate is sufficiently flexible to be used in a number of "
+"ways in many, many architectures. We will, however, illustrate 2 "
+"specifically since they are extremes."
 msgstr ""
-"Este documento no incluye una sinopsis detallada de la arquitecturas en "
-"tiempo de ejecución disponibles; Hibernate es flexible y soporta diferentes "
-"enfoques. Sin embargo, mostraremos los dos extremos: la arquitectura \"mínima"
-"\" y la arquitectura \"completa\"."
+
+#. Tag: title
+#: architecture.xml:59
+#, fuzzy, no-c-format
+msgid "Minimal architecture"
+msgstr "Arquitectura"
 
 #. Tag: para
-#, no-c-format
+#: architecture.xml:61
+#, fuzzy, no-c-format
 msgid ""
-"This next diagram illustrates how Hibernate utilizes database and "
-"configuration data to provide persistence services, and persistent objects, "
-"to the application."
-msgstr ""
-"Este diagrama ilustra la manera en que Hibernate utiliza la base de datos y "
-"los datos de configuración para proporcionar servicios de persistencia y "
-"objetos persistentes a la aplicación."
-
-#. Tag: para
-#, no-c-format
-msgid ""
-"The \"minimal\" architecture has the application provide its own JDBC "
-"connections and manage its own transactions. This approach uses a minimal "
-"subset of Hibernate's APIs:"
+"The \"minimal\" architecture has the application manage its own JDBC "
+"connections and provide those connections to Hibernate; additionally the "
+"application manages transactions for itself. This approach uses a minimal "
+"subset of Hibernate APIs."
 msgstr ""
 "La arquitectura \"mínima\" hace que la aplicación proporcione sus propias "
 "conexiones JDBC y que administre sus propias transacciones. Este enfoque "
 "utiliza un subgrupo mínimo de las APIs de Hibernate:"
 
+#. Tag: title
+#: architecture.xml:77
+#, no-c-format
+msgid "Comprehensive architecture"
+msgstr ""
+
 #. Tag: para
+#: architecture.xml:79
 #, no-c-format
 msgid ""
 "The \"comprehensive\" architecture abstracts the application away from the "
@@ -84,24 +89,37 @@ msgstr ""
 "La arquitectura \"completa\" abstrae la aplicación de las APIs de JDBC/JTA y "
 "permite que Hibernate se encargue de los detalles."
 
-#. Tag: para
+#. Tag: title
+#: architecture.xml:94
 #, no-c-format
-msgid "Here are some definitions of the objects depicted in the diagrams:"
-msgstr "He aquí algunas definiciones de los objetos en los diagramas: "
+msgid "Basic APIs"
+msgstr ""
+
+#. Tag: para
+#: architecture.xml:95
+#, no-c-format
+msgid ""
+"Here are quick discussions about some of the API objects depicted in the "
+"preceding diagrams (you will see them again in more detail in later "
+"chapters)."
+msgstr ""
 
 #. Tag: term
-#, no-c-format
-msgid "SessionFactory (<literal>org.hibernate.SessionFactory</literal>)"
+#: architecture.xml:100
+#, fuzzy, no-c-format
+msgid ""
+"SessionFactory (<interfacename>org.hibernate.SessionFactory</interfacename>)"
 msgstr "SessionFactory (<literal>org.hibernate.SessionFactory</literal>)"
 
 #. Tag: para
-#, no-c-format
+#: architecture.xml:102
+#, fuzzy, no-c-format
 msgid ""
-"A threadsafe, immutable cache of compiled mappings for a single database. A "
-"factory for <literal>Session</literal> and a client of "
-"<literal>ConnectionProvider</literal>, <literal>SessionFactory</literal> can "
-"hold an optional (second-level) cache of data that is reusable between "
-"transactions at a process, or cluster, level."
+"A thread-safe, immutable cache of compiled mappings for a single database. A "
+"factory for <interfacename>org.hibernate.Session</interfacename> instances. "
+"A client of <interfacename>org.hibernate.connection.ConnectionProvider</"
+"interfacename>. Optionally maintains a <literal>second level cache</literal> "
+"of data that is reusable between transactions at a process or cluster level."
 msgstr ""
 "Un caché threadsafe (inmutable) de mapeos compilados para una sola base de "
 "datos. Una fábrica de <literal>Session</literal> y un cliente de "
@@ -110,18 +128,22 @@ msgstr ""
 "transacciones a nivel de proceso o de clúster."
 
 #. Tag: term
-#, no-c-format
-msgid "Session (<literal>org.hibernate.Session</literal>)"
+#: architecture.xml:112
+#, fuzzy, no-c-format
+msgid "Session (<interfacename>org.hibernate.Session</interfacename>)"
 msgstr "Session (<literal>org.hibernate.Session</literal>)"
 
 #. Tag: para
-#, no-c-format
+#: architecture.xml:114
+#, fuzzy, no-c-format
 msgid ""
 "A single-threaded, short-lived object representing a conversation between "
-"the application and the persistent store. It wraps a JDBC connection and is "
-"a factory for <literal>Transaction</literal>. <literal>Session</literal> "
-"holds a mandatory first-level cache of persistent objects that are used when "
-"navigating the object graph or looking up objects by identifier."
+"the application and the persistent store. Wraps a JDBC <interfacename>java."
+"sql.Connection</interfacename>. Factory for <interfacename>org.hibernate."
+"Transaction</interfacename>. Maintains a <literal>first level cache</"
+"literal> of persistent the application's persistent objects and collections; "
+"this cache is used when navigating the object graph or looking up objects by "
+"identifier."
 msgstr ""
 "Un objeto mono-hebra, de corta vida que representa una conversación entre la "
 "aplicación y el almacenamiento persistente. Envuelve una conexión JDBC y es "
@@ -131,19 +153,22 @@ msgstr ""
 "por identificador."
 
 #. Tag: term
+#: architecture.xml:126
 #, no-c-format
 msgid "Persistent objects and collections"
 msgstr "Objetos y colecciones persistentes"
 
 #. Tag: para
-#, no-c-format
+#: architecture.xml:128
+#, fuzzy, 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 <literal>Session</literal>. Once the "
-"<literal>Session</literal> is closed, they will be detached and free to use "
-"in any application layer (for example, directly as data transfer objects to "
-"and from presentation)."
+"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"
 msgstr ""
 "Objetos de corta vida, mono-hebra contienen un estado persistente así como "
 "una funcionalidad empresarial. Estos pueden ser JavaBeans/POJOs normales. "
@@ -154,17 +179,20 @@ msgstr ""
 "desde la presentación)."
 
 #. Tag: term
+#: architecture.xml:139
 #, no-c-format
 msgid "Transient and detached objects and collections"
 msgstr "Objetos y colecciones transitorios y separados"
 
 #. Tag: para
-#, no-c-format
+#: architecture.xml:141
+#, fuzzy, no-c-format
 msgid ""
 "Instances of persistent classes that are not currently associated with a "
-"<literal>Session</literal>. They may have been instantiated by the "
-"application and not yet persisted, or they may have been instantiated by a "
-"closed <literal>Session</literal>."
+"<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"
 msgstr ""
 "Instancias de clases persistentes que no se encuentran actualmente asociadas "
 "con una <literal>Session</literal>. Pueden haber sido instanciadas por la "
@@ -172,19 +200,22 @@ msgstr ""
 "por una <literal>Session</literal> cerrada."
 
 #. Tag: term
-#, no-c-format
-msgid "Transaction (<literal>org.hibernate.Transaction</literal>)"
+#: architecture.xml:151
+#, fuzzy, no-c-format
+msgid "Transaction (<interfacename>org.hibernate.Transaction</interfacename>)"
 msgstr "Transaction (<literal>org.hibernate.Transaction</literal>)"
 
 #. Tag: para
-#, no-c-format
+#: architecture.xml:153
+#, fuzzy, 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 <literal>Session</literal> "
-"might span several <literal>Transaction</literal>s in some cases. However, "
-"transaction demarcation, either using the underlying API or "
-"<literal>Transaction</literal>, is never optional."
+"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 ""
 "(Opcional) Un objeto de corta vida, mono-hebra que la aplicación utiliza "
 "para especificar unidades atómicas de trabajo. Abstrae la aplicación de las "
@@ -195,21 +226,24 @@ msgstr ""
 "literal>, nunca es opcional."
 
 #. Tag: term
-#, no-c-format
+#: architecture.xml:164
+#, fuzzy, no-c-format
 msgid ""
-"ConnectionProvider (<literal>org.hibernate.connection.ConnectionProvider</"
-"literal>)"
+"ConnectionProvider (<interfacename>org.hibernate.connection."
+"ConnectionProvider</interfacename>)"
 msgstr ""
 "ConnectionProvider (<literal>org.hibernate.connection.ConnectionProvider</"
 "literal>)"
 
 #. Tag: para
-#, no-c-format
+#: architecture.xml:166
+#, fuzzy, no-c-format
 msgid ""
 "(Optional) A factory for, and pool of, JDBC connections. It abstracts the "
-"application from underlying <literal>Datasource</literal> or "
-"<literal>DriverManager</literal>. It is not exposed to application, but it "
-"can be extended and/or implemented by the developer."
+"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 ""
 "(Opcional) Una fábrica y pool de conexiones JDBC. Abstrae a la aplicación "
 "del <literal>Datasource</literal> o <literal>DriverManager</literal> "
@@ -217,27 +251,34 @@ msgstr ""
 "implementado por el desarrollador."
 
 #. Tag: term
-#, no-c-format
-msgid "TransactionFactory (<literal>org.hibernate.TransactionFactory</literal>)"
-msgstr "TransactionFactory (<literal>org.hibernate.TransactionFactory</literal>)"
+#: architecture.xml:175
+#, fuzzy, no-c-format
+msgid ""
+"TransactionFactory (<interfacename>org.hibernate.TransactionFactory</"
+"interfacename>)"
+msgstr ""
+"TransactionFactory (<literal>org.hibernate.TransactionFactory</literal>)"
 
 #. Tag: para
-#, no-c-format
+#: architecture.xml:177
+#, fuzzy, no-c-format
 msgid ""
-"(Optional) A factory for <literal>Transaction</literal> instances. It is not "
-"exposed to the application, but it can be extended and/or implemented by the "
-"developer."
+"(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 ""
 "(Opcional) Una fábrica de instancias de <literal>Transaction</literal>. No "
 "se expone a la aplicación pero puede ser extendido/implementado por el "
 "desarrollador. "
 
-#. Tag: term
-#, no-c-format
-msgid "<emphasis>Extension Interfaces</emphasis>"
+#. Tag: emphasis
+#: architecture.xml:185
+#, fuzzy, no-c-format
+msgid "Extension Interfaces"
 msgstr "<emphasis>Interfaces de extensión</emphasis> "
 
 #. Tag: para
+#: architecture.xml:187
 #, no-c-format
 msgid ""
 "Hibernate offers a range of optional extension interfaces you can implement "
@@ -248,25 +289,14 @@ msgstr ""
 "implementar para personalizar el comportamiento de su capa de persistencia. "
 "Para obtener más detalles, vea la documentación de la API."
 
-#. Tag: para
-#, no-c-format
-msgid ""
-"Given a \"minimal\" architecture, the application bypasses the "
-"<literal>Transaction</literal>/<literal>TransactionFactory</literal> and/or "
-"<literal>ConnectionProvider</literal> APIs to communicate with JTA or JDBC "
-"directly."
-msgstr ""
-"Dada una arquitectura \"sencilla\", la aplicación evita las APIs de "
-"<literal>Transaction</literal>/<literal>TransactionFactory</literal> y/o "
-"<literal>ConnectionProvider</literal>, para comunicarse directamente con JTA "
-"o JDBC."
-
 #. 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. "
@@ -281,11 +311,13 @@ msgstr ""
 "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 "
@@ -295,11 +327,13 @@ msgstr ""
 "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 "
@@ -316,11 +350,13 @@ msgstr ""
 "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 "
@@ -336,11 +372,13 @@ msgstr ""
 "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
 #, no-c-format
 msgid ""
 "JMX is the J2EE standard for the management of Java components. Hibernate "
@@ -354,98 +392,25 @@ msgstr ""
 "HibernateService</literal>."
 
 #. Tag: para
-#, no-c-format
-msgid ""
-"For an example of how to deploy Hibernate as a JMX service on the JBoss "
-"Application Server, please see the JBoss User Guide. JBoss AS also provides "
-"these benefits if you deploy using JMX:"
-msgstr ""
-"Para ver un ejemplo de cómo desplegar Hibernate como un servicio JMX en un "
-"servidor de aplicaciones JBoss, por favor, refiérase al manual del usuario "
-"de JBoss. JBoss AS también proporciona estos beneficios si despliega "
-"utilizando JMX:"
-
-#. Tag: para
-#, no-c-format
-msgid ""
-"<emphasis>Session Management</emphasis>: the Hibernate <literal>Session</"
-"literal>'s life cycle can be automatically bound to the scope of a JTA "
-"transaction. This means that you no longer have to manually open and close "
-"the <literal>Session</literal>; this becomes the job of a JBoss EJB "
-"interceptor. You also do not have to worry about transaction demarcation in "
-"your code (if you would like to write a portable persistence layer use the "
-"optional Hibernate <literal>Transaction</literal> API for this). You call "
-"the <literal>HibernateContext</literal> to access a <literal>Session</"
-"literal>."
-msgstr ""
-"<emphasis>Administración de Sesión:</emphasis> El ciclo de vida de la "
-"<literal>Session</literal> de Hibernate puede estar ligado automáticamente "
-"al ámbito de una transacción JTA. Esto significa que ya no tiene que abrir "
-"ni cerrar la <literal>Session</literal> manualmente, esto pasa a ser el "
-"trabajo de un interceptor EJB de JBoss. Además tampoco tiene que preocuparse "
-"más de la demarcación de la transacción en su código (a menos de que quiera "
-"escribir una capa de persitencia portátil, utilice la API de "
-"<literal>Transaction</literal> de Hibernate para hacer esto). Para acceder a "
-"una <literal>Session</literal> llame al <literal>HibernateContext</literal>."
-
-#. Tag: para
-#, no-c-format
-msgid ""
-"<emphasis>HAR deployment</emphasis>: the Hibernate JMX service is deployed "
-"using a JBoss service deployment descriptor in an EAR and/or SAR file, as it "
-"supports all the usual configuration options of a Hibernate "
-"<literal>SessionFactory</literal>. However, you still need to name all your "
-"mapping files in the deployment descriptor. If you use the optional HAR "
-"deployment, JBoss will automatically detect all mapping files in your HAR "
-"file."
-msgstr ""
-"<emphasis>Despliegue HAR:</emphasis>: el servicio JMX de Hibernate se "
-"implementa usando un descriptor de despliegue de servicio de JBoss en un "
-"archivo EAR y/o SAR, que soporta todas las opciones de configuración usuales "
-"de una <literal>SessionFactory</literal> de Hibernate. Sin embargo, todavía "
-"tiene que nombrar todos sus archivos de mapeo en el descriptor de "
-"despliegue. Si utiliza el depliegue HAR opcional, JBoss detectará "
-"automáticamente todos los archivos de mapeo en su archivo HAR."
-
-#. Tag: para
-#, no-c-format
-msgid "Consult the JBoss AS user guide for more information about these options."
-msgstr ""
-"Para más información sobre estas opciones, consulte el Manual de Usuario de "
-"JBoss AS."
-
-#. Tag: para
-#, no-c-format
+#: architecture.xml:257
+#, fuzzy, no-c-format
 msgid ""
 "Another feature available as a JMX service is runtime Hibernate statistics. "
-"See <xref linkend=\"configuration-optional-statistics\" /> for more "
+"See <xref linkend=\"configuration-optional-statistics\"/> for more "
 "information."
 msgstr ""
 "Otra funcionalidad disponible como un servicio de JMX son las estadísticas "
-"en tiempo de ejecución de Hibernate. Consulte <xref linkend=\"configuration-optional-statistics\" /> para obtener mayor información."
-
-#. Tag: title
-#, no-c-format
-msgid "JCA Support"
-msgstr "Soporte JCA"
-
-#. Tag: para
-#, no-c-format
-msgid ""
-"Hibernate can also be configured as a JCA connector. Please see the website "
-"for more information. Please note, however, that at this stage Hibernate JCA "
-"support is under development."
-msgstr ""
-"Hibernate también puede ser configurado como un conector JCA. Por favor "
-"refiérase al sitio web para encontrar más detalles. Sin embargo, tenga en "
-"cuenta que el soporte de JCA de Hibernate aún está bajo desarrollo."
+"en tiempo de ejecución de Hibernate. Consulte <xref linkend=\"configuration-"
+"optional-statistics\" /> para obtener mayor información."
 
 #. Tag: title
+#: architecture.xml:264
 #, no-c-format
 msgid "Contextual sessions"
 msgstr "Sesiones contextuales"
 
 #. Tag: para
+#: architecture.xml:265
 #, no-c-format
 msgid ""
 "Most applications using Hibernate need some form of \"contextual\" session, "
@@ -471,6 +436,7 @@ msgstr ""
 "contextuales con base proxy/intercepción."
 
 #. Tag: para
+#: architecture.xml:274
 #, no-c-format
 msgid ""
 "Starting with version 3.0.1, Hibernate added the <literal>SessionFactory."
@@ -496,6 +462,7 @@ msgstr ""
 "todo lo que usted necesita utilizar."
 
 #. Tag: para
+#: architecture.xml:284
 #, no-c-format
 msgid ""
 "However, as of version 3.1, the processing behind <literal>SessionFactory."
@@ -514,6 +481,7 @@ msgstr ""
 "las sesiones actuales."
 
 #. Tag: para
+#: architecture.xml:291
 #, no-c-format
 msgid ""
 "See the Javadocs for the <literal>org.hibernate.context."
@@ -531,6 +499,7 @@ msgstr ""
 "implementaciones de esta interfaz:"
 
 #. Tag: para
+#: architecture.xml:301
 #, no-c-format
 msgid ""
 "<literal>org.hibernate.context.JTASessionContext</literal>: current sessions "
@@ -544,6 +513,7 @@ msgstr ""
 "sólamente. Refiérase a los Javadocs para obtener más información."
 
 #. Tag: para
+#: architecture.xml:309
 #, no-c-format
 msgid ""
 "<literal>org.hibernate.context.ThreadLocalSessionContext</literal>:current "
@@ -554,6 +524,7 @@ msgstr ""
 "Javadocs para obtener más detalles."
 
 #. Tag: para
+#: architecture.xml:315
 #, no-c-format
 msgid ""
 "<literal>org.hibernate.context.ManagedSessionContext</literal>: current "
@@ -568,7 +539,8 @@ msgstr ""
 "<literal>Session</literal>."
 
 #. Tag: para
-#, no-c-format
+#: architecture.xml:324
+#, fuzzy, no-c-format
 msgid ""
 "The first two implementations provide a \"one session - one database "
 "transaction\" programming model. This is also known and used as "
@@ -580,7 +552,7 @@ msgid ""
 "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 "
+"operations in your code. Refer to <xref linkend=\"transactions\"/> for more "
 "information and code examples."
 msgstr ""
 "Las primeras dos implementaciones brindan un modelo de programación \"una "
@@ -599,6 +571,7 @@ msgstr ""
 "ejemplos de código."
 
 #. Tag: para
+#: architecture.xml:336
 #, no-c-format
 msgid ""
 "The <literal>hibernate.current_session_context_class</literal> configuration "
@@ -623,3 +596,103 @@ msgstr ""
 "de implementación a utilizar. Sin embargo, para las tres implementaciones "
 "incluídas existen tress nombres cortos: \"jta\", \"thread\" y \"managed\"."
 
+#~ msgid ""
+#~ "We do not have the scope in this document to provide a more detailed view "
+#~ "of all the runtime architectures available; Hibernate is flexible and "
+#~ "supports several different approaches. We will, however, show the two "
+#~ "extremes: \"minimal\" architecture and \"comprehensive\" architecture."
+#~ msgstr ""
+#~ "Este documento no incluye una sinopsis detallada de la arquitecturas en "
+#~ "tiempo de ejecución disponibles; Hibernate es flexible y soporta "
+#~ "diferentes enfoques. Sin embargo, mostraremos los dos extremos: la "
+#~ "arquitectura \"mínima\" y la arquitectura \"completa\"."
+
+#~ msgid ""
+#~ "This next diagram illustrates how Hibernate utilizes database and "
+#~ "configuration data to provide persistence services, and persistent "
+#~ "objects, to the application."
+#~ msgstr ""
+#~ "Este diagrama ilustra la manera en que Hibernate utiliza la base de datos "
+#~ "y los datos de configuración para proporcionar servicios de persistencia "
+#~ "y objetos persistentes a la aplicación."
+
+#~ msgid "Here are some definitions of the objects depicted in the diagrams:"
+#~ msgstr "He aquí algunas definiciones de los objetos en los diagramas: "
+
+#~ msgid ""
+#~ "Given a \"minimal\" architecture, the application bypasses the "
+#~ "<literal>Transaction</literal>/<literal>TransactionFactory</literal> and/"
+#~ "or <literal>ConnectionProvider</literal> APIs to communicate with JTA or "
+#~ "JDBC directly."
+#~ msgstr ""
+#~ "Dada una arquitectura \"sencilla\", la aplicación evita las APIs de "
+#~ "<literal>Transaction</literal>/<literal>TransactionFactory</literal> y/o "
+#~ "<literal>ConnectionProvider</literal>, para comunicarse directamente con "
+#~ "JTA o JDBC."
+
+#~ msgid ""
+#~ "For an example of how to deploy Hibernate as a JMX service on the JBoss "
+#~ "Application Server, please see the JBoss User Guide. JBoss AS also "
+#~ "provides these benefits if you deploy using JMX:"
+#~ msgstr ""
+#~ "Para ver un ejemplo de cómo desplegar Hibernate como un servicio JMX en "
+#~ "un servidor de aplicaciones JBoss, por favor, refiérase al manual del "
+#~ "usuario de JBoss. JBoss AS también proporciona estos beneficios si "
+#~ "despliega utilizando JMX:"
+
+#~ msgid ""
+#~ "<emphasis>Session Management</emphasis>: the Hibernate <literal>Session</"
+#~ "literal>'s life cycle can be automatically bound to the scope of a JTA "
+#~ "transaction. This means that you no longer have to manually open and "
+#~ "close the <literal>Session</literal>; this becomes the job of a JBoss EJB "
+#~ "interceptor. You also do not have to worry about transaction demarcation "
+#~ "in your code (if you would like to write a portable persistence layer use "
+#~ "the optional Hibernate <literal>Transaction</literal> API for this). You "
+#~ "call the <literal>HibernateContext</literal> to access a "
+#~ "<literal>Session</literal>."
+#~ msgstr ""
+#~ "<emphasis>Administración de Sesión:</emphasis> El ciclo de vida de la "
+#~ "<literal>Session</literal> de Hibernate puede estar ligado "
+#~ "automáticamente al ámbito de una transacción JTA. Esto significa que ya "
+#~ "no tiene que abrir ni cerrar la <literal>Session</literal> manualmente, "
+#~ "esto pasa a ser el trabajo de un interceptor EJB de JBoss. Además tampoco "
+#~ "tiene que preocuparse más de la demarcación de la transacción en su "
+#~ "código (a menos de que quiera escribir una capa de persitencia portátil, "
+#~ "utilice la API de <literal>Transaction</literal> de Hibernate para hacer "
+#~ "esto). Para acceder a una <literal>Session</literal> llame al "
+#~ "<literal>HibernateContext</literal>."
+
+#~ msgid ""
+#~ "<emphasis>HAR deployment</emphasis>: the Hibernate JMX service is "
+#~ "deployed using a JBoss service deployment descriptor in an EAR and/or SAR "
+#~ "file, as it supports all the usual configuration options of a Hibernate "
+#~ "<literal>SessionFactory</literal>. However, you still need to name all "
+#~ "your mapping files in the deployment descriptor. If you use the optional "
+#~ "HAR deployment, JBoss will automatically detect all mapping files in your "
+#~ "HAR file."
+#~ msgstr ""
+#~ "<emphasis>Despliegue HAR:</emphasis>: el servicio JMX de Hibernate se "
+#~ "implementa usando un descriptor de despliegue de servicio de JBoss en un "
+#~ "archivo EAR y/o SAR, que soporta todas las opciones de configuración "
+#~ "usuales de una <literal>SessionFactory</literal> de Hibernate. Sin "
+#~ "embargo, todavía tiene que nombrar todos sus archivos de mapeo en el "
+#~ "descriptor de despliegue. Si utiliza el depliegue HAR opcional, JBoss "
+#~ "detectará automáticamente todos los archivos de mapeo en su archivo HAR."
+
+#~ msgid ""
+#~ "Consult the JBoss AS user guide for more information about these options."
+#~ msgstr ""
+#~ "Para más información sobre estas opciones, consulte el Manual de Usuario "
+#~ "de JBoss AS."
+
+#~ msgid "JCA Support"
+#~ msgstr "Soporte JCA"
+
+#~ msgid ""
+#~ "Hibernate can also be configured as a JCA connector. Please see the "
+#~ "website for more information. Please note, however, that at this stage "
+#~ "Hibernate JCA support is under development."
+#~ msgstr ""
+#~ "Hibernate también puede ser configurado como un conector JCA. Por favor "
+#~ "refiérase al sitio web para encontrar más detalles. Sin embargo, tenga en "
+#~ "cuenta que el soporte de JCA de Hibernate aún está bajo desarrollo."
diff --git a/documentation/manual/src/main/docbook/fr-FR/content/architecture.po b/documentation/manual/src/main/docbook/fr-FR/content/architecture.po
index 473cace401..5be2893ad4 100644
--- a/documentation/manual/src/main/docbook/fr-FR/content/architecture.po
+++ b/documentation/manual/src/main/docbook/fr-FR/content/architecture.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: architecture\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-03-12T00:03:45\n"
+"POT-Creation-Date: 2010-07-21 05:26+0000\n"
 "PO-Revision-Date: 2010-01-04 16:40+1000\n"
 "Last-Translator: Corina Roe <croe@redhat.com>\n"
 "Language-Team: French <i18@redhat.com>\n"
@@ -17,16 +17,19 @@ msgstr ""
 "X-Generator: KBabel 1.11.4\n"
 
 #. Tag: title
+#: architecture.xml:34
 #, no-c-format
 msgid "Architecture"
 msgstr "Architecture"
 
 #. Tag: title
+#: architecture.xml:37
 #, no-c-format
 msgid "Overview"
 msgstr "Généralités"
 
 #. Tag: para
+#: architecture.xml:39
 #, no-c-format
 msgid ""
 "The diagram below provides a high-level view of the Hibernate architecture:"
@@ -35,41 +38,42 @@ msgstr ""
 "l'architecture Hibernate :"
 
 #. Tag: para
+#: architecture.xml:52
 #, no-c-format
 msgid ""
-"We do not have the scope in this document to provide a more detailed view of "
-"all the runtime architectures available; Hibernate is flexible and supports "
-"several different approaches. We will, however, show the two extremes: "
-"\"minimal\" architecture and \"comprehensive\" architecture."
+"Unfortunately we cannot provide a detailed view of all possible runtime "
+"architectures. Hibernate is sufficiently flexible to be used in a number of "
+"ways in many, many architectures. We will, however, illustrate 2 "
+"specifically since they are extremes."
 msgstr ""
-"Nous aimerions décrire une vue plus détaillée de l'architecture. Hibernate "
-"est flexible et prend en charge différentes approches. Nous allons en "
-"montrer les deux extrêmes : l'architecture \"légère\"  et l'architecture "
-"\"complète\"."
+
+#. Tag: title
+#: architecture.xml:59
+#, fuzzy, no-c-format
+msgid "Minimal architecture"
+msgstr "Architecture"
 
 #. Tag: para
-#, no-c-format
+#: architecture.xml:61
+#, fuzzy, no-c-format
 msgid ""
-"This next diagram illustrates how Hibernate utilizes database and "
-"configuration data to provide persistence services, and persistent objects, "
-"to the application."
-msgstr ""
-"Ce diagramme montre Hibernate utilisant la base de données et des données de "
-"configuration pour fournir un service de persistance, et des objets "
-"persistants, à l'application."
-
-#. Tag: para
-#, no-c-format
-msgid ""
-"The \"minimal\" architecture has the application provide its own JDBC "
-"connections and manage its own transactions. This approach uses a minimal "
-"subset of Hibernate's APIs:"
+"The \"minimal\" architecture has the application manage its own JDBC "
+"connections and provide those connections to Hibernate; additionally the "
+"application manages transactions for itself. This approach uses a minimal "
+"subset of Hibernate APIs."
 msgstr ""
 "L'architecture \"légère\" permet à l'application de fournir ses propres "
 "connexions JDBC et de gérer ses propres transactions. Cette approche utilise "
 "un sous-ensemble minimum des API Hibernate :"
 
+#. Tag: title
+#: architecture.xml:77
+#, no-c-format
+msgid "Comprehensive architecture"
+msgstr ""
+
 #. Tag: para
+#: architecture.xml:79
 #, no-c-format
 msgid ""
 "The \"comprehensive\" architecture abstracts the application away from the "
@@ -78,24 +82,37 @@ msgstr ""
 "L'architecture \"complète\" abstrait l'application des API JDBC/JTA sous-"
 "jacentes et permet à Hibernate de s'occuper des détails."
 
-#. Tag: para
+#. Tag: title
+#: architecture.xml:94
 #, no-c-format
-msgid "Here are some definitions of the objects depicted in the diagrams:"
-msgstr "Voici quelques définitions des objets dans les diagrammes :"
+msgid "Basic APIs"
+msgstr ""
+
+#. Tag: para
+#: architecture.xml:95
+#, no-c-format
+msgid ""
+"Here are quick discussions about some of the API objects depicted in the "
+"preceding diagrams (you will see them again in more detail in later "
+"chapters)."
+msgstr ""
 
 #. Tag: term
-#, no-c-format
-msgid "SessionFactory (<literal>org.hibernate.SessionFactory</literal>)"
+#: architecture.xml:100
+#, fuzzy, no-c-format
+msgid ""
+"SessionFactory (<interfacename>org.hibernate.SessionFactory</interfacename>)"
 msgstr "SessionFactory (<literal>org.hibernate.SessionFactory</literal>)"
 
 #. Tag: para
-#, no-c-format
+#: architecture.xml:102
+#, fuzzy, no-c-format
 msgid ""
-"A threadsafe, immutable cache of compiled mappings for a single database. A "
-"factory for <literal>Session</literal> and a client of "
-"<literal>ConnectionProvider</literal>, <literal>SessionFactory</literal> can "
-"hold an optional (second-level) cache of data that is reusable between "
-"transactions at a process, or cluster, level."
+"A thread-safe, immutable cache of compiled mappings for a single database. A "
+"factory for <interfacename>org.hibernate.Session</interfacename> instances. "
+"A client of <interfacename>org.hibernate.connection.ConnectionProvider</"
+"interfacename>. Optionally maintains a <literal>second level cache</literal> "
+"of data that is reusable between transactions at a process or cluster level."
 msgstr ""
 "Un cache threadsafe (immuable) de mappages compilés pour une base de "
 "données. En tant que fabrique de <literal>Session</literal> et que client du "
@@ -105,18 +122,22 @@ msgstr ""
 "ou au niveau d'un cluster."
 
 #. Tag: term
-#, no-c-format
-msgid "Session (<literal>org.hibernate.Session</literal>)"
+#: architecture.xml:112
+#, fuzzy, no-c-format
+msgid "Session (<interfacename>org.hibernate.Session</interfacename>)"
 msgstr "Session (<literal>org.hibernate.Session</literal>)"
 
 #. Tag: para
-#, no-c-format
+#: architecture.xml:114
+#, fuzzy, no-c-format
 msgid ""
 "A single-threaded, short-lived object representing a conversation between "
-"the application and the persistent store. It wraps a JDBC connection and is "
-"a factory for <literal>Transaction</literal>. <literal>Session</literal> "
-"holds a mandatory first-level cache of persistent objects that are used when "
-"navigating the object graph or looking up objects by identifier."
+"the application and the persistent store. Wraps a JDBC <interfacename>java."
+"sql.Connection</interfacename>. Factory for <interfacename>org.hibernate."
+"Transaction</interfacename>. Maintains a <literal>first level cache</"
+"literal> of persistent the application's persistent objects and collections; "
+"this cache is used when navigating the object graph or looking up objects by "
+"identifier."
 msgstr ""
 "Un objet mono-threadé, à durée de vie courte, qui représente une "
 "conversation entre l'application et l'entrepôt de persistance. Encapsule une "
@@ -126,19 +147,22 @@ msgstr ""
 "ou lors de la récupération d'objets par leur identifiant."
 
 #. Tag: term
+#: architecture.xml:126
 #, no-c-format
 msgid "Persistent objects and collections"
 msgstr "Objets et collections persistants"
 
 #. Tag: para
-#, no-c-format
+#: architecture.xml:128
+#, fuzzy, 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 <literal>Session</literal>. Once the "
-"<literal>Session</literal> is closed, they will be detached and free to use "
-"in any application layer (for example, directly as data transfer objects to "
-"and from presentation)."
+"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"
 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 "
@@ -148,17 +172,20 @@ msgstr ""
 "couche de l'application (par ex. de et vers la présentation)."
 
 #. Tag: term
+#: architecture.xml:139
 #, no-c-format
 msgid "Transient and detached objects and collections"
 msgstr "Objets et collections éphémères (transient) et détachés"
 
 #. Tag: para
-#, no-c-format
+#: architecture.xml:141
+#, fuzzy, no-c-format
 msgid ""
 "Instances of persistent classes that are not currently associated with a "
-"<literal>Session</literal>. They may have been instantiated by the "
-"application and not yet persisted, or they may have been instantiated by a "
-"closed <literal>Session</literal>."
+"<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"
 msgstr ""
 "Instances de classes persistantes qui ne sont actuellement pas associées à "
 "une <literal>Session</literal>. Elles ont pu être instanciées par "
@@ -166,19 +193,22 @@ msgstr ""
 "instanciées par une <literal>Session</literal> fermée."
 
 #. Tag: term
-#, no-c-format
-msgid "Transaction (<literal>org.hibernate.Transaction</literal>)"
+#: architecture.xml:151
+#, fuzzy, no-c-format
+msgid "Transaction (<interfacename>org.hibernate.Transaction</interfacename>)"
 msgstr "Transaction (<literal>org.hibernate.Transaction</literal>)"
 
 #. Tag: para
-#, no-c-format
+#: architecture.xml:153
+#, fuzzy, 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 <literal>Session</literal> "
-"might span several <literal>Transaction</literal>s in some cases. However, "
-"transaction demarcation, either using the underlying API or "
-"<literal>Transaction</literal>, is never optional."
+"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 ""
 "(Optionnel) Un objet mono-threadé à vie courte utilisé par l'application "
 "pour définir une unité de travail atomique. Abstrait l'application des "
@@ -189,21 +219,24 @@ msgstr ""
 "n'est jamais optionnelle. "
 
 #. Tag: term
-#, no-c-format
+#: architecture.xml:164
+#, fuzzy, no-c-format
 msgid ""
-"ConnectionProvider (<literal>org.hibernate.connection.ConnectionProvider</"
-"literal>)"
+"ConnectionProvider (<interfacename>org.hibernate.connection."
+"ConnectionProvider</interfacename>)"
 msgstr ""
 "ConnectionProvider (<literal>org.hibernate.connection.ConnectionProvider</"
 "literal>)"
 
 #. Tag: para
-#, no-c-format
+#: architecture.xml:166
+#, fuzzy, no-c-format
 msgid ""
 "(Optional) A factory for, and pool of, JDBC connections. It abstracts the "
-"application from underlying <literal>Datasource</literal> or "
-"<literal>DriverManager</literal>. It is not exposed to application, but it "
-"can be extended and/or implemented by the developer."
+"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 ""
 "(Optionnel) Une fabrique de (pool de) connexions JDBC. Abstrait "
 "l'application de la <literal>Datasource</literal> ou du "
@@ -211,29 +244,34 @@ msgstr ""
 "mais peut être étendu/implémenté par le développeur. "
 
 #. Tag: term
-#, no-c-format
+#: architecture.xml:175
+#, fuzzy, no-c-format
 msgid ""
-"TransactionFactory (<literal>org.hibernate.TransactionFactory</literal>)"
+"TransactionFactory (<interfacename>org.hibernate.TransactionFactory</"
+"interfacename>)"
 msgstr ""
 "TransactionFactory (<literal>org.hibernate.TransactionFactory</literal>)"
 
 #. Tag: para
-#, no-c-format
+#: architecture.xml:177
+#, fuzzy, no-c-format
 msgid ""
-"(Optional) A factory for <literal>Transaction</literal> instances. It is not "
-"exposed to the application, but it can be extended and/or implemented by the "
-"developer."
+"(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 ""
 "(Optionnel) Une fabrique d'instances de <literal>Transaction</literal>. Non "
 "exposée à l'application, mais peut être étendue/implémentée par le "
 "développeur. "
 
-#. Tag: term
+#. Tag: emphasis
+#: architecture.xml:185
 #, fuzzy, no-c-format
-msgid "<emphasis>Extension Interfaces</emphasis>"
+msgid "Extension Interfaces"
 msgstr "<emphasis>Interfaces d'extension</emphasis> "
 
 #. Tag: para
+#: architecture.xml:187
 #, no-c-format
 msgid ""
 "Hibernate offers a range of optional extension interfaces you can implement "
@@ -245,25 +283,14 @@ msgstr ""
 "de persistance. Reportez vous à la documentation de l'API pour plus de "
 "détails. "
 
-#. Tag: para
-#, no-c-format
-msgid ""
-"Given a \"minimal\" architecture, the application bypasses the "
-"<literal>Transaction</literal>/<literal>TransactionFactory</literal> and/or "
-"<literal>ConnectionProvider</literal> APIs to communicate with JTA or JDBC "
-"directly."
-msgstr ""
-"Dans une architecture légère, l'application n'aura pas à utiliser les API "
-"<literal>Transaction</literal>/<literal>TransactionFactory</literal> et/ou "
-"n'utilisera pas les API <literal>ConnectionProvider</literal> pour utiliser "
-"directement JTA ou JDBC. "
-
 #. 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. "
@@ -277,11 +304,13 @@ msgstr ""
 "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 "
@@ -292,11 +321,13 @@ msgstr ""
 "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 "
@@ -313,11 +344,13 @@ msgstr ""
 "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 "
@@ -333,11 +366,13 @@ msgstr ""
 "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
 #, no-c-format
 msgid ""
 "JMX is the J2EE standard for the management of Java components. Hibernate "
@@ -351,74 +386,11 @@ msgstr ""
 "literal>. "
 
 #. Tag: para
-#, no-c-format
-msgid ""
-"For an example of how to deploy Hibernate as a JMX service on the JBoss "
-"Application Server, please see the JBoss User Guide. JBoss AS also provides "
-"these benefits if you deploy using JMX:"
-msgstr ""
-"Pour un exemple sur la manière de déployer Hibernate en tant que service JMX "
-"dans le serveur d'application JBoss Application Server, référez vous au "
-"guide de l'utilisateur JBoss (JBoss User Guide). Si vous déployez Hibernate "
-"via JMX sur JBoss AS, vous aurez également les avantages suivants : "
-
-#. Tag: para
-#, no-c-format
-msgid ""
-"<emphasis>Session Management</emphasis>: the Hibernate <literal>Session</"
-"literal>'s life cycle can be automatically bound to the scope of a JTA "
-"transaction. This means that you no longer have to manually open and close "
-"the <literal>Session</literal>; this becomes the job of a JBoss EJB "
-"interceptor. You also do not have to worry about transaction demarcation in "
-"your code (if you would like to write a portable persistence layer use the "
-"optional Hibernate <literal>Transaction</literal> API for this). You call "
-"the <literal>HibernateContext</literal> to access a <literal>Session</"
-"literal>."
-msgstr ""
-"<emphasis>Gestion de la session</emphasis> : le cycle de vie de la "
-"<literal>Session</literal> Hibernate peut être automatiquement liée à la "
-"portée d'une transaction JTA. Cela signifie que vous n'avez plus besoin "
-"d'ouvrir et de fermer la <literal>Session</literal> manuellement, cela "
-"devient le travail de l'intercepteur EJB de JBoss. Vous n'avez pas non plus "
-"à vous occuper des démarcations des transactions dans votre code (sauf si "
-"vous voulez écrire une couche de persistance qui soit portable, dans ce cas "
-"vous pouvez utiliser l'API optionnelle <literal>Transaction</literal> de "
-"Hibernate). Vous appelez le <literal>HibernateContext</literal> pour accéder "
-"à la <literal>Session</literal>. "
-
-#. Tag: para
-#, no-c-format
-msgid ""
-"<emphasis>HAR deployment</emphasis>: the Hibernate JMX service is deployed "
-"using a JBoss service deployment descriptor in an EAR and/or SAR file, as it "
-"supports all the usual configuration options of a Hibernate "
-"<literal>SessionFactory</literal>. However, you still need to name all your "
-"mapping files in the deployment descriptor. If you use the optional HAR "
-"deployment, JBoss will automatically detect all mapping files in your HAR "
-"file."
-msgstr ""
-"<emphasis>Déploiement HAR :</emphasis>: habituellement vous déployez le "
-"service JMX Hibernate en utilisant le descripteur de déploiement de JBoss "
-"dans un fichier EAR et/ou un SAR, car il supporte toutes les options de "
-"configuration usuelles d'une <literal>SessionFactory</literal> Hibernate. "
-"Cependant, vous devez toujours nommer tous vos fichiers de mappage dans le "
-"descripteur de déploiement. Si vous décidez d'utiliser le déploiement "
-"optionnel sous forme de HAR, JBoss détectera automatiquement tous vos "
-"fichiers de mapping dans votre fichier HAR."
-
-#. Tag: para
-#, no-c-format
-msgid ""
-"Consult the JBoss AS user guide for more information about these options."
-msgstr ""
-"Consultez le guide d'utilisation de JBoss AS pour plus d'informations sur "
-"ces options."
-
-#. Tag: para
+#: architecture.xml:257
 #, fuzzy, no-c-format
 msgid ""
 "Another feature available as a JMX service is runtime Hibernate statistics. "
-"See <xref linkend=\"configuration-optional-statistics\" /> for more "
+"See <xref linkend=\"configuration-optional-statistics\"/> for more "
 "information."
 msgstr ""
 "Les statistiques Hibernate (runtime) représentent une autre fonctionnalité "
@@ -426,27 +398,13 @@ msgstr ""
 "linkend=\"configuration-optional-statistics\" />."
 
 #. Tag: title
-#, no-c-format
-msgid "JCA Support"
-msgstr "Support JCA"
-
-#. Tag: para
-#, no-c-format
-msgid ""
-"Hibernate can also be configured as a JCA connector. Please see the website "
-"for more information. Please note, however, that at this stage Hibernate JCA "
-"support is under development."
-msgstr ""
-"Hibernate peut aussi être configuré en tant que connecteur JCA. Référez-vous "
-"au site web pour de plus amples détails. Il est important de noter que le "
-"support JCA de Hibernate est encore considéré comme expérimental. "
-
-#. Tag: title
+#: architecture.xml:264
 #, no-c-format
 msgid "Contextual sessions"
 msgstr "Sessions contextuelles "
 
 #. Tag: para
+#: architecture.xml:265
 #, no-c-format
 msgid ""
 "Most applications using Hibernate need some form of \"contextual\" session, "
@@ -472,6 +430,7 @@ msgstr ""
 "l'utilisation de proxy/interception. "
 
 #. Tag: para
+#: architecture.xml:274
 #, no-c-format
 msgid ""
 "Starting with version 3.0.1, Hibernate added the <literal>SessionFactory."
@@ -497,6 +456,7 @@ msgstr ""
 "<literal>JTA</literal>. "
 
 #. Tag: para
+#: architecture.xml:284
 #, no-c-format
 msgid ""
 "However, as of version 3.1, the processing behind <literal>SessionFactory."
@@ -515,6 +475,7 @@ msgstr ""
 "caractéristiques."
 
 #. Tag: para
+#: architecture.xml:291
 #, no-c-format
 msgid ""
 "See the Javadocs for the <literal>org.hibernate.context."
@@ -531,6 +492,7 @@ msgstr ""
 "courante. Hibernate fournit trois implémentations de cette interface :"
 
 #. Tag: para
+#: architecture.xml:301
 #, no-c-format
 msgid ""
 "<literal>org.hibernate.context.JTASessionContext</literal>: current sessions "
@@ -544,6 +506,7 @@ msgstr ""
 "javadocs pour pour plus d'informations. "
 
 #. Tag: para
+#: architecture.xml:309
 #, no-c-format
 msgid ""
 "<literal>org.hibernate.context.ThreadLocalSessionContext</literal>:current "
@@ -554,6 +517,7 @@ msgstr ""
 "javadocs pour plus d'informations. "
 
 #. Tag: para
+#: architecture.xml:315
 #, no-c-format
 msgid ""
 "<literal>org.hibernate.context.ManagedSessionContext</literal>: current "
@@ -568,6 +532,7 @@ msgstr ""
 "ni ne nettoie ou ne ferme une <literal>Session</literal>."
 
 #. Tag: para
+#: architecture.xml:324
 #, fuzzy, no-c-format
 msgid ""
 "The first two implementations provide a \"one session - one database "
@@ -580,7 +545,7 @@ msgid ""
 "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 "
+"operations in your code. Refer to <xref linkend=\"transactions\"/> for more "
 "information and code examples."
 msgstr ""
 "Les deux premières implémentations fournissent un modèle de programmation de "
@@ -597,6 +562,7 @@ msgstr ""
 "et des exemples de code."
 
 #. Tag: para
+#: architecture.xml:336
 #, no-c-format
 msgid ""
 "The <literal>hibernate.current_session_context_class</literal> configuration "
@@ -621,3 +587,106 @@ msgstr ""
 "d'implémentation à utiliser. Pour les trois implémentations prêtes à "
 "utiliser, toutefois, il y a trois noms brefs correspondants : \"jta\", "
 "\"thread\" et \"managed\"."
+
+#~ msgid ""
+#~ "We do not have the scope in this document to provide a more detailed view "
+#~ "of all the runtime architectures available; Hibernate is flexible and "
+#~ "supports several different approaches. We will, however, show the two "
+#~ "extremes: \"minimal\" architecture and \"comprehensive\" architecture."
+#~ msgstr ""
+#~ "Nous aimerions décrire une vue plus détaillée de l'architecture. "
+#~ "Hibernate est flexible et prend en charge différentes approches. Nous "
+#~ "allons en montrer les deux extrêmes : l'architecture \"légère\"  et "
+#~ "l'architecture \"complète\"."
+
+#~ msgid ""
+#~ "This next diagram illustrates how Hibernate utilizes database and "
+#~ "configuration data to provide persistence services, and persistent "
+#~ "objects, to the application."
+#~ msgstr ""
+#~ "Ce diagramme montre Hibernate utilisant la base de données et des données "
+#~ "de configuration pour fournir un service de persistance, et des objets "
+#~ "persistants, à l'application."
+
+#~ msgid "Here are some definitions of the objects depicted in the diagrams:"
+#~ msgstr "Voici quelques définitions des objets dans les diagrammes :"
+
+#~ msgid ""
+#~ "Given a \"minimal\" architecture, the application bypasses the "
+#~ "<literal>Transaction</literal>/<literal>TransactionFactory</literal> and/"
+#~ "or <literal>ConnectionProvider</literal> APIs to communicate with JTA or "
+#~ "JDBC directly."
+#~ msgstr ""
+#~ "Dans une architecture légère, l'application n'aura pas à utiliser les API "
+#~ "<literal>Transaction</literal>/<literal>TransactionFactory</literal> et/"
+#~ "ou n'utilisera pas les API <literal>ConnectionProvider</literal> pour "
+#~ "utiliser directement JTA ou JDBC. "
+
+#~ msgid ""
+#~ "For an example of how to deploy Hibernate as a JMX service on the JBoss "
+#~ "Application Server, please see the JBoss User Guide. JBoss AS also "
+#~ "provides these benefits if you deploy using JMX:"
+#~ msgstr ""
+#~ "Pour un exemple sur la manière de déployer Hibernate en tant que service "
+#~ "JMX dans le serveur d'application JBoss Application Server, référez vous "
+#~ "au guide de l'utilisateur JBoss (JBoss User Guide). Si vous déployez "
+#~ "Hibernate via JMX sur JBoss AS, vous aurez également les avantages "
+#~ "suivants : "
+
+#~ msgid ""
+#~ "<emphasis>Session Management</emphasis>: the Hibernate <literal>Session</"
+#~ "literal>'s life cycle can be automatically bound to the scope of a JTA "
+#~ "transaction. This means that you no longer have to manually open and "
+#~ "close the <literal>Session</literal>; this becomes the job of a JBoss EJB "
+#~ "interceptor. You also do not have to worry about transaction demarcation "
+#~ "in your code (if you would like to write a portable persistence layer use "
+#~ "the optional Hibernate <literal>Transaction</literal> API for this). You "
+#~ "call the <literal>HibernateContext</literal> to access a "
+#~ "<literal>Session</literal>."
+#~ msgstr ""
+#~ "<emphasis>Gestion de la session</emphasis> : le cycle de vie de la "
+#~ "<literal>Session</literal> Hibernate peut être automatiquement liée à la "
+#~ "portée d'une transaction JTA. Cela signifie que vous n'avez plus besoin "
+#~ "d'ouvrir et de fermer la <literal>Session</literal> manuellement, cela "
+#~ "devient le travail de l'intercepteur EJB de JBoss. Vous n'avez pas non "
+#~ "plus à vous occuper des démarcations des transactions dans votre code "
+#~ "(sauf si vous voulez écrire une couche de persistance qui soit portable, "
+#~ "dans ce cas vous pouvez utiliser l'API optionnelle <literal>Transaction</"
+#~ "literal> de Hibernate). Vous appelez le <literal>HibernateContext</"
+#~ "literal> pour accéder à la <literal>Session</literal>. "
+
+#~ msgid ""
+#~ "<emphasis>HAR deployment</emphasis>: the Hibernate JMX service is "
+#~ "deployed using a JBoss service deployment descriptor in an EAR and/or SAR "
+#~ "file, as it supports all the usual configuration options of a Hibernate "
+#~ "<literal>SessionFactory</literal>. However, you still need to name all "
+#~ "your mapping files in the deployment descriptor. If you use the optional "
+#~ "HAR deployment, JBoss will automatically detect all mapping files in your "
+#~ "HAR file."
+#~ msgstr ""
+#~ "<emphasis>Déploiement HAR :</emphasis>: habituellement vous déployez le "
+#~ "service JMX Hibernate en utilisant le descripteur de déploiement de JBoss "
+#~ "dans un fichier EAR et/ou un SAR, car il supporte toutes les options de "
+#~ "configuration usuelles d'une <literal>SessionFactory</literal> Hibernate. "
+#~ "Cependant, vous devez toujours nommer tous vos fichiers de mappage dans "
+#~ "le descripteur de déploiement. Si vous décidez d'utiliser le déploiement "
+#~ "optionnel sous forme de HAR, JBoss détectera automatiquement tous vos "
+#~ "fichiers de mapping dans votre fichier HAR."
+
+#~ msgid ""
+#~ "Consult the JBoss AS user guide for more information about these options."
+#~ msgstr ""
+#~ "Consultez le guide d'utilisation de JBoss AS pour plus d'informations sur "
+#~ "ces options."
+
+#~ msgid "JCA Support"
+#~ msgstr "Support JCA"
+
+#~ msgid ""
+#~ "Hibernate can also be configured as a JCA connector. Please see the "
+#~ "website for more information. Please note, however, that at this stage "
+#~ "Hibernate JCA support is under development."
+#~ msgstr ""
+#~ "Hibernate peut aussi être configuré en tant que connecteur JCA. Référez-"
+#~ "vous au site web pour de plus amples détails. Il est important de noter "
+#~ "que le support JCA de Hibernate est encore considéré comme expérimental. "
diff --git a/documentation/manual/src/main/docbook/ja-JP/content/architecture.po b/documentation/manual/src/main/docbook/ja-JP/content/architecture.po
index 557cbf1c93..55a4d09ff3 100644
--- a/documentation/manual/src/main/docbook/ja-JP/content/architecture.po
+++ b/documentation/manual/src/main/docbook/ja-JP/content/architecture.po
@@ -4,7 +4,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Collection_Mapping\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-03-12T00:03:45\n"
+"POT-Creation-Date: 2010-07-21 05:26+0000\n"
 "PO-Revision-Date: 2010-01-13 10:25+1000\n"
 "Last-Translator: Xi HUANG <xhuang@redhat.com>\n"
 "Language-Team:  <en@li.org>\n"
@@ -14,52 +14,48 @@ msgstr ""
 "X-Generator: KBabel 1.11.4\n"
 
 #. Tag: title
+#: architecture.xml:34
 #, no-c-format
 msgid "Architecture"
 msgstr "アーキテクチャ"
 
 #. Tag: title
+#: architecture.xml:37
 #, no-c-format
 msgid "Overview"
 msgstr "概観"
 
 #. Tag: para
+#: architecture.xml:39
 #, no-c-format
 msgid ""
 "The diagram below provides a high-level view of the Hibernate architecture:"
 msgstr "Hibernate アーキテクチャの（非常に）高いレベルからのビュー："
 
 #. Tag: para
-#, fuzzy, no-c-format
-msgid ""
-"We do not have the scope in this document to provide a more detailed view of "
-"all the runtime architectures available; Hibernate is flexible and supports "
-"several different approaches. We will, however, show the two extremes: "
-"\"minimal\" architecture and \"comprehensive\" architecture."
-msgstr ""
-"ここで実行時アーキテクチャのより詳細なビューをお見せしましょう。あいにく、 "
-"Hibernate は柔軟であり、いろいろなアプローチをサポートしています。ここでは、2"
-"つの極端な例をお見せします。「軽い」アーキテクチャでは、アプリケーションが自"
-"前の JDBC コネクションを用意し、アプリケーション自身がトランザクションを管理"
-"します。この方法は、 Hibernate API の最小限のサブセットを使います："
-
-#. Tag: para
+#: architecture.xml:52
 #, no-c-format
 msgid ""
-"This next diagram illustrates how Hibernate utilizes database and "
-"configuration data to provide persistence services, and persistent objects, "
-"to the application."
+"Unfortunately we cannot provide a detailed view of all possible runtime "
+"architectures. Hibernate is sufficiently flexible to be used in a number of "
+"ways in many, many architectures. We will, however, illustrate 2 "
+"specifically since they are extremes."
 msgstr ""
-"この図は Hibernate が、アプリケーションに対して永続化サービス （と永続オブ"
-"ジェクト）を提供するために、データベースと設定データを使うことを示していま"
-"す。"
+
+#. Tag: title
+#: architecture.xml:59
+#, fuzzy, no-c-format
+msgid "Minimal architecture"
+msgstr "アーキテクチャ"
 
 #. Tag: para
+#: architecture.xml:61
 #, fuzzy, no-c-format
 msgid ""
-"The \"minimal\" architecture has the application provide its own JDBC "
-"connections and manage its own transactions. This approach uses a minimal "
-"subset of Hibernate's APIs:"
+"The \"minimal\" architecture has the application manage its own JDBC "
+"connections and provide those connections to Hibernate; additionally the "
+"application manages transactions for itself. This approach uses a minimal "
+"subset of Hibernate APIs."
 msgstr ""
 "ここで実行時アーキテクチャのより詳細なビューをお見せしましょう。あいにく、 "
 "Hibernate は柔軟であり、いろいろなアプローチをサポートしています。ここでは、2"
@@ -67,7 +63,14 @@ msgstr ""
 "前の JDBC コネクションを用意し、アプリケーション自身がトランザクションを管理"
 "します。この方法は、 Hibernate API の最小限のサブセットを使います："
 
+#. Tag: title
+#: architecture.xml:77
+#, no-c-format
+msgid "Comprehensive architecture"
+msgstr ""
+
 #. Tag: para
+#: architecture.xml:79
 #, fuzzy, no-c-format
 msgid ""
 "The \"comprehensive\" architecture abstracts the application away from the "
@@ -76,24 +79,37 @@ msgstr ""
 "「軽い」アーキテクチャは、アプリケーションから、その下に位置する JDBC や JTA "
 "の API を取り払って抽象化し、その詳細の面倒を Hibernate に見させます。"
 
-#. Tag: para
+#. Tag: title
+#: architecture.xml:94
 #, no-c-format
-msgid "Here are some definitions of the objects depicted in the diagrams:"
-msgstr "以下は、図に含まれるオブジェクトの定義です："
+msgid "Basic APIs"
+msgstr ""
+
+#. Tag: para
+#: architecture.xml:95
+#, no-c-format
+msgid ""
+"Here are quick discussions about some of the API objects depicted in the "
+"preceding diagrams (you will see them again in more detail in later "
+"chapters)."
+msgstr ""
 
 #. Tag: term
-#, no-c-format
-msgid "SessionFactory (<literal>org.hibernate.SessionFactory</literal>)"
+#: architecture.xml:100
+#, fuzzy, no-c-format
+msgid ""
+"SessionFactory (<interfacename>org.hibernate.SessionFactory</interfacename>)"
 msgstr "SessionFactory (<literal>org.hibernate.SessionFactory</literal>)"
 
 #. Tag: para
+#: architecture.xml:102
 #, fuzzy, no-c-format
 msgid ""
-"A threadsafe, immutable cache of compiled mappings for a single database. A "
-"factory for <literal>Session</literal> and a client of "
-"<literal>ConnectionProvider</literal>, <literal>SessionFactory</literal> can "
-"hold an optional (second-level) cache of data that is reusable between "
-"transactions at a process, or cluster, level."
+"A thread-safe, immutable cache of compiled mappings for a single database. A "
+"factory for <interfacename>org.hibernate.Session</interfacename> instances. "
+"A client of <interfacename>org.hibernate.connection.ConnectionProvider</"
+"interfacename>. Optionally maintains a <literal>second level cache</literal> "
+"of data that is reusable between transactions at a process or cluster level."
 msgstr ""
 "1つのデータベースに対するコンパイルされたマッピングのスレッドセーフな（更新不"
 "能の）キャッシュ。 <literal>Session</literal> のファクトリであり、 "
@@ -102,18 +118,22 @@ msgstr ""
 "（二次）キャッシュを持ちます。"
 
 #. Tag: term
-#, no-c-format
-msgid "Session (<literal>org.hibernate.Session</literal>)"
+#: architecture.xml:112
+#, fuzzy, no-c-format
+msgid "Session (<interfacename>org.hibernate.Session</interfacename>)"
 msgstr "Session (<literal>org.hibernate.Session</literal>)"
 
 #. Tag: para
+#: architecture.xml:114
 #, fuzzy, no-c-format
 msgid ""
 "A single-threaded, short-lived object representing a conversation between "
-"the application and the persistent store. It wraps a JDBC connection and is "
-"a factory for <literal>Transaction</literal>. <literal>Session</literal> "
-"holds a mandatory first-level cache of persistent objects that are used when "
-"navigating the object graph or looking up objects by identifier."
+"the application and the persistent store. Wraps a JDBC <interfacename>java."
+"sql.Connection</interfacename>. Factory for <interfacename>org.hibernate."
+"Transaction</interfacename>. Maintains a <literal>first level cache</"
+"literal> of persistent the application's persistent objects and collections; "
+"this cache is used when navigating the object graph or looking up objects by "
+"identifier."
 msgstr ""
 "アプリケーションと永続ストアとの対話を表す、シングルスレッドで短命のオブジェ"
 "クト。 JDBC コネクションをラップします。 <literal>Transaction</literal> の"
@@ -122,19 +142,22 @@ msgstr ""
 "を検索する時に使われます。"
 
 #. Tag: term
+#: architecture.xml:126
 #, no-c-format
 msgid "Persistent objects and collections"
 msgstr "Persistent objects と Collections"
 
 #. Tag: para
-#, no-c-format
+#: architecture.xml:128
+#, fuzzy, 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 <literal>Session</literal>. Once the "
-"<literal>Session</literal> is closed, they will be detached and free to use "
-"in any application layer (for example, directly as data transfer objects to "
-"and from presentation)."
+"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"
 msgstr ""
 "永続化状態とビジネス機能を持つ、短命でシングルスレッドのオブジェクト。これは"
 "通常の JavaBeans/POJO のこともありますが、特徴的なことは、その時点での（ただ1"
@@ -144,17 +167,20 @@ msgstr ""
 "レゼンテーション層から、またはプレゼンテーション層へ直接使用できます）。"
 
 #. Tag: term
+#: architecture.xml:139
 #, no-c-format
 msgid "Transient and detached objects and collections"
 msgstr "Transient と detached な objects と Collections"
 
 #. Tag: para
-#, no-c-format
+#: architecture.xml:141
+#, fuzzy, no-c-format
 msgid ""
 "Instances of persistent classes that are not currently associated with a "
-"<literal>Session</literal>. They may have been instantiated by the "
-"application and not yet persisted, or they may have been instantiated by a "
-"closed <literal>Session</literal>."
+"<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"
 msgstr ""
 "現時点では <literal>Session</literal> と関連していない、永続クラスのインスタ"
 "ンス。すでにアプリケーション側でインスタンス化されていて、まだ永続化されてい"
@@ -162,19 +188,22 @@ msgstr ""
 "どちらかです。"
 
 #. Tag: term
-#, no-c-format
-msgid "Transaction (<literal>org.hibernate.Transaction</literal>)"
+#: architecture.xml:151
+#, fuzzy, no-c-format
+msgid "Transaction (<interfacename>org.hibernate.Transaction</interfacename>)"
 msgstr "Transaction (<literal>org.hibernate.Transaction</literal>)"
 
 #. Tag: para
-#, no-c-format
+#: architecture.xml:153
+#, fuzzy, 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 <literal>Session</literal> "
-"might span several <literal>Transaction</literal>s in some cases. However, "
-"transaction demarcation, either using the underlying API or "
-"<literal>Transaction</literal>, is never optional."
+"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 ""
 "(オプション) 原子性を持つ作業単位 (Unit of Work) を指定するために、アプリケー"
 "ションが使用する、シングルスレッドで短命なオブジェクト。下に位置する JDBC 、 "
@@ -185,21 +214,24 @@ msgstr ""
 "とは、決してオプションではありません。"
 
 #. Tag: term
-#, no-c-format
+#: architecture.xml:164
+#, fuzzy, no-c-format
 msgid ""
-"ConnectionProvider (<literal>org.hibernate.connection.ConnectionProvider</"
-"literal>)"
+"ConnectionProvider (<interfacename>org.hibernate.connection."
+"ConnectionProvider</interfacename>)"
 msgstr ""
 "ConnectionProvider (<literal>org.hibernate.connection.ConnectionProvider</"
 "literal>)"
 
 #. Tag: para
-#, no-c-format
+#: architecture.xml:166
+#, fuzzy, no-c-format
 msgid ""
 "(Optional) A factory for, and pool of, JDBC connections. It abstracts the "
-"application from underlying <literal>Datasource</literal> or "
-"<literal>DriverManager</literal>. It is not exposed to application, but it "
-"can be extended and/or implemented by the developer."
+"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 ""
 "(オプション) JDBC コネクション（とそのプール）のファクトリ。下の層に位置する "
 "<literal>Datasource</literal> や <literal>DriverManager</literal> からアプリ"
@@ -207,28 +239,33 @@ msgstr ""
 "または実装することは可能です。"
 
 #. Tag: term
-#, no-c-format
+#: architecture.xml:175
+#, fuzzy, no-c-format
 msgid ""
-"TransactionFactory (<literal>org.hibernate.TransactionFactory</literal>)"
+"TransactionFactory (<interfacename>org.hibernate.TransactionFactory</"
+"interfacename>)"
 msgstr ""
 "TransactionFactory (<literal>org.hibernate.TransactionFactory</literal>)"
 
 #. Tag: para
-#, no-c-format
+#: architecture.xml:177
+#, fuzzy, no-c-format
 msgid ""
-"(Optional) A factory for <literal>Transaction</literal> instances. It is not "
-"exposed to the application, but it can be extended and/or implemented by the "
-"developer."
+"(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 ""
 "(オプション) <literal>Transaction</literal> インスタンスのファクトリ。アプリ"
 "ケーションには公開されませんが、開発者が継承または実装することは可能です。"
 
-#. Tag: term
+#. Tag: emphasis
+#: architecture.xml:185
 #, fuzzy, no-c-format
-msgid "<emphasis>Extension Interfaces</emphasis>"
+msgid "Extension Interfaces"
 msgstr "<emphasis>Extension Interfaces</emphasis>"
 
 #. Tag: para
+#: architecture.xml:187
 #, no-c-format
 msgid ""
 "Hibernate offers a range of optional extension interfaces you can implement "
@@ -238,24 +275,14 @@ msgstr ""
 "Hibernate は、永続層の振る舞いをカスタマイズするために、多くのオプション拡張"
 "インタフェースを用意しています。詳細は API ドキュメントを参照してください。"
 
-#. Tag: para
-#, no-c-format
-msgid ""
-"Given a \"minimal\" architecture, the application bypasses the "
-"<literal>Transaction</literal>/<literal>TransactionFactory</literal> and/or "
-"<literal>ConnectionProvider</literal> APIs to communicate with JTA or JDBC "
-"directly."
-msgstr ""
-"「軽い」アーキテクチャでは、アプリケーションは直接 JTA や JDBC と対話するため"
-"に、 <literal>Transaction</literal> や <literal>TransactionFactory</literal> "
-"や <literal>ConnectionProvider</literal> の 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. "
@@ -268,11 +295,13 @@ msgstr ""
 "<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 "
@@ -282,11 +311,13 @@ 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 "
@@ -302,11 +333,13 @@ msgstr ""
 "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 "
@@ -322,11 +355,13 @@ msgstr ""
 "Java の ID との関連は、 Hibernate が保証しません。"
 
 #. Tag: title
+#: architecture.xml:249
 #, no-c-format
 msgid "JMX Integration"
 msgstr "JMX との統合"
 
 #. Tag: para
+#: architecture.xml:251
 #, no-c-format
 msgid ""
 "JMX is the J2EE standard for the management of Java components. Hibernate "
@@ -339,99 +374,24 @@ msgstr ""
 "hibernate.jmx.HibernateService</literal> という MBean 実装を用意しています。"
 
 #. Tag: para
-#, no-c-format
-msgid ""
-"For an example of how to deploy Hibernate as a JMX service on the JBoss "
-"Application Server, please see the JBoss User Guide. JBoss AS also provides "
-"these benefits if you deploy using JMX:"
-msgstr ""
-"JBoss アプリケーションサーバー上に Hibernate を JMX サービスとしてデプロイす"
-"る方法の例としては、 JBoss ユーザーガイドを参照してください。 JBoss アプリ"
-"ケーションサーバーにおいて、 JMX を使ってデプロイすると、次のメリットが得られ"
-"ます:"
-
-#. Tag: para
-#, no-c-format
-msgid ""
-"<emphasis>Session Management</emphasis>: the Hibernate <literal>Session</"
-"literal>'s life cycle can be automatically bound to the scope of a JTA "
-"transaction. This means that you no longer have to manually open and close "
-"the <literal>Session</literal>; this becomes the job of a JBoss EJB "
-"interceptor. You also do not have to worry about transaction demarcation in "
-"your code (if you would like to write a portable persistence layer use the "
-"optional Hibernate <literal>Transaction</literal> API for this). You call "
-"the <literal>HibernateContext</literal> to access a <literal>Session</"
-"literal>."
-msgstr ""
-"<emphasis>セッション管理:</emphasis> Hibernate の <literal>Session</literal> "
-"のライフサイクルは、自動的に JTA トランザクションのスコープに結びつけられま"
-"す。これは、もはや手動で <literal>Session</literal> をオープンしたり、クロー"
-"ズしたりする必要がないことを意味します。これは、 JBoss EJB インターセプタの仕"
-"事になります。また、コードのどこでトランザクション境界を設定するかについて、"
-"もはや悩む必要がありません（もちろん移植可能な永続層を書かかなくていいのなら"
-"ば、オプションの Hibernate の <literal>Transaction</literal> を使用してくださ"
-"い。） <literal>Session</literal> にアクセスするためには、 "
-"<literal>HibernateContext</literal> をコールしてください。"
-
-#. Tag: para
-#, no-c-format
-msgid ""
-"<emphasis>HAR deployment</emphasis>: the Hibernate JMX service is deployed "
-"using a JBoss service deployment descriptor in an EAR and/or SAR file, as it "
-"supports all the usual configuration options of a Hibernate "
-"<literal>SessionFactory</literal>. However, you still need to name all your "
-"mapping files in the deployment descriptor. If you use the optional HAR "
-"deployment, JBoss will automatically detect all mapping files in your HAR "
-"file."
-msgstr ""
-"<emphasis>HAR デプロイ:</emphasis> 通常、( EAR または SAR ファイルにある） "
-"JBoss サービスデプロイメントディスクリプタを使って、 Hibernate JMX サービスを"
-"デプロイします。それは、 Hibernate の <literal>SessionFactory</literal> の全"
-"ての一般的な設定オプションをサポートします。しかし依然としてデプロイメント"
-"ディスクリプタのなかにすべてのマッピングファイルの名前を挙げる必要がありま"
-"す。もし、オプションの HAR デプロイメントを使うことを決めたなら、 JBoss は自"
-"動的に HAR ファイルのなかの全てのマッピングファイルを検出します。"
-
-#. Tag: para
-#, no-c-format
-msgid ""
-"Consult the JBoss AS user guide for more information about these options."
-msgstr ""
-"これらのオプションについての詳細な情報は、 JBoss アプリケーションサーバーユー"
-"ザーガイドを参考にしてください。"
-
-#. Tag: para
+#: architecture.xml:257
 #, fuzzy, no-c-format
 msgid ""
 "Another feature available as a JMX service is runtime Hibernate statistics. "
-"See <xref linkend=\"configuration-optional-statistics\" /> for more "
+"See <xref linkend=\"configuration-optional-statistics\"/> for more "
 "information."
 msgstr ""
 "JMX サービスとして利用可能な他の機能に、 Hibernate 実行時統計情報があります。"
 "<xref linkend=\"configuration-optional-statistics\"/> を見てください。"
 
 #. Tag: title
-#, no-c-format
-msgid "JCA Support"
-msgstr "JCA サポート"
-
-#. Tag: para
-#, no-c-format
-msgid ""
-"Hibernate can also be configured as a JCA connector. Please see the website "
-"for more information. Please note, however, that at this stage Hibernate JCA "
-"support is under development."
-msgstr ""
-"Hibernate は JCA コネクタとしても設定できます。詳細については、 Web サイトを"
-"見てください。 Hibernate JCA サポートは、今のところ実験段階として考えられてい"
-"ることに注意してください。"
-
-#. Tag: title
+#: architecture.xml:264
 #, no-c-format
 msgid "Contextual sessions"
 msgstr "コンテキスト上のセッション"
 
 #. Tag: para
+#: architecture.xml:265
 #, no-c-format
 msgid ""
 "Most applications using Hibernate need some form of \"contextual\" session, "
@@ -456,6 +416,7 @@ msgstr ""
 "ワークを利用するかのいずれかでした。"
 
 #. Tag: para
+#: architecture.xml:274
 #, fuzzy, no-c-format
 msgid ""
 "Starting with version 3.0.1, Hibernate added the <literal>SessionFactory."
@@ -480,6 +441,7 @@ msgstr ""
 "「コンテキスト上のセッション」を使うしかないでしょう。"
 
 #. Tag: para
+#: architecture.xml:284
 #, no-c-format
 msgid ""
 "However, as of version 3.1, the processing behind <literal>SessionFactory."
@@ -497,6 +459,7 @@ msgstr ""
 "current_session_context_class</literal> ) が追加されました。"
 
 #. Tag: para
+#: architecture.xml:291
 #, fuzzy, no-c-format
 msgid ""
 "See the Javadocs for the <literal>org.hibernate.context."
@@ -514,6 +477,7 @@ msgstr ""
 "す。"
 
 #. Tag: para
+#: architecture.xml:301
 #, no-c-format
 msgid ""
 "<literal>org.hibernate.context.JTASessionContext</literal>: current sessions "
@@ -527,6 +491,7 @@ msgstr ""
 "Javadoc を参照してください。"
 
 #. Tag: para
+#: architecture.xml:309
 #, no-c-format
 msgid ""
 "<literal>org.hibernate.context.ThreadLocalSessionContext</literal>:current "
@@ -537,6 +502,7 @@ msgstr ""
 "さい。"
 
 #. Tag: para
+#: architecture.xml:315
 #, no-c-format
 msgid ""
 "<literal>org.hibernate.context.ManagedSessionContext</literal>: current "
@@ -551,6 +517,7 @@ msgstr ""
 "ラッシュ、クローズしません。"
 
 #. Tag: para
+#: architecture.xml:324
 #, fuzzy, no-c-format
 msgid ""
 "The first two implementations provide a \"one session - one database "
@@ -563,7 +530,7 @@ msgid ""
 "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 "
+"operations in your code. Refer to <xref linkend=\"transactions\"/> for more "
 "information and code examples."
 msgstr ""
 "はじめの2つの実装は、「1セッション - 1データベーストランザクション」プログラ"
@@ -580,6 +547,7 @@ msgstr ""
 "\"transactions\"/> を参照してください。"
 
 #. Tag: para
+#: architecture.xml:336
 #, no-c-format
 msgid ""
 "The <literal>hibernate.current_session_context_class</literal> configuration "
@@ -601,3 +569,107 @@ msgstr ""
 "JTASessionContext</literal> を使うことに注意してください。通常このパラメータ"
 "の値には、3つの実装の中から使用する実装クラスの名前を直接指定します。しかし、"
 "\"jta\"、 \"thread\"、 \"managed\"というそれぞれの省略名も用意されています。"
+
+#, 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 "
+#~ "extremes: \"minimal\" architecture and \"comprehensive\" architecture."
+#~ msgstr ""
+#~ "ここで実行時アーキテクチャのより詳細なビューをお見せしましょう。あいに"
+#~ "く、 Hibernate は柔軟であり、いろいろなアプローチをサポートしています。こ"
+#~ "こでは、2つの極端な例をお見せします。「軽い」アーキテクチャでは、アプリ"
+#~ "ケーションが自前の JDBC コネクションを用意し、アプリケーション自身がトラン"
+#~ "ザクションを管理します。この方法は、 Hibernate API の最小限のサブセットを"
+#~ "使います："
+
+#~ msgid ""
+#~ "This next diagram illustrates how Hibernate utilizes database and "
+#~ "configuration data to provide persistence services, and persistent "
+#~ "objects, to the application."
+#~ msgstr ""
+#~ "この図は Hibernate が、アプリケーションに対して永続化サービス （と永続オブ"
+#~ "ジェクト）を提供するために、データベースと設定データを使うことを示していま"
+#~ "す。"
+
+#~ msgid "Here are some definitions of the objects depicted in the diagrams:"
+#~ msgstr "以下は、図に含まれるオブジェクトの定義です："
+
+#~ msgid ""
+#~ "Given a \"minimal\" architecture, the application bypasses the "
+#~ "<literal>Transaction</literal>/<literal>TransactionFactory</literal> and/"
+#~ "or <literal>ConnectionProvider</literal> APIs to communicate with JTA or "
+#~ "JDBC directly."
+#~ msgstr ""
+#~ "「軽い」アーキテクチャでは、アプリケーションは直接 JTA や JDBC と対話する"
+#~ "ために、 <literal>Transaction</literal> や <literal>TransactionFactory</"
+#~ "literal> や <literal>ConnectionProvider</literal> の API をバイパスしま"
+#~ "す。"
+
+#~ msgid ""
+#~ "For an example of how to deploy Hibernate as a JMX service on the JBoss "
+#~ "Application Server, please see the JBoss User Guide. JBoss AS also "
+#~ "provides these benefits if you deploy using JMX:"
+#~ msgstr ""
+#~ "JBoss アプリケーションサーバー上に Hibernate を JMX サービスとしてデプロイ"
+#~ "する方法の例としては、 JBoss ユーザーガイドを参照してください。 JBoss アプ"
+#~ "リケーションサーバーにおいて、 JMX を使ってデプロイすると、次のメリットが"
+#~ "得られます:"
+
+#~ msgid ""
+#~ "<emphasis>Session Management</emphasis>: the Hibernate <literal>Session</"
+#~ "literal>'s life cycle can be automatically bound to the scope of a JTA "
+#~ "transaction. This means that you no longer have to manually open and "
+#~ "close the <literal>Session</literal>; this becomes the job of a JBoss EJB "
+#~ "interceptor. You also do not have to worry about transaction demarcation "
+#~ "in your code (if you would like to write a portable persistence layer use "
+#~ "the optional Hibernate <literal>Transaction</literal> API for this). You "
+#~ "call the <literal>HibernateContext</literal> to access a "
+#~ "<literal>Session</literal>."
+#~ msgstr ""
+#~ "<emphasis>セッション管理:</emphasis> Hibernate の <literal>Session</"
+#~ "literal> のライフサイクルは、自動的に JTA トランザクションのスコープに結び"
+#~ "つけられます。これは、もはや手動で <literal>Session</literal> をオープンし"
+#~ "たり、クローズしたりする必要がないことを意味します。これは、 JBoss EJB イ"
+#~ "ンターセプタの仕事になります。また、コードのどこでトランザクション境界を設"
+#~ "定するかについて、もはや悩む必要がありません（もちろん移植可能な永続層を書"
+#~ "かかなくていいのならば、オプションの Hibernate の <literal>Transaction</"
+#~ "literal> を使用してください。） <literal>Session</literal> にアクセスする"
+#~ "ためには、 <literal>HibernateContext</literal> をコールしてください。"
+
+#~ msgid ""
+#~ "<emphasis>HAR deployment</emphasis>: the Hibernate JMX service is "
+#~ "deployed using a JBoss service deployment descriptor in an EAR and/or SAR "
+#~ "file, as it supports all the usual configuration options of a Hibernate "
+#~ "<literal>SessionFactory</literal>. However, you still need to name all "
+#~ "your mapping files in the deployment descriptor. If you use the optional "
+#~ "HAR deployment, JBoss will automatically detect all mapping files in your "
+#~ "HAR file."
+#~ msgstr ""
+#~ "<emphasis>HAR デプロイ:</emphasis> 通常、( EAR または SAR ファイルにあ"
+#~ "る） JBoss サービスデプロイメントディスクリプタを使って、 Hibernate JMX "
+#~ "サービスをデプロイします。それは、 Hibernate の <literal>SessionFactory</"
+#~ "literal> の全ての一般的な設定オプションをサポートします。しかし依然として"
+#~ "デプロイメントディスクリプタのなかにすべてのマッピングファイルの名前を挙げ"
+#~ "る必要があります。もし、オプションの HAR デプロイメントを使うことを決めた"
+#~ "なら、 JBoss は自動的に HAR ファイルのなかの全てのマッピングファイルを検出"
+#~ "します。"
+
+#~ msgid ""
+#~ "Consult the JBoss AS user guide for more information about these options."
+#~ msgstr ""
+#~ "これらのオプションについての詳細な情報は、 JBoss アプリケーションサーバー"
+#~ "ユーザーガイドを参考にしてください。"
+
+#~ msgid "JCA Support"
+#~ msgstr "JCA サポート"
+
+#~ msgid ""
+#~ "Hibernate can also be configured as a JCA connector. Please see the "
+#~ "website for more information. Please note, however, that at this stage "
+#~ "Hibernate JCA support is under development."
+#~ msgstr ""
+#~ "Hibernate は JCA コネクタとしても設定できます。詳細については、 Web サイト"
+#~ "を見てください。 Hibernate JCA サポートは、今のところ実験段階として考えら"
+#~ "れていることに注意してください。"
diff --git a/documentation/manual/src/main/docbook/pot/content/architecture.pot b/documentation/manual/src/main/docbook/pot/content/architecture.pot
index c38cc0dacd..1eff20dc6d 100644
--- a/documentation/manual/src/main/docbook/pot/content/architecture.pot
+++ b/documentation/manual/src/main/docbook/pot/content/architecture.pot
@@ -1,273 +1,297 @@
-# 
-# AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: 0\n"
-"POT-Creation-Date: 2010-03-31T00:33:04\n"
-"PO-Revision-Date: 2010-03-31T00:33:04\n"
-"Last-Translator: Automatically generated\n"
-"Language-Team: None\n"
+"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"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <kde-i18n-doc@kde.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: application/x-publican; charset=UTF-8\n"
+"Content-Type: application/x-xml2pot; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
+#: architecture.xml:34
 #, no-c-format
 msgid "Architecture"
 msgstr ""
 
 #. Tag: title
+#: architecture.xml:37
 #, no-c-format
 msgid "Overview"
 msgstr ""
 
 #. Tag: para
+#: architecture.xml:39
 #, no-c-format
 msgid "The diagram below provides a high-level view of the Hibernate architecture:"
 msgstr ""
 
 #. Tag: para
+#: architecture.xml:52
 #, no-c-format
-msgid "We do not have the scope in this document to provide a more detailed view of all the runtime architectures available; Hibernate is flexible and supports several different approaches. We will, however, show the two extremes: \"minimal\" architecture and \"comprehensive\" architecture."
+msgid "Unfortunately we cannot provide a detailed view of all possible runtime architectures. Hibernate is sufficiently flexible to be used in a number of ways in many, many architectures. We will, however, illustrate 2 specifically since they are extremes."
+msgstr ""
+
+#. Tag: title
+#: architecture.xml:59
+#, no-c-format
+msgid "Minimal architecture"
 msgstr ""
 
 #. Tag: para
+#: architecture.xml:61
 #, no-c-format
-msgid "This next diagram illustrates how Hibernate utilizes database and configuration data to provide persistence services, and persistent objects, to the application."
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "The \"minimal\" architecture has the application provide its own JDBC connections and manage its own transactions. This approach uses a minimal subset of Hibernate's APIs:"
+msgid "The \"minimal\" architecture has the application manage its own JDBC connections and provide those connections to Hibernate; additionally the application manages transactions for itself. This approach uses a minimal subset of Hibernate APIs."
+msgstr ""
+
+#. Tag: title
+#: architecture.xml:77
+#, no-c-format
+msgid "Comprehensive architecture"
 msgstr ""
 
 #. Tag: para
+#: architecture.xml:79
 #, no-c-format
 msgid "The \"comprehensive\" architecture abstracts the application away from the underlying JDBC/JTA APIs and allows Hibernate to manage the details."
 msgstr ""
 
-#. Tag: para
+#. Tag: title
+#: architecture.xml:94
 #, no-c-format
-msgid "Here are some definitions of the objects depicted in the diagrams:"
-msgstr ""
-
-#. Tag: term
-#, no-c-format
-msgid "SessionFactory (<literal>org.hibernate.SessionFactory</literal>)"
+msgid "Basic APIs"
 msgstr ""
 
 #. Tag: para
+#: architecture.xml:95
 #, no-c-format
-msgid "A threadsafe, immutable cache of compiled mappings for a single database. A factory for <literal>Session</literal> and a client of <literal>ConnectionProvider</literal>, <literal>SessionFactory</literal> can hold an optional (second-level) cache of data that is reusable between transactions at a process, or cluster, level."
+msgid "Here are quick discussions about some of the API objects depicted in the preceding diagrams (you will see them again in more detail in later chapters)."
 msgstr ""
 
 #. Tag: term
+#: architecture.xml:100
 #, no-c-format
-msgid "Session (<literal>org.hibernate.Session</literal>)"
+msgid "SessionFactory (<interfacename>org.hibernate.SessionFactory</interfacename>)"
 msgstr ""
 
 #. Tag: para
+#: architecture.xml:102
 #, no-c-format
-msgid "A single-threaded, short-lived object representing a conversation between the application and the persistent store. It wraps a JDBC connection and is a factory for <literal>Transaction</literal>. <literal>Session</literal> holds a mandatory first-level cache of persistent objects that are used when navigating the object graph or looking up objects by identifier."
+msgid "A thread-safe, immutable cache of compiled mappings for a single database. A factory for <interfacename>org.hibernate.Session</interfacename> instances. A client of <interfacename>org.hibernate.connection.ConnectionProvider</interfacename>. Optionally maintains a <literal>second level cache</literal> of data that is reusable between transactions at a process or cluster level."
 msgstr ""
 
 #. Tag: term
+#: architecture.xml:112
+#, no-c-format
+msgid "Session (<interfacename>org.hibernate.Session</interfacename>)"
+msgstr ""
+
+#. Tag: para
+#: architecture.xml:114
+#, no-c-format
+msgid "A single-threaded, short-lived object representing a conversation between the application and the persistent store. Wraps a JDBC <interfacename>java.sql.Connection</interfacename>. Factory for <interfacename>org.hibernate.Transaction</interfacename>. Maintains a <literal>first level cache</literal> of persistent the application's persistent objects and collections; this cache is used when navigating the object graph or looking up objects by identifier."
+msgstr ""
+
+#. Tag: term
+#: architecture.xml:126
 #, no-c-format
 msgid "Persistent objects and collections"
 msgstr ""
 
 #. 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 <literal>Session</literal>. Once the <literal>Session</literal> is closed, they will be detached and free to use in any application layer (for example, directly as data transfer objects to and from presentation)."
+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"
 msgstr ""
 
 #. Tag: term
+#: architecture.xml:139
 #, no-c-format
 msgid "Transient and detached objects and collections"
 msgstr ""
 
 #. Tag: para
+#: architecture.xml:141
 #, no-c-format
-msgid "Instances of persistent classes that are not currently associated with a <literal>Session</literal>. They may have been instantiated by the application and not yet persisted, or they may have been instantiated by a closed <literal>Session</literal>."
+msgid "Instances of persistent classes that are not currently associated with a <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"
 msgstr ""
 
 #. Tag: term
+#: architecture.xml:151
 #, no-c-format
-msgid "Transaction (<literal>org.hibernate.Transaction</literal>)"
+msgid "Transaction (<interfacename>org.hibernate.Transaction</interfacename>)"
 msgstr ""
 
 #. Tag: para
+#: architecture.xml:153
 #, 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 <literal>Session</literal> might span several <literal>Transaction</literal>s in some cases. However, transaction demarcation, either using the underlying API or <literal>Transaction</literal>, is never optional."
+msgid "(Optional) A single-threaded, short-lived object used by the application to specify atomic units of work. It abstracts the application from the underlying JDBC, JTA or CORBA transaction. A <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
 #, no-c-format
-msgid "ConnectionProvider (<literal>org.hibernate.connection.ConnectionProvider</literal>)"
+msgid "ConnectionProvider (<interfacename>org.hibernate.connection.ConnectionProvider</interfacename>)"
 msgstr ""
 
 #. Tag: para
+#: architecture.xml:166
 #, no-c-format
-msgid "(Optional) A factory for, and pool of, JDBC connections. It abstracts the application from underlying <literal>Datasource</literal> or <literal>DriverManager</literal>. It is not exposed to application, but it can be extended and/or implemented by the developer."
+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
 #, no-c-format
-msgid "TransactionFactory (<literal>org.hibernate.TransactionFactory</literal>)"
+msgid "TransactionFactory (<interfacename>org.hibernate.TransactionFactory</interfacename>)"
 msgstr ""
 
 #. Tag: para
+#: architecture.xml:177
 #, no-c-format
-msgid "(Optional) A factory for <literal>Transaction</literal> instances. It is not exposed to the application, but it can be extended and/or implemented by the developer."
+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: term
+#. Tag: emphasis
+#: architecture.xml:185
 #, no-c-format
-msgid "<emphasis>Extension Interfaces</emphasis>"
+msgid "Extension Interfaces"
 msgstr ""
 
 #. Tag: para
+#: architecture.xml:187
 #, 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: para
-#, no-c-format
-msgid "Given a \"minimal\" architecture, the application bypasses the <literal>Transaction</literal>/<literal>TransactionFactory</literal> and/or <literal>ConnectionProvider</literal> APIs to communicate with JTA or JDBC directly."
-msgstr ""
-
 #. Tag: title
+#: architecture.xml: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
 #, 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
 #, no-c-format
-msgid "For an example of how to deploy Hibernate as a JMX service on the JBoss Application Server, please see the JBoss User Guide. JBoss AS also provides these benefits if you deploy using JMX:"
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "<emphasis>Session Management</emphasis>: the Hibernate <literal>Session</literal>'s life cycle can be automatically bound to the scope of a JTA transaction. This means that you no longer have to manually open and close the <literal>Session</literal>; this becomes the job of a JBoss EJB interceptor. You also do not have to worry about transaction demarcation in your code (if you would like to write a portable persistence layer use the optional Hibernate <literal>Transaction</literal> API for this). You call the <literal>HibernateContext</literal> to access a <literal>Session</literal>."
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "<emphasis>HAR deployment</emphasis>: the Hibernate JMX service is deployed using a JBoss service deployment descriptor in an EAR and/or SAR file, as it supports all the usual configuration options of a Hibernate <literal>SessionFactory</literal>. However, you still need to name all your mapping files in the deployment descriptor. If you use the optional HAR deployment, JBoss will automatically detect all mapping files in your HAR file."
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "Consult the JBoss AS user guide for more information about these options."
-msgstr ""
-
-#. Tag: para
-#, 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
-#, no-c-format
-msgid "JCA Support"
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "Hibernate can also be configured as a JCA connector. Please see the website for more information. Please note, however, that at this stage Hibernate JCA support is under development."
+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
 #, no-c-format
 msgid "Contextual sessions"
 msgstr ""
 
 #. Tag: para
+#: architecture.xml:265
 #, 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
 #, 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
 #, 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
 #, 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
 #, 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
 #, 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
 #, 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
 #, 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."
+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
 #, 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 ""
diff --git a/documentation/manual/src/main/docbook/pt-BR/content/architecture.po b/documentation/manual/src/main/docbook/pt-BR/content/architecture.po
index 0e76930724..a19f4acb21 100644
--- a/documentation/manual/src/main/docbook/pt-BR/content/architecture.po
+++ b/documentation/manual/src/main/docbook/pt-BR/content/architecture.po
@@ -108,7 +108,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: architecture\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-03-12T00:03:45\n"
+"POT-Creation-Date: 2010-07-21 05:26+0000\n"
 "PO-Revision-Date: 2010-03-17 10:18+1000\n"
 "Last-Translator: \n"
 "Language-Team:  <en@li.org>\n"
@@ -118,58 +118,63 @@ msgstr ""
 "X-Generator: KBabel 1.11.4\n"
 
 #. Tag: title
+#: architecture.xml:34
 #, no-c-format
 msgid "Architecture"
 msgstr "Arquitetura "
 
 #. Tag: title
+#: architecture.xml:37
 #, no-c-format
 msgid "Overview"
 msgstr "Visão Geral"
 
 #. Tag: para
+#: architecture.xml:39
 #, no-c-format
-msgid "The diagram below provides a high-level view of the Hibernate architecture:"
+msgid ""
+"The diagram below provides a high-level view of the Hibernate architecture:"
 msgstr ""
 "O diagrama abaixo fornece uma visão de altíssimo nível da arquitetura do "
 "Hibernate:"
 
 #. Tag: para
+#: architecture.xml:52
 #, no-c-format
 msgid ""
-"We do not have the scope in this document to provide a more detailed view of "
-"all the runtime architectures available; Hibernate is flexible and supports "
-"several different approaches. We will, however, show the two extremes: "
-"\"minimal\" architecture and \"comprehensive\" architecture."
+"Unfortunately we cannot provide a detailed view of all possible runtime "
+"architectures. Hibernate is sufficiently flexible to be used in a number of "
+"ways in many, many architectures. We will, however, illustrate 2 "
+"specifically since they are extremes."
 msgstr ""
-"Nós não temos o escopo neste documento para mostrar uma visão mais detalhada "
-"da arquitetura em execução. O Hibernate é muito flexível e suporta várias "
-"abordagens. Mostraremos os dois extremos. No entanto, nós apresentaremos os "
-"dois extremos: arquitetura \"mínima\" e arquitetura \"compreensiva\". "
+
+#. Tag: title
+#: architecture.xml:59
+#, fuzzy, no-c-format
+msgid "Minimal architecture"
+msgstr "Arquitetura "
 
 #. Tag: para
-#, no-c-format
+#: architecture.xml:61
+#, fuzzy, no-c-format
 msgid ""
-"This next diagram illustrates how Hibernate utilizes database and "
-"configuration data to provide persistence services, and persistent objects, "
-"to the application."
-msgstr ""
-"Este diagrama mostra o Hibernate usando o banco de dados e a configuração de "
-"dados para prover persistência de serviços e persistência de objetos para o "
-"aplicativo."
-
-#. Tag: para
-#, no-c-format
-msgid ""
-"The \"minimal\" architecture has the application provide its own JDBC "
-"connections and manage its own transactions. This approach uses a minimal "
-"subset of Hibernate's APIs:"
+"The \"minimal\" architecture has the application manage its own JDBC "
+"connections and provide those connections to Hibernate; additionally the "
+"application manages transactions for itself. This approach uses a minimal "
+"subset of Hibernate APIs."
 msgstr ""
 "Na arquitetura \"mínima\", o aplicativo fornece suas próprias conexões JDBC "
 "e gerencia suas transações. Esta abordagem usa o mínimo de subconjuntos das "
 "APIs do Hibernate:"
 
+#. Tag: title
+#: architecture.xml:77
+#, no-c-format
+msgid "Comprehensive architecture"
+msgstr ""
+
 #. Tag: para
+#: architecture.xml:79
 #, no-c-format
 msgid ""
 "The \"comprehensive\" architecture abstracts the application away from the "
@@ -178,24 +183,37 @@ msgstr ""
 "A arquitetura \"compreensiva\" abstrai a aplicação do JDBC/JTA e APIs "
 "adjacentes e deixa o Hibernate tomar conta dos detalhes."
 
-#. Tag: para
+#. Tag: title
+#: architecture.xml:94
 #, no-c-format
-msgid "Here are some definitions of the objects depicted in the diagrams:"
-msgstr "Algumas definições dos objetos descritos nos diagramas: "
+msgid "Basic APIs"
+msgstr ""
+
+#. Tag: para
+#: architecture.xml:95
+#, no-c-format
+msgid ""
+"Here are quick discussions about some of the API objects depicted in the "
+"preceding diagrams (you will see them again in more detail in later "
+"chapters)."
+msgstr ""
 
 #. Tag: term
-#, no-c-format
-msgid "SessionFactory (<literal>org.hibernate.SessionFactory</literal>)"
+#: architecture.xml:100
+#, fuzzy, no-c-format
+msgid ""
+"SessionFactory (<interfacename>org.hibernate.SessionFactory</interfacename>)"
 msgstr "SessionFactory (<literal>org.hibernate.SessionFactory</literal>)"
 
 #. Tag: para
-#, no-c-format
+#: architecture.xml:102
+#, fuzzy, no-c-format
 msgid ""
-"A threadsafe, immutable cache of compiled mappings for a single database. A "
-"factory for <literal>Session</literal> and a client of "
-"<literal>ConnectionProvider</literal>, <literal>SessionFactory</literal> can "
-"hold an optional (second-level) cache of data that is reusable between "
-"transactions at a process, or cluster, level."
+"A thread-safe, immutable cache of compiled mappings for a single database. A "
+"factory for <interfacename>org.hibernate.Session</interfacename> instances. "
+"A client of <interfacename>org.hibernate.connection.ConnectionProvider</"
+"interfacename>. Optionally maintains a <literal>second level cache</literal> "
+"of data that is reusable between transactions at a process or cluster level."
 msgstr ""
 "O threadsafe, cachê imutável composto de mapeamentos compilados para um "
 "único banco de dados. Uma fábrica para <literal>Session</literal> e um "
@@ -204,18 +222,22 @@ msgstr ""
 "reutilizáveis entre transações, no nível de processo ou cluster."
 
 #. Tag: term
-#, no-c-format
-msgid "Session (<literal>org.hibernate.Session</literal>)"
+#: architecture.xml:112
+#, fuzzy, no-c-format
+msgid "Session (<interfacename>org.hibernate.Session</interfacename>)"
 msgstr "Session (<literal>org.hibernate.Session</literal>)"
 
 #. Tag: para
-#, no-c-format
+#: architecture.xml:114
+#, fuzzy, no-c-format
 msgid ""
 "A single-threaded, short-lived object representing a conversation between "
-"the application and the persistent store. It wraps a JDBC connection and is "
-"a factory for <literal>Transaction</literal>. <literal>Session</literal> "
-"holds a mandatory first-level cache of persistent objects that are used when "
-"navigating the object graph or looking up objects by identifier."
+"the application and the persistent store. Wraps a JDBC <interfacename>java."
+"sql.Connection</interfacename>. Factory for <interfacename>org.hibernate."
+"Transaction</interfacename>. Maintains a <literal>first level cache</"
+"literal> of persistent the application's persistent objects and collections; "
+"this cache is used when navigating the object graph or looking up objects by "
+"identifier."
 msgstr ""
 "Objeto single-threaded, de vida curta, representa uma conversação entre o "
 "aplicativo e o armazenamento persistente. Cria uma camada sobre uma conexão "
@@ -225,19 +247,22 @@ msgstr ""
 "objetos pelo identificador."
 
 #. Tag: term
+#: architecture.xml:126
 #, no-c-format
 msgid "Persistent objects and collections"
 msgstr "Objetos persistentes e coleções"
 
 #. Tag: para
-#, no-c-format
+#: architecture.xml:128
+#, fuzzy, 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 <literal>Session</literal>. Once the "
-"<literal>Session</literal> is closed, they will be detached and free to use "
-"in any application layer (for example, directly as data transfer objects to "
-"and from presentation)."
+"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"
 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 "
@@ -248,17 +273,20 @@ msgstr ""
 "apresentação)."
 
 #. Tag: term
+#: architecture.xml:139
 #, no-c-format
 msgid "Transient and detached objects and collections"
 msgstr "Objetos e coleções desanexados e transientes"
 
 #. Tag: para
-#, no-c-format
+#: architecture.xml:141
+#, fuzzy, no-c-format
 msgid ""
 "Instances of persistent classes that are not currently associated with a "
-"<literal>Session</literal>. They may have been instantiated by the "
-"application and not yet persisted, or they may have been instantiated by a "
-"closed <literal>Session</literal>."
+"<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"
 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 "
@@ -266,19 +294,22 @@ msgstr ""
 "<literal>Session</literal> encerrada."
 
 #. Tag: term
-#, no-c-format
-msgid "Transaction (<literal>org.hibernate.Transaction</literal>)"
+#: architecture.xml:151
+#, fuzzy, no-c-format
+msgid "Transaction (<interfacename>org.hibernate.Transaction</interfacename>)"
 msgstr "Transaction (<literal>org.hibernate.Transaction</literal>)"
 
 #. Tag: para
-#, no-c-format
+#: architecture.xml:153
+#, fuzzy, 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 <literal>Session</literal> "
-"might span several <literal>Transaction</literal>s in some cases. However, "
-"transaction demarcation, either using the underlying API or "
-"<literal>Transaction</literal>, is never optional."
+"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 ""
 "(Opcional) Objeto de vida curta, single threaded, usado pela aplicação para "
 "especificar unidades atômicas de trabalho. Abstrai o aplicativo das "
@@ -288,21 +319,24 @@ msgstr ""
 "<literal>Transaction</literal> subjacentes, nunca é opcional."
 
 #. Tag: term
-#, no-c-format
+#: architecture.xml:164
+#, fuzzy, no-c-format
 msgid ""
-"ConnectionProvider (<literal>org.hibernate.connection.ConnectionProvider</"
-"literal>)"
+"ConnectionProvider (<interfacename>org.hibernate.connection."
+"ConnectionProvider</interfacename>)"
 msgstr ""
 "Connection Provider (<literal>org.hibernate.connection.ConnectionProvider</"
 "literal>)"
 
 #. Tag: para
-#, no-c-format
+#: architecture.xml:166
+#, fuzzy, no-c-format
 msgid ""
 "(Optional) A factory for, and pool of, JDBC connections. It abstracts the "
-"application from underlying <literal>Datasource</literal> or "
-"<literal>DriverManager</literal>. It is not exposed to application, but it "
-"can be extended and/or implemented by the developer."
+"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 ""
 "(Opcional) Uma fábrica de, e pool de, conexões JDBC. Abstrai a aplicação dos "
 "<literal>Datasource</literal> ou <literal>DriverManager</literal> "
@@ -310,27 +344,34 @@ msgstr ""
 "estendido pelo programador. "
 
 #. Tag: term
-#, no-c-format
-msgid "TransactionFactory (<literal>org.hibernate.TransactionFactory</literal>)"
-msgstr "Transaction Factory (<literal>org.hibernate.TransactionFactory</literal>)"
+#: architecture.xml:175
+#, fuzzy, no-c-format
+msgid ""
+"TransactionFactory (<interfacename>org.hibernate.TransactionFactory</"
+"interfacename>)"
+msgstr ""
+"Transaction Factory (<literal>org.hibernate.TransactionFactory</literal>)"
 
 #. Tag: para
-#, no-c-format
+#: architecture.xml:177
+#, fuzzy, no-c-format
 msgid ""
-"(Optional) A factory for <literal>Transaction</literal> instances. It is not "
-"exposed to the application, but it can be extended and/or implemented by the "
-"developer."
+"(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 ""
 "(Opcional) Uma fábrica para instâncias de <literal>Transaction</literal>. "
 "Não exposta a aplicação, mas pode ser estendida/implementada pelo "
 "programador."
 
-#. Tag: term
-#, no-c-format
-msgid "<emphasis>Extension Interfaces</emphasis>"
+#. Tag: emphasis
+#: architecture.xml:185
+#, fuzzy, no-c-format
+msgid "Extension Interfaces"
 msgstr "<emphasis>Interfaces de Extensão</emphasis>"
 
 #. Tag: para
+#: architecture.xml:187
 #, no-c-format
 msgid ""
 "Hibernate offers a range of optional extension interfaces you can implement "
@@ -341,25 +382,14 @@ msgstr ""
 "implementar para customizar sua camada persistente. Veja a documentação da "
 "API para maiores detalhes. "
 
-#. Tag: para
-#, no-c-format
-msgid ""
-"Given a \"minimal\" architecture, the application bypasses the "
-"<literal>Transaction</literal>/<literal>TransactionFactory</literal> and/or "
-"<literal>ConnectionProvider</literal> APIs to communicate with JTA or JDBC "
-"directly."
-msgstr ""
-"Dada uma arquitetura \"mínima\", o aplicativo passa pelas APIs "
-"<literal>Transaction</literal>/<literal>TransactionFactory</literal> e/ou "
-"<literal>ConnectionProvider</literal> para se comunicar diretamente com a "
-"transação JTA ou JDBC."
-
 #. 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. "
@@ -373,11 +403,13 @@ msgstr ""
 "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 "
@@ -387,11 +419,13 @@ msgstr ""
 "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 "
@@ -407,11 +441,13 @@ msgstr ""
 "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 "
@@ -427,11 +463,13 @@ msgstr ""
 "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
 #, no-c-format
 msgid ""
 "JMX is the J2EE standard for the management of Java components. Hibernate "
@@ -445,100 +483,25 @@ msgstr ""
 "HibernateService</literal>."
 
 #. Tag: para
-#, no-c-format
-msgid ""
-"For an example of how to deploy Hibernate as a JMX service on the JBoss "
-"Application Server, please see the JBoss User Guide. JBoss AS also provides "
-"these benefits if you deploy using JMX:"
-msgstr ""
-"Para um exemplo de como implementar o Hibernate como um serviço JMX em um "
-"Servidor de Aplicativo JBoss, por favor, consulte o Guia do Usuário do "
-"JBoss. No JBoss As, você poderá ver os benefícios de se fazer a "
-"implementação usando JMX:"
-
-#. Tag: para
-#, no-c-format
-msgid ""
-"<emphasis>Session Management</emphasis>: the Hibernate <literal>Session</"
-"literal>'s life cycle can be automatically bound to the scope of a JTA "
-"transaction. This means that you no longer have to manually open and close "
-"the <literal>Session</literal>; this becomes the job of a JBoss EJB "
-"interceptor. You also do not have to worry about transaction demarcation in "
-"your code (if you would like to write a portable persistence layer use the "
-"optional Hibernate <literal>Transaction</literal> API for this). You call "
-"the <literal>HibernateContext</literal> to access a <literal>Session</"
-"literal>."
-msgstr ""
-"<emphasis>Session Management:</emphasis> O ciclo de vida de uma "
-"<literal>Session</literal> do Hibernate pode ser automaticamente conectada a "
-"um escopo de transação JTA. Isso significa que você não precisará mais abrir "
-"e fechar manualmente uma <literal>Session</literal>, isso se torna uma "
-"tarefa para um interceptor EJB do JBoss. Você também não precisará mais se "
-"preocupar com demarcação de transação em seu código (caso você prefira "
-"escrever uma camada persistente portável, use a API opcional do Hibernate "
-"<literal>Transaction</literal>). Você deve chamar <literal>HibernateContext</"
-"literal> para acessar uma <literal>Session</literal>."
-
-#. Tag: para
-#, no-c-format
-msgid ""
-"<emphasis>HAR deployment</emphasis>: the Hibernate JMX service is deployed "
-"using a JBoss service deployment descriptor in an EAR and/or SAR file, as it "
-"supports all the usual configuration options of a Hibernate "
-"<literal>SessionFactory</literal>. However, you still need to name all your "
-"mapping files in the deployment descriptor. If you use the optional HAR "
-"deployment, JBoss will automatically detect all mapping files in your HAR "
-"file."
-msgstr ""
-"<emphasis>HAR deployment:</emphasis>: Normalmente você implementa o serviço "
-"JMX do Hibernate usando um serviço descritor de implementação do JBoss em um "
-"EAR e/ou arquivo SAR, que suporta todas as configurações comuns de uma "
-"<literal>SessionFactory</literal> do Hibernate. Entretanto, você ainda "
-"precisa nomear todos os seus arquivos de mapeamento no descritor de "
-"implementação. Se você decidir usar a implementaçao opcional HAR, o JBoss "
-"irá automaticamente detectar todos os seus arquivos de mapeamento no seu "
-"arquivo HAR."
-
-#. Tag: para
-#, no-c-format
-msgid "Consult the JBoss AS user guide for more information about these options."
-msgstr ""
-"Consulte o manual do usuário do JBoss AS, para obter maiores informações "
-"sobre essas opções."
-
-#. Tag: para
-#, no-c-format
+#: architecture.xml:257
+#, fuzzy, no-c-format
 msgid ""
 "Another feature available as a JMX service is runtime Hibernate statistics. "
-"See <xref linkend=\"configuration-optional-statistics\" /> for more "
+"See <xref linkend=\"configuration-optional-statistics\"/> for more "
 "information."
 msgstr ""
 "Outra opção disponível como um serviço JMX são as estatísticas de execução "
-"do Hibernate. Veja a <xref linkend=\"configuration-optional-statistics\" />"
-"para maiores informações."
-
-#. Tag: title
-#, no-c-format
-msgid "JCA Support"
-msgstr "Suporte JCA"
-
-#. Tag: para
-#, no-c-format
-msgid ""
-"Hibernate can also be configured as a JCA connector. Please see the website "
-"for more information. Please note, however, that at this stage Hibernate JCA "
-"support is under development."
-msgstr ""
-"O Hibernate pode também ser configurado como um conector JCA. Por favor, "
-"visite o website para maiores detalhes. Observe também, que o suporte do JCA "
-"do Hibernate ainda é considerado experimental."
+"do Hibernate. Veja a <xref linkend=\"configuration-optional-statistics\" /"
+">para maiores informações."
 
 #. Tag: title
+#: architecture.xml:264
 #, no-c-format
 msgid "Contextual sessions"
 msgstr "Sessões Contextuais"
 
 #. Tag: para
+#: architecture.xml:265
 #, no-c-format
 msgid ""
 "Most applications using Hibernate need some form of \"contextual\" session, "
@@ -562,6 +525,7 @@ msgstr ""
 "baseadas em proxy."
 
 #. Tag: para
+#: architecture.xml:274
 #, no-c-format
 msgid ""
 "Starting with version 3.0.1, Hibernate added the <literal>SessionFactory."
@@ -586,6 +550,7 @@ msgstr ""
 "sessões contextuais baseadas em <literal>JTA</literal>. "
 
 #. Tag: para
+#: architecture.xml:284
 #, no-c-format
 msgid ""
 "However, as of version 3.1, the processing behind <literal>SessionFactory."
@@ -604,6 +569,7 @@ msgstr ""
 "definição de sessões correntes."
 
 #. Tag: para
+#: architecture.xml:291
 #, no-c-format
 msgid ""
 "See the Javadocs for the <literal>org.hibernate.context."
@@ -620,6 +586,7 @@ msgstr ""
 "Hibernate surge com três implementações dessa interface:"
 
 #. Tag: para
+#: architecture.xml:301
 #, no-c-format
 msgid ""
 "<literal>org.hibernate.context.JTASessionContext</literal>: current sessions "
@@ -633,6 +600,7 @@ msgstr ""
 "JTA somente. Consulte em Javadocs para maiores detalhes."
 
 #. Tag: para
+#: architecture.xml:309
 #, no-c-format
 msgid ""
 "<literal>org.hibernate.context.ThreadLocalSessionContext</literal>:current "
@@ -643,6 +611,7 @@ msgstr ""
 "consulte em Javadocs para maiores detalhes. "
 
 #. Tag: para
+#: architecture.xml:315
 #, no-c-format
 msgid ""
 "<literal>org.hibernate.context.ManagedSessionContext</literal>: current "
@@ -657,7 +626,8 @@ msgstr ""
 "uma <literal>Session</literal>. "
 
 #. Tag: para
-#, no-c-format
+#: architecture.xml:324
+#, fuzzy, no-c-format
 msgid ""
 "The first two implementations provide a \"one session - one database "
 "transaction\" programming model. This is also known and used as "
@@ -669,7 +639,7 @@ msgid ""
 "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 "
+"operations in your code. Refer to <xref linkend=\"transactions\"/> for more "
 "information and code examples."
 msgstr ""
 "As duas primeiras implementações usam o modelo de programação \"uma sessão - "
@@ -682,9 +652,11 @@ msgstr ""
 "as interfaces JTA para demarcar as transações. Se você executar em um "
 "recipiente EJB que suporta CMT, os limites das transações são definidas "
 "declarativamente e você não precisará de qualquer transação ou operação de "
-"demarcação de sessão no seu código. Consulte o <xref linkend=\"transactions\" /> para mais informações e exemplos de código."
+"demarcação de sessão no seu código. Consulte o <xref linkend=\"transactions"
+"\" /> para mais informações e exemplos de código."
 
 #. Tag: para
+#: architecture.xml:336
 #, no-c-format
 msgid ""
 "The <literal>hibernate.current_session_context_class</literal> configuration "
@@ -709,3 +681,105 @@ msgstr ""
 "para as três implementações fora da caixa, entretanto, há dois pequenos "
 "nomes correspondentes, \"jta\", \"thread\", e \"managed\"."
 
+#~ msgid ""
+#~ "We do not have the scope in this document to provide a more detailed view "
+#~ "of all the runtime architectures available; Hibernate is flexible and "
+#~ "supports several different approaches. We will, however, show the two "
+#~ "extremes: \"minimal\" architecture and \"comprehensive\" architecture."
+#~ msgstr ""
+#~ "Nós não temos o escopo neste documento para mostrar uma visão mais "
+#~ "detalhada da arquitetura em execução. O Hibernate é muito flexível e "
+#~ "suporta várias abordagens. Mostraremos os dois extremos. No entanto, nós "
+#~ "apresentaremos os dois extremos: arquitetura \"mínima\" e arquitetura "
+#~ "\"compreensiva\". "
+
+#~ msgid ""
+#~ "This next diagram illustrates how Hibernate utilizes database and "
+#~ "configuration data to provide persistence services, and persistent "
+#~ "objects, to the application."
+#~ msgstr ""
+#~ "Este diagrama mostra o Hibernate usando o banco de dados e a configuração "
+#~ "de dados para prover persistência de serviços e persistência de objetos "
+#~ "para o aplicativo."
+
+#~ msgid "Here are some definitions of the objects depicted in the diagrams:"
+#~ msgstr "Algumas definições dos objetos descritos nos diagramas: "
+
+#~ msgid ""
+#~ "Given a \"minimal\" architecture, the application bypasses the "
+#~ "<literal>Transaction</literal>/<literal>TransactionFactory</literal> and/"
+#~ "or <literal>ConnectionProvider</literal> APIs to communicate with JTA or "
+#~ "JDBC directly."
+#~ msgstr ""
+#~ "Dada uma arquitetura \"mínima\", o aplicativo passa pelas APIs "
+#~ "<literal>Transaction</literal>/<literal>TransactionFactory</literal> e/ou "
+#~ "<literal>ConnectionProvider</literal> para se comunicar diretamente com a "
+#~ "transação JTA ou JDBC."
+
+#~ msgid ""
+#~ "For an example of how to deploy Hibernate as a JMX service on the JBoss "
+#~ "Application Server, please see the JBoss User Guide. JBoss AS also "
+#~ "provides these benefits if you deploy using JMX:"
+#~ msgstr ""
+#~ "Para um exemplo de como implementar o Hibernate como um serviço JMX em um "
+#~ "Servidor de Aplicativo JBoss, por favor, consulte o Guia do Usuário do "
+#~ "JBoss. No JBoss As, você poderá ver os benefícios de se fazer a "
+#~ "implementação usando JMX:"
+
+#~ msgid ""
+#~ "<emphasis>Session Management</emphasis>: the Hibernate <literal>Session</"
+#~ "literal>'s life cycle can be automatically bound to the scope of a JTA "
+#~ "transaction. This means that you no longer have to manually open and "
+#~ "close the <literal>Session</literal>; this becomes the job of a JBoss EJB "
+#~ "interceptor. You also do not have to worry about transaction demarcation "
+#~ "in your code (if you would like to write a portable persistence layer use "
+#~ "the optional Hibernate <literal>Transaction</literal> API for this). You "
+#~ "call the <literal>HibernateContext</literal> to access a "
+#~ "<literal>Session</literal>."
+#~ msgstr ""
+#~ "<emphasis>Session Management:</emphasis> O ciclo de vida de uma "
+#~ "<literal>Session</literal> do Hibernate pode ser automaticamente "
+#~ "conectada a um escopo de transação JTA. Isso significa que você não "
+#~ "precisará mais abrir e fechar manualmente uma <literal>Session</literal>, "
+#~ "isso se torna uma tarefa para um interceptor EJB do JBoss. Você também "
+#~ "não precisará mais se preocupar com demarcação de transação em seu código "
+#~ "(caso você prefira escrever uma camada persistente portável, use a API "
+#~ "opcional do Hibernate <literal>Transaction</literal>). Você deve chamar "
+#~ "<literal>HibernateContext</literal> para acessar uma <literal>Session</"
+#~ "literal>."
+
+#~ msgid ""
+#~ "<emphasis>HAR deployment</emphasis>: the Hibernate JMX service is "
+#~ "deployed using a JBoss service deployment descriptor in an EAR and/or SAR "
+#~ "file, as it supports all the usual configuration options of a Hibernate "
+#~ "<literal>SessionFactory</literal>. However, you still need to name all "
+#~ "your mapping files in the deployment descriptor. If you use the optional "
+#~ "HAR deployment, JBoss will automatically detect all mapping files in your "
+#~ "HAR file."
+#~ msgstr ""
+#~ "<emphasis>HAR deployment:</emphasis>: Normalmente você implementa o "
+#~ "serviço JMX do Hibernate usando um serviço descritor de implementação do "
+#~ "JBoss em um EAR e/ou arquivo SAR, que suporta todas as configurações "
+#~ "comuns de uma <literal>SessionFactory</literal> do Hibernate. Entretanto, "
+#~ "você ainda precisa nomear todos os seus arquivos de mapeamento no "
+#~ "descritor de implementação. Se você decidir usar a implementaçao opcional "
+#~ "HAR, o JBoss irá automaticamente detectar todos os seus arquivos de "
+#~ "mapeamento no seu arquivo HAR."
+
+#~ msgid ""
+#~ "Consult the JBoss AS user guide for more information about these options."
+#~ msgstr ""
+#~ "Consulte o manual do usuário do JBoss AS, para obter maiores informações "
+#~ "sobre essas opções."
+
+#~ msgid "JCA Support"
+#~ msgstr "Suporte JCA"
+
+#~ msgid ""
+#~ "Hibernate can also be configured as a JCA connector. Please see the "
+#~ "website for more information. Please note, however, that at this stage "
+#~ "Hibernate JCA support is under development."
+#~ msgstr ""
+#~ "O Hibernate pode também ser configurado como um conector JCA. Por favor, "
+#~ "visite o website para maiores detalhes. Observe também, que o suporte do "
+#~ "JCA do Hibernate ainda é considerado experimental."
diff --git a/documentation/manual/src/main/docbook/zh-CN/content/architecture.po b/documentation/manual/src/main/docbook/zh-CN/content/architecture.po
index 571df2b490..31735737a5 100644
--- a/documentation/manual/src/main/docbook/zh-CN/content/architecture.po
+++ b/documentation/manual/src/main/docbook/zh-CN/content/architecture.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Collection_Mapping\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-03-12T00:03:45\n"
+"POT-Creation-Date: 2010-07-21 05:26+0000\n"
 "PO-Revision-Date: 2010-03-15 08:47+1000\n"
 "Last-Translator: Xi HUANG <xhuang@redhat.com>\n"
 "Language-Team:  <en@li.org>\n"
@@ -15,262 +15,618 @@ msgstr ""
 "X-Generator: KBabel 1.11.4\n"
 
 #. Tag: title
+#: architecture.xml:34
 #, no-c-format
 msgid "Architecture"
 msgstr "体系结构（Architecture）"
 
 #. Tag: title
+#: architecture.xml:37
 #, no-c-format
 msgid "Overview"
 msgstr "概况（Overview）"
 
 #. Tag: para
+#: architecture.xml:39
 #, no-c-format
-msgid "The diagram below provides a high-level view of the Hibernate architecture:"
+msgid ""
+"The diagram below provides a high-level view of the Hibernate architecture:"
 msgstr "下面的图表提供了 Hibernate 体系结构的高层视图："
 
 #. Tag: para
+#: architecture.xml:52
 #, no-c-format
-msgid "We do not have the scope in this document to provide a more detailed view of all the runtime architectures available; Hibernate is flexible and supports several different approaches. We will, however, show the two extremes: \"minimal\" architecture and \"comprehensive\" architecture."
-msgstr "提供 Hibernate 所有运行时体系结构的更多细节不是本文档的范畴。由于 Hibernate 非常灵活，且支持多种应用方案， 所以我们这只描述一下两种极端的情况：“最小”和“全面解决”的体系结构方案。"
+msgid ""
+"Unfortunately we cannot provide a detailed view of all possible runtime "
+"architectures. Hibernate is sufficiently flexible to be used in a number of "
+"ways in many, many architectures. We will, however, illustrate 2 "
+"specifically since they are extremes."
+msgstr ""
+
+#. Tag: title
+#: architecture.xml:59
+#, fuzzy, no-c-format
+msgid "Minimal architecture"
+msgstr "体系结构（Architecture）"
 
 #. Tag: para
+#: architecture.xml:61
+#, fuzzy, no-c-format
+msgid ""
+"The \"minimal\" architecture has the application manage its own JDBC "
+"connections and provide those connections to Hibernate; additionally the "
+"application manages transactions for itself. This approach uses a minimal "
+"subset of Hibernate APIs."
+msgstr ""
+"“最小”的体系结构方案，要求应用程序提供自己的 JDBC 连接并管理自己的事务。这种"
+"方案使用了Hibernate API 的最小子集："
+
+#. Tag: title
+#: architecture.xml:77
 #, no-c-format
-msgid "This next diagram illustrates how Hibernate utilizes database and configuration data to provide persistence services, and persistent objects, to the application."
-msgstr "下图演示了 Hibernate 如何使用数据库和配置信息来为应用程序提供持久化服务（以及持久的对象）。"
+msgid "Comprehensive architecture"
+msgstr ""
 
 #. Tag: para
+#: architecture.xml:79
 #, no-c-format
-msgid "The \"minimal\" architecture has the application provide its own JDBC connections and manage its own transactions. This approach uses a minimal subset of Hibernate's APIs:"
-msgstr "“最小”的体系结构方案，要求应用程序提供自己的 JDBC 连接并管理自己的事务。这种方案使用了Hibernate API 的最小子集："
+msgid ""
+"The \"comprehensive\" architecture abstracts the application away from the "
+"underlying JDBC/JTA APIs and allows Hibernate to manage the details."
+msgstr ""
+"“全面解决”的体系结构方案，将应用层从底层的 JDBC/JTA API 中抽象出来，而让 "
+"Hibernate 来处理这些细节。"
+
+#. Tag: title
+#: architecture.xml:94
+#, no-c-format
+msgid "Basic APIs"
+msgstr ""
 
 #. Tag: para
+#: architecture.xml:95
 #, no-c-format
-msgid "The \"comprehensive\" architecture abstracts the application away from the underlying JDBC/JTA APIs and allows Hibernate to manage the details."
-msgstr "“全面解决”的体系结构方案，将应用层从底层的 JDBC/JTA API 中抽象出来，而让 Hibernate 来处理这些细节。"
-
-#. Tag: para
-#, no-c-format
-msgid "Here are some definitions of the objects depicted in the diagrams:"
-msgstr "图中各个对象的定义如下： "
+msgid ""
+"Here are quick discussions about some of the API objects depicted in the "
+"preceding diagrams (you will see them again in more detail in later "
+"chapters)."
+msgstr ""
 
 #. Tag: term
-#, no-c-format
-msgid "SessionFactory (<literal>org.hibernate.SessionFactory</literal>)"
+#: architecture.xml:100
+#, fuzzy, no-c-format
+msgid ""
+"SessionFactory (<interfacename>org.hibernate.SessionFactory</interfacename>)"
 msgstr "SessionFactory (<literal>org.hibernate.SessionFactory</literal>)"
 
 #. Tag: para
-#, no-c-format
-msgid "A threadsafe, immutable cache of compiled mappings for a single database. A factory for <literal>Session</literal> and a client of <literal>ConnectionProvider</literal>, <literal>SessionFactory</literal> can hold an optional (second-level) cache of data that is reusable between transactions at a process, or cluster, level."
-msgstr "针对单个数据库映射关系经过编译后的内存镜像，是线程安全的（不可变）。 作为 <literal>Session</literal> 的工厂和 <literal>ConnectionProvider</literal> 的客户。<literal>SessionFactory</literal> 可以在进程或集群的级别上，为那些事务之间可以重用的数据提供可选的二级缓存。"
+#: architecture.xml:102
+#, fuzzy, no-c-format
+msgid ""
+"A thread-safe, immutable cache of compiled mappings for a single database. A "
+"factory for <interfacename>org.hibernate.Session</interfacename> instances. "
+"A client of <interfacename>org.hibernate.connection.ConnectionProvider</"
+"interfacename>. Optionally maintains a <literal>second level cache</literal> "
+"of data that is reusable between transactions at a process or cluster level."
+msgstr ""
+"针对单个数据库映射关系经过编译后的内存镜像，是线程安全的（不可变）。 作为 "
+"<literal>Session</literal> 的工厂和 <literal>ConnectionProvider</literal> 的"
+"客户。<literal>SessionFactory</literal> 可以在进程或集群的级别上，为那些事务"
+"之间可以重用的数据提供可选的二级缓存。"
 
 #. Tag: term
-#, no-c-format
-msgid "Session (<literal>org.hibernate.Session</literal>)"
+#: architecture.xml:112
+#, fuzzy, no-c-format
+msgid "Session (<interfacename>org.hibernate.Session</interfacename>)"
 msgstr "Session (<literal>org.hibernate.Session</literal>)"
 
 #. Tag: para
-#, no-c-format
-msgid "A single-threaded, short-lived object representing a conversation between the application and the persistent store. It wraps a JDBC connection and is a factory for <literal>Transaction</literal>. <literal>Session</literal> holds a mandatory first-level cache of persistent objects that are used when navigating the object graph or looking up objects by identifier."
-msgstr "表示应用程序与持久储存层之间交互操作的一个单线程对象，此对象生存期很短。其隐藏了 JDBC 连接，也是 <literal>Transaction</literal> 的工厂。它会持有一个针对持久化对象的必选（第一级）缓存，在遍历对象图或者根据持久化标识查找对象时会用到。"
+#: architecture.xml:114
+#, fuzzy, no-c-format
+msgid ""
+"A single-threaded, short-lived object representing a conversation between "
+"the application and the persistent store. Wraps a JDBC <interfacename>java."
+"sql.Connection</interfacename>. Factory for <interfacename>org.hibernate."
+"Transaction</interfacename>. Maintains a <literal>first level cache</"
+"literal> of persistent the application's persistent objects and collections; "
+"this cache is used when navigating the object graph or looking up objects by "
+"identifier."
+msgstr ""
+"表示应用程序与持久储存层之间交互操作的一个单线程对象，此对象生存期很短。其隐"
+"藏了 JDBC 连接，也是 <literal>Transaction</literal> 的工厂。它会持有一个针对"
+"持久化对象的必选（第一级）缓存，在遍历对象图或者根据持久化标识查找对象时会用"
+"到。"
 
 #. Tag: term
+#: architecture.xml:126
 #, no-c-format
 msgid "Persistent objects and collections"
 msgstr "持久的对象及其集合"
 
 #. Tag: para
-#, 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 <literal>Session</literal>. Once the <literal>Session</literal> is closed, they will be detached and free to use in any application layer (for example, directly as data transfer objects to and from presentation)."
-msgstr "带有持久化状态的、具有业务功能的单线程对象，此对象生存期很短。这些对象可能是普通的JavaBeans/POJO，唯一特殊的是他们正与（仅仅一个）<literal>Session</literal> 相关联。一旦这个 <literal>Session</literal> 被关闭，这些对象就会脱离持久化状态，这样就可被应用程序的任何层自由使用（例如，用作跟表示层打交道的数据传输对象）。"
+#: architecture.xml:128
+#, fuzzy, 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"
+msgstr ""
+"带有持久化状态的、具有业务功能的单线程对象，此对象生存期很短。这些对象可能是"
+"普通的JavaBeans/POJO，唯一特殊的是他们正与（仅仅一个）<literal>Session</"
+"literal> 相关联。一旦这个 <literal>Session</literal> 被关闭，这些对象就会脱离"
+"持久化状态，这样就可被应用程序的任何层自由使用（例如，用作跟表示层打交道的数"
+"据传输对象）。"
 
 #. Tag: term
+#: architecture.xml:139
 #, no-c-format
 msgid "Transient and detached objects and collections"
 msgstr "瞬态（transient）和脱管（detached）的对象及其集合"
 
 #. Tag: para
-#, no-c-format
-msgid "Instances of persistent classes that are not currently associated with a <literal>Session</literal>. They may have been instantiated by the application and not yet persisted, or they may have been instantiated by a closed <literal>Session</literal>."
-msgstr "那些目前没有与 <literal>Session</literal>关联的持久化类实例。他们可能是在被应用程序实例化后，尚未进行持久化的对象。也可能是因为实例化他们的 <literal>Session</literal> 已经被关闭而脱离持久化的对象。"
+#: architecture.xml:141
+#, 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"
+msgstr ""
+"那些目前没有与 <literal>Session</literal>关联的持久化类实例。他们可能是在被应"
+"用程序实例化后，尚未进行持久化的对象。也可能是因为实例化他们的 "
+"<literal>Session</literal> 已经被关闭而脱离持久化的对象。"
 
 #. Tag: term
-#, no-c-format
-msgid "Transaction (<literal>org.hibernate.Transaction</literal>)"
+#: architecture.xml:151
+#, fuzzy, no-c-format
+msgid "Transaction (<interfacename>org.hibernate.Transaction</interfacename>)"
 msgstr "事务 Transaction (<literal>org.hibernate.Transaction</literal>)"
 
 #. Tag: para
-#, 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 <literal>Session</literal> might span several <literal>Transaction</literal>s in some cases. However, transaction demarcation, either using the underlying API or <literal>Transaction</literal>, is never optional."
-msgstr "（可选的）应用程序用来指定原子操作单元范围的对象，它是单线程的，生命周期很短。它通过抽象将应用从底层具体的 JDBC、JTA 以及 CORBA 事务隔离开。某些情况下，一个 <literal>Session</literal> 之内可能包含多个 <literal>Transaction</literal> 对象。尽管是否使用该对象是可选的，但无论是使用底层的 API 还是使用 <literal>Transaction</literal> 对象，事务边界的开启与关闭是必需的。 "
+#: architecture.xml:153
+#, fuzzy, 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 ""
+"（可选的）应用程序用来指定原子操作单元范围的对象，它是单线程的，生命周期很"
+"短。它通过抽象将应用从底层具体的 JDBC、JTA 以及 CORBA 事务隔离开。某些情况"
+"下，一个 <literal>Session</literal> 之内可能包含多个 <literal>Transaction</"
+"literal> 对象。尽管是否使用该对象是可选的，但无论是使用底层的 API 还是使用 "
+"<literal>Transaction</literal> 对象，事务边界的开启与关闭是必需的。 "
 
 #. Tag: term
-#, no-c-format
-msgid "ConnectionProvider (<literal>org.hibernate.connection.ConnectionProvider</literal>)"
-msgstr "ConnectionProvider (<literal>org.hibernate.connection.ConnectionProvider</literal>)"
+#: architecture.xml:164
+#, fuzzy, no-c-format
+msgid ""
+"ConnectionProvider (<interfacename>org.hibernate.connection."
+"ConnectionProvider</interfacename>)"
+msgstr ""
+"ConnectionProvider (<literal>org.hibernate.connection.ConnectionProvider</"
+"literal>)"
 
 #. Tag: para
-#, no-c-format
-msgid "(Optional) A factory for, and pool of, JDBC connections. It abstracts the application from underlying <literal>Datasource</literal> or <literal>DriverManager</literal>. It is not exposed to application, but it can be extended and/or implemented by the developer."
-msgstr "（可选的）生成 JDBC 连接的工厂（同时也起到连接池的作用）。它通过抽象将应用从底层的 <literal>Datasource</literal> 或 <literal>DriverManager</literal> 隔离开。仅供开发者扩展/实现用，并不开放给应用程序使用。"
+#: architecture.xml:166
+#, fuzzy, 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 ""
+"（可选的）生成 JDBC 连接的工厂（同时也起到连接池的作用）。它通过抽象将应用从"
+"底层的 <literal>Datasource</literal> 或 <literal>DriverManager</literal> 隔离"
+"开。仅供开发者扩展/实现用，并不开放给应用程序使用。"
 
 #. Tag: term
-#, no-c-format
-msgid "TransactionFactory (<literal>org.hibernate.TransactionFactory</literal>)"
-msgstr "TransactionFactory (<literal>org.hibernate.TransactionFactory</literal>)"
+#: architecture.xml:175
+#, fuzzy, no-c-format
+msgid ""
+"TransactionFactory (<interfacename>org.hibernate.TransactionFactory</"
+"interfacename>)"
+msgstr ""
+"TransactionFactory (<literal>org.hibernate.TransactionFactory</literal>)"
 
 #. Tag: para
-#, no-c-format
-msgid "(Optional) A factory for <literal>Transaction</literal> instances. It is not exposed to the application, but it can be extended and/or implemented by the developer."
-msgstr "（可选的）生成 <literal>Transaction</literal> 对象实例的工厂。仅供开发者扩展/实现用，并不开发能够给应用程序使用。"
+#: architecture.xml:177
+#, fuzzy, 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 ""
+"（可选的）生成 <literal>Transaction</literal> 对象实例的工厂。仅供开发者扩展/"
+"实现用，并不开发能够给应用程序使用。"
 
-#. Tag: term
-#, no-c-format
-msgid "<emphasis>Extension Interfaces</emphasis>"
+#. Tag: emphasis
+#: architecture.xml:185
+#, fuzzy, no-c-format
+msgid "Extension Interfaces"
 msgstr "<emphasis>扩展接口</emphasis> "
 
 #. Tag: para
+#: architecture.xml:187
 #, 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 "Hibernate 提供了很多可选的扩展接口，你可以通过实现它们来定制你的持久层的行为。具体请参考 API 文档。"
-
-#. Tag: para
-#, no-c-format
-msgid "Given a \"minimal\" architecture, the application bypasses the <literal>Transaction</literal>/<literal>TransactionFactory</literal> and/or <literal>ConnectionProvider</literal> APIs to communicate with JTA or JDBC directly."
-msgstr "在特定“最小”的体系结构中，应用程序可能绕过  <literal>Transaction</literal>/<literal>TransactionFactory</literal> 以及 <literal>ConnectionProvider</literal> 等 API 直接跟 JTA 或 JDBC 打交道。"
+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 ""
+"Hibernate 提供了很多可选的扩展接口，你可以通过实现它们来定制你的持久层的行"
+"为。具体请参考 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> 对象就是这个所谓的持久化上下文。这三种不同的状态如下："
+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 "该实例从未与任何持久化上下文关联过。它没有持久化标识（相当于主键值）。 "
+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 标识（其值代表对象在内存中的位置）等价。　"
+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 标识的关系。 "
+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
 #, 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 "JMX 是管理 Java 组件的 J2EE 标准。Hibernate 可以通过一个 JMX 标准服务来管理。在这个发行版本中，我们提供了一个 MBean 接口的实现,即 <literal>org.hibernate.jmx.HibernateService</literal>。 "
+msgid ""
+"JMX is the J2EE standard for the management of Java components. Hibernate "
+"can be managed via a JMX standard service. AN MBean implementation is "
+"provided in the distribution: <literal>org.hibernate.jmx.HibernateService</"
+"literal>."
+msgstr ""
+"JMX 是管理 Java 组件的 J2EE 标准。Hibernate 可以通过一个 JMX 标准服务来管理。"
+"在这个发行版本中，我们提供了一个 MBean 接口的实现,即 <literal>org.hibernate."
+"jmx.HibernateService</literal>。 "
 
 #. Tag: para
-#, no-c-format
-msgid "For an example of how to deploy Hibernate as a JMX service on the JBoss Application Server, please see the JBoss User Guide. JBoss AS also provides these benefits if you deploy using JMX:"
-msgstr "想要看如何在 JBoss 应用服务器上将 Hibernate 部署为一个 JMX 服务的例子，您可以参考《JBoss 用户指南》。如果你使用 JMX 来部署 Hibernate，JBoss AS 也提供如下好处："
-
-#. Tag: para
-#, no-c-format
-msgid "<emphasis>Session Management</emphasis>: the Hibernate <literal>Session</literal>'s life cycle can be automatically bound to the scope of a JTA transaction. This means that you no longer have to manually open and close the <literal>Session</literal>; this becomes the job of a JBoss EJB interceptor. You also do not have to worry about transaction demarcation in your code (if you would like to write a portable persistence layer use the optional Hibernate <literal>Transaction</literal> API for this). You call the <literal>HibernateContext</literal> to access a <literal>Session</literal>."
-msgstr "<emphasis>会话管理：</emphasis> Hibernate 的 <literal>Session</literal> 对象的生命周期可以 自动跟一个 JTA 事务边界绑定。这意味着你无需手工开关 <literal>Session</literal> 了, 这项工作会由 JBoss EJB 拦截器来完成。你再也不用担心你的代码中的事务边界了（除非你想利用 Hibernate 提供可选的 <literal>Transaction</literal> API 来自己写一个便于移植的的持久层）。你通过调用 <literal>HibernateContext</literal> 来访问 <literal>Session</literal>。"
-
-#. Tag: para
-#, no-c-format
-msgid "<emphasis>HAR deployment</emphasis>: the Hibernate JMX service is deployed using a JBoss service deployment descriptor in an EAR and/or SAR file, as it supports all the usual configuration options of a Hibernate <literal>SessionFactory</literal>. However, you still need to name all your mapping files in the deployment descriptor. If you use the optional HAR deployment, JBoss will automatically detect all mapping files in your HAR file."
-msgstr "<emphasis>HAR 部署:</emphasis> 通常情况下，你会使用 JBoss 的服务部署描述符（在 EAR 或/和 SAR 文件中）来部署 Hibernate JMX 服务。这种部署方式支持所有常见的 Hibernate <literal>SessionFactory</literal> 的配置选项。不过，你仍需在部署描述符中，列出你所有的映射文的名字。如果你使用 HAR 部署方式, JBoss 会自动探测出你的 HAR 文件中所有的映射文件。"
-
-#. Tag: para
-#, no-c-format
-msgid "Consult the JBoss AS user guide for more information about these options."
-msgstr "这些选项更多的描述，请参考 JBoss 应用程序用户指南。"
-
-#. Tag: para
-#, 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 "将 Hibernate 以部署为 JMX 服务的另一个好处是可以查看 Hibernate 的运行时统计信息。参看 <xref linkend=\"configuration-optional-statistics\"/>。 "
-
-#. Tag: title
-#, no-c-format
-msgid "JCA Support"
-msgstr "对 JCA 的支持"
-
-#. Tag: para
-#, no-c-format
-msgid "Hibernate can also be configured as a JCA connector. Please see the website for more information. Please note, however, that at this stage Hibernate JCA support is under development."
-msgstr "Hibernate 也可以被配置为一个 JCA 连接器（JCA connector）。更多信息请参看网站。请注意，Hibernate 对 JCA 的支持，仍处于实验性阶段。"
+#: architecture.xml:257
+#, fuzzy, 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 ""
+"将 Hibernate 以部署为 JMX 服务的另一个好处是可以查看 Hibernate 的运行时统计信"
+"息。参看 <xref linkend=\"configuration-optional-statistics\"/>。 "
 
 #. Tag: title
+#: architecture.xml:264
 #, no-c-format
 msgid "Contextual sessions"
 msgstr "上下文相关的会话（Contextual Session）"
 
 #. Tag: para
+#: architecture.xml:265
 #, 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 "使用 Hibernate 的大多数应用程序需要某种形式的“上下文相关的”会话，特定的会话在整个特定的上下文范围内始终有效。然而，对不同类型的应用程序而言，要为什么是组成这种“上下文”下一个定义通常是困难的；不同的上下文对“当前”这个概念定义了不同的范围。在 3.0 版本之前，使用 Hibernate 的程序要么采用自行编写的基于 <literal>ThreadLocal</literal> 的上下文会话，要么采用 <literal>HibernateUtil</literal> 这样的辅助类，要么采用第三方框架（比如 Spring 或 Pico），它们提供了基于代理（proxy）或者基于拦截器（interception）的上下文相关的会话。"
+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 ""
+"使用 Hibernate 的大多数应用程序需要某种形式的“上下文相关的”会话，特定的会话在"
+"整个特定的上下文范围内始终有效。然而，对不同类型的应用程序而言，要为什么是组"
+"成这种“上下文”下一个定义通常是困难的；不同的上下文对“当前”这个概念定义了不同"
+"的范围。在 3.0 版本之前，使用 Hibernate 的程序要么采用自行编写的基于 "
+"<literal>ThreadLocal</literal> 的上下文会话，要么采用 "
+"<literal>HibernateUtil</literal> 这样的辅助类，要么采用第三方框架（比如 "
+"Spring 或 Pico），它们提供了基于代理（proxy）或者基于拦截器（interception）的"
+"上下文相关的会话。"
 
 #. Tag: para
+#: architecture.xml:274
 #, 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 "从 3.0.1 版本开始，Hibernate 增加了 <literal>SessionFactory.getCurrentSession()</literal> 方法。一开始，它假定了采用 <literal>JTA</literal> 事务，<literal>JTA</literal> 事务定义了当前 session 的范围和上下文（scope 和 context）。因为有好几个独立的 <literal>JTA TransactionManager</literal> 实现稳定可用，不论是否被部署到一个 <literal>J2EE</literal> 容器中，大多数（假若不是所有的）应用程序都应该采用 <literal>JTA</literal> 事务管理。基于这一点，采用 <literal>JTA</literal> 的上下文相关的会话可以满足你一切需要。"
+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 ""
+"从 3.0.1 版本开始，Hibernate 增加了 <literal>SessionFactory.getCurrentSession"
+"()</literal> 方法。一开始，它假定了采用 <literal>JTA</literal> 事务，"
+"<literal>JTA</literal> 事务定义了当前 session 的范围和上下文（scope 和 "
+"context）。因为有好几个独立的 <literal>JTA TransactionManager</literal> 实现"
+"稳定可用，不论是否被部署到一个 <literal>J2EE</literal> 容器中，大多数（假若不"
+"是所有的）应用程序都应该采用 <literal>JTA</literal> 事务管理。基于这一点，采"
+"用 <literal>JTA</literal> 的上下文相关的会话可以满足你一切需要。"
 
 #. Tag: para
+#: architecture.xml:284
 #, 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 "更好的是，从 3.1 开始，<literal>SessionFactory.getCurrentSession()</literal> 的后台实现是可拔插的。因此，我们引入了新的扩展接口（<literal>org.hibernate.context.CurrentSessionContext</literal>）和新的配置参数（<literal>hibernate.current_session_context_class</literal>），以便对什么是当前会话的范围（scope）和上下文（context）的定义进行拔插。"
+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 ""
+"更好的是，从 3.1 开始，<literal>SessionFactory.getCurrentSession()</literal> "
+"的后台实现是可拔插的。因此，我们引入了新的扩展接口（<literal>org.hibernate."
+"context.CurrentSessionContext</literal>）和新的配置参数（<literal>hibernate."
+"current_session_context_class</literal>），以便对什么是当前会话的范围"
+"（scope）和上下文（context）的定义进行拔插。"
 
 #. Tag: para
+#: architecture.xml:291
 #, 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 "请参阅 <literal>org.hibernate.context.CurrentSessionContext</literal> 接口的 Javadoc，那里有关于它的契约的详细讨论。它定义了单一的方法，<literal>currentSession()</literal>，特定的实现用它来负责跟踪当前的上下文相关的会话。Hibernate 内置了此接口的三种实现："
+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 ""
+"请参阅 <literal>org.hibernate.context.CurrentSessionContext</literal> 接口的 "
+"Javadoc，那里有关于它的契约的详细讨论。它定义了单一的方法，"
+"<literal>currentSession()</literal>，特定的实现用它来负责跟踪当前的上下文相关"
+"的会话。Hibernate 内置了此接口的三种实现："
 
 #. Tag: para
+#: architecture.xml:301
 #, 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 "<literal>org.hibernate.context.JTASessionContext</literal>：当前会话根据 <literal>JTA</literal> 来跟踪和界定。这和以前的仅支持 JTA 的方法是完全一样的。详情请参阅 Javadoc。"
+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 ""
+"<literal>org.hibernate.context.JTASessionContext</literal>：当前会话根据 "
+"<literal>JTA</literal> 来跟踪和界定。这和以前的仅支持 JTA 的方法是完全一样"
+"的。详情请参阅 Javadoc。"
 
 #. Tag: para
+#: architecture.xml:309
 #, no-c-format
-msgid "<literal>org.hibernate.context.ThreadLocalSessionContext</literal>:current sessions are tracked by thread of execution. See the Javadocs for details."
-msgstr "<literal>org.hibernate.context.ThreadLocalSessionContext</literal>：当前会话通过当前执行的线程来跟踪和界定。详情也请参阅 Javadoc。"
+msgid ""
+"<literal>org.hibernate.context.ThreadLocalSessionContext</literal>:current "
+"sessions are tracked by thread of execution. See the Javadocs for details."
+msgstr ""
+"<literal>org.hibernate.context.ThreadLocalSessionContext</literal>：当前会话"
+"通过当前执行的线程来跟踪和界定。详情也请参阅 Javadoc。"
 
 #. Tag: para
+#: architecture.xml:315
 #, 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 "<literal>org.hibernate.context.ManagedSessionContext</literal>：当前会话通过当前执行的线程来跟踪和界定。但是，你需要负责使用这个类的静态方法将 <literal>Session</literal> 实例绑定、或者取消绑定，它并不会打开（open）、flush 或者关闭（close）任何 <literal>Session</literal>。"
+msgid ""
+"<literal>org.hibernate.context.ManagedSessionContext</literal>: current "
+"sessions are tracked by thread of execution. However, you are responsible to "
+"bind and unbind a <literal>Session</literal> instance with static methods on "
+"this class: it does not open, flush, or close a <literal>Session</literal>."
+msgstr ""
+"<literal>org.hibernate.context.ManagedSessionContext</literal>：当前会话通过"
+"当前执行的线程来跟踪和界定。但是，你需要负责使用这个类的静态方法将 "
+"<literal>Session</literal> 实例绑定、或者取消绑定，它并不会打开（open）、"
+"flush 或者关闭（close）任何 <literal>Session</literal>。"
 
 #. Tag: para
-#, 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 "前两种实现都提供了“one session - one database transaction”的编程模型，也称作 <emphasis>session-per-request</emphasis>。Hibernate session 的起始和终结由数据库事务的生存来控制。假若你在纯粹的 Java SE 之上采用自行编写代码来管理事务，而不使用 JTA，建议你使用 Hibernate <literal>Transaction</literal> API 来把底层事务实现从你的代码中隐藏掉。如果你使用 JTA，请使用 JTA 接口来对事务限界。如果你在支持 CMT 的 EJB 容器中执行代码，事务边界是声明式定义的，你不需要在代码中进行任何事务或会话管理操作。请参阅 <xref linkend=\"transactions\"/> 一节来阅读更多的内容和示例代码。 "
+#: architecture.xml:324
+#, fuzzy, 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 ""
+"前两种实现都提供了“one session - one database transaction”的编程模型，也称作 "
+"<emphasis>session-per-request</emphasis>。Hibernate session 的起始和终结由数"
+"据库事务的生存来控制。假若你在纯粹的 Java SE 之上采用自行编写代码来管理事务，"
+"而不使用 JTA，建议你使用 Hibernate <literal>Transaction</literal> API 来把底"
+"层事务实现从你的代码中隐藏掉。如果你使用 JTA，请使用 JTA 接口来对事务限界。如"
+"果你在支持 CMT 的 EJB 容器中执行代码，事务边界是声明式定义的，你不需要在代码"
+"中进行任何事务或会话管理操作。请参阅 <xref linkend=\"transactions\"/> 一节来"
+"阅读更多的内容和示例代码。 "
 
 #. Tag: para
+#: architecture.xml:336
 #, 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 "<literal>hibernate.current_session_context_class</literal> 配置参数定义了应该采用哪个 <literal>org.hibernate.context.CurrentSessionContext</literal> 实现。注意，为了向下兼容，如果未配置此参数，但是存在 <literal>org.hibernate.transaction.TransactionManagerLookup</literal> 的配置，Hibernate 会采用<literal>org.hibernate.context.JTASessionContext</literal>。一般而言，此参数的值指明了要使用的实现类的全名，但那三种内置的实现可以使用简写，即 \"jta\"、\"thread\" 和 \"managed\"。 "
+msgid ""
+"The <literal>hibernate.current_session_context_class</literal> configuration "
+"parameter defines which <literal>org.hibernate.context."
+"CurrentSessionContext</literal> implementation should be used. For backwards "
+"compatibility, if this configuration parameter is not set but a <literal>org."
+"hibernate.transaction.TransactionManagerLookup</literal> is configured, "
+"Hibernate will use the <literal>org.hibernate.context.JTASessionContext</"
+"literal>. Typically, the value of this parameter would just name the "
+"implementation class to use. For the three out-of-the-box implementations, "
+"however, there are three corresponding short names: \"jta\", \"thread\", and "
+"\"managed\"."
+msgstr ""
+"<literal>hibernate.current_session_context_class</literal> 配置参数定义了应该"
+"采用哪个 <literal>org.hibernate.context.CurrentSessionContext</literal> 实"
+"现。注意，为了向下兼容，如果未配置此参数，但是存在 <literal>org.hibernate."
+"transaction.TransactionManagerLookup</literal> 的配置，Hibernate 会采用"
+"<literal>org.hibernate.context.JTASessionContext</literal>。一般而言，此参数"
+"的值指明了要使用的实现类的全名，但那三种内置的实现可以使用简写，即 \"jta\"、"
+"\"thread\" 和 \"managed\"。 "
 
+#~ msgid ""
+#~ "We do not have the scope in this document to provide a more detailed view "
+#~ "of all the runtime architectures available; Hibernate is flexible and "
+#~ "supports several different approaches. We will, however, show the two "
+#~ "extremes: \"minimal\" architecture and \"comprehensive\" architecture."
+#~ msgstr ""
+#~ "提供 Hibernate 所有运行时体系结构的更多细节不是本文档的范畴。由于 "
+#~ "Hibernate 非常灵活，且支持多种应用方案， 所以我们这只描述一下两种极端的情"
+#~ "况：“最小”和“全面解决”的体系结构方案。"
+
+#~ msgid ""
+#~ "This next diagram illustrates how Hibernate utilizes database and "
+#~ "configuration data to provide persistence services, and persistent "
+#~ "objects, to the application."
+#~ msgstr ""
+#~ "下图演示了 Hibernate 如何使用数据库和配置信息来为应用程序提供持久化服务"
+#~ "（以及持久的对象）。"
+
+#~ msgid "Here are some definitions of the objects depicted in the diagrams:"
+#~ msgstr "图中各个对象的定义如下： "
+
+#~ msgid ""
+#~ "Given a \"minimal\" architecture, the application bypasses the "
+#~ "<literal>Transaction</literal>/<literal>TransactionFactory</literal> and/"
+#~ "or <literal>ConnectionProvider</literal> APIs to communicate with JTA or "
+#~ "JDBC directly."
+#~ msgstr ""
+#~ "在特定“最小”的体系结构中，应用程序可能绕过  <literal>Transaction</"
+#~ "literal>/<literal>TransactionFactory</literal> 以及 "
+#~ "<literal>ConnectionProvider</literal> 等 API 直接跟 JTA 或 JDBC 打交道。"
+
+#~ msgid ""
+#~ "For an example of how to deploy Hibernate as a JMX service on the JBoss "
+#~ "Application Server, please see the JBoss User Guide. JBoss AS also "
+#~ "provides these benefits if you deploy using JMX:"
+#~ msgstr ""
+#~ "想要看如何在 JBoss 应用服务器上将 Hibernate 部署为一个 JMX 服务的例子，您"
+#~ "可以参考《JBoss 用户指南》。如果你使用 JMX 来部署 Hibernate，JBoss AS 也提"
+#~ "供如下好处："
+
+#~ msgid ""
+#~ "<emphasis>Session Management</emphasis>: the Hibernate <literal>Session</"
+#~ "literal>'s life cycle can be automatically bound to the scope of a JTA "
+#~ "transaction. This means that you no longer have to manually open and "
+#~ "close the <literal>Session</literal>; this becomes the job of a JBoss EJB "
+#~ "interceptor. You also do not have to worry about transaction demarcation "
+#~ "in your code (if you would like to write a portable persistence layer use "
+#~ "the optional Hibernate <literal>Transaction</literal> API for this). You "
+#~ "call the <literal>HibernateContext</literal> to access a "
+#~ "<literal>Session</literal>."
+#~ msgstr ""
+#~ "<emphasis>会话管理：</emphasis> Hibernate 的 <literal>Session</literal> 对"
+#~ "象的生命周期可以 自动跟一个 JTA 事务边界绑定。这意味着你无需手工开关 "
+#~ "<literal>Session</literal> 了, 这项工作会由 JBoss EJB 拦截器来完成。你再也"
+#~ "不用担心你的代码中的事务边界了（除非你想利用 Hibernate 提供可选的 "
+#~ "<literal>Transaction</literal> API 来自己写一个便于移植的的持久层）。你通"
+#~ "过调用 <literal>HibernateContext</literal> 来访问 <literal>Session</"
+#~ "literal>。"
+
+#~ msgid ""
+#~ "<emphasis>HAR deployment</emphasis>: the Hibernate JMX service is "
+#~ "deployed using a JBoss service deployment descriptor in an EAR and/or SAR "
+#~ "file, as it supports all the usual configuration options of a Hibernate "
+#~ "<literal>SessionFactory</literal>. However, you still need to name all "
+#~ "your mapping files in the deployment descriptor. If you use the optional "
+#~ "HAR deployment, JBoss will automatically detect all mapping files in your "
+#~ "HAR file."
+#~ msgstr ""
+#~ "<emphasis>HAR 部署:</emphasis> 通常情况下，你会使用 JBoss 的服务部署描述符"
+#~ "（在 EAR 或/和 SAR 文件中）来部署 Hibernate JMX 服务。这种部署方式支持所有"
+#~ "常见的 Hibernate <literal>SessionFactory</literal> 的配置选项。不过，你仍"
+#~ "需在部署描述符中，列出你所有的映射文的名字。如果你使用 HAR 部署方式, "
+#~ "JBoss 会自动探测出你的 HAR 文件中所有的映射文件。"
+
+#~ msgid ""
+#~ "Consult the JBoss AS user guide for more information about these options."
+#~ msgstr "这些选项更多的描述，请参考 JBoss 应用程序用户指南。"
+
+#~ msgid "JCA Support"
+#~ msgstr "对 JCA 的支持"
+
+#~ msgid ""
+#~ "Hibernate can also be configured as a JCA connector. Please see the "
+#~ "website for more information. Please note, however, that at this stage "
+#~ "Hibernate JCA support is under development."
+#~ msgstr ""
+#~ "Hibernate 也可以被配置为一个 JCA 连接器（JCA connector）。更多信息请参看网"
+#~ "站。请注意，Hibernate 对 JCA 的支持，仍处于实验性阶段。"