From 5705431a07051ea30ad55f7399fef17317cdd608 Mon Sep 17 00:00:00 2001 From: Steve Ebersole Date: Thu, 14 Aug 2008 14:03:09 +0000 Subject: [PATCH] undo fixes for HHH-3080,HHH-3190,HHH-2976,HHH-3397 git-svn-id: https://svn.jboss.org/repos/hibernate/core/trunk@15064 1b8cb986-b30d-0410-93ca-fae66ebed9b2 --- .../main/docbook/content/association_mapping.xml | 2 +- .../main/docbook/content/association_mapping.xml | 6 +++--- .../main/docbook/content/association_mapping.xml | 2 +- .../main/docbook/content/association_mapping.xml | 8 ++++---- .../pt-BR/src/main/docbook/content/tutorial1.xml | 8 ++++---- .../main/docbook/content/association_mapping.xml | 2 +- .../en-US/content/association_mapping.xml | 2 +- .../docbook/en-US/content/component_mapping.xml | 2 +- .../src/main/docbook/en-US/content/query_sql.xml | 6 +++--- .../src/main/docbook/en-US/content/tutorial.xml | 5 ++--- .../docbook/es-ES/content/association_mapping.po | 4 ++-- .../docbook/es-ES/content/component_mapping.po | 2 +- .../src/main/docbook/es-ES/content/query_sql.po | 16 ++++++++-------- .../main/docbook/es-ES/content/transactions.po | 2 +- .../src/main/docbook/es-ES/content/tutorial.po | 4 ++-- .../docbook/fr-FR/content/association_mapping.po | 2 +- .../docbook/fr-FR/content/component_mapping.po | 2 +- .../src/main/docbook/fr-FR/content/query_sql.po | 6 +++--- .../main/docbook/fr-FR/content/transactions.po | 2 +- .../src/main/docbook/fr-FR/content/tutorial.po | 2 +- .../docbook/ja-JP/content/association_mapping.po | 2 +- .../docbook/ja-JP/content/component_mapping.po | 2 +- .../src/main/docbook/ja-JP/content/query_sql.po | 6 +++--- .../main/docbook/ja-JP/content/transactions.po | 2 +- .../src/main/docbook/ja-JP/content/tutorial.po | 2 +- .../docbook/ko-KR/content/association_mapping.po | 2 +- .../docbook/ko-KR/content/component_mapping.po | 2 +- .../src/main/docbook/ko-KR/content/query_sql.po | 6 +++--- .../main/docbook/ko-KR/content/transactions.po | 2 +- .../src/main/docbook/ko-KR/content/tutorial.po | 2 +- .../docbook/pot/content/association_mapping.pot | 2 +- .../docbook/pot/content/component_mapping.pot | 2 +- .../src/main/docbook/pot/content/query_sql.pot | 6 +++--- .../docbook/pt-BR/content/association_mapping.po | 2 +- .../docbook/pt-BR/content/component_mapping.po | 2 +- .../src/main/docbook/pt-BR/content/query_sql.po | 6 +++--- .../main/docbook/pt-BR/content/transactions.po | 2 +- .../src/main/docbook/pt-BR/content/tutorial.po | 2 +- .../docbook/zh-CN/content/association_mapping.po | 2 +- .../docbook/zh-CN/content/component_mapping.po | 2 +- .../src/main/docbook/zh-CN/content/query_sql.po | 6 +++--- .../main/docbook/zh-CN/content/transactions.po | 2 +- .../src/main/docbook/zh-CN/content/tutorial.po | 2 +- 43 files changed, 75 insertions(+), 76 deletions(-) diff --git a/documentation/manual/old/fr-FR/src/main/docbook/content/association_mapping.xml b/documentation/manual/old/fr-FR/src/main/docbook/content/association_mapping.xml index 70e780dd1c..656935c437 100644 --- a/documentation/manual/old/fr-FR/src/main/docbook/content/association_mapping.xml +++ b/documentation/manual/old/fr-FR/src/main/docbook/content/association_mapping.xml @@ -585,7 +585,7 @@ create table Address ( addressId bigint not null primary key ) -]]> +]]> alors nous pouvons mapper une association à l'instance courante diff --git a/documentation/manual/old/ja-JP/src/main/docbook/content/association_mapping.xml b/documentation/manual/old/ja-JP/src/main/docbook/content/association_mapping.xml index e6e8fd2c8c..e333b9cd4b 100644 --- a/documentation/manual/old/ja-JP/src/main/docbook/content/association_mapping.xml +++ b/documentation/manual/old/ja-JP/src/main/docbook/content/association_mapping.xml @@ -1,5 +1,5 @@ - - + + @@ -574,7 +574,7 @@ create table Address ( addressId bigint not null primary key ) -]]> +]]> そして、関連を 現時点の インスタンス diff --git a/documentation/manual/old/ko-KR/src/main/docbook/content/association_mapping.xml b/documentation/manual/old/ko-KR/src/main/docbook/content/association_mapping.xml index 3c588417fe..ccaf3e58ff 100644 --- a/documentation/manual/old/ko-KR/src/main/docbook/content/association_mapping.xml +++ b/documentation/manual/old/ko-KR/src/main/docbook/content/association_mapping.xml @@ -560,7 +560,7 @@ create table Address ( addressId bigint not null primary key ) -]]> +]]> 그때 우리는 다음을 사용하여 하나의 연관을 현재 인스턴스 diff --git a/documentation/manual/old/pt-BR/src/main/docbook/content/association_mapping.xml b/documentation/manual/old/pt-BR/src/main/docbook/content/association_mapping.xml index 75199d4d9e..457d72a4fa 100755 --- a/documentation/manual/old/pt-BR/src/main/docbook/content/association_mapping.xml +++ b/documentation/manual/old/pt-BR/src/main/docbook/content/association_mapping.xml @@ -1,6 +1,6 @@ - - - + + + Mapeamento de Associações @@ -588,7 +588,7 @@ Joins de associações mais complexas são extremamente raros. O Hibernate torna -]]> +]]> Then we can map an association to the current instance diff --git a/documentation/manual/old/pt-BR/src/main/docbook/content/tutorial1.xml b/documentation/manual/old/pt-BR/src/main/docbook/content/tutorial1.xml index 7b3d4b8ff1..66d2aa0e1a 100755 --- a/documentation/manual/old/pt-BR/src/main/docbook/content/tutorial1.xml +++ b/documentation/manual/old/pt-BR/src/main/docbook/content/tutorial1.xml @@ -1,6 +1,6 @@ - - - + + +  Introdução ao Hibernate @@ -1444,7 +1444,7 @@ out.close();]]> That's it, the servlet is complete. A request to the servlet will be processed in a single Session and Transaction. As earlier in the standalone application, Hibernate can automatically bind these - objects to the current thread of execution. This gives you the freedom to layer + ojects to the current thread of execution. This gives you the freedom to layer your code and access the SessionFactory in any way you like. Usually you'd use a more sophisticated design and move the data access code into data access objects (the DAO pattern). See the Hibernate Wiki for more diff --git a/documentation/manual/old/zh-CN/src/main/docbook/content/association_mapping.xml b/documentation/manual/old/zh-CN/src/main/docbook/content/association_mapping.xml index df6b82a9aa..ca62c9e612 100644 --- a/documentation/manual/old/zh-CN/src/main/docbook/content/association_mapping.xml +++ b/documentation/manual/old/zh-CN/src/main/docbook/content/association_mapping.xml @@ -541,7 +541,7 @@ create table Address ( addressId bigint not null primary key ) -]]> +]]> 那么我们可以对目前(current)实例(其effectiveEndDate为null)使用这样的关联映射: diff --git a/documentation/manual/src/main/docbook/en-US/content/association_mapping.xml b/documentation/manual/src/main/docbook/en-US/content/association_mapping.xml index 6cb44e827d..e57d361d38 100755 --- a/documentation/manual/src/main/docbook/en-US/content/association_mapping.xml +++ b/documentation/manual/src/main/docbook/en-US/content/association_mapping.xml @@ -603,7 +603,7 @@ create table Address ( addressId bigint not null primary key ) -]]> +]]> Then we can map an association to the current instance diff --git a/documentation/manual/src/main/docbook/en-US/content/component_mapping.xml b/documentation/manual/src/main/docbook/en-US/content/component_mapping.xml index e81c221ca4..436a02852b 100644 --- a/documentation/manual/src/main/docbook/en-US/content/component_mapping.xml +++ b/documentation/manual/src/main/docbook/en-US/content/component_mapping.xml @@ -126,7 +126,7 @@ Like all value types, components do not support shared references. In other words, two persons could have the same name, but the two person objects would contain two independent - name objects, only "the same" by value. The null value semantics of a component are + name ojects, only "the same" by value. The null value semantics of a component are ad hoc. When reloading the containing object, Hibernate will assume that if all component columns are null, then the entire component is null. This should be okay for most purposes. diff --git a/documentation/manual/src/main/docbook/en-US/content/query_sql.xml b/documentation/manual/src/main/docbook/en-US/content/query_sql.xml index 0c976615e3..e36876d9f1 100644 --- a/documentation/manual/src/main/docbook/en-US/content/query_sql.xml +++ b/documentation/manual/src/main/docbook/en-US/content/query_sql.xml @@ -238,9 +238,9 @@ sess.createSQLQuery("SELECT ID, NAME, BIRTHDATE FROM CATS").addEntity(Cat.class) declared in the mapping metadata. Notice that we may even use the property aliases in the where clause if we like. - Before you compile and deploy the web application, note that an additional library - is required: servlet.jar. This is the Java Servlet Development Kit, - if you don't have this library already, get it from the - Sun website and copy it to + is required: jsdk.jar. This is the Java servlet development kit, + if you don't have this library already, get it from the Sun website and copy it to your library directory. However, it will be only used for compilation and excluded from the WAR package. diff --git a/documentation/manual/src/main/docbook/es-ES/content/association_mapping.po b/documentation/manual/src/main/docbook/es-ES/content/association_mapping.po index e648903357..630b54d449 100644 --- a/documentation/manual/src/main/docbook/es-ES/content/association_mapping.po +++ b/documentation/manual/src/main/docbook/es-ES/content/association_mapping.po @@ -1028,7 +1028,7 @@ msgid "" " \n" "\n" "\n" -"]]>" +"]]>" msgstr "" "\n" " \n" " \n" " \n" -" ]]>" #: index.docbook:266 diff --git a/documentation/manual/src/main/docbook/es-ES/content/component_mapping.po b/documentation/manual/src/main/docbook/es-ES/content/component_mapping.po index 9b5e6d5b15..ae80327df3 100644 --- a/documentation/manual/src/main/docbook/es-ES/content/component_mapping.po +++ b/documentation/manual/src/main/docbook/es-ES/content/component_mapping.po @@ -197,7 +197,7 @@ msgstr "" msgid "" "Like all value types, components do not support shared references. In other " "words, two persons could have the same name, but the two person objects " -"would contain two independent name objects, only \"the same\" by value. The " +"would contain two independent name ojects, only \"the same\" by value. The " "null value semantics of a component are ad hoc. When " "reloading the containing object, Hibernate will assume that if all component " "columns are null, then the entire component is null. This should be okay for " diff --git a/documentation/manual/src/main/docbook/es-ES/content/query_sql.po b/documentation/manual/src/main/docbook/es-ES/content/query_sql.po index 77a765d0d8..cf682310df 100644 --- a/documentation/manual/src/main/docbook/es-ES/content/query_sql.po +++ b/documentation/manual/src/main/docbook/es-ES/content/query_sql.po @@ -439,21 +439,21 @@ msgstr "" #: index.docbook:192 msgid "" -"" msgstr "" -"Session or detached instances as the design paradigm." msgstr "" diff --git a/documentation/manual/src/main/docbook/es-ES/content/tutorial.po b/documentation/manual/src/main/docbook/es-ES/content/tutorial.po index 8ca095f65c..ceab1e83fe 100644 --- a/documentation/manual/src/main/docbook/es-ES/content/tutorial.po +++ b/documentation/manual/src/main/docbook/es-ES/content/tutorial.po @@ -2936,7 +2936,7 @@ msgid "" "That's it, the servlet is complete. A request to the servlet will be " "processed in a single Session and Transaction. As earlier in the standalone application, Hibernate can " -"automatically bind these objects to the current thread of execution. This " +"automatically bind these ojects to the current thread of execution. This " "gives you the freedom to layer your code and access the " "SessionFactory in any way you like. Usually you'd use a " "more sophisticated design and move the data access code into data access " @@ -2945,7 +2945,7 @@ msgstr "" "That's it, the servlet is complete. A request to the servlet will be " "processed in a single Session and Transaction. As earlier in the standalone application, Hibernate can " -"automatically bind these objects to the current thread of execution. This " +"automatically bind these ojects to the current thread of execution. This " "gives you the freedom to layer your code and access the " "SessionFactory in any way you like. Usually you'd use a " "more sophisticated design and move the data access code into data access " diff --git a/documentation/manual/src/main/docbook/fr-FR/content/association_mapping.po b/documentation/manual/src/main/docbook/fr-FR/content/association_mapping.po index 0ec25e442f..d847935af1 100644 --- a/documentation/manual/src/main/docbook/fr-FR/content/association_mapping.po +++ b/documentation/manual/src/main/docbook/fr-FR/content/association_mapping.po @@ -838,7 +838,7 @@ msgid "" " \n" "\n" "\n" -"]]>" +"]]>" msgstr "" #. Tag: para diff --git a/documentation/manual/src/main/docbook/fr-FR/content/component_mapping.po b/documentation/manual/src/main/docbook/fr-FR/content/component_mapping.po index c753e626f7..a5b7ee8626 100644 --- a/documentation/manual/src/main/docbook/fr-FR/content/component_mapping.po +++ b/documentation/manual/src/main/docbook/fr-FR/content/component_mapping.po @@ -164,7 +164,7 @@ msgstr "" msgid "" "Like all value types, components do not support shared references. In other " "words, two persons could have the same name, but the two person objects " -"would contain two independent name objects, only \"the same\" by value. The " +"would contain two independent name ojects, only \"the same\" by value. The " "null value semantics of a component are ad hoc. When " "reloading the containing object, Hibernate will assume that if all component " "columns are null, then the entire component is null. This should be okay for " diff --git a/documentation/manual/src/main/docbook/fr-FR/content/query_sql.po b/documentation/manual/src/main/docbook/fr-FR/content/query_sql.po index 690e3fe992..6f77508611 100644 --- a/documentation/manual/src/main/docbook/fr-FR/content/query_sql.po +++ b/documentation/manual/src/main/docbook/fr-FR/content/query_sql.po @@ -476,10 +476,10 @@ msgstr "" #: query_sql.xml:192 #, no-c-format msgid "" -"Session or detached instances as the design paradigm." msgstr "" diff --git a/documentation/manual/src/main/docbook/fr-FR/content/tutorial.po b/documentation/manual/src/main/docbook/fr-FR/content/tutorial.po index bdf3cbfdd0..31d56089fa 100644 --- a/documentation/manual/src/main/docbook/fr-FR/content/tutorial.po +++ b/documentation/manual/src/main/docbook/fr-FR/content/tutorial.po @@ -2669,7 +2669,7 @@ msgid "" "That's it, the servlet is complete. A request to the servlet will be " "processed in a single Session and Transaction. As earlier in the standalone application, Hibernate can " -"automatically bind these objects to the current thread of execution. This " +"automatically bind these ojects to the current thread of execution. This " "gives you the freedom to layer your code and access the " "SessionFactory in any way you like. Usually you'd use a " "more sophisticated design and move the data access code into data access " diff --git a/documentation/manual/src/main/docbook/ja-JP/content/association_mapping.po b/documentation/manual/src/main/docbook/ja-JP/content/association_mapping.po index ffbe32ec1b..f65d7770a1 100644 --- a/documentation/manual/src/main/docbook/ja-JP/content/association_mapping.po +++ b/documentation/manual/src/main/docbook/ja-JP/content/association_mapping.po @@ -801,7 +801,7 @@ msgid "" " \n" "\n" "\n" -"]]>" +"]]>" msgstr "" #. Tag: para diff --git a/documentation/manual/src/main/docbook/ja-JP/content/component_mapping.po b/documentation/manual/src/main/docbook/ja-JP/content/component_mapping.po index c848c602d6..d2a41e65ac 100644 --- a/documentation/manual/src/main/docbook/ja-JP/content/component_mapping.po +++ b/documentation/manual/src/main/docbook/ja-JP/content/component_mapping.po @@ -162,7 +162,7 @@ msgstr "" msgid "" "Like all value types, components do not support shared references. In other " "words, two persons could have the same name, but the two person objects " -"would contain two independent name objects, only \"the same\" by value. The " +"would contain two independent name ojects, only \"the same\" by value. The " "null value semantics of a component are ad hoc. When " "reloading the containing object, Hibernate will assume that if all component " "columns are null, then the entire component is null. This should be okay for " diff --git a/documentation/manual/src/main/docbook/ja-JP/content/query_sql.po b/documentation/manual/src/main/docbook/ja-JP/content/query_sql.po index cf2ddca4ed..ec75aebf79 100644 --- a/documentation/manual/src/main/docbook/ja-JP/content/query_sql.po +++ b/documentation/manual/src/main/docbook/ja-JP/content/query_sql.po @@ -465,10 +465,10 @@ msgstr "" #: query_sql.xml:192 #, no-c-format msgid "" -"Session or detached instances as the design paradigm." msgstr "" diff --git a/documentation/manual/src/main/docbook/ja-JP/content/tutorial.po b/documentation/manual/src/main/docbook/ja-JP/content/tutorial.po index 8775803825..bbea79e3a6 100644 --- a/documentation/manual/src/main/docbook/ja-JP/content/tutorial.po +++ b/documentation/manual/src/main/docbook/ja-JP/content/tutorial.po @@ -2598,7 +2598,7 @@ msgid "" "That's it, the servlet is complete. A request to the servlet will be " "processed in a single Session and Transaction. As earlier in the standalone application, Hibernate can " -"automatically bind these objects to the current thread of execution. This " +"automatically bind these ojects to the current thread of execution. This " "gives you the freedom to layer your code and access the " "SessionFactory in any way you like. Usually you'd use a " "more sophisticated design and move the data access code into data access " diff --git a/documentation/manual/src/main/docbook/ko-KR/content/association_mapping.po b/documentation/manual/src/main/docbook/ko-KR/content/association_mapping.po index 8c6ee1f91f..5bb63d3f59 100644 --- a/documentation/manual/src/main/docbook/ko-KR/content/association_mapping.po +++ b/documentation/manual/src/main/docbook/ko-KR/content/association_mapping.po @@ -811,7 +811,7 @@ msgid "" " \n" "\n" "\n" -"]]>" +"]]>" msgstr "" #. Tag: para diff --git a/documentation/manual/src/main/docbook/ko-KR/content/component_mapping.po b/documentation/manual/src/main/docbook/ko-KR/content/component_mapping.po index 98232a6887..eec938d9f4 100644 --- a/documentation/manual/src/main/docbook/ko-KR/content/component_mapping.po +++ b/documentation/manual/src/main/docbook/ko-KR/content/component_mapping.po @@ -162,7 +162,7 @@ msgstr "" msgid "" "Like all value types, components do not support shared references. In other " "words, two persons could have the same name, but the two person objects " -"would contain two independent name objects, only \"the same\" by value. The " +"would contain two independent name ojects, only \"the same\" by value. The " "null value semantics of a component are ad hoc. When " "reloading the containing object, Hibernate will assume that if all component " "columns are null, then the entire component is null. This should be okay for " diff --git a/documentation/manual/src/main/docbook/ko-KR/content/query_sql.po b/documentation/manual/src/main/docbook/ko-KR/content/query_sql.po index b56581de6b..f5e0d19e1d 100644 --- a/documentation/manual/src/main/docbook/ko-KR/content/query_sql.po +++ b/documentation/manual/src/main/docbook/ko-KR/content/query_sql.po @@ -466,10 +466,10 @@ msgstr "" #: query_sql.xml:192 #, no-c-format msgid "" -"Session or detached instances as the design paradigm." msgstr "" diff --git a/documentation/manual/src/main/docbook/ko-KR/content/tutorial.po b/documentation/manual/src/main/docbook/ko-KR/content/tutorial.po index d3ac3ad6ab..8f76844b9b 100644 --- a/documentation/manual/src/main/docbook/ko-KR/content/tutorial.po +++ b/documentation/manual/src/main/docbook/ko-KR/content/tutorial.po @@ -2616,7 +2616,7 @@ msgid "" "That's it, the servlet is complete. A request to the servlet will be " "processed in a single Session and Transaction. As earlier in the standalone application, Hibernate can " -"automatically bind these objects to the current thread of execution. This " +"automatically bind these ojects to the current thread of execution. This " "gives you the freedom to layer your code and access the " "SessionFactory in any way you like. Usually you'd use a " "more sophisticated design and move the data access code into data access " diff --git a/documentation/manual/src/main/docbook/pot/content/association_mapping.pot b/documentation/manual/src/main/docbook/pot/content/association_mapping.pot index 771cf6c7d8..d4a70b3a6b 100644 --- a/documentation/manual/src/main/docbook/pot/content/association_mapping.pot +++ b/documentation/manual/src/main/docbook/pot/content/association_mapping.pot @@ -685,7 +685,7 @@ msgid "" " \n" "\n" "\n" - "]]>" + "]]>" msgstr "" #. Tag: para diff --git a/documentation/manual/src/main/docbook/pot/content/component_mapping.pot b/documentation/manual/src/main/docbook/pot/content/component_mapping.pot index f8d7ca47b6..c244ba2e03 100644 --- a/documentation/manual/src/main/docbook/pot/content/component_mapping.pot +++ b/documentation/manual/src/main/docbook/pot/content/component_mapping.pot @@ -136,7 +136,7 @@ msgstr "" #. Tag: para #: component_mapping.xml:70 #, no-c-format -msgid "Like all value types, components do not support shared references. In other words, two persons could have the same name, but the two person objects would contain two independent name objects, only \"the same\" by value. The null value semantics of a component are ad hoc. When reloading the containing object, Hibernate will assume that if all component columns are null, then the entire component is null. This should be okay for most purposes." +msgid "Like all value types, components do not support shared references. In other words, two persons could have the same name, but the two person objects would contain two independent name ojects, only \"the same\" by value. The null value semantics of a component are ad hoc. When reloading the containing object, Hibernate will assume that if all component columns are null, then the entire component is null. This should be okay for most purposes." msgstr "" #. Tag: para diff --git a/documentation/manual/src/main/docbook/pot/content/query_sql.pot b/documentation/manual/src/main/docbook/pot/content/query_sql.pot index 5c2ed027de..5b48597681 100644 --- a/documentation/manual/src/main/docbook/pot/content/query_sql.pot +++ b/documentation/manual/src/main/docbook/pot/content/query_sql.pot @@ -310,9 +310,9 @@ msgstr "" #: query_sql.xml:216 #, no-c-format msgid "" - "\n" "\n" "\n" -"]]>" +"]]>" msgstr "" #. Tag: para diff --git a/documentation/manual/src/main/docbook/pt-BR/content/component_mapping.po b/documentation/manual/src/main/docbook/pt-BR/content/component_mapping.po index 0c1533e0e5..5fc6048ef3 100644 --- a/documentation/manual/src/main/docbook/pt-BR/content/component_mapping.po +++ b/documentation/manual/src/main/docbook/pt-BR/content/component_mapping.po @@ -162,7 +162,7 @@ msgstr "" msgid "" "Like all value types, components do not support shared references. In other " "words, two persons could have the same name, but the two person objects " -"would contain two independent name objects, only \"the same\" by value. The " +"would contain two independent name ojects, only \"the same\" by value. The " "null value semantics of a component are ad hoc. When " "reloading the containing object, Hibernate will assume that if all component " "columns are null, then the entire component is null. This should be okay for " diff --git a/documentation/manual/src/main/docbook/pt-BR/content/query_sql.po b/documentation/manual/src/main/docbook/pt-BR/content/query_sql.po index 69c9bb3693..ec64d826b4 100644 --- a/documentation/manual/src/main/docbook/pt-BR/content/query_sql.po +++ b/documentation/manual/src/main/docbook/pt-BR/content/query_sql.po @@ -474,10 +474,10 @@ msgstr "" #: query_sql.xml:192 #, no-c-format msgid "" -"Session or detached instances as the design paradigm." msgstr "" diff --git a/documentation/manual/src/main/docbook/pt-BR/content/tutorial.po b/documentation/manual/src/main/docbook/pt-BR/content/tutorial.po index 4981ab7127..e3bf7303c9 100644 --- a/documentation/manual/src/main/docbook/pt-BR/content/tutorial.po +++ b/documentation/manual/src/main/docbook/pt-BR/content/tutorial.po @@ -2652,7 +2652,7 @@ msgid "" "That's it, the servlet is complete. A request to the servlet will be " "processed in a single Session and Transaction. As earlier in the standalone application, Hibernate can " -"automatically bind these objects to the current thread of execution. This " +"automatically bind these ojects to the current thread of execution. This " "gives you the freedom to layer your code and access the " "SessionFactory in any way you like. Usually you'd use a " "more sophisticated design and move the data access code into data access " diff --git a/documentation/manual/src/main/docbook/zh-CN/content/association_mapping.po b/documentation/manual/src/main/docbook/zh-CN/content/association_mapping.po index a4c451b714..4682f44b95 100644 --- a/documentation/manual/src/main/docbook/zh-CN/content/association_mapping.po +++ b/documentation/manual/src/main/docbook/zh-CN/content/association_mapping.po @@ -802,7 +802,7 @@ msgid "" " \n" "\n" "\n" -"]]>" +"]]>" msgstr "" #. Tag: para diff --git a/documentation/manual/src/main/docbook/zh-CN/content/component_mapping.po b/documentation/manual/src/main/docbook/zh-CN/content/component_mapping.po index 4ffaa8b4c9..8ea7025844 100644 --- a/documentation/manual/src/main/docbook/zh-CN/content/component_mapping.po +++ b/documentation/manual/src/main/docbook/zh-CN/content/component_mapping.po @@ -161,7 +161,7 @@ msgstr "" msgid "" "Like all value types, components do not support shared references. In other " "words, two persons could have the same name, but the two person objects " -"would contain two independent name objects, only \"the same\" by value. The " +"would contain two independent name ojects, only \"the same\" by value. The " "null value semantics of a component are ad hoc. When " "reloading the containing object, Hibernate will assume that if all component " "columns are null, then the entire component is null. This should be okay for " diff --git a/documentation/manual/src/main/docbook/zh-CN/content/query_sql.po b/documentation/manual/src/main/docbook/zh-CN/content/query_sql.po index abefb5e9b3..fd20bab74e 100644 --- a/documentation/manual/src/main/docbook/zh-CN/content/query_sql.po +++ b/documentation/manual/src/main/docbook/zh-CN/content/query_sql.po @@ -452,10 +452,10 @@ msgstr "" #: query_sql.xml:192 #, no-c-format msgid "" -"Session or detached instances as the design paradigm." msgstr "" diff --git a/documentation/manual/src/main/docbook/zh-CN/content/tutorial.po b/documentation/manual/src/main/docbook/zh-CN/content/tutorial.po index 434767d0c4..1d39c38b09 100644 --- a/documentation/manual/src/main/docbook/zh-CN/content/tutorial.po +++ b/documentation/manual/src/main/docbook/zh-CN/content/tutorial.po @@ -2496,7 +2496,7 @@ msgid "" "That's it, the servlet is complete. A request to the servlet will be " "processed in a single Session and Transaction. As earlier in the standalone application, Hibernate can " -"automatically bind these objects to the current thread of execution. This " +"automatically bind these ojects to the current thread of execution. This " "gives you the freedom to layer your code and access the " "SessionFactory in any way you like. Usually you'd use a " "more sophisticated design and move the data access code into data access "