Author: misty(a)redhat.com Date: 2010-03-30 20:52:35 -0400 (Tue, 30 Mar 2010) New Revision: 19142 Modified: core/trunk/annotations/src/main/docbook/en/modules/entity.xml core/trunk/annotations/src/main/docbook/en/modules/xml-overriding.xml core/trunk/annotations/src/main/docbook/fr/modules/entity.xml core/trunk/annotations/src/main/docbook/fr/modules/xml-overriding.xml core/trunk/annotations/src/main/docbook/zh_cn/modules/entity.xml core/trunk/annotations/src/main/docbook/zh_cn/modules/xml-overriding.xml core/trunk/documentation/manual/src/main/docbook/de-DE/content/performance.po core/trunk/documentation/manual/src/main/docbook/de-DE/content/query_sql.po core/trunk/documentation/manual/src/main/docbook/de-DE/content/session_api.po core/trunk/documentation/manual/src/main/docbook/de-DE/fallback_content/Feedback.po core/trunk/documentation/manual/src/main/docbook/en-US/content/basic_mapping.xml core/trunk/documentation/manual/src/main/docbook/en-US/content/collection_mapping.xml core/trunk/documentation/manual/src/main/docbook/en-US/content/performance.xml core/trunk/documentation/manual/src/main/docbook/pot/Book_Info.pot core/trunk/documentation/manual/src/main/docbook/pot/HIBERNATE_-_Relational_Persistence_for_Idiomatic_Java.pot core/trunk/documentation/manual/src/main/docbook/pot/author_group.pot core/trunk/documentation/manual/src/main/docbook/pot/content/architecture.pot core/trunk/documentation/manual/src/main/docbook/pot/content/association_mapping.pot Log: Propagaged changes for JIRA HHH-5047 Modified: core/trunk/annotations/src/main/docbook/en/modules/entity.xml =================================================================== --- core/trunk/annotations/src/main/docbook/en/modules/entity.xml 2010-03-30 19:36:43 UTC (rev 19141) +++ core/trunk/annotations/src/main/docbook/en/modules/entity.xml 2010-03-31 00:52:35 UTC (rev 19142) @@ -427,25 +427,25 @@ <programlistingco> <areaspec> - <area coords="2 55" id="hm1" /> + <area coords="2" id="hm1" /> - <area coords="3 55" id="hm2" /> + <area coords="3" id="hm2" /> - <area coords="4 55" id="hm3" /> + <area coords="4" id="hm3" /> - <area coords="5 55" id="hm4" /> + <area coords="5" id="hm4" /> - <area coords="6 55" id="hm5" /> + <area coords="6" id="hm5" /> - <area coords="7 55" id="hm6" /> + <area coords="7" id="hm6" /> - <area coords="8 55" id="hm7" /> + <area coords="8" id="hm7" /> - <area coords="9 55" id="hm8" /> + <area coords="9" id="hm8" /> - <area coords="10 55" id="hm9" /> + <area coords="10" id="hm9" /> - <area coords="11 55" id="hm10" /> + <area coords="11" id="hm10" /> </areaspec> <programlisting language="JAVA" role="JAVA">@Column( @@ -2645,11 +2645,11 @@ <programlistingco> <areaspec> - <area coords="2 55" id="cache-hm1" /> + <area coords="2" id="cache-hm1" /> - <area coords="3 55" id="cache-hm2" /> + <area coords="3" id="cache-hm2" /> - <area coords="4 55" id="cache-hm3" /> + <area coords="4" id="cache-hm3" /> </areaspec> <programlisting language="JAVA" role="JAVA">@Cache( Modified: core/trunk/annotations/src/main/docbook/en/modules/xml-overriding.xml =================================================================== --- core/trunk/annotations/src/main/docbook/en/modules/xml-overriding.xml 2010-03-30 19:36:43 UTC (rev 19141) +++ core/trunk/annotations/src/main/docbook/en/modules/xml-overriding.xml 2010-03-31 00:52:35 UTC (rev 19142) @@ -91,25 +91,25 @@ <programlistingco> <areaspec> - <area coords="3 85" id="aa1" /> + <area coords="3" id="aa1" /> - <area coords="9 85" id="aa2" /> + <area coords="9" id="aa2" /> - <area coords="10 85" id="aa3" /> + <area coords="10" id="aa3" /> - <area coords="11 85" id="aa4" /> + <area coords="11" id="aa4" /> - <area coords="17 85" id="aa5" /> + <area coords="17" id="aa5" /> - <area coords="23 85" id="aa6" /> + <area coords="23" id="aa6" /> - <area coords="24 85" id="aa7" /> + <area coords="24" id="aa7" /> - <area coords="25 85" id="aa8" /> + <area coords="25" id="aa8" /> - <area coords="26 85" id="aa9" /> + <area coords="26" id="aa9" /> - <area coords="31 85" id="aa10" /> + <area coords="31" id="aa10" /> </areaspec> <programlisting>&lt;?xml version="1.0" encoding="UTF-8"?&gt; @@ -238,15 +238,15 @@ <programlistingco> <areaspec> - <area coords="11 85" id="ab1" /> + <area coords="11" id="ab1" /> - <area coords="18 85" id="ab2" /> + <area coords="18" id="ab2" /> - <area coords="22 85" id="ab3" /> + <area coords="22" id="ab3" /> - <area coords="28 85" id="ab4" /> + <area coords="28" id="ab4" /> - <area coords="34 85" id="ab5" /> + <area coords="34" id="ab5" /> </areaspec> <programlisting>&lt;?xml version="1.0" encoding="UTF-8"?&gt; Modified: core/trunk/annotations/src/main/docbook/fr/modules/entity.xml =================================================================== --- core/trunk/annotations/src/main/docbook/fr/modules/entity.xml 2010-03-30 19:36:43 UTC (rev 19141) +++ core/trunk/annotations/src/main/docbook/fr/modules/entity.xml 2010-03-31 00:52:35 UTC (rev 19142) @@ -307,25 +307,25 @@ <programlistingco> <areaspec> - <area coords="2 55" id="hm1" /> + <area coords="2" id="hm1" /> - <area coords="3 55" id="hm2" /> + <area coords="3" id="hm2" /> - <area coords="4 55" id="hm3" /> + <area coords="4" id="hm3" /> - <area coords="5 55" id="hm4" /> + <area coords="5" id="hm4" /> - <area coords="6 55" id="hm5" /> + <area coords="6" id="hm5" /> - <area coords="7 55" id="hm6" /> + <area coords="7" id="hm6" /> - <area coords="8 55" id="hm7" /> + <area coords="8" id="hm7" /> - <area coords="9 55" id="hm8" /> + <area coords="9" id="hm8" /> - <area coords="10 55" id="hm9" /> + <area coords="10" id="hm9" /> - <area coords="11 55" id="hm10" /> + <area coords="11" id="hm10" /> </areaspec> <programlisting>@Column( @@ -3305,11 +3305,11 @@ <programlistingco> <areaspec> - <area coords="2 55" id="hm1" /> + <area coords="2" id="hm1" /> - <area coords="3 55" id="hm2" /> + <area coords="3" id="hm2" /> - <area coords="4 55" id="hm3" /> + <area coords="4" id="hm3" /> </areaspec> <programlisting>@Cache( Modified: core/trunk/annotations/src/main/docbook/fr/modules/xml-overriding.xml =================================================================== --- core/trunk/annotations/src/main/docbook/fr/modules/xml-overriding.xml 2010-03-30 19:36:43 UTC (rev 19141) +++ core/trunk/annotations/src/main/docbook/fr/modules/xml-overriding.xml 2010-03-31 00:52:35 UTC (rev 19142) @@ -70,25 +70,25 @@ <programlistingco> <areaspec> - <area coords="3 85" id="aa1" /> + <area coords="3" id="aa1" /> - <area coords="9 85" id="aa2" /> + <area coords="9" id="aa2" /> - <area coords="10 85" id="aa3" /> + <area coords="10" id="aa3" /> - <area coords="11 85" id="aa4" /> + <area coords="11" id="aa4" /> - <area coords="17 85" id="aa5" /> + <area coords="17" id="aa5" /> - <area coords="23 85" id="aa6" /> + <area coords="23" id="aa6" /> - <area coords="24 85" id="aa7" /> + <area coords="24" id="aa7" /> - <area coords="25 85" id="aa8" /> + <area coords="25" id="aa8" /> - <area coords="26 85" id="aa9" /> + <area coords="26" id="aa9" /> - <area coords="31 85" id="aa10" /> + <area coords="31" id="aa10" /> </areaspec> <programlisting>&lt;?xml version="1.0" encoding="UTF-8"?&gt; @@ -221,15 +221,15 @@ <programlistingco> <areaspec> - <area coords="11 85" id="ab1" /> + <area coords="11" id="ab1" /> - <area coords="18 85" id="ab2" /> + <area coords="18" id="ab2" /> - <area coords="22 85" id="ab3" /> + <area coords="22" id="ab3" /> - <area coords="28 85" id="ab4" /> + <area coords="28" id="ab4" /> - <area coords="34 85" id="ab5" /> + <area coords="34" id="ab5" /> </areaspec> <programlisting>&lt;?xml version="1.0" encoding="UTF-8"?&gt; Modified: core/trunk/annotations/src/main/docbook/zh_cn/modules/entity.xml =================================================================== --- core/trunk/annotations/src/main/docbook/zh_cn/modules/entity.xml 2010-03-30 19:36:43 UTC (rev 19141) +++ core/trunk/annotations/src/main/docbook/zh_cn/modules/entity.xml 2010-03-31 00:52:35 UTC (rev 19142) @@ -263,25 +263,25 @@ <programlistingco> <areaspec> - <area coords="2 55" id="hm1" /> + <area coords="2" id="hm1" /> - <area coords="3 55" id="hm2" /> + <area coords="3" id="hm2" /> - <area coords="4 55" id="hm3" /> + <area coords="4" id="hm3" /> - <area coords="5 55" id="hm4" /> + <area coords="5" id="hm4" /> - <area coords="6 55" id="hm5" /> + <area coords="6" id="hm5" /> - <area coords="7 55" id="hm6" /> + <area coords="7" id="hm6" /> - <area coords="8 55" id="hm7" /> + <area coords="8" id="hm7" /> - <area coords="9 55" id="hm8" /> + <area coords="9" id="hm8" /> - <area coords="10 55" id="hm9" /> + <area coords="10" id="hm9" /> - <area coords="11 55" id="hm10" /> + <area coords="11" id="hm10" /> </areaspec> <programlisting>@Column( @@ -2744,11 +2744,11 @@ <programlistingco> <areaspec> - <area coords="2 55" id="hm1" /> + <area coords="2" id="hm1" /> - <area coords="3 55" id="hm2" /> + <area coords="3" id="hm2" /> - <area coords="4 55" id="hm3" /> + <area coords="4" id="hm3" /> </areaspec> <programlisting>@Cache( Modified: core/trunk/annotations/src/main/docbook/zh_cn/modules/xml-overriding.xml =================================================================== --- core/trunk/annotations/src/main/docbook/zh_cn/modules/xml-overriding.xml 2010-03-30 19:36:43 UTC (rev 19141) +++ core/trunk/annotations/src/main/docbook/zh_cn/modules/xml-overriding.xml 2010-03-31 00:52:35 UTC (rev 19142) @@ -53,25 +53,25 @@ <programlistingco> <areaspec> - <area coords="3 85" id="aa1" /> + <area coords="3" id="aa1" /> - <area coords="9 85" id="aa2" /> + <area coords="9" id="aa2" /> - <area coords="10 85" id="aa3" /> + <area coords="10" id="aa3" /> - <area coords="11 85" id="aa4" /> + <area coords="11" id="aa4" /> - <area coords="17 85" id="aa5" /> + <area coords="17" id="aa5" /> - <area coords="23 85" id="aa6" /> + <area coords="23" id="aa6" /> - <area coords="24 85" id="aa7" /> + <area coords="24" id="aa7" /> - <area coords="25 85" id="aa8" /> + <area coords="25" id="aa8" /> - <area coords="26 85" id="aa9" /> + <area coords="26" id="aa9" /> - <area coords="31 85" id="aa10" /> + <area coords="31" id="aa10" /> </areaspec> <programlisting>&lt;?xml version="1.0" encoding="UTF-8"?&gt; @@ -173,15 +173,15 @@ <programlistingco> <areaspec> - <area coords="11 85" id="ab1" /> + <area coords="11" id="ab1" /> - <area coords="18 85" id="ab2" /> + <area coords="18" id="ab2" /> - <area coords="22 85" id="ab3" /> + <area coords="22" id="ab3" /> - <area coords="28 85" id="ab4" /> + <area coords="28" id="ab4" /> - <area coords="34 85" id="ab5" /> + <area coords="34" id="ab5" /> </areaspec> <programlisting>&lt;?xml version="1.0" encoding="UTF-8"?&gt; Modified: core/trunk/documentation/manual/src/main/docbook/de-DE/content/performance.po =================================================================== --- core/trunk/documentation/manual/src/main/docbook/de-DE/content/performance.po 2010-03-30 19:36:43 UTC (rev 19141) +++ core/trunk/documentation/manual/src/main/docbook/de-DE/content/performance.po 2010-03-31 00:52:35 UTC (rev 19142) @@ -275,7 +275,7 @@ msgstr "" "Project-Id-Version: Collection_Mapping\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2010-03-12T00:03:47\n" +"POT-Creation-Date: 2010-02-11T05:38:15\n" "PO-Revision-Date: 2007-02-26 10:27+1000\n" "Last-Translator: \n" "Language-Team: <de(a)li.org&gt;\n&quot; @@ -1892,7 +1892,7 @@ #, no-c-format msgid "" "If you configure your underlying cache implementation to use expiry or " -"timeouts is very important that the cache timeout of the underlying cache " +"timeouts is is very important that the cache timeout of the underlying cache " "region for the UpdateTimestampsCache be set to a higher value than the " "timeouts of any of the query caches. In fact, we recommend that the the " "UpdateTimestampsCache region not be configured for expiry at all. Note, in " Modified: core/trunk/documentation/manual/src/main/docbook/de-DE/content/query_sql.po =================================================================== --- core/trunk/documentation/manual/src/main/docbook/de-DE/content/query_sql.po 2010-03-30 19:36:43 UTC (rev 19141) +++ core/trunk/documentation/manual/src/main/docbook/de-DE/content/query_sql.po 2010-03-31 00:52:35 UTC (rev 19142) @@ -275,7 +275,7 @@ msgstr "" "Project-Id-Version: Collection_Mapping\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2010-03-12T00:03:47\n" +"POT-Creation-Date: 2010-02-11T05:38:15\n" "PO-Revision-Date: 2007-02-26 10:27+1000\n" "Last-Translator: \n" "Language-Team: <de(a)li.org&gt;\n&quot; @@ -819,7 +819,7 @@ #. Tag: entry #, fuzzy, no-c-format -msgid "All properties of the collection" +msgid "All properties of the the collection" msgstr "Alle Properties der Collection" #. Tag: entry Modified: core/trunk/documentation/manual/src/main/docbook/de-DE/content/session_api.po =================================================================== --- core/trunk/documentation/manual/src/main/docbook/de-DE/content/session_api.po 2010-03-30 19:36:43 UTC (rev 19141) +++ core/trunk/documentation/manual/src/main/docbook/de-DE/content/session_api.po 2010-03-31 00:52:35 UTC (rev 19142) @@ -275,7 +275,7 @@ msgstr "" "Project-Id-Version: Collection_Mapping\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2010-03-12T00:03:48\n" +"POT-Creation-Date: 2010-02-11T05:38:15\n" "PO-Revision-Date: 2007-02-26 10:27+1000\n" "Last-Translator: \n" "Language-Team: <de(a)li.org&gt;\n&quot; @@ -421,7 +421,7 @@ #. Tag: para #, fuzzy, no-c-format msgid "" -"Newly instantiated instances of a persistent class are considered " +"Newly instantiated instances of a a persistent class are considered " "<emphasis>transient</emphasis> by Hibernate. We can make a transient " "instance <emphasis>persistent</emphasis> by associating it with a session:" msgstr "" Modified: core/trunk/documentation/manual/src/main/docbook/de-DE/fallback_content/Feedback.po =================================================================== --- core/trunk/documentation/manual/src/main/docbook/de-DE/fallback_content/Feedback.po 2010-03-30 19:36:43 UTC (rev 19141) +++ core/trunk/documentation/manual/src/main/docbook/de-DE/fallback_content/Feedback.po 2010-03-31 00:52:35 UTC (rev 19142) @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: Feedback\n" -"POT-Creation-Date: 2010-03-12T00:03:48\n" +"POT-Creation-Date: 2010-02-11T05:38:16\n" "PO-Revision-Date: 2010-01-11 17:47+1100\n" "Last-Translator: \n" "Language-Team: <en(a)li.org&gt;\n&quot; @@ -19,15 +19,19 @@ msgid "We Need Feedback!" msgstr "Wir brauchen Feedback!" +#. Tag: primary +#, no-c-format +msgid "feedback" +msgstr "Feedback" + +#. Tag: secondary +#, no-c-format +msgid "contact information for this manual" +msgstr "Kontaktinformationen für dieses Handbuch" + #. Tag: para #, no-c-format msgid "You should over ride this by creating your own local Feedback.xml file." msgstr "" "Sie sollte dies außer Kraft setzen, indem Sie Ihre eigene lokale Feedback." "xml-Datei erstellen." - -#~ msgid "feedback" -#~ msgstr "Feedback" - -#~ msgid "contact information for this manual" -#~ msgstr "Kontaktinformationen für dieses Handbuch" Modified: core/trunk/documentation/manual/src/main/docbook/en-US/content/basic_mapping.xml =================================================================== --- core/trunk/documentation/manual/src/main/docbook/en-US/content/basic_mapping.xml 2010-03-30 19:36:43 UTC (rev 19141) +++ core/trunk/documentation/manual/src/main/docbook/en-US/content/basic_mapping.xml 2010-03-31 00:52:35 UTC (rev 19142) @@ -197,13 +197,13 @@ <programlistingco role="XML"> <areaspec> - <area id="hm1" coords="2 55"/> - <area id="hm2" coords="3 55"/> - <area id="hm3" coords="4 55"/> - <area id="hm4" coords="5 55"/> - <area id="hm5" coords="6 55"/> - <area id="hm6" coords="7 55"/> - <area id="hm7" coords="8 55"/> + <area id="hm1" coords="2"/> + <area id="hm2" coords="3"/> + <area id="hm3" coords="4"/> + <area id="hm4" coords="5"/> + <area id="hm5" coords="6"/> + <area id="hm6" coords="7"/> + <area id="hm7" coords="8"/> </areaspec> <programlisting role="XML"><![CDATA[<hibernate-mapping schema="schemaName" @@ -288,27 +288,27 @@ <programlistingco role="XML"> <areaspec> - <area id="class1" coords="2 55"/> - <area id="class2" coords="3 55" /> - <area id="class3" coords="4 55"/> - <area id="class4" coords="5 55" /> - <area id="class5" coords="6 55"/> - <area id="class6" coords="7 55" /> - <area id="class7" coords="8 55"/> - <area id="class8" coords="9 55" /> - <area id="class9" coords="10 55" /> - <area id="class10" coords="11 55"/> - <area id="class11" coords="12 55"/> - <area id="class12" coords="13 55"/> - <area id="class13" coords="14 55"/> - <area id="class14" coords="15 55"/> - <area id="class15" coords="16 55"/> - <area id="class16" coords="17 55"/> - <area id="class17" coords="18 55"/> - <area id="class18" coords="19 55"/> - <area id="class19" coords="20 55"/> - <area id="class20" coords="21 55"/> - <area id="class21" coords="22 55"/> + <area id="class1" coords="2"/> + <area id="class2" coords="3" /> + <area id="class3" coords="4"/> + <area id="class4" coords="5" /> + <area id="class5" coords="6"/> + <area id="class6" coords="7" /> + <area id="class7" coords="8"/> + <area id="class8" coords="9" /> + <area id="class9" coords="10" /> + <area id="class10" coords="11"/> + <area id="class11" coords="12"/> + <area id="class12" coords="13"/> + <area id="class13" coords="14"/> + <area id="class14" coords="15"/> + <area id="class15" coords="16"/> + <area id="class16" coords="17"/> + <area id="class17" coords="18"/> + <area id="class18" coords="19"/> + <area id="class19" coords="20"/> + <area id="class20" coords="21"/> + <area id="class21" coords="22"/> </areaspec> <programlisting role="XML"><![CDATA[<class name="ClassName" @@ -608,11 +608,11 @@ <programlistingco role="XML"> <areaspec> - <area id="id1" coords="2 70"/> - <area id="id2" coords="3 70" /> - <area id="id3" coords="4 70"/> - <area id="id4" coords="5 70" /> - <area id="id5" coords="6 70" /> + <area id="id1" coords="2"/> + <area id="id2" coords="3" /> + <area id="id3" coords="4"/> + <area id="id4" coords="5" /> + <area id="id5" coords="6" /> </areaspec> <programlisting role="XML"><![CDATA[<id name="propertyName" @@ -1234,11 +1234,11 @@ <programlistingco role="XML"> <areaspec> - <area id="discriminator1" coords="2 60"/> - <area id="discriminator2" coords="3 60" /> - <area id="discriminator3" coords="4 60" /> - <area id="discriminator4" coords="5 60" /> - <area id="discriminator5" coords="6 60" /> + <area id="discriminator1" coords="2"/> + <area id="discriminator2" coords="3" /> + <area id="discriminator3" coords="4" /> + <area id="discriminator4" coords="5" /> + <area id="discriminator5" coords="6" /> </areaspec> <programlisting role="XML"><![CDATA[<discriminator column="discriminator_column" @@ -1318,13 +1318,13 @@ <programlistingco role="XML"> <areaspec> - <area id="version1" coords="2 70"/> - <area id="version2" coords="3 70"/> - <area id="version3" coords="4 70"/> - <area id="version4" coords="5 70"/> - <area id="version5" coords="6 70"/> - <area id="version6" coords="7 70"/> - <area id="version7" coords="8 70"/> + <area id="version1" coords="2"/> + <area id="version2" coords="3"/> + <area id="version3" coords="4"/> + <area id="version4" coords="5"/> + <area id="version5" coords="6"/> + <area id="version6" coords="7"/> + <area id="version7" coords="8"/> </areaspec> <programlisting role="XML"><![CDATA[<version column="version_column" @@ -1414,12 +1414,12 @@ <programlistingco role="XML"> <areaspec> - <area id="timestamp1" coords="2 70"/> - <area id="timestamp2" coords="3 70" /> - <area id="timestamp3" coords="4 70" /> - <area id="timestamp4" coords="5 70" /> - <area id="timestamp5" coords="6 70" /> - <area id="timestamp6" coords="7 70" /> + <area id="timestamp1" coords="2"/> + <area id="timestamp2" coords="3" /> + <area id="timestamp3" coords="4" /> + <area id="timestamp4" coords="5" /> + <area id="timestamp5" coords="6" /> + <area id="timestamp6" coords="7" /> </areaspec> <programlisting role="XML"><![CDATA[<timestamp column="timestamp_column" @@ -1505,20 +1505,20 @@ <programlistingco role="XML"> <areaspec> - <area id="property1" coords="2 70"/> - <area id="property2" coords="3 70"/> - <area id="property3" coords="4 70"/> + <area id="property1" coords="2"/> + <area id="property2" coords="3"/> + <area id="property3" coords="4"/> <areaset id="property4-5" coords=""> - <area id="property4" coords='5 70'/> - <area id="property5" coords='6 70'/> + <area id="property4" coords='5'/> + <area id="property5" coords='6'/> </areaset> - <area id="property6" coords="7 70"/> - <area id="property7" coords="8 70"/> - <area id="property8" coords="9 70"/> - <area id="property9" coords="10 70"/> - <area id="property10" coords="11 70"/> - <area id="property11" coords="12 70"/> - <area id="property12" coords="13 70"/> + <area id="property6" coords="7"/> + <area id="property7" coords="8"/> + <area id="property8" coords="9"/> + <area id="property9" coords="10"/> + <area id="property10" coords="11"/> + <area id="property11" coords="12"/> + <area id="property12" coords="13"/> </areaspec> <programlisting role="XML"><![CDATA[<property name="propertyName" @@ -1702,24 +1702,24 @@ <programlistingco role="XML"> <areaspec> - <area id="manytoone1" coords="2 70"/> - <area id="manytoone2" coords="3 70"/> - <area id="manytoone3" coords="4 70"/> - <area id="manytoone4" coords="5 70"/> - <area id="manytoone5" coords="6 70"/> + <area id="manytoone1" coords="2"/> + <area id="manytoone2" coords="3"/> + <area id="manytoone3" coords="4"/> + <area id="manytoone4" coords="5"/> + <area id="manytoone5" coords="6"/> <areaset id="manytoone6-7" coords=""> - <area id="manytoone6" coords='7 70'/> - <area id="manytoone7" coords='8 70'/> + <area id="manytoone6" coords='7'/> + <area id="manytoone7" coords='8'/> </areaset> - <area id="manytoone8" coords="9 70"/> - <area id="manytoone9" coords="10 70"/> - <area id="manytoone10" coords="11 70"/> - <area id="manytoone11" coords="12 70"/> - <area id="manytoone12" coords="13 70"/> - <area id="manytoone13" coords="14 70"/> - <area id="manytoone14" coords="15 70"/> - <area id="manytoone15" coords="16 70"/> - <area id="manytoone16" coords="17 70"/> + <area id="manytoone8" coords="9"/> + <area id="manytoone9" coords="10"/> + <area id="manytoone10" coords="11"/> + <area id="manytoone11" coords="12"/> + <area id="manytoone12" coords="13"/> + <area id="manytoone13" coords="14"/> + <area id="manytoone14" coords="15"/> + <area id="manytoone15" coords="16"/> + <area id="manytoone16" coords="17"/> </areaspec> <programlisting role="XML"><![CDATA[<many-to-one name="propertyName" @@ -1913,16 +1913,16 @@ <programlistingco role="XML"> <areaspec> - <area id="onetoone1" coords="2 70"/> - <area id="onetoone2" coords="3 70"/> - <area id="onetoone3" coords="4 70"/> - <area id="onetoone4" coords="5 70"/> - <area id="onetoone5" coords="6 70"/> - <area id="onetoone6" coords="7 70"/> - <area id="onetoone7" coords="8 70"/> - <area id="onetoone8" coords="9 70"/> - <area id="onetoone9" coords="10 70"/> - <area id="onetoone10" coords="11 70"/> + <area id="onetoone1" coords="2"/> + <area id="onetoone2" coords="3"/> + <area id="onetoone3" coords="4"/> + <area id="onetoone4" coords="5"/> + <area id="onetoone5" coords="6"/> + <area id="onetoone6" coords="7"/> + <area id="onetoone7" coords="8"/> + <area id="onetoone8" coords="9"/> + <area id="onetoone9" coords="10"/> + <area id="onetoone10" coords="11"/> </areaspec> <programlisting role="XML"><![CDATA[<one-to-one name="propertyName" @@ -2129,14 +2129,14 @@ <programlistingco role="XML"> <areaspec> - <area id="component1" coords="2 45"/> - <area id="component2" coords="3 45"/> - <area id="component3" coords="4 45"/> - <area id="component4" coords="5 45"/> - <area id="component5" coords="6 45"/> - <area id="component6" coords="7 45"/> - <area id="component7" coords="8 45"/> - <area id="component8" coords="9 45"/> + <area id="component1" coords="2"/> + <area id="component2" coords="3"/> + <area id="component3" coords="4"/> + <area id="component4" coords="5"/> + <area id="component5" coords="6"/> + <area id="component6" coords="7"/> + <area id="component7" coords="8"/> + <area id="component8" coords="9"/> </areaspec> <programlisting role="XML"><![CDATA[<component name="propertyName" @@ -2241,11 +2241,11 @@ <programlistingco role="XML"> <areaspec> - <area id="properties1" coords="2 45"/> - <area id="properties2" coords="3 45"/> - <area id="properties3" coords="4 45"/> - <area id="properties4" coords="5 45"/> - <area id="properties5" coords="6 45"/> + <area id="properties1" coords="2"/> + <area id="properties2" coords="3"/> + <area id="properties3" coords="4"/> + <area id="properties4" coords="5"/> + <area id="properties5" coords="6"/> </areaspec> <programlisting role="XML"><![CDATA[<properties name="logicalName" @@ -2342,10 +2342,10 @@ <programlistingco role="XML"> <areaspec> - <area id="subclass1" coords="2 55"/> - <area id="subclass2" coords="3 55"/> - <area id="subclass3" coords="4 55"/> - <area id="subclass4" coords="5 55"/> + <area id="subclass1" coords="2"/> + <area id="subclass2" coords="3"/> + <area id="subclass3" coords="4"/> + <area id="subclass4" coords="5"/> </areaspec> <programlisting role="XML"><![CDATA[<subclass name="ClassName" @@ -2413,10 +2413,10 @@ <programlistingco role="XML"> <areaspec> - <area id="joinedsubclass1" coords="2 45"/> - <area id="joinedsubclass2" coords="3 45"/> - <area id="joinedsubclass3" coords="4 45"/> - <area id="joinedsubclass4" coords="5 45"/> + <area id="joinedsubclass1" coords="2"/> + <area id="joinedsubclass2" coords="3"/> + <area id="joinedsubclass3" coords="4"/> + <area id="joinedsubclass4" coords="5"/> </areaspec> <programlisting role="XML"><![CDATA[<joined-subclass name="ClassName" @@ -2525,10 +2525,10 @@ <programlistingco role="XML"> <areaspec> - <area id="unionsubclass1" coords="2 45"/> - <area id="unionsubclass2" coords="3 45"/> - <area id="unionsubclass3" coords="4 45"/> - <area id="unionsubclass4" coords="5 45"/> + <area id="unionsubclass1" coords="2"/> + <area id="unionsubclass2" coords="3"/> + <area id="unionsubclass3" coords="4"/> + <area id="unionsubclass4" coords="5"/> </areaspec> <programlisting role="XML"><![CDATA[<union-subclass name="ClassName" @@ -2595,12 +2595,12 @@ <programlistingco role="XML"> <areaspec> - <area id="join1" coords="2 50"/> - <area id="join2" coords="3 50"/> - <area id="join3" coords="4 50"/> - <area id="join4" coords="5 50"/> - <area id="join5" coords="6 50"/> - <area id="join6" coords="7 50"/> + <area id="join1" coords="2"/> + <area id="join2" coords="3"/> + <area id="join3" coords="4"/> + <area id="join4" coords="5"/> + <area id="join5" coords="6"/> + <area id="join6" coords="7"/> </areaspec> <programlisting role="XML"><![CDATA[<join table="tablename" @@ -2703,12 +2703,12 @@ <programlistingco role="XML"> <areaspec> - <area id="key1" coords="2 50"/> - <area id="key2" coords="3 50"/> - <area id="key3" coords="4 50"/> - <area id="key4" coords="5 50"/> - <area id="key5" coords="6 50"/> - <area id="key6" coords="7 50"/> + <area id="key1" coords="2"/> + <area id="key2" coords="3"/> + <area id="key3" coords="4"/> + <area id="key4" coords="5"/> + <area id="key5" coords="6"/> + <area id="key6" coords="7"/> </areaspec> <programlisting role="XML"><![CDATA[<key column="columnname" @@ -2842,8 +2842,8 @@ <programlistingco role="XML"> <areaspec> - <area id="import1" coords="2 40"/> - <area id="import2" coords="3 40"/> + <area id="import1" coords="2"/> + <area id="import2" coords="3"/> </areaspec> <programlisting role="XML"><![CDATA[<import class="ClassName" @@ -2896,12 +2896,12 @@ <programlistingco role="XML"> <areaspec> - <area id="any1" coords="2 50"/> - <area id="any2" coords="3 50"/> - <area id="any3" coords="4 50"/> - <area id="any4" coords="5 50"/> - <area id="any5" coords="6 50"/> - <area id="any6" coords="7 50"/> + <area id="any1" coords="2"/> + <area id="any2" coords="3"/> + <area id="any3" coords="4"/> + <area id="any4" coords="5"/> + <area id="any5" coords="6"/> + <area id="any6" coords="7"/> </areaspec> <programlisting role="XML"><![CDATA[<any name="propertyName" Modified: core/trunk/documentation/manual/src/main/docbook/en-US/content/collection_mapping.xml =================================================================== --- core/trunk/documentation/manual/src/main/docbook/en-US/content/collection_mapping.xml 2010-03-30 19:36:43 UTC (rev 19141) +++ core/trunk/documentation/manual/src/main/docbook/en-US/content/collection_mapping.xml 2010-03-31 00:52:35 UTC (rev 19142) @@ -140,20 +140,20 @@ <programlistingco role="XML"> <areaspec> - <area id="mappingcollection1" coords="2 65"/> - <area id="mappingcollection2" coords="3 65"/> - <area id="mappingcollection3" coords="4 65"/> - <area id="mappingcollection4" coords="5 65"/> - <area id="mappingcollection5" coords="6 65"/> - <area id="mappingcollection6" coords="7 65"/> - <area id="mappingcollection7" coords="8 65"/> - <area id="mappingcollection8" coords="9 65"/> - <area id="mappingcollection9" coords="10 65"/> - <area id="mappingcollection10" coords="11 65"/> - <area id="mappingcollection11" coords="12 65"/> - <area id="mappingcollection12" coords="13 65"/> - <area id="mappingcollection13" coords="14 65"/> - <area id="mappingcollection14" coords="15 65"/> + <area id="mappingcollection1" coords="2"/> + <area id="mappingcollection2" coords="3"/> + <area id="mappingcollection3" coords="4"/> + <area id="mappingcollection4" coords="5"/> + <area id="mappingcollection5" coords="6"/> + <area id="mappingcollection6" coords="7"/> + <area id="mappingcollection7" coords="8"/> + <area id="mappingcollection8" coords="9"/> + <area id="mappingcollection9" coords="10"/> + <area id="mappingcollection10" coords="11"/> + <area id="mappingcollection11" coords="12"/> + <area id="mappingcollection12" coords="13"/> + <area id="mappingcollection13" coords="14"/> + <area id="mappingcollection14" coords="15"/> </areaspec> <programlisting role="XML"><![CDATA[<map name="propertyName" @@ -348,8 +348,8 @@ <programlistingco role="XML"> <areaspec> - <area id="index1" coords="2 45"/> - <area id="index2" coords="3 45"/> + <area id="index1" coords="2"/> + <area id="index2" coords="3"/> </areaspec> <programlisting role="XML"><![CDATA[<list-index column="column_name" @@ -372,9 +372,9 @@ <programlistingco role="XML"> <areaspec> - <area id="mapkey1" coords="2 45"/> - <area id="mapkey2" coords="3 45"/> - <area id="mapkey3" coords="4 45"/> + <area id="mapkey1" coords="2"/> + <area id="mapkey2" coords="3"/> + <area id="mapkey3" coords="4"/> </areaspec> <programlisting role="XML"><![CDATA[<map-key column="column_name" @@ -405,9 +405,9 @@ <programlistingco role="XML"> <areaspec> - <area id="indexmanytomany1" coords="2 45"/> - <area id="indexmanytomany2" coords="3 45"/> - <area id="indexmanytomany3" coords="3 45"/> + <area id="indexmanytomany1" coords="2"/> + <area id="indexmanytomany2" coords="3"/> + <area id="indexmanytomany3" coords="3"/> </areaspec> <programlisting role="XML"><![CDATA[<map-key-many-to-many column="column_name" @@ -461,9 +461,9 @@ <programlistingco role="XML"> <areaspec> - <area id="element1b" coords="2 50"/> - <area id="element2b" coords="3 50"/> - <area id="element3b" coords="4 50"/> + <area id="element1b" coords="2"/> + <area id="element2b" coords="3"/> + <area id="element3b" coords="4"/> </areaspec> <programlisting role="XML"><![CDATA[<element column="column_name" @@ -504,14 +504,14 @@ <programlistingco role="XML"> <areaspec> - <area id="manytomany1" coords="2 60"/> - <area id="manytomany2" coords="3 60"/> - <area id="manytomany3" coords="4 60"/> - <area id="manytomany4" coords="5 60"/> - <area id="manytomany5" coords="6 60"/> - <area id="manytomany6" coords="7 60"/> - <area id="manytomany7" coords="8 60"/> - <area id="manytomany8" coords="9 60"/> + <area id="manytomany1" coords="2"/> + <area id="manytomany2" coords="3"/> + <area id="manytomany3" coords="4"/> + <area id="manytomany4" coords="5"/> + <area id="manytomany5" coords="6"/> + <area id="manytomany6" coords="7"/> + <area id="manytomany7" coords="8"/> + <area id="manytomany8" coords="9"/> </areaspec> <programlisting role="XML"><![CDATA[<many-to-many column="column_name" @@ -682,9 +682,9 @@ <programlistingco role="XML"> <areaspec> - <area id="onetomany1" coords="2 60"/> - <area id="onetomany2" coords="3 60"/> - <area id="onetomany3" coords="4 60"/> + <area id="onetomany1" coords="2"/> + <area id="onetomany2" coords="3"/> + <area id="onetomany3" coords="4"/> </areaspec> <programlisting role="XML"><![CDATA[<one-to-many class="ClassName" Modified: core/trunk/documentation/manual/src/main/docbook/en-US/content/performance.xml =================================================================== --- core/trunk/documentation/manual/src/main/docbook/en-US/content/performance.xml 2010-03-30 19:36:43 UTC (rev 19141) +++ core/trunk/documentation/manual/src/main/docbook/en-US/content/performance.xml 2010-03-31 00:52:35 UTC (rev 19142) @@ -823,9 +823,9 @@ <programlistingco> <areaspec> - <area id="cache1" coords="2 70"/> - <area id="cache2" coords="3 70"/> - <area id="cache3" coords="4 70"/> + <area id="cache1" coords="2"/> + <area id="cache2" coords="3"/> + <area id="cache3" coords="4"/> </areaspec> <programlisting role="XML"><![CDATA[<cache usage="transactional|read-write|nonstrict-read-write|read-only" Modified: core/trunk/documentation/manual/src/main/docbook/pot/Book_Info.pot =================================================================== --- core/trunk/documentation/manual/src/main/docbook/pot/Book_Info.pot 2010-03-30 19:36:43 UTC (rev 19141) +++ core/trunk/documentation/manual/src/main/docbook/pot/Book_Info.pot 2010-03-31 00:52:35 UTC (rev 19142) @@ -4,8 +4,8 @@ msgid "" msgstr "" "Project-Id-Version: 0\n" -"POT-Creation-Date: 2010-02-11T05:38:14\n" -"PO-Revision-Date: 2010-02-11T05:38:14\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" "MIME-Version: 1.0\n" @@ -24,6 +24,6 @@ #. Tag: releaseinfo #, no-c-format -msgid "&versionNumber;" +msgid "&version;" msgstr "" Modified: core/trunk/documentation/manual/src/main/docbook/pot/HIBERNATE_-_Relational_Persistence_for_Idiomatic_Java.pot =================================================================== --- core/trunk/documentation/manual/src/main/docbook/pot/HIBERNATE_-_Relational_Persistence_for_Idiomatic_Java.pot 2010-03-30 19:36:43 UTC (rev 19141) +++ core/trunk/documentation/manual/src/main/docbook/pot/HIBERNATE_-_Relational_Persistence_for_Idiomatic_Java.pot 2010-03-31 00:52:35 UTC (rev 19142) @@ -4,8 +4,8 @@ msgid "" msgstr "" "Project-Id-Version: 0\n" -"POT-Creation-Date: 2010-02-11T05:38:14\n" -"PO-Revision-Date: 2010-02-11T05:38:14\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" "MIME-Version: 1.0\n" Modified: core/trunk/documentation/manual/src/main/docbook/pot/author_group.pot =================================================================== --- core/trunk/documentation/manual/src/main/docbook/pot/author_group.pot 2010-03-30 19:36:43 UTC (rev 19141) +++ core/trunk/documentation/manual/src/main/docbook/pot/author_group.pot 2010-03-31 00:52:35 UTC (rev 19142) @@ -4,8 +4,8 @@ msgid "" msgstr "" "Project-Id-Version: 0\n" -"POT-Creation-Date: 2010-02-11T05:38:14\n" -"PO-Revision-Date: 2010-02-11T05:38:14\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" "MIME-Version: 1.0\n" Modified: core/trunk/documentation/manual/src/main/docbook/pot/content/architecture.pot =================================================================== --- core/trunk/documentation/manual/src/main/docbook/pot/content/architecture.pot 2010-03-30 19:36:43 UTC (rev 19141) +++ core/trunk/documentation/manual/src/main/docbook/pot/content/architecture.pot 2010-03-31 00:52:35 UTC (rev 19142) @@ -4,8 +4,8 @@ msgid "" msgstr "" "Project-Id-Version: 0\n" -"POT-Creation-Date: 2010-02-11T05:38:14\n" -"PO-Revision-Date: 2010-02-11T05:38:14\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" "MIME-Version: 1.0\n" @@ -264,7 +264,7 @@ #. Tag: para #, no-c-format -msgid "The first two implementations provide a \"one session - one database transaction\" programming model. This is also also known and used as <emphasis>session-per-request</emphasis>. The beginning and end of a Hibernate session is defined by the duration of a database transaction. If you use programmatic transaction demarcation in plain JSE without JTA, you are advised to use the Hibernate <literal>Transaction</literal> API to hide the underlying transaction system from your code. If you use JTA, you can utilize the JTA interfaces to demarcate transactions. If you execute in an EJB container that supports CMT, transaction boundaries are defined declaratively and you do not need any transaction or session demarcation operations in your code. Refer to <xref linkend=\"transactions\" /> for more information and code examples." +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 Modified: core/trunk/documentation/manual/src/main/docbook/pot/content/association_mapping.pot =================================================================== --- core/trunk/documentation/manual/src/main/docbook/pot/content/association_mapping.pot 2010-03-30 19:36:43 UTC (rev 19141) +++ core/trunk/documentation/manual/src/main/docbook/pot/content/association_mapping.pot 2010-03-31 00:52:35 UTC (rev 19142) @@ -4,8 +4,8 @@ msgid "" msgstr "" "Project-Id-Version: 0\n" -"POT-Creation-Date: 2010-02-11T05:38:14\n" -"PO-Revision-Date: 2010-02-11T05:38:14\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" "MIME-Version: 1.0\n"