[weld-commits] Weld SVN: r6809 - in doc/trunk/reference: src/main/docbook/de-DE and 6 other directories.

weld-commits at lists.jboss.org weld-commits at lists.jboss.org
Sun Jul 25 00:22:44 EDT 2010


Author: brunolmfg
Date: 2010-07-25 00:22:37 -0400 (Sun, 25 Jul 2010)
New Revision: 6809

Modified:
   doc/trunk/reference/pot/Author_Group.pot
   doc/trunk/reference/pot/Book_Info.pot
   doc/trunk/reference/pot/beans.pot
   doc/trunk/reference/pot/decorators.pot
   doc/trunk/reference/pot/dependencies.pot
   doc/trunk/reference/pot/ee.pot
   doc/trunk/reference/pot/environments.pot
   doc/trunk/reference/pot/events.pot
   doc/trunk/reference/pot/example.pot
   doc/trunk/reference/pot/extend.pot
   doc/trunk/reference/pot/extensions.pot
   doc/trunk/reference/pot/gettingstarted.pot
   doc/trunk/reference/pot/injection.pot
   doc/trunk/reference/pot/interceptors.pot
   doc/trunk/reference/pot/intro.pot
   doc/trunk/reference/pot/master.pot
   doc/trunk/reference/pot/next.pot
   doc/trunk/reference/pot/part1.pot
   doc/trunk/reference/pot/part2.pot
   doc/trunk/reference/pot/part3.pot
   doc/trunk/reference/pot/part4.pot
   doc/trunk/reference/pot/part5.pot
   doc/trunk/reference/pot/producermethods.pot
   doc/trunk/reference/pot/resources.pot
   doc/trunk/reference/pot/ri-spi.pot
   doc/trunk/reference/pot/scopescontexts.pot
   doc/trunk/reference/pot/specialization.pot
   doc/trunk/reference/pot/stereotypes.pot
   doc/trunk/reference/pot/viewlayers.pot
   doc/trunk/reference/pot/weldexamples.pot
   doc/trunk/reference/pot/xml.pot
   doc/trunk/reference/src/main/docbook/de-DE/beans.po
   doc/trunk/reference/src/main/docbook/de-DE/decorators.po
   doc/trunk/reference/src/main/docbook/de-DE/ee.po
   doc/trunk/reference/src/main/docbook/de-DE/environments.po
   doc/trunk/reference/src/main/docbook/de-DE/events.po
   doc/trunk/reference/src/main/docbook/de-DE/example.po
   doc/trunk/reference/src/main/docbook/de-DE/extend.po
   doc/trunk/reference/src/main/docbook/de-DE/extensions.po
   doc/trunk/reference/src/main/docbook/de-DE/gettingstarted.po
   doc/trunk/reference/src/main/docbook/de-DE/injection.po
   doc/trunk/reference/src/main/docbook/de-DE/interceptors.po
   doc/trunk/reference/src/main/docbook/de-DE/intro.po
   doc/trunk/reference/src/main/docbook/de-DE/master.po
   doc/trunk/reference/src/main/docbook/de-DE/next.po
   doc/trunk/reference/src/main/docbook/de-DE/part1.po
   doc/trunk/reference/src/main/docbook/de-DE/part3.po
   doc/trunk/reference/src/main/docbook/de-DE/part4.po
   doc/trunk/reference/src/main/docbook/de-DE/producermethods.po
   doc/trunk/reference/src/main/docbook/de-DE/resources.po
   doc/trunk/reference/src/main/docbook/de-DE/ri-spi.po
   doc/trunk/reference/src/main/docbook/de-DE/scopescontexts.po
   doc/trunk/reference/src/main/docbook/de-DE/specialization.po
   doc/trunk/reference/src/main/docbook/de-DE/stereotypes.po
   doc/trunk/reference/src/main/docbook/de-DE/viewlayers.po
   doc/trunk/reference/src/main/docbook/de-DE/weldexamples.po
   doc/trunk/reference/src/main/docbook/de-DE/xml.po
   doc/trunk/reference/src/main/docbook/es-ES/beans.po
   doc/trunk/reference/src/main/docbook/es-ES/decorators.po
   doc/trunk/reference/src/main/docbook/es-ES/ee.po
   doc/trunk/reference/src/main/docbook/es-ES/environments.po
   doc/trunk/reference/src/main/docbook/es-ES/events.po
   doc/trunk/reference/src/main/docbook/es-ES/example.po
   doc/trunk/reference/src/main/docbook/es-ES/extend.po
   doc/trunk/reference/src/main/docbook/es-ES/extensions.po
   doc/trunk/reference/src/main/docbook/es-ES/gettingstarted.po
   doc/trunk/reference/src/main/docbook/es-ES/injection.po
   doc/trunk/reference/src/main/docbook/es-ES/interceptors.po
   doc/trunk/reference/src/main/docbook/es-ES/intro.po
   doc/trunk/reference/src/main/docbook/es-ES/master.po
   doc/trunk/reference/src/main/docbook/es-ES/next.po
   doc/trunk/reference/src/main/docbook/es-ES/part1.po
   doc/trunk/reference/src/main/docbook/es-ES/part3.po
   doc/trunk/reference/src/main/docbook/es-ES/part4.po
   doc/trunk/reference/src/main/docbook/es-ES/producermethods.po
   doc/trunk/reference/src/main/docbook/es-ES/resources.po
   doc/trunk/reference/src/main/docbook/es-ES/ri-spi.po
   doc/trunk/reference/src/main/docbook/es-ES/scopescontexts.po
   doc/trunk/reference/src/main/docbook/es-ES/specialization.po
   doc/trunk/reference/src/main/docbook/es-ES/stereotypes.po
   doc/trunk/reference/src/main/docbook/es-ES/viewlayers.po
   doc/trunk/reference/src/main/docbook/es-ES/weldexamples.po
   doc/trunk/reference/src/main/docbook/es-ES/xml.po
   doc/trunk/reference/src/main/docbook/it-IT/beans.po
   doc/trunk/reference/src/main/docbook/it-IT/decorators.po
   doc/trunk/reference/src/main/docbook/it-IT/ee.po
   doc/trunk/reference/src/main/docbook/it-IT/environments.po
   doc/trunk/reference/src/main/docbook/it-IT/events.po
   doc/trunk/reference/src/main/docbook/it-IT/example.po
   doc/trunk/reference/src/main/docbook/it-IT/extend.po
   doc/trunk/reference/src/main/docbook/it-IT/extensions.po
   doc/trunk/reference/src/main/docbook/it-IT/gettingstarted.po
   doc/trunk/reference/src/main/docbook/it-IT/injection.po
   doc/trunk/reference/src/main/docbook/it-IT/interceptors.po
   doc/trunk/reference/src/main/docbook/it-IT/intro.po
   doc/trunk/reference/src/main/docbook/it-IT/master.po
   doc/trunk/reference/src/main/docbook/it-IT/next.po
   doc/trunk/reference/src/main/docbook/it-IT/part1.po
   doc/trunk/reference/src/main/docbook/it-IT/part3.po
   doc/trunk/reference/src/main/docbook/it-IT/part4.po
   doc/trunk/reference/src/main/docbook/it-IT/producermethods.po
   doc/trunk/reference/src/main/docbook/it-IT/resources.po
   doc/trunk/reference/src/main/docbook/it-IT/ri-spi.po
   doc/trunk/reference/src/main/docbook/it-IT/scopescontexts.po
   doc/trunk/reference/src/main/docbook/it-IT/specialization.po
   doc/trunk/reference/src/main/docbook/it-IT/stereotypes.po
   doc/trunk/reference/src/main/docbook/it-IT/viewlayers.po
   doc/trunk/reference/src/main/docbook/it-IT/weldexamples.po
   doc/trunk/reference/src/main/docbook/it-IT/xml.po
   doc/trunk/reference/src/main/docbook/ko-KR/beans.po
   doc/trunk/reference/src/main/docbook/ko-KR/decorators.po
   doc/trunk/reference/src/main/docbook/ko-KR/ee.po
   doc/trunk/reference/src/main/docbook/ko-KR/environments.po
   doc/trunk/reference/src/main/docbook/ko-KR/events.po
   doc/trunk/reference/src/main/docbook/ko-KR/example.po
   doc/trunk/reference/src/main/docbook/ko-KR/extend.po
   doc/trunk/reference/src/main/docbook/ko-KR/extensions.po
   doc/trunk/reference/src/main/docbook/ko-KR/gettingstarted.po
   doc/trunk/reference/src/main/docbook/ko-KR/injection.po
   doc/trunk/reference/src/main/docbook/ko-KR/interceptors.po
   doc/trunk/reference/src/main/docbook/ko-KR/intro.po
   doc/trunk/reference/src/main/docbook/ko-KR/master.po
   doc/trunk/reference/src/main/docbook/ko-KR/next.po
   doc/trunk/reference/src/main/docbook/ko-KR/part1.po
   doc/trunk/reference/src/main/docbook/ko-KR/part3.po
   doc/trunk/reference/src/main/docbook/ko-KR/part4.po
   doc/trunk/reference/src/main/docbook/ko-KR/producermethods.po
   doc/trunk/reference/src/main/docbook/ko-KR/resources.po
   doc/trunk/reference/src/main/docbook/ko-KR/ri-spi.po
   doc/trunk/reference/src/main/docbook/ko-KR/scopescontexts.po
   doc/trunk/reference/src/main/docbook/ko-KR/specialization.po
   doc/trunk/reference/src/main/docbook/ko-KR/stereotypes.po
   doc/trunk/reference/src/main/docbook/ko-KR/viewlayers.po
   doc/trunk/reference/src/main/docbook/ko-KR/weldexamples.po
   doc/trunk/reference/src/main/docbook/ko-KR/xml.po
   doc/trunk/reference/src/main/docbook/pt-BR/beans.po
   doc/trunk/reference/src/main/docbook/pt-BR/decorators.po
   doc/trunk/reference/src/main/docbook/pt-BR/ee.po
   doc/trunk/reference/src/main/docbook/pt-BR/environments.po
   doc/trunk/reference/src/main/docbook/pt-BR/events.po
   doc/trunk/reference/src/main/docbook/pt-BR/example.po
   doc/trunk/reference/src/main/docbook/pt-BR/extend.po
   doc/trunk/reference/src/main/docbook/pt-BR/extensions.po
   doc/trunk/reference/src/main/docbook/pt-BR/gettingstarted.po
   doc/trunk/reference/src/main/docbook/pt-BR/injection.po
   doc/trunk/reference/src/main/docbook/pt-BR/interceptors.po
   doc/trunk/reference/src/main/docbook/pt-BR/intro.po
   doc/trunk/reference/src/main/docbook/pt-BR/master.po
   doc/trunk/reference/src/main/docbook/pt-BR/next.po
   doc/trunk/reference/src/main/docbook/pt-BR/part1.po
   doc/trunk/reference/src/main/docbook/pt-BR/part3.po
   doc/trunk/reference/src/main/docbook/pt-BR/part4.po
   doc/trunk/reference/src/main/docbook/pt-BR/producermethods.po
   doc/trunk/reference/src/main/docbook/pt-BR/resources.po
   doc/trunk/reference/src/main/docbook/pt-BR/ri-spi.po
   doc/trunk/reference/src/main/docbook/pt-BR/scopescontexts.po
   doc/trunk/reference/src/main/docbook/pt-BR/specialization.po
   doc/trunk/reference/src/main/docbook/pt-BR/stereotypes.po
   doc/trunk/reference/src/main/docbook/pt-BR/viewlayers.po
   doc/trunk/reference/src/main/docbook/pt-BR/weldexamples.po
   doc/trunk/reference/src/main/docbook/pt-BR/xml.po
   doc/trunk/reference/src/main/docbook/zh-CN/beans.po
   doc/trunk/reference/src/main/docbook/zh-CN/decorators.po
   doc/trunk/reference/src/main/docbook/zh-CN/ee.po
   doc/trunk/reference/src/main/docbook/zh-CN/environments.po
   doc/trunk/reference/src/main/docbook/zh-CN/events.po
   doc/trunk/reference/src/main/docbook/zh-CN/example.po
   doc/trunk/reference/src/main/docbook/zh-CN/extend.po
   doc/trunk/reference/src/main/docbook/zh-CN/extensions.po
   doc/trunk/reference/src/main/docbook/zh-CN/gettingstarted.po
   doc/trunk/reference/src/main/docbook/zh-CN/injection.po
   doc/trunk/reference/src/main/docbook/zh-CN/interceptors.po
   doc/trunk/reference/src/main/docbook/zh-CN/intro.po
   doc/trunk/reference/src/main/docbook/zh-CN/master.po
   doc/trunk/reference/src/main/docbook/zh-CN/next.po
   doc/trunk/reference/src/main/docbook/zh-CN/part1.po
   doc/trunk/reference/src/main/docbook/zh-CN/part3.po
   doc/trunk/reference/src/main/docbook/zh-CN/part4.po
   doc/trunk/reference/src/main/docbook/zh-CN/producermethods.po
   doc/trunk/reference/src/main/docbook/zh-CN/resources.po
   doc/trunk/reference/src/main/docbook/zh-CN/ri-spi.po
   doc/trunk/reference/src/main/docbook/zh-CN/scopescontexts.po
   doc/trunk/reference/src/main/docbook/zh-CN/specialization.po
   doc/trunk/reference/src/main/docbook/zh-CN/stereotypes.po
   doc/trunk/reference/src/main/docbook/zh-CN/viewlayers.po
   doc/trunk/reference/src/main/docbook/zh-CN/weldexamples.po
   doc/trunk/reference/src/main/docbook/zh-CN/xml.po
   doc/trunk/reference/src/main/docbook/zh-TW/beans.po
   doc/trunk/reference/src/main/docbook/zh-TW/decorators.po
   doc/trunk/reference/src/main/docbook/zh-TW/ee.po
   doc/trunk/reference/src/main/docbook/zh-TW/environments.po
   doc/trunk/reference/src/main/docbook/zh-TW/events.po
   doc/trunk/reference/src/main/docbook/zh-TW/example.po
   doc/trunk/reference/src/main/docbook/zh-TW/extend.po
   doc/trunk/reference/src/main/docbook/zh-TW/extensions.po
   doc/trunk/reference/src/main/docbook/zh-TW/gettingstarted.po
   doc/trunk/reference/src/main/docbook/zh-TW/injection.po
   doc/trunk/reference/src/main/docbook/zh-TW/interceptors.po
   doc/trunk/reference/src/main/docbook/zh-TW/intro.po
   doc/trunk/reference/src/main/docbook/zh-TW/master.po
   doc/trunk/reference/src/main/docbook/zh-TW/next.po
   doc/trunk/reference/src/main/docbook/zh-TW/part1.po
   doc/trunk/reference/src/main/docbook/zh-TW/part3.po
   doc/trunk/reference/src/main/docbook/zh-TW/part4.po
   doc/trunk/reference/src/main/docbook/zh-TW/producermethods.po
   doc/trunk/reference/src/main/docbook/zh-TW/resources.po
   doc/trunk/reference/src/main/docbook/zh-TW/ri-spi.po
   doc/trunk/reference/src/main/docbook/zh-TW/scopescontexts.po
   doc/trunk/reference/src/main/docbook/zh-TW/specialization.po
   doc/trunk/reference/src/main/docbook/zh-TW/stereotypes.po
   doc/trunk/reference/src/main/docbook/zh-TW/viewlayers.po
   doc/trunk/reference/src/main/docbook/zh-TW/weldexamples.po
   doc/trunk/reference/src/main/docbook/zh-TW/xml.po
Log:
update pot and po files removing html entities in number style.

Modified: doc/trunk/reference/pot/Author_Group.pot
===================================================================
--- doc/trunk/reference/pot/Author_Group.pot	2010-07-24 16:36:48 UTC (rev 6808)
+++ doc/trunk/reference/pot/Author_Group.pot	2010-07-25 04:22:37 UTC (rev 6809)
@@ -4,8 +4,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: 0\n"
-"POT-Creation-Date: 2010-05-01T14:44:09\n"
-"PO-Revision-Date: 2010-05-01T14:44:09\n"
+"POT-Creation-Date: 2010-07-25T03:52:14\n"
+"PO-Revision-Date: 2010-07-25T03:52:14\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: None\n"
 "MIME-Version: 1.0\n"

Modified: doc/trunk/reference/pot/Book_Info.pot
===================================================================
--- doc/trunk/reference/pot/Book_Info.pot	2010-07-24 16:36:48 UTC (rev 6808)
+++ doc/trunk/reference/pot/Book_Info.pot	2010-07-25 04:22:37 UTC (rev 6809)
@@ -4,8 +4,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: 0\n"
-"POT-Creation-Date: 2010-05-01T14:44:09\n"
-"PO-Revision-Date: 2010-05-01T14:44:09\n"
+"POT-Creation-Date: 2010-07-25T03:52:14\n"
+"PO-Revision-Date: 2010-07-25T03:52:14\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: None\n"
 "MIME-Version: 1.0\n"

Modified: doc/trunk/reference/pot/beans.pot
===================================================================
--- doc/trunk/reference/pot/beans.pot	2010-07-24 16:36:48 UTC (rev 6808)
+++ doc/trunk/reference/pot/beans.pot	2010-07-25 04:22:37 UTC (rev 6809)
@@ -4,8 +4,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: 0\n"
-"POT-Creation-Date: 2010-05-01T14:44:09\n"
-"PO-Revision-Date: 2010-05-01T14:44:09\n"
+"POT-Creation-Date: 2010-07-25T03:52:14\n"
+"PO-Revision-Date: 2010-07-25T03:52:14\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: None\n"
 "MIME-Version: 1.0\n"
@@ -24,7 +24,7 @@
 
 #. Tag: para
 #, no-c-format
-msgid "Let&#39;s back up a second. What does it really mean to be <emphasis>contextual</emphasis>? Since beans may be stateful, it matters <emphasis>which</emphasis> bean instance I have. Unlike a stateless component model (for example, stateless session beans) or a singleton component model (such as servlets, or singleton beans), different clients of a bean see the bean in different states. The client-visible state depends upon which instance of the bean the client has a reference to."
+msgid "Let's back up a second. What does it really mean to be <emphasis>contextual</emphasis>? Since beans may be stateful, it matters <emphasis>which</emphasis> bean instance I have. Unlike a stateless component model (for example, stateless session beans) or a singleton component model (such as servlets, or singleton beans), different clients of a bean see the bean in different states. The client-visible state depends upon which instance of the bean the client has a reference to."
 msgstr ""
 
 #. Tag: para
@@ -54,7 +54,7 @@
 
 #. Tag: para
 #, no-c-format
-msgid "One great advantage of the contextual model is that it allows stateful beans to be treated like services! The client need not concern itself with managing the lifecycle of the bean it&#39;s using, <emphasis>nor does it even need to know what that lifecycle is.</emphasis> Beans interact by passing messages, and the bean implementations define the lifecycle of their own state. The beans are loosely coupled because:"
+msgid "One great advantage of the contextual model is that it allows stateful beans to be treated like services! The client need not concern itself with managing the lifecycle of the bean it's using, <emphasis>nor does it even need to know what that lifecycle is.</emphasis> Beans interact by passing messages, and the bean implementations define the lifecycle of their own state. The beans are loosely coupled because:"
 msgstr ""
 
 #. Tag: para
@@ -129,7 +129,7 @@
 
 #. Tag: para
 #, no-c-format
-msgid "Let&#39;s see what all this new terminology means."
+msgid "Let's see what all this new terminology means."
 msgstr ""
 
 #. Tag: title
@@ -139,7 +139,7 @@
 
 #. Tag: para
 #, no-c-format
-msgid "Beans usually acquire references to other beans via dependency injection. Any injected attribute specifies a &#34;contract&#34; that must be satisfied by the bean to be injected. The contract is:"
+msgid "Beans usually acquire references to other beans via dependency injection. Any injected attribute specifies a \"contract\" that must be satisfied by the bean to be injected. The contract is:"
 msgstr ""
 
 #. Tag: para
@@ -159,7 +159,7 @@
 
 #. Tag: para
 #, no-c-format
-msgid "The bean types are <literal>BookShop</literal>, <literal>Business</literal> and <literal>Shop&#60;Book&#62;</literal>, as well as the implicit type <literal>java.lang.Object</literal>. (Notice that a parameterized type is a legal bean type)."
+msgid "The bean types are <literal>BookShop</literal>, <literal>Business</literal> and <literal>Shop&lt;Book&gt;</literal>, as well as the implicit type <literal>java.lang.Object</literal>. (Notice that a parameterized type is a legal bean type)."
 msgstr ""
 
 #. Tag: para
@@ -169,32 +169,32 @@
 
 #. Tag: para
 #, no-c-format
-msgid "The bean types of a session bean include local interfaces and the bean class local view (if any). EJB remote interfaces are not considered bean types of a session bean. You can&#39;t inject an EJB using its remote interface unless you define a <emphasis>resource</emphasis>, which we&#39;ll meet in <xref linkend=\"resources\" />."
+msgid "The bean types of a session bean include local interfaces and the bean class local view (if any). EJB remote interfaces are not considered bean types of a session bean. You can't inject an EJB using its remote interface unless you define a <emphasis>resource</emphasis>, which we'll meet in <xref linkend=\"resources\" />."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Bean types may be restricted to an explicit set by annotating the bean with the <literal>@Typed</literal> annotation and listing the classes that should be bean types. For instance, the bean types of this bean have been restricted to <literal>Shop&#60;Book&#62;</literal>, together with <literal>java.lang.Object</literal>:"
+msgid "Bean types may be restricted to an explicit set by annotating the bean with the <literal>@Typed</literal> annotation and listing the classes that should be bean types. For instance, the bean types of this bean have been restricted to <literal>Shop&lt;Book&gt;</literal>, together with <literal>java.lang.Object</literal>:"
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Sometimes, a bean type alone does not provide enough information for the container to know which bean to inject. For instance, suppose we have two implementations of the <literal>PaymentProcessor</literal> interface: <literal>CreditCardPaymentProcessor</literal> and <literal>DebitPaymentProcessor</literal>. Injecting a field of type <literal>PaymentProcessor</literal> introduces an ambiguous condition. In these cases, the client must specify some additional quality of the implementation it is interested in. We model this kind of &#34;quality&#34; using a qualifier."
+msgid "Sometimes, a bean type alone does not provide enough information for the container to know which bean to inject. For instance, suppose we have two implementations of the <literal>PaymentProcessor</literal> interface: <literal>CreditCardPaymentProcessor</literal> and <literal>DebitPaymentProcessor</literal>. Injecting a field of type <literal>PaymentProcessor</literal> introduces an ambiguous condition. In these cases, the client must specify some additional quality of the implementation it is interested in. We model this kind of \"quality\" using a qualifier."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "A qualifier is a user-defined annotation that is itself annotated <literal>@Qualifer</literal>. A qualifier annotation is an extension of the type system. It lets us disambiguate a type without having to fall back to string-based names. Here&#39;s an example of a qualifier annotation:"
+msgid "A qualifier is a user-defined annotation that is itself annotated <literal>@Qualifer</literal>. A qualifier annotation is an extension of the type system. It lets us disambiguate a type without having to fall back to string-based names. Here's an example of a qualifier annotation:"
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "You may not be used to seeing the definition of an annotation. In fact, this might be the first time you&#39;ve encountered one. With CDI, annotation definitions will become a familiar artifact as you&#39;ll be creating them from time to time."
+msgid "You may not be used to seeing the definition of an annotation. In fact, this might be the first time you've encountered one. With CDI, annotation definitions will become a familiar artifact as you'll be creating them from time to time."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Pay attention to the names of the built-in annotations in CDI and EJB. You&#39;ll notice that they are often adjectives. We encourage you to follow this convention when creating your custom annotations, since they serve to describe the behaviors and roles of the class."
+msgid "Pay attention to the names of the built-in annotations in CDI and EJB. You'll notice that they are often adjectives. We encourage you to follow this convention when creating your custom annotations, since they serve to describe the behaviors and roles of the class."
 msgstr ""
 
 #. Tag: para
@@ -209,7 +209,7 @@
 
 #. Tag: para
 #, no-c-format
-msgid "For each injection point, the container searches for a bean which satisfies the contract, one which has the bean type and all the qualifiers. If it finds exactly one matching bean, it injects an instance of that bean. If it doesn&#39;t, it reports an error to the user."
+msgid "For each injection point, the container searches for a bean which satisfies the contract, one which has the bean type and all the qualifiers. If it finds exactly one matching bean, it injects an instance of that bean. If it doesn't, it reports an error to the user."
 msgstr ""
 
 #. Tag: para
@@ -224,7 +224,7 @@
 
 #. Tag: para
 #, no-c-format
-msgid "That&#39;s not quite the end of the story. CDI also defines a simple <emphasis>resolution rule</emphasis> that helps the container decide what to do if there is more than one bean that satisfies a particular contract. We&#39;ll get into the details in <xref linkend=\"injection\" />."
+msgid "That's not quite the end of the story. CDI also defines a simple <emphasis>resolution rule</emphasis> that helps the container decide what to do if there is more than one bean that satisfies a particular contract. We'll get into the details in <xref linkend=\"injection\" />."
 msgstr ""
 
 #. Tag: title
@@ -249,7 +249,7 @@
 
 #. Tag: para
 #, no-c-format
-msgid "Keep in mind that once a bean is bound to a context, it remains in that context until the context is destroyed. There is no way to manually remove a bean from a context. If you don&#39;t want the bean to sit in the session indefinitely, consider using another scope with a shorted lifespan, such as the request or conversation scope."
+msgid "Keep in mind that once a bean is bound to a context, it remains in that context until the context is destroyed. There is no way to manually remove a bean from a context. If you don't want the bean to sit in the session indefinitely, consider using another scope with a shorted lifespan, such as the request or conversation scope."
 msgstr ""
 
 #. Tag: para
@@ -259,7 +259,7 @@
 
 #. Tag: para
 #, no-c-format
-msgid "We&#39;ll talk more about scopes in <xref linkend=\"scopescontexts\" />."
+msgid "We'll talk more about scopes in <xref linkend=\"scopescontexts\" />."
 msgstr ""
 
 #. Tag: title
@@ -304,7 +304,7 @@
 
 #. Tag: para
 #, no-c-format
-msgid "We&#39;ve already seen how qualifiers let us choose between multiple implementations of an interface at development time. But sometimes we have an interface (or other bean type) whose implementation varies depending upon the deployment environment. For example, we may want to use a mock implementation in a testing environment. An <emphasis>alternative</emphasis> may be declared by annotating the bean class with the <literal>@Alternative</literal> annotation."
+msgid "We've already seen how qualifiers let us choose between multiple implementations of an interface at development time. But sometimes we have an interface (or other bean type) whose implementation varies depending upon the deployment environment. For example, we may want to use a mock implementation in a testing environment. An <emphasis>alternative</emphasis> may be declared by annotating the bean class with the <literal>@Alternative</literal> annotation."
 msgstr ""
 
 #. Tag: para
@@ -324,12 +324,12 @@
 
 #. Tag: para
 #, no-c-format
-msgid "You might be familiar with the use of interceptors in EJB 3.0. In Java EE 6, this functionality has been generalized to work with other managed beans. That&#39;s right, you no longer have to make your bean an EJB just to intercept its methods. Holler. So what does CDI have to offer above and beyond that? Well, quite a lot actually. Let&#39;s cover some background."
+msgid "You might be familiar with the use of interceptors in EJB 3.0. In Java EE 6, this functionality has been generalized to work with other managed beans. That's right, you no longer have to make your bean an EJB just to intercept its methods. Holler. So what does CDI have to offer above and beyond that? Well, quite a lot actually. Let's cover some background."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "The way that interceptors were defined in Java EE 5 was counter-intuitive. You were required to specify the <emphasis>implementation</emphasis> of the interceptor directly on the <emphasis>implementation</emphasis> of the EJB, either in the <literal>@Interceptors</literal> annotation or in the XML descriptor. You might as well just put the interceptor code <emphasis>in</emphasis> the implementation! Second, the order in which the interceptors are applied is taken from the order in which they are declared in the annotation or the XML descriptor. Perhaps this isn&#39;t so bad if you&#39;re applying the interceptors to a single bean. But, if you are applying them repeatedly, then there&#39;s a good chance that you&#39;ll inadvertently define a different order for different beans. Now that&#39;s a problem."
+msgid "The way that interceptors were defined in Java EE 5 was counter-intuitive. You were required to specify the <emphasis>implementation</emphasis> of the interceptor directly on the <emphasis>implementation</emphasis> of the EJB, either in the <literal>@Interceptors</literal> annotation or in the XML descriptor. You might as well just put the interceptor code <emphasis>in</emphasis> the implementation! Second, the order in which the interceptors are applied is taken from the order in which they are declared in the annotation or the XML descriptor. Perhaps this isn't so bad if you're applying the interceptors to a single bean. But, if you are applying them repeatedly, then there's a good chance that you'll inadvertently define a different order for different beans. Now that's a problem."
 msgstr ""
 
 #. Tag: para
@@ -354,17 +354,17 @@
 
 #. Tag: para
 #, no-c-format
-msgid "Notice that <literal>ShoppingCart</literal> and <literal>TransactionInterceptor</literal> don&#39;t know anything about each other."
+msgid "Notice that <literal>ShoppingCart</literal> and <literal>TransactionInterceptor</literal> don't know anything about each other."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Interceptors are deployment-specific. (We don&#39;t need a <literal>TransactionInterceptor</literal> in our unit tests!) By default, an interceptor is disabled. We can enable an interceptor using the CDI deployment descriptor <literal>META-INF/beans.xml</literal> of the jar or Java EE module. This is also where we specify the interceptor ordering."
+msgid "Interceptors are deployment-specific. (We don't need a <literal>TransactionInterceptor</literal> in our unit tests!) By default, an interceptor is disabled. We can enable an interceptor using the CDI deployment descriptor <literal>META-INF/beans.xml</literal> of the jar or Java EE module. This is also where we specify the interceptor ordering."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "We&#39;ll discuss interceptors, and their cousins, decorators, in <xref linkend=\"interceptors\" /> and <xref linkend=\"decorators\" />."
+msgid "We'll discuss interceptors, and their cousins, decorators, in <xref linkend=\"interceptors\" /> and <xref linkend=\"decorators\" />."
 msgstr ""
 
 #. Tag: title
@@ -374,7 +374,7 @@
 
 #. Tag: para
 #, no-c-format
-msgid "We&#39;ve already seen two types of beans: JavaBeans and EJB session beans. Is that the whole story? Actually, it&#39;s just the beginning. Let&#39;s explore the various kinds of beans that CDI implementations must support out-of-the-box."
+msgid "We've already seen two types of beans: JavaBeans and EJB session beans. Is that the whole story? Actually, it's just the beginning. Let's explore the various kinds of beans that CDI implementations must support out-of-the-box."
 msgstr ""
 
 #. Tag: title
@@ -384,7 +384,7 @@
 
 #. Tag: para
 #, no-c-format
-msgid "A managed bean is a Java class. The basic lifecycle and semantics of a managed bean are defined by the Managed Beans specification. You can explicitly declare a managed bean by annotating the bean class <literal>@ManagedBean</literal>, but in CDI you don&#39;t need to. According to the specification, the CDI container treats any class that satisfies the following conditions as a managed bean:"
+msgid "A managed bean is a Java class. The basic lifecycle and semantics of a managed bean are defined by the Managed Beans specification. You can explicitly declare a managed bean by annotating the bean class <literal>@ManagedBean</literal>, but in CDI you don't need to. According to the specification, the CDI container treats any class that satisfies the following conditions as a managed bean:"
 msgstr ""
 
 #. Tag: para
@@ -424,7 +424,7 @@
 
 #. Tag: para
 #, no-c-format
-msgid "According to this definition, JPA entities are technically managed beans. However, entities have their own special lifecycle, state and identity model and are usually instantiated by JPA or using <literal>new</literal>. Therefore we don&#39;t recommend directly injecting an entity class. We especially recommend against assigning a scope other than <literal>@Dependent</literal> to an entity class, since JPA is not able to persist injected CDI proxies."
+msgid "According to this definition, JPA entities are technically managed beans. However, entities have their own special lifecycle, state and identity model and are usually instantiated by JPA or using <literal>new</literal>. Therefore we don't recommend directly injecting an entity class. We especially recommend against assigning a scope other than <literal>@Dependent</literal> to an entity class, since JPA is not able to persist injected CDI proxies."
 msgstr ""
 
 #. Tag: para
@@ -469,7 +469,7 @@
 
 #. Tag: para
 #, no-c-format
-msgid "There&#39;s no reason to explicitly declare the scope of a stateless session bean or singleton session bean. The EJB container controls the lifecycle of these beans, according to the semantics of the <literal>@Stateless</literal> or <literal>@Singleton</literal> declaration. On the other hand, a stateful session bean may have any scope."
+msgid "There's no reason to explicitly declare the scope of a stateless session bean or singleton session bean. The EJB container controls the lifecycle of these beans, according to the semantics of the <literal>@Stateless</literal> or <literal>@Singleton</literal> declaration. On the other hand, a stateful session bean may have any scope."
 msgstr ""
 
 #. Tag: para
@@ -509,7 +509,7 @@
 
 #. Tag: para
 #, no-c-format
-msgid "When we don&#39;t need any of these things, an ordinary managed bean will serve just fine."
+msgid "When we don't need any of these things, an ordinary managed bean will serve just fine."
 msgstr ""
 
 #. Tag: para
@@ -524,17 +524,17 @@
 
 #. Tag: para
 #, no-c-format
-msgid "Finally, it&#39;s usually obvious when method-level transaction management, method-level security, timers, remote methods or asynchronous methods are needed."
+msgid "Finally, it's usually obvious when method-level transaction management, method-level security, timers, remote methods or asynchronous methods are needed."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "The point we&#39;re trying to make is: use a session bean when you need the services it provides, not just because you want to use dependency injection, lifecycle management, or interceptors. Java EE 6 provides a graduated programming model. It&#39;s usually easy to start with an ordinary managed bean, and later turn it into an EJB just by adding one of the following annotations: <literal>@Stateless</literal>, <literal>@Stateful</literal> or <literal>@Singleton</literal>."
+msgid "The point we're trying to make is: use a session bean when you need the services it provides, not just because you want to use dependency injection, lifecycle management, or interceptors. Java EE 6 provides a graduated programming model. It's usually easy to start with an ordinary managed bean, and later turn it into an EJB just by adding one of the following annotations: <literal>@Stateless</literal>, <literal>@Stateful</literal> or <literal>@Singleton</literal>."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "On the other hand, don&#39;t be scared to use session beans just because you&#39;ve heard your friends say they&#39;re &#34;heavyweight&#34;. It&#39;s nothing more than superstition to think that something is &#34;heavier&#34; just because it&#39;s hosted natively within the Java EE container, instead of by a proprietary bean container or dependency injection framework that runs as an additional layer of obfuscation. And as a general principle, you should be skeptical of folks who use vaguely defined terminology like &#34;heavyweight&#34;."
+msgid "On the other hand, don't be scared to use session beans just because you've heard your friends say they're \"heavyweight\". It's nothing more than superstition to think that something is \"heavier\" just because it's hosted natively within the Java EE container, instead of by a proprietary bean container or dependency injection framework that runs as an additional layer of obfuscation. And as a general principle, you should be skeptical of folks who use vaguely defined terminology like \"heavyweight\"."
 msgstr ""
 
 #. Tag: title
@@ -559,7 +559,7 @@
 
 #. Tag: para
 #, no-c-format
-msgid "We can&#39;t write a bean class that is itself a random number. But we can certainly write a method that returns a random number. By making the method a producer method, we allow the return value of the method—in this case an <literal>Integer</literal>—to be injected. We can even specify a qualifier—in this case <literal>@Random</literal>, a scope—which in this case defaults to <literal>@Dependent</literal>, and an EL name—which in this case defaults to <literal>randomNumber</literal> according to the JavaBeans property name convention. Now we can get a random number anywhere:"
+msgid "We can't write a bean class that is itself a random number. But we can certainly write a method that returns a random number. By making the method a producer method, we allow the return value of the method—in this case an <literal>Integer</literal>—to be injected. We can even specify a qualifier—in this case <literal>@Random</literal>, a scope—which in this case defaults to <literal>@Dependent</literal>, and an EL name—which in this case defaults to <literal>randomNumber</literal> according to the JavaBeans property name convention. Now we can get a random number anywhere:"
 msgstr ""
 
 #. Tag: para
@@ -604,7 +604,7 @@
 
 #. Tag: para
 #, no-c-format
-msgid "We&#39;ll talk much more about producer methods in <xref linkend=\"producermethods\" />."
+msgid "We'll talk much more about producer methods in <xref linkend=\"producermethods\" />."
 msgstr ""
 
 #. Tag: title
@@ -624,6 +624,6 @@
 
 #. Tag: para
 #, no-c-format
-msgid "A producer field is really just a shortcut that lets us avoid writing a useless getter method. However, in addition to convenience, producer fields serve a specific purpose as an adaptor for Java EE component environment injection, but to learn more about that, you&#39;ll have to wait until <xref linkend=\"resources\" />. Because we can&#39;t wait to get to work on some examples."
+msgid "A producer field is really just a shortcut that lets us avoid writing a useless getter method. However, in addition to convenience, producer fields serve a specific purpose as an adaptor for Java EE component environment injection, but to learn more about that, you'll have to wait until <xref linkend=\"resources\" />. Because we can't wait to get to work on some examples."
 msgstr ""
 

Modified: doc/trunk/reference/pot/decorators.pot
===================================================================
--- doc/trunk/reference/pot/decorators.pot	2010-07-24 16:36:48 UTC (rev 6808)
+++ doc/trunk/reference/pot/decorators.pot	2010-07-25 04:22:37 UTC (rev 6809)
@@ -4,8 +4,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: 0\n"
-"POT-Creation-Date: 2010-05-01T14:44:09\n"
-"PO-Revision-Date: 2010-05-01T14:44:09\n"
+"POT-Creation-Date: 2010-07-25T03:52:14\n"
+"PO-Revision-Date: 2010-07-25T03:52:14\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: None\n"
 "MIME-Version: 1.0\n"
@@ -19,12 +19,12 @@
 
 #. Tag: para
 #, no-c-format
-msgid "Interceptors are a powerful way to capture and separate concerns which are <emphasis>orthogonal</emphasis> to the application (and type system). Any interceptor is able to intercept invocations of any Java type. This makes them perfect for solving technical concerns such as transaction management, security and call logging. However, by nature, interceptors are unaware of the actual semantics of the events they intercept. Thus, interceptors aren&#39;t an appropriate tool for separating business-related concerns."
+msgid "Interceptors are a powerful way to capture and separate concerns which are <emphasis>orthogonal</emphasis> to the application (and type system). Any interceptor is able to intercept invocations of any Java type. This makes them perfect for solving technical concerns such as transaction management, security and call logging. However, by nature, interceptors are unaware of the actual semantics of the events they intercept. Thus, interceptors aren't an appropriate tool for separating business-related concerns."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "The reverse is true of <emphasis>decorators</emphasis>. A decorator intercepts invocations only for a certain Java interface, and is therefore aware of all the semantics attached to that interface. Since decorators directly implement operations with business semantics, it makes them the perfect tool for modeling some kinds of business concerns. It also means that a decorator doesn&#39;t have the generality of an interceptor. Decorators aren&#39;t able to solve technical concerns that cut across many disparate types. Interceptors and decorators, though similar in many ways, are complementary. Let&#39;s look at some cases where decorators fit the bill."
+msgid "The reverse is true of <emphasis>decorators</emphasis>. A decorator intercepts invocations only for a certain Java interface, and is therefore aware of all the semantics attached to that interface. Since decorators directly implement operations with business semantics, it makes them the perfect tool for modeling some kinds of business concerns. It also means that a decorator doesn't have the generality of an interceptor. Decorators aren't able to solve technical concerns that cut across many disparate types. Interceptors and decorators, though similar in many ways, are complementary. Let's look at some cases where decorators fit the bill."
 msgstr ""
 
 #. Tag: para
@@ -49,7 +49,7 @@
 
 #. Tag: para
 #, no-c-format
-msgid "Unlike other beans, a decorator may be an abstract class. Therefore, if there&#39;s nothing special the decorator needs to do for a particular method of the decorated interface, you don&#39;t need to implement that method."
+msgid "Unlike other beans, a decorator may be an abstract class. Therefore, if there's nothing special the decorator needs to do for a particular method of the decorated interface, you don't need to implement that method."
 msgstr ""
 
 #. Tag: para
@@ -109,7 +109,7 @@
 
 #. Tag: para
 #, no-c-format
-msgid "This declaration serves the same purpose for decorators that the <literal>&#60;interceptors&#62;</literal> declaration serves for interceptors:"
+msgid "This declaration serves the same purpose for decorators that the <literal>&lt;interceptors&gt;</literal> declaration serves for interceptors:"
 msgstr ""
 
 #. Tag: para

Modified: doc/trunk/reference/pot/dependencies.pot
===================================================================
--- doc/trunk/reference/pot/dependencies.pot	2010-07-24 16:36:48 UTC (rev 6808)
+++ doc/trunk/reference/pot/dependencies.pot	2010-07-25 04:22:37 UTC (rev 6809)
@@ -4,8 +4,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: 0\n"
-"POT-Creation-Date: 2010-05-01T14:44:09\n"
-"PO-Revision-Date: 2010-05-01T14:44:09\n"
+"POT-Creation-Date: 2010-07-25T03:52:14\n"
+"PO-Revision-Date: 2010-07-25T03:52:14\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: None\n"
 "MIME-Version: 1.0\n"

Modified: doc/trunk/reference/pot/ee.pot
===================================================================
--- doc/trunk/reference/pot/ee.pot	2010-07-24 16:36:48 UTC (rev 6808)
+++ doc/trunk/reference/pot/ee.pot	2010-07-25 04:22:37 UTC (rev 6809)
@@ -4,8 +4,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: 0\n"
-"POT-Creation-Date: 2010-05-01T14:44:09\n"
-"PO-Revision-Date: 2010-05-01T14:44:09\n"
+"POT-Creation-Date: 2010-07-25T03:52:14\n"
+"PO-Revision-Date: 2010-07-25T03:52:14\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: None\n"
 "MIME-Version: 1.0\n"
@@ -54,7 +54,7 @@
 
 #. Tag: para
 #, no-c-format
-msgid "The CDI specification does not require the servlet context objects, <literal>HttpServletRequest</literal>, <literal>HttpSession</literal> and <literal>ServletContext</literal> to be exposed as injectable beans. If you really want to be able to inject these objects, it&#39;s easy to create a portable extension to expose them as beans. However, we recommend that direct access to these objects be limited to servlets, servlet filters and servlet event listeners, where they may be obtained in the usual way as defined by the Java Servlets spec. The <literal>FacesContext</literal> is also not injectable. You can get at it by calling <literal>FacesContext.getCurrentInstance()</literal>."
+msgid "The CDI specification does not require the servlet context objects, <literal>HttpServletRequest</literal>, <literal>HttpSession</literal> and <literal>ServletContext</literal> to be exposed as injectable beans. If you really want to be able to inject these objects, it's easy to create a portable extension to expose them as beans. However, we recommend that direct access to these objects be limited to servlets, servlet filters and servlet event listeners, where they may be obtained in the usual way as defined by the Java Servlets spec. The <literal>FacesContext</literal> is also not injectable. You can get at it by calling <literal>FacesContext.getCurrentInstance()</literal>."
 msgstr ""
 
 #. Tag: para
@@ -69,7 +69,7 @@
 
 #. Tag: para
 #, no-c-format
-msgid "All managed beans may take advantage of Java EE component environment injection using <literal>@Resource</literal>, <literal>@EJB</literal>, <literal>@PersistenceContext</literal>, <literal>@PeristenceUnit</literal> and <literal>@WebServiceRef</literal>. We&#39;ve already seen a couple of examples of this, though we didn&#39;t pay much attention at the time:"
+msgid "All managed beans may take advantage of Java EE component environment injection using <literal>@Resource</literal>, <literal>@EJB</literal>, <literal>@PersistenceContext</literal>, <literal>@PeristenceUnit</literal> and <literal>@WebServiceRef</literal>. We've already seen a couple of examples of this, though we didn't pay much attention at the time:"
 msgstr ""
 
 #. Tag: para
@@ -89,7 +89,7 @@
 
 #. Tag: para
 #, no-c-format
-msgid "It&#39;s easy to use a bean from a servlet in Java EE 6. Simply inject the bean using field or initializer method injection."
+msgid "It's easy to use a bean from a servlet in Java EE 6. Simply inject the bean using field or initializer method injection."
 msgstr ""
 
 #. Tag: para
@@ -104,7 +104,7 @@
 
 #. Tag: para
 #, no-c-format
-msgid "CDI injection applies to all EJBs, even when they aren&#39;t managed beans. In particular, you can use CDI injection in message-driven beans, which are by nature not contextual objects."
+msgid "CDI injection applies to all EJBs, even when they aren't managed beans. In particular, you can use CDI injection in message-driven beans, which are by nature not contextual objects."
 msgstr ""
 
 #. Tag: para
@@ -154,7 +154,7 @@
 
 #. Tag: para
 #, no-c-format
-msgid "CDI doesn&#39;t define any special deployment archive. You can package beans in jars, ejb jars or wars—any deployment location in the application classpath. However, the archive must be a &#34;bean archive&#34;. That means each archive that contains beans <emphasis>must</emphasis> include a file named <literal>beans.xml</literal> in the <literal>META-INF</literal> directory of the classpath or <literal>WEB-INF</literal> directory of the web root (for war archives). The file may be empty. Beans deployed in archives that do not have a <literal>beans.xml</literal> file will not be available for use in the application."
+msgid "CDI doesn't define any special deployment archive. You can package beans in jars, ejb jars or wars—any deployment location in the application classpath. However, the archive must be a \"bean archive\". That means each archive that contains beans <emphasis>must</emphasis> include a file named <literal>beans.xml</literal> in the <literal>META-INF</literal> directory of the classpath or <literal>WEB-INF</literal> directory of the web root (for war archives). The file may be empty. Beans deployed in archives that do not have a <literal>beans.xml</literal> file will not be available for use in the application."
 msgstr ""
 
 #. Tag: para

Modified: doc/trunk/reference/pot/environments.pot
===================================================================
--- doc/trunk/reference/pot/environments.pot	2010-07-24 16:36:48 UTC (rev 6808)
+++ doc/trunk/reference/pot/environments.pot	2010-07-25 04:22:37 UTC (rev 6809)
@@ -4,8 +4,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: 0\n"
-"POT-Creation-Date: 2010-05-01T14:44:09\n"
-"PO-Revision-Date: 2010-05-01T14:44:09\n"
+"POT-Creation-Date: 2010-07-25T03:52:14\n"
+"PO-Revision-Date: 2010-07-25T03:52:14\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: None\n"
 "MIME-Version: 1.0\n"
@@ -29,7 +29,7 @@
 
 #. Tag: para
 #, no-c-format
-msgid "Unfortunately, you can&#39;t use Weld with earlier versions of JBoss AS since they are missing key libraries. If you want to learn how to upgrade the built-in support on JBoss AS 6.0, then read on."
+msgid "Unfortunately, you can't use Weld with earlier versions of JBoss AS since they are missing key libraries. If you want to learn how to upgrade the built-in support on JBoss AS 6.0, then read on."
 msgstr ""
 
 #. Tag: para
@@ -74,12 +74,12 @@
 
 #. Tag: para
 #, no-c-format
-msgid "There is a major limitation to using a servlet container. Weld doesn&#39;t support deploying session beans, injection using <literal>@EJB</literal> or <literal>@PersistenceContext</literal>, or using transactional events in servlet containers. For enterprise features such as these, you should really be looking at a Java EE application server."
+msgid "There is a major limitation to using a servlet container. Weld doesn't support deploying session beans, injection using <literal>@EJB</literal> or <literal>@PersistenceContext</literal>, or using transactional events in servlet containers. For enterprise features such as these, you should really be looking at a Java EE application server."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Weld should be used as a web application library in a servlet container. You should place <literal>weld-servlet.jar</literal> in <literal>WEB-INF/lib</literal> in the web root. <literal>weld-servlet.jar</literal> is an &#34;uber-jar&#34;, meaning it bundles all the bits of Weld and CDI required for running in a servlet container, provided for your convenience. Alternatively, you could use its component jars:"
+msgid "Weld should be used as a web application library in a servlet container. You should place <literal>weld-servlet.jar</literal> in <literal>WEB-INF/lib</literal> in the web root. <literal>weld-servlet.jar</literal> is an \"uber-jar\", meaning it bundles all the bits of Weld and CDI required for running in a servlet container, provided for your convenience. Alternatively, you could use its component jars:"
 msgstr ""
 
 #. Tag: para
@@ -139,7 +139,7 @@
 
 #. Tag: para
 #, no-c-format
-msgid "Tomcat has a read-only JNDI, so Weld can&#39;t automatically bind the BeanManager extension SPI. To bind the BeanManager into JNDI, you should populate <literal>META-INF/context.xml</literal> in the web root with the following contents:"
+msgid "Tomcat has a read-only JNDI, so Weld can't automatically bind the BeanManager extension SPI. To bind the BeanManager into JNDI, you should populate <literal>META-INF/context.xml</literal> in the web root with the following contents:"
 msgstr ""
 
 #. Tag: para
@@ -164,12 +164,12 @@
 
 #. Tag: para
 #, no-c-format
-msgid "Like Tomcat, Jetty has a read-only JNDI, so Weld can&#39;t automatically bind the Manager. To bind the Manager to JNDI, you should populate <literal>WEB-INF/jetty-env.xml</literal> with the following contents:"
+msgid "Like Tomcat, Jetty has a read-only JNDI, so Weld can't automatically bind the Manager. To bind the Manager to JNDI, you should populate <literal>WEB-INF/jetty-env.xml</literal> with the following contents:"
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Notice that Jetty doesn&#39;t not have built-in support for an <literal>javax.naming.spi.ObjectFactory</literal> like Tomcat, so it&#39;s necessary to manually create the <literal>javax.naming.Reference</literal> to wrap around it."
+msgid "Notice that Jetty doesn't not have built-in support for an <literal>javax.naming.spi.ObjectFactory</literal> like Tomcat, so it's necessary to manually create the <literal>javax.naming.Reference</literal> to wrap around it."
 msgstr ""
 
 #. Tag: para
@@ -189,7 +189,7 @@
 
 #. Tag: para
 #, no-c-format
-msgid "In addition to improved integration of the Enterprise Java stack, the &#34;Contexts and Dependency Injection for the Java EE platform&#34; specification also defines a state of the art typesafe, stateful dependency injection framework, which can prove useful in a wide range of application types. To help developers take advantage of this, Weld provides a simple means for being executed in the Java Standard Edition (SE) environment independently of any Java EE APIs."
+msgid "In addition to improved integration of the Enterprise Java stack, the \"Contexts and Dependency Injection for the Java EE platform\" specification also defines a state of the art typesafe, stateful dependency injection framework, which can prove useful in a wide range of application types. To help developers take advantage of this, Weld provides a simple means for being executed in the Java Standard Edition (SE) environment independently of any Java EE APIs."
 msgstr ""
 
 #. Tag: para
@@ -259,7 +259,7 @@
 
 #. Tag: para
 #, no-c-format
-msgid "Here&#39;s an example of a simple CDI SE application:"
+msgid "Here's an example of a simple CDI SE application:"
 msgstr ""
 
 #. Tag: title
@@ -279,7 +279,7 @@
 
 #. Tag: para
 #, no-c-format
-msgid "Thanks to the power of CDI&#39;s typesafe event model, application developers need not write any bootstrapping code. The Weld SE module comes with a built-in main method which will bootstrap CDI for you and then fire a <literal>ContainerInitialized</literal> event. The entry point for your application code would therefore be a simple bean which observes the <literal>ContainerInitialized</literal> event, as in the previous example."
+msgid "Thanks to the power of CDI's typesafe event model, application developers need not write any bootstrapping code. The Weld SE module comes with a built-in main method which will bootstrap CDI for you and then fire a <literal>ContainerInitialized</literal> event. The entry point for your application code would therefore be a simple bean which observes the <literal>ContainerInitialized</literal> event, as in the previous example."
 msgstr ""
 
 #. Tag: para
@@ -294,12 +294,12 @@
 
 #. Tag: para
 #, no-c-format
-msgid "For added flexibility, CDI SE also comes with a bootstrap API which can be called from within your application in order to initialize CDI and obtain references to your application&#39;s beans and events. The API consists of two classes: <literal>Weld</literal> and <literal>WeldContainer</literal>."
+msgid "For added flexibility, CDI SE also comes with a bootstrap API which can be called from within your application in order to initialize CDI and obtain references to your application's beans and events. The API consists of two classes: <literal>Weld</literal> and <literal>WeldContainer</literal>."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Here&#39;s an example application main method which uses this API to initialize a bean of type <literal>MyApplicationBean</literal>."
+msgid "Here's an example application main method which uses this API to initialize a bean of type <literal>MyApplicationBean</literal>."
 msgstr ""
 
 #. Tag: para
@@ -319,7 +319,7 @@
 
 #. Tag: para
 #, no-c-format
-msgid "To use the @ThreadScoped annotation you need to enable the <literal>RunnableDecorator</literal> which &#39;listens&#39; for all executions of <literal>Runnable.run()</literal> and decorates them by setting up the thread context beforehand, bound to the current thread, and destroying the context afterwards."
+msgid "To use the @ThreadScoped annotation you need to enable the <literal>RunnableDecorator</literal> which 'listens' for all executions of <literal>Runnable.run()</literal> and decorates them by setting up the thread context beforehand, bound to the current thread, and destroying the context afterwards."
 msgstr ""
 
 #. Tag: para
@@ -334,6 +334,6 @@
 
 #. Tag: para
 #, no-c-format
-msgid "Weld SE comes packaged as a &#39;shaded&#39; jar which includes the CDI API, Weld Core and all dependant classes bundled into a single jar. Therefore the only Weld jar you need on the classpath, in addition to your application&#39;s classes and dependant jars, is the Weld SE jar."
+msgid "Weld SE comes packaged as a 'shaded' jar which includes the CDI API, Weld Core and all dependant classes bundled into a single jar. Therefore the only Weld jar you need on the classpath, in addition to your application's classes and dependant jars, is the Weld SE jar."
 msgstr ""
 

Modified: doc/trunk/reference/pot/events.pot
===================================================================
--- doc/trunk/reference/pot/events.pot	2010-07-24 16:36:48 UTC (rev 6808)
+++ doc/trunk/reference/pot/events.pot	2010-07-25 04:22:37 UTC (rev 6809)
@@ -4,8 +4,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: 0\n"
-"POT-Creation-Date: 2010-05-01T14:44:09\n"
-"PO-Revision-Date: 2010-05-01T14:44:09\n"
+"POT-Creation-Date: 2010-07-25T03:52:14\n"
+"PO-Revision-Date: 2010-07-25T03:52:14\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: None\n"
 "MIME-Version: 1.0\n"
@@ -34,7 +34,7 @@
 
 #. Tag: para
 #, no-c-format
-msgid "observers can specify a combination of &#34;selectors&#34; to narrow the set of event notifications they will receive, and"
+msgid "observers can specify a combination of \"selectors\" to narrow the set of event notifications they will receive, and"
 msgstr ""
 
 #. Tag: para
@@ -44,7 +44,7 @@
 
 #. Tag: para
 #, no-c-format
-msgid "The CDI event notification facility uses more or less the same typesafe approach that we&#39;ve already seen with the dependency injection service."
+msgid "The CDI event notification facility uses more or less the same typesafe approach that we've already seen with the dependency injection service."
 msgstr ""
 
 #. Tag: title
@@ -59,7 +59,7 @@
 
 #. Tag: para
 #, no-c-format
-msgid "An event qualifier is just a normal qualifier, defined using <literal>@Qualifier</literal>. Here&#39;s an example:"
+msgid "An event qualifier is just a normal qualifier, defined using <literal>@Qualifier</literal>. Here's an example:"
 msgstr ""
 
 #. Tag: title
@@ -79,7 +79,7 @@
 
 #. Tag: para
 #, no-c-format
-msgid "An observer method need not specify any event qualifiers—in this case it is interested in <emphasis>all</emphasis> events of a particular type. If it does specify qualifiers, it&#39;s only interested in events which have those qualifiers."
+msgid "An observer method need not specify any event qualifiers—in this case it is interested in <emphasis>all</emphasis> events of a particular type. If it does specify qualifiers, it's only interested in events which have those qualifiers."
 msgstr ""
 
 #. Tag: para
@@ -159,7 +159,7 @@
 
 #. Tag: para
 #, no-c-format
-msgid "The downside of annotating the injection point is that we can&#39;t specify the qualifier dynamically. CDI lets us obtain a qualifier instance by subclassing the helper class <literal>AnnotationLiteral</literal>. That way, we can pass the qualifier to the <literal>select()</literal> method of <literal>Event</literal>."
+msgid "The downside of annotating the injection point is that we can't specify the qualifier dynamically. CDI lets us obtain a qualifier instance by subclassing the helper class <literal>AnnotationLiteral</literal>. That way, we can pass the qualifier to the <literal>select()</literal> method of <literal>Event</literal>."
 msgstr ""
 
 #. Tag: para
@@ -174,7 +174,7 @@
 
 #. Tag: para
 #, no-c-format
-msgid "By default, if there is no instance of an observer in the current context, the container will instantiate the observer in order to deliver an event to it. This behavior isn&#39;t always desirable. We may want to deliver events only to instances of the observer that already exist in the current contexts."
+msgid "By default, if there is no instance of an observer in the current context, the container will instantiate the observer in order to deliver an event to it. This behavior isn't always desirable. We may want to deliver events only to instances of the observer that already exist in the current contexts."
 msgstr ""
 
 #. Tag: para

Modified: doc/trunk/reference/pot/example.pot
===================================================================
--- doc/trunk/reference/pot/example.pot	2010-07-24 16:36:48 UTC (rev 6808)
+++ doc/trunk/reference/pot/example.pot	2010-07-25 04:22:37 UTC (rev 6809)
@@ -4,8 +4,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: 0\n"
-"POT-Creation-Date: 2010-05-01T14:44:09\n"
-"PO-Revision-Date: 2010-05-01T14:44:09\n"
+"POT-Creation-Date: 2010-07-25T03:52:14\n"
+"PO-Revision-Date: 2010-07-25T03:52:14\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: None\n"
 "MIME-Version: 1.0\n"
@@ -19,7 +19,7 @@
 
 #. Tag: para
 #, no-c-format
-msgid "Let&#39;s illustrate these ideas with a full example. We&#39;re going to implement user login/logout for an application that uses JSF. First, we&#39;ll define a request-scoped bean to hold the username and password entered during login, with constraints defined using annotations from the Bean Validation specification:"
+msgid "Let's illustrate these ideas with a full example. We're going to implement user login/logout for an application that uses JSF. First, we'll define a request-scoped bean to hold the username and password entered during login, with constraints defined using annotations from the Bean Validation specification:"
 msgstr ""
 
 #. Tag: para
@@ -34,7 +34,7 @@
 
 #. Tag: para
 #, no-c-format
-msgid "(Note that we&#39;re also going to need a <literal>persistence.xml</literal> file to configure the JPA persistence unit containing <literal>User</literal>.)"
+msgid "(Note that we're also going to need a <literal>persistence.xml</literal> file to configure the JPA persistence unit containing <literal>User</literal>.)"
 msgstr ""
 
 #. Tag: para
@@ -64,6 +64,6 @@
 
 #. Tag: para
 #, no-c-format
-msgid "Hopefully, this example gave you a taste of the CDI programming model. In the next chapter, we&#39;ll explore dependency injection in greater depth."
+msgid "Hopefully, this example gave you a taste of the CDI programming model. In the next chapter, we'll explore dependency injection in greater depth."
 msgstr ""
 

Modified: doc/trunk/reference/pot/extend.pot
===================================================================
--- doc/trunk/reference/pot/extend.pot	2010-07-24 16:36:48 UTC (rev 6808)
+++ doc/trunk/reference/pot/extend.pot	2010-07-25 04:22:37 UTC (rev 6809)
@@ -4,8 +4,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: 0\n"
-"POT-Creation-Date: 2010-05-01T14:44:09\n"
-"PO-Revision-Date: 2010-05-01T14:44:09\n"
+"POT-Creation-Date: 2010-07-25T03:52:14\n"
+"PO-Revision-Date: 2010-07-25T03:52:14\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: None\n"
 "MIME-Version: 1.0\n"
@@ -74,7 +74,7 @@
 
 #. Tag: para
 #, no-c-format
-msgid "The first step in creating a portable extension is to write a class that implements <literal>Extension</literal>. This marker interface does not define any methods, but it&#39;s needed to satisfy the requirements of Java SE&#39;s service provider architecture."
+msgid "The first step in creating a portable extension is to write a class that implements <literal>Extension</literal>. This marker interface does not define any methods, but it's needed to satisfy the requirements of Java SE's service provider architecture."
 msgstr ""
 
 #. Tag: para
@@ -139,7 +139,7 @@
 
 #. Tag: para
 #, no-c-format
-msgid "In fact, the extension can do a lot more than just observe. The extension is permitted to modify the container&#39;s metamodel and more. Here&#39;s a very simple example:"
+msgid "In fact, the extension can do a lot more than just observe. The extension is permitted to modify the container's metamodel and more. Here's a very simple example:"
 msgstr ""
 
 #. Tag: para
@@ -169,7 +169,7 @@
 
 #. Tag: para
 #, no-c-format
-msgid "Let&#39;s study some of the interfaces exposed by the <literal>BeanManager</literal>."
+msgid "Let's study some of the interfaces exposed by the <literal>BeanManager</literal>."
 msgstr ""
 
 #. Tag: title
@@ -204,7 +204,7 @@
 
 #. Tag: para
 #, no-c-format
-msgid "There&#39;s an easy way to find out what beans exist in the application:"
+msgid "There's an easy way to find out what beans exist in the application:"
 msgstr ""
 
 #. Tag: para
@@ -224,7 +224,7 @@
 
 #. Tag: para
 #, no-c-format
-msgid "In this example, we make a framework class, <literal>SecurityManager</literal> available for injection. To make things a bit more interesting, we&#39;re going to delegate back to the container&#39;s <literal>InjectionTarget</literal> to perform instantiation and injection upon the <literal>SecurityManager</literal> instance."
+msgid "In this example, we make a framework class, <literal>SecurityManager</literal> available for injection. To make things a bit more interesting, we're going to delegate back to the container's <literal>InjectionTarget</literal> to perform instantiation and injection upon the <literal>SecurityManager</literal> instance."
 msgstr ""
 
 #. Tag: para
@@ -244,12 +244,12 @@
 
 #. Tag: para
 #, no-c-format
-msgid "Let&#39;s start with an example of an extension that provides support for the use of <literal>@Named</literal> at the package level. The package-level name is used to qualify the EL names of all beans defined in that package. The portable extension uses the <literal>ProcessAnnotatedType</literal> event to wrap the <literal>AnnotatedType</literal> object and override the <literal>value()</literal> of the <literal>@Named</literal> annotation."
+msgid "Let's start with an example of an extension that provides support for the use of <literal>@Named</literal> at the package level. The package-level name is used to qualify the EL names of all beans defined in that package. The portable extension uses the <literal>ProcessAnnotatedType</literal> event to wrap the <literal>AnnotatedType</literal> object and override the <literal>value()</literal> of the <literal>@Named</literal> annotation."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Here&#39;s a second example, which adds the <literal>@Alternative</literal> annotation to any class which implements a certain <literal>Service</literal> interface."
+msgid "Here's a second example, which adds the <literal>@Alternative</literal> annotation to any class which implements a certain <literal>Service</literal> interface."
 msgstr ""
 
 #. Tag: para
@@ -269,7 +269,7 @@
 
 #. Tag: para
 #, no-c-format
-msgid "Here&#39;s a CDI portable extension that reads values from properties files and configures fields of Java EE components, including servlets, EJBs, managed beans, interceptors and more. In this example, properties for a class such as <literal>org.mydomain.blog.Blogger</literal> go in a resource named <literal>org/mydomain/blog/Blogger.properties</literal>, and the name of a property must match the name of the field to be configured. So <literal>Blogger.properties</literal> could contain:"
+msgid "Here's a CDI portable extension that reads values from properties files and configures fields of Java EE components, including servlets, EJBs, managed beans, interceptors and more. In this example, properties for a class such as <literal>org.mydomain.blog.Blogger</literal> go in a resource named <literal>org/mydomain/blog/Blogger.properties</literal>, and the name of a property must match the name of the field to be configured. So <literal>Blogger.properties</literal> could contain:"
 msgstr ""
 
 #. Tag: para
@@ -279,7 +279,7 @@
 
 #. Tag: para
 #, no-c-format
-msgid "There&#39;s a lot more to the portable extension SPI than what we&#39;ve discussed here. Check out the CDI spec or Javadoc for more information. For now, we&#39;ll just mention one more extension point."
+msgid "There's a lot more to the portable extension SPI than what we've discussed here. Check out the CDI spec or Javadoc for more information. For now, we'll just mention one more extension point."
 msgstr ""
 
 #. Tag: title

Modified: doc/trunk/reference/pot/extensions.pot
===================================================================
--- doc/trunk/reference/pot/extensions.pot	2010-07-24 16:36:48 UTC (rev 6808)
+++ doc/trunk/reference/pot/extensions.pot	2010-07-25 04:22:37 UTC (rev 6809)
@@ -4,8 +4,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: 0\n"
-"POT-Creation-Date: 2010-05-01T14:44:09\n"
-"PO-Revision-Date: 2010-05-01T14:44:09\n"
+"POT-Creation-Date: 2010-07-25T03:52:14\n"
+"PO-Revision-Date: 2010-07-25T03:52:14\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: None\n"
 "MIME-Version: 1.0\n"
@@ -44,6 +44,6 @@
 
 #. Tag: para
 #, no-c-format
-msgid "If you are using Weld as your JSR-299 implementation, there&#39;s no need to include sl4j as it&#39;s already included (and used internally)."
+msgid "If you are using Weld as your JSR-299 implementation, there's no need to include sl4j as it's already included (and used internally)."
 msgstr ""
 

Modified: doc/trunk/reference/pot/gettingstarted.pot
===================================================================
--- doc/trunk/reference/pot/gettingstarted.pot	2010-07-24 16:36:48 UTC (rev 6808)
+++ doc/trunk/reference/pot/gettingstarted.pot	2010-07-25 04:22:37 UTC (rev 6809)
@@ -4,8 +4,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: 0\n"
-"POT-Creation-Date: 2010-05-01T14:44:09\n"
-"PO-Revision-Date: 2010-05-01T14:44:09\n"
+"POT-Creation-Date: 2010-07-25T03:52:14\n"
+"PO-Revision-Date: 2010-07-25T03:52:14\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: None\n"
 "MIME-Version: 1.0\n"
@@ -34,7 +34,7 @@
 
 #. Tag: para
 #, no-c-format
-msgid "To run the examples with the provided build scripts, you&#39;ll need the following:"
+msgid "To run the examples with the provided build scripts, you'll need the following:"
 msgstr ""
 
 #. Tag: para
@@ -79,12 +79,12 @@
 
 #. Tag: para
 #, no-c-format
-msgid "You&#39;ll need a full install of Ant 1.7.0. Some linux distributions only supply a partial installation of Ant which cause the build to fail. If you encounter problems, verify that ant-nodeps.jar is on the classpath."
+msgid "You'll need a full install of Ant 1.7.0. Some linux distributions only supply a partial installation of Ant which cause the build to fail. If you encounter problems, verify that ant-nodeps.jar is on the classpath."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "In the next few sections, you&#39;ll be using the Ant command (<literal>ant</literal>) to invoke the Ant build script in each example to compile, assemble and deploy the example to JBoss AS and, for the war example, Apache Tomcat. You can also deploy the generated artifact (war or ear) to any other container that supports Java EE 6, such as GlassFish 3."
+msgid "In the next few sections, you'll be using the Ant command (<literal>ant</literal>) to invoke the Ant build script in each example to compile, assemble and deploy the example to JBoss AS and, for the war example, Apache Tomcat. You can also deploy the generated artifact (war or ear) to any other container that supports Java EE 6, such as GlassFish 3."
 msgstr ""
 
 #. Tag: para
@@ -94,7 +94,7 @@
 
 #. Tag: para
 #, no-c-format
-msgid "The sections below cover the steps for deploying with both Ant and Maven in detail. Let&#39;s start with JBoss AS."
+msgid "The sections below cover the steps for deploying with both Ant and Maven in detail. Let's start with JBoss AS."
 msgstr ""
 
 #. Tag: title
@@ -104,12 +104,12 @@
 
 #. Tag: para
 #, no-c-format
-msgid "To deploy the examples to JBoss AS, you&#39;ll need <ulink url=\"http://jboss.org/jbossas/\">JBoss AS 6.0.0</ulink> or above. If a release of the JBoss AS 6.0 line isn&#39;t yet available, you can download a <ulink url=\"http://hudson.jboss.org/hudson/view/JBoss%20AS/job/JBoss-AS-6.0.x/\">nightly snapshot</ulink>. The reason JBoss AS 6.0.0 or above is required is because it&#39;s the first release that has both CDI and Bean Validation support built-in, making it close enough to Java EE 6 to run the examples. The good news is that there are no additional modifications you have to make to the server. It&#39;s ready to go!"
+msgid "To deploy the examples to JBoss AS, you'll need <ulink url=\"http://jboss.org/jbossas/\">JBoss AS 6.0.0</ulink> or above. If a release of the JBoss AS 6.0 line isn't yet available, you can download a <ulink url=\"http://hudson.jboss.org/hudson/view/JBoss%20AS/job/JBoss-AS-6.0.x/\">nightly snapshot</ulink>. The reason JBoss AS 6.0.0 or above is required is because it's the first release that has both CDI and Bean Validation support built-in, making it close enough to Java EE 6 to run the examples. The good news is that there are no additional modifications you have to make to the server. It's ready to go!"
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "After you have downloaded JBoss AS, extract it. (We recommended renaming the folder to include the <literal>as</literal> qualifier so it&#39;s clear that it&#39;s the application server). You can move the extracted folder anywhere you like. Wherever it lays to rest, that&#39;s what we&#39;ll call the JBoss AS installation directory, or <literal>JBOSS_HOME</literal>."
+msgid "After you have downloaded JBoss AS, extract it. (We recommended renaming the folder to include the <literal>as</literal> qualifier so it's clear that it's the application server). You can move the extracted folder anywhere you like. Wherever it lays to rest, that's what we'll call the JBoss AS installation directory, or <literal>JBOSS_HOME</literal>."
 msgstr ""
 
 #. Tag: para
@@ -119,7 +119,7 @@
 
 #. Tag: para
 #, no-c-format
-msgid "You&#39;re now ready to deploy your first example!"
+msgid "You're now ready to deploy your first example!"
 msgstr ""
 
 #. Tag: para
@@ -129,7 +129,7 @@
 
 #. Tag: para
 #, no-c-format
-msgid "If you haven&#39;t already, start JBoss AS. You can either start JBoss AS from a Linux shell:"
+msgid "If you haven't already, start JBoss AS. You can either start JBoss AS from a Linux shell:"
 msgstr ""
 
 #. Tag: para
@@ -189,12 +189,12 @@
 
 #. Tag: para
 #, no-c-format
-msgid "The translator uses session beans, which are packaged in an EJB module within an ear. Java EE 6 will allow session beans to be deployed in war modules, but that&#39;s a topic for a later chapter."
+msgid "The translator uses session beans, which are packaged in an EJB module within an ear. Java EE 6 will allow session beans to be deployed in war modules, but that's a topic for a later chapter."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Again, wait a few seconds for the application to deploy (if you&#39;re really bored, read the log messages), and visit <ulink url=\"http://localhost:8080/weld-translator\">http://localhost:8080/weld-translator</ulink> to begin pseudo-translating."
+msgid "Again, wait a few seconds for the application to deploy (if you're really bored, read the log messages), and visit <ulink url=\"http://localhost:8080/weld-translator\">http://localhost:8080/weld-translator</ulink> to begin pseudo-translating."
 msgstr ""
 
 #. Tag: title
@@ -204,27 +204,27 @@
 
 #. Tag: para
 #, no-c-format
-msgid "Deploying to GlassFish should be easy and familiar, right? After all, it&#39;s the Java EE 6 reference implementation and Weld is the JSR-299 reference implementation, meaning Weld gets bundled with GlassFish. So yes, it&#39;s all quite easy and familiar."
+msgid "Deploying to GlassFish should be easy and familiar, right? After all, it's the Java EE 6 reference implementation and Weld is the JSR-299 reference implementation, meaning Weld gets bundled with GlassFish. So yes, it's all quite easy and familiar."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "To deploy the examples to GlassFish, you&#39;ll need the final <ulink url=\"https://glassfish.dev.java.net/downloads/v3-final.html\">GlassFish V3</ulink> release. Select the release that ends in either <literal>-unix.sh</literal> or <literal>-windows.exe</literal> depending on your platform. After the download is complete, execute the installer. On Linux/Unix, you&#39;ll need to first make the script executable."
+msgid "To deploy the examples to GlassFish, you'll need the final <ulink url=\"https://glassfish.dev.java.net/downloads/v3-final.html\">GlassFish V3</ulink> release. Select the release that ends in either <literal>-unix.sh</literal> or <literal>-windows.exe</literal> depending on your platform. After the download is complete, execute the installer. On Linux/Unix, you'll need to first make the script executable."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "On Windows you can just click on the executable. Follow the instructions in the installer. It will create a single domain named <literal>domain1</literal>. You&#39;ll use that domain to deploy the example. We recommend that you choose <literal>7070</literal> as the main HTTP port to avoid conflicts with a running instance of JBoss AS (or Apache Tomcat)."
+msgid "On Windows you can just click on the executable. Follow the instructions in the installer. It will create a single domain named <literal>domain1</literal>. You'll use that domain to deploy the example. We recommend that you choose <literal>7070</literal> as the main HTTP port to avoid conflicts with a running instance of JBoss AS (or Apache Tomcat)."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "If you&#39;ve deployed either of the starter examples, <literal>weld-numberguess</literal> or <literal>weld-translator</literal>, to JBoss AS, then you already have the deployable artifact you need. If not, switch to either of the two directories and build it."
+msgid "If you've deployed either of the starter examples, <literal>weld-numberguess</literal> or <literal>weld-translator</literal>, to JBoss AS, then you already have the deployable artifact you need. If not, switch to either of the two directories and build it."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "The deployable archive for the <literal>weld-numberguess</literal>, named <literal>weld-numberguess.war</literal>, ends up in the example&#39;s <literal>target</literal> directory. The archive for the <literal>weld-translator</literal> example, named <literal>weld-translator.ear</literal>, ends up in the example&#39;s <literal>ear/target</literal> directory. All you need to do now is deploy them to GlassFish."
+msgid "The deployable archive for the <literal>weld-numberguess</literal>, named <literal>weld-numberguess.war</literal>, ends up in the example's <literal>target</literal> directory. The archive for the <literal>weld-translator</literal> example, named <literal>weld-translator.ear</literal>, ends up in the example's <literal>ear/target</literal> directory. All you need to do now is deploy them to GlassFish."
 msgstr ""
 
 #. Tag: para
@@ -234,7 +234,7 @@
 
 #. Tag: para
 #, no-c-format
-msgid "After a few seconds you can visit the Admin Console in the browser at the URL <ulink url=\"http://localhost:4848\">http://localhost:4848</ulink>. In the tree on the left-hand side of the page, click on &#34;Applications&#34;, then click on the &#34;Deploy...&#34; button under the heading &#34;Applications&#34; and select the deployable artifact for either of the two examples. The deployer should recognize that you have selected a Java EE artifact and allow you to start it. You can see the examples running at either <ulink url=\"http://localhost:7070/weld-numberguess\">http://localhost:7070/weld-numberguess</ulink> or <ulink url=\"http://localhost:7070/weld-translator\">http://localhost:7070/weld-translator</ulink>, depending on which example you deployed."
+msgid "After a few seconds you can visit the Admin Console in the browser at the URL <ulink url=\"http://localhost:4848\">http://localhost:4848</ulink>. In the tree on the left-hand side of the page, click on \"Applications\", then click on the \"Deploy...\" button under the heading \"Applications\" and select the deployable artifact for either of the two examples. The deployer should recognize that you have selected a Java EE artifact and allow you to start it. You can see the examples running at either <ulink url=\"http://localhost:7070/weld-numberguess\">http://localhost:7070/weld-numberguess</ulink> or <ulink url=\"http://localhost:7070/weld-translator\">http://localhost:7070/weld-translator</ulink>, depending on which example you deployed."
 msgstr ""
 
 #. Tag: para
@@ -259,17 +259,17 @@
 
 #. Tag: para
 #, no-c-format
-msgid "Weld comes with a servlet listener which bootstraps the CDI environment, registers the <literal>BeanManager</literal> in JNDI and provides injection into servlets. Basically, it emulates some of the work done by the Java EE container. (But you don&#39;t get enterprise features such as session beans and container-managed transactions.)"
+msgid "Weld comes with a servlet listener which bootstraps the CDI environment, registers the <literal>BeanManager</literal> in JNDI and provides injection into servlets. Basically, it emulates some of the work done by the Java EE container. (But you don't get enterprise features such as session beans and container-managed transactions.)"
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Let&#39;s give the Weld servlet extension a spin on Apache Tomcat. First, you&#39;ll need to download Tomcat 6.0.18 or later from <ulink url=\"http://tomcat.apache.org/download-60.cgi\">tomcat.apache.org</ulink> and extract it."
+msgid "Let's give the Weld servlet extension a spin on Apache Tomcat. First, you'll need to download Tomcat 6.0.18 or later from <ulink url=\"http://tomcat.apache.org/download-60.cgi\">tomcat.apache.org</ulink> and extract it."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "You have two choices for how you can deploy the application to Tomcat. You can deploy it by pushing the artifact to the hot deploy directory using Ant or you can deploy to the server across HTTP using a Maven plugin. The Ant approach doesn&#39;t require that you have Maven installed, so we&#39;ll start there. If you want to use Maven, you can just skip ahead."
+msgid "You have two choices for how you can deploy the application to Tomcat. You can deploy it by pushing the artifact to the hot deploy directory using Ant or you can deploy to the server across HTTP using a Maven plugin. The Ant approach doesn't require that you have Maven installed, so we'll start there. If you want to use Maven, you can just skip ahead."
 msgstr ""
 
 #. Tag: title
@@ -279,12 +279,12 @@
 
 #. Tag: para
 #, no-c-format
-msgid "In order for Ant to push the artifact to the Tomcat hot deploy directory, it needs to know where the Tomcat installation is located. Again, we need to set a property in the <literal>local.build.properties</literal> file in the examples directory of the Weld distribution. If you haven&#39;t yet created this file, do so now. Then assign the path of your Tomcat installation to the property key <literal>tomcat.home</literal>."
+msgid "In order for Ant to push the artifact to the Tomcat hot deploy directory, it needs to know where the Tomcat installation is located. Again, we need to set a property in the <literal>local.build.properties</literal> file in the examples directory of the Weld distribution. If you haven't yet created this file, do so now. Then assign the path of your Tomcat installation to the property key <literal>tomcat.home</literal>."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Now you&#39;re ready to deploy the numberguess example to Tomcat!"
+msgid "Now you're ready to deploy the numberguess example to Tomcat!"
 msgstr ""
 
 #. Tag: para
@@ -294,7 +294,7 @@
 
 #. Tag: para
 #, no-c-format
-msgid "The Ant build script includes additional targets for Tomcat to deploy and undeploy the archive in either exploded or packaged format. They are the same target names used for JBoss AS, prefixed with &#34;tomcat.&#34;."
+msgid "The Ant build script includes additional targets for Tomcat to deploy and undeploy the archive in either exploded or packaged format. They are the same target names used for JBoss AS, prefixed with \"tomcat.\"."
 msgstr ""
 
 #. Tag: para
@@ -319,7 +319,7 @@
 
 #. Tag: para
 #, no-c-format
-msgid "If you haven&#39;t already, start Tomcat. You can either start Tomcat from a Linux shell:"
+msgid "If you haven't already, start Tomcat. You can either start Tomcat from a Linux shell:"
 msgstr ""
 
 #. Tag: para
@@ -334,12 +334,12 @@
 
 #. Tag: para
 #, no-c-format
-msgid "You can also deploy the application to Tomcat using Maven. This section is a bit more advanced, so skip it unless you&#39;re itching to use Maven natively. Of course, you&#39;ll first need to make sure that you have Maven installed on your path, similar to how you setup Ant."
+msgid "You can also deploy the application to Tomcat using Maven. This section is a bit more advanced, so skip it unless you're itching to use Maven natively. Of course, you'll first need to make sure that you have Maven installed on your path, similar to how you setup Ant."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "The Maven plugin communicates with Tomcat over HTTP, so it doesn&#39;t care where you have installed Tomcat. However, the plugin configuration assumes you are running Tomcat in its default configuration, with a hostname of localhost and port <literal>8080</literal>. The <literal>readme.txt</literal> file in the example directory has information about how to modify the Maven settings to accommodate a different setup."
+msgid "The Maven plugin communicates with Tomcat over HTTP, so it doesn't care where you have installed Tomcat. However, the plugin configuration assumes you are running Tomcat in its default configuration, with a hostname of localhost and port <literal>8080</literal>. The <literal>readme.txt</literal> file in the example directory has information about how to modify the Maven settings to accommodate a different setup."
 msgstr ""
 
 #. Tag: para
@@ -374,7 +374,7 @@
 
 #. Tag: para
 #, no-c-format
-msgid "There are several other Maven goals that you can use if you are hacking on the example, which are documented in the example&#39;s <literal>readme.txt</literal> file."
+msgid "There are several other Maven goals that you can use if you are hacking on the example, which are documented in the example's <literal>readme.txt</literal> file."
 msgstr ""
 
 #. Tag: title
@@ -389,12 +389,12 @@
 
 #. Tag: para
 #, no-c-format
-msgid "If you&#39;ve read through the entire Tomcat section, then you&#39;re all ready to go. The Maven build parallels the embedded Tomcat deployment. If not, don&#39;t worry. We&#39;ll still go over everything that you need to know again in this section."
+msgid "If you've read through the entire Tomcat section, then you're all ready to go. The Maven build parallels the embedded Tomcat deployment. If not, don't worry. We'll still go over everything that you need to know again in this section."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "The Maven POM (<literal>pom.xml</literal>) includes a profile named <literal>jetty</literal> that activates the Maven Jetty plugin, which you can use to start Jetty in embedded mode and deploy the application in place. You don&#39;t need anything else installed except to have the Maven command (<literal>mvn</literal>) on your path. The rest will be downloaded from the internet when the build is run."
+msgid "The Maven POM (<literal>pom.xml</literal>) includes a profile named <literal>jetty</literal> that activates the Maven Jetty plugin, which you can use to start Jetty in embedded mode and deploy the application in place. You don't need anything else installed except to have the Maven command (<literal>mvn</literal>) on your path. The rest will be downloaded from the internet when the build is run."
 msgstr ""
 
 #. Tag: para
@@ -434,7 +434,7 @@
 
 #. Tag: para
 #, no-c-format
-msgid "Now, you are ready to run the server in Eclipse. Import the project into your Eclipse workspace using &#34;Import Existing Project into Workspace. Then, find the start class in <literal>src/jetty/java</literal> and run its main method as a Java Application. Jetty will launch. You can view the application at the following local URL: <ulink url=\"http://localhost:8080\">http://localhost:8080</ulink>. Pay particular attention to the port in the URL and the lack of a trailing context path."
+msgid "Now, you are ready to run the server in Eclipse. Import the project into your Eclipse workspace using \"Import Existing Project into Workspace. Then, find the start class in <literal>src/jetty/java</literal> and run its main method as a Java Application. Jetty will launch. You can view the application at the following local URL: <ulink url=\"http://localhost:8080\">http://localhost:8080</ulink>. Pay particular attention to the port in the URL and the lack of a trailing context path."
 msgstr ""
 
 #. Tag: para

Modified: doc/trunk/reference/pot/injection.pot
===================================================================
--- doc/trunk/reference/pot/injection.pot	2010-07-24 16:36:48 UTC (rev 6808)
+++ doc/trunk/reference/pot/injection.pot	2010-07-25 04:22:37 UTC (rev 6809)
@@ -4,8 +4,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: 0\n"
-"POT-Creation-Date: 2010-05-01T14:44:09\n"
-"PO-Revision-Date: 2010-05-01T14:44:09\n"
+"POT-Creation-Date: 2010-07-25T03:52:14\n"
+"PO-Revision-Date: 2010-07-25T03:52:14\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: None\n"
 "MIME-Version: 1.0\n"
@@ -79,7 +79,7 @@
 
 #. Tag: para
 #, no-c-format
-msgid "Next, the container calls all initializer methods of bean (the call order is not portable, don&#39;t rely on it)."
+msgid "Next, the container calls all initializer methods of bean (the call order is not portable, don't rely on it)."
 msgstr ""
 
 #. Tag: para
@@ -104,7 +104,7 @@
 
 #. Tag: para
 #, no-c-format
-msgid "This is a case where the <literal>@Inject</literal> annotation <emphasis>is not</emphasis> required at the injection point. The same is true for observer methods (which we&#39;ll meet in <xref linkend=\"events\" />) and disposer methods."
+msgid "This is a case where the <literal>@Inject</literal> annotation <emphasis>is not</emphasis> required at the injection point. The same is true for observer methods (which we'll meet in <xref linkend=\"events\" />) and disposer methods."
 msgstr ""
 
 #. Tag: title
@@ -114,7 +114,7 @@
 
 #. Tag: para
 #, no-c-format
-msgid "The CDI specification defines a procedure, called <emphasis>typesafe resolution</emphasis>, that the container follows when identifying the bean to inject to an injection point. This algorithm looks complex at first, but once you understand it, it&#39;s really quite intuitive. Typesafe resolution is performed at system initialization time, which means that the container will inform the developer immediately if a bean&#39;s dependencies cannot be satisfied."
+msgid "The CDI specification defines a procedure, called <emphasis>typesafe resolution</emphasis>, that the container follows when identifying the bean to inject to an injection point. This algorithm looks complex at first, but once you understand it, it's really quite intuitive. Typesafe resolution is performed at system initialization time, which means that the container will inform the developer immediately if a bean's dependencies cannot be satisfied."
 msgstr ""
 
 #. Tag: para
@@ -139,12 +139,12 @@
 
 #. Tag: para
 #, no-c-format
-msgid "Obviously, if you have exactly one bean of a given type, and an injection point with that same type, then bean A is going to go into slot A. That&#39;s the simplest possible scenario. When you first start your application, you&#39;ll likely have lots of those."
+msgid "Obviously, if you have exactly one bean of a given type, and an injection point with that same type, then bean A is going to go into slot A. That's the simplest possible scenario. When you first start your application, you'll likely have lots of those."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "But then, things start to get complicated. Let&#39;s explore how the container determines which bean to inject in more advanced cases. We&#39;ll start by taking a closer look at qualifiers."
+msgid "But then, things start to get complicated. Let's explore how the container determines which bean to inject in more advanced cases. We'll start by taking a closer look at qualifiers."
 msgstr ""
 
 #. Tag: title
@@ -194,7 +194,7 @@
 
 #. Tag: para
 #, no-c-format
-msgid "Now, you may be thinking, <emphasis>&#34;What&#39;s the different between using a qualifier and just specifying the exact implementation class you want?&#34;</emphasis> It&#39;s important to understand that a qualifier is like an extension of the interface. It does not create a direct dependency to any particular implementation. There may be multiple alterative implementations of <literal>@Asynchronous PaymentProcessor</literal>!"
+msgid "Now, you may be thinking, <emphasis>\"What's the different between using a qualifier and just specifying the exact implementation class you want?\"</emphasis> It's important to understand that a qualifier is like an extension of the interface. It does not create a direct dependency to any particular implementation. There may be multiple alterative implementations of <literal>@Asynchronous PaymentProcessor</literal>!"
 msgstr ""
 
 #. Tag: title
@@ -204,7 +204,7 @@
 
 #. Tag: para
 #, no-c-format
-msgid "Whenever a bean or injection point does not explicitly declare a qualifier, the container assumes the qualifier <literal>@Default</literal>. From time to time, you&#39;ll need to decare an injection point without specifying a qualifier. There&#39;s a qualifier for that too. All beans have the qualifier <literal>@Any</literal>. Therefore, by explicitly specifying <literal>@Any</literal> at an injection point, you suppress the default qualifier, without otherwise restricting the beans that are eligible for injection."
+msgid "Whenever a bean or injection point does not explicitly declare a qualifier, the container assumes the qualifier <literal>@Default</literal>. From time to time, you'll need to decare an injection point without specifying a qualifier. There's a qualifier for that too. All beans have the qualifier <literal>@Any</literal>. Therefore, by explicitly specifying <literal>@Any</literal> at an injection point, you suppress the default qualifier, without otherwise restricting the beans that are eligible for injection."
 msgstr ""
 
 #. Tag: para
@@ -264,7 +264,7 @@
 
 #. Tag: para
 #, no-c-format
-msgid "When an ambiguous dependency exists at an injection point, the container attempts to resolve the ambiguity by looking for an enabled alternative among the beans that could be injected. If there is exactly one enabled alternative, that&#39;s the bean that will be injected."
+msgid "When an ambiguous dependency exists at an injection point, the container attempts to resolve the ambiguity by looking for an enabled alternative among the beans that could be injected. If there is exactly one enabled alternative, that's the bean that will be injected."
 msgstr ""
 
 #. Tag: title
@@ -279,7 +279,7 @@
 
 #. Tag: para
 #, no-c-format
-msgid "During the course of your development, you&#39;re going to encounter this situation. Let&#39;s learn how to resolve it."
+msgid "During the course of your development, you're going to encounter this situation. Let's learn how to resolve it."
 msgstr ""
 
 #. Tag: para
@@ -334,17 +334,17 @@
 
 #. Tag: para
 #, no-c-format
-msgid "Just remember: &#34;There can be only one.&#34;"
+msgid "Just remember: \"There can be only one.\""
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "On the other hand, if you really do have an optional or multivalued injection point, you should change the type of your injection point to <literal>Instance</literal>, as we&#39;ll see in <xref linkend=\"lookup\" />."
+msgid "On the other hand, if you really do have an optional or multivalued injection point, you should change the type of your injection point to <literal>Instance</literal>, as we'll see in <xref linkend=\"lookup\" />."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Now there&#39;s one more issue you need to be aware of when using the dependency injection service."
+msgid "Now there's one more issue you need to be aware of when using the dependency injection service."
 msgstr ""
 
 #. Tag: title
@@ -384,7 +384,7 @@
 
 #. Tag: para
 #, no-c-format
-msgid "classes which don&#39;t have a non-private constructor with no parameters, and"
+msgid "classes which don't have a non-private constructor with no parameters, and"
 msgstr ""
 
 #. Tag: para
@@ -399,7 +399,7 @@
 
 #. Tag: para
 #, no-c-format
-msgid "It&#39;s usually very easy to fix an unproxyable dependency problem. If an injection point of type <literal>X</literal> results in an unproxyable dependency, simply:"
+msgid "It's usually very easy to fix an unproxyable dependency problem. If an injection point of type <literal>X</literal> results in an unproxyable dependency, simply:"
 msgstr ""
 
 #. Tag: para
@@ -409,7 +409,7 @@
 
 #. Tag: para
 #, no-c-format
-msgid "change the type of the injection point to <literal>Instance&#60;X&#62;</literal>,"
+msgid "change the type of the injection point to <literal>Instance&lt;X&gt;</literal>,"
 msgstr ""
 
 #. Tag: para
@@ -439,7 +439,7 @@
 
 #. Tag: para
 #, no-c-format
-msgid "But we didn&#39;t get around to implementing this yet."
+msgid "But we didn't get around to implementing this yet."
 msgstr ""
 
 #. Tag: title
@@ -509,7 +509,7 @@
 
 #. Tag: para
 #, no-c-format
-msgid "Next, we need to obtain an instance of our qualifier type. Since annotatons are interfaces, we can&#39;t just write <literal>new Asynchronous()</literal>. It&#39;s also quite tedious to create a concrete implementation of an annotation type from scratch. Instead, CDI lets us obtain a qualifier instance by subclassing the helper class <literal>AnnotationLiteral</literal>."
+msgid "Next, we need to obtain an instance of our qualifier type. Since annotatons are interfaces, we can't just write <literal>new Asynchronous()</literal>. It's also quite tedious to create a concrete implementation of an annotation type from scratch. Instead, CDI lets us obtain a qualifier instance by subclassing the helper class <literal>AnnotationLiteral</literal>."
 msgstr ""
 
 #. Tag: para
@@ -519,7 +519,7 @@
 
 #. Tag: para
 #, no-c-format
-msgid "We can&#39;t use an anonymous class to implement a qualifier type with members."
+msgid "We can't use an anonymous class to implement a qualifier type with members."
 msgstr ""
 
 #. Tag: para
@@ -559,7 +559,7 @@
 
 #. Tag: para
 #, no-c-format
-msgid "Let&#39;s look at an example. The following code is verbose, and vulnerable to refactoring problems:"
+msgid "Let's look at an example. The following code is verbose, and vulnerable to refactoring problems:"
 msgstr ""
 
 #. Tag: para
@@ -574,7 +574,7 @@
 
 #. Tag: para
 #, no-c-format
-msgid "Not convinced? Then here&#39;s a second example. To inject HTTP parameters, we need to define a qualifier type:"
+msgid "Not convinced? Then here's a second example. To inject HTTP parameters, we need to define a qualifier type:"
 msgstr ""
 
 #. Tag: para

Modified: doc/trunk/reference/pot/interceptors.pot
===================================================================
--- doc/trunk/reference/pot/interceptors.pot	2010-07-24 16:36:48 UTC (rev 6808)
+++ doc/trunk/reference/pot/interceptors.pot	2010-07-25 04:22:37 UTC (rev 6809)
@@ -4,8 +4,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: 0\n"
-"POT-Creation-Date: 2010-05-01T14:44:09\n"
-"PO-Revision-Date: 2010-05-01T14:44:09\n"
+"POT-Creation-Date: 2010-07-25T03:52:14\n"
+"PO-Revision-Date: 2010-07-25T03:52:14\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: None\n"
 "MIME-Version: 1.0\n"
@@ -69,7 +69,7 @@
 
 #. Tag: para
 #, no-c-format
-msgid "Suppose we want to declare that some of our beans are transactional. The first thing we need is an <emphasis>interceptor binding type</emphasis> to specify exactly which beans we&#39;re interested in:"
+msgid "Suppose we want to declare that some of our beans are transactional. The first thing we need is an <emphasis>interceptor binding type</emphasis> to specify exactly which beans we're interested in:"
 msgstr ""
 
 #. Tag: para
@@ -89,7 +89,7 @@
 
 #. Tag: para
 #, no-c-format
-msgid "That&#39;s great, but somewhere along the line we&#39;re going to have to actually implement the interceptor that provides this transaction management aspect. All we need to do is create a standard interceptor, and annotate it <literal>@Interceptor</literal> and <literal>@Transactional</literal>."
+msgid "That's great, but somewhere along the line we're going to have to actually implement the interceptor that provides this transaction management aspect. All we need to do is create a standard interceptor, and annotate it <literal>@Interceptor</literal> and <literal>@Transactional</literal>."
 msgstr ""
 
 #. Tag: para

Modified: doc/trunk/reference/pot/intro.pot
===================================================================
--- doc/trunk/reference/pot/intro.pot	2010-07-24 16:36:48 UTC (rev 6808)
+++ doc/trunk/reference/pot/intro.pot	2010-07-25 04:22:37 UTC (rev 6809)
@@ -4,8 +4,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: 0\n"
-"POT-Creation-Date: 2010-05-01T14:44:09\n"
-"PO-Revision-Date: 2010-05-01T14:44:09\n"
+"POT-Creation-Date: 2010-07-25T03:52:14\n"
+"PO-Revision-Date: 2010-07-25T03:52:14\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: None\n"
 "MIME-Version: 1.0\n"
@@ -19,7 +19,7 @@
 
 #. Tag: para
 #, no-c-format
-msgid "So you&#39;re keen to get started writing your first bean? Or perhaps you&#39;re skeptical, wondering what kinds of hoops the CDI specification will make you jump through! The good news is that you&#39;ve probably already written and used hundreds, perhaps thousands of beans. CDI just makes it easier to actually use them to build an application!"
+msgid "So you're keen to get started writing your first bean? Or perhaps you're skeptical, wondering what kinds of hoops the CDI specification will make you jump through! The good news is that you've probably already written and used hundreds, perhaps thousands of beans. CDI just makes it easier to actually use them to build an application!"
 msgstr ""
 
 #. Tag: title
@@ -34,27 +34,27 @@
 
 #. Tag: para
 #, no-c-format
-msgid "Prior to Java EE 6, there was no clear definition of the term &#34;bean&#34; in the Java EE platform. Of course, we&#39;ve been calling Java classes used in web and enterprise applications &#34;beans&#34; for years. There were even a couple of different kinds of things called &#34;beans&#34; in EE specifications, including EJB beans and JSF managed beans. Meanwhile, other third-party frameworks such as Spring and Seam introduced their own ideas of what it meant to be a &#34;bean&#34;. What we&#39;ve been missing is a common definition."
+msgid "Prior to Java EE 6, there was no clear definition of the term \"bean\" in the Java EE platform. Of course, we've been calling Java classes used in web and enterprise applications \"beans\" for years. There were even a couple of different kinds of things called \"beans\" in EE specifications, including EJB beans and JSF managed beans. Meanwhile, other third-party frameworks such as Spring and Seam introduced their own ideas of what it meant to be a \"bean\". What we've been missing is a common definition."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Java EE 6 finally lays down that common definition in the Managed Beans specification. Managed Beans are defined as container-managed objects with minimal programming restrictions, otherwise known by the acronym POJO (Plain Old Java Object). They support a small set of basic services, such as resource injection, lifecycle callbacks and interceptors. Companion specifications, such as EJB and CDI, build on this basic model. But, <emphasis>at last</emphasis>, there&#39;s a uniform concept of a bean and a lightweight component model that&#39;s aligned across the Java EE platform."
+msgid "Java EE 6 finally lays down that common definition in the Managed Beans specification. Managed Beans are defined as container-managed objects with minimal programming restrictions, otherwise known by the acronym POJO (Plain Old Java Object). They support a small set of basic services, such as resource injection, lifecycle callbacks and interceptors. Companion specifications, such as EJB and CDI, build on this basic model. But, <emphasis>at last</emphasis>, there's a uniform concept of a bean and a lightweight component model that's aligned across the Java EE platform."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "With very few exceptions, almost every concrete Java class that has a constructor with no parameters (or a constructor designated with the annotation <literal>@Inject</literal>) is a bean. This includes every JavaBean and every EJB session bean. If you&#39;ve already got some JavaBeans or session beans lying around, they&#39;re already beans—you won&#39;t need any additional special metadata. There&#39;s just little one thing you need to do before you can start injecting them into stuff: you need to put them in an archive (a jar, or a Java EE module such as a war or EJB jar) that contains a special marker file: <literal>META-INF/beans.xml</literal>."
+msgid "With very few exceptions, almost every concrete Java class that has a constructor with no parameters (or a constructor designated with the annotation <literal>@Inject</literal>) is a bean. This includes every JavaBean and every EJB session bean. If you've already got some JavaBeans or session beans lying around, they're already beans—you won't need any additional special metadata. There's just little one thing you need to do before you can start injecting them into stuff: you need to put them in an archive (a jar, or a Java EE module such as a war or EJB jar) that contains a special marker file: <literal>META-INF/beans.xml</literal>."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "The JavaBeans and EJBs you&#39;ve been writing every day, up until now, have not been able to take advantage of the new services defined by the CDI specification. But you&#39;ll be able to use every one of them with CDI—allowing the container to create and destroy instances of your beans and associate them with a designated context, injecting them into other beans, using them in EL expressions, specializing them with qualifier annotations, even adding interceptors and decorators to them—without modifying your existing code. At most, you&#39;ll need to add some annotations."
+msgid "The JavaBeans and EJBs you've been writing every day, up until now, have not been able to take advantage of the new services defined by the CDI specification. But you'll be able to use every one of them with CDI—allowing the container to create and destroy instances of your beans and associate them with a designated context, injecting them into other beans, using them in EL expressions, specializing them with qualifier annotations, even adding interceptors and decorators to them—without modifying your existing code. At most, you'll need to add some annotations."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Now let&#39;s see how to create your first bean that actually uses CDI."
+msgid "Now let's see how to create your first bean that actually uses CDI."
 msgstr ""
 
 #. Tag: title
@@ -64,7 +64,7 @@
 
 #. Tag: para
 #, no-c-format
-msgid "Suppose that we have two existing Java classes that we&#39;ve been using for years in various applications. The first class parses a string into a list of sentences:"
+msgid "Suppose that we have two existing Java classes that we've been using for years in various applications. The first class parses a string into a list of sentences:"
 msgstr ""
 
 #. Tag: para
@@ -79,7 +79,7 @@
 
 #. Tag: para
 #, no-c-format
-msgid "Unfortunately, we don&#39;t have a class that translates whole text documents. So let&#39;s write a bean for this job:"
+msgid "Unfortunately, we don't have a class that translates whole text documents. So let's write a bean for this job:"
 msgstr ""
 
 #. Tag: para
@@ -89,7 +89,7 @@
 
 #. Tag: para
 #, no-c-format
-msgid "As you&#39;ve guessed, the <literal>@Inject</literal> annotation has something to do with dependency injection! <literal>@Inject</literal> may be applied to a constructor or method of a bean, and tells the container to call that constructor or method when instantiating the bean. The container will inject other beans into the parameters of the constructor or method."
+msgid "As you've guessed, the <literal>@Inject</literal> annotation has something to do with dependency injection! <literal>@Inject</literal> may be applied to a constructor or method of a bean, and tells the container to call that constructor or method when instantiating the bean. The container will inject other beans into the parameters of the constructor or method."
 msgstr ""
 
 #. Tag: para
@@ -99,7 +99,7 @@
 
 #. Tag: para
 #, no-c-format
-msgid "Let&#39;s create a UI controller bean that uses field injection to obtain an instance of the <literal>TextTranslator</literal>, translating the text entered by a user:"
+msgid "Let's create a UI controller bean that uses field injection to obtain an instance of the <literal>TextTranslator</literal>, translating the text entered by a user:"
 msgstr ""
 
 #. Tag: para
@@ -109,7 +109,7 @@
 
 #. Tag: para
 #, no-c-format
-msgid "Notice the controller bean is request-scoped and named. Since this combination is so common in web applications, there&#39;s a built-in annotation for it in CDI that we could have used as a shorthand. When the (stereotype) annotation <literal>@Model</literal> is declared on a class, it creates a request-scoped and named bean."
+msgid "Notice the controller bean is request-scoped and named. Since this combination is so common in web applications, there's a built-in annotation for it in CDI that we could have used as a shorthand. When the (stereotype) annotation <literal>@Model</literal> is declared on a class, it creates a request-scoped and named bean."
 msgstr ""
 
 #. Tag: para
@@ -119,7 +119,7 @@
 
 #. Tag: para
 #, no-c-format
-msgid "Notice that it isn&#39;t necessary to create a getter or setter method to inject one bean into another. CDI can access an injected field directly (even if it&#39;s private!), which sometimes helps eliminate some wasteful code. The name of the field is arbitrary. It&#39;s the field&#39;s type that determines what is injected."
+msgid "Notice that it isn't necessary to create a getter or setter method to inject one bean into another. CDI can access an injected field directly (even if it's private!), which sometimes helps eliminate some wasteful code. The name of the field is arbitrary. It's the field's type that determines what is injected."
 msgstr ""
 
 #. Tag: para
@@ -129,6 +129,6 @@
 
 #. Tag: para
 #, no-c-format
-msgid "Before we get too deep in the details, let&#39;s pause and examine a bean&#39;s anatomy. What aspects of the bean are significant, and what gives it its identity? Instead of just giving examples of beans, we&#39;re going to define what <emphasis>makes</emphasis> something a bean."
+msgid "Before we get too deep in the details, let's pause and examine a bean's anatomy. What aspects of the bean are significant, and what gives it its identity? Instead of just giving examples of beans, we're going to define what <emphasis>makes</emphasis> something a bean."
 msgstr ""
 

Modified: doc/trunk/reference/pot/master.pot
===================================================================
--- doc/trunk/reference/pot/master.pot	2010-07-24 16:36:48 UTC (rev 6808)
+++ doc/trunk/reference/pot/master.pot	2010-07-25 04:22:37 UTC (rev 6809)
@@ -4,8 +4,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: 0\n"
-"POT-Creation-Date: 2010-05-01T14:44:09\n"
-"PO-Revision-Date: 2010-05-01T14:44:09\n"
+"POT-Creation-Date: 2010-07-25T03:52:14\n"
+"PO-Revision-Date: 2010-07-25T03:52:14\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: None\n"
 "MIME-Version: 1.0\n"
@@ -19,17 +19,17 @@
 
 #. Tag: para
 #, no-c-format
-msgid "Shortly before the final draft of JSR-299 was submitted, the specification changed its name from &#34;Web Beans&#34; to &#34;Java Contexts and Dependency Injection for the Java EE platform&#34;, abbreviated CDI. For a brief period after the renaming, the reference implementation adopted the name &#34;Web Beans&#34;. However, this ended up causing more confusion than it solved and Red Hat decided to change the name of the reference implementation to &#34;Weld&#34;. You may still find other documentation, blogs, forum posts, etc. that use the old nomenclature. Please update any references you can. The naming game is over."
+msgid "Shortly before the final draft of JSR-299 was submitted, the specification changed its name from \"Web Beans\" to \"Java Contexts and Dependency Injection for the Java EE platform\", abbreviated CDI. For a brief period after the renaming, the reference implementation adopted the name \"Web Beans\". However, this ended up causing more confusion than it solved and Red Hat decided to change the name of the reference implementation to \"Weld\". You may still find other documentation, blogs, forum posts, etc. that use the old nomenclature. Please update any references you can. The naming game is over."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "You&#39;ll also find that some of the functionality that once existed in the specification is now missing, such as defining beans in XML. These features will be available as portable extensions for CDI in the Weld project, and perhaps other implementations."
+msgid "You'll also find that some of the functionality that once existed in the specification is now missing, such as defining beans in XML. These features will be available as portable extensions for CDI in the Weld project, and perhaps other implementations."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Note that this reference guide was started while changes were still being made to the specification. We&#39;ve done our best to update it for accuracy. If you discover a conflict between what is written in this guide and the specification, the specification is the authority—assume it is correct. If you believe you have found an error in the specification, please report it to the JSR-299 EG."
+msgid "Note that this reference guide was started while changes were still being made to the specification. We've done our best to update it for accuracy. If you discover a conflict between what is written in this guide and the specification, the specification is the authority—assume it is correct. If you believe you have found an error in the specification, please report it to the JSR-299 EG."
 msgstr ""
 
 #. Tag: title

Modified: doc/trunk/reference/pot/next.pot
===================================================================
--- doc/trunk/reference/pot/next.pot	2010-07-24 16:36:48 UTC (rev 6808)
+++ doc/trunk/reference/pot/next.pot	2010-07-25 04:22:37 UTC (rev 6809)
@@ -4,8 +4,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: 0\n"
-"POT-Creation-Date: 2010-05-01T14:44:09\n"
-"PO-Revision-Date: 2010-05-01T14:44:09\n"
+"POT-Creation-Date: 2010-07-25T03:52:14\n"
+"PO-Revision-Date: 2010-07-25T03:52:14\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: None\n"
 "MIME-Version: 1.0\n"
@@ -19,12 +19,12 @@
 
 #. Tag: para
 #, no-c-format
-msgid "Because CDI is so new, there&#39;s not yet a lot of information available online. That will change over time. Regardless, the CDI specification remains the authority for information on CDI. The spec is less than 100 pages and is quite readable (don&#39;t worry, it&#39;s not like your Blu-ray player manual). Of course, it covers many details we&#39;ve skipped over here. The spec is available on the <ulink url=\"http://jcp.org/en/jsr/detail?id=299\">JSR-299 page</ulink> at the JCP website."
+msgid "Because CDI is so new, there's not yet a lot of information available online. That will change over time. Regardless, the CDI specification remains the authority for information on CDI. The spec is less than 100 pages and is quite readable (don't worry, it's not like your Blu-ray player manual). Of course, it covers many details we've skipped over here. The spec is available on the <ulink url=\"http://jcp.org/en/jsr/detail?id=299\">JSR-299 page</ulink> at the JCP website."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "The CDI reference implementation, Weld, is being developed at the <ulink url=\"http://seamframework.org/Weld\">Seam project</ulink>. The RI development team and the CDI spec lead blog at <ulink url=\"http://in.relation.to\">in.relation.to</ulink>. This guide was originally based on a series of blog entries published there while the specification was being developed. It&#39;s probably the best source of information about the future of CDI, Weld and Seam."
+msgid "The CDI reference implementation, Weld, is being developed at the <ulink url=\"http://seamframework.org/Weld\">Seam project</ulink>. The RI development team and the CDI spec lead blog at <ulink url=\"http://in.relation.to\">in.relation.to</ulink>. This guide was originally based on a series of blog entries published there while the specification was being developed. It's probably the best source of information about the future of CDI, Weld and Seam."
 msgstr ""
 
 #. Tag: para
@@ -44,7 +44,7 @@
 
 #. Tag: para
 #, no-c-format
-msgid "Edit the <literal>pom.xml</literal> file in the root of the checkout and remove the &#34;<literal>-SNAPSHOT</literal>&#34; from the version element (so you don&#39;t have to build other Weld modules)."
+msgid "Edit the <literal>pom.xml</literal> file in the root of the checkout and remove the \"<literal>-SNAPSHOT</literal>\" from the version element (so you don't have to build other Weld modules)."
 msgstr ""
 
 #. Tag: para

Modified: doc/trunk/reference/pot/part1.pot
===================================================================
--- doc/trunk/reference/pot/part1.pot	2010-07-24 16:36:48 UTC (rev 6808)
+++ doc/trunk/reference/pot/part1.pot	2010-07-25 04:22:37 UTC (rev 6809)
@@ -4,8 +4,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: 0\n"
-"POT-Creation-Date: 2010-05-01T14:44:09\n"
-"PO-Revision-Date: 2010-05-01T14:44:09\n"
+"POT-Creation-Date: 2010-07-25T03:52:14\n"
+"PO-Revision-Date: 2010-07-25T03:52:14\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: None\n"
 "MIME-Version: 1.0\n"
@@ -124,7 +124,7 @@
 
 #. Tag: para
 #, no-c-format
-msgid "Where should I keep the reference to it when I&#39;m not currently using it?"
+msgid "Where should I keep the reference to it when I'm not currently using it?"
 msgstr ""
 
 #. Tag: para
@@ -139,7 +139,7 @@
 
 #. Tag: para
 #, no-c-format
-msgid "CDI is more than a framework. It&#39;s a whole, rich programming model. The <emphasis>theme</emphasis> of CDI is <emphasis>loose-coupling with strong typing</emphasis>. Let&#39;s study what that phrase means."
+msgid "CDI is more than a framework. It's a whole, rich programming model. The <emphasis>theme</emphasis> of CDI is <emphasis>loose-coupling with strong typing</emphasis>. Let's study what that phrase means."
 msgstr ""
 
 #. Tag: para
@@ -169,12 +169,12 @@
 
 #. Tag: para
 #, no-c-format
-msgid "What&#39;s even more powerful (and comforting) is that CDI provides all these facilities in a <emphasis>typesafe</emphasis> way. CDI never relies on string-based identifiers to determine how collaborating objects fit together. Instead, CDI uses the typing information that is already available in the Java object model, augmented using a new programming pattern, called <emphasis>qualifier annotations</emphasis>, to wire together beans, their dependencies, their interceptors and decorators, and their event consumers. Usage of XML descriptors is minimized to truly deployment-specific information."
+msgid "What's even more powerful (and comforting) is that CDI provides all these facilities in a <emphasis>typesafe</emphasis> way. CDI never relies on string-based identifiers to determine how collaborating objects fit together. Instead, CDI uses the typing information that is already available in the Java object model, augmented using a new programming pattern, called <emphasis>qualifier annotations</emphasis>, to wire together beans, their dependencies, their interceptors and decorators, and their event consumers. Usage of XML descriptors is minimized to truly deployment-specific information."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "But CDI isn&#39;t a restrictive programming model. It doesn&#39;t tell you how you should to structure your application into layers, how you should handle persistence, or what web framework you have to use. You&#39;ll have to decide those kinds of things for yourself."
+msgid "But CDI isn't a restrictive programming model. It doesn't tell you how you should to structure your application into layers, how you should handle persistence, or what web framework you have to use. You'll have to decide those kinds of things for yourself."
 msgstr ""
 
 #. Tag: para
@@ -184,7 +184,7 @@
 
 #. Tag: para
 #, no-c-format
-msgid "CDI was influenced by a number of existing Java frameworks, including Seam, Guice and Spring. However, CDI has its own, very distinct, character: more typesafe than Seam, more stateful and less XML-centric than Spring, more web and enterprise-application capable than Guice. But it couldn&#39;t have been any of these without inspiration from the frameworks mentioned and <emphasis>lots</emphasis> of collaboration and hard work by the JSR-299 Expert Group (EG)."
+msgid "CDI was influenced by a number of existing Java frameworks, including Seam, Guice and Spring. However, CDI has its own, very distinct, character: more typesafe than Seam, more stateful and less XML-centric than Spring, more web and enterprise-application capable than Guice. But it couldn't have been any of these without inspiration from the frameworks mentioned and <emphasis>lots</emphasis> of collaboration and hard work by the JSR-299 Expert Group (EG)."
 msgstr ""
 
 #. Tag: para

Modified: doc/trunk/reference/pot/part2.pot
===================================================================
--- doc/trunk/reference/pot/part2.pot	2010-07-24 16:36:48 UTC (rev 6808)
+++ doc/trunk/reference/pot/part2.pot	2010-07-25 04:22:37 UTC (rev 6809)
@@ -4,8 +4,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: 0\n"
-"POT-Creation-Date: 2010-05-01T14:44:09\n"
-"PO-Revision-Date: 2010-05-01T14:44:09\n"
+"POT-Creation-Date: 2010-07-25T03:52:14\n"
+"PO-Revision-Date: 2010-07-25T03:52:14\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: None\n"
 "MIME-Version: 1.0\n"

Modified: doc/trunk/reference/pot/part3.pot
===================================================================
--- doc/trunk/reference/pot/part3.pot	2010-07-24 16:36:48 UTC (rev 6808)
+++ doc/trunk/reference/pot/part3.pot	2010-07-25 04:22:37 UTC (rev 6809)
@@ -4,8 +4,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: 0\n"
-"POT-Creation-Date: 2010-05-01T14:44:09\n"
-"PO-Revision-Date: 2010-05-01T14:44:09\n"
+"POT-Creation-Date: 2010-07-25T03:52:14\n"
+"PO-Revision-Date: 2010-07-25T03:52:14\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: None\n"
 "MIME-Version: 1.0\n"
@@ -14,7 +14,7 @@
 
 #. Tag: para
 #, no-c-format
-msgid "The first major theme of CDI is <emphasis>loose coupling</emphasis>. We&#39;ve already seen three means of achieving loose coupling:"
+msgid "The first major theme of CDI is <emphasis>loose coupling</emphasis>. We've already seen three means of achieving loose coupling:"
 msgstr ""
 
 #. Tag: para
@@ -69,7 +69,7 @@
 
 #. Tag: para
 #, no-c-format
-msgid "You don&#39;t see string-based identifiers in CDI code, not because the framework is hiding them from you using clever defaulting rules—so-called &#34;configuration by convention&#34;—but because there are simply no strings there to begin with!"
+msgid "You don't see string-based identifiers in CDI code, not because the framework is hiding them from you using clever defaulting rules—so-called \"configuration by convention\"—but because there are simply no strings there to begin with!"
 msgstr ""
 
 #. Tag: para
@@ -139,6 +139,6 @@
 
 #. Tag: para
 #, no-c-format
-msgid "We&#39;re now ready to meet some more advanced features of CDI. Bear in mind that these features exist to make our code both easier to validate and more understandable. Most of the time you don&#39;t ever really <emphasis>need</emphasis> to use these features, but if you use them wisely, you&#39;ll come to appreciate their power."
+msgid "We're now ready to meet some more advanced features of CDI. Bear in mind that these features exist to make our code both easier to validate and more understandable. Most of the time you don't ever really <emphasis>need</emphasis> to use these features, but if you use them wisely, you'll come to appreciate their power."
 msgstr ""
 

Modified: doc/trunk/reference/pot/part4.pot
===================================================================
--- doc/trunk/reference/pot/part4.pot	2010-07-24 16:36:48 UTC (rev 6808)
+++ doc/trunk/reference/pot/part4.pot	2010-07-25 04:22:37 UTC (rev 6809)
@@ -4,8 +4,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: 0\n"
-"POT-Creation-Date: 2010-05-01T14:44:09\n"
-"PO-Revision-Date: 2010-05-01T14:44:09\n"
+"POT-Creation-Date: 2010-07-25T03:52:14\n"
+"PO-Revision-Date: 2010-07-25T03:52:14\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: None\n"
 "MIME-Version: 1.0\n"
@@ -14,7 +14,7 @@
 
 #. Tag: para
 #, no-c-format
-msgid "The third theme of CDI is <emphasis>integration</emphasis>. We&#39;ve already seen how CDI helps integrate EJB and JSF, allowing EJBs to be bound directly to JSF pages. That&#39;s just the beginning. The CDI services are integrated into the very core of the Java EE platform. Even EJB session beans can take advantage of the dependency injection, event bus, and contextual lifecycle management that CDI provides."
+msgid "The third theme of CDI is <emphasis>integration</emphasis>. We've already seen how CDI helps integrate EJB and JSF, allowing EJBs to be bound directly to JSF pages. That's just the beginning. The CDI services are integrated into the very core of the Java EE platform. Even EJB session beans can take advantage of the dependency injection, event bus, and contextual lifecycle management that CDI provides."
 msgstr ""
 
 #. Tag: para
@@ -24,6 +24,6 @@
 
 #. Tag: para
 #, no-c-format
-msgid "We&#39;re about to see how to take full advantage of the Java EE platform in an application that uses CDI. We&#39;ll also briefly meet a set of SPIs that are provided to support portable extensions to CDI. You might not ever need to use these SPIs directly, but don&#39;t take them for granted. You will likely be using them indirectly, every time you use a third-party extension, such as Seam."
+msgid "We're about to see how to take full advantage of the Java EE platform in an application that uses CDI. We'll also briefly meet a set of SPIs that are provided to support portable extensions to CDI. You might not ever need to use these SPIs directly, but don't take them for granted. You will likely be using them indirectly, every time you use a third-party extension, such as Seam."
 msgstr ""
 

Modified: doc/trunk/reference/pot/part5.pot
===================================================================
--- doc/trunk/reference/pot/part5.pot	2010-07-24 16:36:48 UTC (rev 6808)
+++ doc/trunk/reference/pot/part5.pot	2010-07-25 04:22:37 UTC (rev 6809)
@@ -4,8 +4,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: 0\n"
-"POT-Creation-Date: 2010-05-01T14:44:09\n"
-"PO-Revision-Date: 2010-05-01T14:44:09\n"
+"POT-Creation-Date: 2010-07-25T03:52:15\n"
+"PO-Revision-Date: 2010-07-25T03:52:15\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: None\n"
 "MIME-Version: 1.0\n"

Modified: doc/trunk/reference/pot/producermethods.pot
===================================================================
--- doc/trunk/reference/pot/producermethods.pot	2010-07-24 16:36:48 UTC (rev 6808)
+++ doc/trunk/reference/pot/producermethods.pot	2010-07-25 04:22:37 UTC (rev 6809)
@@ -4,8 +4,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: 0\n"
-"POT-Creation-Date: 2010-05-01T14:44:09\n"
-"PO-Revision-Date: 2010-05-01T14:44:09\n"
+"POT-Creation-Date: 2010-07-25T03:52:15\n"
+"PO-Revision-Date: 2010-07-25T03:52:15\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: None\n"
 "MIME-Version: 1.0\n"
@@ -19,7 +19,7 @@
 
 #. Tag: para
 #, no-c-format
-msgid "Producer methods let us overcome certain limitations that arise when a container, instead of the application, is responsible for instantiating objects. They&#39;re also the easiest way to integrate objects which are not beans into the CDI environment."
+msgid "Producer methods let us overcome certain limitations that arise when a container, instead of the application, is responsible for instantiating objects. They're also the easiest way to integrate objects which are not beans into the CDI environment."
 msgstr ""
 
 #. Tag: para
@@ -74,7 +74,7 @@
 
 #. Tag: para
 #, no-c-format
-msgid "In particular, producer methods let us use runtime polymorphism with CDI. As we&#39;ve seen, alternative beans are one solution to the problem of deployment-time polymorphism. But once the system is deployed, the CDI implementation is fixed. A producer method has no such limitation:"
+msgid "In particular, producer methods let us use runtime polymorphism with CDI. As we've seen, alternative beans are one solution to the problem of deployment-time polymorphism. But once the system is deployed, the CDI implementation is fixed. A producer method has no such limitation:"
 msgstr ""
 
 #. Tag: para
@@ -104,7 +104,7 @@
 
 #. Tag: para
 #, no-c-format
-msgid "Now, when the producer method is called, the returned <literal>PaymentStrategy</literal> will be bound to the session context. The producer method won&#39;t be called again in the same session."
+msgid "Now, when the producer method is called, the returned <literal>PaymentStrategy</literal> will be bound to the session context. The producer method won't be called again in the same session."
 msgstr ""
 
 #. Tag: para
@@ -119,22 +119,22 @@
 
 #. Tag: para
 #, no-c-format
-msgid "There&#39;s one potential problem with the code above. The implementations of <literal>CreditCardPaymentStrategy</literal> are instantiated using the Java <literal>new</literal> operator. Objects instantiated directly by the application can&#39;t take advantage of dependency injection and don&#39;t have interceptors."
+msgid "There's one potential problem with the code above. The implementations of <literal>CreditCardPaymentStrategy</literal> are instantiated using the Java <literal>new</literal> operator. Objects instantiated directly by the application can't take advantage of dependency injection and don't have interceptors."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "If this isn&#39;t what we want, we can use dependency injection into the producer method to obtain bean instances:"
+msgid "If this isn't what we want, we can use dependency injection into the producer method to obtain bean instances:"
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Wait, what if <literal>CreditCardPaymentStrategy</literal> is a request-scoped bean? Then the producer method has the effect of &#34;promoting&#34; the current request scoped instance into session scope. This is almost certainly a bug! The request scoped object will be destroyed by the container before the session ends, but the reference to the object will be left &#34;hanging&#34; in the session scope. This error will <emphasis>not</emphasis> be detected by the container, so please take extra care when returning bean instances from producer methods!"
+msgid "Wait, what if <literal>CreditCardPaymentStrategy</literal> is a request-scoped bean? Then the producer method has the effect of \"promoting\" the current request scoped instance into session scope. This is almost certainly a bug! The request scoped object will be destroyed by the container before the session ends, but the reference to the object will be left \"hanging\" in the session scope. This error will <emphasis>not</emphasis> be detected by the container, so please take extra care when returning bean instances from producer methods!"
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "There&#39;s at least three ways we could go about fixing this bug. We could change the scope of the <literal>CreditCardPaymentStrategy</literal> implementation, but this would affect other clients of that bean. A better option would be to change the scope of the producer method to <literal>@Dependent</literal> or <literal>@RequestScoped</literal>."
+msgid "There's at least three ways we could go about fixing this bug. We could change the scope of the <literal>CreditCardPaymentStrategy</literal> implementation, but this would affect other clients of that bean. A better option would be to change the scope of the producer method to <literal>@Dependent</literal> or <literal>@RequestScoped</literal>."
 msgstr ""
 
 #. Tag: para
@@ -154,7 +154,7 @@
 
 #. Tag: para
 #, no-c-format
-msgid "Then a new <emphasis>dependent</emphasis> instance of <literal>CreditCardPaymentStrategy</literal> will be created, passed to the producer method, returned by the producer method and finally bound to the session context. The dependent object won&#39;t be destroyed until the <literal>Preferences</literal> object is destroyed, at the end of the session."
+msgid "Then a new <emphasis>dependent</emphasis> instance of <literal>CreditCardPaymentStrategy</literal> will be created, passed to the producer method, returned by the producer method and finally bound to the session context. The dependent object won't be destroyed until the <literal>Preferences</literal> object is destroyed, at the end of the session."
 msgstr ""
 
 #. Tag: title

Modified: doc/trunk/reference/pot/resources.pot
===================================================================
--- doc/trunk/reference/pot/resources.pot	2010-07-24 16:36:48 UTC (rev 6808)
+++ doc/trunk/reference/pot/resources.pot	2010-07-25 04:22:37 UTC (rev 6809)
@@ -4,8 +4,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: 0\n"
-"POT-Creation-Date: 2010-05-01T14:44:09\n"
-"PO-Revision-Date: 2010-05-01T14:44:09\n"
+"POT-Creation-Date: 2010-07-25T03:52:15\n"
+"PO-Revision-Date: 2010-07-25T03:52:15\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: None\n"
 "MIME-Version: 1.0\n"
@@ -24,7 +24,7 @@
 
 #. Tag: para
 #, no-c-format
-msgid "Naturally, there is now a slight mismatch with the new style of dependency injection in CDI. Most notably, component environment injection relies on string-based names to qualify ambiguous types, and there is no real consistency as to the nature of the names (sometimes a JNDI name, sometimes a persistence unit name, sometimes an EJB link, sometimes a nonportable &#34;mapped name&#34;). Producer fields turned out to be an elegant adaptor to reduce all this complexity to a common model and get component environment resources to participate in the CDI system just like any other kind of bean."
+msgid "Naturally, there is now a slight mismatch with the new style of dependency injection in CDI. Most notably, component environment injection relies on string-based names to qualify ambiguous types, and there is no real consistency as to the nature of the names (sometimes a JNDI name, sometimes a persistence unit name, sometimes an EJB link, sometimes a nonportable \"mapped name\"). Producer fields turned out to be an elegant adaptor to reduce all this complexity to a common model and get component environment resources to participate in the CDI system just like any other kind of bean."
 msgstr ""
 
 #. Tag: para
@@ -89,7 +89,7 @@
 
 #. Tag: para
 #, no-c-format
-msgid "It might feel strange to be declaring resources in Java code. Isn&#39;t this stuff that might be deployment-specific? Certainly, and that&#39;s why it makes sense to declare your resources in a class annotated <literal>@Alternative</literal>."
+msgid "It might feel strange to be declaring resources in Java code. Isn't this stuff that might be deployment-specific? Certainly, and that's why it makes sense to declare your resources in a class annotated <literal>@Alternative</literal>."
 msgstr ""
 
 #. Tag: title
@@ -109,7 +109,7 @@
 
 #. Tag: para
 #, no-c-format
-msgid "It might seem like a pain to have to write these extra producer field declarations, just to gain an additional level of indirection. You could just as well use component environment injection directly, right? But remember that you&#39;re going to be using resources like the <literal>EntityManager</literal> in several different beans. Isn&#39;t it nicer and more typesafe to write"
+msgid "It might seem like a pain to have to write these extra producer field declarations, just to gain an additional level of indirection. You could just as well use component environment injection directly, right? But remember that you're going to be using resources like the <literal>EntityManager</literal> in several different beans. Isn't it nicer and more typesafe to write"
 msgstr ""
 
 #. Tag: para

Modified: doc/trunk/reference/pot/ri-spi.pot
===================================================================
--- doc/trunk/reference/pot/ri-spi.pot	2010-07-24 16:36:48 UTC (rev 6808)
+++ doc/trunk/reference/pot/ri-spi.pot	2010-07-25 04:22:37 UTC (rev 6809)
@@ -4,8 +4,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: 0\n"
-"POT-Creation-Date: 2010-05-01T14:44:09\n"
-"PO-Revision-Date: 2010-05-01T14:44:09\n"
+"POT-Creation-Date: 2010-07-25T03:52:15\n"
+"PO-Revision-Date: 2010-07-25T03:52:15\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: None\n"
 "MIME-Version: 1.0\n"
@@ -29,7 +29,7 @@
 
 #. Tag: para
 #, no-c-format
-msgid "If you just want to use managed beans, and not take advantage of enterprise services (EE resource injection, CDI injection into EE component classes, transactional events, support for CDI services in EJBs) and non-flat deployments, then the generic servlet support provided by the &#34;Weld: Servlets&#34; extension will be sufficient, and will work in any container supporting the Servlet API."
+msgid "If you just want to use managed beans, and not take advantage of enterprise services (EE resource injection, CDI injection into EE component classes, transactional events, support for CDI services in EJBs) and non-flat deployments, then the generic servlet support provided by the \"Weld: Servlets\" extension will be sufficient, and will work in any container supporting the Servlet API."
 msgstr ""
 
 #. Tag: para
@@ -54,7 +54,7 @@
 
 #. Tag: para
 #, no-c-format
-msgid "Weld supports multiple environments. An environment is defined by an implementation of the <literal>Environment</literal> interface. A number of standard environments are built in, and described by the <literal>Environments</literal> enumeration. Different environments require different services to be present (for example a Servlet container doesn&#39;t require transaction, EJB or JPA services). By default an EE environment is assumed, but you can adjust the environment by calling <literal>bootstrap.setEnvironment()</literal>."
+msgid "Weld supports multiple environments. An environment is defined by an implementation of the <literal>Environment</literal> interface. A number of standard environments are built in, and described by the <literal>Environments</literal> enumeration. Different environments require different services to be present (for example a Servlet container doesn't require transaction, EJB or JPA services). By default an EE environment is assumed, but you can adjust the environment by calling <literal>bootstrap.setEnvironment()</literal>."
 msgstr ""
 
 #. Tag: para
@@ -94,7 +94,7 @@
 
 #. Tag: para
 #, no-c-format
-msgid "In a strict container, each BDA might have to explicitly specify which other BDAs it can access. However many containers will allow an easy mechanism to make BDAs bi-directionally accessible (such as a library directory). In this case, it is allowable (and reasonable) to describe all such archives as a single, &#39;virtual&#39; <literal>BeanDeploymentArchive</literal>."
+msgid "In a strict container, each BDA might have to explicitly specify which other BDAs it can access. However many containers will allow an easy mechanism to make BDAs bi-directionally accessible (such as a library directory). In this case, it is allowable (and reasonable) to describe all such archives as a single, 'virtual' <literal>BeanDeploymentArchive</literal>."
 msgstr ""
 
 #. Tag: para
@@ -104,7 +104,7 @@
 
 #. Tag: para
 #, no-c-format
-msgid "<literal>BeanDeploymentArchive</literal> provides three methods which allow it&#39;s contents to be discovered by Weld—<literal>BeanDeploymentArchive.getBeanClasses()</literal> must return all the classes in the BDA, <literal>BeanDeploymentArchive.getBeansXml()</literal> must return all the deployment descriptors in the archive, and <literal>BeanDeploymentArchive.getEjbs()</literal> must provide an EJB descriptor for every EJB in the BDA, or an empty list if it is not an EJB archive."
+msgid "<literal>BeanDeploymentArchive</literal> provides three methods which allow it's contents to be discovered by Weld—<literal>BeanDeploymentArchive.getBeanClasses()</literal> must return all the classes in the BDA, <literal>BeanDeploymentArchive.getBeansXml()</literal> must return all the deployment descriptors in the archive, and <literal>BeanDeploymentArchive.getEjbs()</literal> must provide an EJB descriptor for every EJB in the BDA, or an empty list if it is not an EJB archive."
 msgstr ""
 
 #. Tag: para
@@ -119,7 +119,7 @@
 
 #. Tag: para
 #, no-c-format
-msgid "In practice, you can regard the deployment structure represented by <literal>Deployment</literal>, and the virtual BDA graph as a mirror of the classloader structure for a deployment. If a class can from BDA X can be loaded by another in BDA Y, it is accessible, and therefore BDA Y&#39;s accessible BDAs should include BDA X."
+msgid "In practice, you can regard the deployment structure represented by <literal>Deployment</literal>, and the virtual BDA graph as a mirror of the classloader structure for a deployment. If a class can from BDA X can be loaded by another in BDA Y, it is accessible, and therefore BDA Y's accessible BDAs should include BDA X."
 msgstr ""
 
 #. Tag: para
@@ -144,7 +144,7 @@
 
 #. Tag: para
 #, no-c-format
-msgid "Weld delegates EJB 3 bean discovery to the container so that it doesn&#39;t duplicate the work done by the EJB container, and respects any vendor-extensions to the EJB definition."
+msgid "Weld delegates EJB 3 bean discovery to the container so that it doesn't duplicate the work done by the EJB container, and respects any vendor-extensions to the EJB definition."
 msgstr ""
 
 #. Tag: para
@@ -184,7 +184,7 @@
 
 #. Tag: para
 #, no-c-format
-msgid "If you use a non-EE environment then you may implement any of the EE service SPIs, and Weld will provide the associated functionality. There is no need to implement those services you don&#39;t need!"
+msgid "If you use a non-EE environment then you may implement any of the EE service SPIs, and Weld will provide the associated functionality. There is no need to implement those services you don't need!"
 msgstr ""
 
 #. Tag: title
@@ -339,7 +339,7 @@
 
 #. Tag: para
 #, no-c-format
-msgid "Weld expects the Application Server or other container to provide the storage for each application&#39;s context. The <literal>org.jboss.weld.context.api.BeanStore</literal> should be implemented to provide an application scoped storage."
+msgid "Weld expects the Application Server or other container to provide the storage for each application's context. The <literal>org.jboss.weld.context.api.BeanStore</literal> should be implemented to provide an application scoped storage."
 msgstr ""
 
 #. Tag: title

Modified: doc/trunk/reference/pot/scopescontexts.pot
===================================================================
--- doc/trunk/reference/pot/scopescontexts.pot	2010-07-24 16:36:48 UTC (rev 6808)
+++ doc/trunk/reference/pot/scopescontexts.pot	2010-07-25 04:22:37 UTC (rev 6809)
@@ -4,8 +4,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: 0\n"
-"POT-Creation-Date: 2010-05-01T14:44:10\n"
-"PO-Revision-Date: 2010-05-01T14:44:10\n"
+"POT-Creation-Date: 2010-07-25T03:52:15\n"
+"PO-Revision-Date: 2010-07-25T03:52:15\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: None\n"
 "MIME-Version: 1.0\n"
@@ -19,7 +19,7 @@
 
 #. Tag: para
 #, no-c-format
-msgid "So far, we&#39;ve seen a few examples of <emphasis>scope type annotations</emphasis>. The scope of a bean determines the lifecycle of instances of the bean. The scope also determines which clients refer to which instances of the bean. According to the CDI specification, a scope determines:"
+msgid "So far, we've seen a few examples of <emphasis>scope type annotations</emphasis>. The scope of a bean determines the lifecycle of instances of the bean. The scope also determines which clients refer to which instances of the bean. According to the CDI specification, a scope determines:"
 msgstr ""
 
 #. Tag: para
@@ -44,7 +44,7 @@
 
 #. Tag: para
 #, no-c-format
-msgid "JPA entities aren&#39;t a great fit for this model. Entities have their whole own lifecycle and identity model which just doesn&#39;t map naturally to the model used in CDI. Therefore, we recommend against treating entities as CDI beans. You&#39;re certainly going to run into problems if you try to give an entity a scope other than the default scope <literal>@Dependent</literal>. The client proxy will get in the way if you try to pass an injected instance to the JPA <literal>EntityManager</literal>."
+msgid "JPA entities aren't a great fit for this model. Entities have their whole own lifecycle and identity model which just doesn't map naturally to the model used in CDI. Therefore, we recommend against treating entities as CDI beans. You're certainly going to run into problems if you try to give an entity a scope other than the default scope <literal>@Dependent</literal>. The client proxy will get in the way if you try to pass an injected instance to the JPA <literal>EntityManager</literal>."
 msgstr ""
 
 #. Tag: title
@@ -54,12 +54,12 @@
 
 #. Tag: para
 #, no-c-format
-msgid "CDI features an <emphasis>extensible context model</emphasis>. It&#39;s possible to define new scopes by creating a new scope type annotation:"
+msgid "CDI features an <emphasis>extensible context model</emphasis>. It's possible to define new scopes by creating a new scope type annotation:"
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Of course, that&#39;s the easy part of the job. For this scope type to be useful, we will also need to define a <literal>Context</literal> object that implements the scope! Implementing a <literal>Context</literal> is usually a very technical task, intended for framework development only. You can expect an implementation of the business scope, for instance, in a future version of Seam."
+msgid "Of course, that's the easy part of the job. For this scope type to be useful, we will also need to define a <literal>Context</literal> object that implements the scope! Implementing a <literal>Context</literal> is usually a very technical task, intended for framework development only. You can expect an implementation of the business scope, for instance, in a future version of Seam."
 msgstr ""
 
 #. Tag: para
@@ -69,7 +69,7 @@
 
 #. Tag: para
 #, no-c-format
-msgid "Usually, you&#39;ll use one of CDI&#39;s built-in scopes."
+msgid "Usually, you'll use one of CDI's built-in scopes."
 msgstr ""
 
 #. Tag: title
@@ -169,7 +169,7 @@
 
 #. Tag: para
 #, no-c-format
-msgid "Three of the four built-in scopes should be extremely familiar to every Java EE developer, so let&#39;s not waste time discussing them here. One of the scopes, however, is new."
+msgid "Three of the four built-in scopes should be extremely familiar to every Java EE developer, so let's not waste time discussing them here. One of the scopes, however, is new."
 msgstr ""
 
 #. Tag: title
@@ -249,12 +249,12 @@
 
 #. Tag: para
 #, no-c-format
-msgid "It&#39;s probably better to use one of the link components in JSF 2:"
+msgid "It's probably better to use one of the link components in JSF 2:"
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "The conversation context propagates across redirects, making it very easy to implement the common POST-then-redirect pattern, without resort to fragile constructs such as a &#34;flash&#34; object. The container automatically adds the conversation id to the redirect URL as a request parameter."
+msgid "The conversation context propagates across redirects, making it very easy to implement the common POST-then-redirect pattern, without resort to fragile constructs such as a \"flash\" object. The container automatically adds the conversation id to the redirect URL as a request parameter."
 msgstr ""
 
 #. Tag: title
@@ -289,12 +289,12 @@
 
 #. Tag: para
 #, no-c-format
-msgid "You can guess what &#34;singleton&#34; means here. It means a bean that is instantiated once. Unfortunately, there&#39;s a little problem with this pseudo-scope. Beans with scope <literal>@Singleton</literal> don&#39;t have a proxy object. Clients hold a direct reference to the singleton instance. So we need to consider the case of a client that can be serialized, for example, any bean with scope <literal>@SessionScoped</literal> or <literal>@ConversationScoped</literal>, any dependent object of a bean with scope <literal>@SessionScoped</literal> or <literal>@ConversationScoped</literal>, or any stateful session bean."
+msgid "You can guess what \"singleton\" means here. It means a bean that is instantiated once. Unfortunately, there's a little problem with this pseudo-scope. Beans with scope <literal>@Singleton</literal> don't have a proxy object. Clients hold a direct reference to the singleton instance. So we need to consider the case of a client that can be serialized, for example, any bean with scope <literal>@SessionScoped</literal> or <literal>@ConversationScoped</literal>, any dependent object of a bean with scope <literal>@SessionScoped</literal> or <literal>@ConversationScoped</literal>, or any stateful session bean."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Now, if the singleton instance is a simple, immutable, serializable object like a string, a number or a date, we probably don&#39;t mind too much if it gets duplicated via serialization. However, that makes it no stop being a true singleton, and we may as well have just declared it with the default scope."
+msgid "Now, if the singleton instance is a simple, immutable, serializable object like a string, a number or a date, we probably don't mind too much if it gets duplicated via serialization. However, that makes it no stop being a true singleton, and we may as well have just declared it with the default scope."
 msgstr ""
 
 #. Tag: para
@@ -314,7 +314,7 @@
 
 #. Tag: para
 #, no-c-format
-msgid "give the client a reference of type <literal>Instance&#60;X&#62;</literal> where <literal>X</literal> is the bean type of the singleton bean."
+msgid "give the client a reference of type <literal>Instance&lt;X&gt;</literal> where <literal>X</literal> is the bean type of the singleton bean."
 msgstr ""
 
 #. Tag: para
@@ -349,12 +349,12 @@
 
 #. Tag: para
 #, no-c-format
-msgid "If you need to access a bean directly by EL name in a JSF page, you probably need to give it a scope other than <literal>@Dependent</literal>. Otherwise, any value that gets set to the bean by a JSF input will be lost immediately. That&#39;s why CDI features the <literal>@Model</literal> stereotype; it lets you give a bean a name, and set its scope to <literal>@RequestScoped</literal> in one stroke. If you need to access a bean that really <emphasis>has</emphasis> to have the scope <literal>@Dependent</literal> from a JSF page, inject it into a different bean, and expose it to EL via a getter method."
+msgid "If you need to access a bean directly by EL name in a JSF page, you probably need to give it a scope other than <literal>@Dependent</literal>. Otherwise, any value that gets set to the bean by a JSF input will be lost immediately. That's why CDI features the <literal>@Model</literal> stereotype; it lets you give a bean a name, and set its scope to <literal>@RequestScoped</literal> in one stroke. If you need to access a bean that really <emphasis>has</emphasis> to have the scope <literal>@Dependent</literal> from a JSF page, inject it into a different bean, and expose it to EL via a getter method."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Beans with scope <literal>@Dependent</literal> don&#39;t need a proxy object. The client holds a direct reference to its instance."
+msgid "Beans with scope <literal>@Dependent</literal> don't need a proxy object. The client holds a direct reference to its instance."
 msgstr ""
 
 #. Tag: para
@@ -394,6 +394,6 @@
 
 #. Tag: para
 #, no-c-format
-msgid "This feature is particularly useful with producer methods, as we&#39;ll see in the next chapter."
+msgid "This feature is particularly useful with producer methods, as we'll see in the next chapter."
 msgstr ""
 

Modified: doc/trunk/reference/pot/specialization.pot
===================================================================
--- doc/trunk/reference/pot/specialization.pot	2010-07-24 16:36:48 UTC (rev 6808)
+++ doc/trunk/reference/pot/specialization.pot	2010-07-25 04:22:37 UTC (rev 6809)
@@ -4,8 +4,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: 0\n"
-"POT-Creation-Date: 2010-05-01T14:44:10\n"
-"PO-Revision-Date: 2010-05-01T14:44:10\n"
+"POT-Creation-Date: 2010-07-25T03:52:15\n"
+"PO-Revision-Date: 2010-07-25T03:52:15\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: None\n"
 "MIME-Version: 1.0\n"
@@ -19,7 +19,7 @@
 
 #. Tag: para
 #, no-c-format
-msgid "When you first start developing with CDI, you&#39;ll likely be dealing only with a single bean implementation for each bean type. In this case, it&#39;s easy to understand how beans get selected for injection. As the complexity of your application grows, multiple occurrences of the same bean type start appearing, either because you have multiple implementations or two beans share a common (Java) inheritance. That&#39;s when you have to begin studying the specialization, inheritance and alternative rules to work through unsatisfied or ambiguous dependencies or to avoid certain beans from being called."
+msgid "When you first start developing with CDI, you'll likely be dealing only with a single bean implementation for each bean type. In this case, it's easy to understand how beans get selected for injection. As the complexity of your application grows, multiple occurrences of the same bean type start appearing, either because you have multiple implementations or two beans share a common (Java) inheritance. That's when you have to begin studying the specialization, inheritance and alternative rules to work through unsatisfied or ambiguous dependencies or to avoid certain beans from being called."
 msgstr ""
 
 #. Tag: para
@@ -39,12 +39,12 @@
 
 #. Tag: para
 #, no-c-format
-msgid "The second case is the default assumed by CDI. It&#39;s possible to have two beans in the system with the same part bean type (interface or parent class). As you&#39;ve learned, you select between the two implementations using qualifiers."
+msgid "The second case is the default assumed by CDI. It's possible to have two beans in the system with the same part bean type (interface or parent class). As you've learned, you select between the two implementations using qualifiers."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "The first case is the exception, and also requires more care. In any given deployment, only one bean can fulfill a given role at a time. That means one bean needs to be enabled and the other disabled. There are a two modifiers involved: <literal>@Alternative</literal> and <literal>@Specializes</literal>. We&#39;ll start by looking at alternatives and then show the guarantees that specialization adds."
+msgid "The first case is the exception, and also requires more care. In any given deployment, only one bean can fulfill a given role at a time. That means one bean needs to be enabled and the other disabled. There are a two modifiers involved: <literal>@Alternative</literal> and <literal>@Specializes</literal>. We'll start by looking at alternatives and then show the guarantees that specialization adds."
 msgstr ""
 
 #. Tag: title
@@ -59,7 +59,7 @@
 
 #. Tag: para
 #, no-c-format
-msgid "But in our staging environment, we don&#39;t really want to submit payments to the external system, so we override that implementation of <literal>PaymentProcessor</literal> with a different bean:"
+msgid "But in our staging environment, we don't really want to submit payments to the external system, so we override that implementation of <literal>PaymentProcessor</literal> with a different bean:"
 msgstr ""
 
 #. Tag: para
@@ -69,12 +69,12 @@
 
 #. Tag: para
 #, no-c-format
-msgid "We&#39;ve already seen how we can enable this alternative by listing its class in the <literal>beans.xml</literal> descriptor."
+msgid "We've already seen how we can enable this alternative by listing its class in the <literal>beans.xml</literal> descriptor."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "But suppose we have many alternatives in the staging environment. It would be much more convenient to be able to enable them all at once. So let&#39;s make <literal>@Staging</literal> an <literal>@Alternative</literal> stereotype and annotate the staging beans with this stereotype instead. You&#39;ll see how this level of indirection pays off. First, we create the stereotype:"
+msgid "But suppose we have many alternatives in the staging environment. It would be much more convenient to be able to enable them all at once. So let's make <literal>@Staging</literal> an <literal>@Alternative</literal> stereotype and annotate the staging beans with this stereotype instead. You'll see how this level of indirection pays off. First, we create the stereotype:"
 msgstr ""
 
 #. Tag: para
@@ -104,7 +104,7 @@
 
 #. Tag: para
 #, no-c-format
-msgid "So we haven&#39;t completely replaced the default implementation in this deployment of the system. The only way one bean can completely override a second bean at all injection points is if it implements all the bean types and declares all the qualifiers of the second bean. However, if the second bean declares a producer method or observer method, then even this is not enough to ensure that the second bean is never called! We need something extra."
+msgid "So we haven't completely replaced the default implementation in this deployment of the system. The only way one bean can completely override a second bean at all injection points is if it implements all the bean types and declares all the qualifiers of the second bean. However, if the second bean declares a producer method or observer method, then even this is not enough to ensure that the second bean is never called! We need something extra."
 msgstr ""
 
 #. Tag: para
@@ -149,7 +149,7 @@
 
 #. Tag: para
 #, no-c-format
-msgid "Since we&#39;re informing the container that our alternative bean is meant to stand in as a replacement for the default implementation, the alternative implementation automatically inherits all qualifiers of the default implementation. Thus, in our example, <literal>MockCreditCardPaymentProcessor</literal> inherits the qualifiers <literal>@Default</literal> and <literal>@CreditCard</literal>."
+msgid "Since we're informing the container that our alternative bean is meant to stand in as a replacement for the default implementation, the alternative implementation automatically inherits all qualifiers of the default implementation. Thus, in our example, <literal>MockCreditCardPaymentProcessor</literal> inherits the qualifiers <literal>@Default</literal> and <literal>@CreditCard</literal>."
 msgstr ""
 
 #. Tag: para

Modified: doc/trunk/reference/pot/stereotypes.pot
===================================================================
--- doc/trunk/reference/pot/stereotypes.pot	2010-07-24 16:36:48 UTC (rev 6808)
+++ doc/trunk/reference/pot/stereotypes.pot	2010-07-25 04:22:37 UTC (rev 6809)
@@ -4,8 +4,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: 0\n"
-"POT-Creation-Date: 2010-05-01T14:44:10\n"
-"PO-Revision-Date: 2010-05-01T14:44:10\n"
+"POT-Creation-Date: 2010-07-25T03:52:15\n"
+"PO-Revision-Date: 2010-07-25T03:52:15\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: None\n"
 "MIME-Version: 1.0\n"
@@ -74,7 +74,7 @@
 
 #. Tag: para
 #, no-c-format
-msgid "Of course, we need to apply some other annotations to our stereotype or else it wouldn&#39;t be adding much value."
+msgid "Of course, we need to apply some other annotations to our stereotype or else it wouldn't be adding much value."
 msgstr ""
 
 #. Tag: title
@@ -94,7 +94,7 @@
 
 #. Tag: para
 #, no-c-format
-msgid "Naturally, overriding a single default isn&#39;t much use. But remember, stereotypes can define more than just the default scope."
+msgid "Naturally, overriding a single default isn't much use. But remember, stereotypes can define more than just the default scope."
 msgstr ""
 
 #. Tag: title
@@ -149,12 +149,12 @@
 
 #. Tag: para
 #, no-c-format
-msgid "This may blow your mind a bit, but stereotypes may declare other stereotypes, which we&#39;ll call <emphasis>stereotype stacking</emphasis>. You may want to do this if you have two distinct stereotypes which are meaningful on their own, but in other situation may be meaningful when combined."
+msgid "This may blow your mind a bit, but stereotypes may declare other stereotypes, which we'll call <emphasis>stereotype stacking</emphasis>. You may want to do this if you have two distinct stereotypes which are meaningful on their own, but in other situation may be meaningful when combined."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Here&#39;s an example that combines the <literal>@Action</literal> and <literal>@Auditable</literal> stereotypes:"
+msgid "Here's an example that combines the <literal>@Action</literal> and <literal>@Auditable</literal> stereotypes:"
 msgstr ""
 
 #. Tag: title
@@ -164,7 +164,7 @@
 
 #. Tag: para
 #, no-c-format
-msgid "We&#39;ve already met two standard stereotypes defined by the CDI specification: <literal>@Interceptor</literal> and <literal>@Decorator</literal>."
+msgid "We've already met two standard stereotypes defined by the CDI specification: <literal>@Interceptor</literal> and <literal>@Decorator</literal>."
 msgstr ""
 
 #. Tag: para

Modified: doc/trunk/reference/pot/viewlayers.pot
===================================================================
--- doc/trunk/reference/pot/viewlayers.pot	2010-07-24 16:36:48 UTC (rev 6808)
+++ doc/trunk/reference/pot/viewlayers.pot	2010-07-25 04:22:37 UTC (rev 6809)
@@ -4,8 +4,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: 0\n"
-"POT-Creation-Date: 2010-05-01T14:44:10\n"
-"PO-Revision-Date: 2010-05-01T14:44:10\n"
+"POT-Creation-Date: 2010-07-25T03:52:15\n"
+"PO-Revision-Date: 2010-07-25T03:52:15\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: None\n"
 "MIME-Version: 1.0\n"
@@ -69,7 +69,7 @@
 
 #. Tag: para
 #, no-c-format
-msgid "Storing the id of any long-running conversation in Wicket&#39;s metadata when the page response is complete"
+msgid "Storing the id of any long-running conversation in Wicket's metadata when the page response is complete"
 msgstr ""
 
 #. Tag: para
@@ -99,6 +99,6 @@
 
 #. Tag: para
 #, no-c-format
-msgid "When a conversation is marked as long-running, the id of that conversation will be stored in Wicket&#39;s metadata for the current page. If a new page is created and set as the response target through <literal>setResponsePage()</literal>, this new page will also participate in this conversation. This occurs for both directly instantiated pages (<literal>setResponsePage(new OtherPage())</literal>), as well as for bookmarkable pages created with <literal>setResponsePage(OtherPage.class)</literal> where <literal>OtherPage.class</literal> is mounted as bookmarkable from your <literal>WebApplication</literal> subclass (or through annotations). In the latter case, because the new page instance is not created until after a redirect, the conversation id will be propagated through a request parameter, and then stored in page metadata after the redirect."
+msgid "When a conversation is marked as long-running, the id of that conversation will be stored in Wicket's metadata for the current page. If a new page is created and set as the response target through <literal>setResponsePage()</literal>, this new page will also participate in this conversation. This occurs for both directly instantiated pages (<literal>setResponsePage(new OtherPage())</literal>), as well as for bookmarkable pages created with <literal>setResponsePage(OtherPage.class)</literal> where <literal>OtherPage.class</literal> is mounted as bookmarkable from your <literal>WebApplication</literal> subclass (or through annotations). In the latter case, because the new page instance is not created until after a redirect, the conversation id will be propagated through a request parameter, and then stored in page metadata after the redirect."
 msgstr ""
 

Modified: doc/trunk/reference/pot/weldexamples.pot
===================================================================
--- doc/trunk/reference/pot/weldexamples.pot	2010-07-24 16:36:48 UTC (rev 6808)
+++ doc/trunk/reference/pot/weldexamples.pot	2010-07-25 04:22:37 UTC (rev 6809)
@@ -4,8 +4,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: 0\n"
-"POT-Creation-Date: 2010-05-01T14:44:10\n"
-"PO-Revision-Date: 2010-05-01T14:44:10\n"
+"POT-Creation-Date: 2010-07-25T03:52:15\n"
+"PO-Revision-Date: 2010-07-25T03:52:15\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: None\n"
 "MIME-Version: 1.0\n"
@@ -19,7 +19,7 @@
 
 #. Tag: para
 #, no-c-format
-msgid "It&#39;s time to pull the covers back and dive into the internals of Weld example applications. Let&#39;s start with the simpler of the two examples, <literal>weld-numberguess</literal>."
+msgid "It's time to pull the covers back and dive into the internals of Weld example applications. Let's start with the simpler of the two examples, <literal>weld-numberguess</literal>."
 msgstr ""
 
 #. Tag: title
@@ -29,27 +29,27 @@
 
 #. Tag: para
 #, no-c-format
-msgid "In the numberguess application you get 10 attempts to guess a number between 1 and 100. After each attempt, you&#39;re told whether your guess was too high or too low."
+msgid "In the numberguess application you get 10 attempts to guess a number between 1 and 100. After each attempt, you're told whether your guess was too high or too low."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "The numberguess example is comprised of a number of beans, configuration files and Facelets (JSF) views, packaged as a war module. Let&#39;s start by examining the configuration files."
+msgid "The numberguess example is comprised of a number of beans, configuration files and Facelets (JSF) views, packaged as a war module. Let's start by examining the configuration files."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "All the configuration files for this example are located in <literal>WEB-INF/</literal>, which can be found in the <literal>src/main/webapp</literal> directory of the example. First, we have the JSF 2.0 version of <literal>faces-config.xml</literal>. A standardized version of Facelets is the default view handler in JSF 2.0, so there&#39;s really nothing that we have to configure. Thus, the configuration consists of only the root element."
+msgid "All the configuration files for this example are located in <literal>WEB-INF/</literal>, which can be found in the <literal>src/main/webapp</literal> directory of the example. First, we have the JSF 2.0 version of <literal>faces-config.xml</literal>. A standardized version of Facelets is the default view handler in JSF 2.0, so there's really nothing that we have to configure. Thus, the configuration consists of only the root element."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "There&#39;s also an empty <literal>beans.xml</literal> file, which tells the container to look for beans in this application and to activate the CDI services."
+msgid "There's also an empty <literal>beans.xml</literal> file, which tells the container to look for beans in this application and to activate the CDI services."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Finally, there&#39;s the familiar <literal>web.xml</literal>:"
+msgid "Finally, there's the familiar <literal>web.xml</literal>:"
 msgstr ""
 
 #. Tag: para
@@ -79,7 +79,7 @@
 
 #. Tag: para
 #, no-c-format
-msgid "Let&#39;s take a look at the main JSF view, <literal>src/main/webapp/home.xhtml</literal>."
+msgid "Let's take a look at the main JSF view, <literal>src/main/webapp/home.xhtml</literal>."
 msgstr ""
 
 #. Tag: para
@@ -89,7 +89,7 @@
 
 #. Tag: para
 #, no-c-format
-msgid "There are a number of messages which can be sent to the user, &#34;Higher!&#34;, &#34;Lower!&#34; and &#34;Correct!&#34;"
+msgid "There are a number of messages which can be sent to the user, \"Higher!\", \"Lower!\" and \"Correct!\""
 msgstr ""
 
 #. Tag: para
@@ -104,7 +104,7 @@
 
 #. Tag: para
 #, no-c-format
-msgid "A validator binding is used to make sure the user doesn&#39;t accidentally input a number outside of the range in which they can guess - if the validator wasn&#39;t here, the user might use up a guess on an out of bounds number."
+msgid "A validator binding is used to make sure the user doesn't accidentally input a number outside of the range in which they can guess - if the validator wasn't here, the user might use up a guess on an out of bounds number."
 msgstr ""
 
 #. Tag: para
@@ -129,7 +129,7 @@
 
 #. Tag: para
 #, no-c-format
-msgid "The <literal>Generator</literal> is application scoped, so we don&#39;t get a different random each time."
+msgid "The <literal>Generator</literal> is application scoped, so we don't get a different random each time."
 msgstr ""
 
 #. Tag: para
@@ -139,12 +139,12 @@
 
 #. Tag: para
 #, no-c-format
-msgid "The final bean in the application is the session-scoped <literal>Game</literal> class. This is the primary entry point of the application. It&#39;s responsible for setting up or resetting the game, capturing and validating the user&#39;s guess and providing feedback to the user with a <literal>FacesMessage</literal>. We&#39;ve used the post-construct lifecycle method to initialize the game by retrieving a random number from the <literal>@Random Instance&#60;Integer&#62;</literal> bean."
+msgid "The final bean in the application is the session-scoped <literal>Game</literal> class. This is the primary entry point of the application. It's responsible for setting up or resetting the game, capturing and validating the user's guess and providing feedback to the user with a <literal>FacesMessage</literal>. We've used the post-construct lifecycle method to initialize the game by retrieving a random number from the <literal>@Random Instance&lt;Integer&gt;</literal> bean."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "You&#39;ll notice that we&#39;ve also added the <literal>@Named</literal> annotation to this class. This annotation is only required when you want to make the bean accessible to a JSF view via EL (i.e., #{game})."
+msgid "You'll notice that we've also added the <literal>@Named</literal> annotation to this class. This annotation is only required when you want to make the bean accessible to a JSF view via EL (i.e., #{game})."
 msgstr ""
 
 #. Tag: title
@@ -164,12 +164,12 @@
 
 #. Tag: para
 #, no-c-format
-msgid "Second, we need to explicitly specify the servlet listener in <literal>web.xml</literal>, again because the container isn&#39;t doing this stuff for you. The servlet listener boots Weld and controls it&#39;s interaction with requests."
+msgid "Second, we need to explicitly specify the servlet listener in <literal>web.xml</literal>, again because the container isn't doing this stuff for you. The servlet listener boots Weld and controls it's interaction with requests."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "When Weld boots, it places the <literal>javax.enterprise.inject.spi.BeanManager</literal>, the portable SPI for obtaining bean instances, in the ServletContext under a variable name equal to the fully-qualified interface name. You generally don&#39;t need to access this interface, but Weld makes use of it."
+msgid "When Weld boots, it places the <literal>javax.enterprise.inject.spi.BeanManager</literal>, the portable SPI for obtaining bean instances, in the ServletContext under a variable name equal to the fully-qualified interface name. You generally don't need to access this interface, but Weld makes use of it."
 msgstr ""
 
 #. Tag: title
@@ -179,22 +179,22 @@
 
 #. Tag: para
 #, no-c-format
-msgid "Weld includes a number of portable extensions for JSR-299, including an extension for Wicket, which allows you to inject beans into Wicket components and leverage the conversation context. In this section, we&#39;ll walk you through the Wicket version of the numberguess example."
+msgid "Weld includes a number of portable extensions for JSR-299, including an extension for Wicket, which allows you to inject beans into Wicket components and leverage the conversation context. In this section, we'll walk you through the Wicket version of the numberguess example."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "You may want to review the Wicket documentation at <ulink url=\"http://wicket.apache.org/\">http://wicket.apache.org/</ulink> before reading this section, if you aren&#39;t already familiar with the framework."
+msgid "You may want to review the Wicket documentation at <ulink url=\"http://wicket.apache.org/\">http://wicket.apache.org/</ulink> before reading this section, if you aren't already familiar with the framework."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Wicket is another environment that relies on the Weld servlet extension. The use of <ulink url=\"http://jetty.mortbay.org\">Jetty</ulink> is common in the Wicket community, and is thus chosen here as the runtime container. You&#39;ve seen already that Jetty is perfectly capable of running CDI applications with Weld add-ons, and this environment is no different."
+msgid "Wicket is another environment that relies on the Weld servlet extension. The use of <ulink url=\"http://jetty.mortbay.org\">Jetty</ulink> is common in the Wicket community, and is thus chosen here as the runtime container. You've seen already that Jetty is perfectly capable of running CDI applications with Weld add-ons, and this environment is no different."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "We&#39;ll also be using the Eclipse IDE in these examples. Instructions are provided later for running the example from the command line, but since you&#39;ll likely need to do more than just deploy examples, we&#39;ll get setup in this full development environment."
+msgid "We'll also be using the Eclipse IDE in these examples. Instructions are provided later for running the example from the command line, but since you'll likely need to do more than just deploy examples, we'll get setup in this full development environment."
 msgstr ""
 
 #. Tag: title
@@ -209,7 +209,7 @@
 
 #. Tag: para
 #, no-c-format
-msgid "If you have m2eclipse installed, you can open any Maven project directly. From within Eclipse, select <emphasis>File -&#62; Import... -&#62; Maven Projects</emphasis>. Then, browse to the location of the Wicket numberguess example. You should see that Eclipse recognizes the existence of a Maven project."
+msgid "If you have m2eclipse installed, you can open any Maven project directly. From within Eclipse, select <emphasis>File -&gt; Import... -&gt; Maven Projects</emphasis>. Then, browse to the location of the Wicket numberguess example. You should see that Eclipse recognizes the existence of a Maven project."
 msgstr ""
 
 #. Tag: para
@@ -219,12 +219,12 @@
 
 #. Tag: para
 #, no-c-format
-msgid "You&#39;ll notice after importing, the project has a build error. That&#39;s because we need to enable a Maven profile. Right-click on the project and select <emphasis>Properties</emphasis>, then select the <emphasis>Maven</emphasis> tab in the window that appears. In the form field labeled &#34;Active Maven Profiles (comma separated):&#34;, type <literal>jetty</literal>. That will enable some extra dependencies that allow the project to compile. Additionally, <emphasis>uncheck</emphasis> the box labeled &#34;Skip Maven compile plugin when processing resources (recommended)&#34;. That solves an incompatiblity between the m2eclipse plugin and the Maven enforcer plugin that we use for the Weld project. Now, you&#39;re ready to develop!"
+msgid "You'll notice after importing, the project has a build error. That's because we need to enable a Maven profile. Right-click on the project and select <emphasis>Properties</emphasis>, then select the <emphasis>Maven</emphasis> tab in the window that appears. In the form field labeled \"Active Maven Profiles (comma separated):\", type <literal>jetty</literal>. That will enable some extra dependencies that allow the project to compile. Additionally, <emphasis>uncheck</emphasis> the box labeled \"Skip Maven compile plugin when processing resources (recommended)\". That solves an incompatiblity between the m2eclipse plugin and the Maven enforcer plugin that we use for the Weld project. Now, you're ready to develop!"
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Be sure to uncheck the box &#34;Skip Maven compile plugin when processing resources (recommended)&#34; in the Maven properties screen or else the example might not run in Eclipse because beans.xml will be missing from the classpath! See the <ulink url=\"https://issues.sonatype.org/browse/MNGECLIPSE-768\">MNGECLIPSE-768</ulink> issue report for details."
+msgid "Be sure to uncheck the box \"Skip Maven compile plugin when processing resources (recommended)\" in the Maven properties screen or else the example might not run in Eclipse because beans.xml will be missing from the classpath! See the <ulink url=\"https://issues.sonatype.org/browse/MNGECLIPSE-768\">MNGECLIPSE-768</ulink> issue report for details."
 msgstr ""
 
 #. Tag: para
@@ -234,12 +234,12 @@
 
 #. Tag: para
 #, no-c-format
-msgid "Then, from Eclipse, choose <emphasis>File -&#62; Import... -&#62; General -&#62; Existing Projects into Workspace</emphasis>, select the root directory of the numberguess example, and click Finish. This will create a project in your workspace called <literal>weld-wicket-numberguess</literal>."
+msgid "Then, from Eclipse, choose <emphasis>File -&gt; Import... -&gt; General -&gt; Existing Projects into Workspace</emphasis>, select the root directory of the numberguess example, and click Finish. This will create a project in your workspace called <literal>weld-wicket-numberguess</literal>."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "It&#39;s time to get the example running!"
+msgid "It's time to get the example running!"
 msgstr ""
 
 #. Tag: title
@@ -279,7 +279,7 @@
 
 #. Tag: para
 #, no-c-format
-msgid "Enough toying with deployment, let&#39;s dive into the code."
+msgid "Enough toying with deployment, let's dive into the code."
 msgstr ""
 
 #. Tag: title
@@ -299,7 +299,7 @@
 
 #. Tag: para
 #, no-c-format
-msgid "Here&#39;s where things differ from the JSF numberguess example:"
+msgid "Here's where things differ from the JSF numberguess example:"
 msgstr ""
 
 #. Tag: para
@@ -384,7 +384,7 @@
 
 #. Tag: para
 #, no-c-format
-msgid "Let&#39;s have a look at the significant code and configuration files that make up this example."
+msgid "Let's have a look at the significant code and configuration files that make up this example."
 msgstr ""
 
 #. Tag: para
@@ -394,17 +394,17 @@
 
 #. Tag: para
 #, no-c-format
-msgid "The game&#39;s main logic is located in <literal>Game.java</literal>. Here is the code for that class, highlighting the ways in which this differs from the web application version:"
+msgid "The game's main logic is located in <literal>Game.java</literal>. Here is the code for that class, highlighting the ways in which this differs from the web application version:"
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "The bean is application scoped rather than session scoped, since an instance of a Swing application typically represents a single &#39;session&#39;."
+msgid "The bean is application scoped rather than session scoped, since an instance of a Swing application typically represents a single 'session'."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Notice that the bean is not named, since it doesn&#39;t need to be accessed via EL."
+msgid "Notice that the bean is not named, since it doesn't need to be accessed via EL."
 msgstr ""
 
 #. Tag: para
@@ -434,12 +434,12 @@
 
 #. Tag: para
 #, no-c-format
-msgid "The <literal>reset()</literal> method makes a call to the injected <literal>rndGenerator</literal> in order to get the random number at the start of each game. Note that it can&#39;t use <literal>Instance.get()</literal> like the JSF example does because there will not be any active contexts like there are during a JSF request."
+msgid "The <literal>reset()</literal> method makes a call to the injected <literal>rndGenerator</literal> in order to get the random number at the start of each game. Note that it can't use <literal>Instance.get()</literal> like the JSF example does because there will not be any active contexts like there are during a JSF request."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "The <literal>MessageGenerator</literal> class depends on the current instance of <literal>Game</literal> and queries its state in order to determine the appropriate messages to provide as the prompt for the user&#39;s next guess and the response to the previous guess. The code for <literal>MessageGenerator</literal> is as follows:"
+msgid "The <literal>MessageGenerator</literal> class depends on the current instance of <literal>Game</literal> and queries its state in order to determine the appropriate messages to provide as the prompt for the user's next guess and the response to the previous guess. The code for <literal>MessageGenerator</literal> is as follows:"
 msgstr ""
 
 #. Tag: para
@@ -449,7 +449,7 @@
 
 #. Tag: para
 #, no-c-format
-msgid "The <literal>Game</literal>&#39;s state is interrogated to determine the appropriate challenge message ..."
+msgid "The <literal>Game</literal>'s state is interrogated to determine the appropriate challenge message ..."
 msgstr ""
 
 #. Tag: para
@@ -484,7 +484,7 @@
 
 #. Tag: para
 #, no-c-format
-msgid "<literal>guessButtonActionPerformed</literal> is called when the &#39;Guess&#39; button is clicked, and it does the following:"
+msgid "<literal>guessButtonActionPerformed</literal> is called when the 'Guess' button is clicked, and it does the following:"
 msgstr ""
 
 #. Tag: para
@@ -494,7 +494,7 @@
 
 #. Tag: para
 #, no-c-format
-msgid "Calls <literal>game.check()</literal> to validate and perform one &#39;turn&#39; of the game"
+msgid "Calls <literal>game.check()</literal> to validate and perform one 'turn' of the game"
 msgstr ""
 
 #. Tag: para
@@ -519,7 +519,7 @@
 
 #. Tag: para
 #, no-c-format
-msgid "The translator example is built as an ear and contains EJBs. As a result, it&#39;s structure is more complex than the numberguess example."
+msgid "The translator example is built as an ear and contains EJBs. As a result, it's structure is more complex than the numberguess example."
 msgstr ""
 
 #. Tag: para
@@ -529,7 +529,7 @@
 
 #. Tag: para
 #, no-c-format
-msgid "First, let&#39;s take a look at the ear aggregator, which is located in the example&#39;s <literal>ear</literal> directory. Maven automatically generates the <literal>application.xml</literal> for us from this plugin configuration:"
+msgid "First, let's take a look at the ear aggregator, which is located in the example's <literal>ear</literal> directory. Maven automatically generates the <literal>application.xml</literal> for us from this plugin configuration:"
 msgstr ""
 
 #. Tag: para
@@ -539,12 +539,12 @@
 
 #. Tag: para
 #, no-c-format
-msgid "If you weren&#39;t using Maven to generate these files, you would need <literal>META-INF/application.xml</literal>:"
+msgid "If you weren't using Maven to generate these files, you would need <literal>META-INF/application.xml</literal>:"
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Next, lets look at the war, which is located in the example&#39;s <literal>war</literal> directory. Just as in the numberguess example, we have a <literal>faces-config.xml</literal> for JSF 2.0 and a <literal>web.xml</literal> (to activate JSF) under WEB-INF, both sourced from <literal>src/main/webapp/WEB-INF</literal>."
+msgid "Next, lets look at the war, which is located in the example's <literal>war</literal> directory. Just as in the numberguess example, we have a <literal>faces-config.xml</literal> for JSF 2.0 and a <literal>web.xml</literal> (to activate JSF) under WEB-INF, both sourced from <literal>src/main/webapp/WEB-INF</literal>."
 msgstr ""
 
 #. Tag: para
@@ -559,12 +559,12 @@
 
 #. Tag: para
 #, no-c-format
-msgid "Finally, let&#39;s look at the EJB module, which is located in the example&#39;s <literal>ejb</literal> directory. In <literal>src/main/resources/META-INF</literal> there is just an empty <literal>beans.xml</literal>, used to mark the archive as containing beans."
+msgid "Finally, let's look at the EJB module, which is located in the example's <literal>ejb</literal> directory. In <literal>src/main/resources/META-INF</literal> there is just an empty <literal>beans.xml</literal>, used to mark the archive as containing beans."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "We&#39;ve saved the most interesting bit to last, the code! The project has two simple beans, <literal>SentenceParser</literal> and <literal>TextTranslator</literal> and two session beans, <literal>TranslatorControllerBean</literal> and <literal>SentenceTranslator</literal>. You should be getting quite familiar with what a bean looks like by now, so we&#39;ll just highlight the most interesting bits here."
+msgid "We've saved the most interesting bit to last, the code! The project has two simple beans, <literal>SentenceParser</literal> and <literal>TextTranslator</literal> and two session beans, <literal>TranslatorControllerBean</literal> and <literal>SentenceTranslator</literal>. You should be getting quite familiar with what a bean looks like by now, so we'll just highlight the most interesting bits here."
 msgstr ""
 
 #. Tag: para
@@ -574,7 +574,7 @@
 
 #. Tag: para
 #, no-c-format
-msgid "<literal>TextTranslator</literal> uses the simple bean (really just a plain Java class!) <literal>SentenceParser</literal> to parse the sentence and then calls on the stateless bean with the local business interface <literal>Translator</literal> to perform the translation. That&#39;s where the magic happens. Of course, we couldn&#39;t develop a full translator, but it&#39;s convincing enough to anyone who doesn&#39;t understand Latin!"
+msgid "<literal>TextTranslator</literal> uses the simple bean (really just a plain Java class!) <literal>SentenceParser</literal> to parse the sentence and then calls on the stateless bean with the local business interface <literal>Translator</literal> to perform the translation. That's where the magic happens. Of course, we couldn't develop a full translator, but it's convincing enough to anyone who doesn't understand Latin!"
 msgstr ""
 
 #. Tag: para

Modified: doc/trunk/reference/pot/xml.pot
===================================================================
--- doc/trunk/reference/pot/xml.pot	2010-07-24 16:36:48 UTC (rev 6808)
+++ doc/trunk/reference/pot/xml.pot	2010-07-25 04:22:37 UTC (rev 6809)
@@ -4,8 +4,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: 0\n"
-"POT-Creation-Date: 2010-05-01T14:44:10\n"
-"PO-Revision-Date: 2010-05-01T14:44:10\n"
+"POT-Creation-Date: 2010-07-25T03:52:15\n"
+"PO-Revision-Date: 2010-07-25T03:52:15\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: None\n"
 "MIME-Version: 1.0\n"
@@ -19,7 +19,7 @@
 
 #. Tag: para
 #, no-c-format
-msgid "So far, we&#39;ve seen plenty of examples of beans declared using annotations. However, there are a couple of occasions when we can&#39;t use annotations to define the bean:"
+msgid "So far, we've seen plenty of examples of beans declared using annotations. However, there are a couple of occasions when we can't use annotations to define the bean:"
 msgstr ""
 
 #. Tag: para
@@ -44,7 +44,7 @@
 
 #. Tag: para
 #, no-c-format
-msgid "The advantage of this approach is that you can write an XML schema that prevents spelling errors in your XML document. It&#39;s even possible for a tool to generate the XML schema automatically from the compiled Java code. Or, an integrated development environment could perform the same validation without the need for the explicit intermediate generation step."
+msgid "The advantage of this approach is that you can write an XML schema that prevents spelling errors in your XML document. It's even possible for a tool to generate the XML schema automatically from the compiled Java code. Or, an integrated development environment could perform the same validation without the need for the explicit intermediate generation step."
 msgstr ""
 
 #. Tag: title
@@ -64,7 +64,7 @@
 
 #. Tag: para
 #, no-c-format
-msgid "For example, the element <literal>&#60;util:Date/&#62;</literal> in the following XML fragment refers to the class <literal>java.util.Date</literal>:"
+msgid "For example, the element <literal>&lt;util:Date/&gt;</literal> in the following XML fragment refers to the class <literal>java.util.Date</literal>:"
 msgstr ""
 
 #. Tag: para
@@ -124,12 +124,12 @@
 
 #. Tag: para
 #, no-c-format
-msgid "The <literal>&#60;Name&#62;</literal> element declares a bean of scope <literal>@Dependent</literal> and class <literal>Name</literal>, with a set of initial field values. This bean has a special, container-generated qualifier and is therefore injectable only to the specific injection point at which it is declared."
+msgid "The <literal>&lt;Name&gt;</literal> element declares a bean of scope <literal>@Dependent</literal> and class <literal>Name</literal>, with a set of initial field values. This bean has a special, container-generated qualifier and is therefore injectable only to the specific injection point at which it is declared."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "This simple but powerful feature allows the Weld XML format to be used to specify whole graphs of Java objects. It&#39;s not quite a full databinding solution, but it&#39;s close!"
+msgid "This simple but powerful feature allows the Weld XML format to be used to specify whole graphs of Java objects. It's not quite a full databinding solution, but it's close!"
 msgstr ""
 
 #. Tag: title
@@ -139,7 +139,7 @@
 
 #. Tag: para
 #, no-c-format
-msgid "If we want our XML document format to be authored by people who aren&#39;t Java developers, or who don&#39;t have access to our code, we need to provide a schema. There&#39;s nothing specific to Weld about writing or using the schema."
+msgid "If we want our XML document format to be authored by people who aren't Java developers, or who don't have access to our code, we need to provide a schema. There's nothing specific to Weld about writing or using the schema."
 msgstr ""
 
 #. Tag: para

Modified: doc/trunk/reference/src/main/docbook/de-DE/beans.po
===================================================================
--- doc/trunk/reference/src/main/docbook/de-DE/beans.po	2010-07-24 16:36:48 UTC (rev 6808)
+++ doc/trunk/reference/src/main/docbook/de-DE/beans.po	2010-07-25 04:22:37 UTC (rev 6809)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: Weld_-_JSR-299_Reference_Implementation VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-05-01T13:53:42\n"
+"POT-Creation-Date: 2010-07-25T03:52:14\n"
 "PO-Revision-Date: 2009-11-11 15:00+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -32,13 +32,13 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Let&#39;s back up a second. What does it really mean to be "
-"<emphasis>contextual</emphasis>? Since beans may be stateful, it matters "
-"<emphasis>which</emphasis> bean instance I have. Unlike a stateless "
-"component model (for example, stateless session beans) or a singleton "
-"component model (such as servlets, or singleton beans), different clients of "
-"a bean see the bean in different states. The client-visible state depends "
-"upon which instance of the bean the client has a reference to."
+"Let's back up a second. What does it really mean to be <emphasis>contextual</"
+"emphasis>? Since beans may be stateful, it matters <emphasis>which</"
+"emphasis> bean instance I have. Unlike a stateless component model (for "
+"example, stateless session beans) or a singleton component model (such as "
+"servlets, or singleton beans), different clients of a bean see the bean in "
+"different states. The client-visible state depends upon which instance of "
+"the bean the client has a reference to."
 msgstr ""
 
 #. Tag: para
@@ -83,10 +83,10 @@
 msgid ""
 "One great advantage of the contextual model is that it allows stateful beans "
 "to be treated like services! The client need not concern itself with "
-"managing the lifecycle of the bean it&#39;s using, <emphasis>nor does it "
-"even need to know what that lifecycle is.</emphasis> Beans interact by "
-"passing messages, and the bean implementations define the lifecycle of their "
-"own state. The beans are loosely coupled because:"
+"managing the lifecycle of the bean it's using, <emphasis>nor does it even "
+"need to know what that lifecycle is.</emphasis> Beans interact by passing "
+"messages, and the bean implementations define the lifecycle of their own "
+"state. The beans are loosely coupled because:"
 msgstr ""
 
 #. Tag: para
@@ -171,7 +171,7 @@
 
 #. Tag: para
 #, no-c-format
-msgid "Let&#39;s see what all this new terminology means."
+msgid "Let's see what all this new terminology means."
 msgstr ""
 
 #. Tag: title
@@ -183,8 +183,8 @@
 #, no-c-format
 msgid ""
 "Beans usually acquire references to other beans via dependency injection. "
-"Any injected attribute specifies a &#34;contract&#34; that must be satisfied "
-"by the bean to be injected. The contract is:"
+"Any injected attribute specifies a \"contract\" that must be satisfied by "
+"the bean to be injected. The contract is:"
 msgstr ""
 
 #. Tag: para
@@ -211,7 +211,7 @@
 #, no-c-format
 msgid ""
 "The bean types are <literal>BookShop</literal>, <literal>Business</literal> "
-"and <literal>Shop&#60;Book&#62;</literal>, as well as the implicit type "
+"and <literal>Shop&lt;Book&gt;</literal>, as well as the implicit type "
 "<literal>java.lang.Object</literal>. (Notice that a parameterized type is a "
 "legal bean type)."
 msgstr ""
@@ -230,9 +230,9 @@
 msgid ""
 "The bean types of a session bean include local interfaces and the bean class "
 "local view (if any). EJB remote interfaces are not considered bean types of "
-"a session bean. You can&#39;t inject an EJB using its remote interface "
-"unless you define a <emphasis>resource</emphasis>, which we&#39;ll meet in "
-"<xref linkend=\"resources\" />."
+"a session bean. You can't inject an EJB using its remote interface unless "
+"you define a <emphasis>resource</emphasis>, which we'll meet in <xref "
+"linkend=\"resources\" />."
 msgstr ""
 
 #. Tag: para
@@ -241,7 +241,7 @@
 "Bean types may be restricted to an explicit set by annotating the bean with "
 "the <literal>@Typed</literal> annotation and listing the classes that should "
 "be bean types. For instance, the bean types of this bean have been "
-"restricted to <literal>Shop&#60;Book&#62;</literal>, together with "
+"restricted to <literal>Shop&lt;Book&gt;</literal>, together with "
 "<literal>java.lang.Object</literal>:"
 msgstr ""
 
@@ -255,8 +255,8 @@
 "<literal>DebitPaymentProcessor</literal>. Injecting a field of type "
 "<literal>PaymentProcessor</literal> introduces an ambiguous condition. In "
 "these cases, the client must specify some additional quality of the "
-"implementation it is interested in. We model this kind of &#34;quality&#34; "
-"using a qualifier."
+"implementation it is interested in. We model this kind of \"quality\" using "
+"a qualifier."
 msgstr ""
 
 #. Tag: para
@@ -265,23 +265,23 @@
 "A qualifier is a user-defined annotation that is itself annotated "
 "<literal>@Qualifer</literal>. A qualifier annotation is an extension of the "
 "type system. It lets us disambiguate a type without having to fall back to "
-"string-based names. Here&#39;s an example of a qualifier annotation:"
+"string-based names. Here's an example of a qualifier annotation:"
 msgstr ""
 
 #. Tag: para
 #, no-c-format
 msgid ""
 "You may not be used to seeing the definition of an annotation. In fact, this "
-"might be the first time you&#39;ve encountered one. With CDI, annotation "
-"definitions will become a familiar artifact as you&#39;ll be creating them "
-"from time to time."
+"might be the first time you've encountered one. With CDI, annotation "
+"definitions will become a familiar artifact as you'll be creating them from "
+"time to time."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
 msgid ""
 "Pay attention to the names of the built-in annotations in CDI and EJB. "
-"You&#39;ll notice that they are often adjectives. We encourage you to follow "
+"You'll notice that they are often adjectives. We encourage you to follow "
 "this convention when creating your custom annotations, since they serve to "
 "describe the behaviors and roles of the class."
 msgstr ""
@@ -308,7 +308,7 @@
 "For each injection point, the container searches for a bean which satisfies "
 "the contract, one which has the bean type and all the qualifiers. If it "
 "finds exactly one matching bean, it injects an instance of that bean. If it "
-"doesn&#39;t, it reports an error to the user."
+"doesn't, it reports an error to the user."
 msgstr ""
 
 #. Tag: para
@@ -330,10 +330,10 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"That&#39;s not quite the end of the story. CDI also defines a simple "
+"That's not quite the end of the story. CDI also defines a simple "
 "<emphasis>resolution rule</emphasis> that helps the container decide what to "
 "do if there is more than one bean that satisfies a particular contract. "
-"We&#39;ll get into the details in <xref linkend=\"injection\" />."
+"We'll get into the details in <xref linkend=\"injection\" />."
 msgstr ""
 
 #. Tag: title
@@ -370,7 +370,7 @@
 msgid ""
 "Keep in mind that once a bean is bound to a context, it remains in that "
 "context until the context is destroyed. There is no way to manually remove a "
-"bean from a context. If you don&#39;t want the bean to sit in the session "
+"bean from a context. If you don't want the bean to sit in the session "
 "indefinitely, consider using another scope with a shorted lifespan, such as "
 "the request or conversation scope."
 msgstr ""
@@ -386,8 +386,7 @@
 
 #. Tag: para
 #, no-c-format
-msgid ""
-"We&#39;ll talk more about scopes in <xref linkend=\"scopescontexts\" />."
+msgid "We'll talk more about scopes in <xref linkend=\"scopescontexts\" />."
 msgstr ""
 
 #. Tag: title
@@ -446,7 +445,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"We&#39;ve already seen how qualifiers let us choose between multiple "
+"We've already seen how qualifiers let us choose between multiple "
 "implementations of an interface at development time. But sometimes we have "
 "an interface (or other bean type) whose implementation varies depending upon "
 "the deployment environment. For example, we may want to use a mock "
@@ -483,9 +482,9 @@
 msgid ""
 "You might be familiar with the use of interceptors in EJB 3.0. In Java EE 6, "
 "this functionality has been generalized to work with other managed beans. "
-"That&#39;s right, you no longer have to make your bean an EJB just to "
-"intercept its methods. Holler. So what does CDI have to offer above and "
-"beyond that? Well, quite a lot actually. Let&#39;s cover some background."
+"That's right, you no longer have to make your bean an EJB just to intercept "
+"its methods. Holler. So what does CDI have to offer above and beyond that? "
+"Well, quite a lot actually. Let's cover some background."
 msgstr ""
 
 #. Tag: para
@@ -498,10 +497,10 @@
 "descriptor. You might as well just put the interceptor code <emphasis>in</"
 "emphasis> the implementation! Second, the order in which the interceptors "
 "are applied is taken from the order in which they are declared in the "
-"annotation or the XML descriptor. Perhaps this isn&#39;t so bad if you&#39;"
-"re applying the interceptors to a single bean. But, if you are applying them "
-"repeatedly, then there&#39;s a good chance that you&#39;ll inadvertently "
-"define a different order for different beans. Now that&#39;s a problem."
+"annotation or the XML descriptor. Perhaps this isn't so bad if you're "
+"applying the interceptors to a single bean. But, if you are applying them "
+"repeatedly, then there's a good chance that you'll inadvertently define a "
+"different order for different beans. Now that's a problem."
 msgstr ""
 
 #. Tag: para
@@ -540,14 +539,14 @@
 #, no-c-format
 msgid ""
 "Notice that <literal>ShoppingCart</literal> and "
-"<literal>TransactionInterceptor</literal> don&#39;t know anything about each "
+"<literal>TransactionInterceptor</literal> don't know anything about each "
 "other."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
 msgid ""
-"Interceptors are deployment-specific. (We don&#39;t need a "
+"Interceptors are deployment-specific. (We don't need a "
 "<literal>TransactionInterceptor</literal> in our unit tests!) By default, an "
 "interceptor is disabled. We can enable an interceptor using the CDI "
 "deployment descriptor <literal>META-INF/beans.xml</literal> of the jar or "
@@ -557,8 +556,8 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"We&#39;ll discuss interceptors, and their cousins, decorators, in <xref "
-"linkend=\"interceptors\" /> and <xref linkend=\"decorators\" />."
+"We'll discuss interceptors, and their cousins, decorators, in <xref linkend="
+"\"interceptors\" /> and <xref linkend=\"decorators\" />."
 msgstr ""
 
 #. Tag: title
@@ -569,10 +568,9 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"We&#39;ve already seen two types of beans: JavaBeans and EJB session beans. "
-"Is that the whole story? Actually, it&#39;s just the beginning. Let&#39;s "
-"explore the various kinds of beans that CDI implementations must support out-"
-"of-the-box."
+"We've already seen two types of beans: JavaBeans and EJB session beans. Is "
+"that the whole story? Actually, it's just the beginning. Let's explore the "
+"various kinds of beans that CDI implementations must support out-of-the-box."
 msgstr ""
 
 #. Tag: title
@@ -586,8 +584,8 @@
 "A managed bean is a Java class. The basic lifecycle and semantics of a "
 "managed bean are defined by the Managed Beans specification. You can "
 "explicitly declare a managed bean by annotating the bean class "
-"<literal>@ManagedBean</literal>, but in CDI you don&#39;t need to. According "
-"to the specification, the CDI container treats any class that satisfies the "
+"<literal>@ManagedBean</literal>, but in CDI you don't need to. According to "
+"the specification, the CDI container treats any class that satisfies the "
 "following conditions as a managed bean:"
 msgstr ""
 
@@ -636,7 +634,7 @@
 "According to this definition, JPA entities are technically managed beans. "
 "However, entities have their own special lifecycle, state and identity model "
 "and are usually instantiated by JPA or using <literal>new</literal>. "
-"Therefore we don&#39;t recommend directly injecting an entity class. We "
+"Therefore we don't recommend directly injecting an entity class. We "
 "especially recommend against assigning a scope other than "
 "<literal>@Dependent</literal> to an entity class, since JPA is not able to "
 "persist injected CDI proxies."
@@ -715,7 +713,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"There&#39;s no reason to explicitly declare the scope of a stateless session "
+"There's no reason to explicitly declare the scope of a stateless session "
 "bean or singleton session bean. The EJB container controls the lifecycle of "
 "these beans, according to the semantics of the <literal>@Stateless</literal> "
 "or <literal>@Singleton</literal> declaration. On the other hand, a stateful "
@@ -771,8 +769,8 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"When we don&#39;t need any of these things, an ordinary managed bean will "
-"serve just fine."
+"When we don't need any of these things, an ordinary managed bean will serve "
+"just fine."
 msgstr ""
 
 #. Tag: para
@@ -796,7 +794,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Finally, it&#39;s usually obvious when method-level transaction management, "
+"Finally, it's usually obvious when method-level transaction management, "
 "method-level security, timers, remote methods or asynchronous methods are "
 "needed."
 msgstr ""
@@ -804,11 +802,11 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"The point we&#39;re trying to make is: use a session bean when you need the "
+"The point we're trying to make is: use a session bean when you need the "
 "services it provides, not just because you want to use dependency injection, "
 "lifecycle management, or interceptors. Java EE 6 provides a graduated "
-"programming model. It&#39;s usually easy to start with an ordinary managed "
-"bean, and later turn it into an EJB just by adding one of the following "
+"programming model. It's usually easy to start with an ordinary managed bean, "
+"and later turn it into an EJB just by adding one of the following "
 "annotations: <literal>@Stateless</literal>, <literal>@Stateful</literal> or "
 "<literal>@Singleton</literal>."
 msgstr ""
@@ -816,14 +814,13 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"On the other hand, don&#39;t be scared to use session beans just because "
-"you&#39;ve heard your friends say they&#39;re &#34;heavyweight&#34;. It&#39;"
-"s nothing more than superstition to think that something is &#34;"
-"heavier&#34; just because it&#39;s hosted natively within the Java EE "
-"container, instead of by a proprietary bean container or dependency "
-"injection framework that runs as an additional layer of obfuscation. And as "
-"a general principle, you should be skeptical of folks who use vaguely "
-"defined terminology like &#34;heavyweight&#34;."
+"On the other hand, don't be scared to use session beans just because you've "
+"heard your friends say they're \"heavyweight\". It's nothing more than "
+"superstition to think that something is \"heavier\" just because it's hosted "
+"natively within the Java EE container, instead of by a proprietary bean "
+"container or dependency injection framework that runs as an additional layer "
+"of obfuscation. And as a general principle, you should be skeptical of folks "
+"who use vaguely defined terminology like \"heavyweight\"."
 msgstr ""
 
 #. Tag: title
@@ -862,7 +859,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"We can&#39;t write a bean class that is itself a random number. But we can "
+"We can't write a bean class that is itself a random number. But we can "
 "certainly write a method that returns a random number. By making the method "
 "a producer method, we allow the return value of the method—in this case an "
 "<literal>Integer</literal>—to be injected. We can even specify a qualifier—"
@@ -934,7 +931,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"We&#39;ll talk much more about producer methods in <xref linkend="
+"We'll talk much more about producer methods in <xref linkend="
 "\"producermethods\" />."
 msgstr ""
 
@@ -965,7 +962,7 @@
 "A producer field is really just a shortcut that lets us avoid writing a "
 "useless getter method. However, in addition to convenience, producer fields "
 "serve a specific purpose as an adaptor for Java EE component environment "
-"injection, but to learn more about that, you&#39;ll have to wait until <xref "
-"linkend=\"resources\" />. Because we can&#39;t wait to get to work on some "
+"injection, but to learn more about that, you'll have to wait until <xref "
+"linkend=\"resources\" />. Because we can't wait to get to work on some "
 "examples."
 msgstr ""

Modified: doc/trunk/reference/src/main/docbook/de-DE/decorators.po
===================================================================
--- doc/trunk/reference/src/main/docbook/de-DE/decorators.po	2010-07-24 16:36:48 UTC (rev 6808)
+++ doc/trunk/reference/src/main/docbook/de-DE/decorators.po	2010-07-25 04:22:37 UTC (rev 6809)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: decorators\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-05-01T13:53:42\n"
+"POT-Creation-Date: 2010-07-25T03:52:14\n"
 "PO-Revision-Date: 2009-02-02 09:30+1100\n"
 "Last-Translator: \n"
 "Language-Team:  <en at li.org>\n"
@@ -28,8 +28,8 @@
 "interceptor is able to intercept invocations of any Java type. This makes "
 "them perfect for solving technical concerns such as transaction management, "
 "security and call logging. However, by nature, interceptors are unaware of "
-"the actual semantics of the events they intercept. Thus, interceptors "
-"aren&#39;t an appropriate tool for separating business-related concerns."
+"the actual semantics of the events they intercept. Thus, interceptors aren't "
+"an appropriate tool for separating business-related concerns."
 msgstr ""
 "Interzeptoren bieten eine leistungsfähige Weise, Probleme, die "
 "<emphasis>orthogonal</emphasis> zum Typensystem sind, festzuhalten und zu "
@@ -48,11 +48,10 @@
 "aware of all the semantics attached to that interface. Since decorators "
 "directly implement operations with business semantics, it makes them the "
 "perfect tool for modeling some kinds of business concerns. It also means "
-"that a decorator doesn&#39;t have the generality of an interceptor. "
-"Decorators aren&#39;t able to solve technical concerns that cut across many "
-"disparate types. Interceptors and decorators, though similar in many ways, "
-"are complementary. Let&#39;s look at some cases where decorators fit the "
-"bill."
+"that a decorator doesn't have the generality of an interceptor. Decorators "
+"aren't able to solve technical concerns that cut across many disparate "
+"types. Interceptors and decorators, though similar in many ways, are "
+"complementary. Let's look at some cases where decorators fit the bill."
 msgstr ""
 "Das Gegenteil gilt für <emphasis>Dekoratoren</emphasis>. Ein Dekorator fängt "
 "Aufrufe nur für ein bestimmtes Java-Interface ab und kennt daher die zu "
@@ -101,9 +100,8 @@
 #, fuzzy, no-c-format
 msgid ""
 "Unlike other beans, a decorator may be an abstract class. Therefore, if "
-"there&#39;s nothing special the decorator needs to do for a particular "
-"method of the decorated interface, you don&#39;t need to implement that "
-"method."
+"there's nothing special the decorator needs to do for a particular method of "
+"the decorated interface, you don't need to implement that method."
 msgstr ""
 "Anders als andere einfache Web Beans, kann ein Dekorator eine abstrakte "
 "Klasse sein. Falls es nichts besonderes ist, dass der Dekorator für eine "
@@ -198,8 +196,7 @@
 #, fuzzy, no-c-format
 msgid ""
 "This declaration serves the same purpose for decorators that the "
-"<literal>&#60;interceptors&#62;</literal> declaration serves for "
-"interceptors:"
+"<literal>&lt;interceptors&gt;</literal> declaration serves for interceptors:"
 msgstr ""
 "Diese Deklaration dient demselben Zweck für Dekoratoren, den die<literal>&lt;"
 "Interceptors&gt;</literal>-Deklaration für Interzeptoren erfüllt:"

Modified: doc/trunk/reference/src/main/docbook/de-DE/ee.po
===================================================================
--- doc/trunk/reference/src/main/docbook/de-DE/ee.po	2010-07-24 16:36:48 UTC (rev 6808)
+++ doc/trunk/reference/src/main/docbook/de-DE/ee.po	2010-07-25 04:22:37 UTC (rev 6809)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: ee\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-05-01T13:53:42\n"
+"POT-Creation-Date: 2010-07-25T03:52:14\n"
 "PO-Revision-Date: 2009-02-09 20:55+1100\n"
 "Last-Translator: \n"
 "Language-Team:  <en at li.org>\n"
@@ -78,7 +78,7 @@
 "The CDI specification does not require the servlet context objects, "
 "<literal>HttpServletRequest</literal>, <literal>HttpSession</literal> and "
 "<literal>ServletContext</literal> to be exposed as injectable beans. If you "
-"really want to be able to inject these objects, it&#39;s easy to create a "
+"really want to be able to inject these objects, it's easy to create a "
 "portable extension to expose them as beans. However, we recommend that "
 "direct access to these objects be limited to servlets, servlet filters and "
 "servlet event listeners, where they may be obtained in the usual way as "
@@ -105,8 +105,8 @@
 "All managed beans may take advantage of Java EE component environment "
 "injection using <literal>@Resource</literal>, <literal>@EJB</literal>, "
 "<literal>@PersistenceContext</literal>, <literal>@PeristenceUnit</literal> "
-"and <literal>@WebServiceRef</literal>. We&#39;ve already seen a couple of "
-"examples of this, though we didn&#39;t pay much attention at the time:"
+"and <literal>@WebServiceRef</literal>. We've already seen a couple of "
+"examples of this, though we didn't pay much attention at the time:"
 msgstr ""
 "Alle einfachen wie auch Enterprise Web Beans können die Java EE \"Dependency"
 "\"-Einspeisung mittels <literal>@Resource</literal>, <literal>@EJB</literal> "
@@ -142,8 +142,8 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"It&#39;s easy to use a bean from a servlet in Java EE 6. Simply inject the "
-"bean using field or initializer method injection."
+"It's easy to use a bean from a servlet in Java EE 6. Simply inject the bean "
+"using field or initializer method injection."
 msgstr ""
 "In Java EE 6 ist die Verwendung eines Web Beans von einem Servlet ganz "
 "einfach. Speisen Sie einfach das Web Bean mittels Web Beans Field oder "
@@ -171,9 +171,9 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"CDI injection applies to all EJBs, even when they aren&#39;t managed beans. "
-"In particular, you can use CDI injection in message-driven beans, which are "
-"by nature not contextual objects."
+"CDI injection applies to all EJBs, even when they aren't managed beans. In "
+"particular, you can use CDI injection in message-driven beans, which are by "
+"nature not contextual objects."
 msgstr ""
 
 #. Tag: para
@@ -261,15 +261,15 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"CDI doesn&#39;t define any special deployment archive. You can package beans "
-"in jars, ejb jars or wars—any deployment location in the application "
-"classpath. However, the archive must be a &#34;bean archive&#34;. That means "
-"each archive that contains beans <emphasis>must</emphasis> include a file "
-"named <literal>beans.xml</literal> in the <literal>META-INF</literal> "
-"directory of the classpath or <literal>WEB-INF</literal> directory of the "
-"web root (for war archives). The file may be empty. Beans deployed in "
-"archives that do not have a <literal>beans.xml</literal> file will not be "
-"available for use in the application."
+"CDI doesn't define any special deployment archive. You can package beans in "
+"jars, ejb jars or wars—any deployment location in the application classpath. "
+"However, the archive must be a \"bean archive\". That means each archive "
+"that contains beans <emphasis>must</emphasis> include a file named "
+"<literal>beans.xml</literal> in the <literal>META-INF</literal> directory of "
+"the classpath or <literal>WEB-INF</literal> directory of the web root (for "
+"war archives). The file may be empty. Beans deployed in archives that do not "
+"have a <literal>beans.xml</literal> file will not be available for use in "
+"the application."
 msgstr ""
 "Web Beans definiert kein spezielles Deployment-Archiv. Sie können Web Beans "
 "in JARs, EJB-JARs oder WARs &#151; verpacken, jedem Deployment Speicherort "

Modified: doc/trunk/reference/src/main/docbook/de-DE/environments.po
===================================================================
--- doc/trunk/reference/src/main/docbook/de-DE/environments.po	2010-07-24 16:36:48 UTC (rev 6808)
+++ doc/trunk/reference/src/main/docbook/de-DE/environments.po	2010-07-25 04:22:37 UTC (rev 6809)
@@ -6,7 +6,7 @@
 "Project-Id-Version: Web_Beans:_Java_Contexts_and_Dependency_Injection "
 "VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-05-01T14:44:09\n"
+"POT-Creation-Date: 2010-07-25T03:52:14\n"
 "PO-Revision-Date: 2009-03-28 17:09+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -37,9 +37,9 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Unfortunately, you can&#39;t use Weld with earlier versions of JBoss AS "
-"since they are missing key libraries. If you want to learn how to upgrade "
-"the built-in support on JBoss AS 6.0, then read on."
+"Unfortunately, you can't use Weld with earlier versions of JBoss AS since "
+"they are missing key libraries. If you want to learn how to upgrade the "
+"built-in support on JBoss AS 6.0, then read on."
 msgstr ""
 
 #. Tag: para
@@ -107,7 +107,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"There is a major limitation to using a servlet container. Weld doesn&#39;t "
+"There is a major limitation to using a servlet container. Weld doesn't "
 "support deploying session beans, injection using <literal>@EJB</literal> or "
 "<literal>@PersistenceContext</literal>, or using transactional events in "
 "servlet containers. For enterprise features such as these, you should really "
@@ -119,10 +119,10 @@
 msgid ""
 "Weld should be used as a web application library in a servlet container. You "
 "should place <literal>weld-servlet.jar</literal> in <literal>WEB-INF/lib</"
-"literal> in the web root. <literal>weld-servlet.jar</literal> is an &#34;"
-"uber-jar&#34;, meaning it bundles all the bits of Weld and CDI required for "
-"running in a servlet container, provided for your convenience. "
-"Alternatively, you could use its component jars:"
+"literal> in the web root. <literal>weld-servlet.jar</literal> is an \"uber-"
+"jar\", meaning it bundles all the bits of Weld and CDI required for running "
+"in a servlet container, provided for your convenience. Alternatively, you "
+"could use its component jars:"
 msgstr ""
 
 #. Tag: para
@@ -186,7 +186,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Tomcat has a read-only JNDI, so Weld can&#39;t automatically bind the "
+"Tomcat has a read-only JNDI, so Weld can't automatically bind the "
 "BeanManager extension SPI. To bind the BeanManager into JNDI, you should "
 "populate <literal>META-INF/context.xml</literal> in the web root with the "
 "following contents:"
@@ -220,18 +220,18 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Like Tomcat, Jetty has a read-only JNDI, so Weld can&#39;t automatically "
-"bind the Manager. To bind the Manager to JNDI, you should populate "
-"<literal>WEB-INF/jetty-env.xml</literal> with the following contents:"
+"Like Tomcat, Jetty has a read-only JNDI, so Weld can't automatically bind "
+"the Manager. To bind the Manager to JNDI, you should populate <literal>WEB-"
+"INF/jetty-env.xml</literal> with the following contents:"
 msgstr ""
 
 #. Tag: para
 #, no-c-format
 msgid ""
-"Notice that Jetty doesn&#39;t not have built-in support for an "
-"<literal>javax.naming.spi.ObjectFactory</literal> like Tomcat, so it&#39;s "
-"necessary to manually create the <literal>javax.naming.Reference</literal> "
-"to wrap around it."
+"Notice that Jetty doesn't not have built-in support for an <literal>javax."
+"naming.spi.ObjectFactory</literal> like Tomcat, so it's necessary to "
+"manually create the <literal>javax.naming.Reference</literal> to wrap around "
+"it."
 msgstr ""
 
 #. Tag: para
@@ -258,13 +258,13 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"In addition to improved integration of the Enterprise Java stack, the &#34;"
-"Contexts and Dependency Injection for the Java EE platform&#34; "
-"specification also defines a state of the art typesafe, stateful dependency "
-"injection framework, which can prove useful in a wide range of application "
-"types. To help developers take advantage of this, Weld provides a simple "
-"means for being executed in the Java Standard Edition (SE) environment "
-"independently of any Java EE APIs."
+"In addition to improved integration of the Enterprise Java stack, the "
+"\"Contexts and Dependency Injection for the Java EE platform\" specification "
+"also defines a state of the art typesafe, stateful dependency injection "
+"framework, which can prove useful in a wide range of application types. To "
+"help developers take advantage of this, Weld provides a simple means for "
+"being executed in the Java Standard Edition (SE) environment independently "
+"of any Java EE APIs."
 msgstr ""
 
 #. Tag: para
@@ -348,7 +348,7 @@
 
 #. Tag: para
 #, no-c-format
-msgid "Here&#39;s an example of a simple CDI SE application:"
+msgid "Here's an example of a simple CDI SE application:"
 msgstr ""
 
 #. Tag: title
@@ -369,9 +369,9 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Thanks to the power of CDI&#39;s typesafe event model, application "
-"developers need not write any bootstrapping code. The Weld SE module comes "
-"with a built-in main method which will bootstrap CDI for you and then fire a "
+"Thanks to the power of CDI's typesafe event model, application developers "
+"need not write any bootstrapping code. The Weld SE module comes with a built-"
+"in main method which will bootstrap CDI for you and then fire a "
 "<literal>ContainerInitialized</literal> event. The entry point for your "
 "application code would therefore be a simple bean which observes the "
 "<literal>ContainerInitialized</literal> event, as in the previous example."
@@ -394,15 +394,15 @@
 msgid ""
 "For added flexibility, CDI SE also comes with a bootstrap API which can be "
 "called from within your application in order to initialize CDI and obtain "
-"references to your application&#39;s beans and events. The API consists of "
-"two classes: <literal>Weld</literal> and <literal>WeldContainer</literal>."
+"references to your application's beans and events. The API consists of two "
+"classes: <literal>Weld</literal> and <literal>WeldContainer</literal>."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
 msgid ""
-"Here&#39;s an example application main method which uses this API to "
-"initialize a bean of type <literal>MyApplicationBean</literal>."
+"Here's an example application main method which uses this API to initialize "
+"a bean of type <literal>MyApplicationBean</literal>."
 msgstr ""
 
 #. Tag: para
@@ -435,10 +435,10 @@
 #, no-c-format
 msgid ""
 "To use the @ThreadScoped annotation you need to enable the "
-"<literal>RunnableDecorator</literal> which &#39;listens&#39; for all "
-"executions of <literal>Runnable.run()</literal> and decorates them by "
-"setting up the thread context beforehand, bound to the current thread, and "
-"destroying the context afterwards."
+"<literal>RunnableDecorator</literal> which 'listens' for all executions of "
+"<literal>Runnable.run()</literal> and decorates them by setting up the "
+"thread context beforehand, bound to the current thread, and destroying the "
+"context afterwards."
 msgstr ""
 
 #. Tag: para
@@ -459,8 +459,8 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Weld SE comes packaged as a &#39;shaded&#39; jar which includes the CDI API, "
-"Weld Core and all dependant classes bundled into a single jar. Therefore the "
-"only Weld jar you need on the classpath, in addition to your application&#39;"
-"s classes and dependant jars, is the Weld SE jar."
+"Weld SE comes packaged as a 'shaded' jar which includes the CDI API, Weld "
+"Core and all dependant classes bundled into a single jar. Therefore the only "
+"Weld jar you need on the classpath, in addition to your application's "
+"classes and dependant jars, is the Weld SE jar."
 msgstr ""

Modified: doc/trunk/reference/src/main/docbook/de-DE/events.po
===================================================================
--- doc/trunk/reference/src/main/docbook/de-DE/events.po	2010-07-24 16:36:48 UTC (rev 6808)
+++ doc/trunk/reference/src/main/docbook/de-DE/events.po	2010-07-25 04:22:37 UTC (rev 6809)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: events\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-05-01T13:53:42\n"
+"POT-Creation-Date: 2010-07-25T03:52:14\n"
 "PO-Revision-Date: 2009-02-13 08:17+1100\n"
 "Last-Translator: \n"
 "Language-Team:  <en at li.org>\n"
@@ -49,8 +49,8 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"observers can specify a combination of &#34;selectors&#34; to narrow the set "
-"of event notifications they will receive, and"
+"observers can specify a combination of \"selectors\" to narrow the set of "
+"event notifications they will receive, and"
 msgstr ""
 "Observer können eine Kombination von \"Selektoren\" festlegen, um den Satz "
 "von Ereignisbenachrichtigungen einzugrenzen, die sie erhalten und "
@@ -69,7 +69,7 @@
 #, no-c-format
 msgid ""
 "The CDI event notification facility uses more or less the same typesafe "
-"approach that we&#39;ve already seen with the dependency injection service."
+"approach that we've already seen with the dependency injection service."
 msgstr ""
 
 #. Tag: title
@@ -92,7 +92,7 @@
 #, no-c-format
 msgid ""
 "An event qualifier is just a normal qualifier, defined using "
-"<literal>@Qualifier</literal>. Here&#39;s an example:"
+"<literal>@Qualifier</literal>. Here's an example:"
 msgstr ""
 
 #. Tag: title
@@ -129,7 +129,7 @@
 msgid ""
 "An observer method need not specify any event qualifiers—in this case it is "
 "interested in <emphasis>all</emphasis> events of a particular type. If it "
-"does specify qualifiers, it&#39;s only interested in events which have those "
+"does specify qualifiers, it's only interested in events which have those "
 "qualifiers."
 msgstr ""
 "Eine Observer-Methode muss keine Ereignis-Bindings &#151; festlegen, in "
@@ -255,8 +255,8 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"The downside of annotating the injection point is that we can&#39;t specify "
-"the qualifier dynamically. CDI lets us obtain a qualifier instance by "
+"The downside of annotating the injection point is that we can't specify the "
+"qualifier dynamically. CDI lets us obtain a qualifier instance by "
 "subclassing the helper class <literal>AnnotationLiteral</literal>. That way, "
 "we can pass the qualifier to the <literal>select()</literal> method of "
 "<literal>Event</literal>."
@@ -280,8 +280,8 @@
 msgid ""
 "By default, if there is no instance of an observer in the current context, "
 "the container will instantiate the observer in order to deliver an event to "
-"it. This behavior isn&#39;t always desirable. We may want to deliver events "
-"only to instances of the observer that already exist in the current contexts."
+"it. This behavior isn't always desirable. We may want to deliver events only "
+"to instances of the observer that already exist in the current contexts."
 msgstr ""
 
 #. Tag: para

Modified: doc/trunk/reference/src/main/docbook/de-DE/example.po
===================================================================
--- doc/trunk/reference/src/main/docbook/de-DE/example.po	2010-07-24 16:36:48 UTC (rev 6808)
+++ doc/trunk/reference/src/main/docbook/de-DE/example.po	2010-07-25 04:22:37 UTC (rev 6809)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: example\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-05-01T13:53:42\n"
+"POT-Creation-Date: 2010-07-25T03:52:14\n"
 "PO-Revision-Date: 2009-01-28 07:53+1100\n"
 "Last-Translator: \n"
 "Language-Team:  <en at li.org>\n"
@@ -23,11 +23,11 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"Let&#39;s illustrate these ideas with a full example. We&#39;re going to "
-"implement user login/logout for an application that uses JSF. First, we&#39;"
-"ll define a request-scoped bean to hold the username and password entered "
-"during login, with constraints defined using annotations from the Bean "
-"Validation specification:"
+"Let's illustrate these ideas with a full example. We're going to implement "
+"user login/logout for an application that uses JSF. First, we'll define a "
+"request-scoped bean to hold the username and password entered during login, "
+"with constraints defined using annotations from the Bean Validation "
+"specification:"
 msgstr ""
 "Illustrieren wir diese Ideen an einem vollständigen Beispiel. Wir werden "
 "einen Benutzer Login/Logout für eine JSF verwendende Anwendung "
@@ -48,7 +48,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"(Note that we&#39;re also going to need a <literal>persistence.xml</literal> "
+"(Note that we're also going to need a <literal>persistence.xml</literal> "
 "file to configure the JPA persistence unit containing <literal>User</"
 "literal>.)"
 msgstr ""
@@ -96,7 +96,7 @@
 #, fuzzy, no-c-format
 msgid ""
 "Hopefully, this example gave you a taste of the CDI programming model. In "
-"the next chapter, we&#39;ll explore dependency injection in greater depth."
+"the next chapter, we'll explore dependency injection in greater depth."
 msgstr ""
 "Wir hoffen, dass Ihnen dieses Beispiel einen Vorgeschmack auf das Web Bean "
 "Programmiermodell gegeben hat. Im nächsten Kapitel sehen wir uns die Web "

Modified: doc/trunk/reference/src/main/docbook/de-DE/extend.po
===================================================================
--- doc/trunk/reference/src/main/docbook/de-DE/extend.po	2010-07-24 16:36:48 UTC (rev 6808)
+++ doc/trunk/reference/src/main/docbook/de-DE/extend.po	2010-07-25 04:22:37 UTC (rev 6809)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: extend\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-05-01T13:53:42\n"
+"POT-Creation-Date: 2010-07-25T03:52:14\n"
 "PO-Revision-Date: 2009-02-14 06:59+1100\n"
 "Last-Translator: \n"
 "Language-Team:  <en at li.org>\n"
@@ -97,8 +97,8 @@
 msgid ""
 "The first step in creating a portable extension is to write a class that "
 "implements <literal>Extension</literal>. This marker interface does not "
-"define any methods, but it&#39;s needed to satisfy the requirements of Java "
-"SE&#39;s service provider architecture."
+"define any methods, but it's needed to satisfy the requirements of Java SE's "
+"service provider architecture."
 msgstr ""
 
 #. Tag: para
@@ -179,8 +179,8 @@
 #, no-c-format
 msgid ""
 "In fact, the extension can do a lot more than just observe. The extension is "
-"permitted to modify the container&#39;s metamodel and more. Here&#39;s a "
-"very simple example:"
+"permitted to modify the container's metamodel and more. Here's a very simple "
+"example:"
 msgstr ""
 
 #. Tag: para
@@ -227,7 +227,7 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"Let&#39;s study some of the interfaces exposed by the <literal>BeanManager</"
+"Let's study some of the interfaces exposed by the <literal>BeanManager</"
 "literal>."
 msgstr ""
 "Der zentrale Kern zur Erweiterung von Web Beans ist das <literal>Manager</"
@@ -286,8 +286,7 @@
 
 #. Tag: para
 #, no-c-format
-msgid ""
-"There&#39;s an easy way to find out what beans exist in the application:"
+msgid "There's an easy way to find out what beans exist in the application:"
 msgstr ""
 
 #. Tag: para
@@ -325,9 +324,9 @@
 msgid ""
 "In this example, we make a framework class, <literal>SecurityManager</"
 "literal> available for injection. To make things a bit more interesting, "
-"we&#39;re going to delegate back to the container&#39;s "
-"<literal>InjectionTarget</literal> to perform instantiation and injection "
-"upon the <literal>SecurityManager</literal> instance."
+"we're going to delegate back to the container's <literal>InjectionTarget</"
+"literal> to perform instantiation and injection upon the "
+"<literal>SecurityManager</literal> instance."
 msgstr ""
 
 #. Tag: para
@@ -353,8 +352,8 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Let&#39;s start with an example of an extension that provides support for "
-"the use of <literal>@Named</literal> at the package level. The package-level "
+"Let's start with an example of an extension that provides support for the "
+"use of <literal>@Named</literal> at the package level. The package-level "
 "name is used to qualify the EL names of all beans defined in that package. "
 "The portable extension uses the <literal>ProcessAnnotatedType</literal> "
 "event to wrap the <literal>AnnotatedType</literal> object and override the "
@@ -364,7 +363,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Here&#39;s a second example, which adds the <literal>@Alternative</literal> "
+"Here's a second example, which adds the <literal>@Alternative</literal> "
 "annotation to any class which implements a certain <literal>Service</"
 "literal> interface."
 msgstr ""
@@ -395,12 +394,12 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Here&#39;s a CDI portable extension that reads values from properties files "
-"and configures fields of Java EE components, including servlets, EJBs, "
-"managed beans, interceptors and more. In this example, properties for a "
-"class such as <literal>org.mydomain.blog.Blogger</literal> go in a resource "
-"named <literal>org/mydomain/blog/Blogger.properties</literal>, and the name "
-"of a property must match the name of the field to be configured. So "
+"Here's a CDI portable extension that reads values from properties files and "
+"configures fields of Java EE components, including servlets, EJBs, managed "
+"beans, interceptors and more. In this example, properties for a class such "
+"as <literal>org.mydomain.blog.Blogger</literal> go in a resource named "
+"<literal>org/mydomain/blog/Blogger.properties</literal>, and the name of a "
+"property must match the name of the field to be configured. So "
 "<literal>Blogger.properties</literal> could contain:"
 msgstr ""
 
@@ -415,9 +414,9 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"There&#39;s a lot more to the portable extension SPI than what we&#39;ve "
-"discussed here. Check out the CDI spec or Javadoc for more information. For "
-"now, we&#39;ll just mention one more extension point."
+"There's a lot more to the portable extension SPI than what we've discussed "
+"here. Check out the CDI spec or Javadoc for more information. For now, we'll "
+"just mention one more extension point."
 msgstr ""
 
 #. Tag: title

Modified: doc/trunk/reference/src/main/docbook/de-DE/extensions.po
===================================================================
--- doc/trunk/reference/src/main/docbook/de-DE/extensions.po	2010-07-24 16:36:48 UTC (rev 6808)
+++ doc/trunk/reference/src/main/docbook/de-DE/extensions.po	2010-07-25 04:22:37 UTC (rev 6809)
@@ -6,7 +6,7 @@
 "Project-Id-Version: Web_Beans:_Java_Contexts_and_Dependency_Injection "
 "VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-05-01T13:53:42\n"
+"POT-Creation-Date: 2010-07-25T03:52:14\n"
 "PO-Revision-Date: 2009-03-28 17:09+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -59,6 +59,6 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"If you are using Weld as your JSR-299 implementation, there&#39;s no need to "
-"include sl4j as it&#39;s already included (and used internally)."
+"If you are using Weld as your JSR-299 implementation, there's no need to "
+"include sl4j as it's already included (and used internally)."
 msgstr ""

Modified: doc/trunk/reference/src/main/docbook/de-DE/gettingstarted.po
===================================================================
--- doc/trunk/reference/src/main/docbook/de-DE/gettingstarted.po	2010-07-24 16:36:48 UTC (rev 6808)
+++ doc/trunk/reference/src/main/docbook/de-DE/gettingstarted.po	2010-07-25 04:22:37 UTC (rev 6809)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: ri\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-05-01T13:53:42\n"
+"POT-Creation-Date: 2010-07-25T03:52:14\n"
 "PO-Revision-Date: 2009-02-27 15:36+1100\n"
 "Last-Translator: \n"
 "Language-Team:  <en at li.org>\n"
@@ -48,7 +48,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"To run the examples with the provided build scripts, you&#39;ll need the "
+"To run the examples with the provided build scripts, you'll need the "
 "following:"
 msgstr ""
 
@@ -96,7 +96,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"You&#39;ll need a full install of Ant 1.7.0. Some linux distributions only "
+"You'll need a full install of Ant 1.7.0. Some linux distributions only "
 "supply a partial installation of Ant which cause the build to fail. If you "
 "encounter problems, verify that ant-nodeps.jar is on the classpath."
 msgstr ""
@@ -104,7 +104,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"In the next few sections, you&#39;ll be using the Ant command (<literal>ant</"
+"In the next few sections, you'll be using the Ant command (<literal>ant</"
 "literal>) to invoke the Ant build script in each example to compile, "
 "assemble and deploy the example to JBoss AS and, for the war example, Apache "
 "Tomcat. You can also deploy the generated artifact (war or ear) to any other "
@@ -123,7 +123,7 @@
 #, no-c-format
 msgid ""
 "The sections below cover the steps for deploying with both Ant and Maven in "
-"detail. Let&#39;s start with JBoss AS."
+"detail. Let's start with JBoss AS."
 msgstr ""
 
 #. Tag: title
@@ -134,25 +134,25 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"To deploy the examples to JBoss AS, you&#39;ll need <ulink url=\"http://"
-"jboss.org/jbossas/\">JBoss AS 6.0.0</ulink> or above. If a release of the "
-"JBoss AS 6.0 line isn&#39;t yet available, you can download a <ulink url="
-"\"http://hudson.jboss.org/hudson/view/JBoss%20AS/job/JBoss-AS-6.0.x/"
-"\">nightly snapshot</ulink>. The reason JBoss AS 6.0.0 or above is required "
-"is because it&#39;s the first release that has both CDI and Bean Validation "
-"support built-in, making it close enough to Java EE 6 to run the examples. "
-"The good news is that there are no additional modifications you have to make "
-"to the server. It&#39;s ready to go!"
+"To deploy the examples to JBoss AS, you'll need <ulink url=\"http://jboss."
+"org/jbossas/\">JBoss AS 6.0.0</ulink> or above. If a release of the JBoss AS "
+"6.0 line isn't yet available, you can download a <ulink url=\"http://hudson."
+"jboss.org/hudson/view/JBoss%20AS/job/JBoss-AS-6.0.x/\">nightly snapshot</"
+"ulink>. The reason JBoss AS 6.0.0 or above is required is because it's the "
+"first release that has both CDI and Bean Validation support built-in, making "
+"it close enough to Java EE 6 to run the examples. The good news is that "
+"there are no additional modifications you have to make to the server. It's "
+"ready to go!"
 msgstr ""
 
 #. Tag: para
 #, no-c-format
 msgid ""
 "After you have downloaded JBoss AS, extract it. (We recommended renaming the "
-"folder to include the <literal>as</literal> qualifier so it&#39;s clear that "
-"it&#39;s the application server). You can move the extracted folder anywhere "
-"you like. Wherever it lays to rest, that&#39;s what we&#39;ll call the JBoss "
-"AS installation directory, or <literal>JBOSS_HOME</literal>."
+"folder to include the <literal>as</literal> qualifier so it's clear that "
+"it's the application server). You can move the extracted folder anywhere you "
+"like. Wherever it lays to rest, that's what we'll call the JBoss AS "
+"installation directory, or <literal>JBOSS_HOME</literal>."
 msgstr ""
 
 #. Tag: para
@@ -168,7 +168,7 @@
 
 #. Tag: para
 #, fuzzy, no-c-format
-msgid "You&#39;re now ready to deploy your first example!"
+msgid "You're now ready to deploy your first example!"
 msgstr "Jetzt können Sie Ihr erstes Beispiel deployen!"
 
 #. Tag: para
@@ -181,8 +181,8 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"If you haven&#39;t already, start JBoss AS. You can either start JBoss AS "
-"from a Linux shell:"
+"If you haven't already, start JBoss AS. You can either start JBoss AS from a "
+"Linux shell:"
 msgstr ""
 
 #. Tag: para
@@ -276,16 +276,16 @@
 msgid ""
 "The translator uses session beans, which are packaged in an EJB module "
 "within an ear. Java EE 6 will allow session beans to be deployed in war "
-"modules, but that&#39;s a topic for a later chapter."
+"modules, but that's a topic for a later chapter."
 msgstr ""
 
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"Again, wait a few seconds for the application to deploy (if you&#39;re "
-"really bored, read the log messages), and visit <ulink url=\"http://"
-"localhost:8080/weld-translator\">http://localhost:8080/weld-translator</"
-"ulink> to begin pseudo-translating."
+"Again, wait a few seconds for the application to deploy (if you're really "
+"bored, read the log messages), and visit <ulink url=\"http://localhost:8080/"
+"weld-translator\">http://localhost:8080/weld-translator</ulink> to begin "
+"pseudo-translating."
 msgstr ""
 "Hier setzen wir den Kontextpfad, der uns eine schöne url liefert (<ulink url="
 "\"http://localhost:8080/webbeans-translator\">http://localhost:8080/webbeans-"
@@ -299,21 +299,21 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Deploying to GlassFish should be easy and familiar, right? After all, it&#39;"
-"s the Java EE 6 reference implementation and Weld is the JSR-299 reference "
-"implementation, meaning Weld gets bundled with GlassFish. So yes, it&#39;s "
-"all quite easy and familiar."
+"Deploying to GlassFish should be easy and familiar, right? After all, it's "
+"the Java EE 6 reference implementation and Weld is the JSR-299 reference "
+"implementation, meaning Weld gets bundled with GlassFish. So yes, it's all "
+"quite easy and familiar."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
 msgid ""
-"To deploy the examples to GlassFish, you&#39;ll need the final <ulink url="
+"To deploy the examples to GlassFish, you'll need the final <ulink url="
 "\"https://glassfish.dev.java.net/downloads/v3-final.html\">GlassFish V3</"
 "ulink> release. Select the release that ends in either <literal>-unix.sh</"
 "literal> or <literal>-windows.exe</literal> depending on your platform. "
-"After the download is complete, execute the installer. On Linux/Unix, "
-"you&#39;ll need to first make the script executable."
+"After the download is complete, execute the installer. On Linux/Unix, you'll "
+"need to first make the script executable."
 msgstr ""
 
 #. Tag: para
@@ -321,15 +321,15 @@
 msgid ""
 "On Windows you can just click on the executable. Follow the instructions in "
 "the installer. It will create a single domain named <literal>domain1</"
-"literal>. You&#39;ll use that domain to deploy the example. We recommend "
-"that you choose <literal>7070</literal> as the main HTTP port to avoid "
-"conflicts with a running instance of JBoss AS (or Apache Tomcat)."
+"literal>. You'll use that domain to deploy the example. We recommend that "
+"you choose <literal>7070</literal> as the main HTTP port to avoid conflicts "
+"with a running instance of JBoss AS (or Apache Tomcat)."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
 msgid ""
-"If you&#39;ve deployed either of the starter examples, <literal>weld-"
+"If you've deployed either of the starter examples, <literal>weld-"
 "numberguess</literal> or <literal>weld-translator</literal>, to JBoss AS, "
 "then you already have the deployable artifact you need. If not, switch to "
 "either of the two directories and build it."
@@ -339,11 +339,11 @@
 #, no-c-format
 msgid ""
 "The deployable archive for the <literal>weld-numberguess</literal>, named "
-"<literal>weld-numberguess.war</literal>, ends up in the example&#39;s "
+"<literal>weld-numberguess.war</literal>, ends up in the example's "
 "<literal>target</literal> directory. The archive for the <literal>weld-"
 "translator</literal> example, named <literal>weld-translator.ear</literal>, "
-"ends up in the example&#39;s <literal>ear/target</literal> directory. All "
-"you need to do now is deploy them to GlassFish."
+"ends up in the example's <literal>ear/target</literal> directory. All you "
+"need to do now is deploy them to GlassFish."
 msgstr ""
 
 #. Tag: para
@@ -362,15 +362,15 @@
 msgid ""
 "After a few seconds you can visit the Admin Console in the browser at the "
 "URL <ulink url=\"http://localhost:4848\">http://localhost:4848</ulink>. In "
-"the tree on the left-hand side of the page, click on &#34;Applications&#34;, "
-"then click on the &#34;Deploy...&#34; button under the heading &#34;"
-"Applications&#34; and select the deployable artifact for either of the two "
-"examples. The deployer should recognize that you have selected a Java EE "
-"artifact and allow you to start it. You can see the examples running at "
-"either <ulink url=\"http://localhost:7070/weld-numberguess\">http://"
-"localhost:7070/weld-numberguess</ulink> or <ulink url=\"http://"
-"localhost:7070/weld-translator\">http://localhost:7070/weld-translator</"
-"ulink>, depending on which example you deployed."
+"the tree on the left-hand side of the page, click on \"Applications\", then "
+"click on the \"Deploy...\" button under the heading \"Applications\" and "
+"select the deployable artifact for either of the two examples. The deployer "
+"should recognize that you have selected a Java EE artifact and allow you to "
+"start it. You can see the examples running at either <ulink url=\"http://"
+"localhost:7070/weld-numberguess\">http://localhost:7070/weld-numberguess</"
+"ulink> or <ulink url=\"http://localhost:7070/weld-translator\">http://"
+"localhost:7070/weld-translator</ulink>, depending on which example you "
+"deployed."
 msgstr ""
 
 #. Tag: para
@@ -407,16 +407,16 @@
 "Weld comes with a servlet listener which bootstraps the CDI environment, "
 "registers the <literal>BeanManager</literal> in JNDI and provides injection "
 "into servlets. Basically, it emulates some of the work done by the Java EE "
-"container. (But you don&#39;t get enterprise features such as session beans "
-"and container-managed transactions.)"
+"container. (But you don't get enterprise features such as session beans and "
+"container-managed transactions.)"
 msgstr ""
 
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"Let&#39;s give the Weld servlet extension a spin on Apache Tomcat. First, "
-"you&#39;ll need to download Tomcat 6.0.18 or later from <ulink url=\"http://"
-"tomcat.apache.org/download-60.cgi\">tomcat.apache.org</ulink> and extract it."
+"Let's give the Weld servlet extension a spin on Apache Tomcat. First, you'll "
+"need to download Tomcat 6.0.18 or later from <ulink url=\"http://tomcat."
+"apache.org/download-60.cgi\">tomcat.apache.org</ulink> and extract it."
 msgstr ""
 "Anschließend laden Sie die Web Beans RI unter <ulink url=\"http://"
 "seamframework.org/Download\">seamframework.org</ulink> herunter und "
@@ -428,8 +428,8 @@
 "You have two choices for how you can deploy the application to Tomcat. You "
 "can deploy it by pushing the artifact to the hot deploy directory using Ant "
 "or you can deploy to the server across HTTP using a Maven plugin. The Ant "
-"approach doesn&#39;t require that you have Maven installed, so we&#39;ll "
-"start there. If you want to use Maven, you can just skip ahead."
+"approach doesn't require that you have Maven installed, so we'll start "
+"there. If you want to use Maven, you can just skip ahead."
 msgstr ""
 
 #. Tag: title
@@ -443,14 +443,14 @@
 "In order for Ant to push the artifact to the Tomcat hot deploy directory, it "
 "needs to know where the Tomcat installation is located. Again, we need to "
 "set a property in the <literal>local.build.properties</literal> file in the "
-"examples directory of the Weld distribution. If you haven&#39;t yet created "
-"this file, do so now. Then assign the path of your Tomcat installation to "
-"the property key <literal>tomcat.home</literal>."
+"examples directory of the Weld distribution. If you haven't yet created this "
+"file, do so now. Then assign the path of your Tomcat installation to the "
+"property key <literal>tomcat.home</literal>."
 msgstr ""
 
 #. Tag: para
 #, fuzzy, no-c-format
-msgid "Now you&#39;re ready to deploy the numberguess example to Tomcat!"
+msgid "Now you're ready to deploy the numberguess example to Tomcat!"
 msgstr "Um das numberguess Beispiel zu deployen:"
 
 #. Tag: para
@@ -465,7 +465,7 @@
 msgid ""
 "The Ant build script includes additional targets for Tomcat to deploy and "
 "undeploy the archive in either exploded or packaged format. They are the "
-"same target names used for JBoss AS, prefixed with &#34;tomcat.&#34;."
+"same target names used for JBoss AS, prefixed with \"tomcat.\"."
 msgstr ""
 
 #. Tag: para
@@ -503,7 +503,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"If you haven&#39;t already, start Tomcat. You can either start Tomcat from a "
+"If you haven't already, start Tomcat. You can either start Tomcat from a "
 "Linux shell:"
 msgstr ""
 
@@ -526,15 +526,15 @@
 #, no-c-format
 msgid ""
 "You can also deploy the application to Tomcat using Maven. This section is a "
-"bit more advanced, so skip it unless you&#39;re itching to use Maven "
-"natively. Of course, you&#39;ll first need to make sure that you have Maven "
-"installed on your path, similar to how you setup Ant."
+"bit more advanced, so skip it unless you're itching to use Maven natively. "
+"Of course, you'll first need to make sure that you have Maven installed on "
+"your path, similar to how you setup Ant."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
 msgid ""
-"The Maven plugin communicates with Tomcat over HTTP, so it doesn&#39;t care "
+"The Maven plugin communicates with Tomcat over HTTP, so it doesn't care "
 "where you have installed Tomcat. However, the plugin configuration assumes "
 "you are running Tomcat in its default configuration, with a hostname of "
 "localhost and port <literal>8080</literal>. The <literal>readme.txt</"
@@ -592,7 +592,7 @@
 #, no-c-format
 msgid ""
 "There are several other Maven goals that you can use if you are hacking on "
-"the example, which are documented in the example&#39;s <literal>readme.txt</"
+"the example, which are documented in the example's <literal>readme.txt</"
 "literal> file."
 msgstr ""
 
@@ -614,10 +614,10 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"If you&#39;ve read through the entire Tomcat section, then you&#39;re all "
-"ready to go. The Maven build parallels the embedded Tomcat deployment. If "
-"not, don&#39;t worry. We&#39;ll still go over everything that you need to "
-"know again in this section."
+"If you've read through the entire Tomcat section, then you're all ready to "
+"go. The Maven build parallels the embedded Tomcat deployment. If not, don't "
+"worry. We'll still go over everything that you need to know again in this "
+"section."
 msgstr ""
 
 #. Tag: para
@@ -626,7 +626,7 @@
 "The Maven POM (<literal>pom.xml</literal>) includes a profile named "
 "<literal>jetty</literal> that activates the Maven Jetty plugin, which you "
 "can use to start Jetty in embedded mode and deploy the application in place. "
-"You don&#39;t need anything else installed except to have the Maven command "
+"You don't need anything else installed except to have the Maven command "
 "(<literal>mvn</literal>) on your path. The rest will be downloaded from the "
 "internet when the build is run."
 msgstr ""
@@ -698,9 +698,9 @@
 #, no-c-format
 msgid ""
 "Now, you are ready to run the server in Eclipse. Import the project into "
-"your Eclipse workspace using &#34;Import Existing Project into Workspace. "
-"Then, find the start class in <literal>src/jetty/java</literal> and run its "
-"main method as a Java Application. Jetty will launch. You can view the "
+"your Eclipse workspace using \"Import Existing Project into Workspace. Then, "
+"find the start class in <literal>src/jetty/java</literal> and run its main "
+"method as a Java Application. Jetty will launch. You can view the "
 "application at the following local URL: <ulink url=\"http://localhost:8080"
 "\">http://localhost:8080</ulink>. Pay particular attention to the port in "
 "the URL and the lack of a trailing context path."

Modified: doc/trunk/reference/src/main/docbook/de-DE/injection.po
===================================================================
--- doc/trunk/reference/src/main/docbook/de-DE/injection.po	2010-07-24 16:36:48 UTC (rev 6808)
+++ doc/trunk/reference/src/main/docbook/de-DE/injection.po	2010-07-25 04:22:37 UTC (rev 6809)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: injection\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-05-01T14:44:09\n"
+"POT-Creation-Date: 2010-07-25T03:52:14\n"
 "PO-Revision-Date: 2009-02-15 15:56+1100\n"
 "Last-Translator: \n"
 "Language-Team:  <en at li.org>\n"
@@ -109,7 +109,7 @@
 #, fuzzy, no-c-format
 msgid ""
 "Next, the container calls all initializer methods of bean (the call order is "
-"not portable, don&#39;t rely on it)."
+"not portable, don't rely on it)."
 msgstr ""
 "Anschließend ruft der Web Bean Manager alle Initialisierermethoden des Web "
 "Beans auf."
@@ -150,7 +150,7 @@
 msgid ""
 "This is a case where the <literal>@Inject</literal> annotation <emphasis>is "
 "not</emphasis> required at the injection point. The same is true for "
-"observer methods (which we&#39;ll meet in <xref linkend=\"events\" />) and "
+"observer methods (which we'll meet in <xref linkend=\"events\" />) and "
 "disposer methods."
 msgstr ""
 
@@ -165,9 +165,9 @@
 "The CDI specification defines a procedure, called <emphasis>typesafe "
 "resolution</emphasis>, that the container follows when identifying the bean "
 "to inject to an injection point. This algorithm looks complex at first, but "
-"once you understand it, it&#39;s really quite intuitive. Typesafe resolution "
-"is performed at system initialization time, which means that the container "
-"will inform the developer immediately if a bean&#39;s dependencies cannot be "
+"once you understand it, it's really quite intuitive. Typesafe resolution is "
+"performed at system initialization time, which means that the container will "
+"inform the developer immediately if a bean's dependencies cannot be "
 "satisfied."
 msgstr ""
 "Die Web Beans Spezifikation definiert eine Prozedur namens "
@@ -221,17 +221,17 @@
 #, no-c-format
 msgid ""
 "Obviously, if you have exactly one bean of a given type, and an injection "
-"point with that same type, then bean A is going to go into slot A. That&#39;"
-"s the simplest possible scenario. When you first start your application, "
-"you&#39;ll likely have lots of those."
+"point with that same type, then bean A is going to go into slot A. That's "
+"the simplest possible scenario. When you first start your application, "
+"you'll likely have lots of those."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
 msgid ""
-"But then, things start to get complicated. Let&#39;s explore how the "
-"container determines which bean to inject in more advanced cases. We&#39;ll "
-"start by taking a closer look at qualifiers."
+"But then, things start to get complicated. Let's explore how the container "
+"determines which bean to inject in more advanced cases. We'll start by "
+"taking a closer look at qualifiers."
 msgstr ""
 
 #. Tag: title
@@ -305,12 +305,12 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Now, you may be thinking, <emphasis>&#34;What&#39;s the different between "
-"using a qualifier and just specifying the exact implementation class you "
-"want?&#34;</emphasis> It&#39;s important to understand that a qualifier is "
-"like an extension of the interface. It does not create a direct dependency "
-"to any particular implementation. There may be multiple alterative "
-"implementations of <literal>@Asynchronous PaymentProcessor</literal>!"
+"Now, you may be thinking, <emphasis>\"What's the different between using a "
+"qualifier and just specifying the exact implementation class you want?\"</"
+"emphasis> It's important to understand that a qualifier is like an extension "
+"of the interface. It does not create a direct dependency to any particular "
+"implementation. There may be multiple alterative implementations of "
+"<literal>@Asynchronous PaymentProcessor</literal>!"
 msgstr ""
 
 #. Tag: title
@@ -327,12 +327,11 @@
 msgid ""
 "Whenever a bean or injection point does not explicitly declare a qualifier, "
 "the container assumes the qualifier <literal>@Default</literal>. From time "
-"to time, you&#39;ll need to decare an injection point without specifying a "
-"qualifier. There&#39;s a qualifier for that too. All beans have the "
-"qualifier <literal>@Any</literal>. Therefore, by explicitly specifying "
-"<literal>@Any</literal> at an injection point, you suppress the default "
-"qualifier, without otherwise restricting the beans that are eligible for "
-"injection."
+"to time, you'll need to decare an injection point without specifying a "
+"qualifier. There's a qualifier for that too. All beans have the qualifier "
+"<literal>@Any</literal>. Therefore, by explicitly specifying <literal>@Any</"
+"literal> at an injection point, you suppress the default qualifier, without "
+"otherwise restricting the beans that are eligible for injection."
 msgstr ""
 
 #. Tag: para
@@ -422,7 +421,7 @@
 "When an ambiguous dependency exists at an injection point, the container "
 "attempts to resolve the ambiguity by looking for an enabled alternative "
 "among the beans that could be injected. If there is exactly one enabled "
-"alternative, that&#39;s the bean that will be injected."
+"alternative, that's the bean that will be injected."
 msgstr ""
 
 #. Tag: title
@@ -448,8 +447,8 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"During the course of your development, you&#39;re going to encounter this "
-"situation. Let&#39;s learn how to resolve it."
+"During the course of your development, you're going to encounter this "
+"situation. Let's learn how to resolve it."
 msgstr ""
 
 #. Tag: para
@@ -523,7 +522,7 @@
 
 #. Tag: para
 #, no-c-format
-msgid "Just remember: &#34;There can be only one.&#34;"
+msgid "Just remember: \"There can be only one.\""
 msgstr ""
 
 #. Tag: para
@@ -531,14 +530,14 @@
 msgid ""
 "On the other hand, if you really do have an optional or multivalued "
 "injection point, you should change the type of your injection point to "
-"<literal>Instance</literal>, as we&#39;ll see in <xref linkend=\"lookup\" />."
+"<literal>Instance</literal>, as we'll see in <xref linkend=\"lookup\" />."
 msgstr ""
 
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"Now there&#39;s one more issue you need to be aware of when using the "
-"dependency injection service."
+"Now there's one more issue you need to be aware of when using the dependency "
+"injection service."
 msgstr ""
 "Es gibt eine weitere Sache, derer man sich bei der Verwendung von "
 "\"Dependency\"-Einspeisung in Web Beans gewahr sein sollte."
@@ -636,8 +635,7 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"classes which don&#39;t have a non-private constructor with no parameters, "
-"and"
+"classes which don't have a non-private constructor with no parameters, and"
 msgstr ""
 "Klassen, die keinen nicht-privaten Konstruktor ohne Parameter besitzen sowie "
 
@@ -658,7 +656,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"It&#39;s usually very easy to fix an unproxyable dependency problem. If an "
+"It's usually very easy to fix an unproxyable dependency problem. If an "
 "injection point of type <literal>X</literal> results in an unproxyable "
 "dependency, simply:"
 msgstr ""
@@ -671,7 +669,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"change the type of the injection point to <literal>Instance&#60;X&#62;</"
+"change the type of the injection point to <literal>Instance&lt;X&gt;</"
 "literal>,"
 msgstr ""
 
@@ -712,7 +710,7 @@
 
 #. Tag: para
 #, no-c-format
-msgid "But we didn&#39;t get around to implementing this yet."
+msgid "But we didn't get around to implementing this yet."
 msgstr ""
 
 #. Tag: title
@@ -805,11 +803,10 @@
 #, no-c-format
 msgid ""
 "Next, we need to obtain an instance of our qualifier type. Since annotatons "
-"are interfaces, we can&#39;t just write <literal>new Asynchronous()</"
-"literal>. It&#39;s also quite tedious to create a concrete implementation of "
-"an annotation type from scratch. Instead, CDI lets us obtain a qualifier "
-"instance by subclassing the helper class <literal>AnnotationLiteral</"
-"literal>."
+"are interfaces, we can't just write <literal>new Asynchronous()</literal>. "
+"It's also quite tedious to create a concrete implementation of an annotation "
+"type from scratch. Instead, CDI lets us obtain a qualifier instance by "
+"subclassing the helper class <literal>AnnotationLiteral</literal>."
 msgstr ""
 
 #. Tag: para
@@ -820,8 +817,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"We can&#39;t use an anonymous class to implement a qualifier type with "
-"members."
+"We can't use an anonymous class to implement a qualifier type with members."
 msgstr ""
 
 #. Tag: para
@@ -890,8 +886,8 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"Let&#39;s look at an example. The following code is verbose, and vulnerable "
-"to refactoring problems:"
+"Let's look at an example. The following code is verbose, and vulnerable to "
+"refactoring problems:"
 msgstr ""
 "Sehen wir uns ein Beispiel an. Der folgende Code ist umfangreich und "
 "empfänglich für Refaktorierungsprobleme:"
@@ -914,8 +910,8 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"Not convinced? Then here&#39;s a second example. To inject HTTP parameters, "
-"we need to define a qualifier type:"
+"Not convinced? Then here's a second example. To inject HTTP parameters, we "
+"need to define a qualifier type:"
 msgstr ""
 "Sie sind noch nicht ganz überzeugt? Dann sehen Sie sich ein weiteres "
 "Beispiel an. Zur Einspeisung von HTTP-Parametern müssen wir einen Binding-"

Modified: doc/trunk/reference/src/main/docbook/de-DE/interceptors.po
===================================================================
--- doc/trunk/reference/src/main/docbook/de-DE/interceptors.po	2010-07-24 16:36:48 UTC (rev 6808)
+++ doc/trunk/reference/src/main/docbook/de-DE/interceptors.po	2010-07-25 04:22:37 UTC (rev 6809)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: interceptors\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-05-01T13:53:43\n"
+"POT-Creation-Date: 2010-07-25T03:52:14\n"
 "PO-Revision-Date: 2009-02-15 19:11+1100\n"
 "Last-Translator: \n"
 "Language-Team:  <en at li.org>\n"
@@ -101,7 +101,7 @@
 msgid ""
 "Suppose we want to declare that some of our beans are transactional. The "
 "first thing we need is an <emphasis>interceptor binding type</emphasis> to "
-"specify exactly which beans we&#39;re interested in:"
+"specify exactly which beans we're interested in:"
 msgstr ""
 "Nehmen wir an, wir wollten deklarieren, dass einige unserer Web Beans "
 "transaktional sind. Das erste, was wir benötigen ist eine "
@@ -132,9 +132,9 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"That&#39;s great, but somewhere along the line we&#39;re going to have to "
-"actually implement the interceptor that provides this transaction management "
-"aspect. All we need to do is create a standard interceptor, and annotate it "
+"That's great, but somewhere along the line we're going to have to actually "
+"implement the interceptor that provides this transaction management aspect. "
+"All we need to do is create a standard interceptor, and annotate it "
 "<literal>@Interceptor</literal> and <literal>@Transactional</literal>."
 msgstr ""
 "Das ist toll, aber irgendwann müssen wir den den Managementaspekt dieser "

Modified: doc/trunk/reference/src/main/docbook/de-DE/intro.po
===================================================================
--- doc/trunk/reference/src/main/docbook/de-DE/intro.po	2010-07-24 16:36:48 UTC (rev 6808)
+++ doc/trunk/reference/src/main/docbook/de-DE/intro.po	2010-07-25 04:22:37 UTC (rev 6809)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: intro\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-05-01T13:53:43\n"
+"POT-Creation-Date: 2010-07-25T03:52:14\n"
 "PO-Revision-Date: 2009-02-22 13:52+1100\n"
 "Last-Translator: \n"
 "Language-Team:  <en at li.org>\n"
@@ -23,11 +23,11 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"So you&#39;re keen to get started writing your first bean? Or perhaps "
-"you&#39;re skeptical, wondering what kinds of hoops the CDI specification "
-"will make you jump through! The good news is that you&#39;ve probably "
-"already written and used hundreds, perhaps thousands of beans. CDI just "
-"makes it easier to actually use them to build an application!"
+"So you're keen to get started writing your first bean? Or perhaps you're "
+"skeptical, wondering what kinds of hoops the CDI specification will make you "
+"jump through! The good news is that you've probably already written and used "
+"hundreds, perhaps thousands of beans. CDI just makes it easier to actually "
+"use them to build an application!"
 msgstr ""
 "Können Sie es jetzt kaum erwarten Ihr erstes Web Bean zu schreiben? Oder "
 "sind Sie etwas skeptisch und fragen sich, welche Hürden Ihnen bei der Web "
@@ -51,14 +51,13 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Prior to Java EE 6, there was no clear definition of the term &#34;bean&#34; "
-"in the Java EE platform. Of course, we&#39;ve been calling Java classes used "
-"in web and enterprise applications &#34;beans&#34; for years. There were "
-"even a couple of different kinds of things called &#34;beans&#34; in EE "
-"specifications, including EJB beans and JSF managed beans. Meanwhile, other "
-"third-party frameworks such as Spring and Seam introduced their own ideas of "
-"what it meant to be a &#34;bean&#34;. What we&#39;ve been missing is a "
-"common definition."
+"Prior to Java EE 6, there was no clear definition of the term \"bean\" in "
+"the Java EE platform. Of course, we've been calling Java classes used in web "
+"and enterprise applications \"beans\" for years. There were even a couple of "
+"different kinds of things called \"beans\" in EE specifications, including "
+"EJB beans and JSF managed beans. Meanwhile, other third-party frameworks "
+"such as Spring and Seam introduced their own ideas of what it meant to be a "
+"\"bean\". What we've been missing is a common definition."
 msgstr ""
 
 #. Tag: para
@@ -70,8 +69,8 @@
 "Old Java Object). They support a small set of basic services, such as "
 "resource injection, lifecycle callbacks and interceptors. Companion "
 "specifications, such as EJB and CDI, build on this basic model. But, "
-"<emphasis>at last</emphasis>, there&#39;s a uniform concept of a bean and a "
-"lightweight component model that&#39;s aligned across the Java EE platform."
+"<emphasis>at last</emphasis>, there's a uniform concept of a bean and a "
+"lightweight component model that's aligned across the Java EE platform."
 msgstr ""
 
 #. Tag: para
@@ -80,31 +79,30 @@
 "With very few exceptions, almost every concrete Java class that has a "
 "constructor with no parameters (or a constructor designated with the "
 "annotation <literal>@Inject</literal>) is a bean. This includes every "
-"JavaBean and every EJB session bean. If you&#39;ve already got some "
-"JavaBeans or session beans lying around, they&#39;re already beans—you "
-"won&#39;t need any additional special metadata. There&#39;s just little one "
-"thing you need to do before you can start injecting them into stuff: you "
-"need to put them in an archive (a jar, or a Java EE module such as a war or "
-"EJB jar) that contains a special marker file: <literal>META-INF/beans.xml</"
-"literal>."
+"JavaBean and every EJB session bean. If you've already got some JavaBeans or "
+"session beans lying around, they're already beans—you won't need any "
+"additional special metadata. There's just little one thing you need to do "
+"before you can start injecting them into stuff: you need to put them in an "
+"archive (a jar, or a Java EE module such as a war or EJB jar) that contains "
+"a special marker file: <literal>META-INF/beans.xml</literal>."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
 msgid ""
-"The JavaBeans and EJBs you&#39;ve been writing every day, up until now, have "
-"not been able to take advantage of the new services defined by the CDI "
-"specification. But you&#39;ll be able to use every one of them with CDI—"
-"allowing the container to create and destroy instances of your beans and "
-"associate them with a designated context, injecting them into other beans, "
-"using them in EL expressions, specializing them with qualifier annotations, "
-"even adding interceptors and decorators to them—without modifying your "
-"existing code. At most, you&#39;ll need to add some annotations."
+"The JavaBeans and EJBs you've been writing every day, up until now, have not "
+"been able to take advantage of the new services defined by the CDI "
+"specification. But you'll be able to use every one of them with CDI—allowing "
+"the container to create and destroy instances of your beans and associate "
+"them with a designated context, injecting them into other beans, using them "
+"in EL expressions, specializing them with qualifier annotations, even adding "
+"interceptors and decorators to them—without modifying your existing code. At "
+"most, you'll need to add some annotations."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Now let&#39;s see how to create your first bean that actually uses CDI."
+msgid "Now let's see how to create your first bean that actually uses CDI."
 msgstr ""
 
 #. Tag: title
@@ -115,7 +113,7 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"Suppose that we have two existing Java classes that we&#39;ve been using for "
+"Suppose that we have two existing Java classes that we've been using for "
 "years in various applications. The first class parses a string into a list "
 "of sentences:"
 msgstr ""
@@ -142,8 +140,8 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"Unfortunately, we don&#39;t have a class that translates whole text "
-"documents. So let&#39;s write a bean for this job:"
+"Unfortunately, we don't have a class that translates whole text documents. "
+"So let's write a bean for this job:"
 msgstr ""
 "Leider besitzen wir keine bereits bestehende Klasse die ganze Textdokumente "
 "übersetzt. Schreiben wir also ein Web Bean, das diesen Job übernimmt:"
@@ -165,11 +163,11 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"As you&#39;ve guessed, the <literal>@Inject</literal> annotation has "
-"something to do with dependency injection! <literal>@Inject</literal> may be "
-"applied to a constructor or method of a bean, and tells the container to "
-"call that constructor or method when instantiating the bean. The container "
-"will inject other beans into the parameters of the constructor or method."
+"As you've guessed, the <literal>@Inject</literal> annotation has something "
+"to do with dependency injection! <literal>@Inject</literal> may be applied "
+"to a constructor or method of a bean, and tells the container to call that "
+"constructor or method when instantiating the bean. The container will inject "
+"other beans into the parameters of the constructor or method."
 msgstr ""
 "Wie Sie wahrscheinlich bereits erraten haben, hat die <literal>@Initializer</"
 "literal>-Annotation etwas mit Dependency-Einspeisung zu tun! "
@@ -192,7 +190,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Let&#39;s create a UI controller bean that uses field injection to obtain an "
+"Let's create a UI controller bean that uses field injection to obtain an "
 "instance of the <literal>TextTranslator</literal>, translating the text "
 "entered by a user:"
 msgstr ""
@@ -206,10 +204,10 @@
 #, no-c-format
 msgid ""
 "Notice the controller bean is request-scoped and named. Since this "
-"combination is so common in web applications, there&#39;s a built-in "
-"annotation for it in CDI that we could have used as a shorthand. When the "
-"(stereotype) annotation <literal>@Model</literal> is declared on a class, it "
-"creates a request-scoped and named bean."
+"combination is so common in web applications, there's a built-in annotation "
+"for it in CDI that we could have used as a shorthand. When the (stereotype) "
+"annotation <literal>@Model</literal> is declared on a class, it creates a "
+"request-scoped and named bean."
 msgstr ""
 
 #. Tag: para
@@ -225,11 +223,11 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Notice that it isn&#39;t necessary to create a getter or setter method to "
-"inject one bean into another. CDI can access an injected field directly "
-"(even if it&#39;s private!), which sometimes helps eliminate some wasteful "
-"code. The name of the field is arbitrary. It&#39;s the field&#39;s type that "
-"determines what is injected."
+"Notice that it isn't necessary to create a getter or setter method to inject "
+"one bean into another. CDI can access an injected field directly (even if "
+"it's private!), which sometimes helps eliminate some wasteful code. The name "
+"of the field is arbitrary. It's the field's type that determines what is "
+"injected."
 msgstr ""
 
 #. Tag: para
@@ -256,10 +254,10 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Before we get too deep in the details, let&#39;s pause and examine a "
-"bean&#39;s anatomy. What aspects of the bean are significant, and what gives "
-"it its identity? Instead of just giving examples of beans, we&#39;re going "
-"to define what <emphasis>makes</emphasis> something a bean."
+"Before we get too deep in the details, let's pause and examine a bean's "
+"anatomy. What aspects of the bean are significant, and what gives it its "
+"identity? Instead of just giving examples of beans, we're going to define "
+"what <emphasis>makes</emphasis> something a bean."
 msgstr ""
 
 #, fuzzy

Modified: doc/trunk/reference/src/main/docbook/de-DE/master.po
===================================================================
--- doc/trunk/reference/src/main/docbook/de-DE/master.po	2010-07-24 16:36:48 UTC (rev 6808)
+++ doc/trunk/reference/src/main/docbook/de-DE/master.po	2010-07-25 04:22:37 UTC (rev 6809)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: master\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-05-01T13:53:43\n"
+"POT-Creation-Date: 2010-07-25T03:52:14\n"
 "PO-Revision-Date: 2009-02-22 13:55+1100\n"
 "Last-Translator: \n"
 "Language-Team:  <en at li.org>\n"
@@ -24,20 +24,20 @@
 #, no-c-format
 msgid ""
 "Shortly before the final draft of JSR-299 was submitted, the specification "
-"changed its name from &#34;Web Beans&#34; to &#34;Java Contexts and "
-"Dependency Injection for the Java EE platform&#34;, abbreviated CDI. For a "
-"brief period after the renaming, the reference implementation adopted the "
-"name &#34;Web Beans&#34;. However, this ended up causing more confusion than "
-"it solved and Red Hat decided to change the name of the reference "
-"implementation to &#34;Weld&#34;. You may still find other documentation, "
-"blogs, forum posts, etc. that use the old nomenclature. Please update any "
-"references you can. The naming game is over."
+"changed its name from \"Web Beans\" to \"Java Contexts and Dependency "
+"Injection for the Java EE platform\", abbreviated CDI. For a brief period "
+"after the renaming, the reference implementation adopted the name \"Web Beans"
+"\". However, this ended up causing more confusion than it solved and Red Hat "
+"decided to change the name of the reference implementation to \"Weld\". You "
+"may still find other documentation, blogs, forum posts, etc. that use the "
+"old nomenclature. Please update any references you can. The naming game is "
+"over."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
 msgid ""
-"You&#39;ll also find that some of the functionality that once existed in the "
+"You'll also find that some of the functionality that once existed in the "
 "specification is now missing, such as defining beans in XML. These features "
 "will be available as portable extensions for CDI in the Weld project, and "
 "perhaps other implementations."
@@ -47,11 +47,11 @@
 #, no-c-format
 msgid ""
 "Note that this reference guide was started while changes were still being "
-"made to the specification. We&#39;ve done our best to update it for "
-"accuracy. If you discover a conflict between what is written in this guide "
-"and the specification, the specification is the authority—assume it is "
-"correct. If you believe you have found an error in the specification, please "
-"report it to the JSR-299 EG."
+"made to the specification. We've done our best to update it for accuracy. If "
+"you discover a conflict between what is written in this guide and the "
+"specification, the specification is the authority—assume it is correct. If "
+"you believe you have found an error in the specification, please report it "
+"to the JSR-299 EG."
 msgstr ""
 
 #. Tag: title

Modified: doc/trunk/reference/src/main/docbook/de-DE/next.po
===================================================================
--- doc/trunk/reference/src/main/docbook/de-DE/next.po	2010-07-24 16:36:48 UTC (rev 6808)
+++ doc/trunk/reference/src/main/docbook/de-DE/next.po	2010-07-25 04:22:37 UTC (rev 6809)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: next\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-05-01T13:53:43\n"
+"POT-Creation-Date: 2010-07-25T03:52:14\n"
 "PO-Revision-Date: 2009-01-28 06:27+1100\n"
 "Last-Translator: \n"
 "Language-Team:  <en at li.org>\n"
@@ -23,13 +23,13 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Because CDI is so new, there&#39;s not yet a lot of information available "
+"Because CDI is so new, there's not yet a lot of information available "
 "online. That will change over time. Regardless, the CDI specification "
 "remains the authority for information on CDI. The spec is less than 100 "
-"pages and is quite readable (don&#39;t worry, it&#39;s not like your Blu-ray "
-"player manual). Of course, it covers many details we&#39;ve skipped over "
-"here. The spec is available on the <ulink url=\"http://jcp.org/en/jsr/detail?"
-"id=299\">JSR-299 page</ulink> at the JCP website."
+"pages and is quite readable (don't worry, it's not like your Blu-ray player "
+"manual). Of course, it covers many details we've skipped over here. The spec "
+"is available on the <ulink url=\"http://jcp.org/en/jsr/detail?id=299\">JSR-"
+"299 page</ulink> at the JCP website."
 msgstr ""
 
 #. Tag: para
@@ -39,8 +39,8 @@
 "\"http://seamframework.org/Weld\">Seam project</ulink>. The RI development "
 "team and the CDI spec lead blog at <ulink url=\"http://in.relation.to\">in."
 "relation.to</ulink>. This guide was originally based on a series of blog "
-"entries published there while the specification was being developed. It&#39;"
-"s probably the best source of information about the future of CDI, Weld and "
+"entries published there while the specification was being developed. It's "
+"probably the best source of information about the future of CDI, Weld and "
 "Seam."
 msgstr ""
 "Die Web Beans Referenzimplementierung wird unter <literal>http://"
@@ -78,8 +78,8 @@
 #, no-c-format
 msgid ""
 "Edit the <literal>pom.xml</literal> file in the root of the checkout and "
-"remove the &#34;<literal>-SNAPSHOT</literal>&#34; from the version element "
-"(so you don&#39;t have to build other Weld modules)."
+"remove the \"<literal>-SNAPSHOT</literal>\" from the version element (so you "
+"don't have to build other Weld modules)."
 msgstr ""
 
 #. Tag: para

Modified: doc/trunk/reference/src/main/docbook/de-DE/part1.po
===================================================================
--- doc/trunk/reference/src/main/docbook/de-DE/part1.po	2010-07-24 16:36:48 UTC (rev 6808)
+++ doc/trunk/reference/src/main/docbook/de-DE/part1.po	2010-07-25 04:22:37 UTC (rev 6809)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: part1\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-05-01T13:53:43\n"
+"POT-Creation-Date: 2010-07-25T03:52:14\n"
 "PO-Revision-Date: 2009-02-22 16:09+1100\n"
 "Last-Translator: \n"
 "Language-Team:  <en at li.org>\n"
@@ -179,7 +179,7 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"Where should I keep the reference to it when I&#39;m not currently using it?"
+"Where should I keep the reference to it when I'm not currently using it?"
 msgstr ""
 "wo sollte ich meinen Verweis darauf aufbewahren, wenn ich es nicht direkt "
 "verwende?"
@@ -201,9 +201,9 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"CDI is more than a framework. It&#39;s a whole, rich programming model. The "
+"CDI is more than a framework. It's a whole, rich programming model. The "
 "<emphasis>theme</emphasis> of CDI is <emphasis>loose-coupling with strong "
-"typing</emphasis>. Let&#39;s study what that phrase means."
+"typing</emphasis>. Let's study what that phrase means."
 msgstr ""
 
 #. Tag: para
@@ -263,8 +263,8 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"What&#39;s even more powerful (and comforting) is that CDI provides all "
-"these facilities in a <emphasis>typesafe</emphasis> way. CDI never relies on "
+"What's even more powerful (and comforting) is that CDI provides all these "
+"facilities in a <emphasis>typesafe</emphasis> way. CDI never relies on "
 "string-based identifiers to determine how collaborating objects fit "
 "together. Instead, CDI uses the typing information that is already available "
 "in the Java object model, augmented using a new programming pattern, called "
@@ -286,10 +286,10 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"But CDI isn&#39;t a restrictive programming model. It doesn&#39;t tell you "
-"how you should to structure your application into layers, how you should "
-"handle persistence, or what web framework you have to use. You&#39;ll have "
-"to decide those kinds of things for yourself."
+"But CDI isn't a restrictive programming model. It doesn't tell you how you "
+"should to structure your application into layers, how you should handle "
+"persistence, or what web framework you have to use. You'll have to decide "
+"those kinds of things for yourself."
 msgstr ""
 
 #. Tag: para
@@ -312,8 +312,8 @@
 "CDI was influenced by a number of existing Java frameworks, including Seam, "
 "Guice and Spring. However, CDI has its own, very distinct, character: more "
 "typesafe than Seam, more stateful and less XML-centric than Spring, more web "
-"and enterprise-application capable than Guice. But it couldn&#39;t have been "
-"any of these without inspiration from the frameworks mentioned and "
+"and enterprise-application capable than Guice. But it couldn't have been any "
+"of these without inspiration from the frameworks mentioned and "
 "<emphasis>lots</emphasis> of collaboration and hard work by the JSR-299 "
 "Expert Group (EG)."
 msgstr ""

Modified: doc/trunk/reference/src/main/docbook/de-DE/part3.po
===================================================================
--- doc/trunk/reference/src/main/docbook/de-DE/part3.po	2010-07-24 16:36:48 UTC (rev 6808)
+++ doc/trunk/reference/src/main/docbook/de-DE/part3.po	2010-07-25 04:22:37 UTC (rev 6809)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: part3\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-05-01T13:53:43\n"
+"POT-Creation-Date: 2010-07-25T03:52:14\n"
 "PO-Revision-Date: 2009-02-07 15:34+1100\n"
 "Last-Translator: \n"
 "Language-Team:  <en at li.org>\n"
@@ -18,8 +18,8 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"The first major theme of CDI is <emphasis>loose coupling</emphasis>. We&#39;"
-"ve already seen three means of achieving loose coupling:"
+"The first major theme of CDI is <emphasis>loose coupling</emphasis>. We've "
+"already seen three means of achieving loose coupling:"
 msgstr ""
 
 #. Tag: para
@@ -105,10 +105,10 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"You don&#39;t see string-based identifiers in CDI code, not because the "
+"You don't see string-based identifiers in CDI code, not because the "
 "framework is hiding them from you using clever defaulting rules—so-called "
-"&#34;configuration by convention&#34;—but because there are simply no "
-"strings there to begin with!"
+"\"configuration by convention\"—but because there are simply no strings "
+"there to begin with!"
 msgstr ""
 "Sie sehen keine String-basierten Bezeichner in Web Beans Code; dies ist "
 "nicht der Fall weil das Framework diese unter Verwendung irgendwelcher "
@@ -219,11 +219,11 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"We&#39;re now ready to meet some more advanced features of CDI. Bear in mind "
+"We're now ready to meet some more advanced features of CDI. Bear in mind "
 "that these features exist to make our code both easier to validate and more "
-"understandable. Most of the time you don&#39;t ever really <emphasis>need</"
-"emphasis> to use these features, but if you use them wisely, you&#39;ll come "
-"to appreciate their power."
+"understandable. Most of the time you don't ever really <emphasis>need</"
+"emphasis> to use these features, but if you use them wisely, you'll come to "
+"appreciate their power."
 msgstr ""
 "Wir können jetzt einige fortgeschrittenere Features von Web Beans "
 "kennenlernen. Vergessen Sie nicht, dass diese Features unseren Code sowohl "

Modified: doc/trunk/reference/src/main/docbook/de-DE/part4.po
===================================================================
--- doc/trunk/reference/src/main/docbook/de-DE/part4.po	2010-07-24 16:36:48 UTC (rev 6808)
+++ doc/trunk/reference/src/main/docbook/de-DE/part4.po	2010-07-25 04:22:37 UTC (rev 6809)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: part4\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-05-01T13:53:43\n"
+"POT-Creation-Date: 2010-07-25T03:52:14\n"
 "PO-Revision-Date: 2009-01-28 06:47+1100\n"
 "Last-Translator: \n"
 "Language-Team:  <en at li.org>\n"
@@ -18,12 +18,12 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"The third theme of CDI is <emphasis>integration</emphasis>. We&#39;ve "
-"already seen how CDI helps integrate EJB and JSF, allowing EJBs to be bound "
-"directly to JSF pages. That&#39;s just the beginning. The CDI services are "
-"integrated into the very core of the Java EE platform. Even EJB session "
-"beans can take advantage of the dependency injection, event bus, and "
-"contextual lifecycle management that CDI provides."
+"The third theme of CDI is <emphasis>integration</emphasis>. We've already "
+"seen how CDI helps integrate EJB and JSF, allowing EJBs to be bound directly "
+"to JSF pages. That's just the beginning. The CDI services are integrated "
+"into the very core of the Java EE platform. Even EJB session beans can take "
+"advantage of the dependency injection, event bus, and contextual lifecycle "
+"management that CDI provides."
 msgstr ""
 
 #. Tag: para
@@ -56,12 +56,12 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"We&#39;re about to see how to take full advantage of the Java EE platform in "
-"an application that uses CDI. We&#39;ll also briefly meet a set of SPIs that "
-"are provided to support portable extensions to CDI. You might not ever need "
-"to use these SPIs directly, but don&#39;t take them for granted. You will "
-"likely be using them indirectly, every time you use a third-party extension, "
-"such as Seam."
+"We're about to see how to take full advantage of the Java EE platform in an "
+"application that uses CDI. We'll also briefly meet a set of SPIs that are "
+"provided to support portable extensions to CDI. You might not ever need to "
+"use these SPIs directly, but don't take them for granted. You will likely be "
+"using them indirectly, every time you use a third-party extension, such as "
+"Seam."
 msgstr ""
 "Wir wollen Ihnen jetzt zeigen, wie Sie die Java EE platform in einer Web "
 "Beans verwendenden Anwendung am besten nutzen. Wir sehen uns auch kurz einen "

Modified: doc/trunk/reference/src/main/docbook/de-DE/producermethods.po
===================================================================
--- doc/trunk/reference/src/main/docbook/de-DE/producermethods.po	2010-07-24 16:36:48 UTC (rev 6808)
+++ doc/trunk/reference/src/main/docbook/de-DE/producermethods.po	2010-07-25 04:22:37 UTC (rev 6809)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: producermethods\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-05-01T13:53:43\n"
+"POT-Creation-Date: 2010-07-25T03:52:15\n"
 "PO-Revision-Date: 2009-02-23 08:08+1100\n"
 "Last-Translator: \n"
 "Language-Team:  <en at li.org>\n"
@@ -25,7 +25,7 @@
 msgid ""
 "Producer methods let us overcome certain limitations that arise when a "
 "container, instead of the application, is responsible for instantiating "
-"objects. They&#39;re also the easiest way to integrate objects which are not "
+"objects. They're also the easiest way to integrate objects which are not "
 "beans into the CDI environment."
 msgstr ""
 "Producer-Methoden gestatten es uns, bestimmte Beschränkungen zu umgehen, die "
@@ -92,9 +92,9 @@
 #, no-c-format
 msgid ""
 "In particular, producer methods let us use runtime polymorphism with CDI. As "
-"we&#39;ve seen, alternative beans are one solution to the problem of "
-"deployment-time polymorphism. But once the system is deployed, the CDI "
-"implementation is fixed. A producer method has no such limitation:"
+"we've seen, alternative beans are one solution to the problem of deployment-"
+"time polymorphism. But once the system is deployed, the CDI implementation "
+"is fixed. A producer method has no such limitation:"
 msgstr ""
 
 #. Tag: para
@@ -146,7 +146,7 @@
 msgid ""
 "Now, when the producer method is called, the returned "
 "<literal>PaymentStrategy</literal> will be bound to the session context. The "
-"producer method won&#39;t be called again in the same session."
+"producer method won't be called again in the same session."
 msgstr ""
 "Wird jetzt die Producer-Methode aufgerufen, so wird die wiedergegebene "
 "<literal>PaymentStrategy</literal> an den Session-Kontext gebunden. Die "
@@ -172,11 +172,11 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"There&#39;s one potential problem with the code above. The implementations "
-"of <literal>CreditCardPaymentStrategy</literal> are instantiated using the "
-"Java <literal>new</literal> operator. Objects instantiated directly by the "
-"application can&#39;t take advantage of dependency injection and don&#39;t "
-"have interceptors."
+"There's one potential problem with the code above. The implementations of "
+"<literal>CreditCardPaymentStrategy</literal> are instantiated using the Java "
+"<literal>new</literal> operator. Objects instantiated directly by the "
+"application can't take advantage of dependency injection and don't have "
+"interceptors."
 msgstr ""
 "Es gibt ein potenzielles Problem mit dem Code oben. Die Implementierungen "
 "von <literal>CreditCardPaymentStrategy</literal> werden unter Verwendung des "
@@ -187,7 +187,7 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"If this isn&#39;t what we want, we can use dependency injection into the "
+"If this isn't what we want, we can use dependency injection into the "
 "producer method to obtain bean instances:"
 msgstr ""
 "Falls dies nicht das ist was wir wünschen, so können wir Dependency-"
@@ -198,13 +198,13 @@
 #, fuzzy, no-c-format
 msgid ""
 "Wait, what if <literal>CreditCardPaymentStrategy</literal> is a request-"
-"scoped bean? Then the producer method has the effect of &#34;promoting&#34; "
-"the current request scoped instance into session scope. This is almost "
-"certainly a bug! The request scoped object will be destroyed by the "
-"container before the session ends, but the reference to the object will be "
-"left &#34;hanging&#34; in the session scope. This error will <emphasis>not</"
-"emphasis> be detected by the container, so please take extra care when "
-"returning bean instances from producer methods!"
+"scoped bean? Then the producer method has the effect of \"promoting\" the "
+"current request scoped instance into session scope. This is almost certainly "
+"a bug! The request scoped object will be destroyed by the container before "
+"the session ends, but the reference to the object will be left \"hanging\" "
+"in the session scope. This error will <emphasis>not</emphasis> be detected "
+"by the container, so please take extra care when returning bean instances "
+"from producer methods!"
 msgstr ""
 "Aber Moment mal, was wenn <literal>CreditCardPaymentStrategy</literal> ein "
 "anfragenbegrenztes Web Bean ist? Dann hat die Producer-Methode die Wirkung, "
@@ -219,7 +219,7 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"There&#39;s at least three ways we could go about fixing this bug. We could "
+"There's at least three ways we could go about fixing this bug. We could "
 "change the scope of the <literal>CreditCardPaymentStrategy</literal> "
 "implementation, but this would affect other clients of that bean. A better "
 "option would be to change the scope of the producer method to "
@@ -257,7 +257,7 @@
 "Then a new <emphasis>dependent</emphasis> instance of "
 "<literal>CreditCardPaymentStrategy</literal> will be created, passed to the "
 "producer method, returned by the producer method and finally bound to the "
-"session context. The dependent object won&#39;t be destroyed until the "
+"session context. The dependent object won't be destroyed until the "
 "<literal>Preferences</literal> object is destroyed, at the end of the "
 "session."
 msgstr ""

Modified: doc/trunk/reference/src/main/docbook/de-DE/resources.po
===================================================================
--- doc/trunk/reference/src/main/docbook/de-DE/resources.po	2010-07-24 16:36:48 UTC (rev 6808)
+++ doc/trunk/reference/src/main/docbook/de-DE/resources.po	2010-07-25 04:22:37 UTC (rev 6809)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: Weld_-_JSR-299_Reference_Implementation VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-05-01T13:53:43\n"
+"POT-Creation-Date: 2010-07-25T03:52:15\n"
 "PO-Revision-Date: 2009-11-11 15:00+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -34,8 +34,8 @@
 "injection in CDI. Most notably, component environment injection relies on "
 "string-based names to qualify ambiguous types, and there is no real "
 "consistency as to the nature of the names (sometimes a JNDI name, sometimes "
-"a persistence unit name, sometimes an EJB link, sometimes a nonportable &#34;"
-"mapped name&#34;). Producer fields turned out to be an elegant adaptor to "
+"a persistence unit name, sometimes an EJB link, sometimes a nonportable "
+"\"mapped name\"). Producer fields turned out to be an elegant adaptor to "
 "reduce all this complexity to a common model and get component environment "
 "resources to participate in the CDI system just like any other kind of bean."
 msgstr ""
@@ -127,10 +127,10 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"It might feel strange to be declaring resources in Java code. Isn&#39;t this "
-"stuff that might be deployment-specific? Certainly, and that&#39;s why it "
-"makes sense to declare your resources in a class annotated "
-"<literal>@Alternative</literal>."
+"It might feel strange to be declaring resources in Java code. Isn't this "
+"stuff that might be deployment-specific? Certainly, and that's why it makes "
+"sense to declare your resources in a class annotated <literal>@Alternative</"
+"literal>."
 msgstr ""
 
 #. Tag: title
@@ -156,9 +156,9 @@
 "It might seem like a pain to have to write these extra producer field "
 "declarations, just to gain an additional level of indirection. You could "
 "just as well use component environment injection directly, right? But "
-"remember that you&#39;re going to be using resources like the "
-"<literal>EntityManager</literal> in several different beans. Isn&#39;t it "
-"nicer and more typesafe to write"
+"remember that you're going to be using resources like the "
+"<literal>EntityManager</literal> in several different beans. Isn't it nicer "
+"and more typesafe to write"
 msgstr ""
 
 #. Tag: para

Modified: doc/trunk/reference/src/main/docbook/de-DE/ri-spi.po
===================================================================
--- doc/trunk/reference/src/main/docbook/de-DE/ri-spi.po	2010-07-24 16:36:48 UTC (rev 6808)
+++ doc/trunk/reference/src/main/docbook/de-DE/ri-spi.po	2010-07-25 04:22:37 UTC (rev 6809)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: ri-spi\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-05-01T13:53:43\n"
+"POT-Creation-Date: 2010-07-25T03:52:15\n"
 "PO-Revision-Date: 2009-03-05 14:40+1100\n"
 "Last-Translator: \n"
 "Language-Team:  <en at li.org>\n"
@@ -39,8 +39,8 @@
 "If you just want to use managed beans, and not take advantage of enterprise "
 "services (EE resource injection, CDI injection into EE component classes, "
 "transactional events, support for CDI services in EJBs) and non-flat "
-"deployments, then the generic servlet support provided by the &#34;Weld: "
-"Servlets&#34; extension will be sufficient, and will work in any container "
+"deployments, then the generic servlet support provided by the \"Weld: "
+"Servlets\" extension will be sufficient, and will work in any container "
 "supporting the Servlet API."
 msgstr ""
 
@@ -86,8 +86,8 @@
 "implementation of the <literal>Environment</literal> interface. A number of "
 "standard environments are built in, and described by the "
 "<literal>Environments</literal> enumeration. Different environments require "
-"different services to be present (for example a Servlet container doesn&#39;"
-"t require transaction, EJB or JPA services). By default an EE environment is "
+"different services to be present (for example a Servlet container doesn't "
+"require transaction, EJB or JPA services). By default an EE environment is "
 "assumed, but you can adjust the environment by calling <literal>bootstrap."
 "setEnvironment()</literal>."
 msgstr ""
@@ -166,7 +166,7 @@
 "BDAs it can access. However many containers will allow an easy mechanism to "
 "make BDAs bi-directionally accessible (such as a library directory). In this "
 "case, it is allowable (and reasonable) to describe all such archives as a "
-"single, &#39;virtual&#39; <literal>BeanDeploymentArchive</literal>."
+"single, 'virtual' <literal>BeanDeploymentArchive</literal>."
 msgstr ""
 
 #. Tag: para
@@ -181,7 +181,7 @@
 #, no-c-format
 msgid ""
 "<literal>BeanDeploymentArchive</literal> provides three methods which allow "
-"it&#39;s contents to be discovered by Weld—<literal>BeanDeploymentArchive."
+"it's contents to be discovered by Weld—<literal>BeanDeploymentArchive."
 "getBeanClasses()</literal> must return all the classes in the BDA, "
 "<literal>BeanDeploymentArchive.getBeansXml()</literal> must return all the "
 "deployment descriptors in the archive, and <literal>BeanDeploymentArchive."
@@ -210,7 +210,7 @@
 "In practice, you can regard the deployment structure represented by "
 "<literal>Deployment</literal>, and the virtual BDA graph as a mirror of the "
 "classloader structure for a deployment. If a class can from BDA X can be "
-"loaded by another in BDA Y, it is accessible, and therefore BDA Y&#39;s "
+"loaded by another in BDA Y, it is accessible, and therefore BDA Y's "
 "accessible BDAs should include BDA X."
 msgstr ""
 
@@ -246,7 +246,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Weld delegates EJB 3 bean discovery to the container so that it doesn&#39;t "
+"Weld delegates EJB 3 bean discovery to the container so that it doesn't "
 "duplicate the work done by the EJB container, and respects any vendor-"
 "extensions to the EJB definition."
 msgstr ""
@@ -318,7 +318,7 @@
 msgid ""
 "If you use a non-EE environment then you may implement any of the EE service "
 "SPIs, and Weld will provide the associated functionality. There is no need "
-"to implement those services you don&#39;t need!"
+"to implement those services you don't need!"
 msgstr ""
 
 #. Tag: title
@@ -575,9 +575,9 @@
 #, fuzzy, no-c-format
 msgid ""
 "Weld expects the Application Server or other container to provide the "
-"storage for each application&#39;s context. The <literal>org.jboss.weld."
-"context.api.BeanStore</literal> should be implemented to provide an "
-"application scoped storage."
+"storage for each application's context. The <literal>org.jboss.weld.context."
+"api.BeanStore</literal> should be implemented to provide an application "
+"scoped storage."
 msgstr ""
 "Web Beans erwartet, dass der Applikations-Server oder anderer Container den "
 "Speicher für den Kontext jeder Applikation bereitstellt. Der <literal>org."

Modified: doc/trunk/reference/src/main/docbook/de-DE/scopescontexts.po
===================================================================
--- doc/trunk/reference/src/main/docbook/de-DE/scopescontexts.po	2010-07-24 16:36:48 UTC (rev 6808)
+++ doc/trunk/reference/src/main/docbook/de-DE/scopescontexts.po	2010-07-25 04:22:37 UTC (rev 6809)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: scopescontexts\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-05-01T13:53:43\n"
+"POT-Creation-Date: 2010-07-25T03:52:15\n"
 "PO-Revision-Date: 2009-03-05 17:54+1100\n"
 "Last-Translator: \n"
 "Language-Team:  <en at li.org>\n"
@@ -23,7 +23,7 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"So far, we&#39;ve seen a few examples of <emphasis>scope type annotations</"
+"So far, we've seen a few examples of <emphasis>scope type annotations</"
 "emphasis>. The scope of a bean determines the lifecycle of instances of the "
 "bean. The scope also determines which clients refer to which instances of "
 "the bean. According to the CDI specification, a scope determines:"
@@ -76,13 +76,13 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"JPA entities aren&#39;t a great fit for this model. Entities have their "
-"whole own lifecycle and identity model which just doesn&#39;t map naturally "
-"to the model used in CDI. Therefore, we recommend against treating entities "
-"as CDI beans. You&#39;re certainly going to run into problems if you try to "
-"give an entity a scope other than the default scope <literal>@Dependent</"
-"literal>. The client proxy will get in the way if you try to pass an "
-"injected instance to the JPA <literal>EntityManager</literal>."
+"JPA entities aren't a great fit for this model. Entities have their whole "
+"own lifecycle and identity model which just doesn't map naturally to the "
+"model used in CDI. Therefore, we recommend against treating entities as CDI "
+"beans. You're certainly going to run into problems if you try to give an "
+"entity a scope other than the default scope <literal>@Dependent</literal>. "
+"The client proxy will get in the way if you try to pass an injected instance "
+"to the JPA <literal>EntityManager</literal>."
 msgstr ""
 
 #. Tag: title
@@ -93,8 +93,8 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"CDI features an <emphasis>extensible context model</emphasis>. It&#39;s "
-"possible to define new scopes by creating a new scope type annotation:"
+"CDI features an <emphasis>extensible context model</emphasis>. It's possible "
+"to define new scopes by creating a new scope type annotation:"
 msgstr ""
 "Web Beans besitzen ein <emphasis>erweiterbares Kontextmodell</emphasis>. Es "
 "ist möglich, neue Geltungsbereiche zu definieren, indem man eine neue "
@@ -103,7 +103,7 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"Of course, that&#39;s the easy part of the job. For this scope type to be "
+"Of course, that's the easy part of the job. For this scope type to be "
 "useful, we will also need to define a <literal>Context</literal> object that "
 "implements the scope! Implementing a <literal>Context</literal> is usually a "
 "very technical task, intended for framework development only. You can expect "
@@ -128,7 +128,7 @@
 
 #. Tag: para
 #, fuzzy, no-c-format
-msgid "Usually, you&#39;ll use one of CDI&#39;s built-in scopes."
+msgid "Usually, you'll use one of CDI's built-in scopes."
 msgstr ""
 "In der Regel verwenden Sie einen der eingebauten Geltungsbereiche der Web "
 "Beans."
@@ -248,7 +248,7 @@
 #, fuzzy, no-c-format
 msgid ""
 "Three of the four built-in scopes should be extremely familiar to every Java "
-"EE developer, so let&#39;s not waste time discussing them here. One of the "
+"EE developer, so let's not waste time discussing them here. One of the "
 "scopes, however, is new."
 msgstr ""
 "Drei der vier eingebauten Geltungsbereiche solltem jedem Java EE Entwickler "
@@ -406,7 +406,7 @@
 
 #. Tag: para
 #, no-c-format
-msgid "It&#39;s probably better to use one of the link components in JSF 2:"
+msgid "It's probably better to use one of the link components in JSF 2:"
 msgstr ""
 
 #. Tag: para
@@ -414,8 +414,8 @@
 msgid ""
 "The conversation context propagates across redirects, making it very easy to "
 "implement the common POST-then-redirect pattern, without resort to fragile "
-"constructs such as a &#34;flash&#34; object. The container automatically "
-"adds the conversation id to the redirect URL as a request parameter."
+"constructs such as a \"flash\" object. The container automatically adds the "
+"conversation id to the redirect URL as a request parameter."
 msgstr ""
 "Der Web Bean Manager muss auch Konversationen über ein Redirect "
 "fortpflanzen, selbst wenn die Konversation nicht als lange laufend "
@@ -486,12 +486,12 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"You can guess what &#34;singleton&#34; means here. It means a bean that is "
-"instantiated once. Unfortunately, there&#39;s a little problem with this "
-"pseudo-scope. Beans with scope <literal>@Singleton</literal> don&#39;t have "
-"a proxy object. Clients hold a direct reference to the singleton instance. "
-"So we need to consider the case of a client that can be serialized, for "
-"example, any bean with scope <literal>@SessionScoped</literal> or "
+"You can guess what \"singleton\" means here. It means a bean that is "
+"instantiated once. Unfortunately, there's a little problem with this pseudo-"
+"scope. Beans with scope <literal>@Singleton</literal> don't have a proxy "
+"object. Clients hold a direct reference to the singleton instance. So we "
+"need to consider the case of a client that can be serialized, for example, "
+"any bean with scope <literal>@SessionScoped</literal> or "
 "<literal>@ConversationScoped</literal>, any dependent object of a bean with "
 "scope <literal>@SessionScoped</literal> or <literal>@ConversationScoped</"
 "literal>, or any stateful session bean."
@@ -501,7 +501,7 @@
 #, no-c-format
 msgid ""
 "Now, if the singleton instance is a simple, immutable, serializable object "
-"like a string, a number or a date, we probably don&#39;t mind too much if it "
+"like a string, a number or a date, we probably don't mind too much if it "
 "gets duplicated via serialization. However, that makes it no stop being a "
 "true singleton, and we may as well have just declared it with the default "
 "scope."
@@ -532,7 +532,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"give the client a reference of type <literal>Instance&#60;X&#62;</literal> "
+"give the client a reference of type <literal>Instance&lt;X&gt;</literal> "
 "where <literal>X</literal> is the bean type of the singleton bean."
 msgstr ""
 
@@ -593,8 +593,8 @@
 "If you need to access a bean directly by EL name in a JSF page, you probably "
 "need to give it a scope other than <literal>@Dependent</literal>. Otherwise, "
 "any value that gets set to the bean by a JSF input will be lost immediately. "
-"That&#39;s why CDI features the <literal>@Model</literal> stereotype; it "
-"lets you give a bean a name, and set its scope to <literal>@RequestScoped</"
+"That's why CDI features the <literal>@Model</literal> stereotype; it lets "
+"you give a bean a name, and set its scope to <literal>@RequestScoped</"
 "literal> in one stroke. If you need to access a bean that really "
 "<emphasis>has</emphasis> to have the scope <literal>@Dependent</literal> "
 "from a JSF page, inject it into a different bean, and expose it to EL via a "
@@ -604,8 +604,8 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Beans with scope <literal>@Dependent</literal> don&#39;t need a proxy "
-"object. The client holds a direct reference to its instance."
+"Beans with scope <literal>@Dependent</literal> don't need a proxy object. "
+"The client holds a direct reference to its instance."
 msgstr ""
 
 #. Tag: para
@@ -674,8 +674,8 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"This feature is particularly useful with producer methods, as we&#39;ll see "
-"in the next chapter."
+"This feature is particularly useful with producer methods, as we'll see in "
+"the next chapter."
 msgstr ""
 "Dieses Feature ist insbesondere im Zusammenhang mit Producer-Methoden von "
 "Nutzen, wie wir im folgenden Kapitel noch sehen werden."

Modified: doc/trunk/reference/src/main/docbook/de-DE/specialization.po
===================================================================
--- doc/trunk/reference/src/main/docbook/de-DE/specialization.po	2010-07-24 16:36:48 UTC (rev 6808)
+++ doc/trunk/reference/src/main/docbook/de-DE/specialization.po	2010-07-25 04:22:37 UTC (rev 6809)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: specialization\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-05-01T13:53:43\n"
+"POT-Creation-Date: 2010-07-25T03:52:15\n"
 "PO-Revision-Date: 2009-03-06 15:52+1100\n"
 "Last-Translator: \n"
 "Language-Team:  <en at li.org>\n"
@@ -23,15 +23,15 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"When you first start developing with CDI, you&#39;ll likely be dealing only "
-"with a single bean implementation for each bean type. In this case, it&#39;s "
-"easy to understand how beans get selected for injection. As the complexity "
-"of your application grows, multiple occurrences of the same bean type start "
+"When you first start developing with CDI, you'll likely be dealing only with "
+"a single bean implementation for each bean type. In this case, it's easy to "
+"understand how beans get selected for injection. As the complexity of your "
+"application grows, multiple occurrences of the same bean type start "
 "appearing, either because you have multiple implementations or two beans "
-"share a common (Java) inheritance. That&#39;s when you have to begin "
-"studying the specialization, inheritance and alternative rules to work "
-"through unsatisfied or ambiguous dependencies or to avoid certain beans from "
-"being called."
+"share a common (Java) inheritance. That's when you have to begin studying "
+"the specialization, inheritance and alternative rules to work through "
+"unsatisfied or ambiguous dependencies or to avoid certain beans from being "
+"called."
 msgstr ""
 
 #. Tag: para
@@ -60,10 +60,10 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"The second case is the default assumed by CDI. It&#39;s possible to have two "
+"The second case is the default assumed by CDI. It's possible to have two "
 "beans in the system with the same part bean type (interface or parent "
-"class). As you&#39;ve learned, you select between the two implementations "
-"using qualifiers."
+"class). As you've learned, you select between the two implementations using "
+"qualifiers."
 msgstr ""
 
 #. Tag: para
@@ -73,7 +73,7 @@
 "deployment, only one bean can fulfill a given role at a time. That means one "
 "bean needs to be enabled and the other disabled. There are a two modifiers "
 "involved: <literal>@Alternative</literal> and <literal>@Specializes</"
-"literal>. We&#39;ll start by looking at alternatives and then show the "
+"literal>. We'll start by looking at alternatives and then show the "
 "guarantees that specialization adds."
 msgstr ""
 
@@ -99,8 +99,8 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"But in our staging environment, we don&#39;t really want to submit payments "
-"to the external system, so we override that implementation of "
+"But in our staging environment, we don't really want to submit payments to "
+"the external system, so we override that implementation of "
 "<literal>PaymentProcessor</literal> with a different bean:"
 msgstr ""
 "Aber in unserer Staging-Umgebung setzen wir diese Implementierung von "
@@ -114,19 +114,18 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"We&#39;ve already seen how we can enable this alternative by listing its "
-"class in the <literal>beans.xml</literal> descriptor."
+"We've already seen how we can enable this alternative by listing its class "
+"in the <literal>beans.xml</literal> descriptor."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
 msgid ""
 "But suppose we have many alternatives in the staging environment. It would "
-"be much more convenient to be able to enable them all at once. So let&#39;s "
-"make <literal>@Staging</literal> an <literal>@Alternative</literal> "
-"stereotype and annotate the staging beans with this stereotype instead. "
-"You&#39;ll see how this level of indirection pays off. First, we create the "
-"stereotype:"
+"be much more convenient to be able to enable them all at once. So let's make "
+"<literal>@Staging</literal> an <literal>@Alternative</literal> stereotype "
+"and annotate the staging beans with this stereotype instead. You'll see how "
+"this level of indirection pays off. First, we create the stereotype:"
 msgstr ""
 
 #. Tag: para
@@ -167,7 +166,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"So we haven&#39;t completely replaced the default implementation in this "
+"So we haven't completely replaced the default implementation in this "
 "deployment of the system. The only way one bean can completely override a "
 "second bean at all injection points is if it implements all the bean types "
 "and declares all the qualifiers of the second bean. However, if the second "
@@ -240,8 +239,8 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Since we&#39;re informing the container that our alternative bean is meant "
-"to stand in as a replacement for the default implementation, the alternative "
+"Since we're informing the container that our alternative bean is meant to "
+"stand in as a replacement for the default implementation, the alternative "
 "implementation automatically inherits all qualifiers of the default "
 "implementation. Thus, in our example, "
 "<literal>MockCreditCardPaymentProcessor</literal> inherits the qualifiers "

Modified: doc/trunk/reference/src/main/docbook/de-DE/stereotypes.po
===================================================================
--- doc/trunk/reference/src/main/docbook/de-DE/stereotypes.po	2010-07-24 16:36:48 UTC (rev 6808)
+++ doc/trunk/reference/src/main/docbook/de-DE/stereotypes.po	2010-07-25 04:22:37 UTC (rev 6809)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: stereotypes\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-05-01T13:53:43\n"
+"POT-Creation-Date: 2010-07-25T03:52:15\n"
 "PO-Revision-Date: 2009-03-06 16:50+1100\n"
 "Last-Translator: \n"
 "Language-Team:  <en at li.org>\n"
@@ -98,7 +98,7 @@
 #, no-c-format
 msgid ""
 "Of course, we need to apply some other annotations to our stereotype or else "
-"it wouldn&#39;t be adding much value."
+"it wouldn't be adding much value."
 msgstr ""
 
 #. Tag: title
@@ -125,7 +125,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Naturally, overriding a single default isn&#39;t much use. But remember, "
+"Naturally, overriding a single default isn't much use. But remember, "
 "stereotypes can define more than just the default scope."
 msgstr ""
 
@@ -209,8 +209,8 @@
 #, no-c-format
 msgid ""
 "This may blow your mind a bit, but stereotypes may declare other "
-"stereotypes, which we&#39;ll call <emphasis>stereotype stacking</emphasis>. "
-"You may want to do this if you have two distinct stereotypes which are "
+"stereotypes, which we'll call <emphasis>stereotype stacking</emphasis>. You "
+"may want to do this if you have two distinct stereotypes which are "
 "meaningful on their own, but in other situation may be meaningful when "
 "combined."
 msgstr ""
@@ -218,7 +218,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Here&#39;s an example that combines the <literal>@Action</literal> and "
+"Here's an example that combines the <literal>@Action</literal> and "
 "<literal>@Auditable</literal> stereotypes:"
 msgstr ""
 
@@ -230,9 +230,8 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"We&#39;ve already met two standard stereotypes defined by the CDI "
-"specification: <literal>@Interceptor</literal> and <literal>@Decorator</"
-"literal>."
+"We've already met two standard stereotypes defined by the CDI specification: "
+"<literal>@Interceptor</literal> and <literal>@Decorator</literal>."
 msgstr ""
 "Wir haben bereits zwei Standard-Stereotypen kennengelernt, die durch die Web "
 "Beans Spezifikation definiert werden: <literal>@Interceptor</literal> und "

Modified: doc/trunk/reference/src/main/docbook/de-DE/viewlayers.po
===================================================================
--- doc/trunk/reference/src/main/docbook/de-DE/viewlayers.po	2010-07-24 16:36:48 UTC (rev 6808)
+++ doc/trunk/reference/src/main/docbook/de-DE/viewlayers.po	2010-07-25 04:22:37 UTC (rev 6809)
@@ -6,7 +6,7 @@
 "Project-Id-Version: Web_Beans:_Java_Contexts_and_Dependency_Injection "
 "VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-05-01T13:53:43\n"
+"POT-Creation-Date: 2010-07-25T03:52:15\n"
 "PO-Revision-Date: 2009-04-19 20:36+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -90,8 +90,8 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Storing the id of any long-running conversation in Wicket&#39;s metadata "
-"when the page response is complete"
+"Storing the id of any long-running conversation in Wicket's metadata when "
+"the page response is complete"
 msgstr ""
 
 #. Tag: para
@@ -134,9 +134,9 @@
 #, no-c-format
 msgid ""
 "When a conversation is marked as long-running, the id of that conversation "
-"will be stored in Wicket&#39;s metadata for the current page. If a new page "
-"is created and set as the response target through <literal>setResponsePage()"
-"</literal>, this new page will also participate in this conversation. This "
+"will be stored in Wicket's metadata for the current page. If a new page is "
+"created and set as the response target through <literal>setResponsePage()</"
+"literal>, this new page will also participate in this conversation. This "
 "occurs for both directly instantiated pages (<literal>setResponsePage(new "
 "OtherPage())</literal>), as well as for bookmarkable pages created with "
 "<literal>setResponsePage(OtherPage.class)</literal> where <literal>OtherPage."

Modified: doc/trunk/reference/src/main/docbook/de-DE/weldexamples.po
===================================================================
--- doc/trunk/reference/src/main/docbook/de-DE/weldexamples.po	2010-07-24 16:36:48 UTC (rev 6808)
+++ doc/trunk/reference/src/main/docbook/de-DE/weldexamples.po	2010-07-25 04:22:37 UTC (rev 6809)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: Weld_-_JSR-299_Reference_Implementation VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-05-01T13:53:43\n"
+"POT-Creation-Date: 2010-07-25T03:52:15\n"
 "PO-Revision-Date: 2009-11-11 15:00+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -21,8 +21,8 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"It&#39;s time to pull the covers back and dive into the internals of Weld "
-"example applications. Let&#39;s start with the simpler of the two examples, "
+"It's time to pull the covers back and dive into the internals of Weld "
+"example applications. Let's start with the simpler of the two examples, "
 "<literal>weld-numberguess</literal>."
 msgstr ""
 
@@ -35,15 +35,15 @@
 #, no-c-format
 msgid ""
 "In the numberguess application you get 10 attempts to guess a number between "
-"1 and 100. After each attempt, you&#39;re told whether your guess was too "
-"high or too low."
+"1 and 100. After each attempt, you're told whether your guess was too high "
+"or too low."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
 msgid ""
 "The numberguess example is comprised of a number of beans, configuration "
-"files and Facelets (JSF) views, packaged as a war module. Let&#39;s start by "
+"files and Facelets (JSF) views, packaged as a war module. Let's start by "
 "examining the configuration files."
 msgstr ""
 
@@ -54,21 +54,21 @@
 "</literal>, which can be found in the <literal>src/main/webapp</literal> "
 "directory of the example. First, we have the JSF 2.0 version of "
 "<literal>faces-config.xml</literal>. A standardized version of Facelets is "
-"the default view handler in JSF 2.0, so there&#39;s really nothing that we "
-"have to configure. Thus, the configuration consists of only the root element."
+"the default view handler in JSF 2.0, so there's really nothing that we have "
+"to configure. Thus, the configuration consists of only the root element."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
 msgid ""
-"There&#39;s also an empty <literal>beans.xml</literal> file, which tells the "
+"There's also an empty <literal>beans.xml</literal> file, which tells the "
 "container to look for beans in this application and to activate the CDI "
 "services."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Finally, there&#39;s the familiar <literal>web.xml</literal>:"
+msgid "Finally, there's the familiar <literal>web.xml</literal>:"
 msgstr ""
 
 #. Tag: para
@@ -105,8 +105,8 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Let&#39;s take a look at the main JSF view, <literal>src/main/webapp/home."
-"xhtml</literal>."
+"Let's take a look at the main JSF view, <literal>src/main/webapp/home.xhtml</"
+"literal>."
 msgstr ""
 
 #. Tag: para
@@ -119,8 +119,8 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"There are a number of messages which can be sent to the user, &#34;Higher!"
-"&#34;, &#34;Lower!&#34; and &#34;Correct!&#34;"
+"There are a number of messages which can be sent to the user, \"Higher!\", "
+"\"Lower!\" and \"Correct!\""
 msgstr ""
 
 #. Tag: para
@@ -138,10 +138,9 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"A validator binding is used to make sure the user doesn&#39;t accidentally "
-"input a number outside of the range in which they can guess - if the "
-"validator wasn&#39;t here, the user might use up a guess on an out of bounds "
-"number."
+"A validator binding is used to make sure the user doesn't accidentally input "
+"a number outside of the range in which they can guess - if the validator "
+"wasn't here, the user might use up a guess on an out of bounds number."
 msgstr ""
 
 #. Tag: para
@@ -177,8 +176,8 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"The <literal>Generator</literal> is application scoped, so we don&#39;t get "
-"a different random each time."
+"The <literal>Generator</literal> is application scoped, so we don't get a "
+"different random each time."
 msgstr ""
 
 #. Tag: para
@@ -192,20 +191,20 @@
 #, no-c-format
 msgid ""
 "The final bean in the application is the session-scoped <literal>Game</"
-"literal> class. This is the primary entry point of the application. It&#39;s "
+"literal> class. This is the primary entry point of the application. It's "
 "responsible for setting up or resetting the game, capturing and validating "
-"the user&#39;s guess and providing feedback to the user with a "
-"<literal>FacesMessage</literal>. We&#39;ve used the post-construct lifecycle "
+"the user's guess and providing feedback to the user with a "
+"<literal>FacesMessage</literal>. We've used the post-construct lifecycle "
 "method to initialize the game by retrieving a random number from the "
-"<literal>@Random Instance&#60;Integer&#62;</literal> bean."
+"<literal>@Random Instance&lt;Integer&gt;</literal> bean."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
 msgid ""
-"You&#39;ll notice that we&#39;ve also added the <literal>@Named</literal> "
-"annotation to this class. This annotation is only required when you want to "
-"make the bean accessible to a JSF view via EL (i.e., #{game})."
+"You'll notice that we've also added the <literal>@Named</literal> annotation "
+"to this class. This annotation is only required when you want to make the "
+"bean accessible to a JSF view via EL (i.e., #{game})."
 msgstr ""
 
 #. Tag: title
@@ -237,9 +236,8 @@
 #, no-c-format
 msgid ""
 "Second, we need to explicitly specify the servlet listener in <literal>web."
-"xml</literal>, again because the container isn&#39;t doing this stuff for "
-"you. The servlet listener boots Weld and controls it&#39;s interaction with "
-"requests."
+"xml</literal>, again because the container isn't doing this stuff for you. "
+"The servlet listener boots Weld and controls it's interaction with requests."
 msgstr ""
 
 #. Tag: para
@@ -248,8 +246,8 @@
 "When Weld boots, it places the <literal>javax.enterprise.inject.spi."
 "BeanManager</literal>, the portable SPI for obtaining bean instances, in the "
 "ServletContext under a variable name equal to the fully-qualified interface "
-"name. You generally don&#39;t need to access this interface, but Weld makes "
-"use of it."
+"name. You generally don't need to access this interface, but Weld makes use "
+"of it."
 msgstr ""
 
 #. Tag: title
@@ -262,7 +260,7 @@
 msgid ""
 "Weld includes a number of portable extensions for JSR-299, including an "
 "extension for Wicket, which allows you to inject beans into Wicket "
-"components and leverage the conversation context. In this section, we&#39;ll "
+"components and leverage the conversation context. In this section, we'll "
 "walk you through the Wicket version of the numberguess example."
 msgstr ""
 
@@ -271,7 +269,7 @@
 msgid ""
 "You may want to review the Wicket documentation at <ulink url=\"http://"
 "wicket.apache.org/\">http://wicket.apache.org/</ulink> before reading this "
-"section, if you aren&#39;t already familiar with the framework."
+"section, if you aren't already familiar with the framework."
 msgstr ""
 
 #. Tag: para
@@ -280,17 +278,17 @@
 "Wicket is another environment that relies on the Weld servlet extension. The "
 "use of <ulink url=\"http://jetty.mortbay.org\">Jetty</ulink> is common in "
 "the Wicket community, and is thus chosen here as the runtime container. "
-"You&#39;ve seen already that Jetty is perfectly capable of running CDI "
+"You've seen already that Jetty is perfectly capable of running CDI "
 "applications with Weld add-ons, and this environment is no different."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
 msgid ""
-"We&#39;ll also be using the Eclipse IDE in these examples. Instructions are "
+"We'll also be using the Eclipse IDE in these examples. Instructions are "
 "provided later for running the example from the command line, but since "
-"you&#39;ll likely need to do more than just deploy examples, we&#39;ll get "
-"setup in this full development environment."
+"you'll likely need to do more than just deploy examples, we'll get setup in "
+"this full development environment."
 msgstr ""
 
 #. Tag: title
@@ -313,7 +311,7 @@
 #, no-c-format
 msgid ""
 "If you have m2eclipse installed, you can open any Maven project directly. "
-"From within Eclipse, select <emphasis>File -&#62; Import... -&#62; Maven "
+"From within Eclipse, select <emphasis>File -&gt; Import... -&gt; Maven "
 "Projects</emphasis>. Then, browse to the location of the Wicket numberguess "
 "example. You should see that Eclipse recognizes the existence of a Maven "
 "project."
@@ -329,24 +327,24 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"You&#39;ll notice after importing, the project has a build error. That&#39;s "
-"because we need to enable a Maven profile. Right-click on the project and "
-"select <emphasis>Properties</emphasis>, then select the <emphasis>Maven</"
-"emphasis> tab in the window that appears. In the form field labeled &#34;"
-"Active Maven Profiles (comma separated):&#34;, type <literal>jetty</"
-"literal>. That will enable some extra dependencies that allow the project to "
-"compile. Additionally, <emphasis>uncheck</emphasis> the box labeled &#34;"
-"Skip Maven compile plugin when processing resources (recommended)&#34;. That "
-"solves an incompatiblity between the m2eclipse plugin and the Maven enforcer "
-"plugin that we use for the Weld project. Now, you&#39;re ready to develop!"
+"You'll notice after importing, the project has a build error. That's because "
+"we need to enable a Maven profile. Right-click on the project and select "
+"<emphasis>Properties</emphasis>, then select the <emphasis>Maven</emphasis> "
+"tab in the window that appears. In the form field labeled \"Active Maven "
+"Profiles (comma separated):\", type <literal>jetty</literal>. That will "
+"enable some extra dependencies that allow the project to compile. "
+"Additionally, <emphasis>uncheck</emphasis> the box labeled \"Skip Maven "
+"compile plugin when processing resources (recommended)\". That solves an "
+"incompatiblity between the m2eclipse plugin and the Maven enforcer plugin "
+"that we use for the Weld project. Now, you're ready to develop!"
 msgstr ""
 
 #. Tag: para
 #, no-c-format
 msgid ""
-"Be sure to uncheck the box &#34;Skip Maven compile plugin when processing "
-"resources (recommended)&#34; in the Maven properties screen or else the "
-"example might not run in Eclipse because beans.xml will be missing from the "
+"Be sure to uncheck the box \"Skip Maven compile plugin when processing "
+"resources (recommended)\" in the Maven properties screen or else the example "
+"might not run in Eclipse because beans.xml will be missing from the "
 "classpath! See the <ulink url=\"https://issues.sonatype.org/browse/"
 "MNGECLIPSE-768\">MNGECLIPSE-768</ulink> issue report for details."
 msgstr ""
@@ -363,15 +361,15 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Then, from Eclipse, choose <emphasis>File -&#62; Import... -&#62; General -"
-"&#62; Existing Projects into Workspace</emphasis>, select the root directory "
+"Then, from Eclipse, choose <emphasis>File -&gt; Import... -&gt; General -"
+"&gt; Existing Projects into Workspace</emphasis>, select the root directory "
 "of the numberguess example, and click Finish. This will create a project in "
 "your workspace called <literal>weld-wicket-numberguess</literal>."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "It&#39;s time to get the example running!"
+msgid "It's time to get the example running!"
 msgstr ""
 
 #. Tag: title
@@ -430,7 +428,7 @@
 
 #. Tag: para
 #, no-c-format
-msgid "Enough toying with deployment, let&#39;s dive into the code."
+msgid "Enough toying with deployment, let's dive into the code."
 msgstr ""
 
 #. Tag: title
@@ -462,7 +460,7 @@
 
 #. Tag: para
 #, no-c-format
-msgid "Here&#39;s where things differ from the JSF numberguess example:"
+msgid "Here's where things differ from the JSF numberguess example:"
 msgstr ""
 
 #. Tag: para
@@ -585,8 +583,8 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Let&#39;s have a look at the significant code and configuration files that "
-"make up this example."
+"Let's have a look at the significant code and configuration files that make "
+"up this example."
 msgstr ""
 
 #. Tag: para
@@ -600,8 +598,8 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"The game&#39;s main logic is located in <literal>Game.java</literal>. Here "
-"is the code for that class, highlighting the ways in which this differs from "
+"The game's main logic is located in <literal>Game.java</literal>. Here is "
+"the code for that class, highlighting the ways in which this differs from "
 "the web application version:"
 msgstr ""
 
@@ -609,14 +607,14 @@
 #, no-c-format
 msgid ""
 "The bean is application scoped rather than session scoped, since an instance "
-"of a Swing application typically represents a single &#39;session&#39;."
+"of a Swing application typically represents a single 'session'."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
 msgid ""
-"Notice that the bean is not named, since it doesn&#39;t need to be accessed "
-"via EL."
+"Notice that the bean is not named, since it doesn't need to be accessed via "
+"EL."
 msgstr ""
 
 #. Tag: para
@@ -657,9 +655,9 @@
 msgid ""
 "The <literal>reset()</literal> method makes a call to the injected "
 "<literal>rndGenerator</literal> in order to get the random number at the "
-"start of each game. Note that it can&#39;t use <literal>Instance.get()</"
-"literal> like the JSF example does because there will not be any active "
-"contexts like there are during a JSF request."
+"start of each game. Note that it can't use <literal>Instance.get()</literal> "
+"like the JSF example does because there will not be any active contexts like "
+"there are during a JSF request."
 msgstr ""
 
 #. Tag: para
@@ -667,8 +665,8 @@
 msgid ""
 "The <literal>MessageGenerator</literal> class depends on the current "
 "instance of <literal>Game</literal> and queries its state in order to "
-"determine the appropriate messages to provide as the prompt for the user&#39;"
-"s next guess and the response to the previous guess. The code for "
+"determine the appropriate messages to provide as the prompt for the user's "
+"next guess and the response to the previous guess. The code for "
 "<literal>MessageGenerator</literal> is as follows:"
 msgstr ""
 
@@ -681,7 +679,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"The <literal>Game</literal>&#39;s state is interrogated to determine the "
+"The <literal>Game</literal>'s state is interrogated to determine the "
 "appropriate challenge message ..."
 msgstr ""
 
@@ -726,8 +724,8 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"<literal>guessButtonActionPerformed</literal> is called when the &#39;"
-"Guess&#39; button is clicked, and it does the following:"
+"<literal>guessButtonActionPerformed</literal> is called when the 'Guess' "
+"button is clicked, and it does the following:"
 msgstr ""
 
 #. Tag: para
@@ -740,8 +738,8 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Calls <literal>game.check()</literal> to validate and perform one &#39;"
-"turn&#39; of the game"
+"Calls <literal>game.check()</literal> to validate and perform one 'turn' of "
+"the game"
 msgstr ""
 
 #. Tag: para
@@ -780,7 +778,7 @@
 #, no-c-format
 msgid ""
 "The translator example is built as an ear and contains EJBs. As a result, "
-"it&#39;s structure is more complex than the numberguess example."
+"it's structure is more complex than the numberguess example."
 msgstr ""
 
 #. Tag: para
@@ -794,10 +792,9 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"First, let&#39;s take a look at the ear aggregator, which is located in the "
-"example&#39;s <literal>ear</literal> directory. Maven automatically "
-"generates the <literal>application.xml</literal> for us from this plugin "
-"configuration:"
+"First, let's take a look at the ear aggregator, which is located in the "
+"example's <literal>ear</literal> directory. Maven automatically generates "
+"the <literal>application.xml</literal> for us from this plugin configuration:"
 msgstr ""
 
 #. Tag: para
@@ -811,18 +808,18 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"If you weren&#39;t using Maven to generate these files, you would need "
+"If you weren't using Maven to generate these files, you would need "
 "<literal>META-INF/application.xml</literal>:"
 msgstr ""
 
 #. Tag: para
 #, no-c-format
 msgid ""
-"Next, lets look at the war, which is located in the example&#39;s "
-"<literal>war</literal> directory. Just as in the numberguess example, we "
-"have a <literal>faces-config.xml</literal> for JSF 2.0 and a <literal>web."
-"xml</literal> (to activate JSF) under WEB-INF, both sourced from "
-"<literal>src/main/webapp/WEB-INF</literal>."
+"Next, lets look at the war, which is located in the example's <literal>war</"
+"literal> directory. Just as in the numberguess example, we have a "
+"<literal>faces-config.xml</literal> for JSF 2.0 and a <literal>web.xml</"
+"literal> (to activate JSF) under WEB-INF, both sourced from <literal>src/"
+"main/webapp/WEB-INF</literal>."
 msgstr ""
 
 #. Tag: para
@@ -843,21 +840,21 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Finally, let&#39;s look at the EJB module, which is located in the "
-"example&#39;s <literal>ejb</literal> directory. In <literal>src/main/"
-"resources/META-INF</literal> there is just an empty <literal>beans.xml</"
-"literal>, used to mark the archive as containing beans."
+"Finally, let's look at the EJB module, which is located in the example's "
+"<literal>ejb</literal> directory. In <literal>src/main/resources/META-INF</"
+"literal> there is just an empty <literal>beans.xml</literal>, used to mark "
+"the archive as containing beans."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
 msgid ""
-"We&#39;ve saved the most interesting bit to last, the code! The project has "
-"two simple beans, <literal>SentenceParser</literal> and "
-"<literal>TextTranslator</literal> and two session beans, "
-"<literal>TranslatorControllerBean</literal> and <literal>SentenceTranslator</"
-"literal>. You should be getting quite familiar with what a bean looks like "
-"by now, so we&#39;ll just highlight the most interesting bits here."
+"We've saved the most interesting bit to last, the code! The project has two "
+"simple beans, <literal>SentenceParser</literal> and <literal>TextTranslator</"
+"literal> and two session beans, <literal>TranslatorControllerBean</literal> "
+"and <literal>SentenceTranslator</literal>. You should be getting quite "
+"familiar with what a bean looks like by now, so we'll just highlight the "
+"most interesting bits here."
 msgstr ""
 
 #. Tag: para
@@ -874,9 +871,9 @@
 "<literal>TextTranslator</literal> uses the simple bean (really just a plain "
 "Java class!) <literal>SentenceParser</literal> to parse the sentence and "
 "then calls on the stateless bean with the local business interface "
-"<literal>Translator</literal> to perform the translation. That&#39;s where "
-"the magic happens. Of course, we couldn&#39;t develop a full translator, but "
-"it&#39;s convincing enough to anyone who doesn&#39;t understand Latin!"
+"<literal>Translator</literal> to perform the translation. That's where the "
+"magic happens. Of course, we couldn't develop a full translator, but it's "
+"convincing enough to anyone who doesn't understand Latin!"
 msgstr ""
 
 #. Tag: para

Modified: doc/trunk/reference/src/main/docbook/de-DE/xml.po
===================================================================
--- doc/trunk/reference/src/main/docbook/de-DE/xml.po	2010-07-24 16:36:48 UTC (rev 6808)
+++ doc/trunk/reference/src/main/docbook/de-DE/xml.po	2010-07-25 04:22:37 UTC (rev 6809)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: xml\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-05-01T13:53:43\n"
+"POT-Creation-Date: 2010-07-25T03:52:15\n"
 "PO-Revision-Date: 2009-03-06 17:56+1100\n"
 "Last-Translator: \n"
 "Language-Team:  <en at li.org>\n"
@@ -23,9 +23,9 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"So far, we&#39;ve seen plenty of examples of beans declared using "
-"annotations. However, there are a couple of occasions when we can&#39;t use "
-"annotations to define the bean:"
+"So far, we've seen plenty of examples of beans declared using annotations. "
+"However, there are a couple of occasions when we can't use annotations to "
+"define the bean:"
 msgstr ""
 "Bis jetzt haben wir viele Beispiele von unter Verwendung von Annotationen "
 "deklarierten Web Beans gesehen. Es gibt jedoch ein paar Fälle, in denen "
@@ -75,10 +75,10 @@
 #, fuzzy, no-c-format
 msgid ""
 "The advantage of this approach is that you can write an XML schema that "
-"prevents spelling errors in your XML document. It&#39;s even possible for a "
-"tool to generate the XML schema automatically from the compiled Java code. "
-"Or, an integrated development environment could perform the same validation "
-"without the need for the explicit intermediate generation step."
+"prevents spelling errors in your XML document. It's even possible for a tool "
+"to generate the XML schema automatically from the compiled Java code. Or, an "
+"integrated development environment could perform the same validation without "
+"the need for the explicit intermediate generation step."
 msgstr ""
 "Der Vorteil bei dieser Vorgehensweise ist, dass Sie ein XML-Schema schreiben "
 "können, dass Rechtschreibfehler in Ihrem XML-Dokument verhindert. Es ist "
@@ -125,7 +125,7 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"For example, the element <literal>&#60;util:Date/&#62;</literal> in the "
+"For example, the element <literal>&lt;util:Date/&gt;</literal> in the "
 "following XML fragment refers to the class <literal>java.util.Date</literal>:"
 msgstr ""
 "Zum Beispiel bezieht sich das Element <literal>&lt;util:Date/&gt;</literal> "
@@ -213,7 +213,7 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"The <literal>&#60;Name&#62;</literal> element declares a bean of scope "
+"The <literal>&lt;Name&gt;</literal> element declares a bean of scope "
 "<literal>@Dependent</literal> and class <literal>Name</literal>, with a set "
 "of initial field values. This bean has a special, container-generated "
 "qualifier and is therefore injectable only to the specific injection point "
@@ -229,8 +229,8 @@
 #, fuzzy, no-c-format
 msgid ""
 "This simple but powerful feature allows the Weld XML format to be used to "
-"specify whole graphs of Java objects. It&#39;s not quite a full databinding "
-"solution, but it&#39;s close!"
+"specify whole graphs of Java objects. It's not quite a full databinding "
+"solution, but it's close!"
 msgstr ""
 "Dieses einfache aber leistungsfähige Feature gestattet die Verwendung des "
 "Web Beans XML-Formats zur Festlegung ganzer Diagramme von Java-Objekten. Es "
@@ -244,10 +244,9 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"If we want our XML document format to be authored by people who aren&#39;t "
-"Java developers, or who don&#39;t have access to our code, we need to "
-"provide a schema. There&#39;s nothing specific to Weld about writing or "
-"using the schema."
+"If we want our XML document format to be authored by people who aren't Java "
+"developers, or who don't have access to our code, we need to provide a "
+"schema. There's nothing specific to Weld about writing or using the schema."
 msgstr ""
 "Wenn Personen, die keine Java-Entwickler sind, Autoren unseres XML-"
 "Dokumentformats sein sollen oder diese keinen Zugriff auf unseren Code "

Modified: doc/trunk/reference/src/main/docbook/es-ES/beans.po
===================================================================
--- doc/trunk/reference/src/main/docbook/es-ES/beans.po	2010-07-24 16:36:48 UTC (rev 6808)
+++ doc/trunk/reference/src/main/docbook/es-ES/beans.po	2010-07-25 04:22:37 UTC (rev 6809)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: Weld_-_JSR-299_Reference_Implementation VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-05-01T13:53:42\n"
+"POT-Creation-Date: 2010-07-25T03:52:14\n"
 "PO-Revision-Date: 2009-11-11 15:00+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -32,13 +32,13 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Let&#39;s back up a second. What does it really mean to be "
-"<emphasis>contextual</emphasis>? Since beans may be stateful, it matters "
-"<emphasis>which</emphasis> bean instance I have. Unlike a stateless "
-"component model (for example, stateless session beans) or a singleton "
-"component model (such as servlets, or singleton beans), different clients of "
-"a bean see the bean in different states. The client-visible state depends "
-"upon which instance of the bean the client has a reference to."
+"Let's back up a second. What does it really mean to be <emphasis>contextual</"
+"emphasis>? Since beans may be stateful, it matters <emphasis>which</"
+"emphasis> bean instance I have. Unlike a stateless component model (for "
+"example, stateless session beans) or a singleton component model (such as "
+"servlets, or singleton beans), different clients of a bean see the bean in "
+"different states. The client-visible state depends upon which instance of "
+"the bean the client has a reference to."
 msgstr ""
 
 #. Tag: para
@@ -83,10 +83,10 @@
 msgid ""
 "One great advantage of the contextual model is that it allows stateful beans "
 "to be treated like services! The client need not concern itself with "
-"managing the lifecycle of the bean it&#39;s using, <emphasis>nor does it "
-"even need to know what that lifecycle is.</emphasis> Beans interact by "
-"passing messages, and the bean implementations define the lifecycle of their "
-"own state. The beans are loosely coupled because:"
+"managing the lifecycle of the bean it's using, <emphasis>nor does it even "
+"need to know what that lifecycle is.</emphasis> Beans interact by passing "
+"messages, and the bean implementations define the lifecycle of their own "
+"state. The beans are loosely coupled because:"
 msgstr ""
 
 #. Tag: para
@@ -171,7 +171,7 @@
 
 #. Tag: para
 #, no-c-format
-msgid "Let&#39;s see what all this new terminology means."
+msgid "Let's see what all this new terminology means."
 msgstr ""
 
 #. Tag: title
@@ -183,8 +183,8 @@
 #, no-c-format
 msgid ""
 "Beans usually acquire references to other beans via dependency injection. "
-"Any injected attribute specifies a &#34;contract&#34; that must be satisfied "
-"by the bean to be injected. The contract is:"
+"Any injected attribute specifies a \"contract\" that must be satisfied by "
+"the bean to be injected. The contract is:"
 msgstr ""
 
 #. Tag: para
@@ -211,7 +211,7 @@
 #, no-c-format
 msgid ""
 "The bean types are <literal>BookShop</literal>, <literal>Business</literal> "
-"and <literal>Shop&#60;Book&#62;</literal>, as well as the implicit type "
+"and <literal>Shop&lt;Book&gt;</literal>, as well as the implicit type "
 "<literal>java.lang.Object</literal>. (Notice that a parameterized type is a "
 "legal bean type)."
 msgstr ""
@@ -230,9 +230,9 @@
 msgid ""
 "The bean types of a session bean include local interfaces and the bean class "
 "local view (if any). EJB remote interfaces are not considered bean types of "
-"a session bean. You can&#39;t inject an EJB using its remote interface "
-"unless you define a <emphasis>resource</emphasis>, which we&#39;ll meet in "
-"<xref linkend=\"resources\" />."
+"a session bean. You can't inject an EJB using its remote interface unless "
+"you define a <emphasis>resource</emphasis>, which we'll meet in <xref "
+"linkend=\"resources\" />."
 msgstr ""
 
 #. Tag: para
@@ -241,7 +241,7 @@
 "Bean types may be restricted to an explicit set by annotating the bean with "
 "the <literal>@Typed</literal> annotation and listing the classes that should "
 "be bean types. For instance, the bean types of this bean have been "
-"restricted to <literal>Shop&#60;Book&#62;</literal>, together with "
+"restricted to <literal>Shop&lt;Book&gt;</literal>, together with "
 "<literal>java.lang.Object</literal>:"
 msgstr ""
 
@@ -255,8 +255,8 @@
 "<literal>DebitPaymentProcessor</literal>. Injecting a field of type "
 "<literal>PaymentProcessor</literal> introduces an ambiguous condition. In "
 "these cases, the client must specify some additional quality of the "
-"implementation it is interested in. We model this kind of &#34;quality&#34; "
-"using a qualifier."
+"implementation it is interested in. We model this kind of \"quality\" using "
+"a qualifier."
 msgstr ""
 
 #. Tag: para
@@ -265,23 +265,23 @@
 "A qualifier is a user-defined annotation that is itself annotated "
 "<literal>@Qualifer</literal>. A qualifier annotation is an extension of the "
 "type system. It lets us disambiguate a type without having to fall back to "
-"string-based names. Here&#39;s an example of a qualifier annotation:"
+"string-based names. Here's an example of a qualifier annotation:"
 msgstr ""
 
 #. Tag: para
 #, no-c-format
 msgid ""
 "You may not be used to seeing the definition of an annotation. In fact, this "
-"might be the first time you&#39;ve encountered one. With CDI, annotation "
-"definitions will become a familiar artifact as you&#39;ll be creating them "
-"from time to time."
+"might be the first time you've encountered one. With CDI, annotation "
+"definitions will become a familiar artifact as you'll be creating them from "
+"time to time."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
 msgid ""
 "Pay attention to the names of the built-in annotations in CDI and EJB. "
-"You&#39;ll notice that they are often adjectives. We encourage you to follow "
+"You'll notice that they are often adjectives. We encourage you to follow "
 "this convention when creating your custom annotations, since they serve to "
 "describe the behaviors and roles of the class."
 msgstr ""
@@ -308,7 +308,7 @@
 "For each injection point, the container searches for a bean which satisfies "
 "the contract, one which has the bean type and all the qualifiers. If it "
 "finds exactly one matching bean, it injects an instance of that bean. If it "
-"doesn&#39;t, it reports an error to the user."
+"doesn't, it reports an error to the user."
 msgstr ""
 
 #. Tag: para
@@ -330,10 +330,10 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"That&#39;s not quite the end of the story. CDI also defines a simple "
+"That's not quite the end of the story. CDI also defines a simple "
 "<emphasis>resolution rule</emphasis> that helps the container decide what to "
 "do if there is more than one bean that satisfies a particular contract. "
-"We&#39;ll get into the details in <xref linkend=\"injection\" />."
+"We'll get into the details in <xref linkend=\"injection\" />."
 msgstr ""
 
 #. Tag: title
@@ -370,7 +370,7 @@
 msgid ""
 "Keep in mind that once a bean is bound to a context, it remains in that "
 "context until the context is destroyed. There is no way to manually remove a "
-"bean from a context. If you don&#39;t want the bean to sit in the session "
+"bean from a context. If you don't want the bean to sit in the session "
 "indefinitely, consider using another scope with a shorted lifespan, such as "
 "the request or conversation scope."
 msgstr ""
@@ -386,8 +386,7 @@
 
 #. Tag: para
 #, no-c-format
-msgid ""
-"We&#39;ll talk more about scopes in <xref linkend=\"scopescontexts\" />."
+msgid "We'll talk more about scopes in <xref linkend=\"scopescontexts\" />."
 msgstr ""
 
 #. Tag: title
@@ -446,7 +445,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"We&#39;ve already seen how qualifiers let us choose between multiple "
+"We've already seen how qualifiers let us choose between multiple "
 "implementations of an interface at development time. But sometimes we have "
 "an interface (or other bean type) whose implementation varies depending upon "
 "the deployment environment. For example, we may want to use a mock "
@@ -483,9 +482,9 @@
 msgid ""
 "You might be familiar with the use of interceptors in EJB 3.0. In Java EE 6, "
 "this functionality has been generalized to work with other managed beans. "
-"That&#39;s right, you no longer have to make your bean an EJB just to "
-"intercept its methods. Holler. So what does CDI have to offer above and "
-"beyond that? Well, quite a lot actually. Let&#39;s cover some background."
+"That's right, you no longer have to make your bean an EJB just to intercept "
+"its methods. Holler. So what does CDI have to offer above and beyond that? "
+"Well, quite a lot actually. Let's cover some background."
 msgstr ""
 
 #. Tag: para
@@ -498,10 +497,10 @@
 "descriptor. You might as well just put the interceptor code <emphasis>in</"
 "emphasis> the implementation! Second, the order in which the interceptors "
 "are applied is taken from the order in which they are declared in the "
-"annotation or the XML descriptor. Perhaps this isn&#39;t so bad if you&#39;"
-"re applying the interceptors to a single bean. But, if you are applying them "
-"repeatedly, then there&#39;s a good chance that you&#39;ll inadvertently "
-"define a different order for different beans. Now that&#39;s a problem."
+"annotation or the XML descriptor. Perhaps this isn't so bad if you're "
+"applying the interceptors to a single bean. But, if you are applying them "
+"repeatedly, then there's a good chance that you'll inadvertently define a "
+"different order for different beans. Now that's a problem."
 msgstr ""
 
 #. Tag: para
@@ -540,14 +539,14 @@
 #, no-c-format
 msgid ""
 "Notice that <literal>ShoppingCart</literal> and "
-"<literal>TransactionInterceptor</literal> don&#39;t know anything about each "
+"<literal>TransactionInterceptor</literal> don't know anything about each "
 "other."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
 msgid ""
-"Interceptors are deployment-specific. (We don&#39;t need a "
+"Interceptors are deployment-specific. (We don't need a "
 "<literal>TransactionInterceptor</literal> in our unit tests!) By default, an "
 "interceptor is disabled. We can enable an interceptor using the CDI "
 "deployment descriptor <literal>META-INF/beans.xml</literal> of the jar or "
@@ -557,8 +556,8 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"We&#39;ll discuss interceptors, and their cousins, decorators, in <xref "
-"linkend=\"interceptors\" /> and <xref linkend=\"decorators\" />."
+"We'll discuss interceptors, and their cousins, decorators, in <xref linkend="
+"\"interceptors\" /> and <xref linkend=\"decorators\" />."
 msgstr ""
 
 #. Tag: title
@@ -569,10 +568,9 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"We&#39;ve already seen two types of beans: JavaBeans and EJB session beans. "
-"Is that the whole story? Actually, it&#39;s just the beginning. Let&#39;s "
-"explore the various kinds of beans that CDI implementations must support out-"
-"of-the-box."
+"We've already seen two types of beans: JavaBeans and EJB session beans. Is "
+"that the whole story? Actually, it's just the beginning. Let's explore the "
+"various kinds of beans that CDI implementations must support out-of-the-box."
 msgstr ""
 
 #. Tag: title
@@ -586,8 +584,8 @@
 "A managed bean is a Java class. The basic lifecycle and semantics of a "
 "managed bean are defined by the Managed Beans specification. You can "
 "explicitly declare a managed bean by annotating the bean class "
-"<literal>@ManagedBean</literal>, but in CDI you don&#39;t need to. According "
-"to the specification, the CDI container treats any class that satisfies the "
+"<literal>@ManagedBean</literal>, but in CDI you don't need to. According to "
+"the specification, the CDI container treats any class that satisfies the "
 "following conditions as a managed bean:"
 msgstr ""
 
@@ -636,7 +634,7 @@
 "According to this definition, JPA entities are technically managed beans. "
 "However, entities have their own special lifecycle, state and identity model "
 "and are usually instantiated by JPA or using <literal>new</literal>. "
-"Therefore we don&#39;t recommend directly injecting an entity class. We "
+"Therefore we don't recommend directly injecting an entity class. We "
 "especially recommend against assigning a scope other than "
 "<literal>@Dependent</literal> to an entity class, since JPA is not able to "
 "persist injected CDI proxies."
@@ -715,7 +713,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"There&#39;s no reason to explicitly declare the scope of a stateless session "
+"There's no reason to explicitly declare the scope of a stateless session "
 "bean or singleton session bean. The EJB container controls the lifecycle of "
 "these beans, according to the semantics of the <literal>@Stateless</literal> "
 "or <literal>@Singleton</literal> declaration. On the other hand, a stateful "
@@ -771,8 +769,8 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"When we don&#39;t need any of these things, an ordinary managed bean will "
-"serve just fine."
+"When we don't need any of these things, an ordinary managed bean will serve "
+"just fine."
 msgstr ""
 
 #. Tag: para
@@ -796,7 +794,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Finally, it&#39;s usually obvious when method-level transaction management, "
+"Finally, it's usually obvious when method-level transaction management, "
 "method-level security, timers, remote methods or asynchronous methods are "
 "needed."
 msgstr ""
@@ -804,11 +802,11 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"The point we&#39;re trying to make is: use a session bean when you need the "
+"The point we're trying to make is: use a session bean when you need the "
 "services it provides, not just because you want to use dependency injection, "
 "lifecycle management, or interceptors. Java EE 6 provides a graduated "
-"programming model. It&#39;s usually easy to start with an ordinary managed "
-"bean, and later turn it into an EJB just by adding one of the following "
+"programming model. It's usually easy to start with an ordinary managed bean, "
+"and later turn it into an EJB just by adding one of the following "
 "annotations: <literal>@Stateless</literal>, <literal>@Stateful</literal> or "
 "<literal>@Singleton</literal>."
 msgstr ""
@@ -816,14 +814,13 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"On the other hand, don&#39;t be scared to use session beans just because "
-"you&#39;ve heard your friends say they&#39;re &#34;heavyweight&#34;. It&#39;"
-"s nothing more than superstition to think that something is &#34;"
-"heavier&#34; just because it&#39;s hosted natively within the Java EE "
-"container, instead of by a proprietary bean container or dependency "
-"injection framework that runs as an additional layer of obfuscation. And as "
-"a general principle, you should be skeptical of folks who use vaguely "
-"defined terminology like &#34;heavyweight&#34;."
+"On the other hand, don't be scared to use session beans just because you've "
+"heard your friends say they're \"heavyweight\". It's nothing more than "
+"superstition to think that something is \"heavier\" just because it's hosted "
+"natively within the Java EE container, instead of by a proprietary bean "
+"container or dependency injection framework that runs as an additional layer "
+"of obfuscation. And as a general principle, you should be skeptical of folks "
+"who use vaguely defined terminology like \"heavyweight\"."
 msgstr ""
 
 #. Tag: title
@@ -862,7 +859,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"We can&#39;t write a bean class that is itself a random number. But we can "
+"We can't write a bean class that is itself a random number. But we can "
 "certainly write a method that returns a random number. By making the method "
 "a producer method, we allow the return value of the method—in this case an "
 "<literal>Integer</literal>—to be injected. We can even specify a qualifier—"
@@ -934,7 +931,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"We&#39;ll talk much more about producer methods in <xref linkend="
+"We'll talk much more about producer methods in <xref linkend="
 "\"producermethods\" />."
 msgstr ""
 
@@ -965,7 +962,7 @@
 "A producer field is really just a shortcut that lets us avoid writing a "
 "useless getter method. However, in addition to convenience, producer fields "
 "serve a specific purpose as an adaptor for Java EE component environment "
-"injection, but to learn more about that, you&#39;ll have to wait until <xref "
-"linkend=\"resources\" />. Because we can&#39;t wait to get to work on some "
+"injection, but to learn more about that, you'll have to wait until <xref "
+"linkend=\"resources\" />. Because we can't wait to get to work on some "
 "examples."
 msgstr ""

Modified: doc/trunk/reference/src/main/docbook/es-ES/decorators.po
===================================================================
--- doc/trunk/reference/src/main/docbook/es-ES/decorators.po	2010-07-24 16:36:48 UTC (rev 6808)
+++ doc/trunk/reference/src/main/docbook/es-ES/decorators.po	2010-07-25 04:22:37 UTC (rev 6809)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: decorators\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-05-01T13:53:42\n"
+"POT-Creation-Date: 2010-07-25T03:52:14\n"
 "PO-Revision-Date: 2009-01-19 11:35+1000\n"
 "Last-Translator: Gladys Guerrero Lozano <gguerrer at redhat.com>\n"
 "Language-Team: Spanish <fedora-trans-es at redhat.com>\n"
@@ -29,8 +29,8 @@
 "interceptor is able to intercept invocations of any Java type. This makes "
 "them perfect for solving technical concerns such as transaction management, "
 "security and call logging. However, by nature, interceptors are unaware of "
-"the actual semantics of the events they intercept. Thus, interceptors "
-"aren&#39;t an appropriate tool for separating business-related concerns."
+"the actual semantics of the events they intercept. Thus, interceptors aren't "
+"an appropriate tool for separating business-related concerns."
 msgstr ""
 "Los interceptores son una forma potente de capturar y distinguir cuestiones "
 "que son <emphasis>ortogonales</emphasis> al tipo de sistema. Cualquier "
@@ -49,11 +49,10 @@
 "aware of all the semantics attached to that interface. Since decorators "
 "directly implement operations with business semantics, it makes them the "
 "perfect tool for modeling some kinds of business concerns. It also means "
-"that a decorator doesn&#39;t have the generality of an interceptor. "
-"Decorators aren&#39;t able to solve technical concerns that cut across many "
-"disparate types. Interceptors and decorators, though similar in many ways, "
-"are complementary. Let&#39;s look at some cases where decorators fit the "
-"bill."
+"that a decorator doesn't have the generality of an interceptor. Decorators "
+"aren't able to solve technical concerns that cut across many disparate "
+"types. Interceptors and decorators, though similar in many ways, are "
+"complementary. Let's look at some cases where decorators fit the bill."
 msgstr ""
 "En cambio, los <emphasis>decoradores</emphasis> interceptan invocaciones "
 "únicamente para una determinada interfaz de Java y por lo tanto, conocen "
@@ -102,9 +101,8 @@
 #, fuzzy, no-c-format
 msgid ""
 "Unlike other beans, a decorator may be an abstract class. Therefore, if "
-"there&#39;s nothing special the decorator needs to do for a particular "
-"method of the decorated interface, you don&#39;t need to implement that "
-"method."
+"there's nothing special the decorator needs to do for a particular method of "
+"the decorated interface, you don't need to implement that method."
 msgstr ""
 "A diferencia de otros Web Beans sencillos, un decorador puede ser una clase "
 "abstracta. Si no hay nada especial que el decorador tenga que hacer para un "
@@ -198,8 +196,7 @@
 #, fuzzy, no-c-format
 msgid ""
 "This declaration serves the same purpose for decorators that the "
-"<literal>&#60;interceptors&#62;</literal> declaration serves for "
-"interceptors:"
+"<literal>&lt;interceptors&gt;</literal> declaration serves for interceptors:"
 msgstr ""
 "Esta declaración sirve para decoradores al igual que la declaración "
 "<literal>&lt;Interceptores&gt;</literal> sirve para interceptores:"

Modified: doc/trunk/reference/src/main/docbook/es-ES/ee.po
===================================================================
--- doc/trunk/reference/src/main/docbook/es-ES/ee.po	2010-07-24 16:36:48 UTC (rev 6808)
+++ doc/trunk/reference/src/main/docbook/es-ES/ee.po	2010-07-25 04:22:37 UTC (rev 6809)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: ee\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-05-01T13:53:42\n"
+"POT-Creation-Date: 2010-07-25T03:52:14\n"
 "PO-Revision-Date: 2009-01-19 11:56+1000\n"
 "Last-Translator: Gladys Guerrero Lozano <gguerrer at redhat.com>\n"
 "Language-Team: Spanish <fedora-trans-es at redhat.com>\n"
@@ -79,7 +79,7 @@
 "The CDI specification does not require the servlet context objects, "
 "<literal>HttpServletRequest</literal>, <literal>HttpSession</literal> and "
 "<literal>ServletContext</literal> to be exposed as injectable beans. If you "
-"really want to be able to inject these objects, it&#39;s easy to create a "
+"really want to be able to inject these objects, it's easy to create a "
 "portable extension to expose them as beans. However, we recommend that "
 "direct access to these objects be limited to servlets, servlet filters and "
 "servlet event listeners, where they may be obtained in the usual way as "
@@ -106,8 +106,8 @@
 "All managed beans may take advantage of Java EE component environment "
 "injection using <literal>@Resource</literal>, <literal>@EJB</literal>, "
 "<literal>@PersistenceContext</literal>, <literal>@PeristenceUnit</literal> "
-"and <literal>@WebServiceRef</literal>. We&#39;ve already seen a couple of "
-"examples of this, though we didn&#39;t pay much attention at the time:"
+"and <literal>@WebServiceRef</literal>. We've already seen a couple of "
+"examples of this, though we didn't pay much attention at the time:"
 msgstr ""
 "Todos los Web Beans sencillos y empresariales pueden aprovechar la inyección "
 "de dependencia de Java EE utilizando<literal>@Resource</literal>, "
@@ -143,8 +143,8 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"It&#39;s easy to use a bean from a servlet in Java EE 6. Simply inject the "
-"bean using field or initializer method injection."
+"It's easy to use a bean from a servlet in Java EE 6. Simply inject the bean "
+"using field or initializer method injection."
 msgstr ""
 "Es fácil utilizar un Web Bean desde un Servlet en Java EE 6. Simplemente "
 "inyecte el Web Bean mediante campo de Web Beans o Inyección de método "
@@ -171,9 +171,9 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"CDI injection applies to all EJBs, even when they aren&#39;t managed beans. "
-"In particular, you can use CDI injection in message-driven beans, which are "
-"by nature not contextual objects."
+"CDI injection applies to all EJBs, even when they aren't managed beans. In "
+"particular, you can use CDI injection in message-driven beans, which are by "
+"nature not contextual objects."
 msgstr ""
 
 #. Tag: para
@@ -261,15 +261,15 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"CDI doesn&#39;t define any special deployment archive. You can package beans "
-"in jars, ejb jars or wars—any deployment location in the application "
-"classpath. However, the archive must be a &#34;bean archive&#34;. That means "
-"each archive that contains beans <emphasis>must</emphasis> include a file "
-"named <literal>beans.xml</literal> in the <literal>META-INF</literal> "
-"directory of the classpath or <literal>WEB-INF</literal> directory of the "
-"web root (for war archives). The file may be empty. Beans deployed in "
-"archives that do not have a <literal>beans.xml</literal> file will not be "
-"available for use in the application."
+"CDI doesn't define any special deployment archive. You can package beans in "
+"jars, ejb jars or wars—any deployment location in the application classpath. "
+"However, the archive must be a \"bean archive\". That means each archive "
+"that contains beans <emphasis>must</emphasis> include a file named "
+"<literal>beans.xml</literal> in the <literal>META-INF</literal> directory of "
+"the classpath or <literal>WEB-INF</literal> directory of the web root (for "
+"war archives). The file may be empty. Beans deployed in archives that do not "
+"have a <literal>beans.xml</literal> file will not be available for use in "
+"the application."
 msgstr ""
 "Web Beans no define ningún despliegue especial de archivo. Se puede "
 "empaquetar Web Beans en JAR, EJB-JAR o WAR &#151; cualquier ubicación de "

Modified: doc/trunk/reference/src/main/docbook/es-ES/environments.po
===================================================================
--- doc/trunk/reference/src/main/docbook/es-ES/environments.po	2010-07-24 16:36:48 UTC (rev 6808)
+++ doc/trunk/reference/src/main/docbook/es-ES/environments.po	2010-07-25 04:22:37 UTC (rev 6809)
@@ -6,7 +6,7 @@
 "Project-Id-Version: Web_Beans:_Java_Contexts_and_Dependency_Injection "
 "VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-05-01T14:44:09\n"
+"POT-Creation-Date: 2010-07-25T03:52:14\n"
 "PO-Revision-Date: 2009-03-28 17:09+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -37,9 +37,9 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Unfortunately, you can&#39;t use Weld with earlier versions of JBoss AS "
-"since they are missing key libraries. If you want to learn how to upgrade "
-"the built-in support on JBoss AS 6.0, then read on."
+"Unfortunately, you can't use Weld with earlier versions of JBoss AS since "
+"they are missing key libraries. If you want to learn how to upgrade the "
+"built-in support on JBoss AS 6.0, then read on."
 msgstr ""
 
 #. Tag: para
@@ -107,7 +107,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"There is a major limitation to using a servlet container. Weld doesn&#39;t "
+"There is a major limitation to using a servlet container. Weld doesn't "
 "support deploying session beans, injection using <literal>@EJB</literal> or "
 "<literal>@PersistenceContext</literal>, or using transactional events in "
 "servlet containers. For enterprise features such as these, you should really "
@@ -119,10 +119,10 @@
 msgid ""
 "Weld should be used as a web application library in a servlet container. You "
 "should place <literal>weld-servlet.jar</literal> in <literal>WEB-INF/lib</"
-"literal> in the web root. <literal>weld-servlet.jar</literal> is an &#34;"
-"uber-jar&#34;, meaning it bundles all the bits of Weld and CDI required for "
-"running in a servlet container, provided for your convenience. "
-"Alternatively, you could use its component jars:"
+"literal> in the web root. <literal>weld-servlet.jar</literal> is an \"uber-"
+"jar\", meaning it bundles all the bits of Weld and CDI required for running "
+"in a servlet container, provided for your convenience. Alternatively, you "
+"could use its component jars:"
 msgstr ""
 
 #. Tag: para
@@ -186,7 +186,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Tomcat has a read-only JNDI, so Weld can&#39;t automatically bind the "
+"Tomcat has a read-only JNDI, so Weld can't automatically bind the "
 "BeanManager extension SPI. To bind the BeanManager into JNDI, you should "
 "populate <literal>META-INF/context.xml</literal> in the web root with the "
 "following contents:"
@@ -220,18 +220,18 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Like Tomcat, Jetty has a read-only JNDI, so Weld can&#39;t automatically "
-"bind the Manager. To bind the Manager to JNDI, you should populate "
-"<literal>WEB-INF/jetty-env.xml</literal> with the following contents:"
+"Like Tomcat, Jetty has a read-only JNDI, so Weld can't automatically bind "
+"the Manager. To bind the Manager to JNDI, you should populate <literal>WEB-"
+"INF/jetty-env.xml</literal> with the following contents:"
 msgstr ""
 
 #. Tag: para
 #, no-c-format
 msgid ""
-"Notice that Jetty doesn&#39;t not have built-in support for an "
-"<literal>javax.naming.spi.ObjectFactory</literal> like Tomcat, so it&#39;s "
-"necessary to manually create the <literal>javax.naming.Reference</literal> "
-"to wrap around it."
+"Notice that Jetty doesn't not have built-in support for an <literal>javax."
+"naming.spi.ObjectFactory</literal> like Tomcat, so it's necessary to "
+"manually create the <literal>javax.naming.Reference</literal> to wrap around "
+"it."
 msgstr ""
 
 #. Tag: para
@@ -258,13 +258,13 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"In addition to improved integration of the Enterprise Java stack, the &#34;"
-"Contexts and Dependency Injection for the Java EE platform&#34; "
-"specification also defines a state of the art typesafe, stateful dependency "
-"injection framework, which can prove useful in a wide range of application "
-"types. To help developers take advantage of this, Weld provides a simple "
-"means for being executed in the Java Standard Edition (SE) environment "
-"independently of any Java EE APIs."
+"In addition to improved integration of the Enterprise Java stack, the "
+"\"Contexts and Dependency Injection for the Java EE platform\" specification "
+"also defines a state of the art typesafe, stateful dependency injection "
+"framework, which can prove useful in a wide range of application types. To "
+"help developers take advantage of this, Weld provides a simple means for "
+"being executed in the Java Standard Edition (SE) environment independently "
+"of any Java EE APIs."
 msgstr ""
 
 #. Tag: para
@@ -348,7 +348,7 @@
 
 #. Tag: para
 #, no-c-format
-msgid "Here&#39;s an example of a simple CDI SE application:"
+msgid "Here's an example of a simple CDI SE application:"
 msgstr ""
 
 #. Tag: title
@@ -369,9 +369,9 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Thanks to the power of CDI&#39;s typesafe event model, application "
-"developers need not write any bootstrapping code. The Weld SE module comes "
-"with a built-in main method which will bootstrap CDI for you and then fire a "
+"Thanks to the power of CDI's typesafe event model, application developers "
+"need not write any bootstrapping code. The Weld SE module comes with a built-"
+"in main method which will bootstrap CDI for you and then fire a "
 "<literal>ContainerInitialized</literal> event. The entry point for your "
 "application code would therefore be a simple bean which observes the "
 "<literal>ContainerInitialized</literal> event, as in the previous example."
@@ -394,15 +394,15 @@
 msgid ""
 "For added flexibility, CDI SE also comes with a bootstrap API which can be "
 "called from within your application in order to initialize CDI and obtain "
-"references to your application&#39;s beans and events. The API consists of "
-"two classes: <literal>Weld</literal> and <literal>WeldContainer</literal>."
+"references to your application's beans and events. The API consists of two "
+"classes: <literal>Weld</literal> and <literal>WeldContainer</literal>."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
 msgid ""
-"Here&#39;s an example application main method which uses this API to "
-"initialize a bean of type <literal>MyApplicationBean</literal>."
+"Here's an example application main method which uses this API to initialize "
+"a bean of type <literal>MyApplicationBean</literal>."
 msgstr ""
 
 #. Tag: para
@@ -435,10 +435,10 @@
 #, no-c-format
 msgid ""
 "To use the @ThreadScoped annotation you need to enable the "
-"<literal>RunnableDecorator</literal> which &#39;listens&#39; for all "
-"executions of <literal>Runnable.run()</literal> and decorates them by "
-"setting up the thread context beforehand, bound to the current thread, and "
-"destroying the context afterwards."
+"<literal>RunnableDecorator</literal> which 'listens' for all executions of "
+"<literal>Runnable.run()</literal> and decorates them by setting up the "
+"thread context beforehand, bound to the current thread, and destroying the "
+"context afterwards."
 msgstr ""
 
 #. Tag: para
@@ -459,8 +459,8 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Weld SE comes packaged as a &#39;shaded&#39; jar which includes the CDI API, "
-"Weld Core and all dependant classes bundled into a single jar. Therefore the "
-"only Weld jar you need on the classpath, in addition to your application&#39;"
-"s classes and dependant jars, is the Weld SE jar."
+"Weld SE comes packaged as a 'shaded' jar which includes the CDI API, Weld "
+"Core and all dependant classes bundled into a single jar. Therefore the only "
+"Weld jar you need on the classpath, in addition to your application's "
+"classes and dependant jars, is the Weld SE jar."
 msgstr ""

Modified: doc/trunk/reference/src/main/docbook/es-ES/events.po
===================================================================
--- doc/trunk/reference/src/main/docbook/es-ES/events.po	2010-07-24 16:36:48 UTC (rev 6808)
+++ doc/trunk/reference/src/main/docbook/es-ES/events.po	2010-07-25 04:22:37 UTC (rev 6809)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: events\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-05-01T13:53:42\n"
+"POT-Creation-Date: 2010-07-25T03:52:14\n"
 "PO-Revision-Date: 2009-01-19 13:59+1000\n"
 "Last-Translator: Gladys Guerrero Lozano <gguerrer at redhat.com>\n"
 "Language-Team: Spanish <fedora-trans-es at redhat.com>\n"
@@ -51,8 +51,8 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"observers can specify a combination of &#34;selectors&#34; to narrow the set "
-"of event notifications they will receive, and"
+"observers can specify a combination of \"selectors\" to narrow the set of "
+"event notifications they will receive, and"
 msgstr ""
 "los observadores pueden especificar una combinación de \"selectores\" para "
 "limitar el conjunto de notificaciones de eventos que recibirán y"
@@ -71,7 +71,7 @@
 #, no-c-format
 msgid ""
 "The CDI event notification facility uses more or less the same typesafe "
-"approach that we&#39;ve already seen with the dependency injection service."
+"approach that we've already seen with the dependency injection service."
 msgstr ""
 
 #. Tag: title
@@ -94,7 +94,7 @@
 #, no-c-format
 msgid ""
 "An event qualifier is just a normal qualifier, defined using "
-"<literal>@Qualifier</literal>. Here&#39;s an example:"
+"<literal>@Qualifier</literal>. Here's an example:"
 msgstr ""
 
 #. Tag: title
@@ -131,7 +131,7 @@
 msgid ""
 "An observer method need not specify any event qualifiers—in this case it is "
 "interested in <emphasis>all</emphasis> events of a particular type. If it "
-"does specify qualifiers, it&#39;s only interested in events which have those "
+"does specify qualifiers, it's only interested in events which have those "
 "qualifiers."
 msgstr ""
 "Un método de observador no necesita especificar ningún enlace de evento  "
@@ -256,8 +256,8 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"The downside of annotating the injection point is that we can&#39;t specify "
-"the qualifier dynamically. CDI lets us obtain a qualifier instance by "
+"The downside of annotating the injection point is that we can't specify the "
+"qualifier dynamically. CDI lets us obtain a qualifier instance by "
 "subclassing the helper class <literal>AnnotationLiteral</literal>. That way, "
 "we can pass the qualifier to the <literal>select()</literal> method of "
 "<literal>Event</literal>."
@@ -281,8 +281,8 @@
 msgid ""
 "By default, if there is no instance of an observer in the current context, "
 "the container will instantiate the observer in order to deliver an event to "
-"it. This behavior isn&#39;t always desirable. We may want to deliver events "
-"only to instances of the observer that already exist in the current contexts."
+"it. This behavior isn't always desirable. We may want to deliver events only "
+"to instances of the observer that already exist in the current contexts."
 msgstr ""
 
 #. Tag: para

Modified: doc/trunk/reference/src/main/docbook/es-ES/example.po
===================================================================
--- doc/trunk/reference/src/main/docbook/es-ES/example.po	2010-07-24 16:36:48 UTC (rev 6808)
+++ doc/trunk/reference/src/main/docbook/es-ES/example.po	2010-07-25 04:22:37 UTC (rev 6809)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: example\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-05-01T13:53:42\n"
+"POT-Creation-Date: 2010-07-25T03:52:14\n"
 "PO-Revision-Date: 2009-01-20 10:54+1000\n"
 "Last-Translator: Gladys Guerrero Lozano <gguerrer at redhat.com>\n"
 "Language-Team: Spanish <fedora-trans-es at redhat.com>\n"
@@ -24,11 +24,11 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"Let&#39;s illustrate these ideas with a full example. We&#39;re going to "
-"implement user login/logout for an application that uses JSF. First, we&#39;"
-"ll define a request-scoped bean to hold the username and password entered "
-"during login, with constraints defined using annotations from the Bean "
-"Validation specification:"
+"Let's illustrate these ideas with a full example. We're going to implement "
+"user login/logout for an application that uses JSF. First, we'll define a "
+"request-scoped bean to hold the username and password entered during login, "
+"with constraints defined using annotations from the Bean Validation "
+"specification:"
 msgstr ""
 "Ilustremos estas ideas con un ejemplo. Vamos a implementar inicio/cierre de "
 "sesión de usuario para una aplicación que utiliza JSF. Primero, definiremos "
@@ -50,7 +50,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"(Note that we&#39;re also going to need a <literal>persistence.xml</literal> "
+"(Note that we're also going to need a <literal>persistence.xml</literal> "
 "file to configure the JPA persistence unit containing <literal>User</"
 "literal>.)"
 msgstr ""
@@ -97,7 +97,7 @@
 #, fuzzy, no-c-format
 msgid ""
 "Hopefully, this example gave you a taste of the CDI programming model. In "
-"the next chapter, we&#39;ll explore dependency injection in greater depth."
+"the next chapter, we'll explore dependency injection in greater depth."
 msgstr ""
 "Esperamos que este ejemplo de una idea del modelo de programación de Web "
 "Bean. En el próximo capítulo, estudiaremos más a fondo la inyección de "

Modified: doc/trunk/reference/src/main/docbook/es-ES/extend.po
===================================================================
--- doc/trunk/reference/src/main/docbook/es-ES/extend.po	2010-07-24 16:36:48 UTC (rev 6808)
+++ doc/trunk/reference/src/main/docbook/es-ES/extend.po	2010-07-25 04:22:37 UTC (rev 6809)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: extend\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-05-01T13:53:42\n"
+"POT-Creation-Date: 2010-07-25T03:52:14\n"
 "PO-Revision-Date: 2009-01-19 14:15+1000\n"
 "Last-Translator: Gladys Guerrero Lozano <gguerrer at redhat.com>\n"
 "Language-Team: Spanish <fedora-trans-es at redhat.com>\n"
@@ -98,8 +98,8 @@
 msgid ""
 "The first step in creating a portable extension is to write a class that "
 "implements <literal>Extension</literal>. This marker interface does not "
-"define any methods, but it&#39;s needed to satisfy the requirements of Java "
-"SE&#39;s service provider architecture."
+"define any methods, but it's needed to satisfy the requirements of Java SE's "
+"service provider architecture."
 msgstr ""
 
 #. Tag: para
@@ -180,8 +180,8 @@
 #, no-c-format
 msgid ""
 "In fact, the extension can do a lot more than just observe. The extension is "
-"permitted to modify the container&#39;s metamodel and more. Here&#39;s a "
-"very simple example:"
+"permitted to modify the container's metamodel and more. Here's a very simple "
+"example:"
 msgstr ""
 
 #. Tag: para
@@ -227,7 +227,7 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"Let&#39;s study some of the interfaces exposed by the <literal>BeanManager</"
+"Let's study some of the interfaces exposed by the <literal>BeanManager</"
 "literal>."
 msgstr ""
 "El centro nervioso para extender Web Beans es el objeto <literal>Manager</"
@@ -285,8 +285,7 @@
 
 #. Tag: para
 #, no-c-format
-msgid ""
-"There&#39;s an easy way to find out what beans exist in the application:"
+msgid "There's an easy way to find out what beans exist in the application:"
 msgstr ""
 
 #. Tag: para
@@ -323,9 +322,9 @@
 msgid ""
 "In this example, we make a framework class, <literal>SecurityManager</"
 "literal> available for injection. To make things a bit more interesting, "
-"we&#39;re going to delegate back to the container&#39;s "
-"<literal>InjectionTarget</literal> to perform instantiation and injection "
-"upon the <literal>SecurityManager</literal> instance."
+"we're going to delegate back to the container's <literal>InjectionTarget</"
+"literal> to perform instantiation and injection upon the "
+"<literal>SecurityManager</literal> instance."
 msgstr ""
 
 #. Tag: para
@@ -351,8 +350,8 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Let&#39;s start with an example of an extension that provides support for "
-"the use of <literal>@Named</literal> at the package level. The package-level "
+"Let's start with an example of an extension that provides support for the "
+"use of <literal>@Named</literal> at the package level. The package-level "
 "name is used to qualify the EL names of all beans defined in that package. "
 "The portable extension uses the <literal>ProcessAnnotatedType</literal> "
 "event to wrap the <literal>AnnotatedType</literal> object and override the "
@@ -362,7 +361,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Here&#39;s a second example, which adds the <literal>@Alternative</literal> "
+"Here's a second example, which adds the <literal>@Alternative</literal> "
 "annotation to any class which implements a certain <literal>Service</"
 "literal> interface."
 msgstr ""
@@ -393,12 +392,12 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Here&#39;s a CDI portable extension that reads values from properties files "
-"and configures fields of Java EE components, including servlets, EJBs, "
-"managed beans, interceptors and more. In this example, properties for a "
-"class such as <literal>org.mydomain.blog.Blogger</literal> go in a resource "
-"named <literal>org/mydomain/blog/Blogger.properties</literal>, and the name "
-"of a property must match the name of the field to be configured. So "
+"Here's a CDI portable extension that reads values from properties files and "
+"configures fields of Java EE components, including servlets, EJBs, managed "
+"beans, interceptors and more. In this example, properties for a class such "
+"as <literal>org.mydomain.blog.Blogger</literal> go in a resource named "
+"<literal>org/mydomain/blog/Blogger.properties</literal>, and the name of a "
+"property must match the name of the field to be configured. So "
 "<literal>Blogger.properties</literal> could contain:"
 msgstr ""
 
@@ -413,9 +412,9 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"There&#39;s a lot more to the portable extension SPI than what we&#39;ve "
-"discussed here. Check out the CDI spec or Javadoc for more information. For "
-"now, we&#39;ll just mention one more extension point."
+"There's a lot more to the portable extension SPI than what we've discussed "
+"here. Check out the CDI spec or Javadoc for more information. For now, we'll "
+"just mention one more extension point."
 msgstr ""
 
 #. Tag: title

Modified: doc/trunk/reference/src/main/docbook/es-ES/extensions.po
===================================================================
--- doc/trunk/reference/src/main/docbook/es-ES/extensions.po	2010-07-24 16:36:48 UTC (rev 6808)
+++ doc/trunk/reference/src/main/docbook/es-ES/extensions.po	2010-07-25 04:22:37 UTC (rev 6809)
@@ -6,7 +6,7 @@
 "Project-Id-Version: Web_Beans:_Java_Contexts_and_Dependency_Injection "
 "VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-05-01T13:53:42\n"
+"POT-Creation-Date: 2010-07-25T03:52:14\n"
 "PO-Revision-Date: 2009-03-28 17:09+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -59,6 +59,6 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"If you are using Weld as your JSR-299 implementation, there&#39;s no need to "
-"include sl4j as it&#39;s already included (and used internally)."
+"If you are using Weld as your JSR-299 implementation, there's no need to "
+"include sl4j as it's already included (and used internally)."
 msgstr ""

Modified: doc/trunk/reference/src/main/docbook/es-ES/gettingstarted.po
===================================================================
--- doc/trunk/reference/src/main/docbook/es-ES/gettingstarted.po	2010-07-24 16:36:48 UTC (rev 6808)
+++ doc/trunk/reference/src/main/docbook/es-ES/gettingstarted.po	2010-07-25 04:22:37 UTC (rev 6809)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: ri\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-05-01T13:53:42\n"
+"POT-Creation-Date: 2010-07-25T03:52:14\n"
 "PO-Revision-Date: 2009-01-20 10:55+1000\n"
 "Last-Translator: Gladys Guerrero Lozano <gguerrer at redhat.com>\n"
 "Language-Team: Spanish <fedora-trans-es at redhat.com>\n"
@@ -49,7 +49,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"To run the examples with the provided build scripts, you&#39;ll need the "
+"To run the examples with the provided build scripts, you'll need the "
 "following:"
 msgstr ""
 
@@ -97,7 +97,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"You&#39;ll need a full install of Ant 1.7.0. Some linux distributions only "
+"You'll need a full install of Ant 1.7.0. Some linux distributions only "
 "supply a partial installation of Ant which cause the build to fail. If you "
 "encounter problems, verify that ant-nodeps.jar is on the classpath."
 msgstr ""
@@ -105,7 +105,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"In the next few sections, you&#39;ll be using the Ant command (<literal>ant</"
+"In the next few sections, you'll be using the Ant command (<literal>ant</"
 "literal>) to invoke the Ant build script in each example to compile, "
 "assemble and deploy the example to JBoss AS and, for the war example, Apache "
 "Tomcat. You can also deploy the generated artifact (war or ear) to any other "
@@ -124,7 +124,7 @@
 #, no-c-format
 msgid ""
 "The sections below cover the steps for deploying with both Ant and Maven in "
-"detail. Let&#39;s start with JBoss AS."
+"detail. Let's start with JBoss AS."
 msgstr ""
 
 #. Tag: title
@@ -135,25 +135,25 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"To deploy the examples to JBoss AS, you&#39;ll need <ulink url=\"http://"
-"jboss.org/jbossas/\">JBoss AS 6.0.0</ulink> or above. If a release of the "
-"JBoss AS 6.0 line isn&#39;t yet available, you can download a <ulink url="
-"\"http://hudson.jboss.org/hudson/view/JBoss%20AS/job/JBoss-AS-6.0.x/"
-"\">nightly snapshot</ulink>. The reason JBoss AS 6.0.0 or above is required "
-"is because it&#39;s the first release that has both CDI and Bean Validation "
-"support built-in, making it close enough to Java EE 6 to run the examples. "
-"The good news is that there are no additional modifications you have to make "
-"to the server. It&#39;s ready to go!"
+"To deploy the examples to JBoss AS, you'll need <ulink url=\"http://jboss."
+"org/jbossas/\">JBoss AS 6.0.0</ulink> or above. If a release of the JBoss AS "
+"6.0 line isn't yet available, you can download a <ulink url=\"http://hudson."
+"jboss.org/hudson/view/JBoss%20AS/job/JBoss-AS-6.0.x/\">nightly snapshot</"
+"ulink>. The reason JBoss AS 6.0.0 or above is required is because it's the "
+"first release that has both CDI and Bean Validation support built-in, making "
+"it close enough to Java EE 6 to run the examples. The good news is that "
+"there are no additional modifications you have to make to the server. It's "
+"ready to go!"
 msgstr ""
 
 #. Tag: para
 #, no-c-format
 msgid ""
 "After you have downloaded JBoss AS, extract it. (We recommended renaming the "
-"folder to include the <literal>as</literal> qualifier so it&#39;s clear that "
-"it&#39;s the application server). You can move the extracted folder anywhere "
-"you like. Wherever it lays to rest, that&#39;s what we&#39;ll call the JBoss "
-"AS installation directory, or <literal>JBOSS_HOME</literal>."
+"folder to include the <literal>as</literal> qualifier so it's clear that "
+"it's the application server). You can move the extracted folder anywhere you "
+"like. Wherever it lays to rest, that's what we'll call the JBoss AS "
+"installation directory, or <literal>JBOSS_HOME</literal>."
 msgstr ""
 
 #. Tag: para
@@ -169,7 +169,7 @@
 
 #. Tag: para
 #, fuzzy, no-c-format
-msgid "You&#39;re now ready to deploy your first example!"
+msgid "You're now ready to deploy your first example!"
 msgstr "Ahora, ¡está listo para desplegar su primer ejemplo!"
 
 #. Tag: para
@@ -182,8 +182,8 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"If you haven&#39;t already, start JBoss AS. You can either start JBoss AS "
-"from a Linux shell:"
+"If you haven't already, start JBoss AS. You can either start JBoss AS from a "
+"Linux shell:"
 msgstr ""
 
 #. Tag: para
@@ -276,16 +276,16 @@
 msgid ""
 "The translator uses session beans, which are packaged in an EJB module "
 "within an ear. Java EE 6 will allow session beans to be deployed in war "
-"modules, but that&#39;s a topic for a later chapter."
+"modules, but that's a topic for a later chapter."
 msgstr ""
 
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"Again, wait a few seconds for the application to deploy (if you&#39;re "
-"really bored, read the log messages), and visit <ulink url=\"http://"
-"localhost:8080/weld-translator\">http://localhost:8080/weld-translator</"
-"ulink> to begin pseudo-translating."
+"Again, wait a few seconds for the application to deploy (if you're really "
+"bored, read the log messages), and visit <ulink url=\"http://localhost:8080/"
+"weld-translator\">http://localhost:8080/weld-translator</ulink> to begin "
+"pseudo-translating."
 msgstr ""
 "Aquí establecemos la ruta de contexto, la cual nos da una url interesante "
 "(<ulink url=\"http://localhost:8080/webbeans-translator\">http://"
@@ -299,21 +299,21 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Deploying to GlassFish should be easy and familiar, right? After all, it&#39;"
-"s the Java EE 6 reference implementation and Weld is the JSR-299 reference "
-"implementation, meaning Weld gets bundled with GlassFish. So yes, it&#39;s "
-"all quite easy and familiar."
+"Deploying to GlassFish should be easy and familiar, right? After all, it's "
+"the Java EE 6 reference implementation and Weld is the JSR-299 reference "
+"implementation, meaning Weld gets bundled with GlassFish. So yes, it's all "
+"quite easy and familiar."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
 msgid ""
-"To deploy the examples to GlassFish, you&#39;ll need the final <ulink url="
+"To deploy the examples to GlassFish, you'll need the final <ulink url="
 "\"https://glassfish.dev.java.net/downloads/v3-final.html\">GlassFish V3</"
 "ulink> release. Select the release that ends in either <literal>-unix.sh</"
 "literal> or <literal>-windows.exe</literal> depending on your platform. "
-"After the download is complete, execute the installer. On Linux/Unix, "
-"you&#39;ll need to first make the script executable."
+"After the download is complete, execute the installer. On Linux/Unix, you'll "
+"need to first make the script executable."
 msgstr ""
 
 #. Tag: para
@@ -321,15 +321,15 @@
 msgid ""
 "On Windows you can just click on the executable. Follow the instructions in "
 "the installer. It will create a single domain named <literal>domain1</"
-"literal>. You&#39;ll use that domain to deploy the example. We recommend "
-"that you choose <literal>7070</literal> as the main HTTP port to avoid "
-"conflicts with a running instance of JBoss AS (or Apache Tomcat)."
+"literal>. You'll use that domain to deploy the example. We recommend that "
+"you choose <literal>7070</literal> as the main HTTP port to avoid conflicts "
+"with a running instance of JBoss AS (or Apache Tomcat)."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
 msgid ""
-"If you&#39;ve deployed either of the starter examples, <literal>weld-"
+"If you've deployed either of the starter examples, <literal>weld-"
 "numberguess</literal> or <literal>weld-translator</literal>, to JBoss AS, "
 "then you already have the deployable artifact you need. If not, switch to "
 "either of the two directories and build it."
@@ -339,11 +339,11 @@
 #, no-c-format
 msgid ""
 "The deployable archive for the <literal>weld-numberguess</literal>, named "
-"<literal>weld-numberguess.war</literal>, ends up in the example&#39;s "
+"<literal>weld-numberguess.war</literal>, ends up in the example's "
 "<literal>target</literal> directory. The archive for the <literal>weld-"
 "translator</literal> example, named <literal>weld-translator.ear</literal>, "
-"ends up in the example&#39;s <literal>ear/target</literal> directory. All "
-"you need to do now is deploy them to GlassFish."
+"ends up in the example's <literal>ear/target</literal> directory. All you "
+"need to do now is deploy them to GlassFish."
 msgstr ""
 
 #. Tag: para
@@ -362,15 +362,15 @@
 msgid ""
 "After a few seconds you can visit the Admin Console in the browser at the "
 "URL <ulink url=\"http://localhost:4848\">http://localhost:4848</ulink>. In "
-"the tree on the left-hand side of the page, click on &#34;Applications&#34;, "
-"then click on the &#34;Deploy...&#34; button under the heading &#34;"
-"Applications&#34; and select the deployable artifact for either of the two "
-"examples. The deployer should recognize that you have selected a Java EE "
-"artifact and allow you to start it. You can see the examples running at "
-"either <ulink url=\"http://localhost:7070/weld-numberguess\">http://"
-"localhost:7070/weld-numberguess</ulink> or <ulink url=\"http://"
-"localhost:7070/weld-translator\">http://localhost:7070/weld-translator</"
-"ulink>, depending on which example you deployed."
+"the tree on the left-hand side of the page, click on \"Applications\", then "
+"click on the \"Deploy...\" button under the heading \"Applications\" and "
+"select the deployable artifact for either of the two examples. The deployer "
+"should recognize that you have selected a Java EE artifact and allow you to "
+"start it. You can see the examples running at either <ulink url=\"http://"
+"localhost:7070/weld-numberguess\">http://localhost:7070/weld-numberguess</"
+"ulink> or <ulink url=\"http://localhost:7070/weld-translator\">http://"
+"localhost:7070/weld-translator</ulink>, depending on which example you "
+"deployed."
 msgstr ""
 
 #. Tag: para
@@ -407,16 +407,16 @@
 "Weld comes with a servlet listener which bootstraps the CDI environment, "
 "registers the <literal>BeanManager</literal> in JNDI and provides injection "
 "into servlets. Basically, it emulates some of the work done by the Java EE "
-"container. (But you don&#39;t get enterprise features such as session beans "
-"and container-managed transactions.)"
+"container. (But you don't get enterprise features such as session beans and "
+"container-managed transactions.)"
 msgstr ""
 
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"Let&#39;s give the Weld servlet extension a spin on Apache Tomcat. First, "
-"you&#39;ll need to download Tomcat 6.0.18 or later from <ulink url=\"http://"
-"tomcat.apache.org/download-60.cgi\">tomcat.apache.org</ulink> and extract it."
+"Let's give the Weld servlet extension a spin on Apache Tomcat. First, you'll "
+"need to download Tomcat 6.0.18 or later from <ulink url=\"http://tomcat."
+"apache.org/download-60.cgi\">tomcat.apache.org</ulink> and extract it."
 msgstr ""
 "Luego, descargue la IR de Web Beans desde <ulink url=\"http://seamframework."
 "org/Download\">seamframework.org</ulink>, y descomprímalo. Por ejemplo:"
@@ -427,8 +427,8 @@
 "You have two choices for how you can deploy the application to Tomcat. You "
 "can deploy it by pushing the artifact to the hot deploy directory using Ant "
 "or you can deploy to the server across HTTP using a Maven plugin. The Ant "
-"approach doesn&#39;t require that you have Maven installed, so we&#39;ll "
-"start there. If you want to use Maven, you can just skip ahead."
+"approach doesn't require that you have Maven installed, so we'll start "
+"there. If you want to use Maven, you can just skip ahead."
 msgstr ""
 
 #. Tag: title
@@ -442,14 +442,14 @@
 "In order for Ant to push the artifact to the Tomcat hot deploy directory, it "
 "needs to know where the Tomcat installation is located. Again, we need to "
 "set a property in the <literal>local.build.properties</literal> file in the "
-"examples directory of the Weld distribution. If you haven&#39;t yet created "
-"this file, do so now. Then assign the path of your Tomcat installation to "
-"the property key <literal>tomcat.home</literal>."
+"examples directory of the Weld distribution. If you haven't yet created this "
+"file, do so now. Then assign the path of your Tomcat installation to the "
+"property key <literal>tomcat.home</literal>."
 msgstr ""
 
 #. Tag: para
 #, fuzzy, no-c-format
-msgid "Now you&#39;re ready to deploy the numberguess example to Tomcat!"
+msgid "Now you're ready to deploy the numberguess example to Tomcat!"
 msgstr "Para desplegar el ejemplo numberguess:"
 
 #. Tag: para
@@ -464,7 +464,7 @@
 msgid ""
 "The Ant build script includes additional targets for Tomcat to deploy and "
 "undeploy the archive in either exploded or packaged format. They are the "
-"same target names used for JBoss AS, prefixed with &#34;tomcat.&#34;."
+"same target names used for JBoss AS, prefixed with \"tomcat.\"."
 msgstr ""
 
 #. Tag: para
@@ -501,7 +501,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"If you haven&#39;t already, start Tomcat. You can either start Tomcat from a "
+"If you haven't already, start Tomcat. You can either start Tomcat from a "
 "Linux shell:"
 msgstr ""
 
@@ -524,15 +524,15 @@
 #, no-c-format
 msgid ""
 "You can also deploy the application to Tomcat using Maven. This section is a "
-"bit more advanced, so skip it unless you&#39;re itching to use Maven "
-"natively. Of course, you&#39;ll first need to make sure that you have Maven "
-"installed on your path, similar to how you setup Ant."
+"bit more advanced, so skip it unless you're itching to use Maven natively. "
+"Of course, you'll first need to make sure that you have Maven installed on "
+"your path, similar to how you setup Ant."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
 msgid ""
-"The Maven plugin communicates with Tomcat over HTTP, so it doesn&#39;t care "
+"The Maven plugin communicates with Tomcat over HTTP, so it doesn't care "
 "where you have installed Tomcat. However, the plugin configuration assumes "
 "you are running Tomcat in its default configuration, with a hostname of "
 "localhost and port <literal>8080</literal>. The <literal>readme.txt</"
@@ -590,7 +590,7 @@
 #, no-c-format
 msgid ""
 "There are several other Maven goals that you can use if you are hacking on "
-"the example, which are documented in the example&#39;s <literal>readme.txt</"
+"the example, which are documented in the example's <literal>readme.txt</"
 "literal> file."
 msgstr ""
 
@@ -612,10 +612,10 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"If you&#39;ve read through the entire Tomcat section, then you&#39;re all "
-"ready to go. The Maven build parallels the embedded Tomcat deployment. If "
-"not, don&#39;t worry. We&#39;ll still go over everything that you need to "
-"know again in this section."
+"If you've read through the entire Tomcat section, then you're all ready to "
+"go. The Maven build parallels the embedded Tomcat deployment. If not, don't "
+"worry. We'll still go over everything that you need to know again in this "
+"section."
 msgstr ""
 
 #. Tag: para
@@ -624,7 +624,7 @@
 "The Maven POM (<literal>pom.xml</literal>) includes a profile named "
 "<literal>jetty</literal> that activates the Maven Jetty plugin, which you "
 "can use to start Jetty in embedded mode and deploy the application in place. "
-"You don&#39;t need anything else installed except to have the Maven command "
+"You don't need anything else installed except to have the Maven command "
 "(<literal>mvn</literal>) on your path. The rest will be downloaded from the "
 "internet when the build is run."
 msgstr ""
@@ -696,9 +696,9 @@
 #, no-c-format
 msgid ""
 "Now, you are ready to run the server in Eclipse. Import the project into "
-"your Eclipse workspace using &#34;Import Existing Project into Workspace. "
-"Then, find the start class in <literal>src/jetty/java</literal> and run its "
-"main method as a Java Application. Jetty will launch. You can view the "
+"your Eclipse workspace using \"Import Existing Project into Workspace. Then, "
+"find the start class in <literal>src/jetty/java</literal> and run its main "
+"method as a Java Application. Jetty will launch. You can view the "
 "application at the following local URL: <ulink url=\"http://localhost:8080"
 "\">http://localhost:8080</ulink>. Pay particular attention to the port in "
 "the URL and the lack of a trailing context path."

Modified: doc/trunk/reference/src/main/docbook/es-ES/injection.po
===================================================================
--- doc/trunk/reference/src/main/docbook/es-ES/injection.po	2010-07-24 16:36:48 UTC (rev 6808)
+++ doc/trunk/reference/src/main/docbook/es-ES/injection.po	2010-07-25 04:22:37 UTC (rev 6809)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: injection\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-05-01T14:44:09\n"
+"POT-Creation-Date: 2010-07-25T03:52:14\n"
 "PO-Revision-Date: 2009-01-19 15:18+1000\n"
 "Last-Translator: Gladys Guerrero Lozano <gguerrer at redhat.com>\n"
 "Language-Team: Spanish <fedora-trans-es at redhat.com>\n"
@@ -110,7 +110,7 @@
 #, fuzzy, no-c-format
 msgid ""
 "Next, the container calls all initializer methods of bean (the call order is "
-"not portable, don&#39;t rely on it)."
+"not portable, don't rely on it)."
 msgstr ""
 "Más tarde, el administrador de Web Bean llama a todos los métodos "
 "inicializadores del Web Bean."
@@ -151,7 +151,7 @@
 msgid ""
 "This is a case where the <literal>@Inject</literal> annotation <emphasis>is "
 "not</emphasis> required at the injection point. The same is true for "
-"observer methods (which we&#39;ll meet in <xref linkend=\"events\" />) and "
+"observer methods (which we'll meet in <xref linkend=\"events\" />) and "
 "disposer methods."
 msgstr ""
 
@@ -166,9 +166,9 @@
 "The CDI specification defines a procedure, called <emphasis>typesafe "
 "resolution</emphasis>, that the container follows when identifying the bean "
 "to inject to an injection point. This algorithm looks complex at first, but "
-"once you understand it, it&#39;s really quite intuitive. Typesafe resolution "
-"is performed at system initialization time, which means that the container "
-"will inform the developer immediately if a bean&#39;s dependencies cannot be "
+"once you understand it, it's really quite intuitive. Typesafe resolution is "
+"performed at system initialization time, which means that the container will "
+"inform the developer immediately if a bean's dependencies cannot be "
 "satisfied."
 msgstr ""
 "La especificación de Web Beans define un procedimiento, llamado "
@@ -220,17 +220,17 @@
 #, no-c-format
 msgid ""
 "Obviously, if you have exactly one bean of a given type, and an injection "
-"point with that same type, then bean A is going to go into slot A. That&#39;"
-"s the simplest possible scenario. When you first start your application, "
-"you&#39;ll likely have lots of those."
+"point with that same type, then bean A is going to go into slot A. That's "
+"the simplest possible scenario. When you first start your application, "
+"you'll likely have lots of those."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
 msgid ""
-"But then, things start to get complicated. Let&#39;s explore how the "
-"container determines which bean to inject in more advanced cases. We&#39;ll "
-"start by taking a closer look at qualifiers."
+"But then, things start to get complicated. Let's explore how the container "
+"determines which bean to inject in more advanced cases. We'll start by "
+"taking a closer look at qualifiers."
 msgstr ""
 
 #. Tag: title
@@ -304,12 +304,12 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Now, you may be thinking, <emphasis>&#34;What&#39;s the different between "
-"using a qualifier and just specifying the exact implementation class you "
-"want?&#34;</emphasis> It&#39;s important to understand that a qualifier is "
-"like an extension of the interface. It does not create a direct dependency "
-"to any particular implementation. There may be multiple alterative "
-"implementations of <literal>@Asynchronous PaymentProcessor</literal>!"
+"Now, you may be thinking, <emphasis>\"What's the different between using a "
+"qualifier and just specifying the exact implementation class you want?\"</"
+"emphasis> It's important to understand that a qualifier is like an extension "
+"of the interface. It does not create a direct dependency to any particular "
+"implementation. There may be multiple alterative implementations of "
+"<literal>@Asynchronous PaymentProcessor</literal>!"
 msgstr ""
 
 #. Tag: title
@@ -326,12 +326,11 @@
 msgid ""
 "Whenever a bean or injection point does not explicitly declare a qualifier, "
 "the container assumes the qualifier <literal>@Default</literal>. From time "
-"to time, you&#39;ll need to decare an injection point without specifying a "
-"qualifier. There&#39;s a qualifier for that too. All beans have the "
-"qualifier <literal>@Any</literal>. Therefore, by explicitly specifying "
-"<literal>@Any</literal> at an injection point, you suppress the default "
-"qualifier, without otherwise restricting the beans that are eligible for "
-"injection."
+"to time, you'll need to decare an injection point without specifying a "
+"qualifier. There's a qualifier for that too. All beans have the qualifier "
+"<literal>@Any</literal>. Therefore, by explicitly specifying <literal>@Any</"
+"literal> at an injection point, you suppress the default qualifier, without "
+"otherwise restricting the beans that are eligible for injection."
 msgstr ""
 
 #. Tag: para
@@ -422,7 +421,7 @@
 "When an ambiguous dependency exists at an injection point, the container "
 "attempts to resolve the ambiguity by looking for an enabled alternative "
 "among the beans that could be injected. If there is exactly one enabled "
-"alternative, that&#39;s the bean that will be injected."
+"alternative, that's the bean that will be injected."
 msgstr ""
 
 #. Tag: title
@@ -448,8 +447,8 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"During the course of your development, you&#39;re going to encounter this "
-"situation. Let&#39;s learn how to resolve it."
+"During the course of your development, you're going to encounter this "
+"situation. Let's learn how to resolve it."
 msgstr ""
 
 #. Tag: para
@@ -523,7 +522,7 @@
 
 #. Tag: para
 #, no-c-format
-msgid "Just remember: &#34;There can be only one.&#34;"
+msgid "Just remember: \"There can be only one.\""
 msgstr ""
 
 #. Tag: para
@@ -531,14 +530,14 @@
 msgid ""
 "On the other hand, if you really do have an optional or multivalued "
 "injection point, you should change the type of your injection point to "
-"<literal>Instance</literal>, as we&#39;ll see in <xref linkend=\"lookup\" />."
+"<literal>Instance</literal>, as we'll see in <xref linkend=\"lookup\" />."
 msgstr ""
 
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"Now there&#39;s one more issue you need to be aware of when using the "
-"dependency injection service."
+"Now there's one more issue you need to be aware of when using the dependency "
+"injection service."
 msgstr ""
 "Hay algo más que necesita saber cuando utilice inyección de dependencia en "
 "Web Beans."
@@ -636,8 +635,7 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"classes which don&#39;t have a non-private constructor with no parameters, "
-"and"
+"classes which don't have a non-private constructor with no parameters, and"
 msgstr "las clases que no tienen un constructor no-privado sin parámetros y "
 
 #. Tag: para
@@ -657,7 +655,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"It&#39;s usually very easy to fix an unproxyable dependency problem. If an "
+"It's usually very easy to fix an unproxyable dependency problem. If an "
 "injection point of type <literal>X</literal> results in an unproxyable "
 "dependency, simply:"
 msgstr ""
@@ -670,7 +668,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"change the type of the injection point to <literal>Instance&#60;X&#62;</"
+"change the type of the injection point to <literal>Instance&lt;X&gt;</"
 "literal>,"
 msgstr ""
 
@@ -711,7 +709,7 @@
 
 #. Tag: para
 #, no-c-format
-msgid "But we didn&#39;t get around to implementing this yet."
+msgid "But we didn't get around to implementing this yet."
 msgstr ""
 
 #. Tag: title
@@ -804,11 +802,10 @@
 #, no-c-format
 msgid ""
 "Next, we need to obtain an instance of our qualifier type. Since annotatons "
-"are interfaces, we can&#39;t just write <literal>new Asynchronous()</"
-"literal>. It&#39;s also quite tedious to create a concrete implementation of "
-"an annotation type from scratch. Instead, CDI lets us obtain a qualifier "
-"instance by subclassing the helper class <literal>AnnotationLiteral</"
-"literal>."
+"are interfaces, we can't just write <literal>new Asynchronous()</literal>. "
+"It's also quite tedious to create a concrete implementation of an annotation "
+"type from scratch. Instead, CDI lets us obtain a qualifier instance by "
+"subclassing the helper class <literal>AnnotationLiteral</literal>."
 msgstr ""
 
 #. Tag: para
@@ -819,8 +816,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"We can&#39;t use an anonymous class to implement a qualifier type with "
-"members."
+"We can't use an anonymous class to implement a qualifier type with members."
 msgstr ""
 
 #. Tag: para
@@ -889,8 +885,8 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"Let&#39;s look at an example. The following code is verbose, and vulnerable "
-"to refactoring problems:"
+"Let's look at an example. The following code is verbose, and vulnerable to "
+"refactoring problems:"
 msgstr ""
 "Veamos un ejemplo. El código siguiente es detallado, y vulnerable a "
 "problemas de refactorización:"
@@ -912,8 +908,8 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"Not convinced? Then here&#39;s a second example. To inject HTTP parameters, "
-"we need to define a qualifier type:"
+"Not convinced? Then here's a second example. To inject HTTP parameters, we "
+"need to define a qualifier type:"
 msgstr ""
 "¿No está convencido? Entonces, veamos un segundo ejemplo. Para inyectar "
 "parámetros, necesitamos definir el tipo de vinculación:"

Modified: doc/trunk/reference/src/main/docbook/es-ES/interceptors.po
===================================================================
--- doc/trunk/reference/src/main/docbook/es-ES/interceptors.po	2010-07-24 16:36:48 UTC (rev 6808)
+++ doc/trunk/reference/src/main/docbook/es-ES/interceptors.po	2010-07-25 04:22:37 UTC (rev 6809)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: interceptors\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-05-01T13:53:43\n"
+"POT-Creation-Date: 2010-07-25T03:52:14\n"
 "PO-Revision-Date: 2009-01-19 15:37+1000\n"
 "Last-Translator: Gladys Guerrero Lozano <gguerrer at redhat.com>\n"
 "Language-Team: Spanish <fedora-trans-es at redhat.com>\n"
@@ -100,7 +100,7 @@
 msgid ""
 "Suppose we want to declare that some of our beans are transactional. The "
 "first thing we need is an <emphasis>interceptor binding type</emphasis> to "
-"specify exactly which beans we&#39;re interested in:"
+"specify exactly which beans we're interested in:"
 msgstr ""
 "Suponga que deseamos declarar que algunos de nuestros Web Beans son "
 "transaccionales. La primera cosa que necesitamos es una <emphasis>anotación "
@@ -130,9 +130,9 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"That&#39;s great, but somewhere along the line we&#39;re going to have to "
-"actually implement the interceptor that provides this transaction management "
-"aspect. All we need to do is create a standard interceptor, and annotate it "
+"That's great, but somewhere along the line we're going to have to actually "
+"implement the interceptor that provides this transaction management aspect. "
+"All we need to do is create a standard interceptor, and annotate it "
 "<literal>@Interceptor</literal> and <literal>@Transactional</literal>."
 msgstr ""
 "Es maravilloso, pero en alguna parte de la línea vamos a tener que "

Modified: doc/trunk/reference/src/main/docbook/es-ES/intro.po
===================================================================
--- doc/trunk/reference/src/main/docbook/es-ES/intro.po	2010-07-24 16:36:48 UTC (rev 6808)
+++ doc/trunk/reference/src/main/docbook/es-ES/intro.po	2010-07-25 04:22:37 UTC (rev 6809)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: intro\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-05-01T13:53:43\n"
+"POT-Creation-Date: 2010-07-25T03:52:14\n"
 "PO-Revision-Date: 2009-01-19 16:28+1000\n"
 "Last-Translator: Gladys Guerrero Lozano <gguerrer at redhat.com>\n"
 "Language-Team: Spanish <fedora-trans-es at redhat.com>\n"
@@ -24,11 +24,11 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"So you&#39;re keen to get started writing your first bean? Or perhaps "
-"you&#39;re skeptical, wondering what kinds of hoops the CDI specification "
-"will make you jump through! The good news is that you&#39;ve probably "
-"already written and used hundreds, perhaps thousands of beans. CDI just "
-"makes it easier to actually use them to build an application!"
+"So you're keen to get started writing your first bean? Or perhaps you're "
+"skeptical, wondering what kinds of hoops the CDI specification will make you "
+"jump through! The good news is that you've probably already written and used "
+"hundreds, perhaps thousands of beans. CDI just makes it easier to actually "
+"use them to build an application!"
 msgstr ""
 "Entonces, ¿está preparado para empezar a escribir su primer Web Bean? O "
 "quizás está escéptico, preguntándose por qué tipos de arcos le hará ¡saltar "
@@ -51,14 +51,13 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Prior to Java EE 6, there was no clear definition of the term &#34;bean&#34; "
-"in the Java EE platform. Of course, we&#39;ve been calling Java classes used "
-"in web and enterprise applications &#34;beans&#34; for years. There were "
-"even a couple of different kinds of things called &#34;beans&#34; in EE "
-"specifications, including EJB beans and JSF managed beans. Meanwhile, other "
-"third-party frameworks such as Spring and Seam introduced their own ideas of "
-"what it meant to be a &#34;bean&#34;. What we&#39;ve been missing is a "
-"common definition."
+"Prior to Java EE 6, there was no clear definition of the term \"bean\" in "
+"the Java EE platform. Of course, we've been calling Java classes used in web "
+"and enterprise applications \"beans\" for years. There were even a couple of "
+"different kinds of things called \"beans\" in EE specifications, including "
+"EJB beans and JSF managed beans. Meanwhile, other third-party frameworks "
+"such as Spring and Seam introduced their own ideas of what it meant to be a "
+"\"bean\". What we've been missing is a common definition."
 msgstr ""
 
 #. Tag: para
@@ -70,8 +69,8 @@
 "Old Java Object). They support a small set of basic services, such as "
 "resource injection, lifecycle callbacks and interceptors. Companion "
 "specifications, such as EJB and CDI, build on this basic model. But, "
-"<emphasis>at last</emphasis>, there&#39;s a uniform concept of a bean and a "
-"lightweight component model that&#39;s aligned across the Java EE platform."
+"<emphasis>at last</emphasis>, there's a uniform concept of a bean and a "
+"lightweight component model that's aligned across the Java EE platform."
 msgstr ""
 
 #. Tag: para
@@ -80,31 +79,30 @@
 "With very few exceptions, almost every concrete Java class that has a "
 "constructor with no parameters (or a constructor designated with the "
 "annotation <literal>@Inject</literal>) is a bean. This includes every "
-"JavaBean and every EJB session bean. If you&#39;ve already got some "
-"JavaBeans or session beans lying around, they&#39;re already beans—you "
-"won&#39;t need any additional special metadata. There&#39;s just little one "
-"thing you need to do before you can start injecting them into stuff: you "
-"need to put them in an archive (a jar, or a Java EE module such as a war or "
-"EJB jar) that contains a special marker file: <literal>META-INF/beans.xml</"
-"literal>."
+"JavaBean and every EJB session bean. If you've already got some JavaBeans or "
+"session beans lying around, they're already beans—you won't need any "
+"additional special metadata. There's just little one thing you need to do "
+"before you can start injecting them into stuff: you need to put them in an "
+"archive (a jar, or a Java EE module such as a war or EJB jar) that contains "
+"a special marker file: <literal>META-INF/beans.xml</literal>."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
 msgid ""
-"The JavaBeans and EJBs you&#39;ve been writing every day, up until now, have "
-"not been able to take advantage of the new services defined by the CDI "
-"specification. But you&#39;ll be able to use every one of them with CDI—"
-"allowing the container to create and destroy instances of your beans and "
-"associate them with a designated context, injecting them into other beans, "
-"using them in EL expressions, specializing them with qualifier annotations, "
-"even adding interceptors and decorators to them—without modifying your "
-"existing code. At most, you&#39;ll need to add some annotations."
+"The JavaBeans and EJBs you've been writing every day, up until now, have not "
+"been able to take advantage of the new services defined by the CDI "
+"specification. But you'll be able to use every one of them with CDI—allowing "
+"the container to create and destroy instances of your beans and associate "
+"them with a designated context, injecting them into other beans, using them "
+"in EL expressions, specializing them with qualifier annotations, even adding "
+"interceptors and decorators to them—without modifying your existing code. At "
+"most, you'll need to add some annotations."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Now let&#39;s see how to create your first bean that actually uses CDI."
+msgid "Now let's see how to create your first bean that actually uses CDI."
 msgstr ""
 
 #. Tag: title
@@ -115,7 +113,7 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"Suppose that we have two existing Java classes that we&#39;ve been using for "
+"Suppose that we have two existing Java classes that we've been using for "
 "years in various applications. The first class parses a string into a list "
 "of sentences:"
 msgstr ""
@@ -141,8 +139,8 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"Unfortunately, we don&#39;t have a class that translates whole text "
-"documents. So let&#39;s write a bean for this job:"
+"Unfortunately, we don't have a class that translates whole text documents. "
+"So let's write a bean for this job:"
 msgstr ""
 "Lamentablemente, no tenemos una clase preexistente que traduzca todos los "
 "documentos de texto. Entonces, escribamos un Web Bean que realice esta tarea:"
@@ -163,11 +161,11 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"As you&#39;ve guessed, the <literal>@Inject</literal> annotation has "
-"something to do with dependency injection! <literal>@Inject</literal> may be "
-"applied to a constructor or method of a bean, and tells the container to "
-"call that constructor or method when instantiating the bean. The container "
-"will inject other beans into the parameters of the constructor or method."
+"As you've guessed, the <literal>@Inject</literal> annotation has something "
+"to do with dependency injection! <literal>@Inject</literal> may be applied "
+"to a constructor or method of a bean, and tells the container to call that "
+"constructor or method when instantiating the bean. The container will inject "
+"other beans into the parameters of the constructor or method."
 msgstr ""
 "Como pudo adivinar, la anotación <literal>@Initializer</literal> tiene algo "
 "que ver con la ¡inyección de dependencia! <literal>@Initializer</literal> "
@@ -189,7 +187,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Let&#39;s create a UI controller bean that uses field injection to obtain an "
+"Let's create a UI controller bean that uses field injection to obtain an "
 "instance of the <literal>TextTranslator</literal>, translating the text "
 "entered by a user:"
 msgstr ""
@@ -203,10 +201,10 @@
 #, no-c-format
 msgid ""
 "Notice the controller bean is request-scoped and named. Since this "
-"combination is so common in web applications, there&#39;s a built-in "
-"annotation for it in CDI that we could have used as a shorthand. When the "
-"(stereotype) annotation <literal>@Model</literal> is declared on a class, it "
-"creates a request-scoped and named bean."
+"combination is so common in web applications, there's a built-in annotation "
+"for it in CDI that we could have used as a shorthand. When the (stereotype) "
+"annotation <literal>@Model</literal> is declared on a class, it creates a "
+"request-scoped and named bean."
 msgstr ""
 
 #. Tag: para
@@ -222,11 +220,11 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Notice that it isn&#39;t necessary to create a getter or setter method to "
-"inject one bean into another. CDI can access an injected field directly "
-"(even if it&#39;s private!), which sometimes helps eliminate some wasteful "
-"code. The name of the field is arbitrary. It&#39;s the field&#39;s type that "
-"determines what is injected."
+"Notice that it isn't necessary to create a getter or setter method to inject "
+"one bean into another. CDI can access an injected field directly (even if "
+"it's private!), which sometimes helps eliminate some wasteful code. The name "
+"of the field is arbitrary. It's the field's type that determines what is "
+"injected."
 msgstr ""
 
 #. Tag: para
@@ -254,10 +252,10 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Before we get too deep in the details, let&#39;s pause and examine a "
-"bean&#39;s anatomy. What aspects of the bean are significant, and what gives "
-"it its identity? Instead of just giving examples of beans, we&#39;re going "
-"to define what <emphasis>makes</emphasis> something a bean."
+"Before we get too deep in the details, let's pause and examine a bean's "
+"anatomy. What aspects of the bean are significant, and what gives it its "
+"identity? Instead of just giving examples of beans, we're going to define "
+"what <emphasis>makes</emphasis> something a bean."
 msgstr ""
 
 #, fuzzy

Modified: doc/trunk/reference/src/main/docbook/es-ES/master.po
===================================================================
--- doc/trunk/reference/src/main/docbook/es-ES/master.po	2010-07-24 16:36:48 UTC (rev 6808)
+++ doc/trunk/reference/src/main/docbook/es-ES/master.po	2010-07-25 04:22:37 UTC (rev 6809)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: master\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-05-01T13:53:43\n"
+"POT-Creation-Date: 2010-07-25T03:52:14\n"
 "PO-Revision-Date: 2009-01-19 16:28+1000\n"
 "Last-Translator: Gladys Guerrero Lozano <gguerrer at redhat.com>\n"
 "Language-Team: Spanish <fedora-trans-es at redhat.com>\n"
@@ -25,20 +25,20 @@
 #, no-c-format
 msgid ""
 "Shortly before the final draft of JSR-299 was submitted, the specification "
-"changed its name from &#34;Web Beans&#34; to &#34;Java Contexts and "
-"Dependency Injection for the Java EE platform&#34;, abbreviated CDI. For a "
-"brief period after the renaming, the reference implementation adopted the "
-"name &#34;Web Beans&#34;. However, this ended up causing more confusion than "
-"it solved and Red Hat decided to change the name of the reference "
-"implementation to &#34;Weld&#34;. You may still find other documentation, "
-"blogs, forum posts, etc. that use the old nomenclature. Please update any "
-"references you can. The naming game is over."
+"changed its name from \"Web Beans\" to \"Java Contexts and Dependency "
+"Injection for the Java EE platform\", abbreviated CDI. For a brief period "
+"after the renaming, the reference implementation adopted the name \"Web Beans"
+"\". However, this ended up causing more confusion than it solved and Red Hat "
+"decided to change the name of the reference implementation to \"Weld\". You "
+"may still find other documentation, blogs, forum posts, etc. that use the "
+"old nomenclature. Please update any references you can. The naming game is "
+"over."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
 msgid ""
-"You&#39;ll also find that some of the functionality that once existed in the "
+"You'll also find that some of the functionality that once existed in the "
 "specification is now missing, such as defining beans in XML. These features "
 "will be available as portable extensions for CDI in the Weld project, and "
 "perhaps other implementations."
@@ -48,11 +48,11 @@
 #, no-c-format
 msgid ""
 "Note that this reference guide was started while changes were still being "
-"made to the specification. We&#39;ve done our best to update it for "
-"accuracy. If you discover a conflict between what is written in this guide "
-"and the specification, the specification is the authority—assume it is "
-"correct. If you believe you have found an error in the specification, please "
-"report it to the JSR-299 EG."
+"made to the specification. We've done our best to update it for accuracy. If "
+"you discover a conflict between what is written in this guide and the "
+"specification, the specification is the authority—assume it is correct. If "
+"you believe you have found an error in the specification, please report it "
+"to the JSR-299 EG."
 msgstr ""
 
 #. Tag: title

Modified: doc/trunk/reference/src/main/docbook/es-ES/next.po
===================================================================
--- doc/trunk/reference/src/main/docbook/es-ES/next.po	2010-07-24 16:36:48 UTC (rev 6808)
+++ doc/trunk/reference/src/main/docbook/es-ES/next.po	2010-07-25 04:22:37 UTC (rev 6809)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: next\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-05-01T13:53:43\n"
+"POT-Creation-Date: 2010-07-25T03:52:14\n"
 "PO-Revision-Date: 2009-01-20 09:48+1000\n"
 "Last-Translator: Gladys Guerrero Lozano <gguerrer at redhat.com>\n"
 "Language-Team: Spanish <fedora-trans-es at redhat.com>\n"
@@ -24,13 +24,13 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Because CDI is so new, there&#39;s not yet a lot of information available "
+"Because CDI is so new, there's not yet a lot of information available "
 "online. That will change over time. Regardless, the CDI specification "
 "remains the authority for information on CDI. The spec is less than 100 "
-"pages and is quite readable (don&#39;t worry, it&#39;s not like your Blu-ray "
-"player manual). Of course, it covers many details we&#39;ve skipped over "
-"here. The spec is available on the <ulink url=\"http://jcp.org/en/jsr/detail?"
-"id=299\">JSR-299 page</ulink> at the JCP website."
+"pages and is quite readable (don't worry, it's not like your Blu-ray player "
+"manual). Of course, it covers many details we've skipped over here. The spec "
+"is available on the <ulink url=\"http://jcp.org/en/jsr/detail?id=299\">JSR-"
+"299 page</ulink> at the JCP website."
 msgstr ""
 
 #. Tag: para
@@ -40,8 +40,8 @@
 "\"http://seamframework.org/Weld\">Seam project</ulink>. The RI development "
 "team and the CDI spec lead blog at <ulink url=\"http://in.relation.to\">in."
 "relation.to</ulink>. This guide was originally based on a series of blog "
-"entries published there while the specification was being developed. It&#39;"
-"s probably the best source of information about the future of CDI, Weld and "
+"entries published there while the specification was being developed. It's "
+"probably the best source of information about the future of CDI, Weld and "
 "Seam."
 msgstr ""
 "La implementación de Referencia (IR) de Web Beans se desarrolla en "
@@ -79,8 +79,8 @@
 #, no-c-format
 msgid ""
 "Edit the <literal>pom.xml</literal> file in the root of the checkout and "
-"remove the &#34;<literal>-SNAPSHOT</literal>&#34; from the version element "
-"(so you don&#39;t have to build other Weld modules)."
+"remove the \"<literal>-SNAPSHOT</literal>\" from the version element (so you "
+"don't have to build other Weld modules)."
 msgstr ""
 
 #. Tag: para

Modified: doc/trunk/reference/src/main/docbook/es-ES/part1.po
===================================================================
--- doc/trunk/reference/src/main/docbook/es-ES/part1.po	2010-07-24 16:36:48 UTC (rev 6808)
+++ doc/trunk/reference/src/main/docbook/es-ES/part1.po	2010-07-25 04:22:37 UTC (rev 6809)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: part1\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-05-01T13:53:43\n"
+"POT-Creation-Date: 2010-07-25T03:52:14\n"
 "PO-Revision-Date: 2009-01-19 16:38+1000\n"
 "Last-Translator: Gladys Guerrero Lozano <gguerrer at redhat.com>\n"
 "Language-Team: Spanish <fedora-trans-es at redhat.com>\n"
@@ -178,7 +178,7 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"Where should I keep the reference to it when I&#39;m not currently using it?"
+"Where should I keep the reference to it when I'm not currently using it?"
 msgstr ""
 "¿Dónde debo guardar mi referencia a éste cuando no lo estoy usando "
 "directamente?"
@@ -200,9 +200,9 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"CDI is more than a framework. It&#39;s a whole, rich programming model. The "
+"CDI is more than a framework. It's a whole, rich programming model. The "
 "<emphasis>theme</emphasis> of CDI is <emphasis>loose-coupling with strong "
-"typing</emphasis>. Let&#39;s study what that phrase means."
+"typing</emphasis>. Let's study what that phrase means."
 msgstr ""
 
 #. Tag: para
@@ -261,8 +261,8 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"What&#39;s even more powerful (and comforting) is that CDI provides all "
-"these facilities in a <emphasis>typesafe</emphasis> way. CDI never relies on "
+"What's even more powerful (and comforting) is that CDI provides all these "
+"facilities in a <emphasis>typesafe</emphasis> way. CDI never relies on "
 "string-based identifiers to determine how collaborating objects fit "
 "together. Instead, CDI uses the typing information that is already available "
 "in the Java object model, augmented using a new programming pattern, called "
@@ -283,10 +283,10 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"But CDI isn&#39;t a restrictive programming model. It doesn&#39;t tell you "
-"how you should to structure your application into layers, how you should "
-"handle persistence, or what web framework you have to use. You&#39;ll have "
-"to decide those kinds of things for yourself."
+"But CDI isn't a restrictive programming model. It doesn't tell you how you "
+"should to structure your application into layers, how you should handle "
+"persistence, or what web framework you have to use. You'll have to decide "
+"those kinds of things for yourself."
 msgstr ""
 
 #. Tag: para
@@ -308,8 +308,8 @@
 "CDI was influenced by a number of existing Java frameworks, including Seam, "
 "Guice and Spring. However, CDI has its own, very distinct, character: more "
 "typesafe than Seam, more stateful and less XML-centric than Spring, more web "
-"and enterprise-application capable than Guice. But it couldn&#39;t have been "
-"any of these without inspiration from the frameworks mentioned and "
+"and enterprise-application capable than Guice. But it couldn't have been any "
+"of these without inspiration from the frameworks mentioned and "
 "<emphasis>lots</emphasis> of collaboration and hard work by the JSR-299 "
 "Expert Group (EG)."
 msgstr ""

Modified: doc/trunk/reference/src/main/docbook/es-ES/part3.po
===================================================================
--- doc/trunk/reference/src/main/docbook/es-ES/part3.po	2010-07-24 16:36:48 UTC (rev 6808)
+++ doc/trunk/reference/src/main/docbook/es-ES/part3.po	2010-07-25 04:22:37 UTC (rev 6809)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: part3\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-05-01T13:53:43\n"
+"POT-Creation-Date: 2010-07-25T03:52:14\n"
 "PO-Revision-Date: 2009-01-19 16:46+1000\n"
 "Last-Translator: Gladys Guerrero Lozano <gguerrer at redhat.com>\n"
 "Language-Team: Spanish <fedora-trans-es at redhat.com>\n"
@@ -19,8 +19,8 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"The first major theme of CDI is <emphasis>loose coupling</emphasis>. We&#39;"
-"ve already seen three means of achieving loose coupling:"
+"The first major theme of CDI is <emphasis>loose coupling</emphasis>. We've "
+"already seen three means of achieving loose coupling:"
 msgstr ""
 
 #. Tag: para
@@ -105,10 +105,10 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"You don&#39;t see string-based identifiers in CDI code, not because the "
+"You don't see string-based identifiers in CDI code, not because the "
 "framework is hiding them from you using clever defaulting rules—so-called "
-"&#34;configuration by convention&#34;—but because there are simply no "
-"strings there to begin with!"
+"\"configuration by convention\"—but because there are simply no strings "
+"there to begin with!"
 msgstr ""
 "No necesita ver los identificadores de cadena en código de Web Beans, no "
 "porque el marco los esté escondiendo del uso inteligente de las reglas "
@@ -217,11 +217,11 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"We&#39;re now ready to meet some more advanced features of CDI. Bear in mind "
+"We're now ready to meet some more advanced features of CDI. Bear in mind "
 "that these features exist to make our code both easier to validate and more "
-"understandable. Most of the time you don&#39;t ever really <emphasis>need</"
-"emphasis> to use these features, but if you use them wisely, you&#39;ll come "
-"to appreciate their power."
+"understandable. Most of the time you don't ever really <emphasis>need</"
+"emphasis> to use these features, but if you use them wisely, you'll come to "
+"appreciate their power."
 msgstr ""
 "Ahora estamos listos para conocer otras funciones más avanzadas de Web "
 "Beans. Tenga en cuenta que estas funciones hacen a nuestro código más fácil "

Modified: doc/trunk/reference/src/main/docbook/es-ES/part4.po
===================================================================
--- doc/trunk/reference/src/main/docbook/es-ES/part4.po	2010-07-24 16:36:48 UTC (rev 6808)
+++ doc/trunk/reference/src/main/docbook/es-ES/part4.po	2010-07-25 04:22:37 UTC (rev 6809)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: part4\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-05-01T13:53:43\n"
+"POT-Creation-Date: 2010-07-25T03:52:14\n"
 "PO-Revision-Date: 2009-01-19 16:49+1000\n"
 "Last-Translator: Gladys Guerrero Lozano <gguerrer at redhat.com>\n"
 "Language-Team: Spanish <fedora-trans-es at redhat.com>\n"
@@ -19,12 +19,12 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"The third theme of CDI is <emphasis>integration</emphasis>. We&#39;ve "
-"already seen how CDI helps integrate EJB and JSF, allowing EJBs to be bound "
-"directly to JSF pages. That&#39;s just the beginning. The CDI services are "
-"integrated into the very core of the Java EE platform. Even EJB session "
-"beans can take advantage of the dependency injection, event bus, and "
-"contextual lifecycle management that CDI provides."
+"The third theme of CDI is <emphasis>integration</emphasis>. We've already "
+"seen how CDI helps integrate EJB and JSF, allowing EJBs to be bound directly "
+"to JSF pages. That's just the beginning. The CDI services are integrated "
+"into the very core of the Java EE platform. Even EJB session beans can take "
+"advantage of the dependency injection, event bus, and contextual lifecycle "
+"management that CDI provides."
 msgstr ""
 
 #. Tag: para
@@ -56,12 +56,12 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"We&#39;re about to see how to take full advantage of the Java EE platform in "
-"an application that uses CDI. We&#39;ll also briefly meet a set of SPIs that "
-"are provided to support portable extensions to CDI. You might not ever need "
-"to use these SPIs directly, but don&#39;t take them for granted. You will "
-"likely be using them indirectly, every time you use a third-party extension, "
-"such as Seam."
+"We're about to see how to take full advantage of the Java EE platform in an "
+"application that uses CDI. We'll also briefly meet a set of SPIs that are "
+"provided to support portable extensions to CDI. You might not ever need to "
+"use these SPIs directly, but don't take them for granted. You will likely be "
+"using them indirectly, every time you use a third-party extension, such as "
+"Seam."
 msgstr ""
 "Ya estamos a punto de ver cómo aprovechar completamente la plataforma de "
 "Java EE en una aplicación que utiliza Web Beans. También veremos brevemente "

Modified: doc/trunk/reference/src/main/docbook/es-ES/producermethods.po
===================================================================
--- doc/trunk/reference/src/main/docbook/es-ES/producermethods.po	2010-07-24 16:36:48 UTC (rev 6808)
+++ doc/trunk/reference/src/main/docbook/es-ES/producermethods.po	2010-07-25 04:22:37 UTC (rev 6809)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: producermethods\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-05-01T13:53:43\n"
+"POT-Creation-Date: 2010-07-25T03:52:15\n"
 "PO-Revision-Date: 2009-01-19 17:00+1000\n"
 "Last-Translator: Gladys Guerrero Lozano <gguerrer at redhat.com>\n"
 "Language-Team: Spanish <fedora-trans-es at redhat.com>\n"
@@ -26,7 +26,7 @@
 msgid ""
 "Producer methods let us overcome certain limitations that arise when a "
 "container, instead of the application, is responsible for instantiating "
-"objects. They&#39;re also the easiest way to integrate objects which are not "
+"objects. They're also the easiest way to integrate objects which are not "
 "beans into the CDI environment."
 msgstr ""
 "Los métodos de productor nos permiten sobrepasar algunas limitaciones que se "
@@ -93,9 +93,9 @@
 #, no-c-format
 msgid ""
 "In particular, producer methods let us use runtime polymorphism with CDI. As "
-"we&#39;ve seen, alternative beans are one solution to the problem of "
-"deployment-time polymorphism. But once the system is deployed, the CDI "
-"implementation is fixed. A producer method has no such limitation:"
+"we've seen, alternative beans are one solution to the problem of deployment-"
+"time polymorphism. But once the system is deployed, the CDI implementation "
+"is fixed. A producer method has no such limitation:"
 msgstr ""
 
 #. Tag: para
@@ -146,7 +146,7 @@
 msgid ""
 "Now, when the producer method is called, the returned "
 "<literal>PaymentStrategy</literal> will be bound to the session context. The "
-"producer method won&#39;t be called again in the same session."
+"producer method won't be called again in the same session."
 msgstr ""
 "Ahora, cuando el método de productor es llamado, el "
 "<literal>PaymentStrategy</literal> devuelto se enlazará con el contexto de "
@@ -172,11 +172,11 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"There&#39;s one potential problem with the code above. The implementations "
-"of <literal>CreditCardPaymentStrategy</literal> are instantiated using the "
-"Java <literal>new</literal> operator. Objects instantiated directly by the "
-"application can&#39;t take advantage of dependency injection and don&#39;t "
-"have interceptors."
+"There's one potential problem with the code above. The implementations of "
+"<literal>CreditCardPaymentStrategy</literal> are instantiated using the Java "
+"<literal>new</literal> operator. Objects instantiated directly by the "
+"application can't take advantage of dependency injection and don't have "
+"interceptors."
 msgstr ""
 "No hay un problema en potencia con el código anterior. Las implementaciones "
 "de <literal>CreditCardPaymentStrategy</literal> son instanciadas mediante el "
@@ -187,7 +187,7 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"If this isn&#39;t what we want, we can use dependency injection into the "
+"If this isn't what we want, we can use dependency injection into the "
 "producer method to obtain bean instances:"
 msgstr ""
 "Si esto no es lo que deseamos podemos utilizar la inyección de dependencia "
@@ -197,13 +197,13 @@
 #, fuzzy, no-c-format
 msgid ""
 "Wait, what if <literal>CreditCardPaymentStrategy</literal> is a request-"
-"scoped bean? Then the producer method has the effect of &#34;promoting&#34; "
-"the current request scoped instance into session scope. This is almost "
-"certainly a bug! The request scoped object will be destroyed by the "
-"container before the session ends, but the reference to the object will be "
-"left &#34;hanging&#34; in the session scope. This error will <emphasis>not</"
-"emphasis> be detected by the container, so please take extra care when "
-"returning bean instances from producer methods!"
+"scoped bean? Then the producer method has the effect of \"promoting\" the "
+"current request scoped instance into session scope. This is almost certainly "
+"a bug! The request scoped object will be destroyed by the container before "
+"the session ends, but the reference to the object will be left \"hanging\" "
+"in the session scope. This error will <emphasis>not</emphasis> be detected "
+"by the container, so please take extra care when returning bean instances "
+"from producer methods!"
 msgstr ""
 "Espere, ¿qué sucede si <literal>CreditCardPaymentStrategy</literal> es una "
 "petición en ámbito de Web Bean? Entonces el método del productor tiene el "
@@ -218,7 +218,7 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"There&#39;s at least three ways we could go about fixing this bug. We could "
+"There's at least three ways we could go about fixing this bug. We could "
 "change the scope of the <literal>CreditCardPaymentStrategy</literal> "
 "implementation, but this would affect other clients of that bean. A better "
 "option would be to change the scope of the producer method to "
@@ -255,7 +255,7 @@
 "Then a new <emphasis>dependent</emphasis> instance of "
 "<literal>CreditCardPaymentStrategy</literal> will be created, passed to the "
 "producer method, returned by the producer method and finally bound to the "
-"session context. The dependent object won&#39;t be destroyed until the "
+"session context. The dependent object won't be destroyed until the "
 "<literal>Preferences</literal> object is destroyed, at the end of the "
 "session."
 msgstr ""

Modified: doc/trunk/reference/src/main/docbook/es-ES/resources.po
===================================================================
--- doc/trunk/reference/src/main/docbook/es-ES/resources.po	2010-07-24 16:36:48 UTC (rev 6808)
+++ doc/trunk/reference/src/main/docbook/es-ES/resources.po	2010-07-25 04:22:37 UTC (rev 6809)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: Weld_-_JSR-299_Reference_Implementation VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-05-01T13:53:43\n"
+"POT-Creation-Date: 2010-07-25T03:52:15\n"
 "PO-Revision-Date: 2009-11-11 15:00+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -34,8 +34,8 @@
 "injection in CDI. Most notably, component environment injection relies on "
 "string-based names to qualify ambiguous types, and there is no real "
 "consistency as to the nature of the names (sometimes a JNDI name, sometimes "
-"a persistence unit name, sometimes an EJB link, sometimes a nonportable &#34;"
-"mapped name&#34;). Producer fields turned out to be an elegant adaptor to "
+"a persistence unit name, sometimes an EJB link, sometimes a nonportable "
+"\"mapped name\"). Producer fields turned out to be an elegant adaptor to "
 "reduce all this complexity to a common model and get component environment "
 "resources to participate in the CDI system just like any other kind of bean."
 msgstr ""
@@ -127,10 +127,10 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"It might feel strange to be declaring resources in Java code. Isn&#39;t this "
-"stuff that might be deployment-specific? Certainly, and that&#39;s why it "
-"makes sense to declare your resources in a class annotated "
-"<literal>@Alternative</literal>."
+"It might feel strange to be declaring resources in Java code. Isn't this "
+"stuff that might be deployment-specific? Certainly, and that's why it makes "
+"sense to declare your resources in a class annotated <literal>@Alternative</"
+"literal>."
 msgstr ""
 
 #. Tag: title
@@ -156,9 +156,9 @@
 "It might seem like a pain to have to write these extra producer field "
 "declarations, just to gain an additional level of indirection. You could "
 "just as well use component environment injection directly, right? But "
-"remember that you&#39;re going to be using resources like the "
-"<literal>EntityManager</literal> in several different beans. Isn&#39;t it "
-"nicer and more typesafe to write"
+"remember that you're going to be using resources like the "
+"<literal>EntityManager</literal> in several different beans. Isn't it nicer "
+"and more typesafe to write"
 msgstr ""
 
 #. Tag: para

Modified: doc/trunk/reference/src/main/docbook/es-ES/ri-spi.po
===================================================================
--- doc/trunk/reference/src/main/docbook/es-ES/ri-spi.po	2010-07-24 16:36:48 UTC (rev 6808)
+++ doc/trunk/reference/src/main/docbook/es-ES/ri-spi.po	2010-07-25 04:22:37 UTC (rev 6809)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: ri-spi\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-05-01T13:53:43\n"
+"POT-Creation-Date: 2010-07-25T03:52:15\n"
 "PO-Revision-Date: 2009-01-20 10:15+1000\n"
 "Last-Translator: Gladys Guerrero Lozano <gguerrer at redhat.com>\n"
 "Language-Team: Spanish <fedora-trans-es at redhat.com>\n"
@@ -40,8 +40,8 @@
 "If you just want to use managed beans, and not take advantage of enterprise "
 "services (EE resource injection, CDI injection into EE component classes, "
 "transactional events, support for CDI services in EJBs) and non-flat "
-"deployments, then the generic servlet support provided by the &#34;Weld: "
-"Servlets&#34; extension will be sufficient, and will work in any container "
+"deployments, then the generic servlet support provided by the \"Weld: "
+"Servlets\" extension will be sufficient, and will work in any container "
 "supporting the Servlet API."
 msgstr ""
 
@@ -87,8 +87,8 @@
 "implementation of the <literal>Environment</literal> interface. A number of "
 "standard environments are built in, and described by the "
 "<literal>Environments</literal> enumeration. Different environments require "
-"different services to be present (for example a Servlet container doesn&#39;"
-"t require transaction, EJB or JPA services). By default an EE environment is "
+"different services to be present (for example a Servlet container doesn't "
+"require transaction, EJB or JPA services). By default an EE environment is "
 "assumed, but you can adjust the environment by calling <literal>bootstrap."
 "setEnvironment()</literal>."
 msgstr ""
@@ -167,7 +167,7 @@
 "BDAs it can access. However many containers will allow an easy mechanism to "
 "make BDAs bi-directionally accessible (such as a library directory). In this "
 "case, it is allowable (and reasonable) to describe all such archives as a "
-"single, &#39;virtual&#39; <literal>BeanDeploymentArchive</literal>."
+"single, 'virtual' <literal>BeanDeploymentArchive</literal>."
 msgstr ""
 
 #. Tag: para
@@ -182,7 +182,7 @@
 #, no-c-format
 msgid ""
 "<literal>BeanDeploymentArchive</literal> provides three methods which allow "
-"it&#39;s contents to be discovered by Weld—<literal>BeanDeploymentArchive."
+"it's contents to be discovered by Weld—<literal>BeanDeploymentArchive."
 "getBeanClasses()</literal> must return all the classes in the BDA, "
 "<literal>BeanDeploymentArchive.getBeansXml()</literal> must return all the "
 "deployment descriptors in the archive, and <literal>BeanDeploymentArchive."
@@ -211,7 +211,7 @@
 "In practice, you can regard the deployment structure represented by "
 "<literal>Deployment</literal>, and the virtual BDA graph as a mirror of the "
 "classloader structure for a deployment. If a class can from BDA X can be "
-"loaded by another in BDA Y, it is accessible, and therefore BDA Y&#39;s "
+"loaded by another in BDA Y, it is accessible, and therefore BDA Y's "
 "accessible BDAs should include BDA X."
 msgstr ""
 
@@ -247,7 +247,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Weld delegates EJB 3 bean discovery to the container so that it doesn&#39;t "
+"Weld delegates EJB 3 bean discovery to the container so that it doesn't "
 "duplicate the work done by the EJB container, and respects any vendor-"
 "extensions to the EJB definition."
 msgstr ""
@@ -319,7 +319,7 @@
 msgid ""
 "If you use a non-EE environment then you may implement any of the EE service "
 "SPIs, and Weld will provide the associated functionality. There is no need "
-"to implement those services you don&#39;t need!"
+"to implement those services you don't need!"
 msgstr ""
 
 #. Tag: title
@@ -549,9 +549,9 @@
 #, no-c-format
 msgid ""
 "Weld expects the Application Server or other container to provide the "
-"storage for each application&#39;s context. The <literal>org.jboss.weld."
-"context.api.BeanStore</literal> should be implemented to provide an "
-"application scoped storage."
+"storage for each application's context. The <literal>org.jboss.weld.context."
+"api.BeanStore</literal> should be implemented to provide an application "
+"scoped storage."
 msgstr ""
 
 #. Tag: title

Modified: doc/trunk/reference/src/main/docbook/es-ES/scopescontexts.po
===================================================================
--- doc/trunk/reference/src/main/docbook/es-ES/scopescontexts.po	2010-07-24 16:36:48 UTC (rev 6808)
+++ doc/trunk/reference/src/main/docbook/es-ES/scopescontexts.po	2010-07-25 04:22:37 UTC (rev 6809)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: scopescontexts\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-05-01T13:53:43\n"
+"POT-Creation-Date: 2010-07-25T03:52:15\n"
 "PO-Revision-Date: 2009-01-20 11:45+1000\n"
 "Last-Translator: Gladys Guerrero Lozano <gguerrer at redhat.com>\n"
 "Language-Team: Spanish <fedora-trans-es at redhat.com>\n"
@@ -24,7 +24,7 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"So far, we&#39;ve seen a few examples of <emphasis>scope type annotations</"
+"So far, we've seen a few examples of <emphasis>scope type annotations</"
 "emphasis>. The scope of a bean determines the lifecycle of instances of the "
 "bean. The scope also determines which clients refer to which instances of "
 "the bean. According to the CDI specification, a scope determines:"
@@ -74,13 +74,13 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"JPA entities aren&#39;t a great fit for this model. Entities have their "
-"whole own lifecycle and identity model which just doesn&#39;t map naturally "
-"to the model used in CDI. Therefore, we recommend against treating entities "
-"as CDI beans. You&#39;re certainly going to run into problems if you try to "
-"give an entity a scope other than the default scope <literal>@Dependent</"
-"literal>. The client proxy will get in the way if you try to pass an "
-"injected instance to the JPA <literal>EntityManager</literal>."
+"JPA entities aren't a great fit for this model. Entities have their whole "
+"own lifecycle and identity model which just doesn't map naturally to the "
+"model used in CDI. Therefore, we recommend against treating entities as CDI "
+"beans. You're certainly going to run into problems if you try to give an "
+"entity a scope other than the default scope <literal>@Dependent</literal>. "
+"The client proxy will get in the way if you try to pass an injected instance "
+"to the JPA <literal>EntityManager</literal>."
 msgstr ""
 
 #. Tag: title
@@ -91,8 +91,8 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"CDI features an <emphasis>extensible context model</emphasis>. It&#39;s "
-"possible to define new scopes by creating a new scope type annotation:"
+"CDI features an <emphasis>extensible context model</emphasis>. It's possible "
+"to define new scopes by creating a new scope type annotation:"
 msgstr ""
 "Web Beans ofrece un <emphasis>modelo contextual extensible</emphasis>. Es "
 "posible definir nuevos ámbitos creando una nueva anotación de tipo de ámbito:"
@@ -100,7 +100,7 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"Of course, that&#39;s the easy part of the job. For this scope type to be "
+"Of course, that's the easy part of the job. For this scope type to be "
 "useful, we will also need to define a <literal>Context</literal> object that "
 "implements the scope! Implementing a <literal>Context</literal> is usually a "
 "very technical task, intended for framework development only. You can expect "
@@ -123,7 +123,7 @@
 
 #. Tag: para
 #, fuzzy, no-c-format
-msgid "Usually, you&#39;ll use one of CDI&#39;s built-in scopes."
+msgid "Usually, you'll use one of CDI's built-in scopes."
 msgstr ""
 "Por lo general, se utilizará uno de los ámbitos incorporados de Web Beans."
 
@@ -243,7 +243,7 @@
 #, fuzzy, no-c-format
 msgid ""
 "Three of the four built-in scopes should be extremely familiar to every Java "
-"EE developer, so let&#39;s not waste time discussing them here. One of the "
+"EE developer, so let's not waste time discussing them here. One of the "
 "scopes, however, is new."
 msgstr ""
 "Tres de los ámbitos incorporados deben ser extremadamente familiares a "
@@ -400,7 +400,7 @@
 
 #. Tag: para
 #, no-c-format
-msgid "It&#39;s probably better to use one of the link components in JSF 2:"
+msgid "It's probably better to use one of the link components in JSF 2:"
 msgstr ""
 
 #. Tag: para
@@ -408,8 +408,8 @@
 msgid ""
 "The conversation context propagates across redirects, making it very easy to "
 "implement the common POST-then-redirect pattern, without resort to fragile "
-"constructs such as a &#34;flash&#34; object. The container automatically "
-"adds the conversation id to the redirect URL as a request parameter."
+"constructs such as a \"flash\" object. The container automatically adds the "
+"conversation id to the redirect URL as a request parameter."
 msgstr ""
 "El administrador de Web Bean también se requiere para propagar "
 "conversaciones a través de cualquier redirección, incluso si la conversación "
@@ -479,12 +479,12 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"You can guess what &#34;singleton&#34; means here. It means a bean that is "
-"instantiated once. Unfortunately, there&#39;s a little problem with this "
-"pseudo-scope. Beans with scope <literal>@Singleton</literal> don&#39;t have "
-"a proxy object. Clients hold a direct reference to the singleton instance. "
-"So we need to consider the case of a client that can be serialized, for "
-"example, any bean with scope <literal>@SessionScoped</literal> or "
+"You can guess what \"singleton\" means here. It means a bean that is "
+"instantiated once. Unfortunately, there's a little problem with this pseudo-"
+"scope. Beans with scope <literal>@Singleton</literal> don't have a proxy "
+"object. Clients hold a direct reference to the singleton instance. So we "
+"need to consider the case of a client that can be serialized, for example, "
+"any bean with scope <literal>@SessionScoped</literal> or "
 "<literal>@ConversationScoped</literal>, any dependent object of a bean with "
 "scope <literal>@SessionScoped</literal> or <literal>@ConversationScoped</"
 "literal>, or any stateful session bean."
@@ -494,7 +494,7 @@
 #, no-c-format
 msgid ""
 "Now, if the singleton instance is a simple, immutable, serializable object "
-"like a string, a number or a date, we probably don&#39;t mind too much if it "
+"like a string, a number or a date, we probably don't mind too much if it "
 "gets duplicated via serialization. However, that makes it no stop being a "
 "true singleton, and we may as well have just declared it with the default "
 "scope."
@@ -525,7 +525,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"give the client a reference of type <literal>Instance&#60;X&#62;</literal> "
+"give the client a reference of type <literal>Instance&lt;X&gt;</literal> "
 "where <literal>X</literal> is the bean type of the singleton bean."
 msgstr ""
 
@@ -585,8 +585,8 @@
 "If you need to access a bean directly by EL name in a JSF page, you probably "
 "need to give it a scope other than <literal>@Dependent</literal>. Otherwise, "
 "any value that gets set to the bean by a JSF input will be lost immediately. "
-"That&#39;s why CDI features the <literal>@Model</literal> stereotype; it "
-"lets you give a bean a name, and set its scope to <literal>@RequestScoped</"
+"That's why CDI features the <literal>@Model</literal> stereotype; it lets "
+"you give a bean a name, and set its scope to <literal>@RequestScoped</"
 "literal> in one stroke. If you need to access a bean that really "
 "<emphasis>has</emphasis> to have the scope <literal>@Dependent</literal> "
 "from a JSF page, inject it into a different bean, and expose it to EL via a "
@@ -596,8 +596,8 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Beans with scope <literal>@Dependent</literal> don&#39;t need a proxy "
-"object. The client holds a direct reference to its instance."
+"Beans with scope <literal>@Dependent</literal> don't need a proxy object. "
+"The client holds a direct reference to its instance."
 msgstr ""
 
 #. Tag: para
@@ -664,8 +664,8 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"This feature is particularly useful with producer methods, as we&#39;ll see "
-"in the next chapter."
+"This feature is particularly useful with producer methods, as we'll see in "
+"the next chapter."
 msgstr ""
 "La función es particularmente útil con métodos de productor, así como "
 "veremos en el siguiente capítulo."

Modified: doc/trunk/reference/src/main/docbook/es-ES/specialization.po
===================================================================
--- doc/trunk/reference/src/main/docbook/es-ES/specialization.po	2010-07-24 16:36:48 UTC (rev 6808)
+++ doc/trunk/reference/src/main/docbook/es-ES/specialization.po	2010-07-25 04:22:37 UTC (rev 6809)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: specialization\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-05-01T13:53:43\n"
+"POT-Creation-Date: 2010-07-25T03:52:15\n"
 "PO-Revision-Date: 2009-01-20 11:16+1000\n"
 "Last-Translator: Gladys Guerrero Lozano <gguerrer at redhat.com>\n"
 "Language-Team: Spanish <fedora-trans-es at redhat.com>\n"
@@ -24,15 +24,15 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"When you first start developing with CDI, you&#39;ll likely be dealing only "
-"with a single bean implementation for each bean type. In this case, it&#39;s "
-"easy to understand how beans get selected for injection. As the complexity "
-"of your application grows, multiple occurrences of the same bean type start "
+"When you first start developing with CDI, you'll likely be dealing only with "
+"a single bean implementation for each bean type. In this case, it's easy to "
+"understand how beans get selected for injection. As the complexity of your "
+"application grows, multiple occurrences of the same bean type start "
 "appearing, either because you have multiple implementations or two beans "
-"share a common (Java) inheritance. That&#39;s when you have to begin "
-"studying the specialization, inheritance and alternative rules to work "
-"through unsatisfied or ambiguous dependencies or to avoid certain beans from "
-"being called."
+"share a common (Java) inheritance. That's when you have to begin studying "
+"the specialization, inheritance and alternative rules to work through "
+"unsatisfied or ambiguous dependencies or to avoid certain beans from being "
+"called."
 msgstr ""
 
 #. Tag: para
@@ -61,10 +61,10 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"The second case is the default assumed by CDI. It&#39;s possible to have two "
+"The second case is the default assumed by CDI. It's possible to have two "
 "beans in the system with the same part bean type (interface or parent "
-"class). As you&#39;ve learned, you select between the two implementations "
-"using qualifiers."
+"class). As you've learned, you select between the two implementations using "
+"qualifiers."
 msgstr ""
 
 #. Tag: para
@@ -74,7 +74,7 @@
 "deployment, only one bean can fulfill a given role at a time. That means one "
 "bean needs to be enabled and the other disabled. There are a two modifiers "
 "involved: <literal>@Alternative</literal> and <literal>@Specializes</"
-"literal>. We&#39;ll start by looking at alternatives and then show the "
+"literal>. We'll start by looking at alternatives and then show the "
 "guarantees that specialization adds."
 msgstr ""
 
@@ -100,8 +100,8 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"But in our staging environment, we don&#39;t really want to submit payments "
-"to the external system, so we override that implementation of "
+"But in our staging environment, we don't really want to submit payments to "
+"the external system, so we override that implementation of "
 "<literal>PaymentProcessor</literal> with a different bean:"
 msgstr ""
 "Pero en nuestro entorno, omitimos esa implementación de "
@@ -115,19 +115,18 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"We&#39;ve already seen how we can enable this alternative by listing its "
-"class in the <literal>beans.xml</literal> descriptor."
+"We've already seen how we can enable this alternative by listing its class "
+"in the <literal>beans.xml</literal> descriptor."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
 msgid ""
 "But suppose we have many alternatives in the staging environment. It would "
-"be much more convenient to be able to enable them all at once. So let&#39;s "
-"make <literal>@Staging</literal> an <literal>@Alternative</literal> "
-"stereotype and annotate the staging beans with this stereotype instead. "
-"You&#39;ll see how this level of indirection pays off. First, we create the "
-"stereotype:"
+"be much more convenient to be able to enable them all at once. So let's make "
+"<literal>@Staging</literal> an <literal>@Alternative</literal> stereotype "
+"and annotate the staging beans with this stereotype instead. You'll see how "
+"this level of indirection pays off. First, we create the stereotype:"
 msgstr ""
 
 #. Tag: para
@@ -168,7 +167,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"So we haven&#39;t completely replaced the default implementation in this "
+"So we haven't completely replaced the default implementation in this "
 "deployment of the system. The only way one bean can completely override a "
 "second bean at all injection points is if it implements all the bean types "
 "and declares all the qualifiers of the second bean. However, if the second "
@@ -241,8 +240,8 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Since we&#39;re informing the container that our alternative bean is meant "
-"to stand in as a replacement for the default implementation, the alternative "
+"Since we're informing the container that our alternative bean is meant to "
+"stand in as a replacement for the default implementation, the alternative "
 "implementation automatically inherits all qualifiers of the default "
 "implementation. Thus, in our example, "
 "<literal>MockCreditCardPaymentProcessor</literal> inherits the qualifiers "

Modified: doc/trunk/reference/src/main/docbook/es-ES/stereotypes.po
===================================================================
--- doc/trunk/reference/src/main/docbook/es-ES/stereotypes.po	2010-07-24 16:36:48 UTC (rev 6808)
+++ doc/trunk/reference/src/main/docbook/es-ES/stereotypes.po	2010-07-25 04:22:37 UTC (rev 6809)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: stereotypes\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-05-01T13:53:43\n"
+"POT-Creation-Date: 2010-07-25T03:52:15\n"
 "PO-Revision-Date: 2009-01-20 11:23+1000\n"
 "Last-Translator: Gladys Guerrero Lozano <gguerrer at redhat.com>\n"
 "Language-Team: Spanish <fedora-trans-es at redhat.com>\n"
@@ -97,7 +97,7 @@
 #, no-c-format
 msgid ""
 "Of course, we need to apply some other annotations to our stereotype or else "
-"it wouldn&#39;t be adding much value."
+"it wouldn't be adding much value."
 msgstr ""
 
 #. Tag: title
@@ -124,7 +124,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Naturally, overriding a single default isn&#39;t much use. But remember, "
+"Naturally, overriding a single default isn't much use. But remember, "
 "stereotypes can define more than just the default scope."
 msgstr ""
 
@@ -207,8 +207,8 @@
 #, no-c-format
 msgid ""
 "This may blow your mind a bit, but stereotypes may declare other "
-"stereotypes, which we&#39;ll call <emphasis>stereotype stacking</emphasis>. "
-"You may want to do this if you have two distinct stereotypes which are "
+"stereotypes, which we'll call <emphasis>stereotype stacking</emphasis>. You "
+"may want to do this if you have two distinct stereotypes which are "
 "meaningful on their own, but in other situation may be meaningful when "
 "combined."
 msgstr ""
@@ -216,7 +216,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Here&#39;s an example that combines the <literal>@Action</literal> and "
+"Here's an example that combines the <literal>@Action</literal> and "
 "<literal>@Auditable</literal> stereotypes:"
 msgstr ""
 
@@ -228,9 +228,8 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"We&#39;ve already met two standard stereotypes defined by the CDI "
-"specification: <literal>@Interceptor</literal> and <literal>@Decorator</"
-"literal>."
+"We've already met two standard stereotypes defined by the CDI specification: "
+"<literal>@Interceptor</literal> and <literal>@Decorator</literal>."
 msgstr ""
 "Ya hemos visto dos estereotipos estándar definidos por la especificación de "
 "Web Beans: <literal>@Interceptor</literal> y <literal>@Decorator</literal>."

Modified: doc/trunk/reference/src/main/docbook/es-ES/viewlayers.po
===================================================================
--- doc/trunk/reference/src/main/docbook/es-ES/viewlayers.po	2010-07-24 16:36:48 UTC (rev 6808)
+++ doc/trunk/reference/src/main/docbook/es-ES/viewlayers.po	2010-07-25 04:22:37 UTC (rev 6809)
@@ -6,7 +6,7 @@
 "Project-Id-Version: Web_Beans:_Java_Contexts_and_Dependency_Injection "
 "VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-05-01T13:53:43\n"
+"POT-Creation-Date: 2010-07-25T03:52:15\n"
 "PO-Revision-Date: 2009-04-19 20:36+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -90,8 +90,8 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Storing the id of any long-running conversation in Wicket&#39;s metadata "
-"when the page response is complete"
+"Storing the id of any long-running conversation in Wicket's metadata when "
+"the page response is complete"
 msgstr ""
 
 #. Tag: para
@@ -134,9 +134,9 @@
 #, no-c-format
 msgid ""
 "When a conversation is marked as long-running, the id of that conversation "
-"will be stored in Wicket&#39;s metadata for the current page. If a new page "
-"is created and set as the response target through <literal>setResponsePage()"
-"</literal>, this new page will also participate in this conversation. This "
+"will be stored in Wicket's metadata for the current page. If a new page is "
+"created and set as the response target through <literal>setResponsePage()</"
+"literal>, this new page will also participate in this conversation. This "
 "occurs for both directly instantiated pages (<literal>setResponsePage(new "
 "OtherPage())</literal>), as well as for bookmarkable pages created with "
 "<literal>setResponsePage(OtherPage.class)</literal> where <literal>OtherPage."

Modified: doc/trunk/reference/src/main/docbook/es-ES/weldexamples.po
===================================================================
--- doc/trunk/reference/src/main/docbook/es-ES/weldexamples.po	2010-07-24 16:36:48 UTC (rev 6808)
+++ doc/trunk/reference/src/main/docbook/es-ES/weldexamples.po	2010-07-25 04:22:37 UTC (rev 6809)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: Weld_-_JSR-299_Reference_Implementation VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-05-01T13:53:43\n"
+"POT-Creation-Date: 2010-07-25T03:52:15\n"
 "PO-Revision-Date: 2009-11-11 15:00+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -21,8 +21,8 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"It&#39;s time to pull the covers back and dive into the internals of Weld "
-"example applications. Let&#39;s start with the simpler of the two examples, "
+"It's time to pull the covers back and dive into the internals of Weld "
+"example applications. Let's start with the simpler of the two examples, "
 "<literal>weld-numberguess</literal>."
 msgstr ""
 
@@ -35,15 +35,15 @@
 #, no-c-format
 msgid ""
 "In the numberguess application you get 10 attempts to guess a number between "
-"1 and 100. After each attempt, you&#39;re told whether your guess was too "
-"high or too low."
+"1 and 100. After each attempt, you're told whether your guess was too high "
+"or too low."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
 msgid ""
 "The numberguess example is comprised of a number of beans, configuration "
-"files and Facelets (JSF) views, packaged as a war module. Let&#39;s start by "
+"files and Facelets (JSF) views, packaged as a war module. Let's start by "
 "examining the configuration files."
 msgstr ""
 
@@ -54,21 +54,21 @@
 "</literal>, which can be found in the <literal>src/main/webapp</literal> "
 "directory of the example. First, we have the JSF 2.0 version of "
 "<literal>faces-config.xml</literal>. A standardized version of Facelets is "
-"the default view handler in JSF 2.0, so there&#39;s really nothing that we "
-"have to configure. Thus, the configuration consists of only the root element."
+"the default view handler in JSF 2.0, so there's really nothing that we have "
+"to configure. Thus, the configuration consists of only the root element."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
 msgid ""
-"There&#39;s also an empty <literal>beans.xml</literal> file, which tells the "
+"There's also an empty <literal>beans.xml</literal> file, which tells the "
 "container to look for beans in this application and to activate the CDI "
 "services."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Finally, there&#39;s the familiar <literal>web.xml</literal>:"
+msgid "Finally, there's the familiar <literal>web.xml</literal>:"
 msgstr ""
 
 #. Tag: para
@@ -105,8 +105,8 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Let&#39;s take a look at the main JSF view, <literal>src/main/webapp/home."
-"xhtml</literal>."
+"Let's take a look at the main JSF view, <literal>src/main/webapp/home.xhtml</"
+"literal>."
 msgstr ""
 
 #. Tag: para
@@ -119,8 +119,8 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"There are a number of messages which can be sent to the user, &#34;Higher!"
-"&#34;, &#34;Lower!&#34; and &#34;Correct!&#34;"
+"There are a number of messages which can be sent to the user, \"Higher!\", "
+"\"Lower!\" and \"Correct!\""
 msgstr ""
 
 #. Tag: para
@@ -138,10 +138,9 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"A validator binding is used to make sure the user doesn&#39;t accidentally "
-"input a number outside of the range in which they can guess - if the "
-"validator wasn&#39;t here, the user might use up a guess on an out of bounds "
-"number."
+"A validator binding is used to make sure the user doesn't accidentally input "
+"a number outside of the range in which they can guess - if the validator "
+"wasn't here, the user might use up a guess on an out of bounds number."
 msgstr ""
 
 #. Tag: para
@@ -177,8 +176,8 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"The <literal>Generator</literal> is application scoped, so we don&#39;t get "
-"a different random each time."
+"The <literal>Generator</literal> is application scoped, so we don't get a "
+"different random each time."
 msgstr ""
 
 #. Tag: para
@@ -192,20 +191,20 @@
 #, no-c-format
 msgid ""
 "The final bean in the application is the session-scoped <literal>Game</"
-"literal> class. This is the primary entry point of the application. It&#39;s "
+"literal> class. This is the primary entry point of the application. It's "
 "responsible for setting up or resetting the game, capturing and validating "
-"the user&#39;s guess and providing feedback to the user with a "
-"<literal>FacesMessage</literal>. We&#39;ve used the post-construct lifecycle "
+"the user's guess and providing feedback to the user with a "
+"<literal>FacesMessage</literal>. We've used the post-construct lifecycle "
 "method to initialize the game by retrieving a random number from the "
-"<literal>@Random Instance&#60;Integer&#62;</literal> bean."
+"<literal>@Random Instance&lt;Integer&gt;</literal> bean."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
 msgid ""
-"You&#39;ll notice that we&#39;ve also added the <literal>@Named</literal> "
-"annotation to this class. This annotation is only required when you want to "
-"make the bean accessible to a JSF view via EL (i.e., #{game})."
+"You'll notice that we've also added the <literal>@Named</literal> annotation "
+"to this class. This annotation is only required when you want to make the "
+"bean accessible to a JSF view via EL (i.e., #{game})."
 msgstr ""
 
 #. Tag: title
@@ -237,9 +236,8 @@
 #, no-c-format
 msgid ""
 "Second, we need to explicitly specify the servlet listener in <literal>web."
-"xml</literal>, again because the container isn&#39;t doing this stuff for "
-"you. The servlet listener boots Weld and controls it&#39;s interaction with "
-"requests."
+"xml</literal>, again because the container isn't doing this stuff for you. "
+"The servlet listener boots Weld and controls it's interaction with requests."
 msgstr ""
 
 #. Tag: para
@@ -248,8 +246,8 @@
 "When Weld boots, it places the <literal>javax.enterprise.inject.spi."
 "BeanManager</literal>, the portable SPI for obtaining bean instances, in the "
 "ServletContext under a variable name equal to the fully-qualified interface "
-"name. You generally don&#39;t need to access this interface, but Weld makes "
-"use of it."
+"name. You generally don't need to access this interface, but Weld makes use "
+"of it."
 msgstr ""
 
 #. Tag: title
@@ -262,7 +260,7 @@
 msgid ""
 "Weld includes a number of portable extensions for JSR-299, including an "
 "extension for Wicket, which allows you to inject beans into Wicket "
-"components and leverage the conversation context. In this section, we&#39;ll "
+"components and leverage the conversation context. In this section, we'll "
 "walk you through the Wicket version of the numberguess example."
 msgstr ""
 
@@ -271,7 +269,7 @@
 msgid ""
 "You may want to review the Wicket documentation at <ulink url=\"http://"
 "wicket.apache.org/\">http://wicket.apache.org/</ulink> before reading this "
-"section, if you aren&#39;t already familiar with the framework."
+"section, if you aren't already familiar with the framework."
 msgstr ""
 
 #. Tag: para
@@ -280,17 +278,17 @@
 "Wicket is another environment that relies on the Weld servlet extension. The "
 "use of <ulink url=\"http://jetty.mortbay.org\">Jetty</ulink> is common in "
 "the Wicket community, and is thus chosen here as the runtime container. "
-"You&#39;ve seen already that Jetty is perfectly capable of running CDI "
+"You've seen already that Jetty is perfectly capable of running CDI "
 "applications with Weld add-ons, and this environment is no different."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
 msgid ""
-"We&#39;ll also be using the Eclipse IDE in these examples. Instructions are "
+"We'll also be using the Eclipse IDE in these examples. Instructions are "
 "provided later for running the example from the command line, but since "
-"you&#39;ll likely need to do more than just deploy examples, we&#39;ll get "
-"setup in this full development environment."
+"you'll likely need to do more than just deploy examples, we'll get setup in "
+"this full development environment."
 msgstr ""
 
 #. Tag: title
@@ -313,7 +311,7 @@
 #, no-c-format
 msgid ""
 "If you have m2eclipse installed, you can open any Maven project directly. "
-"From within Eclipse, select <emphasis>File -&#62; Import... -&#62; Maven "
+"From within Eclipse, select <emphasis>File -&gt; Import... -&gt; Maven "
 "Projects</emphasis>. Then, browse to the location of the Wicket numberguess "
 "example. You should see that Eclipse recognizes the existence of a Maven "
 "project."
@@ -329,24 +327,24 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"You&#39;ll notice after importing, the project has a build error. That&#39;s "
-"because we need to enable a Maven profile. Right-click on the project and "
-"select <emphasis>Properties</emphasis>, then select the <emphasis>Maven</"
-"emphasis> tab in the window that appears. In the form field labeled &#34;"
-"Active Maven Profiles (comma separated):&#34;, type <literal>jetty</"
-"literal>. That will enable some extra dependencies that allow the project to "
-"compile. Additionally, <emphasis>uncheck</emphasis> the box labeled &#34;"
-"Skip Maven compile plugin when processing resources (recommended)&#34;. That "
-"solves an incompatiblity between the m2eclipse plugin and the Maven enforcer "
-"plugin that we use for the Weld project. Now, you&#39;re ready to develop!"
+"You'll notice after importing, the project has a build error. That's because "
+"we need to enable a Maven profile. Right-click on the project and select "
+"<emphasis>Properties</emphasis>, then select the <emphasis>Maven</emphasis> "
+"tab in the window that appears. In the form field labeled \"Active Maven "
+"Profiles (comma separated):\", type <literal>jetty</literal>. That will "
+"enable some extra dependencies that allow the project to compile. "
+"Additionally, <emphasis>uncheck</emphasis> the box labeled \"Skip Maven "
+"compile plugin when processing resources (recommended)\". That solves an "
+"incompatiblity between the m2eclipse plugin and the Maven enforcer plugin "
+"that we use for the Weld project. Now, you're ready to develop!"
 msgstr ""
 
 #. Tag: para
 #, no-c-format
 msgid ""
-"Be sure to uncheck the box &#34;Skip Maven compile plugin when processing "
-"resources (recommended)&#34; in the Maven properties screen or else the "
-"example might not run in Eclipse because beans.xml will be missing from the "
+"Be sure to uncheck the box \"Skip Maven compile plugin when processing "
+"resources (recommended)\" in the Maven properties screen or else the example "
+"might not run in Eclipse because beans.xml will be missing from the "
 "classpath! See the <ulink url=\"https://issues.sonatype.org/browse/"
 "MNGECLIPSE-768\">MNGECLIPSE-768</ulink> issue report for details."
 msgstr ""
@@ -363,15 +361,15 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Then, from Eclipse, choose <emphasis>File -&#62; Import... -&#62; General -"
-"&#62; Existing Projects into Workspace</emphasis>, select the root directory "
+"Then, from Eclipse, choose <emphasis>File -&gt; Import... -&gt; General -"
+"&gt; Existing Projects into Workspace</emphasis>, select the root directory "
 "of the numberguess example, and click Finish. This will create a project in "
 "your workspace called <literal>weld-wicket-numberguess</literal>."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "It&#39;s time to get the example running!"
+msgid "It's time to get the example running!"
 msgstr ""
 
 #. Tag: title
@@ -430,7 +428,7 @@
 
 #. Tag: para
 #, no-c-format
-msgid "Enough toying with deployment, let&#39;s dive into the code."
+msgid "Enough toying with deployment, let's dive into the code."
 msgstr ""
 
 #. Tag: title
@@ -462,7 +460,7 @@
 
 #. Tag: para
 #, no-c-format
-msgid "Here&#39;s where things differ from the JSF numberguess example:"
+msgid "Here's where things differ from the JSF numberguess example:"
 msgstr ""
 
 #. Tag: para
@@ -585,8 +583,8 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Let&#39;s have a look at the significant code and configuration files that "
-"make up this example."
+"Let's have a look at the significant code and configuration files that make "
+"up this example."
 msgstr ""
 
 #. Tag: para
@@ -600,8 +598,8 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"The game&#39;s main logic is located in <literal>Game.java</literal>. Here "
-"is the code for that class, highlighting the ways in which this differs from "
+"The game's main logic is located in <literal>Game.java</literal>. Here is "
+"the code for that class, highlighting the ways in which this differs from "
 "the web application version:"
 msgstr ""
 
@@ -609,14 +607,14 @@
 #, no-c-format
 msgid ""
 "The bean is application scoped rather than session scoped, since an instance "
-"of a Swing application typically represents a single &#39;session&#39;."
+"of a Swing application typically represents a single 'session'."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
 msgid ""
-"Notice that the bean is not named, since it doesn&#39;t need to be accessed "
-"via EL."
+"Notice that the bean is not named, since it doesn't need to be accessed via "
+"EL."
 msgstr ""
 
 #. Tag: para
@@ -657,9 +655,9 @@
 msgid ""
 "The <literal>reset()</literal> method makes a call to the injected "
 "<literal>rndGenerator</literal> in order to get the random number at the "
-"start of each game. Note that it can&#39;t use <literal>Instance.get()</"
-"literal> like the JSF example does because there will not be any active "
-"contexts like there are during a JSF request."
+"start of each game. Note that it can't use <literal>Instance.get()</literal> "
+"like the JSF example does because there will not be any active contexts like "
+"there are during a JSF request."
 msgstr ""
 
 #. Tag: para
@@ -667,8 +665,8 @@
 msgid ""
 "The <literal>MessageGenerator</literal> class depends on the current "
 "instance of <literal>Game</literal> and queries its state in order to "
-"determine the appropriate messages to provide as the prompt for the user&#39;"
-"s next guess and the response to the previous guess. The code for "
+"determine the appropriate messages to provide as the prompt for the user's "
+"next guess and the response to the previous guess. The code for "
 "<literal>MessageGenerator</literal> is as follows:"
 msgstr ""
 
@@ -681,7 +679,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"The <literal>Game</literal>&#39;s state is interrogated to determine the "
+"The <literal>Game</literal>'s state is interrogated to determine the "
 "appropriate challenge message ..."
 msgstr ""
 
@@ -726,8 +724,8 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"<literal>guessButtonActionPerformed</literal> is called when the &#39;"
-"Guess&#39; button is clicked, and it does the following:"
+"<literal>guessButtonActionPerformed</literal> is called when the 'Guess' "
+"button is clicked, and it does the following:"
 msgstr ""
 
 #. Tag: para
@@ -740,8 +738,8 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Calls <literal>game.check()</literal> to validate and perform one &#39;"
-"turn&#39; of the game"
+"Calls <literal>game.check()</literal> to validate and perform one 'turn' of "
+"the game"
 msgstr ""
 
 #. Tag: para
@@ -780,7 +778,7 @@
 #, no-c-format
 msgid ""
 "The translator example is built as an ear and contains EJBs. As a result, "
-"it&#39;s structure is more complex than the numberguess example."
+"it's structure is more complex than the numberguess example."
 msgstr ""
 
 #. Tag: para
@@ -794,10 +792,9 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"First, let&#39;s take a look at the ear aggregator, which is located in the "
-"example&#39;s <literal>ear</literal> directory. Maven automatically "
-"generates the <literal>application.xml</literal> for us from this plugin "
-"configuration:"
+"First, let's take a look at the ear aggregator, which is located in the "
+"example's <literal>ear</literal> directory. Maven automatically generates "
+"the <literal>application.xml</literal> for us from this plugin configuration:"
 msgstr ""
 
 #. Tag: para
@@ -811,18 +808,18 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"If you weren&#39;t using Maven to generate these files, you would need "
+"If you weren't using Maven to generate these files, you would need "
 "<literal>META-INF/application.xml</literal>:"
 msgstr ""
 
 #. Tag: para
 #, no-c-format
 msgid ""
-"Next, lets look at the war, which is located in the example&#39;s "
-"<literal>war</literal> directory. Just as in the numberguess example, we "
-"have a <literal>faces-config.xml</literal> for JSF 2.0 and a <literal>web."
-"xml</literal> (to activate JSF) under WEB-INF, both sourced from "
-"<literal>src/main/webapp/WEB-INF</literal>."
+"Next, lets look at the war, which is located in the example's <literal>war</"
+"literal> directory. Just as in the numberguess example, we have a "
+"<literal>faces-config.xml</literal> for JSF 2.0 and a <literal>web.xml</"
+"literal> (to activate JSF) under WEB-INF, both sourced from <literal>src/"
+"main/webapp/WEB-INF</literal>."
 msgstr ""
 
 #. Tag: para
@@ -843,21 +840,21 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Finally, let&#39;s look at the EJB module, which is located in the "
-"example&#39;s <literal>ejb</literal> directory. In <literal>src/main/"
-"resources/META-INF</literal> there is just an empty <literal>beans.xml</"
-"literal>, used to mark the archive as containing beans."
+"Finally, let's look at the EJB module, which is located in the example's "
+"<literal>ejb</literal> directory. In <literal>src/main/resources/META-INF</"
+"literal> there is just an empty <literal>beans.xml</literal>, used to mark "
+"the archive as containing beans."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
 msgid ""
-"We&#39;ve saved the most interesting bit to last, the code! The project has "
-"two simple beans, <literal>SentenceParser</literal> and "
-"<literal>TextTranslator</literal> and two session beans, "
-"<literal>TranslatorControllerBean</literal> and <literal>SentenceTranslator</"
-"literal>. You should be getting quite familiar with what a bean looks like "
-"by now, so we&#39;ll just highlight the most interesting bits here."
+"We've saved the most interesting bit to last, the code! The project has two "
+"simple beans, <literal>SentenceParser</literal> and <literal>TextTranslator</"
+"literal> and two session beans, <literal>TranslatorControllerBean</literal> "
+"and <literal>SentenceTranslator</literal>. You should be getting quite "
+"familiar with what a bean looks like by now, so we'll just highlight the "
+"most interesting bits here."
 msgstr ""
 
 #. Tag: para
@@ -874,9 +871,9 @@
 "<literal>TextTranslator</literal> uses the simple bean (really just a plain "
 "Java class!) <literal>SentenceParser</literal> to parse the sentence and "
 "then calls on the stateless bean with the local business interface "
-"<literal>Translator</literal> to perform the translation. That&#39;s where "
-"the magic happens. Of course, we couldn&#39;t develop a full translator, but "
-"it&#39;s convincing enough to anyone who doesn&#39;t understand Latin!"
+"<literal>Translator</literal> to perform the translation. That's where the "
+"magic happens. Of course, we couldn't develop a full translator, but it's "
+"convincing enough to anyone who doesn't understand Latin!"
 msgstr ""
 
 #. Tag: para

Modified: doc/trunk/reference/src/main/docbook/es-ES/xml.po
===================================================================
--- doc/trunk/reference/src/main/docbook/es-ES/xml.po	2010-07-24 16:36:48 UTC (rev 6808)
+++ doc/trunk/reference/src/main/docbook/es-ES/xml.po	2010-07-25 04:22:37 UTC (rev 6809)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: xml\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-05-01T13:53:43\n"
+"POT-Creation-Date: 2010-07-25T03:52:15\n"
 "PO-Revision-Date: 2009-01-20 11:40+1000\n"
 "Last-Translator: Gladys Guerrero Lozano <gguerrer at redhat.com>\n"
 "Language-Team: Spanish <fedora-trans-es at redhat.com>\n"
@@ -24,9 +24,9 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"So far, we&#39;ve seen plenty of examples of beans declared using "
-"annotations. However, there are a couple of occasions when we can&#39;t use "
-"annotations to define the bean:"
+"So far, we've seen plenty of examples of beans declared using annotations. "
+"However, there are a couple of occasions when we can't use annotations to "
+"define the bean:"
 msgstr ""
 "Hasta ahora hemos visto varios ejemplos de Web Beans declarados mediante "
 "anotaciones. No obstante, hay un par de ocasiones en que no podemos utilizar "
@@ -73,10 +73,10 @@
 #, fuzzy, no-c-format
 msgid ""
 "The advantage of this approach is that you can write an XML schema that "
-"prevents spelling errors in your XML document. It&#39;s even possible for a "
-"tool to generate the XML schema automatically from the compiled Java code. "
-"Or, an integrated development environment could perform the same validation "
-"without the need for the explicit intermediate generation step."
+"prevents spelling errors in your XML document. It's even possible for a tool "
+"to generate the XML schema automatically from the compiled Java code. Or, an "
+"integrated development environment could perform the same validation without "
+"the need for the explicit intermediate generation step."
 msgstr ""
 "La ventaja de este enfoque es que se puede escribir un esquema de XML que "
 "evita errores de ortografía en su documento de XML. Es incluso posible que "
@@ -122,7 +122,7 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"For example, the element <literal>&#60;util:Date/&#62;</literal> in the "
+"For example, the element <literal>&lt;util:Date/&gt;</literal> in the "
 "following XML fragment refers to the class <literal>java.util.Date</literal>:"
 msgstr ""
 "Por ejemplo, el elemento <literal>&lt;util:Date/&gt;</literal> en el "
@@ -210,7 +210,7 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"The <literal>&#60;Name&#62;</literal> element declares a bean of scope "
+"The <literal>&lt;Name&gt;</literal> element declares a bean of scope "
 "<literal>@Dependent</literal> and class <literal>Name</literal>, with a set "
 "of initial field values. This bean has a special, container-generated "
 "qualifier and is therefore injectable only to the specific injection point "
@@ -226,8 +226,8 @@
 #, fuzzy, no-c-format
 msgid ""
 "This simple but powerful feature allows the Weld XML format to be used to "
-"specify whole graphs of Java objects. It&#39;s not quite a full databinding "
-"solution, but it&#39;s close!"
+"specify whole graphs of Java objects. It's not quite a full databinding "
+"solution, but it's close!"
 msgstr ""
 "Esta función simple pero poderosa permite que el formato XML de Web Beans "
 "pueda utilizarse para especificar gráficos completos de objetos Java. No es "
@@ -241,10 +241,9 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"If we want our XML document format to be authored by people who aren&#39;t "
-"Java developers, or who don&#39;t have access to our code, we need to "
-"provide a schema. There&#39;s nothing specific to Weld about writing or "
-"using the schema."
+"If we want our XML document format to be authored by people who aren't Java "
+"developers, or who don't have access to our code, we need to provide a "
+"schema. There's nothing specific to Weld about writing or using the schema."
 msgstr ""
 "Si deseamos que nuestro formato de documento XML sea creado por personas que "
 "no son desarrolladores de Java, o que no tienen acceso a nuestro código, "

Modified: doc/trunk/reference/src/main/docbook/it-IT/beans.po
===================================================================
--- doc/trunk/reference/src/main/docbook/it-IT/beans.po	2010-07-24 16:36:48 UTC (rev 6808)
+++ doc/trunk/reference/src/main/docbook/it-IT/beans.po	2010-07-25 04:22:37 UTC (rev 6809)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: Weld_-_JSR-299_Reference_Implementation VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-05-01T13:53:42\n"
+"POT-Creation-Date: 2010-07-25T03:52:14\n"
 "PO-Revision-Date: 2009-11-24 16:04+0100\n"
 "Last-Translator: Nicola Benaglia <nico.benaz at gmail.com>\n"
 "Language-Team: none\n"
@@ -32,13 +32,13 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Let&#39;s back up a second. What does it really mean to be "
-"<emphasis>contextual</emphasis>? Since beans may be stateful, it matters "
-"<emphasis>which</emphasis> bean instance I have. Unlike a stateless "
-"component model (for example, stateless session beans) or a singleton "
-"component model (such as servlets, or singleton beans), different clients of "
-"a bean see the bean in different states. The client-visible state depends "
-"upon which instance of the bean the client has a reference to."
+"Let's back up a second. What does it really mean to be <emphasis>contextual</"
+"emphasis>? Since beans may be stateful, it matters <emphasis>which</"
+"emphasis> bean instance I have. Unlike a stateless component model (for "
+"example, stateless session beans) or a singleton component model (such as "
+"servlets, or singleton beans), different clients of a bean see the bean in "
+"different states. The client-visible state depends upon which instance of "
+"the bean the client has a reference to."
 msgstr ""
 
 #. Tag: para
@@ -83,10 +83,10 @@
 msgid ""
 "One great advantage of the contextual model is that it allows stateful beans "
 "to be treated like services! The client need not concern itself with "
-"managing the lifecycle of the bean it&#39;s using, <emphasis>nor does it "
-"even need to know what that lifecycle is.</emphasis> Beans interact by "
-"passing messages, and the bean implementations define the lifecycle of their "
-"own state. The beans are loosely coupled because:"
+"managing the lifecycle of the bean it's using, <emphasis>nor does it even "
+"need to know what that lifecycle is.</emphasis> Beans interact by passing "
+"messages, and the bean implementations define the lifecycle of their own "
+"state. The beans are loosely coupled because:"
 msgstr ""
 
 #. Tag: para
@@ -171,7 +171,7 @@
 
 #. Tag: para
 #, no-c-format
-msgid "Let&#39;s see what all this new terminology means."
+msgid "Let's see what all this new terminology means."
 msgstr ""
 
 #. Tag: title
@@ -183,8 +183,8 @@
 #, no-c-format
 msgid ""
 "Beans usually acquire references to other beans via dependency injection. "
-"Any injected attribute specifies a &#34;contract&#34; that must be satisfied "
-"by the bean to be injected. The contract is:"
+"Any injected attribute specifies a \"contract\" that must be satisfied by "
+"the bean to be injected. The contract is:"
 msgstr ""
 
 #. Tag: para
@@ -211,7 +211,7 @@
 #, no-c-format
 msgid ""
 "The bean types are <literal>BookShop</literal>, <literal>Business</literal> "
-"and <literal>Shop&#60;Book&#62;</literal>, as well as the implicit type "
+"and <literal>Shop&lt;Book&gt;</literal>, as well as the implicit type "
 "<literal>java.lang.Object</literal>. (Notice that a parameterized type is a "
 "legal bean type)."
 msgstr ""
@@ -230,9 +230,9 @@
 msgid ""
 "The bean types of a session bean include local interfaces and the bean class "
 "local view (if any). EJB remote interfaces are not considered bean types of "
-"a session bean. You can&#39;t inject an EJB using its remote interface "
-"unless you define a <emphasis>resource</emphasis>, which we&#39;ll meet in "
-"<xref linkend=\"resources\" />."
+"a session bean. You can't inject an EJB using its remote interface unless "
+"you define a <emphasis>resource</emphasis>, which we'll meet in <xref "
+"linkend=\"resources\" />."
 msgstr ""
 
 #. Tag: para
@@ -241,7 +241,7 @@
 "Bean types may be restricted to an explicit set by annotating the bean with "
 "the <literal>@Typed</literal> annotation and listing the classes that should "
 "be bean types. For instance, the bean types of this bean have been "
-"restricted to <literal>Shop&#60;Book&#62;</literal>, together with "
+"restricted to <literal>Shop&lt;Book&gt;</literal>, together with "
 "<literal>java.lang.Object</literal>:"
 msgstr ""
 
@@ -255,8 +255,8 @@
 "<literal>DebitPaymentProcessor</literal>. Injecting a field of type "
 "<literal>PaymentProcessor</literal> introduces an ambiguous condition. In "
 "these cases, the client must specify some additional quality of the "
-"implementation it is interested in. We model this kind of &#34;quality&#34; "
-"using a qualifier."
+"implementation it is interested in. We model this kind of \"quality\" using "
+"a qualifier."
 msgstr ""
 
 #. Tag: para
@@ -265,23 +265,23 @@
 "A qualifier is a user-defined annotation that is itself annotated "
 "<literal>@Qualifer</literal>. A qualifier annotation is an extension of the "
 "type system. It lets us disambiguate a type without having to fall back to "
-"string-based names. Here&#39;s an example of a qualifier annotation:"
+"string-based names. Here's an example of a qualifier annotation:"
 msgstr ""
 
 #. Tag: para
 #, no-c-format
 msgid ""
 "You may not be used to seeing the definition of an annotation. In fact, this "
-"might be the first time you&#39;ve encountered one. With CDI, annotation "
-"definitions will become a familiar artifact as you&#39;ll be creating them "
-"from time to time."
+"might be the first time you've encountered one. With CDI, annotation "
+"definitions will become a familiar artifact as you'll be creating them from "
+"time to time."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
 msgid ""
 "Pay attention to the names of the built-in annotations in CDI and EJB. "
-"You&#39;ll notice that they are often adjectives. We encourage you to follow "
+"You'll notice that they are often adjectives. We encourage you to follow "
 "this convention when creating your custom annotations, since they serve to "
 "describe the behaviors and roles of the class."
 msgstr ""
@@ -308,7 +308,7 @@
 "For each injection point, the container searches for a bean which satisfies "
 "the contract, one which has the bean type and all the qualifiers. If it "
 "finds exactly one matching bean, it injects an instance of that bean. If it "
-"doesn&#39;t, it reports an error to the user."
+"doesn't, it reports an error to the user."
 msgstr ""
 
 #. Tag: para
@@ -330,10 +330,10 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"That&#39;s not quite the end of the story. CDI also defines a simple "
+"That's not quite the end of the story. CDI also defines a simple "
 "<emphasis>resolution rule</emphasis> that helps the container decide what to "
 "do if there is more than one bean that satisfies a particular contract. "
-"We&#39;ll get into the details in <xref linkend=\"injection\" />."
+"We'll get into the details in <xref linkend=\"injection\" />."
 msgstr ""
 
 #. Tag: title
@@ -370,7 +370,7 @@
 msgid ""
 "Keep in mind that once a bean is bound to a context, it remains in that "
 "context until the context is destroyed. There is no way to manually remove a "
-"bean from a context. If you don&#39;t want the bean to sit in the session "
+"bean from a context. If you don't want the bean to sit in the session "
 "indefinitely, consider using another scope with a shorted lifespan, such as "
 "the request or conversation scope."
 msgstr ""
@@ -386,8 +386,7 @@
 
 #. Tag: para
 #, no-c-format
-msgid ""
-"We&#39;ll talk more about scopes in <xref linkend=\"scopescontexts\" />."
+msgid "We'll talk more about scopes in <xref linkend=\"scopescontexts\" />."
 msgstr ""
 
 #. Tag: title
@@ -446,7 +445,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"We&#39;ve already seen how qualifiers let us choose between multiple "
+"We've already seen how qualifiers let us choose between multiple "
 "implementations of an interface at development time. But sometimes we have "
 "an interface (or other bean type) whose implementation varies depending upon "
 "the deployment environment. For example, we may want to use a mock "
@@ -483,9 +482,9 @@
 msgid ""
 "You might be familiar with the use of interceptors in EJB 3.0. In Java EE 6, "
 "this functionality has been generalized to work with other managed beans. "
-"That&#39;s right, you no longer have to make your bean an EJB just to "
-"intercept its methods. Holler. So what does CDI have to offer above and "
-"beyond that? Well, quite a lot actually. Let&#39;s cover some background."
+"That's right, you no longer have to make your bean an EJB just to intercept "
+"its methods. Holler. So what does CDI have to offer above and beyond that? "
+"Well, quite a lot actually. Let's cover some background."
 msgstr ""
 
 #. Tag: para
@@ -498,10 +497,10 @@
 "descriptor. You might as well just put the interceptor code <emphasis>in</"
 "emphasis> the implementation! Second, the order in which the interceptors "
 "are applied is taken from the order in which they are declared in the "
-"annotation or the XML descriptor. Perhaps this isn&#39;t so bad if you&#39;"
-"re applying the interceptors to a single bean. But, if you are applying them "
-"repeatedly, then there&#39;s a good chance that you&#39;ll inadvertently "
-"define a different order for different beans. Now that&#39;s a problem."
+"annotation or the XML descriptor. Perhaps this isn't so bad if you're "
+"applying the interceptors to a single bean. But, if you are applying them "
+"repeatedly, then there's a good chance that you'll inadvertently define a "
+"different order for different beans. Now that's a problem."
 msgstr ""
 
 #. Tag: para
@@ -540,14 +539,14 @@
 #, no-c-format
 msgid ""
 "Notice that <literal>ShoppingCart</literal> and "
-"<literal>TransactionInterceptor</literal> don&#39;t know anything about each "
+"<literal>TransactionInterceptor</literal> don't know anything about each "
 "other."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
 msgid ""
-"Interceptors are deployment-specific. (We don&#39;t need a "
+"Interceptors are deployment-specific. (We don't need a "
 "<literal>TransactionInterceptor</literal> in our unit tests!) By default, an "
 "interceptor is disabled. We can enable an interceptor using the CDI "
 "deployment descriptor <literal>META-INF/beans.xml</literal> of the jar or "
@@ -557,8 +556,8 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"We&#39;ll discuss interceptors, and their cousins, decorators, in <xref "
-"linkend=\"interceptors\" /> and <xref linkend=\"decorators\" />."
+"We'll discuss interceptors, and their cousins, decorators, in <xref linkend="
+"\"interceptors\" /> and <xref linkend=\"decorators\" />."
 msgstr ""
 
 #. Tag: title
@@ -569,10 +568,9 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"We&#39;ve already seen two types of beans: JavaBeans and EJB session beans. "
-"Is that the whole story? Actually, it&#39;s just the beginning. Let&#39;s "
-"explore the various kinds of beans that CDI implementations must support out-"
-"of-the-box."
+"We've already seen two types of beans: JavaBeans and EJB session beans. Is "
+"that the whole story? Actually, it's just the beginning. Let's explore the "
+"various kinds of beans that CDI implementations must support out-of-the-box."
 msgstr ""
 
 #. Tag: title
@@ -586,8 +584,8 @@
 "A managed bean is a Java class. The basic lifecycle and semantics of a "
 "managed bean are defined by the Managed Beans specification. You can "
 "explicitly declare a managed bean by annotating the bean class "
-"<literal>@ManagedBean</literal>, but in CDI you don&#39;t need to. According "
-"to the specification, the CDI container treats any class that satisfies the "
+"<literal>@ManagedBean</literal>, but in CDI you don't need to. According to "
+"the specification, the CDI container treats any class that satisfies the "
 "following conditions as a managed bean:"
 msgstr ""
 
@@ -636,7 +634,7 @@
 "According to this definition, JPA entities are technically managed beans. "
 "However, entities have their own special lifecycle, state and identity model "
 "and are usually instantiated by JPA or using <literal>new</literal>. "
-"Therefore we don&#39;t recommend directly injecting an entity class. We "
+"Therefore we don't recommend directly injecting an entity class. We "
 "especially recommend against assigning a scope other than "
 "<literal>@Dependent</literal> to an entity class, since JPA is not able to "
 "persist injected CDI proxies."
@@ -715,7 +713,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"There&#39;s no reason to explicitly declare the scope of a stateless session "
+"There's no reason to explicitly declare the scope of a stateless session "
 "bean or singleton session bean. The EJB container controls the lifecycle of "
 "these beans, according to the semantics of the <literal>@Stateless</literal> "
 "or <literal>@Singleton</literal> declaration. On the other hand, a stateful "
@@ -771,8 +769,8 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"When we don&#39;t need any of these things, an ordinary managed bean will "
-"serve just fine."
+"When we don't need any of these things, an ordinary managed bean will serve "
+"just fine."
 msgstr ""
 
 #. Tag: para
@@ -796,7 +794,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Finally, it&#39;s usually obvious when method-level transaction management, "
+"Finally, it's usually obvious when method-level transaction management, "
 "method-level security, timers, remote methods or asynchronous methods are "
 "needed."
 msgstr ""
@@ -804,11 +802,11 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"The point we&#39;re trying to make is: use a session bean when you need the "
+"The point we're trying to make is: use a session bean when you need the "
 "services it provides, not just because you want to use dependency injection, "
 "lifecycle management, or interceptors. Java EE 6 provides a graduated "
-"programming model. It&#39;s usually easy to start with an ordinary managed "
-"bean, and later turn it into an EJB just by adding one of the following "
+"programming model. It's usually easy to start with an ordinary managed bean, "
+"and later turn it into an EJB just by adding one of the following "
 "annotations: <literal>@Stateless</literal>, <literal>@Stateful</literal> or "
 "<literal>@Singleton</literal>."
 msgstr ""
@@ -816,14 +814,13 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"On the other hand, don&#39;t be scared to use session beans just because "
-"you&#39;ve heard your friends say they&#39;re &#34;heavyweight&#34;. It&#39;"
-"s nothing more than superstition to think that something is &#34;"
-"heavier&#34; just because it&#39;s hosted natively within the Java EE "
-"container, instead of by a proprietary bean container or dependency "
-"injection framework that runs as an additional layer of obfuscation. And as "
-"a general principle, you should be skeptical of folks who use vaguely "
-"defined terminology like &#34;heavyweight&#34;."
+"On the other hand, don't be scared to use session beans just because you've "
+"heard your friends say they're \"heavyweight\". It's nothing more than "
+"superstition to think that something is \"heavier\" just because it's hosted "
+"natively within the Java EE container, instead of by a proprietary bean "
+"container or dependency injection framework that runs as an additional layer "
+"of obfuscation. And as a general principle, you should be skeptical of folks "
+"who use vaguely defined terminology like \"heavyweight\"."
 msgstr ""
 
 #. Tag: title
@@ -862,7 +859,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"We can&#39;t write a bean class that is itself a random number. But we can "
+"We can't write a bean class that is itself a random number. But we can "
 "certainly write a method that returns a random number. By making the method "
 "a producer method, we allow the return value of the method—in this case an "
 "<literal>Integer</literal>—to be injected. We can even specify a qualifier—"
@@ -934,7 +931,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"We&#39;ll talk much more about producer methods in <xref linkend="
+"We'll talk much more about producer methods in <xref linkend="
 "\"producermethods\" />."
 msgstr ""
 
@@ -965,8 +962,8 @@
 "A producer field is really just a shortcut that lets us avoid writing a "
 "useless getter method. However, in addition to convenience, producer fields "
 "serve a specific purpose as an adaptor for Java EE component environment "
-"injection, but to learn more about that, you&#39;ll have to wait until <xref "
-"linkend=\"resources\" />. Because we can&#39;t wait to get to work on some "
+"injection, but to learn more about that, you'll have to wait until <xref "
+"linkend=\"resources\" />. Because we can't wait to get to work on some "
 "examples."
 msgstr ""
 

Modified: doc/trunk/reference/src/main/docbook/it-IT/decorators.po
===================================================================
--- doc/trunk/reference/src/main/docbook/it-IT/decorators.po	2010-07-24 16:36:48 UTC (rev 6808)
+++ doc/trunk/reference/src/main/docbook/it-IT/decorators.po	2010-07-25 04:22:37 UTC (rev 6809)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: master.xml\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-05-01T13:53:42\n"
+"POT-Creation-Date: 2010-07-25T03:52:14\n"
 "PO-Revision-Date: 2010-07-17 18:52+0100\n"
 "Last-Translator: Nicola Benaglia <nico.benaz at gmail.com>\n"
 "Language-Team: none\n"
@@ -20,14 +20,46 @@
 
 #. Tag: para
 #, fuzzy, no-c-format
-msgid "Interceptors are a powerful way to capture and separate concerns which are <emphasis>orthogonal</emphasis> to the application (and type system). Any interceptor is able to intercept invocations of any Java type. This makes them perfect for solving technical concerns such as transaction management, security and call logging. However, by nature, interceptors are unaware of the actual semantics of the events they intercept. Thus, interceptors aren&#39;t an appropriate tool for separating business-related concerns."
-msgstr "Gli interceptor sono un potente modo per catturare e separare i concern (N.d.T. un concern è un particolare concetto o area di interesse) che sono <emphasis>ortogonali</emphasis> al sistema tipo. Qualsiasi interceptor è capace di intercettare le invocazioni di qualsiasi tipo Java. Questo li rende perfetti per risolvere concern tecnici quali gestione delle transazioni e la sicurezza. Comunque, per natura, gli interceptor non sono consapevoli dell'attuale semantica degli eventi che intercettano. Quindi gli interceptor non sono il giusto strumento per separare i concern di tipo business."
+msgid ""
+"Interceptors are a powerful way to capture and separate concerns which are "
+"<emphasis>orthogonal</emphasis> to the application (and type system). Any "
+"interceptor is able to intercept invocations of any Java type. This makes "
+"them perfect for solving technical concerns such as transaction management, "
+"security and call logging. However, by nature, interceptors are unaware of "
+"the actual semantics of the events they intercept. Thus, interceptors aren't "
+"an appropriate tool for separating business-related concerns."
+msgstr ""
+"Gli interceptor sono un potente modo per catturare e separare i concern (N.d."
+"T. un concern è un particolare concetto o area di interesse) che sono "
+"<emphasis>ortogonali</emphasis> al sistema tipo. Qualsiasi interceptor è "
+"capace di intercettare le invocazioni di qualsiasi tipo Java. Questo li "
+"rende perfetti per risolvere concern tecnici quali gestione delle "
+"transazioni e la sicurezza. Comunque, per natura, gli interceptor non sono "
+"consapevoli dell'attuale semantica degli eventi che intercettano. Quindi gli "
+"interceptor non sono il giusto strumento per separare i concern di tipo "
+"business."
 
 # ...concerns that cut across many disparate types = ?
 #. Tag: para
 #, fuzzy, no-c-format
-msgid "The reverse is true of <emphasis>decorators</emphasis>. A decorator intercepts invocations only for a certain Java interface, and is therefore aware of all the semantics attached to that interface. Since decorators directly implement operations with business semantics, it makes them the perfect tool for modeling some kinds of business concerns. It also means that a decorator doesn&#39;t have the generality of an interceptor. Decorators aren&#39;t able to solve technical concerns that cut across many disparate types. Interceptors and decorators, though similar in many ways, are complementary. Let&#39;s look at some cases where decorators fit the bill."
-msgstr "Il contrario è vero per i <emphasis>decoratori</emphasis>. Un decoratore intercetta le invocazioni solamente per una certa interfaccia Java, e quindi è consapevole della semantica legata a questa. Ciò rende i decoratori uno strumento perfetto per modellare alcuni tipi di concern di business. E significa pure che un decoratore non ha la generalità di un interceptor. I decoratori non sono capaci di risolvere i concern tecnici che agiscono per diversi tipi."
+msgid ""
+"The reverse is true of <emphasis>decorators</emphasis>. A decorator "
+"intercepts invocations only for a certain Java interface, and is therefore "
+"aware of all the semantics attached to that interface. Since decorators "
+"directly implement operations with business semantics, it makes them the "
+"perfect tool for modeling some kinds of business concerns. It also means "
+"that a decorator doesn't have the generality of an interceptor. Decorators "
+"aren't able to solve technical concerns that cut across many disparate "
+"types. Interceptors and decorators, though similar in many ways, are "
+"complementary. Let's look at some cases where decorators fit the bill."
+msgstr ""
+"Il contrario è vero per i <emphasis>decoratori</emphasis>. Un decoratore "
+"intercetta le invocazioni solamente per una certa interfaccia Java, e quindi "
+"è consapevole della semantica legata a questa. Ciò rende i decoratori uno "
+"strumento perfetto per modellare alcuni tipi di concern di business. E "
+"significa pure che un decoratore non ha la generalità di un interceptor. I "
+"decoratori non sono capaci di risolvere i concern tecnici che agiscono per "
+"diversi tipi."
 
 #. Tag: para
 #, no-c-format
@@ -36,28 +68,52 @@
 
 #. Tag: para
 #, fuzzy, no-c-format
-msgid "Several different beans in our system implement the <literal>Account</literal> interface. However, we have a common legal requirement that; for any kind of account, large transactions must be recorded by the system in a special log. This is a perfect job for a decorator."
-msgstr "Parecchi Web Beans del nostro sistema implementano l'interfaccia <literal>Account</literal>. Abbiamo come comune requisito legale, per ogni tipo di account, che le transazioni lunghe vengano registrate dal sistema in uno speciale log. Questo è un lavoro perfetto per un decoratore."
+msgid ""
+"Several different beans in our system implement the <literal>Account</"
+"literal> interface. However, we have a common legal requirement that; for "
+"any kind of account, large transactions must be recorded by the system in a "
+"special log. This is a perfect job for a decorator."
+msgstr ""
+"Parecchi Web Beans del nostro sistema implementano l'interfaccia "
+"<literal>Account</literal>. Abbiamo come comune requisito legale, per ogni "
+"tipo di account, che le transazioni lunghe vengano registrate dal sistema in "
+"uno speciale log. Questo è un lavoro perfetto per un decoratore."
 
 #. Tag: para
 #, fuzzy, no-c-format
-msgid "A decorator is a bean (possibly even an abstract class) that implements the type it decorates and is annotated <literal>@Decorator</literal>."
-msgstr "Un decorator è un semplice Web Beans che implementa il tipo che decora ed è annotato con <literal>@Decorator</literal>.\""
+msgid ""
+"A decorator is a bean (possibly even an abstract class) that implements the "
+"type it decorates and is annotated <literal>@Decorator</literal>."
+msgstr ""
+"Un decorator è un semplice Web Beans che implementa il tipo che decora ed è "
+"annotato con <literal>@Decorator</literal>.\""
 
 #. Tag: para
 #, no-c-format
-msgid "The decorator implements the methods of the decorated type that it wants to intercept."
+msgid ""
+"The decorator implements the methods of the decorated type that it wants to "
+"intercept."
 msgstr ""
 
 #. Tag: para
 #, fuzzy, no-c-format
-msgid "Unlike other beans, a decorator may be an abstract class. Therefore, if there&#39;s nothing special the decorator needs to do for a particular method of the decorated interface, you don&#39;t need to implement that method."
-msgstr "Diversamente dai semplici Web Beans, un decoratore può essere una classe astratta. Se un decoratore non ha niente da fare per un particolare metodo, allora non occorre implementare quel metodo."
+msgid ""
+"Unlike other beans, a decorator may be an abstract class. Therefore, if "
+"there's nothing special the decorator needs to do for a particular method of "
+"the decorated interface, you don't need to implement that method."
+msgstr ""
+"Diversamente dai semplici Web Beans, un decoratore può essere una classe "
+"astratta. Se un decoratore non ha niente da fare per un particolare metodo, "
+"allora non occorre implementare quel metodo."
 
 #. Tag: para
 #, fuzzy, no-c-format
-msgid "Interceptors for a method are called before decorators that apply to the method."
-msgstr "Gli interceptor per un metodo sono chiamati prima dei decoratori che vengono applicati a tali metodo."
+msgid ""
+"Interceptors for a method are called before decorators that apply to the "
+"method."
+msgstr ""
+"Gli interceptor per un metodo sono chiamati prima dei decoratori che vengono "
+"applicati a tali metodo."
 
 #. Tag: title
 #, no-c-format
@@ -66,7 +122,12 @@
 
 #. Tag: para
 #, no-c-format
-msgid "Decorators have a special injection point, called the <emphasis>delegate injection point</emphasis>, with the same type as the beans they decorate, and the annotation <literal>@Delegate</literal>. There must be exactly one delegate injection point, which can be a constructor parameter, initializer method parameter or injected field."
+msgid ""
+"Decorators have a special injection point, called the <emphasis>delegate "
+"injection point</emphasis>, with the same type as the beans they decorate, "
+"and the annotation <literal>@Delegate</literal>. There must be exactly one "
+"delegate injection point, which can be a constructor parameter, initializer "
+"method parameter or injected field."
 msgstr ""
 
 #. Tag: para
@@ -82,24 +143,42 @@
 #. Tag: para
 #, no-c-format
 msgid "has all qualifiers that are declared at the delegate injection point."
-msgstr "ha tutti i qualificatori che sono dichiarati nel punto injection delegate."
+msgstr ""
+"ha tutti i qualificatori che sono dichiarati nel punto injection delegate."
 
 #. Tag: para
 #, no-c-format
-msgid "This delegate injection point specifies that the decorator is bound to all beans that implement <literal>Account</literal>:"
-msgstr "Questo punto di injection delegate specifica che il decoratore è legato a tutti i beans che implementano <literal>Account</literal>:"
+msgid ""
+"This delegate injection point specifies that the decorator is bound to all "
+"beans that implement <literal>Account</literal>:"
+msgstr ""
+"Questo punto di injection delegate specifica che il decoratore è legato a "
+"tutti i beans che implementano <literal>Account</literal>:"
 
 # E' corretto tradurre BOUND con LEGATO in questo particolare contesto?
 # ....rivedere alcune frasi sopra.
 #. Tag: para
 #, no-c-format
-msgid "A delegate injection point may specify any number of qualifier annotations. The decorator will only be bound to beans with the same qualifiers."
-msgstr "Un punto di injection delegate può specificare un qualsiasi numero di annotazioni qualifier. Il decoratore verrà associato ai bean con gli stessi qualificatori."
+msgid ""
+"A delegate injection point may specify any number of qualifier annotations. "
+"The decorator will only be bound to beans with the same qualifiers."
+msgstr ""
+"Un punto di injection delegate può specificare un qualsiasi numero di "
+"annotazioni qualifier. Il decoratore verrà associato ai bean con gli stessi "
+"qualificatori."
 
 #. Tag: para
 #, no-c-format
-msgid "The decorator may invoke the delegate object, which has much the same effect as calling <literal>InvocationContext.proceed()</literal> from an interceptor. The main difference is that the decorator can invoke <emphasis>any</emphasis> business method on the delegate object."
-msgstr "Il decoratore può invocare l'oggetto delegate, il ché ha lo stesso effetto come chiamare <literal>InvocationContext.proceed()</literal> da un interceptor. La principale differenza è che il decoratore può invocare <emphasis>qualsiasi</emphasis> metodo di business sull'oggetto delegate."
+msgid ""
+"The decorator may invoke the delegate object, which has much the same effect "
+"as calling <literal>InvocationContext.proceed()</literal> from an "
+"interceptor. The main difference is that the decorator can invoke "
+"<emphasis>any</emphasis> business method on the delegate object."
+msgstr ""
+"Il decoratore può invocare l'oggetto delegate, il ché ha lo stesso effetto "
+"come chiamare <literal>InvocationContext.proceed()</literal> da un "
+"interceptor. La principale differenza è che il decoratore può invocare "
+"<emphasis>qualsiasi</emphasis> metodo di business sull'oggetto delegate."
 
 #. Tag: title
 #, no-c-format
@@ -108,24 +187,38 @@
 
 #. Tag: para
 #, no-c-format
-msgid "By default, all decorators are disabled. We need to <emphasis>enable</emphasis> our decorator in the <literal>beans.xml</literal> descriptor of a bean archive. This activation only applies to the beans in that archive."
+msgid ""
+"By default, all decorators are disabled. We need to <emphasis>enable</"
+"emphasis> our decorator in the <literal>beans.xml</literal> descriptor of a "
+"bean archive. This activation only applies to the beans in that archive."
 msgstr ""
 
 # Rivedere la frase?
 #. Tag: para
-#, no-c-format
-msgid "This declaration serves the same purpose for decorators that the <literal>&#60;interceptors&#62;</literal> declaration serves for interceptors:"
-msgstr "Questa dichiarazione provvede per i decoratori alle stesse finalità di quanto la dichiarazione <literal>&#60;interceptors&#62;</literal> fa per gli interceptor."
+#, fuzzy, no-c-format
+msgid ""
+"This declaration serves the same purpose for decorators that the "
+"<literal>&lt;interceptors&gt;</literal> declaration serves for interceptors:"
+msgstr ""
+"Questa dichiarazione provvede per i decoratori alle stesse finalità di "
+"quanto la dichiarazione <literal>&#60;interceptors&#62;</literal> fa per gli "
+"interceptor."
 
 #. Tag: para
 #, no-c-format
-msgid "it enables us to specify a total ordering for all decorators in our system, ensuring deterministic behavior, and"
-msgstr "Consente di specificare un ordinamento totale per tutti i decoratori del sistema, assicurando un comportamento deterministico, e"
+msgid ""
+"it enables us to specify a total ordering for all decorators in our system, "
+"ensuring deterministic behavior, and"
+msgstr ""
+"Consente di specificare un ordinamento totale per tutti i decoratori del "
+"sistema, assicurando un comportamento deterministico, e"
 
 #. Tag: para
 #, no-c-format
 msgid "it lets us enable or disable decorator classes at deployment time."
-msgstr "consente di abilitare o disabilitare le classi decorato durante la fase di deploy."
+msgstr ""
+"consente di abilitare o disabilitare le classi decorato durante la fase di "
+"deploy."
 
 #~ msgid ""
 #~ "<![CDATA[public interface Account {\n"
@@ -141,6 +234,7 @@
 #~ "   public void withdraw(BigDecimal amount);\n"
 #~ "   public void deposit(BigDecimal amount);\n"
 #~ "}]]>"
+
 #~ msgid ""
 #~ "<![CDATA[@Decorator\n"
 #~ "public abstract class LargeTransactionDecorator\n"
@@ -153,6 +247,7 @@
 #~ "      implements Account {\n"
 #~ "   ...\n"
 #~ "}]]>"
+
 #~ msgid ""
 #~ "<![CDATA[@Decorator\n"
 #~ "public abstract class LargeTransactionDecorator\n"
@@ -185,6 +280,7 @@
 #~ "      ...\n"
 #~ "   }\n"
 #~ "}]]>"
+
 #~ msgid ""
 #~ "<![CDATA[@Decorator\n"
 #~ "public abstract class LargeTransactionDecorator\n"
@@ -199,10 +295,13 @@
 #~ "   @Inject @Delegate @Any Account account;\n"
 #~ "   ...\n"
 #~ "}]]>"
+
 #~ msgid "<![CDATA[@Inject @Delegate @Any Account account;]]>"
 #~ msgstr "<![CDATA[@Inject @Delegate @Any Account account;]]>"
+
 #~ msgid "<![CDATA[@Inject @Delegate @Foreign Account account;]]>"
 #~ msgstr "<![CDATA[@Inject @Delegate @Foreign Account account;]]>"
+
 #~ msgid ""
 #~ "<![CDATA[@Decorator\n"
 #~ "public abstract class LargeTransactionDecorator\n"
@@ -247,6 +346,7 @@
 #~ "      }\n"
 #~ "   }\n"
 #~ "}]]>"
+
 #~ msgid ""
 #~ "<![CDATA[<beans\n"
 #~ "   xmlns=\"http://java.sun.com/xml/ns/javaee\"\n"
@@ -269,6 +369,7 @@
 #~ "         <class>org.mycompany.myapp.LargeTransactionDecorator</class>\n"
 #~ "   </decorators>\n"
 #~ "</beans>]]>"
+
 #~ msgid ""
 #~ "All decorators have a <emphasis>delegate attribute</emphasis>. The type "
 #~ "and binding types of the delegate attribute determine which Web Beans the "
@@ -279,10 +380,10 @@
 #~ "tipo ed i tipi di binding dell'attributo delegato determinano a quali Web "
 #~ "Beans è legato il decoratore. Il tipo di attributo delegato deve "
 #~ "implementare o estendere tutte le interfacce implementate dal decoratore."
+
 #~ msgid ""
 #~ "We need to <emphasis>enable</emphasis> our decorator in <literal>web-"
 #~ "beans.xml</literal>."
 #~ msgstr ""
 #~ "Occorre <emphasis>abilitare</emphasis> il decoratore in <literal>web-"
 #~ "beans.xml</literal>."
-

Modified: doc/trunk/reference/src/main/docbook/it-IT/ee.po
===================================================================
--- doc/trunk/reference/src/main/docbook/it-IT/ee.po	2010-07-24 16:36:48 UTC (rev 6808)
+++ doc/trunk/reference/src/main/docbook/it-IT/ee.po	2010-07-25 04:22:37 UTC (rev 6809)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: master.xml\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-05-01T13:53:42\n"
+"POT-Creation-Date: 2010-07-25T03:52:14\n"
 "PO-Revision-Date: 2009-11-23 21:16+0100\n"
 "Last-Translator: Nicola Benaglia <nico.benaz at gmail.com>\n"
 "Language-Team: none\n"
@@ -76,7 +76,7 @@
 "The CDI specification does not require the servlet context objects, "
 "<literal>HttpServletRequest</literal>, <literal>HttpSession</literal> and "
 "<literal>ServletContext</literal> to be exposed as injectable beans. If you "
-"really want to be able to inject these objects, it&#39;s easy to create a "
+"really want to be able to inject these objects, it's easy to create a "
 "portable extension to expose them as beans. However, we recommend that "
 "direct access to these objects be limited to servlets, servlet filters and "
 "servlet event listeners, where they may be obtained in the usual way as "
@@ -103,8 +103,8 @@
 "All managed beans may take advantage of Java EE component environment "
 "injection using <literal>@Resource</literal>, <literal>@EJB</literal>, "
 "<literal>@PersistenceContext</literal>, <literal>@PeristenceUnit</literal> "
-"and <literal>@WebServiceRef</literal>. We&#39;ve already seen a couple of "
-"examples of this, though we didn&#39;t pay much attention at the time:"
+"and <literal>@WebServiceRef</literal>. We've already seen a couple of "
+"examples of this, though we didn't pay much attention at the time:"
 msgstr ""
 "Tutti i Web Beans sia semplici che enterprise si avvantaggiano della "
 "dependency injection di Java EE usando <literal>@Resource</literal>, "
@@ -141,8 +141,8 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"It&#39;s easy to use a bean from a servlet in Java EE 6. Simply inject the "
-"bean using field or initializer method injection."
+"It's easy to use a bean from a servlet in Java EE 6. Simply inject the bean "
+"using field or initializer method injection."
 msgstr ""
 "E' facile utilizzare i Web Beans da un Servlet in Java EE 6. Semplicemente "
 "si inietti il Web Bean utilizzando l'injection del campo Web Bean o del "
@@ -168,9 +168,9 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"CDI injection applies to all EJBs, even when they aren&#39;t managed beans. "
-"In particular, you can use CDI injection in message-driven beans, which are "
-"by nature not contextual objects."
+"CDI injection applies to all EJBs, even when they aren't managed beans. In "
+"particular, you can use CDI injection in message-driven beans, which are by "
+"nature not contextual objects."
 msgstr ""
 
 # Web Beans interceptor bindings =?
@@ -259,15 +259,15 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"CDI doesn&#39;t define any special deployment archive. You can package beans "
-"in jars, ejb jars or wars—any deployment location in the application "
-"classpath. However, the archive must be a &#34;bean archive&#34;. That means "
-"each archive that contains beans <emphasis>must</emphasis> include a file "
-"named <literal>beans.xml</literal> in the <literal>META-INF</literal> "
-"directory of the classpath or <literal>WEB-INF</literal> directory of the "
-"web root (for war archives). The file may be empty. Beans deployed in "
-"archives that do not have a <literal>beans.xml</literal> file will not be "
-"available for use in the application."
+"CDI doesn't define any special deployment archive. You can package beans in "
+"jars, ejb jars or wars—any deployment location in the application classpath. "
+"However, the archive must be a \"bean archive\". That means each archive "
+"that contains beans <emphasis>must</emphasis> include a file named "
+"<literal>beans.xml</literal> in the <literal>META-INF</literal> directory of "
+"the classpath or <literal>WEB-INF</literal> directory of the web root (for "
+"war archives). The file may be empty. Beans deployed in archives that do not "
+"have a <literal>beans.xml</literal> file will not be available for use in "
+"the application."
 msgstr ""
 "Web Beans non definisce nessuno archivio speciale per il deploy. Si può "
 "impacchettare i Web Beans in JAR, EJB-JAR o WAR &#151; qualsiasi locazione "

Modified: doc/trunk/reference/src/main/docbook/it-IT/environments.po
===================================================================
--- doc/trunk/reference/src/main/docbook/it-IT/environments.po	2010-07-24 16:36:48 UTC (rev 6808)
+++ doc/trunk/reference/src/main/docbook/it-IT/environments.po	2010-07-25 04:22:37 UTC (rev 6809)
@@ -6,7 +6,7 @@
 "Project-Id-Version: Web_Beans:_Java_Contexts_and_Dependency_Injection "
 "VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-05-01T14:44:09\n"
+"POT-Creation-Date: 2010-07-25T03:52:14\n"
 "PO-Revision-Date: 2009-11-23 21:17+0100\n"
 "Last-Translator: Nicola Benaglia <nico.benaz at gmail.com>\n"
 "Language-Team: none\n"
@@ -37,9 +37,9 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Unfortunately, you can&#39;t use Weld with earlier versions of JBoss AS "
-"since they are missing key libraries. If you want to learn how to upgrade "
-"the built-in support on JBoss AS 6.0, then read on."
+"Unfortunately, you can't use Weld with earlier versions of JBoss AS since "
+"they are missing key libraries. If you want to learn how to upgrade the "
+"built-in support on JBoss AS 6.0, then read on."
 msgstr ""
 
 #. Tag: para
@@ -113,7 +113,7 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"There is a major limitation to using a servlet container. Weld doesn&#39;t "
+"There is a major limitation to using a servlet container. Weld doesn't "
 "support deploying session beans, injection using <literal>@EJB</literal> or "
 "<literal>@PersistenceContext</literal>, or using transactional events in "
 "servlet containers. For enterprise features such as these, you should really "
@@ -128,10 +128,10 @@
 msgid ""
 "Weld should be used as a web application library in a servlet container. You "
 "should place <literal>weld-servlet.jar</literal> in <literal>WEB-INF/lib</"
-"literal> in the web root. <literal>weld-servlet.jar</literal> is an &#34;"
-"uber-jar&#34;, meaning it bundles all the bits of Weld and CDI required for "
-"running in a servlet container, provided for your convenience. "
-"Alternatively, you could use its component jars:"
+"literal> in the web root. <literal>weld-servlet.jar</literal> is an \"uber-"
+"jar\", meaning it bundles all the bits of Weld and CDI required for running "
+"in a servlet container, provided for your convenience. Alternatively, you "
+"could use its component jars:"
 msgstr ""
 "Web Beans dovrebbe essere usata come libreria per web application in un "
 "servlet container. Si dovrebbe mettere <literal>webbeans-servlet.jar</"
@@ -203,7 +203,7 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"Tomcat has a read-only JNDI, so Weld can&#39;t automatically bind the "
+"Tomcat has a read-only JNDI, so Weld can't automatically bind the "
 "BeanManager extension SPI. To bind the BeanManager into JNDI, you should "
 "populate <literal>META-INF/context.xml</literal> in the web root with the "
 "following contents:"
@@ -245,9 +245,9 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"Like Tomcat, Jetty has a read-only JNDI, so Weld can&#39;t automatically "
-"bind the Manager. To bind the Manager to JNDI, you should populate "
-"<literal>WEB-INF/jetty-env.xml</literal> with the following contents:"
+"Like Tomcat, Jetty has a read-only JNDI, so Weld can't automatically bind "
+"the Manager. To bind the Manager to JNDI, you should populate <literal>WEB-"
+"INF/jetty-env.xml</literal> with the following contents:"
 msgstr ""
 "Come Tomcat, Jetty ha un JNDI read-only, e quindi Web Beans non può "
 "automaticamente associare il Manager. Per associare il Manager a JNDI "
@@ -257,10 +257,10 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"Notice that Jetty doesn&#39;t not have built-in support for an "
-"<literal>javax.naming.spi.ObjectFactory</literal> like Tomcat, so it&#39;s "
-"necessary to manually create the <literal>javax.naming.Reference</literal> "
-"to wrap around it."
+"Notice that Jetty doesn't not have built-in support for an <literal>javax."
+"naming.spi.ObjectFactory</literal> like Tomcat, so it's necessary to "
+"manually create the <literal>javax.naming.Reference</literal> to wrap around "
+"it."
 msgstr ""
 "Si noti che Jetty non ha un supporto predefinito per <literal>javax.naming."
 "spi.ObjectFactory</literal> come Tomcat, quindi è necessario creare "
@@ -298,13 +298,13 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"In addition to improved integration of the Enterprise Java stack, the &#34;"
-"Contexts and Dependency Injection for the Java EE platform&#34; "
-"specification also defines a state of the art typesafe, stateful dependency "
-"injection framework, which can prove useful in a wide range of application "
-"types. To help developers take advantage of this, Weld provides a simple "
-"means for being executed in the Java Standard Edition (SE) environment "
-"independently of any Java EE APIs."
+"In addition to improved integration of the Enterprise Java stack, the "
+"\"Contexts and Dependency Injection for the Java EE platform\" specification "
+"also defines a state of the art typesafe, stateful dependency injection "
+"framework, which can prove useful in a wide range of application types. To "
+"help developers take advantage of this, Weld provides a simple means for "
+"being executed in the Java Standard Edition (SE) environment independently "
+"of any Java EE APIs."
 msgstr ""
 "Oltre alla migliorata integrazione dello stack Java Enterprise, Web Beans "
 "fornisce anche uno stato dell'arte typesafe, con dependency injection "
@@ -409,7 +409,7 @@
 
 #. Tag: para
 #, fuzzy, no-c-format
-msgid "Here&#39;s an example of a simple CDI SE application:"
+msgid "Here's an example of a simple CDI SE application:"
 msgstr "Ecco un esempio di una semplice applicazione Web Beans SE:"
 
 #. Tag: title
@@ -432,9 +432,9 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Thanks to the power of CDI&#39;s typesafe event model, application "
-"developers need not write any bootstrapping code. The Weld SE module comes "
-"with a built-in main method which will bootstrap CDI for you and then fire a "
+"Thanks to the power of CDI's typesafe event model, application developers "
+"need not write any bootstrapping code. The Weld SE module comes with a built-"
+"in main method which will bootstrap CDI for you and then fire a "
 "<literal>ContainerInitialized</literal> event. The entry point for your "
 "application code would therefore be a simple bean which observes the "
 "<literal>ContainerInitialized</literal> event, as in the previous example."
@@ -459,15 +459,15 @@
 msgid ""
 "For added flexibility, CDI SE also comes with a bootstrap API which can be "
 "called from within your application in order to initialize CDI and obtain "
-"references to your application&#39;s beans and events. The API consists of "
-"two classes: <literal>Weld</literal> and <literal>WeldContainer</literal>."
+"references to your application's beans and events. The API consists of two "
+"classes: <literal>Weld</literal> and <literal>WeldContainer</literal>."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
 msgid ""
-"Here&#39;s an example application main method which uses this API to "
-"initialize a bean of type <literal>MyApplicationBean</literal>."
+"Here's an example application main method which uses this API to initialize "
+"a bean of type <literal>MyApplicationBean</literal>."
 msgstr ""
 
 #. Tag: para
@@ -500,10 +500,10 @@
 #, no-c-format
 msgid ""
 "To use the @ThreadScoped annotation you need to enable the "
-"<literal>RunnableDecorator</literal> which &#39;listens&#39; for all "
-"executions of <literal>Runnable.run()</literal> and decorates them by "
-"setting up the thread context beforehand, bound to the current thread, and "
-"destroying the context afterwards."
+"<literal>RunnableDecorator</literal> which 'listens' for all executions of "
+"<literal>Runnable.run()</literal> and decorates them by setting up the "
+"thread context beforehand, bound to the current thread, and destroying the "
+"context afterwards."
 msgstr ""
 
 #. Tag: para
@@ -524,10 +524,10 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Weld SE comes packaged as a &#39;shaded&#39; jar which includes the CDI API, "
-"Weld Core and all dependant classes bundled into a single jar. Therefore the "
-"only Weld jar you need on the classpath, in addition to your application&#39;"
-"s classes and dependant jars, is the Weld SE jar."
+"Weld SE comes packaged as a 'shaded' jar which includes the CDI API, Weld "
+"Core and all dependant classes bundled into a single jar. Therefore the only "
+"Weld jar you need on the classpath, in addition to your application's "
+"classes and dependant jars, is the Weld SE jar."
 msgstr ""
 
 #~ msgid "<![CDATA[jboss.home=/path/to/jboss-as-5.x]]>"

Modified: doc/trunk/reference/src/main/docbook/it-IT/events.po
===================================================================
--- doc/trunk/reference/src/main/docbook/it-IT/events.po	2010-07-24 16:36:48 UTC (rev 6808)
+++ doc/trunk/reference/src/main/docbook/it-IT/events.po	2010-07-25 04:22:37 UTC (rev 6809)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: master.xml\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-05-01T13:53:42\n"
+"POT-Creation-Date: 2010-07-25T03:52:14\n"
 "PO-Revision-Date: 2009-11-23 21:18+0100\n"
 "Last-Translator: Nicola Benaglia <nico.benaz at gmail.com>\n"
 "Language-Team: none\n"
@@ -47,8 +47,8 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"observers can specify a combination of &#34;selectors&#34; to narrow the set "
-"of event notifications they will receive, and"
+"observers can specify a combination of \"selectors\" to narrow the set of "
+"event notifications they will receive, and"
 msgstr ""
 "gli osservatori possono specificare una combinazione di \"selettori\" per "
 "restringere il set di notifiche di eventi da ricevere, e"
@@ -67,7 +67,7 @@
 #, no-c-format
 msgid ""
 "The CDI event notification facility uses more or less the same typesafe "
-"approach that we&#39;ve already seen with the dependency injection service."
+"approach that we've already seen with the dependency injection service."
 msgstr ""
 
 #. Tag: title
@@ -90,7 +90,7 @@
 #, no-c-format
 msgid ""
 "An event qualifier is just a normal qualifier, defined using "
-"<literal>@Qualifier</literal>. Here&#39;s an example:"
+"<literal>@Qualifier</literal>. Here's an example:"
 msgstr ""
 
 #. Tag: title
@@ -127,7 +127,7 @@
 msgid ""
 "An observer method need not specify any event qualifiers—in this case it is "
 "interested in <emphasis>all</emphasis> events of a particular type. If it "
-"does specify qualifiers, it&#39;s only interested in events which have those "
+"does specify qualifiers, it's only interested in events which have those "
 "qualifiers."
 msgstr ""
 "Un metodo osservatore non ha bisogno di specificare alcun binding di evento "
@@ -249,8 +249,8 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"The downside of annotating the injection point is that we can&#39;t specify "
-"the qualifier dynamically. CDI lets us obtain a qualifier instance by "
+"The downside of annotating the injection point is that we can't specify the "
+"qualifier dynamically. CDI lets us obtain a qualifier instance by "
 "subclassing the helper class <literal>AnnotationLiteral</literal>. That way, "
 "we can pass the qualifier to the <literal>select()</literal> method of "
 "<literal>Event</literal>."
@@ -274,8 +274,8 @@
 msgid ""
 "By default, if there is no instance of an observer in the current context, "
 "the container will instantiate the observer in order to deliver an event to "
-"it. This behavior isn&#39;t always desirable. We may want to deliver events "
-"only to instances of the observer that already exist in the current contexts."
+"it. This behavior isn't always desirable. We may want to deliver events only "
+"to instances of the observer that already exist in the current contexts."
 msgstr ""
 
 #. Tag: para

Modified: doc/trunk/reference/src/main/docbook/it-IT/example.po
===================================================================
--- doc/trunk/reference/src/main/docbook/it-IT/example.po	2010-07-24 16:36:48 UTC (rev 6808)
+++ doc/trunk/reference/src/main/docbook/it-IT/example.po	2010-07-25 04:22:37 UTC (rev 6809)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: master.xml\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-05-01T13:53:42\n"
+"POT-Creation-Date: 2010-07-25T03:52:14\n"
 "PO-Revision-Date: 2009-11-23 21:19+0100\n"
 "Last-Translator: Nicola Benaglia <nico.benaz at gmail.com>\n"
 "Language-Team: none\n"
@@ -21,11 +21,11 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"Let&#39;s illustrate these ideas with a full example. We&#39;re going to "
-"implement user login/logout for an application that uses JSF. First, we&#39;"
-"ll define a request-scoped bean to hold the username and password entered "
-"during login, with constraints defined using annotations from the Bean "
-"Validation specification:"
+"Let's illustrate these ideas with a full example. We're going to implement "
+"user login/logout for an application that uses JSF. First, we'll define a "
+"request-scoped bean to hold the username and password entered during login, "
+"with constraints defined using annotations from the Bean Validation "
+"specification:"
 msgstr ""
 "Illustriamo queste idee con un esempio completo. Implementiamo il login/"
 "logout dell'utente per un'applicazione che utilizza JSF. Innanzitutto "
@@ -46,7 +46,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"(Note that we&#39;re also going to need a <literal>persistence.xml</literal> "
+"(Note that we're also going to need a <literal>persistence.xml</literal> "
 "file to configure the JPA persistence unit containing <literal>User</"
 "literal>.)"
 msgstr ""
@@ -93,7 +93,7 @@
 #, fuzzy, no-c-format
 msgid ""
 "Hopefully, this example gave you a taste of the CDI programming model. In "
-"the next chapter, we&#39;ll explore dependency injection in greater depth."
+"the next chapter, we'll explore dependency injection in greater depth."
 msgstr ""
 "Quest'esempio è un assaggio del modello di programmazione con Web Bean. Nel "
 "prossimo capitolo esploreremo la dependency injection dei Web Bean con "

Modified: doc/trunk/reference/src/main/docbook/it-IT/extend.po
===================================================================
--- doc/trunk/reference/src/main/docbook/it-IT/extend.po	2010-07-24 16:36:48 UTC (rev 6808)
+++ doc/trunk/reference/src/main/docbook/it-IT/extend.po	2010-07-25 04:22:37 UTC (rev 6809)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: master.xml\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-05-01T13:53:42\n"
+"POT-Creation-Date: 2010-07-25T03:52:14\n"
 "PO-Revision-Date: 2008-12-20 16:41+0100\n"
 "Last-Translator: Nicola Benaglia <nico.benaz at gmail.com>\n"
 "Language-Team: none\n"
@@ -94,8 +94,8 @@
 msgid ""
 "The first step in creating a portable extension is to write a class that "
 "implements <literal>Extension</literal>. This marker interface does not "
-"define any methods, but it&#39;s needed to satisfy the requirements of Java "
-"SE&#39;s service provider architecture."
+"define any methods, but it's needed to satisfy the requirements of Java SE's "
+"service provider architecture."
 msgstr ""
 
 #. Tag: para
@@ -176,8 +176,8 @@
 #, no-c-format
 msgid ""
 "In fact, the extension can do a lot more than just observe. The extension is "
-"permitted to modify the container&#39;s metamodel and more. Here&#39;s a "
-"very simple example:"
+"permitted to modify the container's metamodel and more. Here's a very simple "
+"example:"
 msgstr ""
 
 #. Tag: para
@@ -223,7 +223,7 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"Let&#39;s study some of the interfaces exposed by the <literal>BeanManager</"
+"Let's study some of the interfaces exposed by the <literal>BeanManager</"
 "literal>."
 msgstr ""
 "Il nervo centrale per l'estensione di Web Beans è l'oggetto "
@@ -281,8 +281,7 @@
 
 #. Tag: para
 #, no-c-format
-msgid ""
-"There&#39;s an easy way to find out what beans exist in the application:"
+msgid "There's an easy way to find out what beans exist in the application:"
 msgstr ""
 
 #. Tag: para
@@ -318,9 +317,9 @@
 msgid ""
 "In this example, we make a framework class, <literal>SecurityManager</"
 "literal> available for injection. To make things a bit more interesting, "
-"we&#39;re going to delegate back to the container&#39;s "
-"<literal>InjectionTarget</literal> to perform instantiation and injection "
-"upon the <literal>SecurityManager</literal> instance."
+"we're going to delegate back to the container's <literal>InjectionTarget</"
+"literal> to perform instantiation and injection upon the "
+"<literal>SecurityManager</literal> instance."
 msgstr ""
 
 #. Tag: para
@@ -346,8 +345,8 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Let&#39;s start with an example of an extension that provides support for "
-"the use of <literal>@Named</literal> at the package level. The package-level "
+"Let's start with an example of an extension that provides support for the "
+"use of <literal>@Named</literal> at the package level. The package-level "
 "name is used to qualify the EL names of all beans defined in that package. "
 "The portable extension uses the <literal>ProcessAnnotatedType</literal> "
 "event to wrap the <literal>AnnotatedType</literal> object and override the "
@@ -357,7 +356,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Here&#39;s a second example, which adds the <literal>@Alternative</literal> "
+"Here's a second example, which adds the <literal>@Alternative</literal> "
 "annotation to any class which implements a certain <literal>Service</"
 "literal> interface."
 msgstr ""
@@ -388,12 +387,12 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Here&#39;s a CDI portable extension that reads values from properties files "
-"and configures fields of Java EE components, including servlets, EJBs, "
-"managed beans, interceptors and more. In this example, properties for a "
-"class such as <literal>org.mydomain.blog.Blogger</literal> go in a resource "
-"named <literal>org/mydomain/blog/Blogger.properties</literal>, and the name "
-"of a property must match the name of the field to be configured. So "
+"Here's a CDI portable extension that reads values from properties files and "
+"configures fields of Java EE components, including servlets, EJBs, managed "
+"beans, interceptors and more. In this example, properties for a class such "
+"as <literal>org.mydomain.blog.Blogger</literal> go in a resource named "
+"<literal>org/mydomain/blog/Blogger.properties</literal>, and the name of a "
+"property must match the name of the field to be configured. So "
 "<literal>Blogger.properties</literal> could contain:"
 msgstr ""
 
@@ -408,9 +407,9 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"There&#39;s a lot more to the portable extension SPI than what we&#39;ve "
-"discussed here. Check out the CDI spec or Javadoc for more information. For "
-"now, we&#39;ll just mention one more extension point."
+"There's a lot more to the portable extension SPI than what we've discussed "
+"here. Check out the CDI spec or Javadoc for more information. For now, we'll "
+"just mention one more extension point."
 msgstr ""
 
 #. Tag: title

Modified: doc/trunk/reference/src/main/docbook/it-IT/extensions.po
===================================================================
--- doc/trunk/reference/src/main/docbook/it-IT/extensions.po	2010-07-24 16:36:48 UTC (rev 6808)
+++ doc/trunk/reference/src/main/docbook/it-IT/extensions.po	2010-07-25 04:22:37 UTC (rev 6809)
@@ -6,7 +6,7 @@
 "Project-Id-Version: Web_Beans:_Java_Contexts_and_Dependency_Injection "
 "VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-05-01T13:53:42\n"
+"POT-Creation-Date: 2010-07-25T03:52:14\n"
 "PO-Revision-Date: 2009-11-23 21:21+0100\n"
 "Last-Translator: Nicola Benaglia <nico.benaz at gmail.com>\n"
 "Language-Team: none\n"
@@ -70,8 +70,8 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"If you are using Weld as your JSR-299 implementation, there&#39;s no need to "
-"include sl4j as it&#39;s already included (and used internally)."
+"If you are using Weld as your JSR-299 implementation, there's no need to "
+"include sl4j as it's already included (and used internally)."
 msgstr ""
 "Se si usa Web Beans come implementazione JSR-299, non c'è alcun bisogno di "
 "includere <literal>webbeans-logging.jar</literal> poiché lo è già."

Modified: doc/trunk/reference/src/main/docbook/it-IT/gettingstarted.po
===================================================================
--- doc/trunk/reference/src/main/docbook/it-IT/gettingstarted.po	2010-07-24 16:36:48 UTC (rev 6808)
+++ doc/trunk/reference/src/main/docbook/it-IT/gettingstarted.po	2010-07-25 04:22:37 UTC (rev 6809)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: master.xml\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-05-01T13:53:42\n"
+"POT-Creation-Date: 2010-07-25T03:52:14\n"
 "PO-Revision-Date: 2009-06-08 21:39+0100\n"
 "Last-Translator: Nicola Benaglia <nico.benaz at gmail.com>\n"
 "Language-Team: none\n"
@@ -48,7 +48,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"To run the examples with the provided build scripts, you&#39;ll need the "
+"To run the examples with the provided build scripts, you'll need the "
 "following:"
 msgstr ""
 
@@ -96,7 +96,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"You&#39;ll need a full install of Ant 1.7.0. Some linux distributions only "
+"You'll need a full install of Ant 1.7.0. Some linux distributions only "
 "supply a partial installation of Ant which cause the build to fail. If you "
 "encounter problems, verify that ant-nodeps.jar is on the classpath."
 msgstr ""
@@ -104,7 +104,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"In the next few sections, you&#39;ll be using the Ant command (<literal>ant</"
+"In the next few sections, you'll be using the Ant command (<literal>ant</"
 "literal>) to invoke the Ant build script in each example to compile, "
 "assemble and deploy the example to JBoss AS and, for the war example, Apache "
 "Tomcat. You can also deploy the generated artifact (war or ear) to any other "
@@ -123,7 +123,7 @@
 #, no-c-format
 msgid ""
 "The sections below cover the steps for deploying with both Ant and Maven in "
-"detail. Let&#39;s start with JBoss AS."
+"detail. Let's start with JBoss AS."
 msgstr ""
 
 #. Tag: title
@@ -134,25 +134,25 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"To deploy the examples to JBoss AS, you&#39;ll need <ulink url=\"http://"
-"jboss.org/jbossas/\">JBoss AS 6.0.0</ulink> or above. If a release of the "
-"JBoss AS 6.0 line isn&#39;t yet available, you can download a <ulink url="
-"\"http://hudson.jboss.org/hudson/view/JBoss%20AS/job/JBoss-AS-6.0.x/"
-"\">nightly snapshot</ulink>. The reason JBoss AS 6.0.0 or above is required "
-"is because it&#39;s the first release that has both CDI and Bean Validation "
-"support built-in, making it close enough to Java EE 6 to run the examples. "
-"The good news is that there are no additional modifications you have to make "
-"to the server. It&#39;s ready to go!"
+"To deploy the examples to JBoss AS, you'll need <ulink url=\"http://jboss."
+"org/jbossas/\">JBoss AS 6.0.0</ulink> or above. If a release of the JBoss AS "
+"6.0 line isn't yet available, you can download a <ulink url=\"http://hudson."
+"jboss.org/hudson/view/JBoss%20AS/job/JBoss-AS-6.0.x/\">nightly snapshot</"
+"ulink>. The reason JBoss AS 6.0.0 or above is required is because it's the "
+"first release that has both CDI and Bean Validation support built-in, making "
+"it close enough to Java EE 6 to run the examples. The good news is that "
+"there are no additional modifications you have to make to the server. It's "
+"ready to go!"
 msgstr ""
 
 #. Tag: para
 #, no-c-format
 msgid ""
 "After you have downloaded JBoss AS, extract it. (We recommended renaming the "
-"folder to include the <literal>as</literal> qualifier so it&#39;s clear that "
-"it&#39;s the application server). You can move the extracted folder anywhere "
-"you like. Wherever it lays to rest, that&#39;s what we&#39;ll call the JBoss "
-"AS installation directory, or <literal>JBOSS_HOME</literal>."
+"folder to include the <literal>as</literal> qualifier so it's clear that "
+"it's the application server). You can move the extracted folder anywhere you "
+"like. Wherever it lays to rest, that's what we'll call the JBoss AS "
+"installation directory, or <literal>JBOSS_HOME</literal>."
 msgstr ""
 
 #. Tag: para
@@ -168,7 +168,7 @@
 
 #. Tag: para
 #, fuzzy, no-c-format
-msgid "You&#39;re now ready to deploy your first example!"
+msgid "You're now ready to deploy your first example!"
 msgstr "Ora, siete pronti a fare il deploy del primo esempio!"
 
 #. Tag: para
@@ -181,8 +181,8 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"If you haven&#39;t already, start JBoss AS. You can either start JBoss AS "
-"from a Linux shell:"
+"If you haven't already, start JBoss AS. You can either start JBoss AS from a "
+"Linux shell:"
 msgstr ""
 
 #. Tag: para
@@ -275,16 +275,16 @@
 msgid ""
 "The translator uses session beans, which are packaged in an EJB module "
 "within an ear. Java EE 6 will allow session beans to be deployed in war "
-"modules, but that&#39;s a topic for a later chapter."
+"modules, but that's a topic for a later chapter."
 msgstr ""
 
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"Again, wait a few seconds for the application to deploy (if you&#39;re "
-"really bored, read the log messages), and visit <ulink url=\"http://"
-"localhost:8080/weld-translator\">http://localhost:8080/weld-translator</"
-"ulink> to begin pseudo-translating."
+"Again, wait a few seconds for the application to deploy (if you're really "
+"bored, read the log messages), and visit <ulink url=\"http://localhost:8080/"
+"weld-translator\">http://localhost:8080/weld-translator</ulink> to begin "
+"pseudo-translating."
 msgstr ""
 "Qua viene impostato il context path, in modo da avere un url gradevole "
 "(<ulink url=\"http://localhost:8080/webbeans-translator\">http://"
@@ -298,21 +298,21 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Deploying to GlassFish should be easy and familiar, right? After all, it&#39;"
-"s the Java EE 6 reference implementation and Weld is the JSR-299 reference "
-"implementation, meaning Weld gets bundled with GlassFish. So yes, it&#39;s "
-"all quite easy and familiar."
+"Deploying to GlassFish should be easy and familiar, right? After all, it's "
+"the Java EE 6 reference implementation and Weld is the JSR-299 reference "
+"implementation, meaning Weld gets bundled with GlassFish. So yes, it's all "
+"quite easy and familiar."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
 msgid ""
-"To deploy the examples to GlassFish, you&#39;ll need the final <ulink url="
+"To deploy the examples to GlassFish, you'll need the final <ulink url="
 "\"https://glassfish.dev.java.net/downloads/v3-final.html\">GlassFish V3</"
 "ulink> release. Select the release that ends in either <literal>-unix.sh</"
 "literal> or <literal>-windows.exe</literal> depending on your platform. "
-"After the download is complete, execute the installer. On Linux/Unix, "
-"you&#39;ll need to first make the script executable."
+"After the download is complete, execute the installer. On Linux/Unix, you'll "
+"need to first make the script executable."
 msgstr ""
 
 #. Tag: para
@@ -320,15 +320,15 @@
 msgid ""
 "On Windows you can just click on the executable. Follow the instructions in "
 "the installer. It will create a single domain named <literal>domain1</"
-"literal>. You&#39;ll use that domain to deploy the example. We recommend "
-"that you choose <literal>7070</literal> as the main HTTP port to avoid "
-"conflicts with a running instance of JBoss AS (or Apache Tomcat)."
+"literal>. You'll use that domain to deploy the example. We recommend that "
+"you choose <literal>7070</literal> as the main HTTP port to avoid conflicts "
+"with a running instance of JBoss AS (or Apache Tomcat)."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
 msgid ""
-"If you&#39;ve deployed either of the starter examples, <literal>weld-"
+"If you've deployed either of the starter examples, <literal>weld-"
 "numberguess</literal> or <literal>weld-translator</literal>, to JBoss AS, "
 "then you already have the deployable artifact you need. If not, switch to "
 "either of the two directories and build it."
@@ -338,11 +338,11 @@
 #, no-c-format
 msgid ""
 "The deployable archive for the <literal>weld-numberguess</literal>, named "
-"<literal>weld-numberguess.war</literal>, ends up in the example&#39;s "
+"<literal>weld-numberguess.war</literal>, ends up in the example's "
 "<literal>target</literal> directory. The archive for the <literal>weld-"
 "translator</literal> example, named <literal>weld-translator.ear</literal>, "
-"ends up in the example&#39;s <literal>ear/target</literal> directory. All "
-"you need to do now is deploy them to GlassFish."
+"ends up in the example's <literal>ear/target</literal> directory. All you "
+"need to do now is deploy them to GlassFish."
 msgstr ""
 
 #. Tag: para
@@ -361,15 +361,15 @@
 msgid ""
 "After a few seconds you can visit the Admin Console in the browser at the "
 "URL <ulink url=\"http://localhost:4848\">http://localhost:4848</ulink>. In "
-"the tree on the left-hand side of the page, click on &#34;Applications&#34;, "
-"then click on the &#34;Deploy...&#34; button under the heading &#34;"
-"Applications&#34; and select the deployable artifact for either of the two "
-"examples. The deployer should recognize that you have selected a Java EE "
-"artifact and allow you to start it. You can see the examples running at "
-"either <ulink url=\"http://localhost:7070/weld-numberguess\">http://"
-"localhost:7070/weld-numberguess</ulink> or <ulink url=\"http://"
-"localhost:7070/weld-translator\">http://localhost:7070/weld-translator</"
-"ulink>, depending on which example you deployed."
+"the tree on the left-hand side of the page, click on \"Applications\", then "
+"click on the \"Deploy...\" button under the heading \"Applications\" and "
+"select the deployable artifact for either of the two examples. The deployer "
+"should recognize that you have selected a Java EE artifact and allow you to "
+"start it. You can see the examples running at either <ulink url=\"http://"
+"localhost:7070/weld-numberguess\">http://localhost:7070/weld-numberguess</"
+"ulink> or <ulink url=\"http://localhost:7070/weld-translator\">http://"
+"localhost:7070/weld-translator</ulink>, depending on which example you "
+"deployed."
 msgstr ""
 
 #. Tag: para
@@ -406,16 +406,16 @@
 "Weld comes with a servlet listener which bootstraps the CDI environment, "
 "registers the <literal>BeanManager</literal> in JNDI and provides injection "
 "into servlets. Basically, it emulates some of the work done by the Java EE "
-"container. (But you don&#39;t get enterprise features such as session beans "
-"and container-managed transactions.)"
+"container. (But you don't get enterprise features such as session beans and "
+"container-managed transactions.)"
 msgstr ""
 
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"Let&#39;s give the Weld servlet extension a spin on Apache Tomcat. First, "
-"you&#39;ll need to download Tomcat 6.0.18 or later from <ulink url=\"http://"
-"tomcat.apache.org/download-60.cgi\">tomcat.apache.org</ulink> and extract it."
+"Let's give the Weld servlet extension a spin on Apache Tomcat. First, you'll "
+"need to download Tomcat 6.0.18 or later from <ulink url=\"http://tomcat."
+"apache.org/download-60.cgi\">tomcat.apache.org</ulink> and extract it."
 msgstr ""
 "Scaricare Tomcat 6.0.18 o successivo da <ulink url=\"http://tomcat.apache."
 "org/download-60.cgi\">tomcat.apache.org</ulink>, e scompattarlo. Per esempio"
@@ -426,8 +426,8 @@
 "You have two choices for how you can deploy the application to Tomcat. You "
 "can deploy it by pushing the artifact to the hot deploy directory using Ant "
 "or you can deploy to the server across HTTP using a Maven plugin. The Ant "
-"approach doesn&#39;t require that you have Maven installed, so we&#39;ll "
-"start there. If you want to use Maven, you can just skip ahead."
+"approach doesn't require that you have Maven installed, so we'll start "
+"there. If you want to use Maven, you can just skip ahead."
 msgstr ""
 
 #. Tag: title
@@ -441,14 +441,14 @@
 "In order for Ant to push the artifact to the Tomcat hot deploy directory, it "
 "needs to know where the Tomcat installation is located. Again, we need to "
 "set a property in the <literal>local.build.properties</literal> file in the "
-"examples directory of the Weld distribution. If you haven&#39;t yet created "
-"this file, do so now. Then assign the path of your Tomcat installation to "
-"the property key <literal>tomcat.home</literal>."
+"examples directory of the Weld distribution. If you haven't yet created this "
+"file, do so now. Then assign the path of your Tomcat installation to the "
+"property key <literal>tomcat.home</literal>."
 msgstr ""
 
 #. Tag: para
 #, fuzzy, no-c-format
-msgid "Now you&#39;re ready to deploy the numberguess example to Tomcat!"
+msgid "Now you're ready to deploy the numberguess example to Tomcat!"
 msgstr "Per eseguire il deploy dell'esempio Indovina Numero per tomcat:"
 
 #. Tag: para
@@ -463,7 +463,7 @@
 msgid ""
 "The Ant build script includes additional targets for Tomcat to deploy and "
 "undeploy the archive in either exploded or packaged format. They are the "
-"same target names used for JBoss AS, prefixed with &#34;tomcat.&#34;."
+"same target names used for JBoss AS, prefixed with \"tomcat.\"."
 msgstr ""
 
 #. Tag: para
@@ -501,7 +501,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"If you haven&#39;t already, start Tomcat. You can either start Tomcat from a "
+"If you haven't already, start Tomcat. You can either start Tomcat from a "
 "Linux shell:"
 msgstr ""
 
@@ -524,15 +524,15 @@
 #, no-c-format
 msgid ""
 "You can also deploy the application to Tomcat using Maven. This section is a "
-"bit more advanced, so skip it unless you&#39;re itching to use Maven "
-"natively. Of course, you&#39;ll first need to make sure that you have Maven "
-"installed on your path, similar to how you setup Ant."
+"bit more advanced, so skip it unless you're itching to use Maven natively. "
+"Of course, you'll first need to make sure that you have Maven installed on "
+"your path, similar to how you setup Ant."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
 msgid ""
-"The Maven plugin communicates with Tomcat over HTTP, so it doesn&#39;t care "
+"The Maven plugin communicates with Tomcat over HTTP, so it doesn't care "
 "where you have installed Tomcat. However, the plugin configuration assumes "
 "you are running Tomcat in its default configuration, with a hostname of "
 "localhost and port <literal>8080</literal>. The <literal>readme.txt</"
@@ -590,7 +590,7 @@
 #, no-c-format
 msgid ""
 "There are several other Maven goals that you can use if you are hacking on "
-"the example, which are documented in the example&#39;s <literal>readme.txt</"
+"the example, which are documented in the example's <literal>readme.txt</"
 "literal> file."
 msgstr ""
 
@@ -612,10 +612,10 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"If you&#39;ve read through the entire Tomcat section, then you&#39;re all "
-"ready to go. The Maven build parallels the embedded Tomcat deployment. If "
-"not, don&#39;t worry. We&#39;ll still go over everything that you need to "
-"know again in this section."
+"If you've read through the entire Tomcat section, then you're all ready to "
+"go. The Maven build parallels the embedded Tomcat deployment. If not, don't "
+"worry. We'll still go over everything that you need to know again in this "
+"section."
 msgstr ""
 
 #. Tag: para
@@ -624,7 +624,7 @@
 "The Maven POM (<literal>pom.xml</literal>) includes a profile named "
 "<literal>jetty</literal> that activates the Maven Jetty plugin, which you "
 "can use to start Jetty in embedded mode and deploy the application in place. "
-"You don&#39;t need anything else installed except to have the Maven command "
+"You don't need anything else installed except to have the Maven command "
 "(<literal>mvn</literal>) on your path. The rest will be downloaded from the "
 "internet when the build is run."
 msgstr ""
@@ -696,9 +696,9 @@
 #, no-c-format
 msgid ""
 "Now, you are ready to run the server in Eclipse. Import the project into "
-"your Eclipse workspace using &#34;Import Existing Project into Workspace. "
-"Then, find the start class in <literal>src/jetty/java</literal> and run its "
-"main method as a Java Application. Jetty will launch. You can view the "
+"your Eclipse workspace using \"Import Existing Project into Workspace. Then, "
+"find the start class in <literal>src/jetty/java</literal> and run its main "
+"method as a Java Application. Jetty will launch. You can view the "
 "application at the following local URL: <ulink url=\"http://localhost:8080"
 "\">http://localhost:8080</ulink>. Pay particular attention to the port in "
 "the URL and the lack of a trailing context path."

Modified: doc/trunk/reference/src/main/docbook/it-IT/injection.po
===================================================================
--- doc/trunk/reference/src/main/docbook/it-IT/injection.po	2010-07-24 16:36:48 UTC (rev 6808)
+++ doc/trunk/reference/src/main/docbook/it-IT/injection.po	2010-07-25 04:22:37 UTC (rev 6809)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: master.xml\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-05-01T14:44:09\n"
+"POT-Creation-Date: 2010-07-25T03:52:14\n"
 "PO-Revision-Date: 2009-01-24 19:22+0100\n"
 "Last-Translator: Nicola Benaglia <nico.benaz at gmail.com>\n"
 "Language-Team: none\n"
@@ -113,7 +113,7 @@
 #, fuzzy, no-c-format
 msgid ""
 "Next, the container calls all initializer methods of bean (the call order is "
-"not portable, don&#39;t rely on it)."
+"not portable, don't rely on it)."
 msgstr ""
 "Quindi, il Web Bean manager chiama tutti i metodi inizializzatori del Web "
 "Bean."
@@ -154,7 +154,7 @@
 msgid ""
 "This is a case where the <literal>@Inject</literal> annotation <emphasis>is "
 "not</emphasis> required at the injection point. The same is true for "
-"observer methods (which we&#39;ll meet in <xref linkend=\"events\" />) and "
+"observer methods (which we'll meet in <xref linkend=\"events\" />) and "
 "disposer methods."
 msgstr ""
 
@@ -171,9 +171,9 @@
 "The CDI specification defines a procedure, called <emphasis>typesafe "
 "resolution</emphasis>, that the container follows when identifying the bean "
 "to inject to an injection point. This algorithm looks complex at first, but "
-"once you understand it, it&#39;s really quite intuitive. Typesafe resolution "
-"is performed at system initialization time, which means that the container "
-"will inform the developer immediately if a bean&#39;s dependencies cannot be "
+"once you understand it, it's really quite intuitive. Typesafe resolution is "
+"performed at system initialization time, which means that the container will "
+"inform the developer immediately if a bean's dependencies cannot be "
 "satisfied."
 msgstr ""
 "Le specifiche Web Beans definiscono una procedura, chiamata "
@@ -227,17 +227,17 @@
 #, no-c-format
 msgid ""
 "Obviously, if you have exactly one bean of a given type, and an injection "
-"point with that same type, then bean A is going to go into slot A. That&#39;"
-"s the simplest possible scenario. When you first start your application, "
-"you&#39;ll likely have lots of those."
+"point with that same type, then bean A is going to go into slot A. That's "
+"the simplest possible scenario. When you first start your application, "
+"you'll likely have lots of those."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
 msgid ""
-"But then, things start to get complicated. Let&#39;s explore how the "
-"container determines which bean to inject in more advanced cases. We&#39;ll "
-"start by taking a closer look at qualifiers."
+"But then, things start to get complicated. Let's explore how the container "
+"determines which bean to inject in more advanced cases. We'll start by "
+"taking a closer look at qualifiers."
 msgstr ""
 
 #. Tag: title
@@ -312,12 +312,12 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Now, you may be thinking, <emphasis>&#34;What&#39;s the different between "
-"using a qualifier and just specifying the exact implementation class you "
-"want?&#34;</emphasis> It&#39;s important to understand that a qualifier is "
-"like an extension of the interface. It does not create a direct dependency "
-"to any particular implementation. There may be multiple alterative "
-"implementations of <literal>@Asynchronous PaymentProcessor</literal>!"
+"Now, you may be thinking, <emphasis>\"What's the different between using a "
+"qualifier and just specifying the exact implementation class you want?\"</"
+"emphasis> It's important to understand that a qualifier is like an extension "
+"of the interface. It does not create a direct dependency to any particular "
+"implementation. There may be multiple alterative implementations of "
+"<literal>@Asynchronous PaymentProcessor</literal>!"
 msgstr ""
 
 #. Tag: title
@@ -334,12 +334,11 @@
 msgid ""
 "Whenever a bean or injection point does not explicitly declare a qualifier, "
 "the container assumes the qualifier <literal>@Default</literal>. From time "
-"to time, you&#39;ll need to decare an injection point without specifying a "
-"qualifier. There&#39;s a qualifier for that too. All beans have the "
-"qualifier <literal>@Any</literal>. Therefore, by explicitly specifying "
-"<literal>@Any</literal> at an injection point, you suppress the default "
-"qualifier, without otherwise restricting the beans that are eligible for "
-"injection."
+"to time, you'll need to decare an injection point without specifying a "
+"qualifier. There's a qualifier for that too. All beans have the qualifier "
+"<literal>@Any</literal>. Therefore, by explicitly specifying <literal>@Any</"
+"literal> at an injection point, you suppress the default qualifier, without "
+"otherwise restricting the beans that are eligible for injection."
 msgstr ""
 
 #. Tag: para
@@ -428,7 +427,7 @@
 "When an ambiguous dependency exists at an injection point, the container "
 "attempts to resolve the ambiguity by looking for an enabled alternative "
 "among the beans that could be injected. If there is exactly one enabled "
-"alternative, that&#39;s the bean that will be injected."
+"alternative, that's the bean that will be injected."
 msgstr ""
 
 #. Tag: title
@@ -455,8 +454,8 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"During the course of your development, you&#39;re going to encounter this "
-"situation. Let&#39;s learn how to resolve it."
+"During the course of your development, you're going to encounter this "
+"situation. Let's learn how to resolve it."
 msgstr ""
 
 #. Tag: para
@@ -530,7 +529,7 @@
 
 #. Tag: para
 #, no-c-format
-msgid "Just remember: &#34;There can be only one.&#34;"
+msgid "Just remember: \"There can be only one.\""
 msgstr ""
 
 #. Tag: para
@@ -538,14 +537,14 @@
 msgid ""
 "On the other hand, if you really do have an optional or multivalued "
 "injection point, you should change the type of your injection point to "
-"<literal>Instance</literal>, as we&#39;ll see in <xref linkend=\"lookup\" />."
+"<literal>Instance</literal>, as we'll see in <xref linkend=\"lookup\" />."
 msgstr ""
 
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"Now there&#39;s one more issue you need to be aware of when using the "
-"dependency injection service."
+"Now there's one more issue you need to be aware of when using the dependency "
+"injection service."
 msgstr ""
 "Vi è un ulteriore questione di cui occorre essere a conoscenza quando si usa "
 "la dependency injection in Web Beans."
@@ -642,8 +641,7 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"classes which don&#39;t have a non-private constructor with no parameters, "
-"and"
+"classes which don't have a non-private constructor with no parameters, and"
 msgstr ""
 "classi che non abbiano costruttori non privati (non-private) senza "
 "parametri, e"
@@ -665,7 +663,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"It&#39;s usually very easy to fix an unproxyable dependency problem. If an "
+"It's usually very easy to fix an unproxyable dependency problem. If an "
 "injection point of type <literal>X</literal> results in an unproxyable "
 "dependency, simply:"
 msgstr ""
@@ -678,7 +676,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"change the type of the injection point to <literal>Instance&#60;X&#62;</"
+"change the type of the injection point to <literal>Instance&lt;X&gt;</"
 "literal>,"
 msgstr ""
 
@@ -719,7 +717,7 @@
 
 #. Tag: para
 #, no-c-format
-msgid "But we didn&#39;t get around to implementing this yet."
+msgid "But we didn't get around to implementing this yet."
 msgstr ""
 
 #. Tag: title
@@ -813,11 +811,10 @@
 #, no-c-format
 msgid ""
 "Next, we need to obtain an instance of our qualifier type. Since annotatons "
-"are interfaces, we can&#39;t just write <literal>new Asynchronous()</"
-"literal>. It&#39;s also quite tedious to create a concrete implementation of "
-"an annotation type from scratch. Instead, CDI lets us obtain a qualifier "
-"instance by subclassing the helper class <literal>AnnotationLiteral</"
-"literal>."
+"are interfaces, we can't just write <literal>new Asynchronous()</literal>. "
+"It's also quite tedious to create a concrete implementation of an annotation "
+"type from scratch. Instead, CDI lets us obtain a qualifier instance by "
+"subclassing the helper class <literal>AnnotationLiteral</literal>."
 msgstr ""
 
 #. Tag: para
@@ -828,8 +825,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"We can&#39;t use an anonymous class to implement a qualifier type with "
-"members."
+"We can't use an anonymous class to implement a qualifier type with members."
 msgstr ""
 
 #. Tag: para
@@ -898,8 +894,8 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"Let&#39;s look at an example. The following code is verbose, and vulnerable "
-"to refactoring problems:"
+"Let's look at an example. The following code is verbose, and vulnerable to "
+"refactoring problems:"
 msgstr ""
 "Vediamo un esempio. Il codice seguente è prolisso e vulnerabile a problemi "
 "di refactoring:"
@@ -922,8 +918,8 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"Not convinced? Then here&#39;s a second example. To inject HTTP parameters, "
-"we need to define a qualifier type:"
+"Not convinced? Then here's a second example. To inject HTTP parameters, we "
+"need to define a qualifier type:"
 msgstr ""
 "Non siete convinti? Eccovi un secondo esempio. Per iniettare parametri HTTP, "
 "è necessario definire un tipo di binding:"

Modified: doc/trunk/reference/src/main/docbook/it-IT/interceptors.po
===================================================================
--- doc/trunk/reference/src/main/docbook/it-IT/interceptors.po	2010-07-24 16:36:48 UTC (rev 6808)
+++ doc/trunk/reference/src/main/docbook/it-IT/interceptors.po	2010-07-25 04:22:37 UTC (rev 6809)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: master.xml\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-05-01T13:53:43\n"
+"POT-Creation-Date: 2010-07-25T03:52:14\n"
 "PO-Revision-Date: 2009-01-05 00:26+0100\n"
 "Last-Translator: Nicola Benaglia <nico.benaz at gmail.com>\n"
 "Language-Team: none\n"
@@ -100,7 +100,7 @@
 msgid ""
 "Suppose we want to declare that some of our beans are transactional. The "
 "first thing we need is an <emphasis>interceptor binding type</emphasis> to "
-"specify exactly which beans we&#39;re interested in:"
+"specify exactly which beans we're interested in:"
 msgstr ""
 "Si supponga di voler dichiarare transazionali alcuni Web Beans. La prima "
 "cosa necessaria è un'<emphasis>annotazione di interceptor binding</emphasis> "
@@ -129,9 +129,9 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"That&#39;s great, but somewhere along the line we&#39;re going to have to "
-"actually implement the interceptor that provides this transaction management "
-"aspect. All we need to do is create a standard interceptor, and annotate it "
+"That's great, but somewhere along the line we're going to have to actually "
+"implement the interceptor that provides this transaction management aspect. "
+"All we need to do is create a standard interceptor, and annotate it "
 "<literal>@Interceptor</literal> and <literal>@Transactional</literal>."
 msgstr ""
 "Bene, ma da qualche parte è necessario implementare l'interceptor che "

Modified: doc/trunk/reference/src/main/docbook/it-IT/intro.po
===================================================================
--- doc/trunk/reference/src/main/docbook/it-IT/intro.po	2010-07-24 16:36:48 UTC (rev 6808)
+++ doc/trunk/reference/src/main/docbook/it-IT/intro.po	2010-07-25 04:22:37 UTC (rev 6809)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: master.xml\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-05-01T13:53:43\n"
+"POT-Creation-Date: 2010-07-25T03:52:14\n"
 "PO-Revision-Date: 2008-12-25 12:11+0100\n"
 "Last-Translator: Nicola Benaglia <nico.benaz at gmail.com>\n"
 "Language-Team: none\n"
@@ -22,11 +22,11 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"So you&#39;re keen to get started writing your first bean? Or perhaps "
-"you&#39;re skeptical, wondering what kinds of hoops the CDI specification "
-"will make you jump through! The good news is that you&#39;ve probably "
-"already written and used hundreds, perhaps thousands of beans. CDI just "
-"makes it easier to actually use them to build an application!"
+"So you're keen to get started writing your first bean? Or perhaps you're "
+"skeptical, wondering what kinds of hoops the CDI specification will make you "
+"jump through! The good news is that you've probably already written and used "
+"hundreds, perhaps thousands of beans. CDI just makes it easier to actually "
+"use them to build an application!"
 msgstr ""
 "Non vedi l'ora di iniziare a scrivere il primo Web Beans? O forse sei un pò "
 "scettico e ti domandi quali virtuosismi ti farà fare la specifica Web Beans! "
@@ -49,14 +49,13 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Prior to Java EE 6, there was no clear definition of the term &#34;bean&#34; "
-"in the Java EE platform. Of course, we&#39;ve been calling Java classes used "
-"in web and enterprise applications &#34;beans&#34; for years. There were "
-"even a couple of different kinds of things called &#34;beans&#34; in EE "
-"specifications, including EJB beans and JSF managed beans. Meanwhile, other "
-"third-party frameworks such as Spring and Seam introduced their own ideas of "
-"what it meant to be a &#34;bean&#34;. What we&#39;ve been missing is a "
-"common definition."
+"Prior to Java EE 6, there was no clear definition of the term \"bean\" in "
+"the Java EE platform. Of course, we've been calling Java classes used in web "
+"and enterprise applications \"beans\" for years. There were even a couple of "
+"different kinds of things called \"beans\" in EE specifications, including "
+"EJB beans and JSF managed beans. Meanwhile, other third-party frameworks "
+"such as Spring and Seam introduced their own ideas of what it meant to be a "
+"\"bean\". What we've been missing is a common definition."
 msgstr ""
 
 #. Tag: para
@@ -68,8 +67,8 @@
 "Old Java Object). They support a small set of basic services, such as "
 "resource injection, lifecycle callbacks and interceptors. Companion "
 "specifications, such as EJB and CDI, build on this basic model. But, "
-"<emphasis>at last</emphasis>, there&#39;s a uniform concept of a bean and a "
-"lightweight component model that&#39;s aligned across the Java EE platform."
+"<emphasis>at last</emphasis>, there's a uniform concept of a bean and a "
+"lightweight component model that's aligned across the Java EE platform."
 msgstr ""
 
 #. Tag: para
@@ -78,31 +77,30 @@
 "With very few exceptions, almost every concrete Java class that has a "
 "constructor with no parameters (or a constructor designated with the "
 "annotation <literal>@Inject</literal>) is a bean. This includes every "
-"JavaBean and every EJB session bean. If you&#39;ve already got some "
-"JavaBeans or session beans lying around, they&#39;re already beans—you "
-"won&#39;t need any additional special metadata. There&#39;s just little one "
-"thing you need to do before you can start injecting them into stuff: you "
-"need to put them in an archive (a jar, or a Java EE module such as a war or "
-"EJB jar) that contains a special marker file: <literal>META-INF/beans.xml</"
-"literal>."
+"JavaBean and every EJB session bean. If you've already got some JavaBeans or "
+"session beans lying around, they're already beans—you won't need any "
+"additional special metadata. There's just little one thing you need to do "
+"before you can start injecting them into stuff: you need to put them in an "
+"archive (a jar, or a Java EE module such as a war or EJB jar) that contains "
+"a special marker file: <literal>META-INF/beans.xml</literal>."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
 msgid ""
-"The JavaBeans and EJBs you&#39;ve been writing every day, up until now, have "
-"not been able to take advantage of the new services defined by the CDI "
-"specification. But you&#39;ll be able to use every one of them with CDI—"
-"allowing the container to create and destroy instances of your beans and "
-"associate them with a designated context, injecting them into other beans, "
-"using them in EL expressions, specializing them with qualifier annotations, "
-"even adding interceptors and decorators to them—without modifying your "
-"existing code. At most, you&#39;ll need to add some annotations."
+"The JavaBeans and EJBs you've been writing every day, up until now, have not "
+"been able to take advantage of the new services defined by the CDI "
+"specification. But you'll be able to use every one of them with CDI—allowing "
+"the container to create and destroy instances of your beans and associate "
+"them with a designated context, injecting them into other beans, using them "
+"in EL expressions, specializing them with qualifier annotations, even adding "
+"interceptors and decorators to them—without modifying your existing code. At "
+"most, you'll need to add some annotations."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Now let&#39;s see how to create your first bean that actually uses CDI."
+msgid "Now let's see how to create your first bean that actually uses CDI."
 msgstr ""
 
 #. Tag: title
@@ -113,7 +111,7 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"Suppose that we have two existing Java classes that we&#39;ve been using for "
+"Suppose that we have two existing Java classes that we've been using for "
 "years in various applications. The first class parses a string into a list "
 "of sentences:"
 msgstr ""
@@ -139,8 +137,8 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"Unfortunately, we don&#39;t have a class that translates whole text "
-"documents. So let&#39;s write a bean for this job:"
+"Unfortunately, we don't have a class that translates whole text documents. "
+"So let's write a bean for this job:"
 msgstr ""
 "Sfortunatamente non ci sono classi preesistenti che traducano l'intero testo "
 "dei documenti. Quindi occorre scrivere un Web Bean che faccia questo lavoro:"
@@ -161,11 +159,11 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"As you&#39;ve guessed, the <literal>@Inject</literal> annotation has "
-"something to do with dependency injection! <literal>@Inject</literal> may be "
-"applied to a constructor or method of a bean, and tells the container to "
-"call that constructor or method when instantiating the bean. The container "
-"will inject other beans into the parameters of the constructor or method."
+"As you've guessed, the <literal>@Inject</literal> annotation has something "
+"to do with dependency injection! <literal>@Inject</literal> may be applied "
+"to a constructor or method of a bean, and tells the container to call that "
+"constructor or method when instantiating the bean. The container will inject "
+"other beans into the parameters of the constructor or method."
 msgstr ""
 "Come hai indovinato, l'annotazione <literal>@Initializer</literal> ha "
 "qualcosa che fare con la dependency injection! <literal>@Initializer</"
@@ -187,7 +185,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Let&#39;s create a UI controller bean that uses field injection to obtain an "
+"Let's create a UI controller bean that uses field injection to obtain an "
 "instance of the <literal>TextTranslator</literal>, translating the text "
 "entered by a user:"
 msgstr ""
@@ -201,10 +199,10 @@
 #, no-c-format
 msgid ""
 "Notice the controller bean is request-scoped and named. Since this "
-"combination is so common in web applications, there&#39;s a built-in "
-"annotation for it in CDI that we could have used as a shorthand. When the "
-"(stereotype) annotation <literal>@Model</literal> is declared on a class, it "
-"creates a request-scoped and named bean."
+"combination is so common in web applications, there's a built-in annotation "
+"for it in CDI that we could have used as a shorthand. When the (stereotype) "
+"annotation <literal>@Model</literal> is declared on a class, it creates a "
+"request-scoped and named bean."
 msgstr ""
 
 #. Tag: para
@@ -220,11 +218,11 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Notice that it isn&#39;t necessary to create a getter or setter method to "
-"inject one bean into another. CDI can access an injected field directly "
-"(even if it&#39;s private!), which sometimes helps eliminate some wasteful "
-"code. The name of the field is arbitrary. It&#39;s the field&#39;s type that "
-"determines what is injected."
+"Notice that it isn't necessary to create a getter or setter method to inject "
+"one bean into another. CDI can access an injected field directly (even if "
+"it's private!), which sometimes helps eliminate some wasteful code. The name "
+"of the field is arbitrary. It's the field's type that determines what is "
+"injected."
 msgstr ""
 
 #. Tag: para
@@ -251,10 +249,10 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Before we get too deep in the details, let&#39;s pause and examine a "
-"bean&#39;s anatomy. What aspects of the bean are significant, and what gives "
-"it its identity? Instead of just giving examples of beans, we&#39;re going "
-"to define what <emphasis>makes</emphasis> something a bean."
+"Before we get too deep in the details, let's pause and examine a bean's "
+"anatomy. What aspects of the bean are significant, and what gives it its "
+"identity? Instead of just giving examples of beans, we're going to define "
+"what <emphasis>makes</emphasis> something a bean."
 msgstr ""
 
 #, fuzzy

Modified: doc/trunk/reference/src/main/docbook/it-IT/master.po
===================================================================
--- doc/trunk/reference/src/main/docbook/it-IT/master.po	2010-07-24 16:36:48 UTC (rev 6808)
+++ doc/trunk/reference/src/main/docbook/it-IT/master.po	2010-07-25 04:22:37 UTC (rev 6809)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: master.xml\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-05-01T13:53:43\n"
+"POT-Creation-Date: 2010-07-25T03:52:14\n"
 "PO-Revision-Date: 2009-04-20 22:16+0100\n"
 "Last-Translator: Nicola Benaglia <nico.benaz at gmail.com>\n"
 "Language-Team: none\n"
@@ -22,20 +22,20 @@
 #, no-c-format
 msgid ""
 "Shortly before the final draft of JSR-299 was submitted, the specification "
-"changed its name from &#34;Web Beans&#34; to &#34;Java Contexts and "
-"Dependency Injection for the Java EE platform&#34;, abbreviated CDI. For a "
-"brief period after the renaming, the reference implementation adopted the "
-"name &#34;Web Beans&#34;. However, this ended up causing more confusion than "
-"it solved and Red Hat decided to change the name of the reference "
-"implementation to &#34;Weld&#34;. You may still find other documentation, "
-"blogs, forum posts, etc. that use the old nomenclature. Please update any "
-"references you can. The naming game is over."
+"changed its name from \"Web Beans\" to \"Java Contexts and Dependency "
+"Injection for the Java EE platform\", abbreviated CDI. For a brief period "
+"after the renaming, the reference implementation adopted the name \"Web Beans"
+"\". However, this ended up causing more confusion than it solved and Red Hat "
+"decided to change the name of the reference implementation to \"Weld\". You "
+"may still find other documentation, blogs, forum posts, etc. that use the "
+"old nomenclature. Please update any references you can. The naming game is "
+"over."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
 msgid ""
-"You&#39;ll also find that some of the functionality that once existed in the "
+"You'll also find that some of the functionality that once existed in the "
 "specification is now missing, such as defining beans in XML. These features "
 "will be available as portable extensions for CDI in the Weld project, and "
 "perhaps other implementations."
@@ -45,11 +45,11 @@
 #, no-c-format
 msgid ""
 "Note that this reference guide was started while changes were still being "
-"made to the specification. We&#39;ve done our best to update it for "
-"accuracy. If you discover a conflict between what is written in this guide "
-"and the specification, the specification is the authority—assume it is "
-"correct. If you believe you have found an error in the specification, please "
-"report it to the JSR-299 EG."
+"made to the specification. We've done our best to update it for accuracy. If "
+"you discover a conflict between what is written in this guide and the "
+"specification, the specification is the authority—assume it is correct. If "
+"you believe you have found an error in the specification, please report it "
+"to the JSR-299 EG."
 msgstr ""
 
 #. Tag: title

Modified: doc/trunk/reference/src/main/docbook/it-IT/next.po
===================================================================
--- doc/trunk/reference/src/main/docbook/it-IT/next.po	2010-07-24 16:36:48 UTC (rev 6808)
+++ doc/trunk/reference/src/main/docbook/it-IT/next.po	2010-07-25 04:22:37 UTC (rev 6809)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: master.xml\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-05-01T13:53:43\n"
+"POT-Creation-Date: 2010-07-25T03:52:14\n"
 "PO-Revision-Date: 2008-12-20 01:10+0100\n"
 "Last-Translator: Nicola Benaglia <nico.benaz at gmail.com>\n"
 "Language-Team: none\n"
@@ -21,13 +21,13 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Because CDI is so new, there&#39;s not yet a lot of information available "
+"Because CDI is so new, there's not yet a lot of information available "
 "online. That will change over time. Regardless, the CDI specification "
 "remains the authority for information on CDI. The spec is less than 100 "
-"pages and is quite readable (don&#39;t worry, it&#39;s not like your Blu-ray "
-"player manual). Of course, it covers many details we&#39;ve skipped over "
-"here. The spec is available on the <ulink url=\"http://jcp.org/en/jsr/detail?"
-"id=299\">JSR-299 page</ulink> at the JCP website."
+"pages and is quite readable (don't worry, it's not like your Blu-ray player "
+"manual). Of course, it covers many details we've skipped over here. The spec "
+"is available on the <ulink url=\"http://jcp.org/en/jsr/detail?id=299\">JSR-"
+"299 page</ulink> at the JCP website."
 msgstr ""
 
 #. Tag: para
@@ -37,8 +37,8 @@
 "\"http://seamframework.org/Weld\">Seam project</ulink>. The RI development "
 "team and the CDI spec lead blog at <ulink url=\"http://in.relation.to\">in."
 "relation.to</ulink>. This guide was originally based on a series of blog "
-"entries published there while the specification was being developed. It&#39;"
-"s probably the best source of information about the future of CDI, Weld and "
+"entries published there while the specification was being developed. It's "
+"probably the best source of information about the future of CDI, Weld and "
 "Seam."
 msgstr ""
 "L'implementazione della documentazione Web Beans è stata sviluppata in "
@@ -76,8 +76,8 @@
 #, no-c-format
 msgid ""
 "Edit the <literal>pom.xml</literal> file in the root of the checkout and "
-"remove the &#34;<literal>-SNAPSHOT</literal>&#34; from the version element "
-"(so you don&#39;t have to build other Weld modules)."
+"remove the \"<literal>-SNAPSHOT</literal>\" from the version element (so you "
+"don't have to build other Weld modules)."
 msgstr ""
 
 #. Tag: para

Modified: doc/trunk/reference/src/main/docbook/it-IT/part1.po
===================================================================
--- doc/trunk/reference/src/main/docbook/it-IT/part1.po	2010-07-24 16:36:48 UTC (rev 6808)
+++ doc/trunk/reference/src/main/docbook/it-IT/part1.po	2010-07-25 04:22:37 UTC (rev 6809)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: master.xml\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-05-01T13:53:43\n"
+"POT-Creation-Date: 2010-07-25T03:52:14\n"
 "PO-Revision-Date: 2008-12-24 19:21+0100\n"
 "Last-Translator: Nicola Benaglia <nico.benaz at gmail.com>\n"
 "Language-Team: none\n"
@@ -179,7 +179,7 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"Where should I keep the reference to it when I&#39;m not currently using it?"
+"Where should I keep the reference to it when I'm not currently using it?"
 msgstr ""
 "dove dovrei tenerne il riferimento quando non lo sto usando direttamente?"
 
@@ -201,9 +201,9 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"CDI is more than a framework. It&#39;s a whole, rich programming model. The "
+"CDI is more than a framework. It's a whole, rich programming model. The "
 "<emphasis>theme</emphasis> of CDI is <emphasis>loose-coupling with strong "
-"typing</emphasis>. Let&#39;s study what that phrase means."
+"typing</emphasis>. Let's study what that phrase means."
 msgstr ""
 
 # implementazione concreta mi pare pleonastico
@@ -267,8 +267,8 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"What&#39;s even more powerful (and comforting) is that CDI provides all "
-"these facilities in a <emphasis>typesafe</emphasis> way. CDI never relies on "
+"What's even more powerful (and comforting) is that CDI provides all these "
+"facilities in a <emphasis>typesafe</emphasis> way. CDI never relies on "
 "string-based identifiers to determine how collaborating objects fit "
 "together. Instead, CDI uses the typing information that is already available "
 "in the Java object model, augmented using a new programming pattern, called "
@@ -289,10 +289,10 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"But CDI isn&#39;t a restrictive programming model. It doesn&#39;t tell you "
-"how you should to structure your application into layers, how you should "
-"handle persistence, or what web framework you have to use. You&#39;ll have "
-"to decide those kinds of things for yourself."
+"But CDI isn't a restrictive programming model. It doesn't tell you how you "
+"should to structure your application into layers, how you should handle "
+"persistence, or what web framework you have to use. You'll have to decide "
+"those kinds of things for yourself."
 msgstr ""
 
 #. Tag: para
@@ -315,8 +315,8 @@
 "CDI was influenced by a number of existing Java frameworks, including Seam, "
 "Guice and Spring. However, CDI has its own, very distinct, character: more "
 "typesafe than Seam, more stateful and less XML-centric than Spring, more web "
-"and enterprise-application capable than Guice. But it couldn&#39;t have been "
-"any of these without inspiration from the frameworks mentioned and "
+"and enterprise-application capable than Guice. But it couldn't have been any "
+"of these without inspiration from the frameworks mentioned and "
 "<emphasis>lots</emphasis> of collaboration and hard work by the JSR-299 "
 "Expert Group (EG)."
 msgstr ""

Modified: doc/trunk/reference/src/main/docbook/it-IT/part3.po
===================================================================
--- doc/trunk/reference/src/main/docbook/it-IT/part3.po	2010-07-24 16:36:48 UTC (rev 6808)
+++ doc/trunk/reference/src/main/docbook/it-IT/part3.po	2010-07-25 04:22:37 UTC (rev 6809)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: master.xml\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-05-01T13:53:43\n"
+"POT-Creation-Date: 2010-07-25T03:52:14\n"
 "PO-Revision-Date: 2009-01-15 20:46+0100\n"
 "Last-Translator: Nicola Benaglia <nico.benaz at gmail.com>\n"
 "Language-Team: none\n"
@@ -16,8 +16,8 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"The first major theme of CDI is <emphasis>loose coupling</emphasis>. We&#39;"
-"ve already seen three means of achieving loose coupling:"
+"The first major theme of CDI is <emphasis>loose coupling</emphasis>. We've "
+"already seen three means of achieving loose coupling:"
 msgstr ""
 
 #. Tag: para
@@ -103,10 +103,10 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"You don&#39;t see string-based identifiers in CDI code, not because the "
+"You don't see string-based identifiers in CDI code, not because the "
 "framework is hiding them from you using clever defaulting rules—so-called "
-"&#34;configuration by convention&#34;—but because there are simply no "
-"strings there to begin with!"
+"\"configuration by convention\"—but because there are simply no strings "
+"there to begin with!"
 msgstr ""
 "Non si vedono identificatori di tipo stringa nel codice basato su Web Beans, "
 "non perché il framework li nasconde usando regole intelligenti "
@@ -220,11 +220,11 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"We&#39;re now ready to meet some more advanced features of CDI. Bear in mind "
+"We're now ready to meet some more advanced features of CDI. Bear in mind "
 "that these features exist to make our code both easier to validate and more "
-"understandable. Most of the time you don&#39;t ever really <emphasis>need</"
-"emphasis> to use these features, but if you use them wisely, you&#39;ll come "
-"to appreciate their power."
+"understandable. Most of the time you don't ever really <emphasis>need</"
+"emphasis> to use these features, but if you use them wisely, you'll come to "
+"appreciate their power."
 msgstr ""
 "Ora siamo pronti ad incontrare alcune caratteristiche più avanzate di Web "
 "Beans. Tenete a mente che tali caratteristiche esistono sia per rendere il "

Modified: doc/trunk/reference/src/main/docbook/it-IT/part4.po
===================================================================
--- doc/trunk/reference/src/main/docbook/it-IT/part4.po	2010-07-24 16:36:48 UTC (rev 6808)
+++ doc/trunk/reference/src/main/docbook/it-IT/part4.po	2010-07-25 04:22:37 UTC (rev 6809)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: master.xml\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-05-01T13:53:43\n"
+"POT-Creation-Date: 2010-07-25T03:52:14\n"
 "PO-Revision-Date: 2008-12-24 19:34+0100\n"
 "Last-Translator: Nicola Benaglia <nico.benaz at gmail.com>\n"
 "Language-Team: none\n"
@@ -16,12 +16,12 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"The third theme of CDI is <emphasis>integration</emphasis>. We&#39;ve "
-"already seen how CDI helps integrate EJB and JSF, allowing EJBs to be bound "
-"directly to JSF pages. That&#39;s just the beginning. The CDI services are "
-"integrated into the very core of the Java EE platform. Even EJB session "
-"beans can take advantage of the dependency injection, event bus, and "
-"contextual lifecycle management that CDI provides."
+"The third theme of CDI is <emphasis>integration</emphasis>. We've already "
+"seen how CDI helps integrate EJB and JSF, allowing EJBs to be bound directly "
+"to JSF pages. That's just the beginning. The CDI services are integrated "
+"into the very core of the Java EE platform. Even EJB session beans can take "
+"advantage of the dependency injection, event bus, and contextual lifecycle "
+"management that CDI provides."
 msgstr ""
 
 # modelli a componenti o architetture a componenti?
@@ -54,12 +54,12 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"We&#39;re about to see how to take full advantage of the Java EE platform in "
-"an application that uses CDI. We&#39;ll also briefly meet a set of SPIs that "
-"are provided to support portable extensions to CDI. You might not ever need "
-"to use these SPIs directly, but don&#39;t take them for granted. You will "
-"likely be using them indirectly, every time you use a third-party extension, "
-"such as Seam."
+"We're about to see how to take full advantage of the Java EE platform in an "
+"application that uses CDI. We'll also briefly meet a set of SPIs that are "
+"provided to support portable extensions to CDI. You might not ever need to "
+"use these SPIs directly, but don't take them for granted. You will likely be "
+"using them indirectly, every time you use a third-party extension, such as "
+"Seam."
 msgstr ""
 "Stiamo per scoprire come sfruttare appieno la piattaforma Java EE in "
 "applicazioni che usano  Web Beans. Scorreremo anche velocemente un insieme "

Modified: doc/trunk/reference/src/main/docbook/it-IT/producermethods.po
===================================================================
--- doc/trunk/reference/src/main/docbook/it-IT/producermethods.po	2010-07-24 16:36:48 UTC (rev 6808)
+++ doc/trunk/reference/src/main/docbook/it-IT/producermethods.po	2010-07-25 04:22:37 UTC (rev 6809)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: master.xml\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-05-01T13:53:43\n"
+"POT-Creation-Date: 2010-07-25T03:52:15\n"
 "PO-Revision-Date: 2009-03-31 11:05+0100\n"
 "Last-Translator: Nicola Benaglia <nico.benaz at gmail.com>\n"
 "Language-Team: none\n"
@@ -23,7 +23,7 @@
 msgid ""
 "Producer methods let us overcome certain limitations that arise when a "
 "container, instead of the application, is responsible for instantiating "
-"objects. They&#39;re also the easiest way to integrate objects which are not "
+"objects. They're also the easiest way to integrate objects which are not "
 "beans into the CDI environment."
 msgstr ""
 "I metodi produttori consentono di superare alcune limitazioni che sorgono "
@@ -96,9 +96,9 @@
 #, fuzzy, no-c-format
 msgid ""
 "In particular, producer methods let us use runtime polymorphism with CDI. As "
-"we&#39;ve seen, alternative beans are one solution to the problem of "
-"deployment-time polymorphism. But once the system is deployed, the CDI "
-"implementation is fixed. A producer method has no such limitation:"
+"we've seen, alternative beans are one solution to the problem of deployment-"
+"time polymorphism. But once the system is deployed, the CDI implementation "
+"is fixed. A producer method has no such limitation:"
 msgstr ""
 "In particolare i metodi produttori consentono l'uso del polimorfismo a "
 "runtime con Web Beans. Come visto, i tipi di deploy sono soluzioni potenti "
@@ -159,7 +159,7 @@
 msgid ""
 "Now, when the producer method is called, the returned "
 "<literal>PaymentStrategy</literal> will be bound to the session context. The "
-"producer method won&#39;t be called again in the same session."
+"producer method won't be called again in the same session."
 msgstr ""
 "Ora, quando il metodo produttore viene chiamato, il "
 "<literal>PaymentStrategy</literal> restituito verrà associato al contesto di "
@@ -185,11 +185,11 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"There&#39;s one potential problem with the code above. The implementations "
-"of <literal>CreditCardPaymentStrategy</literal> are instantiated using the "
-"Java <literal>new</literal> operator. Objects instantiated directly by the "
-"application can&#39;t take advantage of dependency injection and don&#39;t "
-"have interceptors."
+"There's one potential problem with the code above. The implementations of "
+"<literal>CreditCardPaymentStrategy</literal> are instantiated using the Java "
+"<literal>new</literal> operator. Objects instantiated directly by the "
+"application can't take advantage of dependency injection and don't have "
+"interceptors."
 msgstr ""
 "C'è un potenziale problema con il codice visto sopra. Le implementazioni di "
 "<literal>CreditCardPaymentStrategy</literal> vengono istanziate usando "
@@ -200,7 +200,7 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"If this isn&#39;t what we want, we can use dependency injection into the "
+"If this isn't what we want, we can use dependency injection into the "
 "producer method to obtain bean instances:"
 msgstr ""
 "Se questo non è ciò che si vuole, è possibile usare la dependency injection "
@@ -210,13 +210,13 @@
 #, fuzzy, no-c-format
 msgid ""
 "Wait, what if <literal>CreditCardPaymentStrategy</literal> is a request-"
-"scoped bean? Then the producer method has the effect of &#34;promoting&#34; "
-"the current request scoped instance into session scope. This is almost "
-"certainly a bug! The request scoped object will be destroyed by the "
-"container before the session ends, but the reference to the object will be "
-"left &#34;hanging&#34; in the session scope. This error will <emphasis>not</"
-"emphasis> be detected by the container, so please take extra care when "
-"returning bean instances from producer methods!"
+"scoped bean? Then the producer method has the effect of \"promoting\" the "
+"current request scoped instance into session scope. This is almost certainly "
+"a bug! The request scoped object will be destroyed by the container before "
+"the session ends, but the reference to the object will be left \"hanging\" "
+"in the session scope. This error will <emphasis>not</emphasis> be detected "
+"by the container, so please take extra care when returning bean instances "
+"from producer methods!"
 msgstr ""
 "Ma cosa succede se <literal>CreditCardPaymentStrategy</literal> è un Web "
 "Bean con scope di tipo richiesta? Il metodo produttore ha l'effetto di "
@@ -230,7 +230,7 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"There&#39;s at least three ways we could go about fixing this bug. We could "
+"There's at least three ways we could go about fixing this bug. We could "
 "change the scope of the <literal>CreditCardPaymentStrategy</literal> "
 "implementation, but this would affect other clients of that bean. A better "
 "option would be to change the scope of the producer method to "
@@ -267,7 +267,7 @@
 "Then a new <emphasis>dependent</emphasis> instance of "
 "<literal>CreditCardPaymentStrategy</literal> will be created, passed to the "
 "producer method, returned by the producer method and finally bound to the "
-"session context. The dependent object won&#39;t be destroyed until the "
+"session context. The dependent object won't be destroyed until the "
 "<literal>Preferences</literal> object is destroyed, at the end of the "
 "session."
 msgstr ""

Modified: doc/trunk/reference/src/main/docbook/it-IT/resources.po
===================================================================
--- doc/trunk/reference/src/main/docbook/it-IT/resources.po	2010-07-24 16:36:48 UTC (rev 6808)
+++ doc/trunk/reference/src/main/docbook/it-IT/resources.po	2010-07-25 04:22:37 UTC (rev 6809)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: Weld_-_JSR-299_Reference_Implementation VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-05-01T13:53:43\n"
+"POT-Creation-Date: 2010-07-25T03:52:15\n"
 "PO-Revision-Date: 2009-11-11 15:00+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -34,8 +34,8 @@
 "injection in CDI. Most notably, component environment injection relies on "
 "string-based names to qualify ambiguous types, and there is no real "
 "consistency as to the nature of the names (sometimes a JNDI name, sometimes "
-"a persistence unit name, sometimes an EJB link, sometimes a nonportable &#34;"
-"mapped name&#34;). Producer fields turned out to be an elegant adaptor to "
+"a persistence unit name, sometimes an EJB link, sometimes a nonportable "
+"\"mapped name\"). Producer fields turned out to be an elegant adaptor to "
 "reduce all this complexity to a common model and get component environment "
 "resources to participate in the CDI system just like any other kind of bean."
 msgstr ""
@@ -127,10 +127,10 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"It might feel strange to be declaring resources in Java code. Isn&#39;t this "
-"stuff that might be deployment-specific? Certainly, and that&#39;s why it "
-"makes sense to declare your resources in a class annotated "
-"<literal>@Alternative</literal>."
+"It might feel strange to be declaring resources in Java code. Isn't this "
+"stuff that might be deployment-specific? Certainly, and that's why it makes "
+"sense to declare your resources in a class annotated <literal>@Alternative</"
+"literal>."
 msgstr ""
 
 #. Tag: title
@@ -156,9 +156,9 @@
 "It might seem like a pain to have to write these extra producer field "
 "declarations, just to gain an additional level of indirection. You could "
 "just as well use component environment injection directly, right? But "
-"remember that you&#39;re going to be using resources like the "
-"<literal>EntityManager</literal> in several different beans. Isn&#39;t it "
-"nicer and more typesafe to write"
+"remember that you're going to be using resources like the "
+"<literal>EntityManager</literal> in several different beans. Isn't it nicer "
+"and more typesafe to write"
 msgstr ""
 
 #. Tag: para

Modified: doc/trunk/reference/src/main/docbook/it-IT/ri-spi.po
===================================================================
--- doc/trunk/reference/src/main/docbook/it-IT/ri-spi.po	2010-07-24 16:36:48 UTC (rev 6808)
+++ doc/trunk/reference/src/main/docbook/it-IT/ri-spi.po	2010-07-25 04:22:37 UTC (rev 6809)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: master.xml\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-05-01T13:53:43\n"
+"POT-Creation-Date: 2010-07-25T03:52:15\n"
 "PO-Revision-Date: 2009-06-08 21:35+0100\n"
 "Last-Translator: Nicola Benaglia <nico.benaz at gmail.com>\n"
 "Language-Team: none\n"
@@ -37,8 +37,8 @@
 "If you just want to use managed beans, and not take advantage of enterprise "
 "services (EE resource injection, CDI injection into EE component classes, "
 "transactional events, support for CDI services in EJBs) and non-flat "
-"deployments, then the generic servlet support provided by the &#34;Weld: "
-"Servlets&#34; extension will be sufficient, and will work in any container "
+"deployments, then the generic servlet support provided by the \"Weld: "
+"Servlets\" extension will be sufficient, and will work in any container "
 "supporting the Servlet API."
 msgstr ""
 
@@ -88,8 +88,8 @@
 "implementation of the <literal>Environment</literal> interface. A number of "
 "standard environments are built in, and described by the "
 "<literal>Environments</literal> enumeration. Different environments require "
-"different services to be present (for example a Servlet container doesn&#39;"
-"t require transaction, EJB or JPA services). By default an EE environment is "
+"different services to be present (for example a Servlet container doesn't "
+"require transaction, EJB or JPA services). By default an EE environment is "
 "assumed, but you can adjust the environment by calling <literal>bootstrap."
 "setEnvironment()</literal>."
 msgstr ""
@@ -179,7 +179,7 @@
 "BDAs it can access. However many containers will allow an easy mechanism to "
 "make BDAs bi-directionally accessible (such as a library directory). In this "
 "case, it is allowable (and reasonable) to describe all such archives as a "
-"single, &#39;virtual&#39; <literal>BeanDeploymentArchive</literal>."
+"single, 'virtual' <literal>BeanDeploymentArchive</literal>."
 msgstr ""
 
 #. Tag: para
@@ -194,7 +194,7 @@
 #, no-c-format
 msgid ""
 "<literal>BeanDeploymentArchive</literal> provides three methods which allow "
-"it&#39;s contents to be discovered by Weld—<literal>BeanDeploymentArchive."
+"it's contents to be discovered by Weld—<literal>BeanDeploymentArchive."
 "getBeanClasses()</literal> must return all the classes in the BDA, "
 "<literal>BeanDeploymentArchive.getBeansXml()</literal> must return all the "
 "deployment descriptors in the archive, and <literal>BeanDeploymentArchive."
@@ -223,7 +223,7 @@
 "In practice, you can regard the deployment structure represented by "
 "<literal>Deployment</literal>, and the virtual BDA graph as a mirror of the "
 "classloader structure for a deployment. If a class can from BDA X can be "
-"loaded by another in BDA Y, it is accessible, and therefore BDA Y&#39;s "
+"loaded by another in BDA Y, it is accessible, and therefore BDA Y's "
 "accessible BDAs should include BDA X."
 msgstr ""
 
@@ -259,7 +259,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Weld delegates EJB 3 bean discovery to the container so that it doesn&#39;t "
+"Weld delegates EJB 3 bean discovery to the container so that it doesn't "
 "duplicate the work done by the EJB container, and respects any vendor-"
 "extensions to the EJB definition."
 msgstr ""
@@ -331,7 +331,7 @@
 msgid ""
 "If you use a non-EE environment then you may implement any of the EE service "
 "SPIs, and Weld will provide the associated functionality. There is no need "
-"to implement those services you don&#39;t need!"
+"to implement those services you don't need!"
 msgstr ""
 
 #. Tag: title
@@ -602,9 +602,9 @@
 #, fuzzy, no-c-format
 msgid ""
 "Weld expects the Application Server or other container to provide the "
-"storage for each application&#39;s context. The <literal>org.jboss.weld."
-"context.api.BeanStore</literal> should be implemented to provide an "
-"application scoped storage."
+"storage for each application's context. The <literal>org.jboss.weld.context."
+"api.BeanStore</literal> should be implemented to provide an application "
+"scoped storage."
 msgstr ""
 "Web Beans si aspetta che l'Application Server od un altro container fornisca "
 "la memorizzazione per ogni contesto applicazione. <literal>org.jboss."

Modified: doc/trunk/reference/src/main/docbook/it-IT/scopescontexts.po
===================================================================
--- doc/trunk/reference/src/main/docbook/it-IT/scopescontexts.po	2010-07-24 16:36:48 UTC (rev 6808)
+++ doc/trunk/reference/src/main/docbook/it-IT/scopescontexts.po	2010-07-25 04:22:37 UTC (rev 6809)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: master.xml\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-05-01T13:53:43\n"
+"POT-Creation-Date: 2010-07-25T03:52:15\n"
 "PO-Revision-Date: 2008-12-26 13:03+0100\n"
 "Last-Translator: Nicola Benaglia <nico.benaz at gmail.com>\n"
 "Language-Team: none\n"
@@ -21,7 +21,7 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"So far, we&#39;ve seen a few examples of <emphasis>scope type annotations</"
+"So far, we've seen a few examples of <emphasis>scope type annotations</"
 "emphasis>. The scope of a bean determines the lifecycle of instances of the "
 "bean. The scope also determines which clients refer to which instances of "
 "the bean. According to the CDI specification, a scope determines:"
@@ -70,13 +70,13 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"JPA entities aren&#39;t a great fit for this model. Entities have their "
-"whole own lifecycle and identity model which just doesn&#39;t map naturally "
-"to the model used in CDI. Therefore, we recommend against treating entities "
-"as CDI beans. You&#39;re certainly going to run into problems if you try to "
-"give an entity a scope other than the default scope <literal>@Dependent</"
-"literal>. The client proxy will get in the way if you try to pass an "
-"injected instance to the JPA <literal>EntityManager</literal>."
+"JPA entities aren't a great fit for this model. Entities have their whole "
+"own lifecycle and identity model which just doesn't map naturally to the "
+"model used in CDI. Therefore, we recommend against treating entities as CDI "
+"beans. You're certainly going to run into problems if you try to give an "
+"entity a scope other than the default scope <literal>@Dependent</literal>. "
+"The client proxy will get in the way if you try to pass an injected instance "
+"to the JPA <literal>EntityManager</literal>."
 msgstr ""
 
 #. Tag: title
@@ -87,8 +87,8 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"CDI features an <emphasis>extensible context model</emphasis>. It&#39;s "
-"possible to define new scopes by creating a new scope type annotation:"
+"CDI features an <emphasis>extensible context model</emphasis>. It's possible "
+"to define new scopes by creating a new scope type annotation:"
 msgstr ""
 "Web Bean fornisce un <emphasis>modello di contesto estensibile</emphasis>. "
 "E' possibile definire nuovi scope creando una nuova annotazione di un tipo "
@@ -97,7 +97,7 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"Of course, that&#39;s the easy part of the job. For this scope type to be "
+"Of course, that's the easy part of the job. For this scope type to be "
 "useful, we will also need to define a <literal>Context</literal> object that "
 "implements the scope! Implementing a <literal>Context</literal> is usually a "
 "very technical task, intended for framework development only. You can expect "
@@ -120,7 +120,7 @@
 
 #. Tag: para
 #, fuzzy, no-c-format
-msgid "Usually, you&#39;ll use one of CDI&#39;s built-in scopes."
+msgid "Usually, you'll use one of CDI's built-in scopes."
 msgstr "Solitamente si userà uno degli scopi predefiniti di Web Beans."
 
 #. Tag: title
@@ -237,7 +237,7 @@
 #, fuzzy, no-c-format
 msgid ""
 "Three of the four built-in scopes should be extremely familiar to every Java "
-"EE developer, so let&#39;s not waste time discussing them here. One of the "
+"EE developer, so let's not waste time discussing them here. One of the "
 "scopes, however, is new."
 msgstr ""
 "Tre dei quattro scope predefiniti dovrebbero essere estremamente familiari "
@@ -392,7 +392,7 @@
 
 #. Tag: para
 #, no-c-format
-msgid "It&#39;s probably better to use one of the link components in JSF 2:"
+msgid "It's probably better to use one of the link components in JSF 2:"
 msgstr ""
 
 #. Tag: para
@@ -400,8 +400,8 @@
 msgid ""
 "The conversation context propagates across redirects, making it very easy to "
 "implement the common POST-then-redirect pattern, without resort to fragile "
-"constructs such as a &#34;flash&#34; object. The container automatically "
-"adds the conversation id to the redirect URL as a request parameter."
+"constructs such as a \"flash\" object. The container automatically adds the "
+"conversation id to the redirect URL as a request parameter."
 msgstr ""
 "Il manager Web Bean deve propagare le conversazioni attraverso i redirect, "
 "anche se la conversazione non è marcata long-running. Questo rende facile "
@@ -470,12 +470,12 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"You can guess what &#34;singleton&#34; means here. It means a bean that is "
-"instantiated once. Unfortunately, there&#39;s a little problem with this "
-"pseudo-scope. Beans with scope <literal>@Singleton</literal> don&#39;t have "
-"a proxy object. Clients hold a direct reference to the singleton instance. "
-"So we need to consider the case of a client that can be serialized, for "
-"example, any bean with scope <literal>@SessionScoped</literal> or "
+"You can guess what \"singleton\" means here. It means a bean that is "
+"instantiated once. Unfortunately, there's a little problem with this pseudo-"
+"scope. Beans with scope <literal>@Singleton</literal> don't have a proxy "
+"object. Clients hold a direct reference to the singleton instance. So we "
+"need to consider the case of a client that can be serialized, for example, "
+"any bean with scope <literal>@SessionScoped</literal> or "
 "<literal>@ConversationScoped</literal>, any dependent object of a bean with "
 "scope <literal>@SessionScoped</literal> or <literal>@ConversationScoped</"
 "literal>, or any stateful session bean."
@@ -485,7 +485,7 @@
 #, no-c-format
 msgid ""
 "Now, if the singleton instance is a simple, immutable, serializable object "
-"like a string, a number or a date, we probably don&#39;t mind too much if it "
+"like a string, a number or a date, we probably don't mind too much if it "
 "gets duplicated via serialization. However, that makes it no stop being a "
 "true singleton, and we may as well have just declared it with the default "
 "scope."
@@ -516,7 +516,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"give the client a reference of type <literal>Instance&#60;X&#62;</literal> "
+"give the client a reference of type <literal>Instance&lt;X&gt;</literal> "
 "where <literal>X</literal> is the bean type of the singleton bean."
 msgstr ""
 
@@ -576,8 +576,8 @@
 "If you need to access a bean directly by EL name in a JSF page, you probably "
 "need to give it a scope other than <literal>@Dependent</literal>. Otherwise, "
 "any value that gets set to the bean by a JSF input will be lost immediately. "
-"That&#39;s why CDI features the <literal>@Model</literal> stereotype; it "
-"lets you give a bean a name, and set its scope to <literal>@RequestScoped</"
+"That's why CDI features the <literal>@Model</literal> stereotype; it lets "
+"you give a bean a name, and set its scope to <literal>@RequestScoped</"
 "literal> in one stroke. If you need to access a bean that really "
 "<emphasis>has</emphasis> to have the scope <literal>@Dependent</literal> "
 "from a JSF page, inject it into a different bean, and expose it to EL via a "
@@ -587,8 +587,8 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Beans with scope <literal>@Dependent</literal> don&#39;t need a proxy "
-"object. The client holds a direct reference to its instance."
+"Beans with scope <literal>@Dependent</literal> don't need a proxy object. "
+"The client holds a direct reference to its instance."
 msgstr ""
 
 #. Tag: para
@@ -655,8 +655,8 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"This feature is particularly useful with producer methods, as we&#39;ll see "
-"in the next chapter."
+"This feature is particularly useful with producer methods, as we'll see in "
+"the next chapter."
 msgstr ""
 "Questa caratteristica è particolarmente utile con i metodi produttori, come "
 "si vedrà nel prossimo capitolo."

Modified: doc/trunk/reference/src/main/docbook/it-IT/specialization.po
===================================================================
--- doc/trunk/reference/src/main/docbook/it-IT/specialization.po	2010-07-24 16:36:48 UTC (rev 6808)
+++ doc/trunk/reference/src/main/docbook/it-IT/specialization.po	2010-07-25 04:22:37 UTC (rev 6809)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: master.xml\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-05-01T13:53:43\n"
+"POT-Creation-Date: 2010-07-25T03:52:15\n"
 "PO-Revision-Date: 2009-01-05 00:30+0100\n"
 "Last-Translator: Nicola Benaglia <nico.benaz at gmail.com>\n"
 "Language-Team: none\n"
@@ -21,15 +21,15 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"When you first start developing with CDI, you&#39;ll likely be dealing only "
-"with a single bean implementation for each bean type. In this case, it&#39;s "
-"easy to understand how beans get selected for injection. As the complexity "
-"of your application grows, multiple occurrences of the same bean type start "
+"When you first start developing with CDI, you'll likely be dealing only with "
+"a single bean implementation for each bean type. In this case, it's easy to "
+"understand how beans get selected for injection. As the complexity of your "
+"application grows, multiple occurrences of the same bean type start "
 "appearing, either because you have multiple implementations or two beans "
-"share a common (Java) inheritance. That&#39;s when you have to begin "
-"studying the specialization, inheritance and alternative rules to work "
-"through unsatisfied or ambiguous dependencies or to avoid certain beans from "
-"being called."
+"share a common (Java) inheritance. That's when you have to begin studying "
+"the specialization, inheritance and alternative rules to work through "
+"unsatisfied or ambiguous dependencies or to avoid certain beans from being "
+"called."
 msgstr ""
 
 #. Tag: para
@@ -58,10 +58,10 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"The second case is the default assumed by CDI. It&#39;s possible to have two "
+"The second case is the default assumed by CDI. It's possible to have two "
 "beans in the system with the same part bean type (interface or parent "
-"class). As you&#39;ve learned, you select between the two implementations "
-"using qualifiers."
+"class). As you've learned, you select between the two implementations using "
+"qualifiers."
 msgstr ""
 
 #. Tag: para
@@ -71,7 +71,7 @@
 "deployment, only one bean can fulfill a given role at a time. That means one "
 "bean needs to be enabled and the other disabled. There are a two modifiers "
 "involved: <literal>@Alternative</literal> and <literal>@Specializes</"
-"literal>. We&#39;ll start by looking at alternatives and then show the "
+"literal>. We'll start by looking at alternatives and then show the "
 "guarantees that specialization adds."
 msgstr ""
 
@@ -97,8 +97,8 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"But in our staging environment, we don&#39;t really want to submit payments "
-"to the external system, so we override that implementation of "
+"But in our staging environment, we don't really want to submit payments to "
+"the external system, so we override that implementation of "
 "<literal>PaymentProcessor</literal> with a different bean:"
 msgstr ""
 "Ma in quest'ambiente di prova si procede con l'override dell'implementazione "
@@ -112,19 +112,18 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"We&#39;ve already seen how we can enable this alternative by listing its "
-"class in the <literal>beans.xml</literal> descriptor."
+"We've already seen how we can enable this alternative by listing its class "
+"in the <literal>beans.xml</literal> descriptor."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
 msgid ""
 "But suppose we have many alternatives in the staging environment. It would "
-"be much more convenient to be able to enable them all at once. So let&#39;s "
-"make <literal>@Staging</literal> an <literal>@Alternative</literal> "
-"stereotype and annotate the staging beans with this stereotype instead. "
-"You&#39;ll see how this level of indirection pays off. First, we create the "
-"stereotype:"
+"be much more convenient to be able to enable them all at once. So let's make "
+"<literal>@Staging</literal> an <literal>@Alternative</literal> stereotype "
+"and annotate the staging beans with this stereotype instead. You'll see how "
+"this level of indirection pays off. First, we create the stereotype:"
 msgstr ""
 
 #. Tag: para
@@ -165,7 +164,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"So we haven&#39;t completely replaced the default implementation in this "
+"So we haven't completely replaced the default implementation in this "
 "deployment of the system. The only way one bean can completely override a "
 "second bean at all injection points is if it implements all the bean types "
 "and declares all the qualifiers of the second bean. However, if the second "
@@ -238,8 +237,8 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Since we&#39;re informing the container that our alternative bean is meant "
-"to stand in as a replacement for the default implementation, the alternative "
+"Since we're informing the container that our alternative bean is meant to "
+"stand in as a replacement for the default implementation, the alternative "
 "implementation automatically inherits all qualifiers of the default "
 "implementation. Thus, in our example, "
 "<literal>MockCreditCardPaymentProcessor</literal> inherits the qualifiers "

Modified: doc/trunk/reference/src/main/docbook/it-IT/stereotypes.po
===================================================================
--- doc/trunk/reference/src/main/docbook/it-IT/stereotypes.po	2010-07-24 16:36:48 UTC (rev 6808)
+++ doc/trunk/reference/src/main/docbook/it-IT/stereotypes.po	2010-07-25 04:22:37 UTC (rev 6809)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: master.xml\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-05-01T13:53:43\n"
+"POT-Creation-Date: 2010-07-25T03:52:15\n"
 "PO-Revision-Date: 2008-12-25 22:17+0100\n"
 "Last-Translator: Nicola Benaglia <nico.benaz at gmail.com>\n"
 "Language-Team: none\n"
@@ -94,7 +94,7 @@
 #, no-c-format
 msgid ""
 "Of course, we need to apply some other annotations to our stereotype or else "
-"it wouldn&#39;t be adding much value."
+"it wouldn't be adding much value."
 msgstr ""
 
 #. Tag: title
@@ -121,7 +121,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Naturally, overriding a single default isn&#39;t much use. But remember, "
+"Naturally, overriding a single default isn't much use. But remember, "
 "stereotypes can define more than just the default scope."
 msgstr ""
 
@@ -203,8 +203,8 @@
 #, no-c-format
 msgid ""
 "This may blow your mind a bit, but stereotypes may declare other "
-"stereotypes, which we&#39;ll call <emphasis>stereotype stacking</emphasis>. "
-"You may want to do this if you have two distinct stereotypes which are "
+"stereotypes, which we'll call <emphasis>stereotype stacking</emphasis>. You "
+"may want to do this if you have two distinct stereotypes which are "
 "meaningful on their own, but in other situation may be meaningful when "
 "combined."
 msgstr ""
@@ -212,7 +212,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Here&#39;s an example that combines the <literal>@Action</literal> and "
+"Here's an example that combines the <literal>@Action</literal> and "
 "<literal>@Auditable</literal> stereotypes:"
 msgstr ""
 
@@ -224,9 +224,8 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"We&#39;ve already met two standard stereotypes defined by the CDI "
-"specification: <literal>@Interceptor</literal> and <literal>@Decorator</"
-"literal>."
+"We've already met two standard stereotypes defined by the CDI specification: "
+"<literal>@Interceptor</literal> and <literal>@Decorator</literal>."
 msgstr ""
 "Si sono già visti due stereotipi standard definiti dalla specifica Web Bean: "
 "<literal>@Interceptor</literal> e <literal>@Decorator</literal>."

Modified: doc/trunk/reference/src/main/docbook/it-IT/viewlayers.po
===================================================================
--- doc/trunk/reference/src/main/docbook/it-IT/viewlayers.po	2010-07-24 16:36:48 UTC (rev 6808)
+++ doc/trunk/reference/src/main/docbook/it-IT/viewlayers.po	2010-07-25 04:22:37 UTC (rev 6809)
@@ -6,7 +6,7 @@
 "Project-Id-Version: Web_Beans:_Java_Contexts_and_Dependency_Injection "
 "VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-05-01T13:53:43\n"
+"POT-Creation-Date: 2010-07-25T03:52:15\n"
 "PO-Revision-Date: 2009-05-10 12:43+0100\n"
 "Last-Translator: Nicola Benaglia <nico.benaz at gmail.com>\n"
 "Language-Team: none\n"
@@ -100,8 +100,8 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"Storing the id of any long-running conversation in Wicket&#39;s metadata "
-"when the page response is complete"
+"Storing the id of any long-running conversation in Wicket's metadata when "
+"the page response is complete"
 msgstr ""
 "Memorizzare l'id di qualsiasi conversazione long-running nei metadati Wicket "
 "quando è completa la risposta della pagina"
@@ -157,9 +157,9 @@
 #, fuzzy, no-c-format
 msgid ""
 "When a conversation is marked as long-running, the id of that conversation "
-"will be stored in Wicket&#39;s metadata for the current page. If a new page "
-"is created and set as the response target through <literal>setResponsePage()"
-"</literal>, this new page will also participate in this conversation. This "
+"will be stored in Wicket's metadata for the current page. If a new page is "
+"created and set as the response target through <literal>setResponsePage()</"
+"literal>, this new page will also participate in this conversation. This "
 "occurs for both directly instantiated pages (<literal>setResponsePage(new "
 "OtherPage())</literal>), as well as for bookmarkable pages created with "
 "<literal>setResponsePage(OtherPage.class)</literal> where <literal>OtherPage."

Modified: doc/trunk/reference/src/main/docbook/it-IT/weldexamples.po
===================================================================
--- doc/trunk/reference/src/main/docbook/it-IT/weldexamples.po	2010-07-24 16:36:48 UTC (rev 6808)
+++ doc/trunk/reference/src/main/docbook/it-IT/weldexamples.po	2010-07-25 04:22:37 UTC (rev 6809)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: Weld_-_JSR-299_Reference_Implementation VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-05-01T13:53:43\n"
+"POT-Creation-Date: 2010-07-25T03:52:15\n"
 "PO-Revision-Date: 2009-11-23 21:23+0100\n"
 "Last-Translator: Nicola Benaglia <nico.benaz at gmail.com>\n"
 "Language-Team: none\n"
@@ -21,8 +21,8 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"It&#39;s time to pull the covers back and dive into the internals of Weld "
-"example applications. Let&#39;s start with the simpler of the two examples, "
+"It's time to pull the covers back and dive into the internals of Weld "
+"example applications. Let's start with the simpler of the two examples, "
 "<literal>weld-numberguess</literal>."
 msgstr ""
 
@@ -35,15 +35,15 @@
 #, no-c-format
 msgid ""
 "In the numberguess application you get 10 attempts to guess a number between "
-"1 and 100. After each attempt, you&#39;re told whether your guess was too "
-"high or too low."
+"1 and 100. After each attempt, you're told whether your guess was too high "
+"or too low."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
 msgid ""
 "The numberguess example is comprised of a number of beans, configuration "
-"files and Facelets (JSF) views, packaged as a war module. Let&#39;s start by "
+"files and Facelets (JSF) views, packaged as a war module. Let's start by "
 "examining the configuration files."
 msgstr ""
 
@@ -54,21 +54,21 @@
 "</literal>, which can be found in the <literal>src/main/webapp</literal> "
 "directory of the example. First, we have the JSF 2.0 version of "
 "<literal>faces-config.xml</literal>. A standardized version of Facelets is "
-"the default view handler in JSF 2.0, so there&#39;s really nothing that we "
-"have to configure. Thus, the configuration consists of only the root element."
+"the default view handler in JSF 2.0, so there's really nothing that we have "
+"to configure. Thus, the configuration consists of only the root element."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
 msgid ""
-"There&#39;s also an empty <literal>beans.xml</literal> file, which tells the "
+"There's also an empty <literal>beans.xml</literal> file, which tells the "
 "container to look for beans in this application and to activate the CDI "
 "services."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Finally, there&#39;s the familiar <literal>web.xml</literal>:"
+msgid "Finally, there's the familiar <literal>web.xml</literal>:"
 msgstr ""
 
 #. Tag: para
@@ -105,8 +105,8 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Let&#39;s take a look at the main JSF view, <literal>src/main/webapp/home."
-"xhtml</literal>."
+"Let's take a look at the main JSF view, <literal>src/main/webapp/home.xhtml</"
+"literal>."
 msgstr ""
 
 #. Tag: para
@@ -119,8 +119,8 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"There are a number of messages which can be sent to the user, &#34;Higher!"
-"&#34;, &#34;Lower!&#34; and &#34;Correct!&#34;"
+"There are a number of messages which can be sent to the user, \"Higher!\", "
+"\"Lower!\" and \"Correct!\""
 msgstr ""
 
 #. Tag: para
@@ -138,10 +138,9 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"A validator binding is used to make sure the user doesn&#39;t accidentally "
-"input a number outside of the range in which they can guess - if the "
-"validator wasn&#39;t here, the user might use up a guess on an out of bounds "
-"number."
+"A validator binding is used to make sure the user doesn't accidentally input "
+"a number outside of the range in which they can guess - if the validator "
+"wasn't here, the user might use up a guess on an out of bounds number."
 msgstr ""
 
 #. Tag: para
@@ -177,8 +176,8 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"The <literal>Generator</literal> is application scoped, so we don&#39;t get "
-"a different random each time."
+"The <literal>Generator</literal> is application scoped, so we don't get a "
+"different random each time."
 msgstr ""
 
 #. Tag: para
@@ -192,20 +191,20 @@
 #, no-c-format
 msgid ""
 "The final bean in the application is the session-scoped <literal>Game</"
-"literal> class. This is the primary entry point of the application. It&#39;s "
+"literal> class. This is the primary entry point of the application. It's "
 "responsible for setting up or resetting the game, capturing and validating "
-"the user&#39;s guess and providing feedback to the user with a "
-"<literal>FacesMessage</literal>. We&#39;ve used the post-construct lifecycle "
+"the user's guess and providing feedback to the user with a "
+"<literal>FacesMessage</literal>. We've used the post-construct lifecycle "
 "method to initialize the game by retrieving a random number from the "
-"<literal>@Random Instance&#60;Integer&#62;</literal> bean."
+"<literal>@Random Instance&lt;Integer&gt;</literal> bean."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
 msgid ""
-"You&#39;ll notice that we&#39;ve also added the <literal>@Named</literal> "
-"annotation to this class. This annotation is only required when you want to "
-"make the bean accessible to a JSF view via EL (i.e., #{game})."
+"You'll notice that we've also added the <literal>@Named</literal> annotation "
+"to this class. This annotation is only required when you want to make the "
+"bean accessible to a JSF view via EL (i.e., #{game})."
 msgstr ""
 
 #. Tag: title
@@ -237,9 +236,8 @@
 #, no-c-format
 msgid ""
 "Second, we need to explicitly specify the servlet listener in <literal>web."
-"xml</literal>, again because the container isn&#39;t doing this stuff for "
-"you. The servlet listener boots Weld and controls it&#39;s interaction with "
-"requests."
+"xml</literal>, again because the container isn't doing this stuff for you. "
+"The servlet listener boots Weld and controls it's interaction with requests."
 msgstr ""
 
 #. Tag: para
@@ -248,8 +246,8 @@
 "When Weld boots, it places the <literal>javax.enterprise.inject.spi."
 "BeanManager</literal>, the portable SPI for obtaining bean instances, in the "
 "ServletContext under a variable name equal to the fully-qualified interface "
-"name. You generally don&#39;t need to access this interface, but Weld makes "
-"use of it."
+"name. You generally don't need to access this interface, but Weld makes use "
+"of it."
 msgstr ""
 
 #. Tag: title
@@ -262,7 +260,7 @@
 msgid ""
 "Weld includes a number of portable extensions for JSR-299, including an "
 "extension for Wicket, which allows you to inject beans into Wicket "
-"components and leverage the conversation context. In this section, we&#39;ll "
+"components and leverage the conversation context. In this section, we'll "
 "walk you through the Wicket version of the numberguess example."
 msgstr ""
 
@@ -271,7 +269,7 @@
 msgid ""
 "You may want to review the Wicket documentation at <ulink url=\"http://"
 "wicket.apache.org/\">http://wicket.apache.org/</ulink> before reading this "
-"section, if you aren&#39;t already familiar with the framework."
+"section, if you aren't already familiar with the framework."
 msgstr ""
 
 #. Tag: para
@@ -280,17 +278,17 @@
 "Wicket is another environment that relies on the Weld servlet extension. The "
 "use of <ulink url=\"http://jetty.mortbay.org\">Jetty</ulink> is common in "
 "the Wicket community, and is thus chosen here as the runtime container. "
-"You&#39;ve seen already that Jetty is perfectly capable of running CDI "
+"You've seen already that Jetty is perfectly capable of running CDI "
 "applications with Weld add-ons, and this environment is no different."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
 msgid ""
-"We&#39;ll also be using the Eclipse IDE in these examples. Instructions are "
+"We'll also be using the Eclipse IDE in these examples. Instructions are "
 "provided later for running the example from the command line, but since "
-"you&#39;ll likely need to do more than just deploy examples, we&#39;ll get "
-"setup in this full development environment."
+"you'll likely need to do more than just deploy examples, we'll get setup in "
+"this full development environment."
 msgstr ""
 
 #. Tag: title
@@ -313,7 +311,7 @@
 #, no-c-format
 msgid ""
 "If you have m2eclipse installed, you can open any Maven project directly. "
-"From within Eclipse, select <emphasis>File -&#62; Import... -&#62; Maven "
+"From within Eclipse, select <emphasis>File -&gt; Import... -&gt; Maven "
 "Projects</emphasis>. Then, browse to the location of the Wicket numberguess "
 "example. You should see that Eclipse recognizes the existence of a Maven "
 "project."
@@ -329,24 +327,24 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"You&#39;ll notice after importing, the project has a build error. That&#39;s "
-"because we need to enable a Maven profile. Right-click on the project and "
-"select <emphasis>Properties</emphasis>, then select the <emphasis>Maven</"
-"emphasis> tab in the window that appears. In the form field labeled &#34;"
-"Active Maven Profiles (comma separated):&#34;, type <literal>jetty</"
-"literal>. That will enable some extra dependencies that allow the project to "
-"compile. Additionally, <emphasis>uncheck</emphasis> the box labeled &#34;"
-"Skip Maven compile plugin when processing resources (recommended)&#34;. That "
-"solves an incompatiblity between the m2eclipse plugin and the Maven enforcer "
-"plugin that we use for the Weld project. Now, you&#39;re ready to develop!"
+"You'll notice after importing, the project has a build error. That's because "
+"we need to enable a Maven profile. Right-click on the project and select "
+"<emphasis>Properties</emphasis>, then select the <emphasis>Maven</emphasis> "
+"tab in the window that appears. In the form field labeled \"Active Maven "
+"Profiles (comma separated):\", type <literal>jetty</literal>. That will "
+"enable some extra dependencies that allow the project to compile. "
+"Additionally, <emphasis>uncheck</emphasis> the box labeled \"Skip Maven "
+"compile plugin when processing resources (recommended)\". That solves an "
+"incompatiblity between the m2eclipse plugin and the Maven enforcer plugin "
+"that we use for the Weld project. Now, you're ready to develop!"
 msgstr ""
 
 #. Tag: para
 #, no-c-format
 msgid ""
-"Be sure to uncheck the box &#34;Skip Maven compile plugin when processing "
-"resources (recommended)&#34; in the Maven properties screen or else the "
-"example might not run in Eclipse because beans.xml will be missing from the "
+"Be sure to uncheck the box \"Skip Maven compile plugin when processing "
+"resources (recommended)\" in the Maven properties screen or else the example "
+"might not run in Eclipse because beans.xml will be missing from the "
 "classpath! See the <ulink url=\"https://issues.sonatype.org/browse/"
 "MNGECLIPSE-768\">MNGECLIPSE-768</ulink> issue report for details."
 msgstr ""
@@ -363,15 +361,15 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Then, from Eclipse, choose <emphasis>File -&#62; Import... -&#62; General -"
-"&#62; Existing Projects into Workspace</emphasis>, select the root directory "
+"Then, from Eclipse, choose <emphasis>File -&gt; Import... -&gt; General -"
+"&gt; Existing Projects into Workspace</emphasis>, select the root directory "
 "of the numberguess example, and click Finish. This will create a project in "
 "your workspace called <literal>weld-wicket-numberguess</literal>."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "It&#39;s time to get the example running!"
+msgid "It's time to get the example running!"
 msgstr ""
 
 #. Tag: title
@@ -430,7 +428,7 @@
 
 #. Tag: para
 #, no-c-format
-msgid "Enough toying with deployment, let&#39;s dive into the code."
+msgid "Enough toying with deployment, let's dive into the code."
 msgstr ""
 
 #. Tag: title
@@ -462,7 +460,7 @@
 
 #. Tag: para
 #, no-c-format
-msgid "Here&#39;s where things differ from the JSF numberguess example:"
+msgid "Here's where things differ from the JSF numberguess example:"
 msgstr ""
 
 #. Tag: para
@@ -585,8 +583,8 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Let&#39;s have a look at the significant code and configuration files that "
-"make up this example."
+"Let's have a look at the significant code and configuration files that make "
+"up this example."
 msgstr ""
 
 #. Tag: para
@@ -600,8 +598,8 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"The game&#39;s main logic is located in <literal>Game.java</literal>. Here "
-"is the code for that class, highlighting the ways in which this differs from "
+"The game's main logic is located in <literal>Game.java</literal>. Here is "
+"the code for that class, highlighting the ways in which this differs from "
 "the web application version:"
 msgstr ""
 
@@ -609,14 +607,14 @@
 #, no-c-format
 msgid ""
 "The bean is application scoped rather than session scoped, since an instance "
-"of a Swing application typically represents a single &#39;session&#39;."
+"of a Swing application typically represents a single 'session'."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
 msgid ""
-"Notice that the bean is not named, since it doesn&#39;t need to be accessed "
-"via EL."
+"Notice that the bean is not named, since it doesn't need to be accessed via "
+"EL."
 msgstr ""
 
 #. Tag: para
@@ -657,9 +655,9 @@
 msgid ""
 "The <literal>reset()</literal> method makes a call to the injected "
 "<literal>rndGenerator</literal> in order to get the random number at the "
-"start of each game. Note that it can&#39;t use <literal>Instance.get()</"
-"literal> like the JSF example does because there will not be any active "
-"contexts like there are during a JSF request."
+"start of each game. Note that it can't use <literal>Instance.get()</literal> "
+"like the JSF example does because there will not be any active contexts like "
+"there are during a JSF request."
 msgstr ""
 
 #. Tag: para
@@ -667,8 +665,8 @@
 msgid ""
 "The <literal>MessageGenerator</literal> class depends on the current "
 "instance of <literal>Game</literal> and queries its state in order to "
-"determine the appropriate messages to provide as the prompt for the user&#39;"
-"s next guess and the response to the previous guess. The code for "
+"determine the appropriate messages to provide as the prompt for the user's "
+"next guess and the response to the previous guess. The code for "
 "<literal>MessageGenerator</literal> is as follows:"
 msgstr ""
 
@@ -681,7 +679,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"The <literal>Game</literal>&#39;s state is interrogated to determine the "
+"The <literal>Game</literal>'s state is interrogated to determine the "
 "appropriate challenge message ..."
 msgstr ""
 
@@ -726,8 +724,8 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"<literal>guessButtonActionPerformed</literal> is called when the &#39;"
-"Guess&#39; button is clicked, and it does the following:"
+"<literal>guessButtonActionPerformed</literal> is called when the 'Guess' "
+"button is clicked, and it does the following:"
 msgstr ""
 
 #. Tag: para
@@ -740,8 +738,8 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Calls <literal>game.check()</literal> to validate and perform one &#39;"
-"turn&#39; of the game"
+"Calls <literal>game.check()</literal> to validate and perform one 'turn' of "
+"the game"
 msgstr ""
 
 #. Tag: para
@@ -780,7 +778,7 @@
 #, no-c-format
 msgid ""
 "The translator example is built as an ear and contains EJBs. As a result, "
-"it&#39;s structure is more complex than the numberguess example."
+"it's structure is more complex than the numberguess example."
 msgstr ""
 
 #. Tag: para
@@ -794,10 +792,9 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"First, let&#39;s take a look at the ear aggregator, which is located in the "
-"example&#39;s <literal>ear</literal> directory. Maven automatically "
-"generates the <literal>application.xml</literal> for us from this plugin "
-"configuration:"
+"First, let's take a look at the ear aggregator, which is located in the "
+"example's <literal>ear</literal> directory. Maven automatically generates "
+"the <literal>application.xml</literal> for us from this plugin configuration:"
 msgstr ""
 
 #. Tag: para
@@ -811,18 +808,18 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"If you weren&#39;t using Maven to generate these files, you would need "
+"If you weren't using Maven to generate these files, you would need "
 "<literal>META-INF/application.xml</literal>:"
 msgstr ""
 
 #. Tag: para
 #, no-c-format
 msgid ""
-"Next, lets look at the war, which is located in the example&#39;s "
-"<literal>war</literal> directory. Just as in the numberguess example, we "
-"have a <literal>faces-config.xml</literal> for JSF 2.0 and a <literal>web."
-"xml</literal> (to activate JSF) under WEB-INF, both sourced from "
-"<literal>src/main/webapp/WEB-INF</literal>."
+"Next, lets look at the war, which is located in the example's <literal>war</"
+"literal> directory. Just as in the numberguess example, we have a "
+"<literal>faces-config.xml</literal> for JSF 2.0 and a <literal>web.xml</"
+"literal> (to activate JSF) under WEB-INF, both sourced from <literal>src/"
+"main/webapp/WEB-INF</literal>."
 msgstr ""
 
 #. Tag: para
@@ -843,21 +840,21 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Finally, let&#39;s look at the EJB module, which is located in the "
-"example&#39;s <literal>ejb</literal> directory. In <literal>src/main/"
-"resources/META-INF</literal> there is just an empty <literal>beans.xml</"
-"literal>, used to mark the archive as containing beans."
+"Finally, let's look at the EJB module, which is located in the example's "
+"<literal>ejb</literal> directory. In <literal>src/main/resources/META-INF</"
+"literal> there is just an empty <literal>beans.xml</literal>, used to mark "
+"the archive as containing beans."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
 msgid ""
-"We&#39;ve saved the most interesting bit to last, the code! The project has "
-"two simple beans, <literal>SentenceParser</literal> and "
-"<literal>TextTranslator</literal> and two session beans, "
-"<literal>TranslatorControllerBean</literal> and <literal>SentenceTranslator</"
-"literal>. You should be getting quite familiar with what a bean looks like "
-"by now, so we&#39;ll just highlight the most interesting bits here."
+"We've saved the most interesting bit to last, the code! The project has two "
+"simple beans, <literal>SentenceParser</literal> and <literal>TextTranslator</"
+"literal> and two session beans, <literal>TranslatorControllerBean</literal> "
+"and <literal>SentenceTranslator</literal>. You should be getting quite "
+"familiar with what a bean looks like by now, so we'll just highlight the "
+"most interesting bits here."
 msgstr ""
 
 #. Tag: para
@@ -874,9 +871,9 @@
 "<literal>TextTranslator</literal> uses the simple bean (really just a plain "
 "Java class!) <literal>SentenceParser</literal> to parse the sentence and "
 "then calls on the stateless bean with the local business interface "
-"<literal>Translator</literal> to perform the translation. That&#39;s where "
-"the magic happens. Of course, we couldn&#39;t develop a full translator, but "
-"it&#39;s convincing enough to anyone who doesn&#39;t understand Latin!"
+"<literal>Translator</literal> to perform the translation. That's where the "
+"magic happens. Of course, we couldn't develop a full translator, but it's "
+"convincing enough to anyone who doesn't understand Latin!"
 msgstr ""
 
 #. Tag: para

Modified: doc/trunk/reference/src/main/docbook/it-IT/xml.po
===================================================================
--- doc/trunk/reference/src/main/docbook/it-IT/xml.po	2010-07-24 16:36:48 UTC (rev 6808)
+++ doc/trunk/reference/src/main/docbook/it-IT/xml.po	2010-07-25 04:22:37 UTC (rev 6809)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: master.xml\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-05-01T13:53:43\n"
+"POT-Creation-Date: 2010-07-25T03:52:15\n"
 "PO-Revision-Date: 2009-11-23 21:23+0100\n"
 "Last-Translator: Nicola Benaglia <nico.benaz at gmail.com>\n"
 "Language-Team: none\n"
@@ -21,9 +21,9 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"So far, we&#39;ve seen plenty of examples of beans declared using "
-"annotations. However, there are a couple of occasions when we can&#39;t use "
-"annotations to define the bean:"
+"So far, we've seen plenty of examples of beans declared using annotations. "
+"However, there are a couple of occasions when we can't use annotations to "
+"define the bean:"
 msgstr ""
 "Finora si sono visti molti esempi di Web Bean dichiarati usando annotazioni. "
 "Comunque ci sono varie occasioni in cui non è possibile usare le annotazioni "
@@ -72,10 +72,10 @@
 #, fuzzy, no-c-format
 msgid ""
 "The advantage of this approach is that you can write an XML schema that "
-"prevents spelling errors in your XML document. It&#39;s even possible for a "
-"tool to generate the XML schema automatically from the compiled Java code. "
-"Or, an integrated development environment could perform the same validation "
-"without the need for the explicit intermediate generation step."
+"prevents spelling errors in your XML document. It's even possible for a tool "
+"to generate the XML schema automatically from the compiled Java code. Or, an "
+"integrated development environment could perform the same validation without "
+"the need for the explicit intermediate generation step."
 msgstr ""
 "Il vantaggio di quest'approccio è che risulta possibile scrivere uno "
 "schemaXML che previene gli errori di scrittura nei documenti XML. E' "
@@ -121,7 +121,7 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"For example, the element <literal>&#60;util:Date/&#62;</literal> in the "
+"For example, the element <literal>&lt;util:Date/&gt;</literal> in the "
 "following XML fragment refers to the class <literal>java.util.Date</literal>:"
 msgstr ""
 "Per esempio l'elemento <literal>&lt;util:Date/&gt;</literal> nel seguente "
@@ -207,7 +207,7 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"The <literal>&#60;Name&#62;</literal> element declares a bean of scope "
+"The <literal>&lt;Name&gt;</literal> element declares a bean of scope "
 "<literal>@Dependent</literal> and class <literal>Name</literal>, with a set "
 "of initial field values. This bean has a special, container-generated "
 "qualifier and is therefore injectable only to the specific injection point "
@@ -223,8 +223,8 @@
 #, fuzzy, no-c-format
 msgid ""
 "This simple but powerful feature allows the Weld XML format to be used to "
-"specify whole graphs of Java objects. It&#39;s not quite a full databinding "
-"solution, but it&#39;s close!"
+"specify whole graphs of Java objects. It's not quite a full databinding "
+"solution, but it's close!"
 msgstr ""
 "Questa caratteristica semplice e potente consente formato XML di Web Bean di "
 "essere usato per specificare l'intero grafo di oggetti Java. Non è ancora "
@@ -239,10 +239,9 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"If we want our XML document format to be authored by people who aren&#39;t "
-"Java developers, or who don&#39;t have access to our code, we need to "
-"provide a schema. There&#39;s nothing specific to Weld about writing or "
-"using the schema."
+"If we want our XML document format to be authored by people who aren't Java "
+"developers, or who don't have access to our code, we need to provide a "
+"schema. There's nothing specific to Weld about writing or using the schema."
 msgstr ""
 "Se si vuole che il formato di documento XML sia scritto da persone che non "
 "sono sviluppatori Java o che non hanno accesso al codice, occorre fornire "

Modified: doc/trunk/reference/src/main/docbook/ko-KR/beans.po
===================================================================
--- doc/trunk/reference/src/main/docbook/ko-KR/beans.po	2010-07-24 16:36:48 UTC (rev 6808)
+++ doc/trunk/reference/src/main/docbook/ko-KR/beans.po	2010-07-25 04:22:37 UTC (rev 6809)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: Weld_-_JSR-299_Reference_Implementation VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-05-01T13:53:42\n"
+"POT-Creation-Date: 2010-07-25T03:52:14\n"
 "PO-Revision-Date: 2009-11-11 15:00+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -32,13 +32,13 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Let&#39;s back up a second. What does it really mean to be "
-"<emphasis>contextual</emphasis>? Since beans may be stateful, it matters "
-"<emphasis>which</emphasis> bean instance I have. Unlike a stateless "
-"component model (for example, stateless session beans) or a singleton "
-"component model (such as servlets, or singleton beans), different clients of "
-"a bean see the bean in different states. The client-visible state depends "
-"upon which instance of the bean the client has a reference to."
+"Let's back up a second. What does it really mean to be <emphasis>contextual</"
+"emphasis>? Since beans may be stateful, it matters <emphasis>which</"
+"emphasis> bean instance I have. Unlike a stateless component model (for "
+"example, stateless session beans) or a singleton component model (such as "
+"servlets, or singleton beans), different clients of a bean see the bean in "
+"different states. The client-visible state depends upon which instance of "
+"the bean the client has a reference to."
 msgstr ""
 
 #. Tag: para
@@ -83,10 +83,10 @@
 msgid ""
 "One great advantage of the contextual model is that it allows stateful beans "
 "to be treated like services! The client need not concern itself with "
-"managing the lifecycle of the bean it&#39;s using, <emphasis>nor does it "
-"even need to know what that lifecycle is.</emphasis> Beans interact by "
-"passing messages, and the bean implementations define the lifecycle of their "
-"own state. The beans are loosely coupled because:"
+"managing the lifecycle of the bean it's using, <emphasis>nor does it even "
+"need to know what that lifecycle is.</emphasis> Beans interact by passing "
+"messages, and the bean implementations define the lifecycle of their own "
+"state. The beans are loosely coupled because:"
 msgstr ""
 
 #. Tag: para
@@ -171,7 +171,7 @@
 
 #. Tag: para
 #, no-c-format
-msgid "Let&#39;s see what all this new terminology means."
+msgid "Let's see what all this new terminology means."
 msgstr ""
 
 #. Tag: title
@@ -183,8 +183,8 @@
 #, no-c-format
 msgid ""
 "Beans usually acquire references to other beans via dependency injection. "
-"Any injected attribute specifies a &#34;contract&#34; that must be satisfied "
-"by the bean to be injected. The contract is:"
+"Any injected attribute specifies a \"contract\" that must be satisfied by "
+"the bean to be injected. The contract is:"
 msgstr ""
 
 #. Tag: para
@@ -211,7 +211,7 @@
 #, no-c-format
 msgid ""
 "The bean types are <literal>BookShop</literal>, <literal>Business</literal> "
-"and <literal>Shop&#60;Book&#62;</literal>, as well as the implicit type "
+"and <literal>Shop&lt;Book&gt;</literal>, as well as the implicit type "
 "<literal>java.lang.Object</literal>. (Notice that a parameterized type is a "
 "legal bean type)."
 msgstr ""
@@ -230,9 +230,9 @@
 msgid ""
 "The bean types of a session bean include local interfaces and the bean class "
 "local view (if any). EJB remote interfaces are not considered bean types of "
-"a session bean. You can&#39;t inject an EJB using its remote interface "
-"unless you define a <emphasis>resource</emphasis>, which we&#39;ll meet in "
-"<xref linkend=\"resources\" />."
+"a session bean. You can't inject an EJB using its remote interface unless "
+"you define a <emphasis>resource</emphasis>, which we'll meet in <xref "
+"linkend=\"resources\" />."
 msgstr ""
 
 #. Tag: para
@@ -241,7 +241,7 @@
 "Bean types may be restricted to an explicit set by annotating the bean with "
 "the <literal>@Typed</literal> annotation and listing the classes that should "
 "be bean types. For instance, the bean types of this bean have been "
-"restricted to <literal>Shop&#60;Book&#62;</literal>, together with "
+"restricted to <literal>Shop&lt;Book&gt;</literal>, together with "
 "<literal>java.lang.Object</literal>:"
 msgstr ""
 
@@ -255,8 +255,8 @@
 "<literal>DebitPaymentProcessor</literal>. Injecting a field of type "
 "<literal>PaymentProcessor</literal> introduces an ambiguous condition. In "
 "these cases, the client must specify some additional quality of the "
-"implementation it is interested in. We model this kind of &#34;quality&#34; "
-"using a qualifier."
+"implementation it is interested in. We model this kind of \"quality\" using "
+"a qualifier."
 msgstr ""
 
 #. Tag: para
@@ -265,23 +265,23 @@
 "A qualifier is a user-defined annotation that is itself annotated "
 "<literal>@Qualifer</literal>. A qualifier annotation is an extension of the "
 "type system. It lets us disambiguate a type without having to fall back to "
-"string-based names. Here&#39;s an example of a qualifier annotation:"
+"string-based names. Here's an example of a qualifier annotation:"
 msgstr ""
 
 #. Tag: para
 #, no-c-format
 msgid ""
 "You may not be used to seeing the definition of an annotation. In fact, this "
-"might be the first time you&#39;ve encountered one. With CDI, annotation "
-"definitions will become a familiar artifact as you&#39;ll be creating them "
-"from time to time."
+"might be the first time you've encountered one. With CDI, annotation "
+"definitions will become a familiar artifact as you'll be creating them from "
+"time to time."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
 msgid ""
 "Pay attention to the names of the built-in annotations in CDI and EJB. "
-"You&#39;ll notice that they are often adjectives. We encourage you to follow "
+"You'll notice that they are often adjectives. We encourage you to follow "
 "this convention when creating your custom annotations, since they serve to "
 "describe the behaviors and roles of the class."
 msgstr ""
@@ -308,7 +308,7 @@
 "For each injection point, the container searches for a bean which satisfies "
 "the contract, one which has the bean type and all the qualifiers. If it "
 "finds exactly one matching bean, it injects an instance of that bean. If it "
-"doesn&#39;t, it reports an error to the user."
+"doesn't, it reports an error to the user."
 msgstr ""
 
 #. Tag: para
@@ -330,10 +330,10 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"That&#39;s not quite the end of the story. CDI also defines a simple "
+"That's not quite the end of the story. CDI also defines a simple "
 "<emphasis>resolution rule</emphasis> that helps the container decide what to "
 "do if there is more than one bean that satisfies a particular contract. "
-"We&#39;ll get into the details in <xref linkend=\"injection\" />."
+"We'll get into the details in <xref linkend=\"injection\" />."
 msgstr ""
 
 #. Tag: title
@@ -370,7 +370,7 @@
 msgid ""
 "Keep in mind that once a bean is bound to a context, it remains in that "
 "context until the context is destroyed. There is no way to manually remove a "
-"bean from a context. If you don&#39;t want the bean to sit in the session "
+"bean from a context. If you don't want the bean to sit in the session "
 "indefinitely, consider using another scope with a shorted lifespan, such as "
 "the request or conversation scope."
 msgstr ""
@@ -386,8 +386,7 @@
 
 #. Tag: para
 #, no-c-format
-msgid ""
-"We&#39;ll talk more about scopes in <xref linkend=\"scopescontexts\" />."
+msgid "We'll talk more about scopes in <xref linkend=\"scopescontexts\" />."
 msgstr ""
 
 #. Tag: title
@@ -446,7 +445,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"We&#39;ve already seen how qualifiers let us choose between multiple "
+"We've already seen how qualifiers let us choose between multiple "
 "implementations of an interface at development time. But sometimes we have "
 "an interface (or other bean type) whose implementation varies depending upon "
 "the deployment environment. For example, we may want to use a mock "
@@ -483,9 +482,9 @@
 msgid ""
 "You might be familiar with the use of interceptors in EJB 3.0. In Java EE 6, "
 "this functionality has been generalized to work with other managed beans. "
-"That&#39;s right, you no longer have to make your bean an EJB just to "
-"intercept its methods. Holler. So what does CDI have to offer above and "
-"beyond that? Well, quite a lot actually. Let&#39;s cover some background."
+"That's right, you no longer have to make your bean an EJB just to intercept "
+"its methods. Holler. So what does CDI have to offer above and beyond that? "
+"Well, quite a lot actually. Let's cover some background."
 msgstr ""
 
 #. Tag: para
@@ -498,10 +497,10 @@
 "descriptor. You might as well just put the interceptor code <emphasis>in</"
 "emphasis> the implementation! Second, the order in which the interceptors "
 "are applied is taken from the order in which they are declared in the "
-"annotation or the XML descriptor. Perhaps this isn&#39;t so bad if you&#39;"
-"re applying the interceptors to a single bean. But, if you are applying them "
-"repeatedly, then there&#39;s a good chance that you&#39;ll inadvertently "
-"define a different order for different beans. Now that&#39;s a problem."
+"annotation or the XML descriptor. Perhaps this isn't so bad if you're "
+"applying the interceptors to a single bean. But, if you are applying them "
+"repeatedly, then there's a good chance that you'll inadvertently define a "
+"different order for different beans. Now that's a problem."
 msgstr ""
 
 #. Tag: para
@@ -540,14 +539,14 @@
 #, no-c-format
 msgid ""
 "Notice that <literal>ShoppingCart</literal> and "
-"<literal>TransactionInterceptor</literal> don&#39;t know anything about each "
+"<literal>TransactionInterceptor</literal> don't know anything about each "
 "other."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
 msgid ""
-"Interceptors are deployment-specific. (We don&#39;t need a "
+"Interceptors are deployment-specific. (We don't need a "
 "<literal>TransactionInterceptor</literal> in our unit tests!) By default, an "
 "interceptor is disabled. We can enable an interceptor using the CDI "
 "deployment descriptor <literal>META-INF/beans.xml</literal> of the jar or "
@@ -557,8 +556,8 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"We&#39;ll discuss interceptors, and their cousins, decorators, in <xref "
-"linkend=\"interceptors\" /> and <xref linkend=\"decorators\" />."
+"We'll discuss interceptors, and their cousins, decorators, in <xref linkend="
+"\"interceptors\" /> and <xref linkend=\"decorators\" />."
 msgstr ""
 
 #. Tag: title
@@ -569,10 +568,9 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"We&#39;ve already seen two types of beans: JavaBeans and EJB session beans. "
-"Is that the whole story? Actually, it&#39;s just the beginning. Let&#39;s "
-"explore the various kinds of beans that CDI implementations must support out-"
-"of-the-box."
+"We've already seen two types of beans: JavaBeans and EJB session beans. Is "
+"that the whole story? Actually, it's just the beginning. Let's explore the "
+"various kinds of beans that CDI implementations must support out-of-the-box."
 msgstr ""
 
 #. Tag: title
@@ -586,8 +584,8 @@
 "A managed bean is a Java class. The basic lifecycle and semantics of a "
 "managed bean are defined by the Managed Beans specification. You can "
 "explicitly declare a managed bean by annotating the bean class "
-"<literal>@ManagedBean</literal>, but in CDI you don&#39;t need to. According "
-"to the specification, the CDI container treats any class that satisfies the "
+"<literal>@ManagedBean</literal>, but in CDI you don't need to. According to "
+"the specification, the CDI container treats any class that satisfies the "
 "following conditions as a managed bean:"
 msgstr ""
 
@@ -636,7 +634,7 @@
 "According to this definition, JPA entities are technically managed beans. "
 "However, entities have their own special lifecycle, state and identity model "
 "and are usually instantiated by JPA or using <literal>new</literal>. "
-"Therefore we don&#39;t recommend directly injecting an entity class. We "
+"Therefore we don't recommend directly injecting an entity class. We "
 "especially recommend against assigning a scope other than "
 "<literal>@Dependent</literal> to an entity class, since JPA is not able to "
 "persist injected CDI proxies."
@@ -715,7 +713,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"There&#39;s no reason to explicitly declare the scope of a stateless session "
+"There's no reason to explicitly declare the scope of a stateless session "
 "bean or singleton session bean. The EJB container controls the lifecycle of "
 "these beans, according to the semantics of the <literal>@Stateless</literal> "
 "or <literal>@Singleton</literal> declaration. On the other hand, a stateful "
@@ -771,8 +769,8 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"When we don&#39;t need any of these things, an ordinary managed bean will "
-"serve just fine."
+"When we don't need any of these things, an ordinary managed bean will serve "
+"just fine."
 msgstr ""
 
 #. Tag: para
@@ -796,7 +794,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Finally, it&#39;s usually obvious when method-level transaction management, "
+"Finally, it's usually obvious when method-level transaction management, "
 "method-level security, timers, remote methods or asynchronous methods are "
 "needed."
 msgstr ""
@@ -804,11 +802,11 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"The point we&#39;re trying to make is: use a session bean when you need the "
+"The point we're trying to make is: use a session bean when you need the "
 "services it provides, not just because you want to use dependency injection, "
 "lifecycle management, or interceptors. Java EE 6 provides a graduated "
-"programming model. It&#39;s usually easy to start with an ordinary managed "
-"bean, and later turn it into an EJB just by adding one of the following "
+"programming model. It's usually easy to start with an ordinary managed bean, "
+"and later turn it into an EJB just by adding one of the following "
 "annotations: <literal>@Stateless</literal>, <literal>@Stateful</literal> or "
 "<literal>@Singleton</literal>."
 msgstr ""
@@ -816,14 +814,13 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"On the other hand, don&#39;t be scared to use session beans just because "
-"you&#39;ve heard your friends say they&#39;re &#34;heavyweight&#34;. It&#39;"
-"s nothing more than superstition to think that something is &#34;"
-"heavier&#34; just because it&#39;s hosted natively within the Java EE "
-"container, instead of by a proprietary bean container or dependency "
-"injection framework that runs as an additional layer of obfuscation. And as "
-"a general principle, you should be skeptical of folks who use vaguely "
-"defined terminology like &#34;heavyweight&#34;."
+"On the other hand, don't be scared to use session beans just because you've "
+"heard your friends say they're \"heavyweight\". It's nothing more than "
+"superstition to think that something is \"heavier\" just because it's hosted "
+"natively within the Java EE container, instead of by a proprietary bean "
+"container or dependency injection framework that runs as an additional layer "
+"of obfuscation. And as a general principle, you should be skeptical of folks "
+"who use vaguely defined terminology like \"heavyweight\"."
 msgstr ""
 
 #. Tag: title
@@ -862,7 +859,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"We can&#39;t write a bean class that is itself a random number. But we can "
+"We can't write a bean class that is itself a random number. But we can "
 "certainly write a method that returns a random number. By making the method "
 "a producer method, we allow the return value of the method—in this case an "
 "<literal>Integer</literal>—to be injected. We can even specify a qualifier—"
@@ -934,7 +931,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"We&#39;ll talk much more about producer methods in <xref linkend="
+"We'll talk much more about producer methods in <xref linkend="
 "\"producermethods\" />."
 msgstr ""
 
@@ -965,7 +962,7 @@
 "A producer field is really just a shortcut that lets us avoid writing a "
 "useless getter method. However, in addition to convenience, producer fields "
 "serve a specific purpose as an adaptor for Java EE component environment "
-"injection, but to learn more about that, you&#39;ll have to wait until <xref "
-"linkend=\"resources\" />. Because we can&#39;t wait to get to work on some "
+"injection, but to learn more about that, you'll have to wait until <xref "
+"linkend=\"resources\" />. Because we can't wait to get to work on some "
 "examples."
 msgstr ""

Modified: doc/trunk/reference/src/main/docbook/ko-KR/decorators.po
===================================================================
--- doc/trunk/reference/src/main/docbook/ko-KR/decorators.po	2010-07-24 16:36:48 UTC (rev 6808)
+++ doc/trunk/reference/src/main/docbook/ko-KR/decorators.po	2010-07-25 04:22:37 UTC (rev 6809)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: decorators\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-05-01T13:53:42\n"
+"POT-Creation-Date: 2010-07-25T03:52:14\n"
 "PO-Revision-Date: 2009-01-23 11:19+1000\n"
 "Last-Translator: Eunju Kim <eukim at redhat.com>\n"
 "Language-Team: Korean <ko at li.org>\n"
@@ -37,8 +37,8 @@
 "interceptor is able to intercept invocations of any Java type. This makes "
 "them perfect for solving technical concerns such as transaction management, "
 "security and call logging. However, by nature, interceptors are unaware of "
-"the actual semantics of the events they intercept. Thus, interceptors "
-"aren&#39;t an appropriate tool for separating business-related concerns."
+"the actual semantics of the events they intercept. Thus, interceptors aren't "
+"an appropriate tool for separating business-related concerns."
 msgstr ""
 "인터셉터는 유형 시스템에 <emphasis>직교</emphasis> 되어 있는 문제를 분리하고 "
 "캡쳐하는 강력한 방법입니다. 인터셉터는 모든 Java 유형 호출을 차단할 수 있습니"
@@ -55,11 +55,10 @@
 "aware of all the semantics attached to that interface. Since decorators "
 "directly implement operations with business semantics, it makes them the "
 "perfect tool for modeling some kinds of business concerns. It also means "
-"that a decorator doesn&#39;t have the generality of an interceptor. "
-"Decorators aren&#39;t able to solve technical concerns that cut across many "
-"disparate types. Interceptors and decorators, though similar in many ways, "
-"are complementary. Let&#39;s look at some cases where decorators fit the "
-"bill."
+"that a decorator doesn't have the generality of an interceptor. Decorators "
+"aren't able to solve technical concerns that cut across many disparate "
+"types. Interceptors and decorators, though similar in many ways, are "
+"complementary. Let's look at some cases where decorators fit the bill."
 msgstr ""
 "역으로 기능하는 것이 <emphasis>데코레이터</emphasis>입니다. 데코레이터는 특"
 "정 Java 인터페이스에 대해서만 호출을 차단하며, 인터페이스에 부착된 모든 시멘"
@@ -106,9 +105,8 @@
 #, fuzzy, no-c-format
 msgid ""
 "Unlike other beans, a decorator may be an abstract class. Therefore, if "
-"there&#39;s nothing special the decorator needs to do for a particular "
-"method of the decorated interface, you don&#39;t need to implement that "
-"method."
+"there's nothing special the decorator needs to do for a particular method of "
+"the decorated interface, you don't need to implement that method."
 msgstr ""
 "기타 다른 심플 Web Beans와 다르게, 데코레이터는 추상클래스일 수 도 있습니다. "
 "데코레이터된 인터페이스의 특정 방식에 대해 데코레이터가 특별히 해야할 것이 없"
@@ -198,8 +196,7 @@
 #, fuzzy, no-c-format
 msgid ""
 "This declaration serves the same purpose for decorators that the "
-"<literal>&#60;interceptors&#62;</literal> declaration serves for "
-"interceptors:"
+"<literal>&lt;interceptors&gt;</literal> declaration serves for interceptors:"
 msgstr ""
 "이러한 명시 사항은 데코레이터에 대해 <literal>&lt;Interceptors&gt;</literal> "
 "명시가 인터셉터에 대해 실행하는 것과 동일한 목적을 실행합니다:  "

Modified: doc/trunk/reference/src/main/docbook/ko-KR/ee.po
===================================================================
--- doc/trunk/reference/src/main/docbook/ko-KR/ee.po	2010-07-24 16:36:48 UTC (rev 6808)
+++ doc/trunk/reference/src/main/docbook/ko-KR/ee.po	2010-07-25 04:22:37 UTC (rev 6809)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: ee\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-05-01T13:53:42\n"
+"POT-Creation-Date: 2010-07-25T03:52:14\n"
 "PO-Revision-Date: 2009-01-15 02:17+1000\n"
 "Last-Translator: Eunju Kim <eukim at redhat.com>\n"
 "Language-Team: Korean <ko at li.org>\n"
@@ -83,7 +83,7 @@
 "The CDI specification does not require the servlet context objects, "
 "<literal>HttpServletRequest</literal>, <literal>HttpSession</literal> and "
 "<literal>ServletContext</literal> to be exposed as injectable beans. If you "
-"really want to be able to inject these objects, it&#39;s easy to create a "
+"really want to be able to inject these objects, it's easy to create a "
 "portable extension to expose them as beans. However, we recommend that "
 "direct access to these objects be limited to servlets, servlet filters and "
 "servlet event listeners, where they may be obtained in the usual way as "
@@ -110,8 +110,8 @@
 "All managed beans may take advantage of Java EE component environment "
 "injection using <literal>@Resource</literal>, <literal>@EJB</literal>, "
 "<literal>@PersistenceContext</literal>, <literal>@PeristenceUnit</literal> "
-"and <literal>@WebServiceRef</literal>. We&#39;ve already seen a couple of "
-"examples of this, though we didn&#39;t pay much attention at the time:"
+"and <literal>@WebServiceRef</literal>. We've already seen a couple of "
+"examples of this, though we didn't pay much attention at the time:"
 msgstr ""
 "모든 엔터프라이즈 Web Beans는 <literal>@Resource</literal>, <literal>@EJB</"
 "literal>, <literal>@PersistenceContext</literal>를 사용하여 Java EE 의존성 삽"
@@ -145,8 +145,8 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"It&#39;s easy to use a bean from a servlet in Java EE 6. Simply inject the "
-"bean using field or initializer method injection."
+"It's easy to use a bean from a servlet in Java EE 6. Simply inject the bean "
+"using field or initializer method injection."
 msgstr ""
 "Java EE 6에 있는 Servlet에서 Web Bean을 사용하기가 쉽습니다. Web Beans 영역 "
 "또는 초기화 방식 삽입을 사용하여 Web Bean을 삽입합니다. "
@@ -171,9 +171,9 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"CDI injection applies to all EJBs, even when they aren&#39;t managed beans. "
-"In particular, you can use CDI injection in message-driven beans, which are "
-"by nature not contextual objects."
+"CDI injection applies to all EJBs, even when they aren't managed beans. In "
+"particular, you can use CDI injection in message-driven beans, which are by "
+"nature not contextual objects."
 msgstr ""
 
 #. Tag: para
@@ -258,15 +258,15 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"CDI doesn&#39;t define any special deployment archive. You can package beans "
-"in jars, ejb jars or wars—any deployment location in the application "
-"classpath. However, the archive must be a &#34;bean archive&#34;. That means "
-"each archive that contains beans <emphasis>must</emphasis> include a file "
-"named <literal>beans.xml</literal> in the <literal>META-INF</literal> "
-"directory of the classpath or <literal>WEB-INF</literal> directory of the "
-"web root (for war archives). The file may be empty. Beans deployed in "
-"archives that do not have a <literal>beans.xml</literal> file will not be "
-"available for use in the application."
+"CDI doesn't define any special deployment archive. You can package beans in "
+"jars, ejb jars or wars—any deployment location in the application classpath. "
+"However, the archive must be a \"bean archive\". That means each archive "
+"that contains beans <emphasis>must</emphasis> include a file named "
+"<literal>beans.xml</literal> in the <literal>META-INF</literal> directory of "
+"the classpath or <literal>WEB-INF</literal> directory of the web root (for "
+"war archives). The file may be empty. Beans deployed in archives that do not "
+"have a <literal>beans.xml</literal> file will not be available for use in "
+"the application."
 msgstr ""
 "Web Beans는 특정 배포 아카이브를 지정하지 않습니다. JAR, EJB-JAR 또는 WAR에 "
 "있는 Web Beans  &#151;  애플리케이션 classpath에 있는 배포 위치를 패키지화할 "

Modified: doc/trunk/reference/src/main/docbook/ko-KR/environments.po
===================================================================
--- doc/trunk/reference/src/main/docbook/ko-KR/environments.po	2010-07-24 16:36:48 UTC (rev 6808)
+++ doc/trunk/reference/src/main/docbook/ko-KR/environments.po	2010-07-25 04:22:37 UTC (rev 6809)
@@ -6,7 +6,7 @@
 "Project-Id-Version: Web_Beans:_Java_Contexts_and_Dependency_Injection "
 "VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-05-01T14:44:09\n"
+"POT-Creation-Date: 2010-07-25T03:52:14\n"
 "PO-Revision-Date: 2009-03-28 17:09+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -37,9 +37,9 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Unfortunately, you can&#39;t use Weld with earlier versions of JBoss AS "
-"since they are missing key libraries. If you want to learn how to upgrade "
-"the built-in support on JBoss AS 6.0, then read on."
+"Unfortunately, you can't use Weld with earlier versions of JBoss AS since "
+"they are missing key libraries. If you want to learn how to upgrade the "
+"built-in support on JBoss AS 6.0, then read on."
 msgstr ""
 
 #. Tag: para
@@ -107,7 +107,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"There is a major limitation to using a servlet container. Weld doesn&#39;t "
+"There is a major limitation to using a servlet container. Weld doesn't "
 "support deploying session beans, injection using <literal>@EJB</literal> or "
 "<literal>@PersistenceContext</literal>, or using transactional events in "
 "servlet containers. For enterprise features such as these, you should really "
@@ -119,10 +119,10 @@
 msgid ""
 "Weld should be used as a web application library in a servlet container. You "
 "should place <literal>weld-servlet.jar</literal> in <literal>WEB-INF/lib</"
-"literal> in the web root. <literal>weld-servlet.jar</literal> is an &#34;"
-"uber-jar&#34;, meaning it bundles all the bits of Weld and CDI required for "
-"running in a servlet container, provided for your convenience. "
-"Alternatively, you could use its component jars:"
+"literal> in the web root. <literal>weld-servlet.jar</literal> is an \"uber-"
+"jar\", meaning it bundles all the bits of Weld and CDI required for running "
+"in a servlet container, provided for your convenience. Alternatively, you "
+"could use its component jars:"
 msgstr ""
 
 #. Tag: para
@@ -186,7 +186,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Tomcat has a read-only JNDI, so Weld can&#39;t automatically bind the "
+"Tomcat has a read-only JNDI, so Weld can't automatically bind the "
 "BeanManager extension SPI. To bind the BeanManager into JNDI, you should "
 "populate <literal>META-INF/context.xml</literal> in the web root with the "
 "following contents:"
@@ -220,18 +220,18 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Like Tomcat, Jetty has a read-only JNDI, so Weld can&#39;t automatically "
-"bind the Manager. To bind the Manager to JNDI, you should populate "
-"<literal>WEB-INF/jetty-env.xml</literal> with the following contents:"
+"Like Tomcat, Jetty has a read-only JNDI, so Weld can't automatically bind "
+"the Manager. To bind the Manager to JNDI, you should populate <literal>WEB-"
+"INF/jetty-env.xml</literal> with the following contents:"
 msgstr ""
 
 #. Tag: para
 #, no-c-format
 msgid ""
-"Notice that Jetty doesn&#39;t not have built-in support for an "
-"<literal>javax.naming.spi.ObjectFactory</literal> like Tomcat, so it&#39;s "
-"necessary to manually create the <literal>javax.naming.Reference</literal> "
-"to wrap around it."
+"Notice that Jetty doesn't not have built-in support for an <literal>javax."
+"naming.spi.ObjectFactory</literal> like Tomcat, so it's necessary to "
+"manually create the <literal>javax.naming.Reference</literal> to wrap around "
+"it."
 msgstr ""
 
 #. Tag: para
@@ -258,13 +258,13 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"In addition to improved integration of the Enterprise Java stack, the &#34;"
-"Contexts and Dependency Injection for the Java EE platform&#34; "
-"specification also defines a state of the art typesafe, stateful dependency "
-"injection framework, which can prove useful in a wide range of application "
-"types. To help developers take advantage of this, Weld provides a simple "
-"means for being executed in the Java Standard Edition (SE) environment "
-"independently of any Java EE APIs."
+"In addition to improved integration of the Enterprise Java stack, the "
+"\"Contexts and Dependency Injection for the Java EE platform\" specification "
+"also defines a state of the art typesafe, stateful dependency injection "
+"framework, which can prove useful in a wide range of application types. To "
+"help developers take advantage of this, Weld provides a simple means for "
+"being executed in the Java Standard Edition (SE) environment independently "
+"of any Java EE APIs."
 msgstr ""
 
 #. Tag: para
@@ -348,7 +348,7 @@
 
 #. Tag: para
 #, no-c-format
-msgid "Here&#39;s an example of a simple CDI SE application:"
+msgid "Here's an example of a simple CDI SE application:"
 msgstr ""
 
 #. Tag: title
@@ -369,9 +369,9 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Thanks to the power of CDI&#39;s typesafe event model, application "
-"developers need not write any bootstrapping code. The Weld SE module comes "
-"with a built-in main method which will bootstrap CDI for you and then fire a "
+"Thanks to the power of CDI's typesafe event model, application developers "
+"need not write any bootstrapping code. The Weld SE module comes with a built-"
+"in main method which will bootstrap CDI for you and then fire a "
 "<literal>ContainerInitialized</literal> event. The entry point for your "
 "application code would therefore be a simple bean which observes the "
 "<literal>ContainerInitialized</literal> event, as in the previous example."
@@ -394,15 +394,15 @@
 msgid ""
 "For added flexibility, CDI SE also comes with a bootstrap API which can be "
 "called from within your application in order to initialize CDI and obtain "
-"references to your application&#39;s beans and events. The API consists of "
-"two classes: <literal>Weld</literal> and <literal>WeldContainer</literal>."
+"references to your application's beans and events. The API consists of two "
+"classes: <literal>Weld</literal> and <literal>WeldContainer</literal>."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
 msgid ""
-"Here&#39;s an example application main method which uses this API to "
-"initialize a bean of type <literal>MyApplicationBean</literal>."
+"Here's an example application main method which uses this API to initialize "
+"a bean of type <literal>MyApplicationBean</literal>."
 msgstr ""
 
 #. Tag: para
@@ -435,10 +435,10 @@
 #, no-c-format
 msgid ""
 "To use the @ThreadScoped annotation you need to enable the "
-"<literal>RunnableDecorator</literal> which &#39;listens&#39; for all "
-"executions of <literal>Runnable.run()</literal> and decorates them by "
-"setting up the thread context beforehand, bound to the current thread, and "
-"destroying the context afterwards."
+"<literal>RunnableDecorator</literal> which 'listens' for all executions of "
+"<literal>Runnable.run()</literal> and decorates them by setting up the "
+"thread context beforehand, bound to the current thread, and destroying the "
+"context afterwards."
 msgstr ""
 
 #. Tag: para
@@ -459,8 +459,8 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Weld SE comes packaged as a &#39;shaded&#39; jar which includes the CDI API, "
-"Weld Core and all dependant classes bundled into a single jar. Therefore the "
-"only Weld jar you need on the classpath, in addition to your application&#39;"
-"s classes and dependant jars, is the Weld SE jar."
+"Weld SE comes packaged as a 'shaded' jar which includes the CDI API, Weld "
+"Core and all dependant classes bundled into a single jar. Therefore the only "
+"Weld jar you need on the classpath, in addition to your application's "
+"classes and dependant jars, is the Weld SE jar."
 msgstr ""

Modified: doc/trunk/reference/src/main/docbook/ko-KR/events.po
===================================================================
--- doc/trunk/reference/src/main/docbook/ko-KR/events.po	2010-07-24 16:36:48 UTC (rev 6808)
+++ doc/trunk/reference/src/main/docbook/ko-KR/events.po	2010-07-25 04:22:37 UTC (rev 6809)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: events\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-05-01T13:53:42\n"
+"POT-Creation-Date: 2010-07-25T03:52:14\n"
 "PO-Revision-Date: 2009-01-23 11:16+1000\n"
 "Last-Translator: Eunju Kim <eukim at redhat.com>\n"
 "Language-Team: Korean <ko at li.org>\n"
@@ -63,8 +63,8 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"observers can specify a combination of &#34;selectors&#34; to narrow the set "
-"of event notifications they will receive, and"
+"observers can specify a combination of \"selectors\" to narrow the set of "
+"event notifications they will receive, and"
 msgstr ""
 "옵저버는 \"선택자\" 조합을 지정하여 이벤트 통지 모음의 범위를 좁힙니다. "
 
@@ -81,7 +81,7 @@
 #, no-c-format
 msgid ""
 "The CDI event notification facility uses more or less the same typesafe "
-"approach that we&#39;ve already seen with the dependency injection service."
+"approach that we've already seen with the dependency injection service."
 msgstr ""
 
 #. Tag: title
@@ -104,7 +104,7 @@
 #, no-c-format
 msgid ""
 "An event qualifier is just a normal qualifier, defined using "
-"<literal>@Qualifier</literal>. Here&#39;s an example:"
+"<literal>@Qualifier</literal>. Here's an example:"
 msgstr ""
 
 #. Tag: title
@@ -140,7 +140,7 @@
 msgid ""
 "An observer method need not specify any event qualifiers—in this case it is "
 "interested in <emphasis>all</emphasis> events of a particular type. If it "
-"does specify qualifiers, it&#39;s only interested in events which have those "
+"does specify qualifiers, it's only interested in events which have those "
 "qualifiers."
 msgstr ""
 "옵저버 방식은 어떤 이벤트 바인딩도 지정할 필요가 없습니다 &#151; 이러한 경우 "
@@ -260,8 +260,8 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"The downside of annotating the injection point is that we can&#39;t specify "
-"the qualifier dynamically. CDI lets us obtain a qualifier instance by "
+"The downside of annotating the injection point is that we can't specify the "
+"qualifier dynamically. CDI lets us obtain a qualifier instance by "
 "subclassing the helper class <literal>AnnotationLiteral</literal>. That way, "
 "we can pass the qualifier to the <literal>select()</literal> method of "
 "<literal>Event</literal>."
@@ -285,8 +285,8 @@
 msgid ""
 "By default, if there is no instance of an observer in the current context, "
 "the container will instantiate the observer in order to deliver an event to "
-"it. This behavior isn&#39;t always desirable. We may want to deliver events "
-"only to instances of the observer that already exist in the current contexts."
+"it. This behavior isn't always desirable. We may want to deliver events only "
+"to instances of the observer that already exist in the current contexts."
 msgstr ""
 
 #. Tag: para

Modified: doc/trunk/reference/src/main/docbook/ko-KR/example.po
===================================================================
--- doc/trunk/reference/src/main/docbook/ko-KR/example.po	2010-07-24 16:36:48 UTC (rev 6808)
+++ doc/trunk/reference/src/main/docbook/ko-KR/example.po	2010-07-25 04:22:37 UTC (rev 6809)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: example\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-05-01T13:53:42\n"
+"POT-Creation-Date: 2010-07-25T03:52:14\n"
 "PO-Revision-Date: 2009-01-14 15:00+1000\n"
 "Last-Translator: Eunju Kim <eukim at redhat.com>\n"
 "Language-Team: Korean <ko at li.org>\n"
@@ -30,11 +30,11 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"Let&#39;s illustrate these ideas with a full example. We&#39;re going to "
-"implement user login/logout for an application that uses JSF. First, we&#39;"
-"ll define a request-scoped bean to hold the username and password entered "
-"during login, with constraints defined using annotations from the Bean "
-"Validation specification:"
+"Let's illustrate these ideas with a full example. We're going to implement "
+"user login/logout for an application that uses JSF. First, we'll define a "
+"request-scoped bean to hold the username and password entered during login, "
+"with constraints defined using annotations from the Bean Validation "
+"specification:"
 msgstr ""
 "이러한 웹 애플리케이션의 예를 살펴봅시다. JSF를 사용하는 애플리케이션의 사용"
 "자 로그인/로그아웃을 구현할 것입니다. 먼저, 로그인시 입력한 사용자 이름 및 암"
@@ -53,7 +53,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"(Note that we&#39;re also going to need a <literal>persistence.xml</literal> "
+"(Note that we're also going to need a <literal>persistence.xml</literal> "
 "file to configure the JPA persistence unit containing <literal>User</"
 "literal>.)"
 msgstr ""
@@ -98,7 +98,7 @@
 #, fuzzy, no-c-format
 msgid ""
 "Hopefully, this example gave you a taste of the CDI programming model. In "
-"the next chapter, we&#39;ll explore dependency injection in greater depth."
+"the next chapter, we'll explore dependency injection in greater depth."
 msgstr ""
 "이러한 예가 Web Bean 프로그래밍 모델의 맛을 보는 계기가 되었으면 합니다. 다"
 "음 부분에서는 Web Beans 의존성 삽입에 대해 자세히 살펴보겠습니다. "

Modified: doc/trunk/reference/src/main/docbook/ko-KR/extend.po
===================================================================
--- doc/trunk/reference/src/main/docbook/ko-KR/extend.po	2010-07-24 16:36:48 UTC (rev 6808)
+++ doc/trunk/reference/src/main/docbook/ko-KR/extend.po	2010-07-25 04:22:37 UTC (rev 6809)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: extend\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-05-01T13:53:42\n"
+"POT-Creation-Date: 2010-07-25T03:52:14\n"
 "PO-Revision-Date: 2009-01-23 11:05+1000\n"
 "Last-Translator: Eunju Kim <eukim at redhat.com>\n"
 "Language-Team: Korean <ko at li.org>\n"
@@ -102,8 +102,8 @@
 msgid ""
 "The first step in creating a portable extension is to write a class that "
 "implements <literal>Extension</literal>. This marker interface does not "
-"define any methods, but it&#39;s needed to satisfy the requirements of Java "
-"SE&#39;s service provider architecture."
+"define any methods, but it's needed to satisfy the requirements of Java SE's "
+"service provider architecture."
 msgstr ""
 
 #. Tag: para
@@ -184,8 +184,8 @@
 #, no-c-format
 msgid ""
 "In fact, the extension can do a lot more than just observe. The extension is "
-"permitted to modify the container&#39;s metamodel and more. Here&#39;s a "
-"very simple example:"
+"permitted to modify the container's metamodel and more. Here's a very simple "
+"example:"
 msgstr ""
 
 #. Tag: para
@@ -227,7 +227,7 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"Let&#39;s study some of the interfaces exposed by the <literal>BeanManager</"
+"Let's study some of the interfaces exposed by the <literal>BeanManager</"
 "literal>."
 msgstr "Web Beans 확장의 중심은 <literal>Manager</literal> 객체입니다.  "
 
@@ -283,8 +283,7 @@
 
 #. Tag: para
 #, no-c-format
-msgid ""
-"There&#39;s an easy way to find out what beans exist in the application:"
+msgid "There's an easy way to find out what beans exist in the application:"
 msgstr ""
 
 #. Tag: para
@@ -320,9 +319,9 @@
 msgid ""
 "In this example, we make a framework class, <literal>SecurityManager</"
 "literal> available for injection. To make things a bit more interesting, "
-"we&#39;re going to delegate back to the container&#39;s "
-"<literal>InjectionTarget</literal> to perform instantiation and injection "
-"upon the <literal>SecurityManager</literal> instance."
+"we're going to delegate back to the container's <literal>InjectionTarget</"
+"literal> to perform instantiation and injection upon the "
+"<literal>SecurityManager</literal> instance."
 msgstr ""
 
 #. Tag: para
@@ -348,8 +347,8 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Let&#39;s start with an example of an extension that provides support for "
-"the use of <literal>@Named</literal> at the package level. The package-level "
+"Let's start with an example of an extension that provides support for the "
+"use of <literal>@Named</literal> at the package level. The package-level "
 "name is used to qualify the EL names of all beans defined in that package. "
 "The portable extension uses the <literal>ProcessAnnotatedType</literal> "
 "event to wrap the <literal>AnnotatedType</literal> object and override the "
@@ -359,7 +358,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Here&#39;s a second example, which adds the <literal>@Alternative</literal> "
+"Here's a second example, which adds the <literal>@Alternative</literal> "
 "annotation to any class which implements a certain <literal>Service</"
 "literal> interface."
 msgstr ""
@@ -390,12 +389,12 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Here&#39;s a CDI portable extension that reads values from properties files "
-"and configures fields of Java EE components, including servlets, EJBs, "
-"managed beans, interceptors and more. In this example, properties for a "
-"class such as <literal>org.mydomain.blog.Blogger</literal> go in a resource "
-"named <literal>org/mydomain/blog/Blogger.properties</literal>, and the name "
-"of a property must match the name of the field to be configured. So "
+"Here's a CDI portable extension that reads values from properties files and "
+"configures fields of Java EE components, including servlets, EJBs, managed "
+"beans, interceptors and more. In this example, properties for a class such "
+"as <literal>org.mydomain.blog.Blogger</literal> go in a resource named "
+"<literal>org/mydomain/blog/Blogger.properties</literal>, and the name of a "
+"property must match the name of the field to be configured. So "
 "<literal>Blogger.properties</literal> could contain:"
 msgstr ""
 
@@ -410,9 +409,9 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"There&#39;s a lot more to the portable extension SPI than what we&#39;ve "
-"discussed here. Check out the CDI spec or Javadoc for more information. For "
-"now, we&#39;ll just mention one more extension point."
+"There's a lot more to the portable extension SPI than what we've discussed "
+"here. Check out the CDI spec or Javadoc for more information. For now, we'll "
+"just mention one more extension point."
 msgstr ""
 
 #. Tag: title

Modified: doc/trunk/reference/src/main/docbook/ko-KR/extensions.po
===================================================================
--- doc/trunk/reference/src/main/docbook/ko-KR/extensions.po	2010-07-24 16:36:48 UTC (rev 6808)
+++ doc/trunk/reference/src/main/docbook/ko-KR/extensions.po	2010-07-25 04:22:37 UTC (rev 6809)
@@ -6,7 +6,7 @@
 "Project-Id-Version: Web_Beans:_Java_Contexts_and_Dependency_Injection "
 "VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-05-01T13:53:42\n"
+"POT-Creation-Date: 2010-07-25T03:52:14\n"
 "PO-Revision-Date: 2009-03-28 17:09+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -59,6 +59,6 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"If you are using Weld as your JSR-299 implementation, there&#39;s no need to "
-"include sl4j as it&#39;s already included (and used internally)."
+"If you are using Weld as your JSR-299 implementation, there's no need to "
+"include sl4j as it's already included (and used internally)."
 msgstr ""

Modified: doc/trunk/reference/src/main/docbook/ko-KR/gettingstarted.po
===================================================================
--- doc/trunk/reference/src/main/docbook/ko-KR/gettingstarted.po	2010-07-24 16:36:48 UTC (rev 6808)
+++ doc/trunk/reference/src/main/docbook/ko-KR/gettingstarted.po	2010-07-25 04:22:37 UTC (rev 6809)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: ri\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-05-01T13:53:42\n"
+"POT-Creation-Date: 2010-07-25T03:52:14\n"
 "PO-Revision-Date: 2009-01-23 11:14+1000\n"
 "Last-Translator: Eunju Kim <eukim at redhat.com>\n"
 "Language-Team: Korean <ko at li.org>\n"
@@ -58,7 +58,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"To run the examples with the provided build scripts, you&#39;ll need the "
+"To run the examples with the provided build scripts, you'll need the "
 "following:"
 msgstr ""
 
@@ -106,7 +106,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"You&#39;ll need a full install of Ant 1.7.0. Some linux distributions only "
+"You'll need a full install of Ant 1.7.0. Some linux distributions only "
 "supply a partial installation of Ant which cause the build to fail. If you "
 "encounter problems, verify that ant-nodeps.jar is on the classpath."
 msgstr ""
@@ -114,7 +114,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"In the next few sections, you&#39;ll be using the Ant command (<literal>ant</"
+"In the next few sections, you'll be using the Ant command (<literal>ant</"
 "literal>) to invoke the Ant build script in each example to compile, "
 "assemble and deploy the example to JBoss AS and, for the war example, Apache "
 "Tomcat. You can also deploy the generated artifact (war or ear) to any other "
@@ -133,7 +133,7 @@
 #, no-c-format
 msgid ""
 "The sections below cover the steps for deploying with both Ant and Maven in "
-"detail. Let&#39;s start with JBoss AS."
+"detail. Let's start with JBoss AS."
 msgstr ""
 
 #. Tag: title
@@ -144,25 +144,25 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"To deploy the examples to JBoss AS, you&#39;ll need <ulink url=\"http://"
-"jboss.org/jbossas/\">JBoss AS 6.0.0</ulink> or above. If a release of the "
-"JBoss AS 6.0 line isn&#39;t yet available, you can download a <ulink url="
-"\"http://hudson.jboss.org/hudson/view/JBoss%20AS/job/JBoss-AS-6.0.x/"
-"\">nightly snapshot</ulink>. The reason JBoss AS 6.0.0 or above is required "
-"is because it&#39;s the first release that has both CDI and Bean Validation "
-"support built-in, making it close enough to Java EE 6 to run the examples. "
-"The good news is that there are no additional modifications you have to make "
-"to the server. It&#39;s ready to go!"
+"To deploy the examples to JBoss AS, you'll need <ulink url=\"http://jboss."
+"org/jbossas/\">JBoss AS 6.0.0</ulink> or above. If a release of the JBoss AS "
+"6.0 line isn't yet available, you can download a <ulink url=\"http://hudson."
+"jboss.org/hudson/view/JBoss%20AS/job/JBoss-AS-6.0.x/\">nightly snapshot</"
+"ulink>. The reason JBoss AS 6.0.0 or above is required is because it's the "
+"first release that has both CDI and Bean Validation support built-in, making "
+"it close enough to Java EE 6 to run the examples. The good news is that "
+"there are no additional modifications you have to make to the server. It's "
+"ready to go!"
 msgstr ""
 
 #. Tag: para
 #, no-c-format
 msgid ""
 "After you have downloaded JBoss AS, extract it. (We recommended renaming the "
-"folder to include the <literal>as</literal> qualifier so it&#39;s clear that "
-"it&#39;s the application server). You can move the extracted folder anywhere "
-"you like. Wherever it lays to rest, that&#39;s what we&#39;ll call the JBoss "
-"AS installation directory, or <literal>JBOSS_HOME</literal>."
+"folder to include the <literal>as</literal> qualifier so it's clear that "
+"it's the application server). You can move the extracted folder anywhere you "
+"like. Wherever it lays to rest, that's what we'll call the JBoss AS "
+"installation directory, or <literal>JBOSS_HOME</literal>."
 msgstr ""
 
 #. Tag: para
@@ -178,7 +178,7 @@
 
 #. Tag: para
 #, fuzzy, no-c-format
-msgid "You&#39;re now ready to deploy your first example!"
+msgid "You're now ready to deploy your first example!"
 msgstr "이제, 첫번째 예제를 배치할 준비가 되었습니다!      "
 
 #. Tag: para
@@ -191,8 +191,8 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"If you haven&#39;t already, start JBoss AS. You can either start JBoss AS "
-"from a Linux shell:"
+"If you haven't already, start JBoss AS. You can either start JBoss AS from a "
+"Linux shell:"
 msgstr ""
 
 #. Tag: para
@@ -284,16 +284,16 @@
 msgid ""
 "The translator uses session beans, which are packaged in an EJB module "
 "within an ear. Java EE 6 will allow session beans to be deployed in war "
-"modules, but that&#39;s a topic for a later chapter."
+"modules, but that's a topic for a later chapter."
 msgstr ""
 
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"Again, wait a few seconds for the application to deploy (if you&#39;re "
-"really bored, read the log messages), and visit <ulink url=\"http://"
-"localhost:8080/weld-translator\">http://localhost:8080/weld-translator</"
-"ulink> to begin pseudo-translating."
+"Again, wait a few seconds for the application to deploy (if you're really "
+"bored, read the log messages), and visit <ulink url=\"http://localhost:8080/"
+"weld-translator\">http://localhost:8080/weld-translator</ulink> to begin "
+"pseudo-translating."
 msgstr ""
 "url (<ulink url=\"http://localhost:8080/webbeans-translator\">http://"
 "localhost:8080/webbeans-translator</ulink>)을 제공하는 컨텍스트 경로를 설정합"
@@ -307,21 +307,21 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Deploying to GlassFish should be easy and familiar, right? After all, it&#39;"
-"s the Java EE 6 reference implementation and Weld is the JSR-299 reference "
-"implementation, meaning Weld gets bundled with GlassFish. So yes, it&#39;s "
-"all quite easy and familiar."
+"Deploying to GlassFish should be easy and familiar, right? After all, it's "
+"the Java EE 6 reference implementation and Weld is the JSR-299 reference "
+"implementation, meaning Weld gets bundled with GlassFish. So yes, it's all "
+"quite easy and familiar."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
 msgid ""
-"To deploy the examples to GlassFish, you&#39;ll need the final <ulink url="
+"To deploy the examples to GlassFish, you'll need the final <ulink url="
 "\"https://glassfish.dev.java.net/downloads/v3-final.html\">GlassFish V3</"
 "ulink> release. Select the release that ends in either <literal>-unix.sh</"
 "literal> or <literal>-windows.exe</literal> depending on your platform. "
-"After the download is complete, execute the installer. On Linux/Unix, "
-"you&#39;ll need to first make the script executable."
+"After the download is complete, execute the installer. On Linux/Unix, you'll "
+"need to first make the script executable."
 msgstr ""
 
 #. Tag: para
@@ -329,15 +329,15 @@
 msgid ""
 "On Windows you can just click on the executable. Follow the instructions in "
 "the installer. It will create a single domain named <literal>domain1</"
-"literal>. You&#39;ll use that domain to deploy the example. We recommend "
-"that you choose <literal>7070</literal> as the main HTTP port to avoid "
-"conflicts with a running instance of JBoss AS (or Apache Tomcat)."
+"literal>. You'll use that domain to deploy the example. We recommend that "
+"you choose <literal>7070</literal> as the main HTTP port to avoid conflicts "
+"with a running instance of JBoss AS (or Apache Tomcat)."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
 msgid ""
-"If you&#39;ve deployed either of the starter examples, <literal>weld-"
+"If you've deployed either of the starter examples, <literal>weld-"
 "numberguess</literal> or <literal>weld-translator</literal>, to JBoss AS, "
 "then you already have the deployable artifact you need. If not, switch to "
 "either of the two directories and build it."
@@ -347,11 +347,11 @@
 #, no-c-format
 msgid ""
 "The deployable archive for the <literal>weld-numberguess</literal>, named "
-"<literal>weld-numberguess.war</literal>, ends up in the example&#39;s "
+"<literal>weld-numberguess.war</literal>, ends up in the example's "
 "<literal>target</literal> directory. The archive for the <literal>weld-"
 "translator</literal> example, named <literal>weld-translator.ear</literal>, "
-"ends up in the example&#39;s <literal>ear/target</literal> directory. All "
-"you need to do now is deploy them to GlassFish."
+"ends up in the example's <literal>ear/target</literal> directory. All you "
+"need to do now is deploy them to GlassFish."
 msgstr ""
 
 #. Tag: para
@@ -370,15 +370,15 @@
 msgid ""
 "After a few seconds you can visit the Admin Console in the browser at the "
 "URL <ulink url=\"http://localhost:4848\">http://localhost:4848</ulink>. In "
-"the tree on the left-hand side of the page, click on &#34;Applications&#34;, "
-"then click on the &#34;Deploy...&#34; button under the heading &#34;"
-"Applications&#34; and select the deployable artifact for either of the two "
-"examples. The deployer should recognize that you have selected a Java EE "
-"artifact and allow you to start it. You can see the examples running at "
-"either <ulink url=\"http://localhost:7070/weld-numberguess\">http://"
-"localhost:7070/weld-numberguess</ulink> or <ulink url=\"http://"
-"localhost:7070/weld-translator\">http://localhost:7070/weld-translator</"
-"ulink>, depending on which example you deployed."
+"the tree on the left-hand side of the page, click on \"Applications\", then "
+"click on the \"Deploy...\" button under the heading \"Applications\" and "
+"select the deployable artifact for either of the two examples. The deployer "
+"should recognize that you have selected a Java EE artifact and allow you to "
+"start it. You can see the examples running at either <ulink url=\"http://"
+"localhost:7070/weld-numberguess\">http://localhost:7070/weld-numberguess</"
+"ulink> or <ulink url=\"http://localhost:7070/weld-translator\">http://"
+"localhost:7070/weld-translator</ulink>, depending on which example you "
+"deployed."
 msgstr ""
 
 #. Tag: para
@@ -415,16 +415,16 @@
 "Weld comes with a servlet listener which bootstraps the CDI environment, "
 "registers the <literal>BeanManager</literal> in JNDI and provides injection "
 "into servlets. Basically, it emulates some of the work done by the Java EE "
-"container. (But you don&#39;t get enterprise features such as session beans "
-"and container-managed transactions.)"
+"container. (But you don't get enterprise features such as session beans and "
+"container-managed transactions.)"
 msgstr ""
 
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"Let&#39;s give the Weld servlet extension a spin on Apache Tomcat. First, "
-"you&#39;ll need to download Tomcat 6.0.18 or later from <ulink url=\"http://"
-"tomcat.apache.org/download-60.cgi\">tomcat.apache.org</ulink> and extract it."
+"Let's give the Weld servlet extension a spin on Apache Tomcat. First, you'll "
+"need to download Tomcat 6.0.18 or later from <ulink url=\"http://tomcat."
+"apache.org/download-60.cgi\">tomcat.apache.org</ulink> and extract it."
 msgstr ""
 "다음으로 <ulink url=\"http://seamframework.org/Download\">seamframework.org</"
 "ulink>에서 Web Beans RI를 다운로드하여 압축 풀기를 합니다. 예: "
@@ -435,8 +435,8 @@
 "You have two choices for how you can deploy the application to Tomcat. You "
 "can deploy it by pushing the artifact to the hot deploy directory using Ant "
 "or you can deploy to the server across HTTP using a Maven plugin. The Ant "
-"approach doesn&#39;t require that you have Maven installed, so we&#39;ll "
-"start there. If you want to use Maven, you can just skip ahead."
+"approach doesn't require that you have Maven installed, so we'll start "
+"there. If you want to use Maven, you can just skip ahead."
 msgstr ""
 
 #. Tag: title
@@ -450,14 +450,14 @@
 "In order for Ant to push the artifact to the Tomcat hot deploy directory, it "
 "needs to know where the Tomcat installation is located. Again, we need to "
 "set a property in the <literal>local.build.properties</literal> file in the "
-"examples directory of the Weld distribution. If you haven&#39;t yet created "
-"this file, do so now. Then assign the path of your Tomcat installation to "
-"the property key <literal>tomcat.home</literal>."
+"examples directory of the Weld distribution. If you haven't yet created this "
+"file, do so now. Then assign the path of your Tomcat installation to the "
+"property key <literal>tomcat.home</literal>."
 msgstr ""
 
 #. Tag: para
 #, fuzzy, no-c-format
-msgid "Now you&#39;re ready to deploy the numberguess example to Tomcat!"
+msgid "Now you're ready to deploy the numberguess example to Tomcat!"
 msgstr "numberguess 예제를 배치하려면:    "
 
 #. Tag: para
@@ -472,7 +472,7 @@
 msgid ""
 "The Ant build script includes additional targets for Tomcat to deploy and "
 "undeploy the archive in either exploded or packaged format. They are the "
-"same target names used for JBoss AS, prefixed with &#34;tomcat.&#34;."
+"same target names used for JBoss AS, prefixed with \"tomcat.\"."
 msgstr ""
 
 #. Tag: para
@@ -508,7 +508,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"If you haven&#39;t already, start Tomcat. You can either start Tomcat from a "
+"If you haven't already, start Tomcat. You can either start Tomcat from a "
 "Linux shell:"
 msgstr ""
 
@@ -531,15 +531,15 @@
 #, no-c-format
 msgid ""
 "You can also deploy the application to Tomcat using Maven. This section is a "
-"bit more advanced, so skip it unless you&#39;re itching to use Maven "
-"natively. Of course, you&#39;ll first need to make sure that you have Maven "
-"installed on your path, similar to how you setup Ant."
+"bit more advanced, so skip it unless you're itching to use Maven natively. "
+"Of course, you'll first need to make sure that you have Maven installed on "
+"your path, similar to how you setup Ant."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
 msgid ""
-"The Maven plugin communicates with Tomcat over HTTP, so it doesn&#39;t care "
+"The Maven plugin communicates with Tomcat over HTTP, so it doesn't care "
 "where you have installed Tomcat. However, the plugin configuration assumes "
 "you are running Tomcat in its default configuration, with a hostname of "
 "localhost and port <literal>8080</literal>. The <literal>readme.txt</"
@@ -597,7 +597,7 @@
 #, no-c-format
 msgid ""
 "There are several other Maven goals that you can use if you are hacking on "
-"the example, which are documented in the example&#39;s <literal>readme.txt</"
+"the example, which are documented in the example's <literal>readme.txt</"
 "literal> file."
 msgstr ""
 
@@ -619,10 +619,10 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"If you&#39;ve read through the entire Tomcat section, then you&#39;re all "
-"ready to go. The Maven build parallels the embedded Tomcat deployment. If "
-"not, don&#39;t worry. We&#39;ll still go over everything that you need to "
-"know again in this section."
+"If you've read through the entire Tomcat section, then you're all ready to "
+"go. The Maven build parallels the embedded Tomcat deployment. If not, don't "
+"worry. We'll still go over everything that you need to know again in this "
+"section."
 msgstr ""
 
 #. Tag: para
@@ -631,7 +631,7 @@
 "The Maven POM (<literal>pom.xml</literal>) includes a profile named "
 "<literal>jetty</literal> that activates the Maven Jetty plugin, which you "
 "can use to start Jetty in embedded mode and deploy the application in place. "
-"You don&#39;t need anything else installed except to have the Maven command "
+"You don't need anything else installed except to have the Maven command "
 "(<literal>mvn</literal>) on your path. The rest will be downloaded from the "
 "internet when the build is run."
 msgstr ""
@@ -703,9 +703,9 @@
 #, no-c-format
 msgid ""
 "Now, you are ready to run the server in Eclipse. Import the project into "
-"your Eclipse workspace using &#34;Import Existing Project into Workspace. "
-"Then, find the start class in <literal>src/jetty/java</literal> and run its "
-"main method as a Java Application. Jetty will launch. You can view the "
+"your Eclipse workspace using \"Import Existing Project into Workspace. Then, "
+"find the start class in <literal>src/jetty/java</literal> and run its main "
+"method as a Java Application. Jetty will launch. You can view the "
 "application at the following local URL: <ulink url=\"http://localhost:8080"
 "\">http://localhost:8080</ulink>. Pay particular attention to the port in "
 "the URL and the lack of a trailing context path."

Modified: doc/trunk/reference/src/main/docbook/ko-KR/injection.po
===================================================================
--- doc/trunk/reference/src/main/docbook/ko-KR/injection.po	2010-07-24 16:36:48 UTC (rev 6808)
+++ doc/trunk/reference/src/main/docbook/ko-KR/injection.po	2010-07-25 04:22:37 UTC (rev 6809)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: injection\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-05-01T14:44:09\n"
+"POT-Creation-Date: 2010-07-25T03:52:14\n"
 "PO-Revision-Date: 2009-01-23 17:37+1000\n"
 "Last-Translator: Eunju Kim <eukim at redhat.com>\n"
 "Language-Team: Korean <ko at li.org>\n"
@@ -124,7 +124,7 @@
 #, fuzzy, no-c-format
 msgid ""
 "Next, the container calls all initializer methods of bean (the call order is "
-"not portable, don&#39;t rely on it)."
+"not portable, don't rely on it)."
 msgstr "그 후, Web Bean 관리자는 Web Bean의 모든 초기화 방식을 호출합니다.  "
 
 #. Tag: para
@@ -162,7 +162,7 @@
 msgid ""
 "This is a case where the <literal>@Inject</literal> annotation <emphasis>is "
 "not</emphasis> required at the injection point. The same is true for "
-"observer methods (which we&#39;ll meet in <xref linkend=\"events\" />) and "
+"observer methods (which we'll meet in <xref linkend=\"events\" />) and "
 "disposer methods."
 msgstr ""
 
@@ -177,9 +177,9 @@
 "The CDI specification defines a procedure, called <emphasis>typesafe "
 "resolution</emphasis>, that the container follows when identifying the bean "
 "to inject to an injection point. This algorithm looks complex at first, but "
-"once you understand it, it&#39;s really quite intuitive. Typesafe resolution "
-"is performed at system initialization time, which means that the container "
-"will inform the developer immediately if a bean&#39;s dependencies cannot be "
+"once you understand it, it's really quite intuitive. Typesafe resolution is "
+"performed at system initialization time, which means that the container will "
+"inform the developer immediately if a bean's dependencies cannot be "
 "satisfied."
 msgstr ""
 "Web Beans 사양은 <emphasis>타입 안정적 해상도 알고리즘</emphasis>이라는 절차"
@@ -228,17 +228,17 @@
 #, no-c-format
 msgid ""
 "Obviously, if you have exactly one bean of a given type, and an injection "
-"point with that same type, then bean A is going to go into slot A. That&#39;"
-"s the simplest possible scenario. When you first start your application, "
-"you&#39;ll likely have lots of those."
+"point with that same type, then bean A is going to go into slot A. That's "
+"the simplest possible scenario. When you first start your application, "
+"you'll likely have lots of those."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
 msgid ""
-"But then, things start to get complicated. Let&#39;s explore how the "
-"container determines which bean to inject in more advanced cases. We&#39;ll "
-"start by taking a closer look at qualifiers."
+"But then, things start to get complicated. Let's explore how the container "
+"determines which bean to inject in more advanced cases. We'll start by "
+"taking a closer look at qualifiers."
 msgstr ""
 
 #. Tag: title
@@ -312,12 +312,12 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Now, you may be thinking, <emphasis>&#34;What&#39;s the different between "
-"using a qualifier and just specifying the exact implementation class you "
-"want?&#34;</emphasis> It&#39;s important to understand that a qualifier is "
-"like an extension of the interface. It does not create a direct dependency "
-"to any particular implementation. There may be multiple alterative "
-"implementations of <literal>@Asynchronous PaymentProcessor</literal>!"
+"Now, you may be thinking, <emphasis>\"What's the different between using a "
+"qualifier and just specifying the exact implementation class you want?\"</"
+"emphasis> It's important to understand that a qualifier is like an extension "
+"of the interface. It does not create a direct dependency to any particular "
+"implementation. There may be multiple alterative implementations of "
+"<literal>@Asynchronous PaymentProcessor</literal>!"
 msgstr ""
 
 #. Tag: title
@@ -334,12 +334,11 @@
 msgid ""
 "Whenever a bean or injection point does not explicitly declare a qualifier, "
 "the container assumes the qualifier <literal>@Default</literal>. From time "
-"to time, you&#39;ll need to decare an injection point without specifying a "
-"qualifier. There&#39;s a qualifier for that too. All beans have the "
-"qualifier <literal>@Any</literal>. Therefore, by explicitly specifying "
-"<literal>@Any</literal> at an injection point, you suppress the default "
-"qualifier, without otherwise restricting the beans that are eligible for "
-"injection."
+"to time, you'll need to decare an injection point without specifying a "
+"qualifier. There's a qualifier for that too. All beans have the qualifier "
+"<literal>@Any</literal>. Therefore, by explicitly specifying <literal>@Any</"
+"literal> at an injection point, you suppress the default qualifier, without "
+"otherwise restricting the beans that are eligible for injection."
 msgstr ""
 
 #. Tag: para
@@ -427,7 +426,7 @@
 "When an ambiguous dependency exists at an injection point, the container "
 "attempts to resolve the ambiguity by looking for an enabled alternative "
 "among the beans that could be injected. If there is exactly one enabled "
-"alternative, that&#39;s the bean that will be injected."
+"alternative, that's the bean that will be injected."
 msgstr ""
 
 #. Tag: title
@@ -452,8 +451,8 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"During the course of your development, you&#39;re going to encounter this "
-"situation. Let&#39;s learn how to resolve it."
+"During the course of your development, you're going to encounter this "
+"situation. Let's learn how to resolve it."
 msgstr ""
 
 #. Tag: para
@@ -527,7 +526,7 @@
 
 #. Tag: para
 #, no-c-format
-msgid "Just remember: &#34;There can be only one.&#34;"
+msgid "Just remember: \"There can be only one.\""
 msgstr ""
 
 #. Tag: para
@@ -535,14 +534,14 @@
 msgid ""
 "On the other hand, if you really do have an optional or multivalued "
 "injection point, you should change the type of your injection point to "
-"<literal>Instance</literal>, as we&#39;ll see in <xref linkend=\"lookup\" />."
+"<literal>Instance</literal>, as we'll see in <xref linkend=\"lookup\" />."
 msgstr ""
 
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"Now there&#39;s one more issue you need to be aware of when using the "
-"dependency injection service."
+"Now there's one more issue you need to be aware of when using the dependency "
+"injection service."
 msgstr ""
 "Web Beans에서 의존성 삽입을 사용할 때 유의하셔야 할 사항이 한 가지 더 있습니"
 "다. "
@@ -632,8 +631,7 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"classes which don&#39;t have a non-private constructor with no parameters, "
-"and"
+"classes which don't have a non-private constructor with no parameters, and"
 msgstr "매개 변수 없는 비전용 생성자를 갖지 않는 클래스, "
 
 #. Tag: para
@@ -653,7 +651,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"It&#39;s usually very easy to fix an unproxyable dependency problem. If an "
+"It's usually very easy to fix an unproxyable dependency problem. If an "
 "injection point of type <literal>X</literal> results in an unproxyable "
 "dependency, simply:"
 msgstr ""
@@ -666,7 +664,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"change the type of the injection point to <literal>Instance&#60;X&#62;</"
+"change the type of the injection point to <literal>Instance&lt;X&gt;</"
 "literal>,"
 msgstr ""
 
@@ -707,7 +705,7 @@
 
 #. Tag: para
 #, no-c-format
-msgid "But we didn&#39;t get around to implementing this yet."
+msgid "But we didn't get around to implementing this yet."
 msgstr ""
 
 #. Tag: title
@@ -799,11 +797,10 @@
 #, no-c-format
 msgid ""
 "Next, we need to obtain an instance of our qualifier type. Since annotatons "
-"are interfaces, we can&#39;t just write <literal>new Asynchronous()</"
-"literal>. It&#39;s also quite tedious to create a concrete implementation of "
-"an annotation type from scratch. Instead, CDI lets us obtain a qualifier "
-"instance by subclassing the helper class <literal>AnnotationLiteral</"
-"literal>."
+"are interfaces, we can't just write <literal>new Asynchronous()</literal>. "
+"It's also quite tedious to create a concrete implementation of an annotation "
+"type from scratch. Instead, CDI lets us obtain a qualifier instance by "
+"subclassing the helper class <literal>AnnotationLiteral</literal>."
 msgstr ""
 
 #. Tag: para
@@ -814,8 +811,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"We can&#39;t use an anonymous class to implement a qualifier type with "
-"members."
+"We can't use an anonymous class to implement a qualifier type with members."
 msgstr ""
 
 #. Tag: para
@@ -883,8 +879,8 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"Let&#39;s look at an example. The following code is verbose, and vulnerable "
-"to refactoring problems:"
+"Let's look at an example. The following code is verbose, and vulnerable to "
+"refactoring problems:"
 msgstr ""
 "다음 예를 살펴봅시다. 다음과 같은 코드는 프로그램을 리팩토링하기에 취약하고 "
 "장황합니다: "
@@ -906,8 +902,8 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"Not convinced? Then here&#39;s a second example. To inject HTTP parameters, "
-"we need to define a qualifier type:"
+"Not convinced? Then here's a second example. To inject HTTP parameters, we "
+"need to define a qualifier type:"
 msgstr ""
 "확신하시지 않습니까? 그러시다면 여기에 두 번째 예제가 있습니다. HTTP 매개 변"
 "수를 삽입하려면, 바인딩 유형을 정의해야 합니다:  "

Modified: doc/trunk/reference/src/main/docbook/ko-KR/interceptors.po
===================================================================
--- doc/trunk/reference/src/main/docbook/ko-KR/interceptors.po	2010-07-24 16:36:48 UTC (rev 6808)
+++ doc/trunk/reference/src/main/docbook/ko-KR/interceptors.po	2010-07-25 04:22:37 UTC (rev 6809)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: interceptors\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-05-01T13:53:43\n"
+"POT-Creation-Date: 2010-07-25T03:52:14\n"
 "PO-Revision-Date: 2009-01-23 11:10+1000\n"
 "Last-Translator: Eunju Kim <eukim at redhat.com>\n"
 "Language-Team: Korean <ko at li.org>\n"
@@ -103,7 +103,7 @@
 msgid ""
 "Suppose we want to declare that some of our beans are transactional. The "
 "first thing we need is an <emphasis>interceptor binding type</emphasis> to "
-"specify exactly which beans we&#39;re interested in:"
+"specify exactly which beans we're interested in:"
 msgstr ""
 "Web Beans의 일부는 트랜젝션할 수 있음을 명시하고자 한다고 가정합니다. 처음으"
 "로 해야할 것은 어떤 Web Beans에 관심이 있는 지를 지정하기 위해 <emphasis>인터"
@@ -131,9 +131,9 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"That&#39;s great, but somewhere along the line we&#39;re going to have to "
-"actually implement the interceptor that provides this transaction management "
-"aspect. All we need to do is create a standard interceptor, and annotate it "
+"That's great, but somewhere along the line we're going to have to actually "
+"implement the interceptor that provides this transaction management aspect. "
+"All we need to do is create a standard interceptor, and annotate it "
 "<literal>@Interceptor</literal> and <literal>@Transactional</literal>."
 msgstr ""
 "행을 따라 어딘가에 이러한 트랜젝션 관리 측면을 제공하기 위해 실제적으로 인터"

Modified: doc/trunk/reference/src/main/docbook/ko-KR/intro.po
===================================================================
--- doc/trunk/reference/src/main/docbook/ko-KR/intro.po	2010-07-24 16:36:48 UTC (rev 6808)
+++ doc/trunk/reference/src/main/docbook/ko-KR/intro.po	2010-07-25 04:22:37 UTC (rev 6809)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: intro\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-05-01T13:53:43\n"
+"POT-Creation-Date: 2010-07-25T03:52:14\n"
 "PO-Revision-Date: 2009-01-29 14:49+1000\n"
 "Last-Translator: Eunju Kim <eukim at redhat.com>\n"
 "Language-Team: Korean <ko at li.org>\n"
@@ -38,11 +38,11 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"So you&#39;re keen to get started writing your first bean? Or perhaps "
-"you&#39;re skeptical, wondering what kinds of hoops the CDI specification "
-"will make you jump through! The good news is that you&#39;ve probably "
-"already written and used hundreds, perhaps thousands of beans. CDI just "
-"makes it easier to actually use them to build an application!"
+"So you're keen to get started writing your first bean? Or perhaps you're "
+"skeptical, wondering what kinds of hoops the CDI specification will make you "
+"jump through! The good news is that you've probably already written and used "
+"hundreds, perhaps thousands of beans. CDI just makes it easier to actually "
+"use them to build an application!"
 msgstr ""
 "첫 번째 Web Bean 작성을 시작해 보시겠습니까? 혹은 어떤 종류의 Web Beans 사양"
 "을 통해 도약하게 될 지를 의아해 하거나 의심하고 계실 수 도 있겠군요! 한 가지 "
@@ -65,14 +65,13 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Prior to Java EE 6, there was no clear definition of the term &#34;bean&#34; "
-"in the Java EE platform. Of course, we&#39;ve been calling Java classes used "
-"in web and enterprise applications &#34;beans&#34; for years. There were "
-"even a couple of different kinds of things called &#34;beans&#34; in EE "
-"specifications, including EJB beans and JSF managed beans. Meanwhile, other "
-"third-party frameworks such as Spring and Seam introduced their own ideas of "
-"what it meant to be a &#34;bean&#34;. What we&#39;ve been missing is a "
-"common definition."
+"Prior to Java EE 6, there was no clear definition of the term \"bean\" in "
+"the Java EE platform. Of course, we've been calling Java classes used in web "
+"and enterprise applications \"beans\" for years. There were even a couple of "
+"different kinds of things called \"beans\" in EE specifications, including "
+"EJB beans and JSF managed beans. Meanwhile, other third-party frameworks "
+"such as Spring and Seam introduced their own ideas of what it meant to be a "
+"\"bean\". What we've been missing is a common definition."
 msgstr ""
 
 #. Tag: para
@@ -84,8 +83,8 @@
 "Old Java Object). They support a small set of basic services, such as "
 "resource injection, lifecycle callbacks and interceptors. Companion "
 "specifications, such as EJB and CDI, build on this basic model. But, "
-"<emphasis>at last</emphasis>, there&#39;s a uniform concept of a bean and a "
-"lightweight component model that&#39;s aligned across the Java EE platform."
+"<emphasis>at last</emphasis>, there's a uniform concept of a bean and a "
+"lightweight component model that's aligned across the Java EE platform."
 msgstr ""
 
 #. Tag: para
@@ -94,31 +93,30 @@
 "With very few exceptions, almost every concrete Java class that has a "
 "constructor with no parameters (or a constructor designated with the "
 "annotation <literal>@Inject</literal>) is a bean. This includes every "
-"JavaBean and every EJB session bean. If you&#39;ve already got some "
-"JavaBeans or session beans lying around, they&#39;re already beans—you "
-"won&#39;t need any additional special metadata. There&#39;s just little one "
-"thing you need to do before you can start injecting them into stuff: you "
-"need to put them in an archive (a jar, or a Java EE module such as a war or "
-"EJB jar) that contains a special marker file: <literal>META-INF/beans.xml</"
-"literal>."
+"JavaBean and every EJB session bean. If you've already got some JavaBeans or "
+"session beans lying around, they're already beans—you won't need any "
+"additional special metadata. There's just little one thing you need to do "
+"before you can start injecting them into stuff: you need to put them in an "
+"archive (a jar, or a Java EE module such as a war or EJB jar) that contains "
+"a special marker file: <literal>META-INF/beans.xml</literal>."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
 msgid ""
-"The JavaBeans and EJBs you&#39;ve been writing every day, up until now, have "
-"not been able to take advantage of the new services defined by the CDI "
-"specification. But you&#39;ll be able to use every one of them with CDI—"
-"allowing the container to create and destroy instances of your beans and "
-"associate them with a designated context, injecting them into other beans, "
-"using them in EL expressions, specializing them with qualifier annotations, "
-"even adding interceptors and decorators to them—without modifying your "
-"existing code. At most, you&#39;ll need to add some annotations."
+"The JavaBeans and EJBs you've been writing every day, up until now, have not "
+"been able to take advantage of the new services defined by the CDI "
+"specification. But you'll be able to use every one of them with CDI—allowing "
+"the container to create and destroy instances of your beans and associate "
+"them with a designated context, injecting them into other beans, using them "
+"in EL expressions, specializing them with qualifier annotations, even adding "
+"interceptors and decorators to them—without modifying your existing code. At "
+"most, you'll need to add some annotations."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Now let&#39;s see how to create your first bean that actually uses CDI."
+msgid "Now let's see how to create your first bean that actually uses CDI."
 msgstr ""
 
 #. Tag: title
@@ -129,7 +127,7 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"Suppose that we have two existing Java classes that we&#39;ve been using for "
+"Suppose that we have two existing Java classes that we've been using for "
 "years in various applications. The first class parses a string into a list "
 "of sentences:"
 msgstr ""
@@ -154,8 +152,8 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"Unfortunately, we don&#39;t have a class that translates whole text "
-"documents. So let&#39;s write a bean for this job:"
+"Unfortunately, we don't have a class that translates whole text documents. "
+"So let's write a bean for this job:"
 msgstr ""
 "불행하게도 전체 텍스트 문서를 번역하는 기존 클래스가 없으므로, 이러한 작업을 "
 "실행하는 Web Bean을 작성합시다:  "
@@ -176,11 +174,11 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"As you&#39;ve guessed, the <literal>@Inject</literal> annotation has "
-"something to do with dependency injection! <literal>@Inject</literal> may be "
-"applied to a constructor or method of a bean, and tells the container to "
-"call that constructor or method when instantiating the bean. The container "
-"will inject other beans into the parameters of the constructor or method."
+"As you've guessed, the <literal>@Inject</literal> annotation has something "
+"to do with dependency injection! <literal>@Inject</literal> may be applied "
+"to a constructor or method of a bean, and tells the container to call that "
+"constructor or method when instantiating the bean. The container will inject "
+"other beans into the parameters of the constructor or method."
 msgstr ""
 "예상하셨듯이, <literal>@Initializer</literal> 어노테이션은 의존성 삽입을 사용"
 "하여 실행하기 위한 무엇인가를 갖고 있습니다! <literal>@Initializer</literal>"
@@ -202,7 +200,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Let&#39;s create a UI controller bean that uses field injection to obtain an "
+"Let's create a UI controller bean that uses field injection to obtain an "
 "instance of the <literal>TextTranslator</literal>, translating the text "
 "entered by a user:"
 msgstr ""
@@ -216,10 +214,10 @@
 #, no-c-format
 msgid ""
 "Notice the controller bean is request-scoped and named. Since this "
-"combination is so common in web applications, there&#39;s a built-in "
-"annotation for it in CDI that we could have used as a shorthand. When the "
-"(stereotype) annotation <literal>@Model</literal> is declared on a class, it "
-"creates a request-scoped and named bean."
+"combination is so common in web applications, there's a built-in annotation "
+"for it in CDI that we could have used as a shorthand. When the (stereotype) "
+"annotation <literal>@Model</literal> is declared on a class, it creates a "
+"request-scoped and named bean."
 msgstr ""
 
 #. Tag: para
@@ -235,11 +233,11 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Notice that it isn&#39;t necessary to create a getter or setter method to "
-"inject one bean into another. CDI can access an injected field directly "
-"(even if it&#39;s private!), which sometimes helps eliminate some wasteful "
-"code. The name of the field is arbitrary. It&#39;s the field&#39;s type that "
-"determines what is injected."
+"Notice that it isn't necessary to create a getter or setter method to inject "
+"one bean into another. CDI can access an injected field directly (even if "
+"it's private!), which sometimes helps eliminate some wasteful code. The name "
+"of the field is arbitrary. It's the field's type that determines what is "
+"injected."
 msgstr ""
 
 #. Tag: para
@@ -265,10 +263,10 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Before we get too deep in the details, let&#39;s pause and examine a "
-"bean&#39;s anatomy. What aspects of the bean are significant, and what gives "
-"it its identity? Instead of just giving examples of beans, we&#39;re going "
-"to define what <emphasis>makes</emphasis> something a bean."
+"Before we get too deep in the details, let's pause and examine a bean's "
+"anatomy. What aspects of the bean are significant, and what gives it its "
+"identity? Instead of just giving examples of beans, we're going to define "
+"what <emphasis>makes</emphasis> something a bean."
 msgstr ""
 
 #, fuzzy

Modified: doc/trunk/reference/src/main/docbook/ko-KR/master.po
===================================================================
--- doc/trunk/reference/src/main/docbook/ko-KR/master.po	2010-07-24 16:36:48 UTC (rev 6808)
+++ doc/trunk/reference/src/main/docbook/ko-KR/master.po	2010-07-25 04:22:37 UTC (rev 6809)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: master\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-05-01T13:53:43\n"
+"POT-Creation-Date: 2010-07-25T03:52:14\n"
 "PO-Revision-Date: 2009-01-09 10:27+1000\n"
 "Last-Translator: Eunju Kim <eukim at redhat.com>\n"
 "Language-Team: Korean <ko at li.org>\n"
@@ -29,20 +29,20 @@
 #, no-c-format
 msgid ""
 "Shortly before the final draft of JSR-299 was submitted, the specification "
-"changed its name from &#34;Web Beans&#34; to &#34;Java Contexts and "
-"Dependency Injection for the Java EE platform&#34;, abbreviated CDI. For a "
-"brief period after the renaming, the reference implementation adopted the "
-"name &#34;Web Beans&#34;. However, this ended up causing more confusion than "
-"it solved and Red Hat decided to change the name of the reference "
-"implementation to &#34;Weld&#34;. You may still find other documentation, "
-"blogs, forum posts, etc. that use the old nomenclature. Please update any "
-"references you can. The naming game is over."
+"changed its name from \"Web Beans\" to \"Java Contexts and Dependency "
+"Injection for the Java EE platform\", abbreviated CDI. For a brief period "
+"after the renaming, the reference implementation adopted the name \"Web Beans"
+"\". However, this ended up causing more confusion than it solved and Red Hat "
+"decided to change the name of the reference implementation to \"Weld\". You "
+"may still find other documentation, blogs, forum posts, etc. that use the "
+"old nomenclature. Please update any references you can. The naming game is "
+"over."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
 msgid ""
-"You&#39;ll also find that some of the functionality that once existed in the "
+"You'll also find that some of the functionality that once existed in the "
 "specification is now missing, such as defining beans in XML. These features "
 "will be available as portable extensions for CDI in the Weld project, and "
 "perhaps other implementations."
@@ -52,11 +52,11 @@
 #, no-c-format
 msgid ""
 "Note that this reference guide was started while changes were still being "
-"made to the specification. We&#39;ve done our best to update it for "
-"accuracy. If you discover a conflict between what is written in this guide "
-"and the specification, the specification is the authority—assume it is "
-"correct. If you believe you have found an error in the specification, please "
-"report it to the JSR-299 EG."
+"made to the specification. We've done our best to update it for accuracy. If "
+"you discover a conflict between what is written in this guide and the "
+"specification, the specification is the authority—assume it is correct. If "
+"you believe you have found an error in the specification, please report it "
+"to the JSR-299 EG."
 msgstr ""
 
 #. Tag: title

Modified: doc/trunk/reference/src/main/docbook/ko-KR/next.po
===================================================================
--- doc/trunk/reference/src/main/docbook/ko-KR/next.po	2010-07-24 16:36:48 UTC (rev 6808)
+++ doc/trunk/reference/src/main/docbook/ko-KR/next.po	2010-07-25 04:22:37 UTC (rev 6809)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: next\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-05-01T13:53:43\n"
+"POT-Creation-Date: 2010-07-25T03:52:14\n"
 "PO-Revision-Date: 2009-01-09 11:31+1000\n"
 "Last-Translator: Eunju Kim <eukim at redhat.com>\n"
 "Language-Team: Korean <ko at li.org>\n"
@@ -26,13 +26,13 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Because CDI is so new, there&#39;s not yet a lot of information available "
+"Because CDI is so new, there's not yet a lot of information available "
 "online. That will change over time. Regardless, the CDI specification "
 "remains the authority for information on CDI. The spec is less than 100 "
-"pages and is quite readable (don&#39;t worry, it&#39;s not like your Blu-ray "
-"player manual). Of course, it covers many details we&#39;ve skipped over "
-"here. The spec is available on the <ulink url=\"http://jcp.org/en/jsr/detail?"
-"id=299\">JSR-299 page</ulink> at the JCP website."
+"pages and is quite readable (don't worry, it's not like your Blu-ray player "
+"manual). Of course, it covers many details we've skipped over here. The spec "
+"is available on the <ulink url=\"http://jcp.org/en/jsr/detail?id=299\">JSR-"
+"299 page</ulink> at the JCP website."
 msgstr ""
 
 #. Tag: para
@@ -42,8 +42,8 @@
 "\"http://seamframework.org/Weld\">Seam project</ulink>. The RI development "
 "team and the CDI spec lead blog at <ulink url=\"http://in.relation.to\">in."
 "relation.to</ulink>. This guide was originally based on a series of blog "
-"entries published there while the specification was being developed. It&#39;"
-"s probably the best source of information about the future of CDI, Weld and "
+"entries published there while the specification was being developed. It's "
+"probably the best source of information about the future of CDI, Weld and "
 "Seam."
 msgstr ""
 "Web Beans Reference 구현은 <literal>http://seamframework.org/WebBeans</"
@@ -80,8 +80,8 @@
 #, no-c-format
 msgid ""
 "Edit the <literal>pom.xml</literal> file in the root of the checkout and "
-"remove the &#34;<literal>-SNAPSHOT</literal>&#34; from the version element "
-"(so you don&#39;t have to build other Weld modules)."
+"remove the \"<literal>-SNAPSHOT</literal>\" from the version element (so you "
+"don't have to build other Weld modules)."
 msgstr ""
 
 #. Tag: para

Modified: doc/trunk/reference/src/main/docbook/ko-KR/part1.po
===================================================================
--- doc/trunk/reference/src/main/docbook/ko-KR/part1.po	2010-07-24 16:36:48 UTC (rev 6808)
+++ doc/trunk/reference/src/main/docbook/ko-KR/part1.po	2010-07-25 04:22:37 UTC (rev 6809)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: part1\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-05-01T13:53:43\n"
+"POT-Creation-Date: 2010-07-25T03:52:14\n"
 "PO-Revision-Date: 2009-01-27 10:42+1000\n"
 "Last-Translator: Eunju Kim <eukim at redhat.com>\n"
 "Language-Team: Korean <ko at li.org>\n"
@@ -181,7 +181,7 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"Where should I keep the reference to it when I&#39;m not currently using it?"
+"Where should I keep the reference to it when I'm not currently using it?"
 msgstr "직접 사용하지 않을 경우 참조 사항을 어디에 보관해야 합니까? "
 
 #. Tag: para
@@ -201,9 +201,9 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"CDI is more than a framework. It&#39;s a whole, rich programming model. The "
+"CDI is more than a framework. It's a whole, rich programming model. The "
 "<emphasis>theme</emphasis> of CDI is <emphasis>loose-coupling with strong "
-"typing</emphasis>. Let&#39;s study what that phrase means."
+"typing</emphasis>. Let's study what that phrase means."
 msgstr ""
 
 #. Tag: para
@@ -259,8 +259,8 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"What&#39;s even more powerful (and comforting) is that CDI provides all "
-"these facilities in a <emphasis>typesafe</emphasis> way. CDI never relies on "
+"What's even more powerful (and comforting) is that CDI provides all these "
+"facilities in a <emphasis>typesafe</emphasis> way. CDI never relies on "
 "string-based identifiers to determine how collaborating objects fit "
 "together. Instead, CDI uses the typing information that is already available "
 "in the Java object model, augmented using a new programming pattern, called "
@@ -280,10 +280,10 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"But CDI isn&#39;t a restrictive programming model. It doesn&#39;t tell you "
-"how you should to structure your application into layers, how you should "
-"handle persistence, or what web framework you have to use. You&#39;ll have "
-"to decide those kinds of things for yourself."
+"But CDI isn't a restrictive programming model. It doesn't tell you how you "
+"should to structure your application into layers, how you should handle "
+"persistence, or what web framework you have to use. You'll have to decide "
+"those kinds of things for yourself."
 msgstr ""
 
 #. Tag: para
@@ -304,8 +304,8 @@
 "CDI was influenced by a number of existing Java frameworks, including Seam, "
 "Guice and Spring. However, CDI has its own, very distinct, character: more "
 "typesafe than Seam, more stateful and less XML-centric than Spring, more web "
-"and enterprise-application capable than Guice. But it couldn&#39;t have been "
-"any of these without inspiration from the frameworks mentioned and "
+"and enterprise-application capable than Guice. But it couldn't have been any "
+"of these without inspiration from the frameworks mentioned and "
 "<emphasis>lots</emphasis> of collaboration and hard work by the JSR-299 "
 "Expert Group (EG)."
 msgstr ""

Modified: doc/trunk/reference/src/main/docbook/ko-KR/part3.po
===================================================================
--- doc/trunk/reference/src/main/docbook/ko-KR/part3.po	2010-07-24 16:36:48 UTC (rev 6808)
+++ doc/trunk/reference/src/main/docbook/ko-KR/part3.po	2010-07-25 04:22:37 UTC (rev 6809)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: part3\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-05-01T13:53:43\n"
+"POT-Creation-Date: 2010-07-25T03:52:14\n"
 "PO-Revision-Date: 2009-01-23 11:11+1000\n"
 "Last-Translator: Eunju Kim <eukim at redhat.com>\n"
 "Language-Team: Korean <ko at li.org>\n"
@@ -21,8 +21,8 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"The first major theme of CDI is <emphasis>loose coupling</emphasis>. We&#39;"
-"ve already seen three means of achieving loose coupling:"
+"The first major theme of CDI is <emphasis>loose coupling</emphasis>. We've "
+"already seen three means of achieving loose coupling:"
 msgstr ""
 
 #. Tag: para
@@ -106,10 +106,10 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"You don&#39;t see string-based identifiers in CDI code, not because the "
+"You don't see string-based identifiers in CDI code, not because the "
 "framework is hiding them from you using clever defaulting rules—so-called "
-"&#34;configuration by convention&#34;—but because there are simply no "
-"strings there to begin with!"
+"\"configuration by convention\"—but because there are simply no strings "
+"there to begin with!"
 msgstr ""
 "Web Beans 코드에서 문자열 기반 식별자를 보실 수 없습니다. 그 이유는 프레임워"
 "크가  &#151; \"관례에 의한 설정\"이라고 부르는 &#151;  기본값 규칙을 사용하"
@@ -212,11 +212,11 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"We&#39;re now ready to meet some more advanced features of CDI. Bear in mind "
+"We're now ready to meet some more advanced features of CDI. Bear in mind "
 "that these features exist to make our code both easier to validate and more "
-"understandable. Most of the time you don&#39;t ever really <emphasis>need</"
-"emphasis> to use these features, but if you use them wisely, you&#39;ll come "
-"to appreciate their power."
+"understandable. Most of the time you don't ever really <emphasis>need</"
+"emphasis> to use these features, but if you use them wisely, you'll come to "
+"appreciate their power."
 msgstr ""
 "이제 Web Beans의 보다 고급 기능에 대해 알아볼 준비가 되었습니다. 이러한 기능"
 "은 코드를 보다 쉽게 유효화하고 이해 가능하게 하기 위해 존재하는 것임을 명심하"

Modified: doc/trunk/reference/src/main/docbook/ko-KR/part4.po
===================================================================
--- doc/trunk/reference/src/main/docbook/ko-KR/part4.po	2010-07-24 16:36:48 UTC (rev 6808)
+++ doc/trunk/reference/src/main/docbook/ko-KR/part4.po	2010-07-25 04:22:37 UTC (rev 6809)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: part4\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-05-01T13:53:43\n"
+"POT-Creation-Date: 2010-07-25T03:52:14\n"
 "PO-Revision-Date: 2009-01-13 16:06+1000\n"
 "Last-Translator: Eunju Kim <eukim at redhat.com>\n"
 "Language-Team: Korean <ko at li.org>\n"
@@ -21,12 +21,12 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"The third theme of CDI is <emphasis>integration</emphasis>. We&#39;ve "
-"already seen how CDI helps integrate EJB and JSF, allowing EJBs to be bound "
-"directly to JSF pages. That&#39;s just the beginning. The CDI services are "
-"integrated into the very core of the Java EE platform. Even EJB session "
-"beans can take advantage of the dependency injection, event bus, and "
-"contextual lifecycle management that CDI provides."
+"The third theme of CDI is <emphasis>integration</emphasis>. We've already "
+"seen how CDI helps integrate EJB and JSF, allowing EJBs to be bound directly "
+"to JSF pages. That's just the beginning. The CDI services are integrated "
+"into the very core of the Java EE platform. Even EJB session beans can take "
+"advantage of the dependency injection, event bus, and contextual lifecycle "
+"management that CDI provides."
 msgstr ""
 
 #. Tag: para
@@ -56,12 +56,12 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"We&#39;re about to see how to take full advantage of the Java EE platform in "
-"an application that uses CDI. We&#39;ll also briefly meet a set of SPIs that "
-"are provided to support portable extensions to CDI. You might not ever need "
-"to use these SPIs directly, but don&#39;t take them for granted. You will "
-"likely be using them indirectly, every time you use a third-party extension, "
-"such as Seam."
+"We're about to see how to take full advantage of the Java EE platform in an "
+"application that uses CDI. We'll also briefly meet a set of SPIs that are "
+"provided to support portable extensions to CDI. You might not ever need to "
+"use these SPIs directly, but don't take them for granted. You will likely be "
+"using them indirectly, every time you use a third-party extension, such as "
+"Seam."
 msgstr ""
 "Web Beans을 사용하는 애플리케이션에서 Java EE 플랫폼의 장점을 최대한으로 활용"
 "하는 방법에 대해 살펴보겠습니다. 또한 Web Beans에 휴대용 확장을 지원하기 위"

Modified: doc/trunk/reference/src/main/docbook/ko-KR/producermethods.po
===================================================================
--- doc/trunk/reference/src/main/docbook/ko-KR/producermethods.po	2010-07-24 16:36:48 UTC (rev 6808)
+++ doc/trunk/reference/src/main/docbook/ko-KR/producermethods.po	2010-07-25 04:22:37 UTC (rev 6809)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: producermethods\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-05-01T13:53:43\n"
+"POT-Creation-Date: 2010-07-25T03:52:15\n"
 "PO-Revision-Date: 2009-01-23 11:12+1000\n"
 "Last-Translator: Eunju Kim <eukim at redhat.com>\n"
 "Language-Team: Korean <ko at li.org>\n"
@@ -30,7 +30,7 @@
 msgid ""
 "Producer methods let us overcome certain limitations that arise when a "
 "container, instead of the application, is responsible for instantiating "
-"objects. They&#39;re also the easiest way to integrate objects which are not "
+"objects. They're also the easiest way to integrate objects which are not "
 "beans into the CDI environment."
 msgstr ""
 "생산자 방식은 Web Bean 관리자가 애플리케이션 대신 인스턴스 객체에 응답할 때 "
@@ -96,9 +96,9 @@
 #, no-c-format
 msgid ""
 "In particular, producer methods let us use runtime polymorphism with CDI. As "
-"we&#39;ve seen, alternative beans are one solution to the problem of "
-"deployment-time polymorphism. But once the system is deployed, the CDI "
-"implementation is fixed. A producer method has no such limitation:"
+"we've seen, alternative beans are one solution to the problem of deployment-"
+"time polymorphism. But once the system is deployed, the CDI implementation "
+"is fixed. A producer method has no such limitation:"
 msgstr ""
 
 #. Tag: para
@@ -149,7 +149,7 @@
 msgid ""
 "Now, when the producer method is called, the returned "
 "<literal>PaymentStrategy</literal> will be bound to the session context. The "
-"producer method won&#39;t be called again in the same session."
+"producer method won't be called again in the same session."
 msgstr ""
 "이제 생산자 방식이 호출되면, 반환된 <literal>PaymentStrategy</literal>는 세"
 "션 컨텍스트로 바운드됩니다. 동일한 세션에서 생산자 방식은 다시 호출되지 않습"
@@ -175,11 +175,11 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"There&#39;s one potential problem with the code above. The implementations "
-"of <literal>CreditCardPaymentStrategy</literal> are instantiated using the "
-"Java <literal>new</literal> operator. Objects instantiated directly by the "
-"application can&#39;t take advantage of dependency injection and don&#39;t "
-"have interceptors."
+"There's one potential problem with the code above. The implementations of "
+"<literal>CreditCardPaymentStrategy</literal> are instantiated using the Java "
+"<literal>new</literal> operator. Objects instantiated directly by the "
+"application can't take advantage of dependency injection and don't have "
+"interceptors."
 msgstr ""
 "위의 코드에 한 가지 문제가 있을 수 있습니다. "
 "<literal>CreditCardPaymentStrategy</literal> 구현은 Java <literal>new</"
@@ -189,7 +189,7 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"If this isn&#39;t what we want, we can use dependency injection into the "
+"If this isn't what we want, we can use dependency injection into the "
 "producer method to obtain bean instances:"
 msgstr ""
 "이러한 방식을 원하지 않을 경우, 의존성 삽입을 생산자 방식으로 사용하여 Web "
@@ -199,13 +199,13 @@
 #, fuzzy, no-c-format
 msgid ""
 "Wait, what if <literal>CreditCardPaymentStrategy</literal> is a request-"
-"scoped bean? Then the producer method has the effect of &#34;promoting&#34; "
-"the current request scoped instance into session scope. This is almost "
-"certainly a bug! The request scoped object will be destroyed by the "
-"container before the session ends, but the reference to the object will be "
-"left &#34;hanging&#34; in the session scope. This error will <emphasis>not</"
-"emphasis> be detected by the container, so please take extra care when "
-"returning bean instances from producer methods!"
+"scoped bean? Then the producer method has the effect of \"promoting\" the "
+"current request scoped instance into session scope. This is almost certainly "
+"a bug! The request scoped object will be destroyed by the container before "
+"the session ends, but the reference to the object will be left \"hanging\" "
+"in the session scope. This error will <emphasis>not</emphasis> be detected "
+"by the container, so please take extra care when returning bean instances "
+"from producer methods!"
 msgstr ""
 "<literal>CreditCardPaymentStrategy</literal>가 요청 범위 Web Bean이면 어떻게 "
 "합니까? 이럴 경우 생산자 방식은 현재 요청 범위 임스턴스를 세선 범위로 \"활성"
@@ -218,7 +218,7 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"There&#39;s at least three ways we could go about fixing this bug. We could "
+"There's at least three ways we could go about fixing this bug. We could "
 "change the scope of the <literal>CreditCardPaymentStrategy</literal> "
 "implementation, but this would affect other clients of that bean. A better "
 "option would be to change the scope of the producer method to "
@@ -255,7 +255,7 @@
 "Then a new <emphasis>dependent</emphasis> instance of "
 "<literal>CreditCardPaymentStrategy</literal> will be created, passed to the "
 "producer method, returned by the producer method and finally bound to the "
-"session context. The dependent object won&#39;t be destroyed until the "
+"session context. The dependent object won't be destroyed until the "
 "<literal>Preferences</literal> object is destroyed, at the end of the "
 "session."
 msgstr ""

Modified: doc/trunk/reference/src/main/docbook/ko-KR/resources.po
===================================================================
--- doc/trunk/reference/src/main/docbook/ko-KR/resources.po	2010-07-24 16:36:48 UTC (rev 6808)
+++ doc/trunk/reference/src/main/docbook/ko-KR/resources.po	2010-07-25 04:22:37 UTC (rev 6809)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: Weld_-_JSR-299_Reference_Implementation VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-05-01T13:53:43\n"
+"POT-Creation-Date: 2010-07-25T03:52:15\n"
 "PO-Revision-Date: 2009-11-11 15:00+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -34,8 +34,8 @@
 "injection in CDI. Most notably, component environment injection relies on "
 "string-based names to qualify ambiguous types, and there is no real "
 "consistency as to the nature of the names (sometimes a JNDI name, sometimes "
-"a persistence unit name, sometimes an EJB link, sometimes a nonportable &#34;"
-"mapped name&#34;). Producer fields turned out to be an elegant adaptor to "
+"a persistence unit name, sometimes an EJB link, sometimes a nonportable "
+"\"mapped name\"). Producer fields turned out to be an elegant adaptor to "
 "reduce all this complexity to a common model and get component environment "
 "resources to participate in the CDI system just like any other kind of bean."
 msgstr ""
@@ -127,10 +127,10 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"It might feel strange to be declaring resources in Java code. Isn&#39;t this "
-"stuff that might be deployment-specific? Certainly, and that&#39;s why it "
-"makes sense to declare your resources in a class annotated "
-"<literal>@Alternative</literal>."
+"It might feel strange to be declaring resources in Java code. Isn't this "
+"stuff that might be deployment-specific? Certainly, and that's why it makes "
+"sense to declare your resources in a class annotated <literal>@Alternative</"
+"literal>."
 msgstr ""
 
 #. Tag: title
@@ -156,9 +156,9 @@
 "It might seem like a pain to have to write these extra producer field "
 "declarations, just to gain an additional level of indirection. You could "
 "just as well use component environment injection directly, right? But "
-"remember that you&#39;re going to be using resources like the "
-"<literal>EntityManager</literal> in several different beans. Isn&#39;t it "
-"nicer and more typesafe to write"
+"remember that you're going to be using resources like the "
+"<literal>EntityManager</literal> in several different beans. Isn't it nicer "
+"and more typesafe to write"
 msgstr ""
 
 #. Tag: para

Modified: doc/trunk/reference/src/main/docbook/ko-KR/ri-spi.po
===================================================================
--- doc/trunk/reference/src/main/docbook/ko-KR/ri-spi.po	2010-07-24 16:36:48 UTC (rev 6808)
+++ doc/trunk/reference/src/main/docbook/ko-KR/ri-spi.po	2010-07-25 04:22:37 UTC (rev 6809)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: ri-spi\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-05-01T13:53:43\n"
+"POT-Creation-Date: 2010-07-25T03:52:15\n"
 "PO-Revision-Date: 2009-01-19 13:32+1000\n"
 "Last-Translator: Eunju Kim <eukim at redhat.com>\n"
 "Language-Team: Korean <ko at li.org>\n"
@@ -49,8 +49,8 @@
 "If you just want to use managed beans, and not take advantage of enterprise "
 "services (EE resource injection, CDI injection into EE component classes, "
 "transactional events, support for CDI services in EJBs) and non-flat "
-"deployments, then the generic servlet support provided by the &#34;Weld: "
-"Servlets&#34; extension will be sufficient, and will work in any container "
+"deployments, then the generic servlet support provided by the \"Weld: "
+"Servlets\" extension will be sufficient, and will work in any container "
 "supporting the Servlet API."
 msgstr ""
 
@@ -95,8 +95,8 @@
 "implementation of the <literal>Environment</literal> interface. A number of "
 "standard environments are built in, and described by the "
 "<literal>Environments</literal> enumeration. Different environments require "
-"different services to be present (for example a Servlet container doesn&#39;"
-"t require transaction, EJB or JPA services). By default an EE environment is "
+"different services to be present (for example a Servlet container doesn't "
+"require transaction, EJB or JPA services). By default an EE environment is "
 "assumed, but you can adjust the environment by calling <literal>bootstrap."
 "setEnvironment()</literal>."
 msgstr ""
@@ -175,7 +175,7 @@
 "BDAs it can access. However many containers will allow an easy mechanism to "
 "make BDAs bi-directionally accessible (such as a library directory). In this "
 "case, it is allowable (and reasonable) to describe all such archives as a "
-"single, &#39;virtual&#39; <literal>BeanDeploymentArchive</literal>."
+"single, 'virtual' <literal>BeanDeploymentArchive</literal>."
 msgstr ""
 
 #. Tag: para
@@ -190,7 +190,7 @@
 #, no-c-format
 msgid ""
 "<literal>BeanDeploymentArchive</literal> provides three methods which allow "
-"it&#39;s contents to be discovered by Weld—<literal>BeanDeploymentArchive."
+"it's contents to be discovered by Weld—<literal>BeanDeploymentArchive."
 "getBeanClasses()</literal> must return all the classes in the BDA, "
 "<literal>BeanDeploymentArchive.getBeansXml()</literal> must return all the "
 "deployment descriptors in the archive, and <literal>BeanDeploymentArchive."
@@ -219,7 +219,7 @@
 "In practice, you can regard the deployment structure represented by "
 "<literal>Deployment</literal>, and the virtual BDA graph as a mirror of the "
 "classloader structure for a deployment. If a class can from BDA X can be "
-"loaded by another in BDA Y, it is accessible, and therefore BDA Y&#39;s "
+"loaded by another in BDA Y, it is accessible, and therefore BDA Y's "
 "accessible BDAs should include BDA X."
 msgstr ""
 
@@ -255,7 +255,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Weld delegates EJB 3 bean discovery to the container so that it doesn&#39;t "
+"Weld delegates EJB 3 bean discovery to the container so that it doesn't "
 "duplicate the work done by the EJB container, and respects any vendor-"
 "extensions to the EJB definition."
 msgstr ""
@@ -326,7 +326,7 @@
 msgid ""
 "If you use a non-EE environment then you may implement any of the EE service "
 "SPIs, and Weld will provide the associated functionality. There is no need "
-"to implement those services you don&#39;t need!"
+"to implement those services you don't need!"
 msgstr ""
 
 #. Tag: title
@@ -556,9 +556,9 @@
 #, no-c-format
 msgid ""
 "Weld expects the Application Server or other container to provide the "
-"storage for each application&#39;s context. The <literal>org.jboss.weld."
-"context.api.BeanStore</literal> should be implemented to provide an "
-"application scoped storage."
+"storage for each application's context. The <literal>org.jboss.weld.context."
+"api.BeanStore</literal> should be implemented to provide an application "
+"scoped storage."
 msgstr ""
 
 #. Tag: title

Modified: doc/trunk/reference/src/main/docbook/ko-KR/scopescontexts.po
===================================================================
--- doc/trunk/reference/src/main/docbook/ko-KR/scopescontexts.po	2010-07-24 16:36:48 UTC (rev 6808)
+++ doc/trunk/reference/src/main/docbook/ko-KR/scopescontexts.po	2010-07-25 04:22:37 UTC (rev 6809)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: scopescontexts\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-05-01T13:53:43\n"
+"POT-Creation-Date: 2010-07-25T03:52:15\n"
 "PO-Revision-Date: 2009-01-22 12:18+1000\n"
 "Last-Translator: Eunju Kim <eukim at redhat.com>\n"
 "Language-Team: Korean <ko at li.org>\n"
@@ -29,7 +29,7 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"So far, we&#39;ve seen a few examples of <emphasis>scope type annotations</"
+"So far, we've seen a few examples of <emphasis>scope type annotations</"
 "emphasis>. The scope of a bean determines the lifecycle of instances of the "
 "bean. The scope also determines which clients refer to which instances of "
 "the bean. According to the CDI specification, a scope determines:"
@@ -74,13 +74,13 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"JPA entities aren&#39;t a great fit for this model. Entities have their "
-"whole own lifecycle and identity model which just doesn&#39;t map naturally "
-"to the model used in CDI. Therefore, we recommend against treating entities "
-"as CDI beans. You&#39;re certainly going to run into problems if you try to "
-"give an entity a scope other than the default scope <literal>@Dependent</"
-"literal>. The client proxy will get in the way if you try to pass an "
-"injected instance to the JPA <literal>EntityManager</literal>."
+"JPA entities aren't a great fit for this model. Entities have their whole "
+"own lifecycle and identity model which just doesn't map naturally to the "
+"model used in CDI. Therefore, we recommend against treating entities as CDI "
+"beans. You're certainly going to run into problems if you try to give an "
+"entity a scope other than the default scope <literal>@Dependent</literal>. "
+"The client proxy will get in the way if you try to pass an injected instance "
+"to the JPA <literal>EntityManager</literal>."
 msgstr ""
 
 #. Tag: title
@@ -91,8 +91,8 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"CDI features an <emphasis>extensible context model</emphasis>. It&#39;s "
-"possible to define new scopes by creating a new scope type annotation:"
+"CDI features an <emphasis>extensible context model</emphasis>. It's possible "
+"to define new scopes by creating a new scope type annotation:"
 msgstr ""
 "Web Beans는 <emphasis>extensible context model</emphasis>을 특징으로 합니다. "
 "새로운 범위 유형 어노테이션을 생성하여 새로운 범위를 정의할 수 있습니다:  "
@@ -100,7 +100,7 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"Of course, that&#39;s the easy part of the job. For this scope type to be "
+"Of course, that's the easy part of the job. For this scope type to be "
 "useful, we will also need to define a <literal>Context</literal> object that "
 "implements the scope! Implementing a <literal>Context</literal> is usually a "
 "very technical task, intended for framework development only. You can expect "
@@ -123,7 +123,7 @@
 
 #. Tag: para
 #, fuzzy, no-c-format
-msgid "Usually, you&#39;ll use one of CDI&#39;s built-in scopes."
+msgid "Usually, you'll use one of CDI's built-in scopes."
 msgstr "주로, Web Beans의 내장된 범위 중 하나를 사용하게 됩니다.  "
 
 #. Tag: title
@@ -238,7 +238,7 @@
 #, fuzzy, no-c-format
 msgid ""
 "Three of the four built-in scopes should be extremely familiar to every Java "
-"EE developer, so let&#39;s not waste time discussing them here. One of the "
+"EE developer, so let's not waste time discussing them here. One of the "
 "scopes, however, is new."
 msgstr ""
 "네 개의 내장된 범위 중 세 개는 모든 Java EE 개발자에게 익숙하므로, 여기서 다"
@@ -386,7 +386,7 @@
 
 #. Tag: para
 #, no-c-format
-msgid "It&#39;s probably better to use one of the link components in JSF 2:"
+msgid "It's probably better to use one of the link components in JSF 2:"
 msgstr ""
 
 #. Tag: para
@@ -394,8 +394,8 @@
 msgid ""
 "The conversation context propagates across redirects, making it very easy to "
 "implement the common POST-then-redirect pattern, without resort to fragile "
-"constructs such as a &#34;flash&#34; object. The container automatically "
-"adds the conversation id to the redirect URL as a request parameter."
+"constructs such as a \"flash\" object. The container automatically adds the "
+"conversation id to the redirect URL as a request parameter."
 msgstr ""
 "Web Bean 관리자는 컨버세이션이 장기 실행으로 표시되어 있지 않아도, 리다이렉트"
 "를 통해 컨버세이션을 보급해야 합니다. 이는 \"플래시\" 객체와 같은 깨지기 쉬"
@@ -462,12 +462,12 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"You can guess what &#34;singleton&#34; means here. It means a bean that is "
-"instantiated once. Unfortunately, there&#39;s a little problem with this "
-"pseudo-scope. Beans with scope <literal>@Singleton</literal> don&#39;t have "
-"a proxy object. Clients hold a direct reference to the singleton instance. "
-"So we need to consider the case of a client that can be serialized, for "
-"example, any bean with scope <literal>@SessionScoped</literal> or "
+"You can guess what \"singleton\" means here. It means a bean that is "
+"instantiated once. Unfortunately, there's a little problem with this pseudo-"
+"scope. Beans with scope <literal>@Singleton</literal> don't have a proxy "
+"object. Clients hold a direct reference to the singleton instance. So we "
+"need to consider the case of a client that can be serialized, for example, "
+"any bean with scope <literal>@SessionScoped</literal> or "
 "<literal>@ConversationScoped</literal>, any dependent object of a bean with "
 "scope <literal>@SessionScoped</literal> or <literal>@ConversationScoped</"
 "literal>, or any stateful session bean."
@@ -477,7 +477,7 @@
 #, no-c-format
 msgid ""
 "Now, if the singleton instance is a simple, immutable, serializable object "
-"like a string, a number or a date, we probably don&#39;t mind too much if it "
+"like a string, a number or a date, we probably don't mind too much if it "
 "gets duplicated via serialization. However, that makes it no stop being a "
 "true singleton, and we may as well have just declared it with the default "
 "scope."
@@ -508,7 +508,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"give the client a reference of type <literal>Instance&#60;X&#62;</literal> "
+"give the client a reference of type <literal>Instance&lt;X&gt;</literal> "
 "where <literal>X</literal> is the bean type of the singleton bean."
 msgstr ""
 
@@ -567,8 +567,8 @@
 "If you need to access a bean directly by EL name in a JSF page, you probably "
 "need to give it a scope other than <literal>@Dependent</literal>. Otherwise, "
 "any value that gets set to the bean by a JSF input will be lost immediately. "
-"That&#39;s why CDI features the <literal>@Model</literal> stereotype; it "
-"lets you give a bean a name, and set its scope to <literal>@RequestScoped</"
+"That's why CDI features the <literal>@Model</literal> stereotype; it lets "
+"you give a bean a name, and set its scope to <literal>@RequestScoped</"
 "literal> in one stroke. If you need to access a bean that really "
 "<emphasis>has</emphasis> to have the scope <literal>@Dependent</literal> "
 "from a JSF page, inject it into a different bean, and expose it to EL via a "
@@ -578,8 +578,8 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Beans with scope <literal>@Dependent</literal> don&#39;t need a proxy "
-"object. The client holds a direct reference to its instance."
+"Beans with scope <literal>@Dependent</literal> don't need a proxy object. "
+"The client holds a direct reference to its instance."
 msgstr ""
 
 #. Tag: para
@@ -644,8 +644,8 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"This feature is particularly useful with producer methods, as we&#39;ll see "
-"in the next chapter."
+"This feature is particularly useful with producer methods, as we'll see in "
+"the next chapter."
 msgstr "특히 이러한 기능은 다음 장에서 다루게 될 생산자 방식에서 유용합니다.  "
 
 #, fuzzy

Modified: doc/trunk/reference/src/main/docbook/ko-KR/specialization.po
===================================================================
--- doc/trunk/reference/src/main/docbook/ko-KR/specialization.po	2010-07-24 16:36:48 UTC (rev 6808)
+++ doc/trunk/reference/src/main/docbook/ko-KR/specialization.po	2010-07-25 04:22:37 UTC (rev 6809)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: specialization\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-05-01T13:53:43\n"
+"POT-Creation-Date: 2010-07-25T03:52:15\n"
 "PO-Revision-Date: 2009-01-23 11:14+1000\n"
 "Last-Translator: Eunju Kim <eukim at redhat.com>\n"
 "Language-Team: Korean <ko at li.org>\n"
@@ -33,15 +33,15 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"When you first start developing with CDI, you&#39;ll likely be dealing only "
-"with a single bean implementation for each bean type. In this case, it&#39;s "
-"easy to understand how beans get selected for injection. As the complexity "
-"of your application grows, multiple occurrences of the same bean type start "
+"When you first start developing with CDI, you'll likely be dealing only with "
+"a single bean implementation for each bean type. In this case, it's easy to "
+"understand how beans get selected for injection. As the complexity of your "
+"application grows, multiple occurrences of the same bean type start "
 "appearing, either because you have multiple implementations or two beans "
-"share a common (Java) inheritance. That&#39;s when you have to begin "
-"studying the specialization, inheritance and alternative rules to work "
-"through unsatisfied or ambiguous dependencies or to avoid certain beans from "
-"being called."
+"share a common (Java) inheritance. That's when you have to begin studying "
+"the specialization, inheritance and alternative rules to work through "
+"unsatisfied or ambiguous dependencies or to avoid certain beans from being "
+"called."
 msgstr ""
 
 #. Tag: para
@@ -70,10 +70,10 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"The second case is the default assumed by CDI. It&#39;s possible to have two "
+"The second case is the default assumed by CDI. It's possible to have two "
 "beans in the system with the same part bean type (interface or parent "
-"class). As you&#39;ve learned, you select between the two implementations "
-"using qualifiers."
+"class). As you've learned, you select between the two implementations using "
+"qualifiers."
 msgstr ""
 
 #. Tag: para
@@ -83,7 +83,7 @@
 "deployment, only one bean can fulfill a given role at a time. That means one "
 "bean needs to be enabled and the other disabled. There are a two modifiers "
 "involved: <literal>@Alternative</literal> and <literal>@Specializes</"
-"literal>. We&#39;ll start by looking at alternatives and then show the "
+"literal>. We'll start by looking at alternatives and then show the "
 "guarantees that specialization adds."
 msgstr ""
 
@@ -107,8 +107,8 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"But in our staging environment, we don&#39;t really want to submit payments "
-"to the external system, so we override that implementation of "
+"But in our staging environment, we don't really want to submit payments to "
+"the external system, so we override that implementation of "
 "<literal>PaymentProcessor</literal> with a different bean:"
 msgstr ""
 "staging 환경에서, 다른 Web Bean을 사용하여 <literal>PaymentProcessor</"
@@ -122,19 +122,18 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"We&#39;ve already seen how we can enable this alternative by listing its "
-"class in the <literal>beans.xml</literal> descriptor."
+"We've already seen how we can enable this alternative by listing its class "
+"in the <literal>beans.xml</literal> descriptor."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
 msgid ""
 "But suppose we have many alternatives in the staging environment. It would "
-"be much more convenient to be able to enable them all at once. So let&#39;s "
-"make <literal>@Staging</literal> an <literal>@Alternative</literal> "
-"stereotype and annotate the staging beans with this stereotype instead. "
-"You&#39;ll see how this level of indirection pays off. First, we create the "
-"stereotype:"
+"be much more convenient to be able to enable them all at once. So let's make "
+"<literal>@Staging</literal> an <literal>@Alternative</literal> stereotype "
+"and annotate the staging beans with this stereotype instead. You'll see how "
+"this level of indirection pays off. First, we create the stereotype:"
 msgstr ""
 
 #. Tag: para
@@ -175,7 +174,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"So we haven&#39;t completely replaced the default implementation in this "
+"So we haven't completely replaced the default implementation in this "
 "deployment of the system. The only way one bean can completely override a "
 "second bean at all injection points is if it implements all the bean types "
 "and declares all the qualifiers of the second bean. However, if the second "
@@ -247,8 +246,8 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Since we&#39;re informing the container that our alternative bean is meant "
-"to stand in as a replacement for the default implementation, the alternative "
+"Since we're informing the container that our alternative bean is meant to "
+"stand in as a replacement for the default implementation, the alternative "
 "implementation automatically inherits all qualifiers of the default "
 "implementation. Thus, in our example, "
 "<literal>MockCreditCardPaymentProcessor</literal> inherits the qualifiers "

Modified: doc/trunk/reference/src/main/docbook/ko-KR/stereotypes.po
===================================================================
--- doc/trunk/reference/src/main/docbook/ko-KR/stereotypes.po	2010-07-24 16:36:48 UTC (rev 6808)
+++ doc/trunk/reference/src/main/docbook/ko-KR/stereotypes.po	2010-07-25 04:22:37 UTC (rev 6809)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: stereotypes\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-05-01T13:53:43\n"
+"POT-Creation-Date: 2010-07-25T03:52:15\n"
 "PO-Revision-Date: 2009-01-20 15:31+1000\n"
 "Last-Translator: Eunju Kim <eukim at redhat.com>\n"
 "Language-Team: Korean <ko at li.org>\n"
@@ -100,7 +100,7 @@
 #, no-c-format
 msgid ""
 "Of course, we need to apply some other annotations to our stereotype or else "
-"it wouldn&#39;t be adding much value."
+"it wouldn't be adding much value."
 msgstr ""
 
 #. Tag: title
@@ -125,7 +125,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Naturally, overriding a single default isn&#39;t much use. But remember, "
+"Naturally, overriding a single default isn't much use. But remember, "
 "stereotypes can define more than just the default scope."
 msgstr ""
 
@@ -206,8 +206,8 @@
 #, no-c-format
 msgid ""
 "This may blow your mind a bit, but stereotypes may declare other "
-"stereotypes, which we&#39;ll call <emphasis>stereotype stacking</emphasis>. "
-"You may want to do this if you have two distinct stereotypes which are "
+"stereotypes, which we'll call <emphasis>stereotype stacking</emphasis>. You "
+"may want to do this if you have two distinct stereotypes which are "
 "meaningful on their own, but in other situation may be meaningful when "
 "combined."
 msgstr ""
@@ -215,7 +215,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Here&#39;s an example that combines the <literal>@Action</literal> and "
+"Here's an example that combines the <literal>@Action</literal> and "
 "<literal>@Auditable</literal> stereotypes:"
 msgstr ""
 
@@ -227,9 +227,8 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"We&#39;ve already met two standard stereotypes defined by the CDI "
-"specification: <literal>@Interceptor</literal> and <literal>@Decorator</"
-"literal>."
+"We've already met two standard stereotypes defined by the CDI specification: "
+"<literal>@Interceptor</literal> and <literal>@Decorator</literal>."
 msgstr ""
 "Web Beans 사양에 의해 정의된 두가지 표준 스테레오타입 <literal>@Interceptor</"
 "literal> 및 <literal>@Decorator</literal>를 살펴보았습니다.  "

Modified: doc/trunk/reference/src/main/docbook/ko-KR/viewlayers.po
===================================================================
--- doc/trunk/reference/src/main/docbook/ko-KR/viewlayers.po	2010-07-24 16:36:48 UTC (rev 6808)
+++ doc/trunk/reference/src/main/docbook/ko-KR/viewlayers.po	2010-07-25 04:22:37 UTC (rev 6809)
@@ -6,7 +6,7 @@
 "Project-Id-Version: Web_Beans:_Java_Contexts_and_Dependency_Injection "
 "VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-05-01T13:53:43\n"
+"POT-Creation-Date: 2010-07-25T03:52:15\n"
 "PO-Revision-Date: 2009-04-19 20:36+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -90,8 +90,8 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Storing the id of any long-running conversation in Wicket&#39;s metadata "
-"when the page response is complete"
+"Storing the id of any long-running conversation in Wicket's metadata when "
+"the page response is complete"
 msgstr ""
 
 #. Tag: para
@@ -134,9 +134,9 @@
 #, no-c-format
 msgid ""
 "When a conversation is marked as long-running, the id of that conversation "
-"will be stored in Wicket&#39;s metadata for the current page. If a new page "
-"is created and set as the response target through <literal>setResponsePage()"
-"</literal>, this new page will also participate in this conversation. This "
+"will be stored in Wicket's metadata for the current page. If a new page is "
+"created and set as the response target through <literal>setResponsePage()</"
+"literal>, this new page will also participate in this conversation. This "
 "occurs for both directly instantiated pages (<literal>setResponsePage(new "
 "OtherPage())</literal>), as well as for bookmarkable pages created with "
 "<literal>setResponsePage(OtherPage.class)</literal> where <literal>OtherPage."

Modified: doc/trunk/reference/src/main/docbook/ko-KR/weldexamples.po
===================================================================
--- doc/trunk/reference/src/main/docbook/ko-KR/weldexamples.po	2010-07-24 16:36:48 UTC (rev 6808)
+++ doc/trunk/reference/src/main/docbook/ko-KR/weldexamples.po	2010-07-25 04:22:37 UTC (rev 6809)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: Weld_-_JSR-299_Reference_Implementation VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-05-01T13:53:43\n"
+"POT-Creation-Date: 2010-07-25T03:52:15\n"
 "PO-Revision-Date: 2009-11-11 15:00+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -21,8 +21,8 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"It&#39;s time to pull the covers back and dive into the internals of Weld "
-"example applications. Let&#39;s start with the simpler of the two examples, "
+"It's time to pull the covers back and dive into the internals of Weld "
+"example applications. Let's start with the simpler of the two examples, "
 "<literal>weld-numberguess</literal>."
 msgstr ""
 
@@ -35,15 +35,15 @@
 #, no-c-format
 msgid ""
 "In the numberguess application you get 10 attempts to guess a number between "
-"1 and 100. After each attempt, you&#39;re told whether your guess was too "
-"high or too low."
+"1 and 100. After each attempt, you're told whether your guess was too high "
+"or too low."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
 msgid ""
 "The numberguess example is comprised of a number of beans, configuration "
-"files and Facelets (JSF) views, packaged as a war module. Let&#39;s start by "
+"files and Facelets (JSF) views, packaged as a war module. Let's start by "
 "examining the configuration files."
 msgstr ""
 
@@ -54,21 +54,21 @@
 "</literal>, which can be found in the <literal>src/main/webapp</literal> "
 "directory of the example. First, we have the JSF 2.0 version of "
 "<literal>faces-config.xml</literal>. A standardized version of Facelets is "
-"the default view handler in JSF 2.0, so there&#39;s really nothing that we "
-"have to configure. Thus, the configuration consists of only the root element."
+"the default view handler in JSF 2.0, so there's really nothing that we have "
+"to configure. Thus, the configuration consists of only the root element."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
 msgid ""
-"There&#39;s also an empty <literal>beans.xml</literal> file, which tells the "
+"There's also an empty <literal>beans.xml</literal> file, which tells the "
 "container to look for beans in this application and to activate the CDI "
 "services."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Finally, there&#39;s the familiar <literal>web.xml</literal>:"
+msgid "Finally, there's the familiar <literal>web.xml</literal>:"
 msgstr ""
 
 #. Tag: para
@@ -105,8 +105,8 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Let&#39;s take a look at the main JSF view, <literal>src/main/webapp/home."
-"xhtml</literal>."
+"Let's take a look at the main JSF view, <literal>src/main/webapp/home.xhtml</"
+"literal>."
 msgstr ""
 
 #. Tag: para
@@ -119,8 +119,8 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"There are a number of messages which can be sent to the user, &#34;Higher!"
-"&#34;, &#34;Lower!&#34; and &#34;Correct!&#34;"
+"There are a number of messages which can be sent to the user, \"Higher!\", "
+"\"Lower!\" and \"Correct!\""
 msgstr ""
 
 #. Tag: para
@@ -138,10 +138,9 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"A validator binding is used to make sure the user doesn&#39;t accidentally "
-"input a number outside of the range in which they can guess - if the "
-"validator wasn&#39;t here, the user might use up a guess on an out of bounds "
-"number."
+"A validator binding is used to make sure the user doesn't accidentally input "
+"a number outside of the range in which they can guess - if the validator "
+"wasn't here, the user might use up a guess on an out of bounds number."
 msgstr ""
 
 #. Tag: para
@@ -177,8 +176,8 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"The <literal>Generator</literal> is application scoped, so we don&#39;t get "
-"a different random each time."
+"The <literal>Generator</literal> is application scoped, so we don't get a "
+"different random each time."
 msgstr ""
 
 #. Tag: para
@@ -192,20 +191,20 @@
 #, no-c-format
 msgid ""
 "The final bean in the application is the session-scoped <literal>Game</"
-"literal> class. This is the primary entry point of the application. It&#39;s "
+"literal> class. This is the primary entry point of the application. It's "
 "responsible for setting up or resetting the game, capturing and validating "
-"the user&#39;s guess and providing feedback to the user with a "
-"<literal>FacesMessage</literal>. We&#39;ve used the post-construct lifecycle "
+"the user's guess and providing feedback to the user with a "
+"<literal>FacesMessage</literal>. We've used the post-construct lifecycle "
 "method to initialize the game by retrieving a random number from the "
-"<literal>@Random Instance&#60;Integer&#62;</literal> bean."
+"<literal>@Random Instance&lt;Integer&gt;</literal> bean."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
 msgid ""
-"You&#39;ll notice that we&#39;ve also added the <literal>@Named</literal> "
-"annotation to this class. This annotation is only required when you want to "
-"make the bean accessible to a JSF view via EL (i.e., #{game})."
+"You'll notice that we've also added the <literal>@Named</literal> annotation "
+"to this class. This annotation is only required when you want to make the "
+"bean accessible to a JSF view via EL (i.e., #{game})."
 msgstr ""
 
 #. Tag: title
@@ -237,9 +236,8 @@
 #, no-c-format
 msgid ""
 "Second, we need to explicitly specify the servlet listener in <literal>web."
-"xml</literal>, again because the container isn&#39;t doing this stuff for "
-"you. The servlet listener boots Weld and controls it&#39;s interaction with "
-"requests."
+"xml</literal>, again because the container isn't doing this stuff for you. "
+"The servlet listener boots Weld and controls it's interaction with requests."
 msgstr ""
 
 #. Tag: para
@@ -248,8 +246,8 @@
 "When Weld boots, it places the <literal>javax.enterprise.inject.spi."
 "BeanManager</literal>, the portable SPI for obtaining bean instances, in the "
 "ServletContext under a variable name equal to the fully-qualified interface "
-"name. You generally don&#39;t need to access this interface, but Weld makes "
-"use of it."
+"name. You generally don't need to access this interface, but Weld makes use "
+"of it."
 msgstr ""
 
 #. Tag: title
@@ -262,7 +260,7 @@
 msgid ""
 "Weld includes a number of portable extensions for JSR-299, including an "
 "extension for Wicket, which allows you to inject beans into Wicket "
-"components and leverage the conversation context. In this section, we&#39;ll "
+"components and leverage the conversation context. In this section, we'll "
 "walk you through the Wicket version of the numberguess example."
 msgstr ""
 
@@ -271,7 +269,7 @@
 msgid ""
 "You may want to review the Wicket documentation at <ulink url=\"http://"
 "wicket.apache.org/\">http://wicket.apache.org/</ulink> before reading this "
-"section, if you aren&#39;t already familiar with the framework."
+"section, if you aren't already familiar with the framework."
 msgstr ""
 
 #. Tag: para
@@ -280,17 +278,17 @@
 "Wicket is another environment that relies on the Weld servlet extension. The "
 "use of <ulink url=\"http://jetty.mortbay.org\">Jetty</ulink> is common in "
 "the Wicket community, and is thus chosen here as the runtime container. "
-"You&#39;ve seen already that Jetty is perfectly capable of running CDI "
+"You've seen already that Jetty is perfectly capable of running CDI "
 "applications with Weld add-ons, and this environment is no different."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
 msgid ""
-"We&#39;ll also be using the Eclipse IDE in these examples. Instructions are "
+"We'll also be using the Eclipse IDE in these examples. Instructions are "
 "provided later for running the example from the command line, but since "
-"you&#39;ll likely need to do more than just deploy examples, we&#39;ll get "
-"setup in this full development environment."
+"you'll likely need to do more than just deploy examples, we'll get setup in "
+"this full development environment."
 msgstr ""
 
 #. Tag: title
@@ -313,7 +311,7 @@
 #, no-c-format
 msgid ""
 "If you have m2eclipse installed, you can open any Maven project directly. "
-"From within Eclipse, select <emphasis>File -&#62; Import... -&#62; Maven "
+"From within Eclipse, select <emphasis>File -&gt; Import... -&gt; Maven "
 "Projects</emphasis>. Then, browse to the location of the Wicket numberguess "
 "example. You should see that Eclipse recognizes the existence of a Maven "
 "project."
@@ -329,24 +327,24 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"You&#39;ll notice after importing, the project has a build error. That&#39;s "
-"because we need to enable a Maven profile. Right-click on the project and "
-"select <emphasis>Properties</emphasis>, then select the <emphasis>Maven</"
-"emphasis> tab in the window that appears. In the form field labeled &#34;"
-"Active Maven Profiles (comma separated):&#34;, type <literal>jetty</"
-"literal>. That will enable some extra dependencies that allow the project to "
-"compile. Additionally, <emphasis>uncheck</emphasis> the box labeled &#34;"
-"Skip Maven compile plugin when processing resources (recommended)&#34;. That "
-"solves an incompatiblity between the m2eclipse plugin and the Maven enforcer "
-"plugin that we use for the Weld project. Now, you&#39;re ready to develop!"
+"You'll notice after importing, the project has a build error. That's because "
+"we need to enable a Maven profile. Right-click on the project and select "
+"<emphasis>Properties</emphasis>, then select the <emphasis>Maven</emphasis> "
+"tab in the window that appears. In the form field labeled \"Active Maven "
+"Profiles (comma separated):\", type <literal>jetty</literal>. That will "
+"enable some extra dependencies that allow the project to compile. "
+"Additionally, <emphasis>uncheck</emphasis> the box labeled \"Skip Maven "
+"compile plugin when processing resources (recommended)\". That solves an "
+"incompatiblity between the m2eclipse plugin and the Maven enforcer plugin "
+"that we use for the Weld project. Now, you're ready to develop!"
 msgstr ""
 
 #. Tag: para
 #, no-c-format
 msgid ""
-"Be sure to uncheck the box &#34;Skip Maven compile plugin when processing "
-"resources (recommended)&#34; in the Maven properties screen or else the "
-"example might not run in Eclipse because beans.xml will be missing from the "
+"Be sure to uncheck the box \"Skip Maven compile plugin when processing "
+"resources (recommended)\" in the Maven properties screen or else the example "
+"might not run in Eclipse because beans.xml will be missing from the "
 "classpath! See the <ulink url=\"https://issues.sonatype.org/browse/"
 "MNGECLIPSE-768\">MNGECLIPSE-768</ulink> issue report for details."
 msgstr ""
@@ -363,15 +361,15 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Then, from Eclipse, choose <emphasis>File -&#62; Import... -&#62; General -"
-"&#62; Existing Projects into Workspace</emphasis>, select the root directory "
+"Then, from Eclipse, choose <emphasis>File -&gt; Import... -&gt; General -"
+"&gt; Existing Projects into Workspace</emphasis>, select the root directory "
 "of the numberguess example, and click Finish. This will create a project in "
 "your workspace called <literal>weld-wicket-numberguess</literal>."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "It&#39;s time to get the example running!"
+msgid "It's time to get the example running!"
 msgstr ""
 
 #. Tag: title
@@ -430,7 +428,7 @@
 
 #. Tag: para
 #, no-c-format
-msgid "Enough toying with deployment, let&#39;s dive into the code."
+msgid "Enough toying with deployment, let's dive into the code."
 msgstr ""
 
 #. Tag: title
@@ -462,7 +460,7 @@
 
 #. Tag: para
 #, no-c-format
-msgid "Here&#39;s where things differ from the JSF numberguess example:"
+msgid "Here's where things differ from the JSF numberguess example:"
 msgstr ""
 
 #. Tag: para
@@ -585,8 +583,8 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Let&#39;s have a look at the significant code and configuration files that "
-"make up this example."
+"Let's have a look at the significant code and configuration files that make "
+"up this example."
 msgstr ""
 
 #. Tag: para
@@ -600,8 +598,8 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"The game&#39;s main logic is located in <literal>Game.java</literal>. Here "
-"is the code for that class, highlighting the ways in which this differs from "
+"The game's main logic is located in <literal>Game.java</literal>. Here is "
+"the code for that class, highlighting the ways in which this differs from "
 "the web application version:"
 msgstr ""
 
@@ -609,14 +607,14 @@
 #, no-c-format
 msgid ""
 "The bean is application scoped rather than session scoped, since an instance "
-"of a Swing application typically represents a single &#39;session&#39;."
+"of a Swing application typically represents a single 'session'."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
 msgid ""
-"Notice that the bean is not named, since it doesn&#39;t need to be accessed "
-"via EL."
+"Notice that the bean is not named, since it doesn't need to be accessed via "
+"EL."
 msgstr ""
 
 #. Tag: para
@@ -657,9 +655,9 @@
 msgid ""
 "The <literal>reset()</literal> method makes a call to the injected "
 "<literal>rndGenerator</literal> in order to get the random number at the "
-"start of each game. Note that it can&#39;t use <literal>Instance.get()</"
-"literal> like the JSF example does because there will not be any active "
-"contexts like there are during a JSF request."
+"start of each game. Note that it can't use <literal>Instance.get()</literal> "
+"like the JSF example does because there will not be any active contexts like "
+"there are during a JSF request."
 msgstr ""
 
 #. Tag: para
@@ -667,8 +665,8 @@
 msgid ""
 "The <literal>MessageGenerator</literal> class depends on the current "
 "instance of <literal>Game</literal> and queries its state in order to "
-"determine the appropriate messages to provide as the prompt for the user&#39;"
-"s next guess and the response to the previous guess. The code for "
+"determine the appropriate messages to provide as the prompt for the user's "
+"next guess and the response to the previous guess. The code for "
 "<literal>MessageGenerator</literal> is as follows:"
 msgstr ""
 
@@ -681,7 +679,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"The <literal>Game</literal>&#39;s state is interrogated to determine the "
+"The <literal>Game</literal>'s state is interrogated to determine the "
 "appropriate challenge message ..."
 msgstr ""
 
@@ -726,8 +724,8 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"<literal>guessButtonActionPerformed</literal> is called when the &#39;"
-"Guess&#39; button is clicked, and it does the following:"
+"<literal>guessButtonActionPerformed</literal> is called when the 'Guess' "
+"button is clicked, and it does the following:"
 msgstr ""
 
 #. Tag: para
@@ -740,8 +738,8 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Calls <literal>game.check()</literal> to validate and perform one &#39;"
-"turn&#39; of the game"
+"Calls <literal>game.check()</literal> to validate and perform one 'turn' of "
+"the game"
 msgstr ""
 
 #. Tag: para
@@ -780,7 +778,7 @@
 #, no-c-format
 msgid ""
 "The translator example is built as an ear and contains EJBs. As a result, "
-"it&#39;s structure is more complex than the numberguess example."
+"it's structure is more complex than the numberguess example."
 msgstr ""
 
 #. Tag: para
@@ -794,10 +792,9 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"First, let&#39;s take a look at the ear aggregator, which is located in the "
-"example&#39;s <literal>ear</literal> directory. Maven automatically "
-"generates the <literal>application.xml</literal> for us from this plugin "
-"configuration:"
+"First, let's take a look at the ear aggregator, which is located in the "
+"example's <literal>ear</literal> directory. Maven automatically generates "
+"the <literal>application.xml</literal> for us from this plugin configuration:"
 msgstr ""
 
 #. Tag: para
@@ -811,18 +808,18 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"If you weren&#39;t using Maven to generate these files, you would need "
+"If you weren't using Maven to generate these files, you would need "
 "<literal>META-INF/application.xml</literal>:"
 msgstr ""
 
 #. Tag: para
 #, no-c-format
 msgid ""
-"Next, lets look at the war, which is located in the example&#39;s "
-"<literal>war</literal> directory. Just as in the numberguess example, we "
-"have a <literal>faces-config.xml</literal> for JSF 2.0 and a <literal>web."
-"xml</literal> (to activate JSF) under WEB-INF, both sourced from "
-"<literal>src/main/webapp/WEB-INF</literal>."
+"Next, lets look at the war, which is located in the example's <literal>war</"
+"literal> directory. Just as in the numberguess example, we have a "
+"<literal>faces-config.xml</literal> for JSF 2.0 and a <literal>web.xml</"
+"literal> (to activate JSF) under WEB-INF, both sourced from <literal>src/"
+"main/webapp/WEB-INF</literal>."
 msgstr ""
 
 #. Tag: para
@@ -843,21 +840,21 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Finally, let&#39;s look at the EJB module, which is located in the "
-"example&#39;s <literal>ejb</literal> directory. In <literal>src/main/"
-"resources/META-INF</literal> there is just an empty <literal>beans.xml</"
-"literal>, used to mark the archive as containing beans."
+"Finally, let's look at the EJB module, which is located in the example's "
+"<literal>ejb</literal> directory. In <literal>src/main/resources/META-INF</"
+"literal> there is just an empty <literal>beans.xml</literal>, used to mark "
+"the archive as containing beans."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
 msgid ""
-"We&#39;ve saved the most interesting bit to last, the code! The project has "
-"two simple beans, <literal>SentenceParser</literal> and "
-"<literal>TextTranslator</literal> and two session beans, "
-"<literal>TranslatorControllerBean</literal> and <literal>SentenceTranslator</"
-"literal>. You should be getting quite familiar with what a bean looks like "
-"by now, so we&#39;ll just highlight the most interesting bits here."
+"We've saved the most interesting bit to last, the code! The project has two "
+"simple beans, <literal>SentenceParser</literal> and <literal>TextTranslator</"
+"literal> and two session beans, <literal>TranslatorControllerBean</literal> "
+"and <literal>SentenceTranslator</literal>. You should be getting quite "
+"familiar with what a bean looks like by now, so we'll just highlight the "
+"most interesting bits here."
 msgstr ""
 
 #. Tag: para
@@ -874,9 +871,9 @@
 "<literal>TextTranslator</literal> uses the simple bean (really just a plain "
 "Java class!) <literal>SentenceParser</literal> to parse the sentence and "
 "then calls on the stateless bean with the local business interface "
-"<literal>Translator</literal> to perform the translation. That&#39;s where "
-"the magic happens. Of course, we couldn&#39;t develop a full translator, but "
-"it&#39;s convincing enough to anyone who doesn&#39;t understand Latin!"
+"<literal>Translator</literal> to perform the translation. That's where the "
+"magic happens. Of course, we couldn't develop a full translator, but it's "
+"convincing enough to anyone who doesn't understand Latin!"
 msgstr ""
 
 #. Tag: para

Modified: doc/trunk/reference/src/main/docbook/ko-KR/xml.po
===================================================================
--- doc/trunk/reference/src/main/docbook/ko-KR/xml.po	2010-07-24 16:36:48 UTC (rev 6808)
+++ doc/trunk/reference/src/main/docbook/ko-KR/xml.po	2010-07-25 04:22:37 UTC (rev 6809)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: xml\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-05-01T13:53:43\n"
+"POT-Creation-Date: 2010-07-25T03:52:15\n"
 "PO-Revision-Date: 2009-01-23 11:16+1000\n"
 "Last-Translator: Eunju Kim <eukim at redhat.com>\n"
 "Language-Team: Korean <ko at li.org>\n"
@@ -32,9 +32,9 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"So far, we&#39;ve seen plenty of examples of beans declared using "
-"annotations. However, there are a couple of occasions when we can&#39;t use "
-"annotations to define the bean:"
+"So far, we've seen plenty of examples of beans declared using annotations. "
+"However, there are a couple of occasions when we can't use annotations to "
+"define the bean:"
 msgstr ""
 "지금까지 어노테이션을 사용하여 명시된 여러 가지 Web Beans의 예를 살펴보았습니"
 "다. 하지만 Web Bean을 정의하기 위해 어노테이션을 사용할 수 없는 경우가 종종 "
@@ -78,10 +78,10 @@
 #, fuzzy, no-c-format
 msgid ""
 "The advantage of this approach is that you can write an XML schema that "
-"prevents spelling errors in your XML document. It&#39;s even possible for a "
-"tool to generate the XML schema automatically from the compiled Java code. "
-"Or, an integrated development environment could perform the same validation "
-"without the need for the explicit intermediate generation step."
+"prevents spelling errors in your XML document. It's even possible for a tool "
+"to generate the XML schema automatically from the compiled Java code. Or, an "
+"integrated development environment could perform the same validation without "
+"the need for the explicit intermediate generation step."
 msgstr ""
 "이러한 접근 방법의 장점은 XML 문서에서 스펠링 오류가 나타나지 않게 하는 XML "
 "스키마를 작성할 수 있다는 것입니다. 컴파일된 Java 코드에서 XML 스키마를 자동"
@@ -123,7 +123,7 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"For example, the element <literal>&#60;util:Date/&#62;</literal> in the "
+"For example, the element <literal>&lt;util:Date/&gt;</literal> in the "
 "following XML fragment refers to the class <literal>java.util.Date</literal>:"
 msgstr ""
 "예를 들어, 다음의 XML 부분에 있는 <literal>&lt;util:Date/&gt;</literal> 요소"
@@ -205,7 +205,7 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"The <literal>&#60;Name&#62;</literal> element declares a bean of scope "
+"The <literal>&lt;Name&gt;</literal> element declares a bean of scope "
 "<literal>@Dependent</literal> and class <literal>Name</literal>, with a set "
 "of initial field values. This bean has a special, container-generated "
 "qualifier and is therefore injectable only to the specific injection point "
@@ -220,8 +220,8 @@
 #, fuzzy, no-c-format
 msgid ""
 "This simple but powerful feature allows the Weld XML format to be used to "
-"specify whole graphs of Java objects. It&#39;s not quite a full databinding "
-"solution, but it&#39;s close!"
+"specify whole graphs of Java objects. It's not quite a full databinding "
+"solution, but it's close!"
 msgstr ""
 "이러한 간단하지만 강력한 기능은 Web Beans XML 포맷이 Java 객체의 전체 그래프"
 "를 지정하는데 사용하게 합니다. 이는 완전한 데이터바인딩 솔루션이 아니지만, 근"
@@ -235,10 +235,9 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"If we want our XML document format to be authored by people who aren&#39;t "
-"Java developers, or who don&#39;t have access to our code, we need to "
-"provide a schema. There&#39;s nothing specific to Weld about writing or "
-"using the schema."
+"If we want our XML document format to be authored by people who aren't Java "
+"developers, or who don't have access to our code, we need to provide a "
+"schema. There's nothing specific to Weld about writing or using the schema."
 msgstr ""
 "Java 개발자 이외나 또는 코드로 액세스할 수 없는 사람들에 의해 작성된 XML 문"
 "서 형식을 원하실 경우, 스키마를 제공해야 합니다. 스키마를 사용 또는 작성에 관"

Modified: doc/trunk/reference/src/main/docbook/pt-BR/beans.po
===================================================================
--- doc/trunk/reference/src/main/docbook/pt-BR/beans.po	2010-07-24 16:36:48 UTC (rev 6808)
+++ doc/trunk/reference/src/main/docbook/pt-BR/beans.po	2010-07-25 04:22:37 UTC (rev 6809)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: Weld_-_JSR-299_Reference_Implementation VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-05-01T14:44:09\n"
+"POT-Creation-Date: 2010-07-25T03:52:14\n"
 "PO-Revision-Date: 2010-04-14 15:37-0300\n"
 "Last-Translator: Bruno Leonardo Gonçalves <brunolmfg at gmail.com>\n"
 "Language-Team: none\n"
@@ -38,13 +38,13 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"Let&#39;s back up a second. What does it really mean to be "
-"<emphasis>contextual</emphasis>? Since beans may be stateful, it matters "
-"<emphasis>which</emphasis> bean instance I have. Unlike a stateless "
-"component model (for example, stateless session beans) or a singleton "
-"component model (such as servlets, or singleton beans), different clients of "
-"a bean see the bean in different states. The client-visible state depends "
-"upon which instance of the bean the client has a reference to."
+"Let's back up a second. What does it really mean to be <emphasis>contextual</"
+"emphasis>? Since beans may be stateful, it matters <emphasis>which</"
+"emphasis> bean instance I have. Unlike a stateless component model (for "
+"example, stateless session beans) or a singleton component model (such as "
+"servlets, or singleton beans), different clients of a bean see the bean in "
+"different states. The client-visible state depends upon which instance of "
+"the bean the client has a reference to."
 msgstr ""
 "Vamos voltar um segundo. O que realmente significa ser <emphasis>contextual</"
 "emphasis>? Uma vez que os beans podem ser stateful, é importante saber "
@@ -112,10 +112,10 @@
 msgid ""
 "One great advantage of the contextual model is that it allows stateful beans "
 "to be treated like services! The client need not concern itself with "
-"managing the lifecycle of the bean it&#39;s using, <emphasis>nor does it "
-"even need to know what that lifecycle is.</emphasis> Beans interact by "
-"passing messages, and the bean implementations define the lifecycle of their "
-"own state. The beans are loosely coupled because:"
+"managing the lifecycle of the bean it's using, <emphasis>nor does it even "
+"need to know what that lifecycle is.</emphasis> Beans interact by passing "
+"messages, and the bean implementations define the lifecycle of their own "
+"state. The beans are loosely coupled because:"
 msgstr ""
 "Uma grande vantagem do modelo contextual é que ele permite que stateful "
 "beans sejam tratados como serviços!  O cliente não precisa se preocupar com "
@@ -217,7 +217,7 @@
 
 #. Tag: para
 #, fuzzy, no-c-format
-msgid "Let&#39;s see what all this new terminology means."
+msgid "Let's see what all this new terminology means."
 msgstr "Vamos ver o que toda esta nova terminologia significa."
 
 #. Tag: title
@@ -229,8 +229,8 @@
 #, fuzzy, no-c-format
 msgid ""
 "Beans usually acquire references to other beans via dependency injection. "
-"Any injected attribute specifies a &#34;contract&#34; that must be satisfied "
-"by the bean to be injected. The contract is:"
+"Any injected attribute specifies a \"contract\" that must be satisfied by "
+"the bean to be injected. The contract is:"
 msgstr ""
 "Beans usualmente adquirem referências para outros beans por meio de injeção "
 "de dependência. Qualquer atributo injetado especifica um \"contrato\" que "
@@ -265,7 +265,7 @@
 #, fuzzy, no-c-format
 msgid ""
 "The bean types are <literal>BookShop</literal>, <literal>Business</literal> "
-"and <literal>Shop&#60;Book&#62;</literal>, as well as the implicit type "
+"and <literal>Shop&lt;Book&gt;</literal>, as well as the implicit type "
 "<literal>java.lang.Object</literal>. (Notice that a parameterized type is a "
 "legal bean type)."
 msgstr ""
@@ -292,9 +292,9 @@
 msgid ""
 "The bean types of a session bean include local interfaces and the bean class "
 "local view (if any). EJB remote interfaces are not considered bean types of "
-"a session bean. You can&#39;t inject an EJB using its remote interface "
-"unless you define a <emphasis>resource</emphasis>, which we&#39;ll meet in "
-"<xref linkend=\"resources\" />."
+"a session bean. You can't inject an EJB using its remote interface unless "
+"you define a <emphasis>resource</emphasis>, which we'll meet in <xref "
+"linkend=\"resources\" />."
 msgstr ""
 "Os tipos de bean de um session bean incluem suas interfaces locais e a "
 "classe de visão local do bean (se houver). As interfaces remotas do EJB não "
@@ -309,7 +309,7 @@
 "Bean types may be restricted to an explicit set by annotating the bean with "
 "the <literal>@Typed</literal> annotation and listing the classes that should "
 "be bean types. For instance, the bean types of this bean have been "
-"restricted to <literal>Shop&#60;Book&#62;</literal>, together with "
+"restricted to <literal>Shop&lt;Book&gt;</literal>, together with "
 "<literal>java.lang.Object</literal>:"
 msgstr ""
 "Os tipos do bean podem ser limitados a um conjunto explícito, anotando o "
@@ -328,8 +328,8 @@
 "<literal>DebitPaymentProcessor</literal>. Injecting a field of type "
 "<literal>PaymentProcessor</literal> introduces an ambiguous condition. In "
 "these cases, the client must specify some additional quality of the "
-"implementation it is interested in. We model this kind of &#34;quality&#34; "
-"using a qualifier."
+"implementation it is interested in. We model this kind of \"quality\" using "
+"a qualifier."
 msgstr ""
 "Algumas vezes um tipo de bean sozinho não fornece informação suficiente para "
 "o contêiner saber qual bean injetar. Por exemplo, suponha que temos duas "
@@ -347,7 +347,7 @@
 "A qualifier is a user-defined annotation that is itself annotated "
 "<literal>@Qualifer</literal>. A qualifier annotation is an extension of the "
 "type system. It lets us disambiguate a type without having to fall back to "
-"string-based names. Here&#39;s an example of a qualifier annotation:"
+"string-based names. Here's an example of a qualifier annotation:"
 msgstr ""
 "Um qualificador é uma anotação definida pelo usuário que é ela própria "
 "anotada com <literal>@Qualifer</literal>. Uma anotação de qualificador é uma "
@@ -359,9 +359,9 @@
 #, fuzzy, no-c-format
 msgid ""
 "You may not be used to seeing the definition of an annotation. In fact, this "
-"might be the first time you&#39;ve encountered one. With CDI, annotation "
-"definitions will become a familiar artifact as you&#39;ll be creating them "
-"from time to time."
+"might be the first time you've encountered one. With CDI, annotation "
+"definitions will become a familiar artifact as you'll be creating them from "
+"time to time."
 msgstr ""
 "Você pode não estar acostumado a ver a definição de uma anotação. Na "
 "verdade, essa poderia ser a primeira vez que você encontrou uma. Com CDI, "
@@ -372,7 +372,7 @@
 #, fuzzy, no-c-format
 msgid ""
 "Pay attention to the names of the built-in annotations in CDI and EJB. "
-"You&#39;ll notice that they are often adjectives. We encourage you to follow "
+"You'll notice that they are often adjectives. We encourage you to follow "
 "this convention when creating your custom annotations, since they serve to "
 "describe the behaviors and roles of the class."
 msgstr ""
@@ -409,7 +409,7 @@
 "For each injection point, the container searches for a bean which satisfies "
 "the contract, one which has the bean type and all the qualifiers. If it "
 "finds exactly one matching bean, it injects an instance of that bean. If it "
-"doesn&#39;t, it reports an error to the user."
+"doesn't, it reports an error to the user."
 msgstr ""
 "Para cada ponto de injeção, o contêiner pesquisa por um bean que satisfaça o "
 "contrato, um que tenha o tipo de bean e todos os qualificadores. Se ele "
@@ -441,10 +441,10 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"That&#39;s not quite the end of the story. CDI also defines a simple "
+"That's not quite the end of the story. CDI also defines a simple "
 "<emphasis>resolution rule</emphasis> that helps the container decide what to "
 "do if there is more than one bean that satisfies a particular contract. "
-"We&#39;ll get into the details in <xref linkend=\"injection\" />."
+"We'll get into the details in <xref linkend=\"injection\" />."
 msgstr ""
 "Esse não é bem o fim da história. CDI também define uma simples "
 "<emphasis>regra de resolução</emphasis> que ajuda o contêiner decidir o que "
@@ -495,7 +495,7 @@
 msgid ""
 "Keep in mind that once a bean is bound to a context, it remains in that "
 "context until the context is destroyed. There is no way to manually remove a "
-"bean from a context. If you don&#39;t want the bean to sit in the session "
+"bean from a context. If you don't want the bean to sit in the session "
 "indefinitely, consider using another scope with a shorted lifespan, such as "
 "the request or conversation scope."
 msgstr ""
@@ -522,8 +522,7 @@
 
 #. Tag: para
 #, fuzzy, no-c-format
-msgid ""
-"We&#39;ll talk more about scopes in <xref linkend=\"scopescontexts\" />."
+msgid "We'll talk more about scopes in <xref linkend=\"scopescontexts\" />."
 msgstr ""
 "Nós falaremos mais sobre escopos no <xref linkend=\"scopescontexts\" />."
 
@@ -596,7 +595,7 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"We&#39;ve already seen how qualifiers let us choose between multiple "
+"We've already seen how qualifiers let us choose between multiple "
 "implementations of an interface at development time. But sometimes we have "
 "an interface (or other bean type) whose implementation varies depending upon "
 "the deployment environment. For example, we may want to use a mock "
@@ -649,9 +648,9 @@
 msgid ""
 "You might be familiar with the use of interceptors in EJB 3.0. In Java EE 6, "
 "this functionality has been generalized to work with other managed beans. "
-"That&#39;s right, you no longer have to make your bean an EJB just to "
-"intercept its methods. Holler. So what does CDI have to offer above and "
-"beyond that? Well, quite a lot actually. Let&#39;s cover some background."
+"That's right, you no longer have to make your bean an EJB just to intercept "
+"its methods. Holler. So what does CDI have to offer above and beyond that? "
+"Well, quite a lot actually. Let's cover some background."
 msgstr ""
 "Você pode estar familiarizado com o uso de interceptadores em EJB 3.0. Em "
 "Java EE 6, esta funcionalidade foi generalizada para trabalhar com outros "
@@ -669,10 +668,10 @@
 "descriptor. You might as well just put the interceptor code <emphasis>in</"
 "emphasis> the implementation! Second, the order in which the interceptors "
 "are applied is taken from the order in which they are declared in the "
-"annotation or the XML descriptor. Perhaps this isn&#39;t so bad if you&#39;"
-"re applying the interceptors to a single bean. But, if you are applying them "
-"repeatedly, then there&#39;s a good chance that you&#39;ll inadvertently "
-"define a different order for different beans. Now that&#39;s a problem."
+"annotation or the XML descriptor. Perhaps this isn't so bad if you're "
+"applying the interceptors to a single bean. But, if you are applying them "
+"repeatedly, then there's a good chance that you'll inadvertently define a "
+"different order for different beans. Now that's a problem."
 msgstr ""
 "A maneira em que interceptadores foram definidos em Java EE 5 não foi muito "
 "intuitivo. Era necessário especificar a <emphasis>implementação</emphasis> "
@@ -735,7 +734,7 @@
 #, fuzzy, no-c-format
 msgid ""
 "Notice that <literal>ShoppingCart</literal> and "
-"<literal>TransactionInterceptor</literal> don&#39;t know anything about each "
+"<literal>TransactionInterceptor</literal> don't know anything about each "
 "other."
 msgstr ""
 "Observe que <literal>ShoppingCart</literal> e "
@@ -744,7 +743,7 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"Interceptors are deployment-specific. (We don&#39;t need a "
+"Interceptors are deployment-specific. (We don't need a "
 "<literal>TransactionInterceptor</literal> in our unit tests!) By default, an "
 "interceptor is disabled. We can enable an interceptor using the CDI "
 "deployment descriptor <literal>META-INF/beans.xml</literal> of the jar or "
@@ -760,8 +759,8 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"We&#39;ll discuss interceptors, and their cousins, decorators, in <xref "
-"linkend=\"interceptors\" /> and <xref linkend=\"decorators\" />."
+"We'll discuss interceptors, and their cousins, decorators, in <xref linkend="
+"\"interceptors\" /> and <xref linkend=\"decorators\" />."
 msgstr ""
 "Discutiremos sobre interceptadores, e seus primos decoradores, no <xref "
 "linkend=\"interceptors\" /> e <xref linkend=\"decorators\" />."
@@ -774,10 +773,9 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"We&#39;ve already seen two types of beans: JavaBeans and EJB session beans. "
-"Is that the whole story? Actually, it&#39;s just the beginning. Let&#39;s "
-"explore the various kinds of beans that CDI implementations must support out-"
-"of-the-box."
+"We've already seen two types of beans: JavaBeans and EJB session beans. Is "
+"that the whole story? Actually, it's just the beginning. Let's explore the "
+"various kinds of beans that CDI implementations must support out-of-the-box."
 msgstr ""
 "Nós já vimos dois tipos de beans: JavaBeans e EJB session beans. Esta é toda "
 "a história? Na verdade, é apenas o começo. Vamos explorar as várias "
@@ -794,8 +792,8 @@
 "A managed bean is a Java class. The basic lifecycle and semantics of a "
 "managed bean are defined by the Managed Beans specification. You can "
 "explicitly declare a managed bean by annotating the bean class "
-"<literal>@ManagedBean</literal>, but in CDI you don&#39;t need to. According "
-"to the specification, the CDI container treats any class that satisfies the "
+"<literal>@ManagedBean</literal>, but in CDI you don't need to. According to "
+"the specification, the CDI container treats any class that satisfies the "
 "following conditions as a managed bean:"
 msgstr ""
 "Um managed bean é uma classe Java. O ciclo de vida básico e a semântica de "
@@ -854,7 +852,7 @@
 "According to this definition, JPA entities are technically managed beans. "
 "However, entities have their own special lifecycle, state and identity model "
 "and are usually instantiated by JPA or using <literal>new</literal>. "
-"Therefore we don&#39;t recommend directly injecting an entity class. We "
+"Therefore we don't recommend directly injecting an entity class. We "
 "especially recommend against assigning a scope other than "
 "<literal>@Dependent</literal> to an entity class, since JPA is not able to "
 "persist injected CDI proxies."
@@ -971,7 +969,7 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"There&#39;s no reason to explicitly declare the scope of a stateless session "
+"There's no reason to explicitly declare the scope of a stateless session "
 "bean or singleton session bean. The EJB container controls the lifecycle of "
 "these beans, according to the semantics of the <literal>@Stateless</literal> "
 "or <literal>@Singleton</literal> declaration. On the other hand, a stateful "
@@ -1044,8 +1042,8 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"When we don&#39;t need any of these things, an ordinary managed bean will "
-"serve just fine."
+"When we don't need any of these things, an ordinary managed bean will serve "
+"just fine."
 msgstr ""
 "Quando não precisamos de nenhuma dessas coisas, um managed bean comum "
 "servirá muito bem."
@@ -1080,7 +1078,7 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"Finally, it&#39;s usually obvious when method-level transaction management, "
+"Finally, it's usually obvious when method-level transaction management, "
 "method-level security, timers, remote methods or asynchronous methods are "
 "needed."
 msgstr ""
@@ -1091,11 +1089,11 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"The point we&#39;re trying to make is: use a session bean when you need the "
+"The point we're trying to make is: use a session bean when you need the "
 "services it provides, not just because you want to use dependency injection, "
 "lifecycle management, or interceptors. Java EE 6 provides a graduated "
-"programming model. It&#39;s usually easy to start with an ordinary managed "
-"bean, and later turn it into an EJB just by adding one of the following "
+"programming model. It's usually easy to start with an ordinary managed bean, "
+"and later turn it into an EJB just by adding one of the following "
 "annotations: <literal>@Stateless</literal>, <literal>@Stateful</literal> or "
 "<literal>@Singleton</literal>."
 msgstr ""
@@ -1110,14 +1108,13 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"On the other hand, don&#39;t be scared to use session beans just because "
-"you&#39;ve heard your friends say they&#39;re &#34;heavyweight&#34;. It&#39;"
-"s nothing more than superstition to think that something is &#34;"
-"heavier&#34; just because it&#39;s hosted natively within the Java EE "
-"container, instead of by a proprietary bean container or dependency "
-"injection framework that runs as an additional layer of obfuscation. And as "
-"a general principle, you should be skeptical of folks who use vaguely "
-"defined terminology like &#34;heavyweight&#34;."
+"On the other hand, don't be scared to use session beans just because you've "
+"heard your friends say they're \"heavyweight\". It's nothing more than "
+"superstition to think that something is \"heavier\" just because it's hosted "
+"natively within the Java EE container, instead of by a proprietary bean "
+"container or dependency injection framework that runs as an additional layer "
+"of obfuscation. And as a general principle, you should be skeptical of folks "
+"who use vaguely defined terminology like \"heavyweight\"."
 msgstr ""
 "Por outro lado, não tenha medo de usar session beans apenas porque você "
 "ouviu seus amigos dizer que eles são \"pesados\". Não é nada mais do que "
@@ -1178,7 +1175,7 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"We can&#39;t write a bean class that is itself a random number. But we can "
+"We can't write a bean class that is itself a random number. But we can "
 "certainly write a method that returns a random number. By making the method "
 "a producer method, we allow the return value of the method—in this case an "
 "<literal>Integer</literal>—to be injected. We can even specify a qualifier—"
@@ -1280,7 +1277,7 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"We&#39;ll talk much more about producer methods in <xref linkend="
+"We'll talk much more about producer methods in <xref linkend="
 "\"producermethods\" />."
 msgstr ""
 "Falaremos mais sobre métodos produtores no <xref linkend=\"producermethods"
@@ -1319,8 +1316,8 @@
 "A producer field is really just a shortcut that lets us avoid writing a "
 "useless getter method. However, in addition to convenience, producer fields "
 "serve a specific purpose as an adaptor for Java EE component environment "
-"injection, but to learn more about that, you&#39;ll have to wait until <xref "
-"linkend=\"resources\" />. Because we can&#39;t wait to get to work on some "
+"injection, but to learn more about that, you'll have to wait until <xref "
+"linkend=\"resources\" />. Because we can't wait to get to work on some "
 "examples."
 msgstr ""
 "Um campo produtor é realmente apenas um atalho que nos permite evitar "

Modified: doc/trunk/reference/src/main/docbook/pt-BR/decorators.po
===================================================================
--- doc/trunk/reference/src/main/docbook/pt-BR/decorators.po	2010-07-24 16:36:48 UTC (rev 6808)
+++ doc/trunk/reference/src/main/docbook/pt-BR/decorators.po	2010-07-25 04:22:37 UTC (rev 6809)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: Introduction_to_Web_Beans VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-05-01T13:53:42\n"
+"POT-Creation-Date: 2010-07-25T03:52:14\n"
 "PO-Revision-Date: 2010-01-07 10:22-0300\n"
 "Last-Translator: Bruno Leonardo Gonçalves <brunolmfg at gmail.com>\n"
 "Language-Team: none\n"
@@ -26,8 +26,8 @@
 "interceptor is able to intercept invocations of any Java type. This makes "
 "them perfect for solving technical concerns such as transaction management, "
 "security and call logging. However, by nature, interceptors are unaware of "
-"the actual semantics of the events they intercept. Thus, interceptors "
-"aren&#39;t an appropriate tool for separating business-related concerns."
+"the actual semantics of the events they intercept. Thus, interceptors aren't "
+"an appropriate tool for separating business-related concerns."
 msgstr ""
 "Interceptadores são um meio poderoso para capturar e separar preocupações "
 "<emphasis>ortogonais</emphasis> para a aplicação (e sistema de tipos). "
@@ -46,11 +46,10 @@
 "aware of all the semantics attached to that interface. Since decorators "
 "directly implement operations with business semantics, it makes them the "
 "perfect tool for modeling some kinds of business concerns. It also means "
-"that a decorator doesn&#39;t have the generality of an interceptor. "
-"Decorators aren&#39;t able to solve technical concerns that cut across many "
-"disparate types. Interceptors and decorators, though similar in many ways, "
-"are complementary. Let&#39;s look at some cases where decorators fit the "
-"bill."
+"that a decorator doesn't have the generality of an interceptor. Decorators "
+"aren't able to solve technical concerns that cut across many disparate "
+"types. Interceptors and decorators, though similar in many ways, are "
+"complementary. Let's look at some cases where decorators fit the bill."
 msgstr ""
 "O contrário é verdadeiro para <emphasis>decoradores</emphasis>. Um decorador "
 "intercepta invocações apenas para uma determinada interface Java e, "
@@ -105,9 +104,8 @@
 #, fuzzy, no-c-format
 msgid ""
 "Unlike other beans, a decorator may be an abstract class. Therefore, if "
-"there&#39;s nothing special the decorator needs to do for a particular "
-"method of the decorated interface, you don&#39;t need to implement that "
-"method."
+"there's nothing special the decorator needs to do for a particular method of "
+"the decorated interface, you don't need to implement that method."
 msgstr ""
 "Ao contrário de outros beans, um decorador pode ser uma classe abstrata. "
 "Portanto, se não há nada de especial que o decorador precisa fazer para um "
@@ -213,8 +211,7 @@
 #, fuzzy, no-c-format
 msgid ""
 "This declaration serves the same purpose for decorators that the "
-"<literal>&#60;interceptors&#62;</literal> declaration serves for "
-"interceptors:"
+"<literal>&lt;interceptors&gt;</literal> declaration serves for interceptors:"
 msgstr ""
 "Essa declaração tem o mesmo propósito para decoradores que a declaração "
 "<literal>&lt;interceptors&gt;</literal> tem para os interceptadores:"

Modified: doc/trunk/reference/src/main/docbook/pt-BR/ee.po
===================================================================
--- doc/trunk/reference/src/main/docbook/pt-BR/ee.po	2010-07-24 16:36:48 UTC (rev 6808)
+++ doc/trunk/reference/src/main/docbook/pt-BR/ee.po	2010-07-25 04:22:37 UTC (rev 6809)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: Introduction_to_Web_Beans VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-05-01T13:53:42\n"
+"POT-Creation-Date: 2010-07-25T03:52:14\n"
 "PO-Revision-Date: 2009-12-19 18:11-0300\n"
 "Last-Translator: João Paulo Viragine <joao.viragine at redhat.com>\n"
 "Language-Team: none\n"
@@ -76,7 +76,7 @@
 "The CDI specification does not require the servlet context objects, "
 "<literal>HttpServletRequest</literal>, <literal>HttpSession</literal> and "
 "<literal>ServletContext</literal> to be exposed as injectable beans. If you "
-"really want to be able to inject these objects, it&#39;s easy to create a "
+"really want to be able to inject these objects, it's easy to create a "
 "portable extension to expose them as beans. However, we recommend that "
 "direct access to these objects be limited to servlets, servlet filters and "
 "servlet event listeners, where they may be obtained in the usual way as "
@@ -103,8 +103,8 @@
 "All managed beans may take advantage of Java EE component environment "
 "injection using <literal>@Resource</literal>, <literal>@EJB</literal>, "
 "<literal>@PersistenceContext</literal>, <literal>@PeristenceUnit</literal> "
-"and <literal>@WebServiceRef</literal>. We&#39;ve already seen a couple of "
-"examples of this, though we didn&#39;t pay much attention at the time:"
+"and <literal>@WebServiceRef</literal>. We've already seen a couple of "
+"examples of this, though we didn't pay much attention at the time:"
 msgstr ""
 "Todos Web Beans, simples e corporativos (enterprise Web Beans), podem "
 "usufruir da injeção de dependência do Java EE utilizando <literal>@Resource</"
@@ -141,8 +141,8 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"It&#39;s easy to use a bean from a servlet in Java EE 6. Simply inject the "
-"bean using field or initializer method injection."
+"It's easy to use a bean from a servlet in Java EE 6. Simply inject the bean "
+"using field or initializer method injection."
 msgstr ""
 "É fácil utilizar um Web Bean a partir de um Servlet em Java EE : basta "
 "injetar o Web Bean usando a injeção de atributos ou de método de "
@@ -169,9 +169,9 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"CDI injection applies to all EJBs, even when they aren&#39;t managed beans. "
-"In particular, you can use CDI injection in message-driven beans, which are "
-"by nature not contextual objects."
+"CDI injection applies to all EJBs, even when they aren't managed beans. In "
+"particular, you can use CDI injection in message-driven beans, which are by "
+"nature not contextual objects."
 msgstr ""
 
 #. Tag: para
@@ -259,15 +259,15 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"CDI doesn&#39;t define any special deployment archive. You can package beans "
-"in jars, ejb jars or wars—any deployment location in the application "
-"classpath. However, the archive must be a &#34;bean archive&#34;. That means "
-"each archive that contains beans <emphasis>must</emphasis> include a file "
-"named <literal>beans.xml</literal> in the <literal>META-INF</literal> "
-"directory of the classpath or <literal>WEB-INF</literal> directory of the "
-"web root (for war archives). The file may be empty. Beans deployed in "
-"archives that do not have a <literal>beans.xml</literal> file will not be "
-"available for use in the application."
+"CDI doesn't define any special deployment archive. You can package beans in "
+"jars, ejb jars or wars—any deployment location in the application classpath. "
+"However, the archive must be a \"bean archive\". That means each archive "
+"that contains beans <emphasis>must</emphasis> include a file named "
+"<literal>beans.xml</literal> in the <literal>META-INF</literal> directory of "
+"the classpath or <literal>WEB-INF</literal> directory of the web root (for "
+"war archives). The file may be empty. Beans deployed in archives that do not "
+"have a <literal>beans.xml</literal> file will not be available for use in "
+"the application."
 msgstr ""
 "A Web Beans não define nenhum tipo especial de pacote de implantação. Você "
 "pode empacotar Web Beans em JARs, EJB-JARs ou WARs &#151; qualquer "

Modified: doc/trunk/reference/src/main/docbook/pt-BR/environments.po
===================================================================
--- doc/trunk/reference/src/main/docbook/pt-BR/environments.po	2010-07-24 16:36:48 UTC (rev 6808)
+++ doc/trunk/reference/src/main/docbook/pt-BR/environments.po	2010-07-25 04:22:37 UTC (rev 6809)
@@ -6,7 +6,7 @@
 "Project-Id-Version: Web_Beans:_Java_Contexts_and_Dependency_Injection "
 "VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-05-01T14:44:09\n"
+"POT-Creation-Date: 2010-07-25T03:52:14\n"
 "PO-Revision-Date: 2009-12-19 18:10-0300\n"
 "Last-Translator: João Paulo Viragine <joao.viragine at redhat.com>\n"
 "Language-Team: none\n"
@@ -37,9 +37,9 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Unfortunately, you can&#39;t use Weld with earlier versions of JBoss AS "
-"since they are missing key libraries. If you want to learn how to upgrade "
-"the built-in support on JBoss AS 6.0, then read on."
+"Unfortunately, you can't use Weld with earlier versions of JBoss AS since "
+"they are missing key libraries. If you want to learn how to upgrade the "
+"built-in support on JBoss AS 6.0, then read on."
 msgstr ""
 
 #. Tag: para
@@ -113,7 +113,7 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"There is a major limitation to using a servlet container. Weld doesn&#39;t "
+"There is a major limitation to using a servlet container. Weld doesn't "
 "support deploying session beans, injection using <literal>@EJB</literal> or "
 "<literal>@PersistenceContext</literal>, or using transactional events in "
 "servlet containers. For enterprise features such as these, you should really "
@@ -128,10 +128,10 @@
 msgid ""
 "Weld should be used as a web application library in a servlet container. You "
 "should place <literal>weld-servlet.jar</literal> in <literal>WEB-INF/lib</"
-"literal> in the web root. <literal>weld-servlet.jar</literal> is an &#34;"
-"uber-jar&#34;, meaning it bundles all the bits of Weld and CDI required for "
-"running in a servlet container, provided for your convenience. "
-"Alternatively, you could use its component jars:"
+"literal> in the web root. <literal>weld-servlet.jar</literal> is an \"uber-"
+"jar\", meaning it bundles all the bits of Weld and CDI required for running "
+"in a servlet container, provided for your convenience. Alternatively, you "
+"could use its component jars:"
 msgstr ""
 "A Web Beans deveria ser utilizada como uma bibilioteca de aplicação web no "
 "Tomcat. Você deve colocar o <literal>webbeans-tomcat.jar</literal> em "
@@ -203,7 +203,7 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"Tomcat has a read-only JNDI, so Weld can&#39;t automatically bind the "
+"Tomcat has a read-only JNDI, so Weld can't automatically bind the "
 "BeanManager extension SPI. To bind the BeanManager into JNDI, you should "
 "populate <literal>META-INF/context.xml</literal> in the web root with the "
 "following contents:"
@@ -245,9 +245,9 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"Like Tomcat, Jetty has a read-only JNDI, so Weld can&#39;t automatically "
-"bind the Manager. To bind the Manager to JNDI, you should populate "
-"<literal>WEB-INF/jetty-env.xml</literal> with the following contents:"
+"Like Tomcat, Jetty has a read-only JNDI, so Weld can't automatically bind "
+"the Manager. To bind the Manager to JNDI, you should populate <literal>WEB-"
+"INF/jetty-env.xml</literal> with the following contents:"
 msgstr ""
 "O Tomcat tem um JNDI apenas de leitura. Assim, a Web Beans não pode vincular "
 "automaticamente o Manager. Para vincular o Manager no JNDI, você deve "
@@ -256,10 +256,10 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Notice that Jetty doesn&#39;t not have built-in support for an "
-"<literal>javax.naming.spi.ObjectFactory</literal> like Tomcat, so it&#39;s "
-"necessary to manually create the <literal>javax.naming.Reference</literal> "
-"to wrap around it."
+"Notice that Jetty doesn't not have built-in support for an <literal>javax."
+"naming.spi.ObjectFactory</literal> like Tomcat, so it's necessary to "
+"manually create the <literal>javax.naming.Reference</literal> to wrap around "
+"it."
 msgstr ""
 
 #. Tag: para
@@ -289,13 +289,13 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"In addition to improved integration of the Enterprise Java stack, the &#34;"
-"Contexts and Dependency Injection for the Java EE platform&#34; "
-"specification also defines a state of the art typesafe, stateful dependency "
-"injection framework, which can prove useful in a wide range of application "
-"types. To help developers take advantage of this, Weld provides a simple "
-"means for being executed in the Java Standard Edition (SE) environment "
-"independently of any Java EE APIs."
+"In addition to improved integration of the Enterprise Java stack, the "
+"\"Contexts and Dependency Injection for the Java EE platform\" specification "
+"also defines a state of the art typesafe, stateful dependency injection "
+"framework, which can prove useful in a wide range of application types. To "
+"help developers take advantage of this, Weld provides a simple means for "
+"being executed in the Java Standard Edition (SE) environment independently "
+"of any Java EE APIs."
 msgstr ""
 
 #. Tag: para
@@ -381,7 +381,7 @@
 
 #. Tag: para
 #, fuzzy, no-c-format
-msgid "Here&#39;s an example of a simple CDI SE application:"
+msgid "Here's an example of a simple CDI SE application:"
 msgstr "Aqui está um exemplo de uma simples aplicação Web Beans SE:"
 
 #. Tag: title
@@ -403,9 +403,9 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Thanks to the power of CDI&#39;s typesafe event model, application "
-"developers need not write any bootstrapping code. The Weld SE module comes "
-"with a built-in main method which will bootstrap CDI for you and then fire a "
+"Thanks to the power of CDI's typesafe event model, application developers "
+"need not write any bootstrapping code. The Weld SE module comes with a built-"
+"in main method which will bootstrap CDI for you and then fire a "
 "<literal>ContainerInitialized</literal> event. The entry point for your "
 "application code would therefore be a simple bean which observes the "
 "<literal>ContainerInitialized</literal> event, as in the previous example."
@@ -429,15 +429,15 @@
 msgid ""
 "For added flexibility, CDI SE also comes with a bootstrap API which can be "
 "called from within your application in order to initialize CDI and obtain "
-"references to your application&#39;s beans and events. The API consists of "
-"two classes: <literal>Weld</literal> and <literal>WeldContainer</literal>."
+"references to your application's beans and events. The API consists of two "
+"classes: <literal>Weld</literal> and <literal>WeldContainer</literal>."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
 msgid ""
-"Here&#39;s an example application main method which uses this API to "
-"initialize a bean of type <literal>MyApplicationBean</literal>."
+"Here's an example application main method which uses this API to initialize "
+"a bean of type <literal>MyApplicationBean</literal>."
 msgstr ""
 
 #. Tag: para
@@ -470,10 +470,10 @@
 #, no-c-format
 msgid ""
 "To use the @ThreadScoped annotation you need to enable the "
-"<literal>RunnableDecorator</literal> which &#39;listens&#39; for all "
-"executions of <literal>Runnable.run()</literal> and decorates them by "
-"setting up the thread context beforehand, bound to the current thread, and "
-"destroying the context afterwards."
+"<literal>RunnableDecorator</literal> which 'listens' for all executions of "
+"<literal>Runnable.run()</literal> and decorates them by setting up the "
+"thread context beforehand, bound to the current thread, and destroying the "
+"context afterwards."
 msgstr ""
 
 #. Tag: para
@@ -494,10 +494,10 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Weld SE comes packaged as a &#39;shaded&#39; jar which includes the CDI API, "
-"Weld Core and all dependant classes bundled into a single jar. Therefore the "
-"only Weld jar you need on the classpath, in addition to your application&#39;"
-"s classes and dependant jars, is the Weld SE jar."
+"Weld SE comes packaged as a 'shaded' jar which includes the CDI API, Weld "
+"Core and all dependant classes bundled into a single jar. Therefore the only "
+"Weld jar you need on the classpath, in addition to your application's "
+"classes and dependant jars, is the Weld SE jar."
 msgstr ""
 
 #~ msgid "<![CDATA[jboss.home=/path/to/jboss-as-5.x]]>"

Modified: doc/trunk/reference/src/main/docbook/pt-BR/events.po
===================================================================
--- doc/trunk/reference/src/main/docbook/pt-BR/events.po	2010-07-24 16:36:48 UTC (rev 6808)
+++ doc/trunk/reference/src/main/docbook/pt-BR/events.po	2010-07-25 04:22:37 UTC (rev 6809)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: Introduction_to_Web_Beans VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-05-01T13:53:42\n"
+"POT-Creation-Date: 2010-07-25T03:52:14\n"
 "PO-Revision-Date: 2009-12-19 18:11-0300\n"
 "Last-Translator: João Paulo Viragine <joao.viragine at redhat.com>\n"
 "Language-Team: none\n"
@@ -47,8 +47,8 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"observers can specify a combination of &#34;selectors&#34; to narrow the set "
-"of event notifications they will receive, and"
+"observers can specify a combination of \"selectors\" to narrow the set of "
+"event notifications they will receive, and"
 msgstr ""
 "os observadores podem especificar uma combinação de \"seletores\" para "
 "reduzir o conjunto de eventos que irão receber notificações, e"
@@ -66,7 +66,7 @@
 #, no-c-format
 msgid ""
 "The CDI event notification facility uses more or less the same typesafe "
-"approach that we&#39;ve already seen with the dependency injection service."
+"approach that we've already seen with the dependency injection service."
 msgstr ""
 
 #. Tag: title
@@ -89,7 +89,7 @@
 #, no-c-format
 msgid ""
 "An event qualifier is just a normal qualifier, defined using "
-"<literal>@Qualifier</literal>. Here&#39;s an example:"
+"<literal>@Qualifier</literal>. Here's an example:"
 msgstr ""
 
 #. Tag: title
@@ -126,7 +126,7 @@
 msgid ""
 "An observer method need not specify any event qualifiers—in this case it is "
 "interested in <emphasis>all</emphasis> events of a particular type. If it "
-"does specify qualifiers, it&#39;s only interested in events which have those "
+"does specify qualifiers, it's only interested in events which have those "
 "qualifiers."
 msgstr ""
 "Um método observador não necessita especificar nenhum binding de evento "
@@ -248,8 +248,8 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"The downside of annotating the injection point is that we can&#39;t specify "
-"the qualifier dynamically. CDI lets us obtain a qualifier instance by "
+"The downside of annotating the injection point is that we can't specify the "
+"qualifier dynamically. CDI lets us obtain a qualifier instance by "
 "subclassing the helper class <literal>AnnotationLiteral</literal>. That way, "
 "we can pass the qualifier to the <literal>select()</literal> method of "
 "<literal>Event</literal>."
@@ -273,8 +273,8 @@
 msgid ""
 "By default, if there is no instance of an observer in the current context, "
 "the container will instantiate the observer in order to deliver an event to "
-"it. This behavior isn&#39;t always desirable. We may want to deliver events "
-"only to instances of the observer that already exist in the current contexts."
+"it. This behavior isn't always desirable. We may want to deliver events only "
+"to instances of the observer that already exist in the current contexts."
 msgstr ""
 
 #. Tag: para

Modified: doc/trunk/reference/src/main/docbook/pt-BR/example.po
===================================================================
--- doc/trunk/reference/src/main/docbook/pt-BR/example.po	2010-07-24 16:36:48 UTC (rev 6808)
+++ doc/trunk/reference/src/main/docbook/pt-BR/example.po	2010-07-25 04:22:37 UTC (rev 6809)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: Introduction_to_Web_Beans VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-05-01T13:53:42\n"
+"POT-Creation-Date: 2010-07-25T03:52:14\n"
 "PO-Revision-Date: 2010-01-15 10:27-0300\n"
 "Last-Translator: Bruno Leonardo Gonçalves <brunolmfg at gmail.com>\n"
 "Language-Team: none\n"
@@ -21,11 +21,11 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"Let&#39;s illustrate these ideas with a full example. We&#39;re going to "
-"implement user login/logout for an application that uses JSF. First, we&#39;"
-"ll define a request-scoped bean to hold the username and password entered "
-"during login, with constraints defined using annotations from the Bean "
-"Validation specification:"
+"Let's illustrate these ideas with a full example. We're going to implement "
+"user login/logout for an application that uses JSF. First, we'll define a "
+"request-scoped bean to hold the username and password entered during login, "
+"with constraints defined using annotations from the Bean Validation "
+"specification:"
 msgstr ""
 "Vamos ilustrar essas ideias com um exemplo completo. Nós  implementaremos um "
 "login/logout de usuário de uma aplicação que utiliza JSF. Primeiro, "
@@ -46,7 +46,7 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"(Note that we&#39;re also going to need a <literal>persistence.xml</literal> "
+"(Note that we're also going to need a <literal>persistence.xml</literal> "
 "file to configure the JPA persistence unit containing <literal>User</"
 "literal>.)"
 msgstr ""
@@ -101,7 +101,7 @@
 #, fuzzy, no-c-format
 msgid ""
 "Hopefully, this example gave you a taste of the CDI programming model. In "
-"the next chapter, we&#39;ll explore dependency injection in greater depth."
+"the next chapter, we'll explore dependency injection in greater depth."
 msgstr ""
 "Esperamos que este exemplo tenha dado um gostinho do modelo de programação "
 "em CDI. No capítulo seguinte, exploraremos a injeção de dependência com "

Modified: doc/trunk/reference/src/main/docbook/pt-BR/extend.po
===================================================================
--- doc/trunk/reference/src/main/docbook/pt-BR/extend.po	2010-07-24 16:36:48 UTC (rev 6808)
+++ doc/trunk/reference/src/main/docbook/pt-BR/extend.po	2010-07-25 04:22:37 UTC (rev 6809)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: Introduction_to_Web_Beans VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-05-01T13:53:42\n"
+"POT-Creation-Date: 2010-07-25T03:52:14\n"
 "PO-Revision-Date: 2009-12-19 18:03-0300\n"
 "Last-Translator: João Paulo Viragine <joao.viragine at redhat.com>\n"
 "Language-Team: none\n"
@@ -97,8 +97,8 @@
 msgid ""
 "The first step in creating a portable extension is to write a class that "
 "implements <literal>Extension</literal>. This marker interface does not "
-"define any methods, but it&#39;s needed to satisfy the requirements of Java "
-"SE&#39;s service provider architecture."
+"define any methods, but it's needed to satisfy the requirements of Java SE's "
+"service provider architecture."
 msgstr ""
 
 #. Tag: para
@@ -179,8 +179,8 @@
 #, no-c-format
 msgid ""
 "In fact, the extension can do a lot more than just observe. The extension is "
-"permitted to modify the container&#39;s metamodel and more. Here&#39;s a "
-"very simple example:"
+"permitted to modify the container's metamodel and more. Here's a very simple "
+"example:"
 msgstr ""
 
 #. Tag: para
@@ -225,7 +225,7 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"Let&#39;s study some of the interfaces exposed by the <literal>BeanManager</"
+"Let's study some of the interfaces exposed by the <literal>BeanManager</"
 "literal>."
 msgstr ""
 "O nervo central para estender a Web Beans é o objeto <literal>Manager</"
@@ -283,8 +283,7 @@
 
 #. Tag: para
 #, no-c-format
-msgid ""
-"There&#39;s an easy way to find out what beans exist in the application:"
+msgid "There's an easy way to find out what beans exist in the application:"
 msgstr ""
 
 #. Tag: para
@@ -321,9 +320,9 @@
 msgid ""
 "In this example, we make a framework class, <literal>SecurityManager</"
 "literal> available for injection. To make things a bit more interesting, "
-"we&#39;re going to delegate back to the container&#39;s "
-"<literal>InjectionTarget</literal> to perform instantiation and injection "
-"upon the <literal>SecurityManager</literal> instance."
+"we're going to delegate back to the container's <literal>InjectionTarget</"
+"literal> to perform instantiation and injection upon the "
+"<literal>SecurityManager</literal> instance."
 msgstr ""
 
 #. Tag: para
@@ -349,8 +348,8 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Let&#39;s start with an example of an extension that provides support for "
-"the use of <literal>@Named</literal> at the package level. The package-level "
+"Let's start with an example of an extension that provides support for the "
+"use of <literal>@Named</literal> at the package level. The package-level "
 "name is used to qualify the EL names of all beans defined in that package. "
 "The portable extension uses the <literal>ProcessAnnotatedType</literal> "
 "event to wrap the <literal>AnnotatedType</literal> object and override the "
@@ -360,7 +359,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Here&#39;s a second example, which adds the <literal>@Alternative</literal> "
+"Here's a second example, which adds the <literal>@Alternative</literal> "
 "annotation to any class which implements a certain <literal>Service</"
 "literal> interface."
 msgstr ""
@@ -391,12 +390,12 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Here&#39;s a CDI portable extension that reads values from properties files "
-"and configures fields of Java EE components, including servlets, EJBs, "
-"managed beans, interceptors and more. In this example, properties for a "
-"class such as <literal>org.mydomain.blog.Blogger</literal> go in a resource "
-"named <literal>org/mydomain/blog/Blogger.properties</literal>, and the name "
-"of a property must match the name of the field to be configured. So "
+"Here's a CDI portable extension that reads values from properties files and "
+"configures fields of Java EE components, including servlets, EJBs, managed "
+"beans, interceptors and more. In this example, properties for a class such "
+"as <literal>org.mydomain.blog.Blogger</literal> go in a resource named "
+"<literal>org/mydomain/blog/Blogger.properties</literal>, and the name of a "
+"property must match the name of the field to be configured. So "
 "<literal>Blogger.properties</literal> could contain:"
 msgstr ""
 
@@ -411,9 +410,9 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"There&#39;s a lot more to the portable extension SPI than what we&#39;ve "
-"discussed here. Check out the CDI spec or Javadoc for more information. For "
-"now, we&#39;ll just mention one more extension point."
+"There's a lot more to the portable extension SPI than what we've discussed "
+"here. Check out the CDI spec or Javadoc for more information. For now, we'll "
+"just mention one more extension point."
 msgstr ""
 
 #. Tag: title

Modified: doc/trunk/reference/src/main/docbook/pt-BR/extensions.po
===================================================================
--- doc/trunk/reference/src/main/docbook/pt-BR/extensions.po	2010-07-24 16:36:48 UTC (rev 6808)
+++ doc/trunk/reference/src/main/docbook/pt-BR/extensions.po	2010-07-25 04:22:37 UTC (rev 6809)
@@ -6,7 +6,7 @@
 "Project-Id-Version: Web_Beans:_Java_Contexts_and_Dependency_Injection "
 "VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-05-01T13:53:42\n"
+"POT-Creation-Date: 2010-07-25T03:52:14\n"
 "PO-Revision-Date: 2010-01-07 10:42-0300\n"
 "Last-Translator: Bruno Leonardo Gonçalves <brunolmfg at gmail.com>\n"
 "Language-Team: none\n"
@@ -73,8 +73,8 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"If you are using Weld as your JSR-299 implementation, there&#39;s no need to "
-"include sl4j as it&#39;s already included (and used internally)."
+"If you are using Weld as your JSR-299 implementation, there's no need to "
+"include sl4j as it's already included (and used internally)."
 msgstr ""
 "Se você estiver utilizando o Weld como sua implementação da JSR-299, não há "
 "necessidade de incluir o sl4j, pois ele já está incluído (e usado "

Modified: doc/trunk/reference/src/main/docbook/pt-BR/gettingstarted.po
===================================================================
--- doc/trunk/reference/src/main/docbook/pt-BR/gettingstarted.po	2010-07-24 16:36:48 UTC (rev 6808)
+++ doc/trunk/reference/src/main/docbook/pt-BR/gettingstarted.po	2010-07-25 04:22:37 UTC (rev 6809)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: Introduction_to_Web_Beans VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-05-01T14:44:09\n"
+"POT-Creation-Date: 2010-07-25T03:52:14\n"
 "PO-Revision-Date: 2010-04-16 21:53-0300\n"
 "Last-Translator: Bruno Leonardo Gonçalves <brunolmfg at gmail.com>\n"
 "Language-Team: none\n"
@@ -57,7 +57,7 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"To run the examples with the provided build scripts, you&#39;ll need the "
+"To run the examples with the provided build scripts, you'll need the "
 "following:"
 msgstr ""
 "Para executar os exemplos com os scripts de construção fornecidos, você "
@@ -109,7 +109,7 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"You&#39;ll need a full install of Ant 1.7.0. Some linux distributions only "
+"You'll need a full install of Ant 1.7.0. Some linux distributions only "
 "supply a partial installation of Ant which cause the build to fail. If you "
 "encounter problems, verify that ant-nodeps.jar is on the classpath."
 msgstr ""
@@ -121,7 +121,7 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"In the next few sections, you&#39;ll be using the Ant command (<literal>ant</"
+"In the next few sections, you'll be using the Ant command (<literal>ant</"
 "literal>) to invoke the Ant build script in each example to compile, "
 "assemble and deploy the example to JBoss AS and, for the war example, Apache "
 "Tomcat. You can also deploy the generated artifact (war or ear) to any other "
@@ -148,7 +148,7 @@
 #, fuzzy, no-c-format
 msgid ""
 "The sections below cover the steps for deploying with both Ant and Maven in "
-"detail. Let&#39;s start with JBoss AS."
+"detail. Let's start with JBoss AS."
 msgstr ""
 "As seções abaixo cobrem os passos para implantar com Ant e Maven em "
 "detalhes. Vamos iniciar com o JBoss AS."
@@ -161,15 +161,15 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"To deploy the examples to JBoss AS, you&#39;ll need <ulink url=\"http://"
-"jboss.org/jbossas/\">JBoss AS 6.0.0</ulink> or above. If a release of the "
-"JBoss AS 6.0 line isn&#39;t yet available, you can download a <ulink url="
-"\"http://hudson.jboss.org/hudson/view/JBoss%20AS/job/JBoss-AS-6.0.x/"
-"\">nightly snapshot</ulink>. The reason JBoss AS 6.0.0 or above is required "
-"is because it&#39;s the first release that has both CDI and Bean Validation "
-"support built-in, making it close enough to Java EE 6 to run the examples. "
-"The good news is that there are no additional modifications you have to make "
-"to the server. It&#39;s ready to go!"
+"To deploy the examples to JBoss AS, you'll need <ulink url=\"http://jboss."
+"org/jbossas/\">JBoss AS 6.0.0</ulink> or above. If a release of the JBoss AS "
+"6.0 line isn't yet available, you can download a <ulink url=\"http://hudson."
+"jboss.org/hudson/view/JBoss%20AS/job/JBoss-AS-6.0.x/\">nightly snapshot</"
+"ulink>. The reason JBoss AS 6.0.0 or above is required is because it's the "
+"first release that has both CDI and Bean Validation support built-in, making "
+"it close enough to Java EE 6 to run the examples. The good news is that "
+"there are no additional modifications you have to make to the server. It's "
+"ready to go!"
 msgstr ""
 "Para implantar os exemplos no JBoss AS, você precisará do <ulink url="
 "\"http://jboss.org/jbossas/\">JBoss AS 6.0.0</ulink> ou acima. Se uma versão "
@@ -185,10 +185,10 @@
 #, fuzzy, no-c-format
 msgid ""
 "After you have downloaded JBoss AS, extract it. (We recommended renaming the "
-"folder to include the <literal>as</literal> qualifier so it&#39;s clear that "
-"it&#39;s the application server). You can move the extracted folder anywhere "
-"you like. Wherever it lays to rest, that&#39;s what we&#39;ll call the JBoss "
-"AS installation directory, or <literal>JBOSS_HOME</literal>."
+"folder to include the <literal>as</literal> qualifier so it's clear that "
+"it's the application server). You can move the extracted folder anywhere you "
+"like. Wherever it lays to rest, that's what we'll call the JBoss AS "
+"installation directory, or <literal>JBOSS_HOME</literal>."
 msgstr ""
 "Depois de ter baixado o JBoss AS, extrai-o. (Recomendamos renomear a pasta "
 "para incluir o qualificador <literal>as</literal>, assim fica claro que é o "
@@ -215,7 +215,7 @@
 
 #. Tag: para
 #, fuzzy, no-c-format
-msgid "You&#39;re now ready to deploy your first example!"
+msgid "You're now ready to deploy your first example!"
 msgstr "Agora você está pronto para implantar seu primeiro exemplo!"
 
 #. Tag: para
@@ -230,8 +230,8 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"If you haven&#39;t already, start JBoss AS. You can either start JBoss AS "
-"from a Linux shell:"
+"If you haven't already, start JBoss AS. You can either start JBoss AS from a "
+"Linux shell:"
 msgstr ""
 "Se você já não estiver, inicie o JBoss AS. Você pode também iniciar o JBoss "
 "AS a partir de um shell Linux:"
@@ -340,7 +340,7 @@
 msgid ""
 "The translator uses session beans, which are packaged in an EJB module "
 "within an ear. Java EE 6 will allow session beans to be deployed in war "
-"modules, but that&#39;s a topic for a later chapter."
+"modules, but that's a topic for a later chapter."
 msgstr ""
 "O tradutor utiliza session beans, os quais estão empacotados em um módulo "
 "EJB dentro de um ear. Java EE 6 permitirá que session beans sejam "
@@ -349,10 +349,10 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"Again, wait a few seconds for the application to deploy (if you&#39;re "
-"really bored, read the log messages), and visit <ulink url=\"http://"
-"localhost:8080/weld-translator\">http://localhost:8080/weld-translator</"
-"ulink> to begin pseudo-translating."
+"Again, wait a few seconds for the application to deploy (if you're really "
+"bored, read the log messages), and visit <ulink url=\"http://localhost:8080/"
+"weld-translator\">http://localhost:8080/weld-translator</ulink> to begin "
+"pseudo-translating."
 msgstr ""
 "Novamente, aguarde uns poucos segundos para a aplicação ser implantada (se "
 "você está realmente entediado, leia as mensagens de log), e visite <ulink "
@@ -367,10 +367,10 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"Deploying to GlassFish should be easy and familiar, right? After all, it&#39;"
-"s the Java EE 6 reference implementation and Weld is the JSR-299 reference "
-"implementation, meaning Weld gets bundled with GlassFish. So yes, it&#39;s "
-"all quite easy and familiar."
+"Deploying to GlassFish should be easy and familiar, right? After all, it's "
+"the Java EE 6 reference implementation and Weld is the JSR-299 reference "
+"implementation, meaning Weld gets bundled with GlassFish. So yes, it's all "
+"quite easy and familiar."
 msgstr ""
 "Implantar no GlassFish deve ser fácil e familiar, certo? Afinal, é a "
 "implementação de referência da Java EE 6 e Weld é a implementação de "
@@ -380,12 +380,12 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"To deploy the examples to GlassFish, you&#39;ll need the final <ulink url="
+"To deploy the examples to GlassFish, you'll need the final <ulink url="
 "\"https://glassfish.dev.java.net/downloads/v3-final.html\">GlassFish V3</"
 "ulink> release. Select the release that ends in either <literal>-unix.sh</"
 "literal> or <literal>-windows.exe</literal> depending on your platform. "
-"After the download is complete, execute the installer. On Linux/Unix, "
-"you&#39;ll need to first make the script executable."
+"After the download is complete, execute the installer. On Linux/Unix, you'll "
+"need to first make the script executable."
 msgstr ""
 "Para implantar os exemplos no GlassFish, você precisará o versão final do "
 "<ulink url=\"https://glassfish.dev.java.net/downloads/v3-final.html"
@@ -399,9 +399,9 @@
 msgid ""
 "On Windows you can just click on the executable. Follow the instructions in "
 "the installer. It will create a single domain named <literal>domain1</"
-"literal>. You&#39;ll use that domain to deploy the example. We recommend "
-"that you choose <literal>7070</literal> as the main HTTP port to avoid "
-"conflicts with a running instance of JBoss AS (or Apache Tomcat)."
+"literal>. You'll use that domain to deploy the example. We recommend that "
+"you choose <literal>7070</literal> as the main HTTP port to avoid conflicts "
+"with a running instance of JBoss AS (or Apache Tomcat)."
 msgstr ""
 "No Windows você pode simplesmente clicar sobre o executável. Siga as "
 "instruções no instalador. Ele criará um único domínio nomeado como "
@@ -413,7 +413,7 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"If you&#39;ve deployed either of the starter examples, <literal>weld-"
+"If you've deployed either of the starter examples, <literal>weld-"
 "numberguess</literal> or <literal>weld-translator</literal>, to JBoss AS, "
 "then you already have the deployable artifact you need. If not, switch to "
 "either of the two directories and build it."
@@ -427,11 +427,11 @@
 #, fuzzy, no-c-format
 msgid ""
 "The deployable archive for the <literal>weld-numberguess</literal>, named "
-"<literal>weld-numberguess.war</literal>, ends up in the example&#39;s "
+"<literal>weld-numberguess.war</literal>, ends up in the example's "
 "<literal>target</literal> directory. The archive for the <literal>weld-"
 "translator</literal> example, named <literal>weld-translator.ear</literal>, "
-"ends up in the example&#39;s <literal>ear/target</literal> directory. All "
-"you need to do now is deploy them to GlassFish."
+"ends up in the example's <literal>ear/target</literal> directory. All you "
+"need to do now is deploy them to GlassFish."
 msgstr ""
 "O artefato implantável para o exemplo <literal>weld-numberguess</literal>, "
 "com o nome <literal>weld-numberguess.war</literal>, é criado no diretório "
@@ -462,15 +462,15 @@
 msgid ""
 "After a few seconds you can visit the Admin Console in the browser at the "
 "URL <ulink url=\"http://localhost:4848\">http://localhost:4848</ulink>. In "
-"the tree on the left-hand side of the page, click on &#34;Applications&#34;, "
-"then click on the &#34;Deploy...&#34; button under the heading &#34;"
-"Applications&#34; and select the deployable artifact for either of the two "
-"examples. The deployer should recognize that you have selected a Java EE "
-"artifact and allow you to start it. You can see the examples running at "
-"either <ulink url=\"http://localhost:7070/weld-numberguess\">http://"
-"localhost:7070/weld-numberguess</ulink> or <ulink url=\"http://"
-"localhost:7070/weld-translator\">http://localhost:7070/weld-translator</"
-"ulink>, depending on which example you deployed."
+"the tree on the left-hand side of the page, click on \"Applications\", then "
+"click on the \"Deploy...\" button under the heading \"Applications\" and "
+"select the deployable artifact for either of the two examples. The deployer "
+"should recognize that you have selected a Java EE artifact and allow you to "
+"start it. You can see the examples running at either <ulink url=\"http://"
+"localhost:7070/weld-numberguess\">http://localhost:7070/weld-numberguess</"
+"ulink> or <ulink url=\"http://localhost:7070/weld-translator\">http://"
+"localhost:7070/weld-translator</ulink>, depending on which example you "
+"deployed."
 msgstr ""
 "Após uns poucos segundos você pode visitar o Admin Console no navegador "
 "através da URL <ulink url=\"http://localhost:4848\">http://localhost:4848</"
@@ -527,8 +527,8 @@
 "Weld comes with a servlet listener which bootstraps the CDI environment, "
 "registers the <literal>BeanManager</literal> in JNDI and provides injection "
 "into servlets. Basically, it emulates some of the work done by the Java EE "
-"container. (But you don&#39;t get enterprise features such as session beans "
-"and container-managed transactions.)"
+"container. (But you don't get enterprise features such as session beans and "
+"container-managed transactions.)"
 msgstr ""
 "O Weld vem com um servlet listener que inicializa o ambiente CDI, registra o "
 "<literal>BeanManager</literal> no JNDI e oferece injeção dentro de servlets. "
@@ -539,9 +539,9 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"Let&#39;s give the Weld servlet extension a spin on Apache Tomcat. First, "
-"you&#39;ll need to download Tomcat 6.0.18 or later from <ulink url=\"http://"
-"tomcat.apache.org/download-60.cgi\">tomcat.apache.org</ulink> and extract it."
+"Let's give the Weld servlet extension a spin on Apache Tomcat. First, you'll "
+"need to download Tomcat 6.0.18 or later from <ulink url=\"http://tomcat."
+"apache.org/download-60.cgi\">tomcat.apache.org</ulink> and extract it."
 msgstr ""
 "Vamos colocar a extensão servlet do Weld para rodar no Apache Tomcat. "
 "Primeiro você precisará baixar o Tomcat 6.0.18 ou posterior em <ulink url="
@@ -554,8 +554,8 @@
 "You have two choices for how you can deploy the application to Tomcat. You "
 "can deploy it by pushing the artifact to the hot deploy directory using Ant "
 "or you can deploy to the server across HTTP using a Maven plugin. The Ant "
-"approach doesn&#39;t require that you have Maven installed, so we&#39;ll "
-"start there. If you want to use Maven, you can just skip ahead."
+"approach doesn't require that you have Maven installed, so we'll start "
+"there. If you want to use Maven, you can just skip ahead."
 msgstr ""
 "Você possui duas opções para implantar a aplicação no Tomcat. Você pode "
 "implantá-la publicando o artefato no diretório de implantação automática "
@@ -575,9 +575,9 @@
 "In order for Ant to push the artifact to the Tomcat hot deploy directory, it "
 "needs to know where the Tomcat installation is located. Again, we need to "
 "set a property in the <literal>local.build.properties</literal> file in the "
-"examples directory of the Weld distribution. If you haven&#39;t yet created "
-"this file, do so now. Then assign the path of your Tomcat installation to "
-"the property key <literal>tomcat.home</literal>."
+"examples directory of the Weld distribution. If you haven't yet created this "
+"file, do so now. Then assign the path of your Tomcat installation to the "
+"property key <literal>tomcat.home</literal>."
 msgstr ""
 "Para que o Ant coloque o artefato no diretório de implantação automática do "
 "Tomcat, ele precisa saber onde a instalação do Tomcat está localizada. "
@@ -589,7 +589,7 @@
 
 #. Tag: para
 #, fuzzy, no-c-format
-msgid "Now you&#39;re ready to deploy the numberguess example to Tomcat!"
+msgid "Now you're ready to deploy the numberguess example to Tomcat!"
 msgstr "Agora você está pronto para implantar o exemplo numberguess no Tomcat!"
 
 #. Tag: para
@@ -606,7 +606,7 @@
 msgid ""
 "The Ant build script includes additional targets for Tomcat to deploy and "
 "undeploy the archive in either exploded or packaged format. They are the "
-"same target names used for JBoss AS, prefixed with &#34;tomcat.&#34;."
+"same target names used for JBoss AS, prefixed with \"tomcat.\"."
 msgstr ""
 "O script de contrução do Ant inclui alvos adicionais para o Tomcat implantar "
 "e desimplantar o arquivo no formato explodido ou empacotado. Eles possuem os "
@@ -647,7 +647,7 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"If you haven&#39;t already, start Tomcat. You can either start Tomcat from a "
+"If you haven't already, start Tomcat. You can either start Tomcat from a "
 "Linux shell:"
 msgstr ""
 "Se você já não estiver, inicie o Tomcat. Você pode também iniciar o Tomcat a "
@@ -677,9 +677,9 @@
 #, fuzzy, no-c-format
 msgid ""
 "You can also deploy the application to Tomcat using Maven. This section is a "
-"bit more advanced, so skip it unless you&#39;re itching to use Maven "
-"natively. Of course, you&#39;ll first need to make sure that you have Maven "
-"installed on your path, similar to how you setup Ant."
+"bit more advanced, so skip it unless you're itching to use Maven natively. "
+"Of course, you'll first need to make sure that you have Maven installed on "
+"your path, similar to how you setup Ant."
 msgstr ""
 "Você também pode implantar a aplicação no Tomcat usando o Maven. Esta seção "
 "é um pouco mais avançada, portanto pule-a, a não ser que você esteja ansioso "
@@ -690,7 +690,7 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"The Maven plugin communicates with Tomcat over HTTP, so it doesn&#39;t care "
+"The Maven plugin communicates with Tomcat over HTTP, so it doesn't care "
 "where you have installed Tomcat. However, the plugin configuration assumes "
 "you are running Tomcat in its default configuration, with a hostname of "
 "localhost and port <literal>8080</literal>. The <literal>readme.txt</"
@@ -772,7 +772,7 @@
 #, fuzzy, no-c-format
 msgid ""
 "There are several other Maven goals that you can use if you are hacking on "
-"the example, which are documented in the example&#39;s <literal>readme.txt</"
+"the example, which are documented in the example's <literal>readme.txt</"
 "literal> file."
 msgstr ""
 "Existem muitos outros goals do Maven que você pode usar se estiver "
@@ -802,10 +802,10 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"If you&#39;ve read through the entire Tomcat section, then you&#39;re all "
-"ready to go. The Maven build parallels the embedded Tomcat deployment. If "
-"not, don&#39;t worry. We&#39;ll still go over everything that you need to "
-"know again in this section."
+"If you've read through the entire Tomcat section, then you're all ready to "
+"go. The Maven build parallels the embedded Tomcat deployment. If not, don't "
+"worry. We'll still go over everything that you need to know again in this "
+"section."
 msgstr ""
 "Se você leu toda a seção do Tomcat até o fim, então você está pronto para "
 "seguir. A execução do Maven assemelha-se à implantação embutida do Tomcat. "
@@ -818,7 +818,7 @@
 "The Maven POM (<literal>pom.xml</literal>) includes a profile named "
 "<literal>jetty</literal> that activates the Maven Jetty plugin, which you "
 "can use to start Jetty in embedded mode and deploy the application in place. "
-"You don&#39;t need anything else installed except to have the Maven command "
+"You don't need anything else installed except to have the Maven command "
 "(<literal>mvn</literal>) on your path. The rest will be downloaded from the "
 "internet when the build is run."
 msgstr ""
@@ -925,9 +925,9 @@
 #, fuzzy, no-c-format
 msgid ""
 "Now, you are ready to run the server in Eclipse. Import the project into "
-"your Eclipse workspace using &#34;Import Existing Project into Workspace. "
-"Then, find the start class in <literal>src/jetty/java</literal> and run its "
-"main method as a Java Application. Jetty will launch. You can view the "
+"your Eclipse workspace using \"Import Existing Project into Workspace. Then, "
+"find the start class in <literal>src/jetty/java</literal> and run its main "
+"method as a Java Application. Jetty will launch. You can view the "
 "application at the following local URL: <ulink url=\"http://localhost:8080"
 "\">http://localhost:8080</ulink>. Pay particular attention to the port in "
 "the URL and the lack of a trailing context path."

Modified: doc/trunk/reference/src/main/docbook/pt-BR/injection.po
===================================================================
--- doc/trunk/reference/src/main/docbook/pt-BR/injection.po	2010-07-24 16:36:48 UTC (rev 6808)
+++ doc/trunk/reference/src/main/docbook/pt-BR/injection.po	2010-07-25 04:22:37 UTC (rev 6809)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: Introduction_to_Web_Beans VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-05-01T14:44:09\n"
+"POT-Creation-Date: 2010-07-25T03:52:14\n"
 "PO-Revision-Date: 2010-04-14 17:23-0300\n"
 "Last-Translator: Bruno Leonardo Gonçalves <brunolmfg at gmail.com>\n"
 "Language-Team: none\n"
@@ -120,7 +120,7 @@
 #, fuzzy, no-c-format
 msgid ""
 "Next, the container calls all initializer methods of bean (the call order is "
-"not portable, don&#39;t rely on it)."
+"not portable, don't rely on it)."
 msgstr ""
 "Em seguida, o contêiner chama todos os métodos inicializadores do bean (a "
 "ordem de chamada não é portável, não confie nela)."
@@ -169,7 +169,7 @@
 msgid ""
 "This is a case where the <literal>@Inject</literal> annotation <emphasis>is "
 "not</emphasis> required at the injection point. The same is true for "
-"observer methods (which we&#39;ll meet in <xref linkend=\"events\" />) and "
+"observer methods (which we'll meet in <xref linkend=\"events\" />) and "
 "disposer methods."
 msgstr ""
 "Este é um caso onde a anotação <literal>@Inject</literal> <emphasis>não é</"
@@ -188,9 +188,9 @@
 "The CDI specification defines a procedure, called <emphasis>typesafe "
 "resolution</emphasis>, that the container follows when identifying the bean "
 "to inject to an injection point. This algorithm looks complex at first, but "
-"once you understand it, it&#39;s really quite intuitive. Typesafe resolution "
-"is performed at system initialization time, which means that the container "
-"will inform the developer immediately if a bean&#39;s dependencies cannot be "
+"once you understand it, it's really quite intuitive. Typesafe resolution is "
+"performed at system initialization time, which means that the container will "
+"inform the developer immediately if a bean's dependencies cannot be "
 "satisfied."
 msgstr ""
 "A especificação CDI define um procedimento, chamado de <emphasis>resolução "
@@ -239,9 +239,9 @@
 #, fuzzy, no-c-format
 msgid ""
 "Obviously, if you have exactly one bean of a given type, and an injection "
-"point with that same type, then bean A is going to go into slot A. That&#39;"
-"s the simplest possible scenario. When you first start your application, "
-"you&#39;ll likely have lots of those."
+"point with that same type, then bean A is going to go into slot A. That's "
+"the simplest possible scenario. When you first start your application, "
+"you'll likely have lots of those."
 msgstr ""
 "Obviamente, se você possui exatamente um bean de um dado tipo, e um ponto de "
 "injeção com este mesmo tipo, então o bean A irá para onde pedir um A. Este é "
@@ -251,9 +251,9 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"But then, things start to get complicated. Let&#39;s explore how the "
-"container determines which bean to inject in more advanced cases. We&#39;ll "
-"start by taking a closer look at qualifiers."
+"But then, things start to get complicated. Let's explore how the container "
+"determines which bean to inject in more advanced cases. We'll start by "
+"taking a closer look at qualifiers."
 msgstr ""
 "Mas então, as coisas começam a ficar complicadas. Vamos explorar como o "
 "contêiner determina qual bean injetar em casos mais avançados. Nós "
@@ -337,12 +337,12 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"Now, you may be thinking, <emphasis>&#34;What&#39;s the different between "
-"using a qualifier and just specifying the exact implementation class you "
-"want?&#34;</emphasis> It&#39;s important to understand that a qualifier is "
-"like an extension of the interface. It does not create a direct dependency "
-"to any particular implementation. There may be multiple alterative "
-"implementations of <literal>@Asynchronous PaymentProcessor</literal>!"
+"Now, you may be thinking, <emphasis>\"What's the different between using a "
+"qualifier and just specifying the exact implementation class you want?\"</"
+"emphasis> It's important to understand that a qualifier is like an extension "
+"of the interface. It does not create a direct dependency to any particular "
+"implementation. There may be multiple alterative implementations of "
+"<literal>@Asynchronous PaymentProcessor</literal>!"
 msgstr ""
 "Agora, você pode estar pensando, <emphasis>\"Qual a diferença entre usar um "
 "qualificador e apenas especificar a exata classe de implementação que você "
@@ -365,12 +365,11 @@
 msgid ""
 "Whenever a bean or injection point does not explicitly declare a qualifier, "
 "the container assumes the qualifier <literal>@Default</literal>. From time "
-"to time, you&#39;ll need to decare an injection point without specifying a "
-"qualifier. There&#39;s a qualifier for that too. All beans have the "
-"qualifier <literal>@Any</literal>. Therefore, by explicitly specifying "
-"<literal>@Any</literal> at an injection point, you suppress the default "
-"qualifier, without otherwise restricting the beans that are eligible for "
-"injection."
+"to time, you'll need to decare an injection point without specifying a "
+"qualifier. There's a qualifier for that too. All beans have the qualifier "
+"<literal>@Any</literal>. Therefore, by explicitly specifying <literal>@Any</"
+"literal> at an injection point, you suppress the default qualifier, without "
+"otherwise restricting the beans that are eligible for injection."
 msgstr ""
 "Sempre que um bean ou ponto de injeção não declara explicitamente um "
 "qualificador, o contêiner assume o qualificador <literal>@Default</literal>. "
@@ -484,7 +483,7 @@
 "When an ambiguous dependency exists at an injection point, the container "
 "attempts to resolve the ambiguity by looking for an enabled alternative "
 "among the beans that could be injected. If there is exactly one enabled "
-"alternative, that&#39;s the bean that will be injected."
+"alternative, that's the bean that will be injected."
 msgstr ""
 "Quando existe uma dependência ambígua em um ponto de injeção, o contêiner "
 "tenta resolver a ambiguidade pesquisando por um alternativo habilitado entre "
@@ -517,8 +516,8 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"During the course of your development, you&#39;re going to encounter this "
-"situation. Let&#39;s learn how to resolve it."
+"During the course of your development, you're going to encounter this "
+"situation. Let's learn how to resolve it."
 msgstr ""
 "Durante o progresso de seu desenvolvimento, você vai encontrar essa "
 "situação. Vamos aprender como resolvê-la."
@@ -613,7 +612,7 @@
 
 #. Tag: para
 #, fuzzy, no-c-format
-msgid "Just remember: &#34;There can be only one.&#34;"
+msgid "Just remember: \"There can be only one.\""
 msgstr "Apenas lembre-se: \"Só pode haver um.\""
 
 #. Tag: para
@@ -621,7 +620,7 @@
 msgid ""
 "On the other hand, if you really do have an optional or multivalued "
 "injection point, you should change the type of your injection point to "
-"<literal>Instance</literal>, as we&#39;ll see in <xref linkend=\"lookup\" />."
+"<literal>Instance</literal>, as we'll see in <xref linkend=\"lookup\" />."
 msgstr ""
 "Por outro lado, se você realmente tem um ponto de injeção opcional ou "
 "multivalorado, você deveria mudar o tipo de seu ponto de injeção para "
@@ -630,8 +629,8 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"Now there&#39;s one more issue you need to be aware of when using the "
-"dependency injection service."
+"Now there's one more issue you need to be aware of when using the dependency "
+"injection service."
 msgstr ""
 "Agora há mais uma questão que você precisa estar ciente quando usar o "
 "serviço de injeção de dependência."
@@ -728,8 +727,7 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"classes which don&#39;t have a non-private constructor with no parameters, "
-"and"
+"classes which don't have a non-private constructor with no parameters, and"
 msgstr "classes que não possuem um construtor não privado sem parâmetros, e"
 
 #. Tag: para
@@ -749,7 +747,7 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"It&#39;s usually very easy to fix an unproxyable dependency problem. If an "
+"It's usually very easy to fix an unproxyable dependency problem. If an "
 "injection point of type <literal>X</literal> results in an unproxyable "
 "dependency, simply:"
 msgstr ""
@@ -765,7 +763,7 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"change the type of the injection point to <literal>Instance&#60;X&#62;</"
+"change the type of the injection point to <literal>Instance&lt;X&gt;</"
 "literal>,"
 msgstr ""
 "modifique o tipo do ponto de injeção para <literal>Instance&lt;X&gt;</"
@@ -818,7 +816,7 @@
 
 #. Tag: para
 #, fuzzy, no-c-format
-msgid "But we didn&#39;t get around to implementing this yet."
+msgid "But we didn't get around to implementing this yet."
 msgstr "Mas não somos obrigados a implementar isto ainda."
 
 #. Tag: title
@@ -925,11 +923,10 @@
 #, fuzzy, no-c-format
 msgid ""
 "Next, we need to obtain an instance of our qualifier type. Since annotatons "
-"are interfaces, we can&#39;t just write <literal>new Asynchronous()</"
-"literal>. It&#39;s also quite tedious to create a concrete implementation of "
-"an annotation type from scratch. Instead, CDI lets us obtain a qualifier "
-"instance by subclassing the helper class <literal>AnnotationLiteral</"
-"literal>."
+"are interfaces, we can't just write <literal>new Asynchronous()</literal>. "
+"It's also quite tedious to create a concrete implementation of an annotation "
+"type from scratch. Instead, CDI lets us obtain a qualifier instance by "
+"subclassing the helper class <literal>AnnotationLiteral</literal>."
 msgstr ""
 "Em seguida, precisamos obter uma instância de nosso tipo de qualificador. "
 "Uma vez que anotações são interfaces, não podemos apenas escrever "
@@ -946,8 +943,7 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"We can&#39;t use an anonymous class to implement a qualifier type with "
-"members."
+"We can't use an anonymous class to implement a qualifier type with members."
 msgstr ""
 "Não podemos utilizar uma classe anônima para implementar um tipo de "
 "qualificador com membros."
@@ -1020,8 +1016,8 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"Let&#39;s look at an example. The following code is verbose, and vulnerable "
-"to refactoring problems:"
+"Let's look at an example. The following code is verbose, and vulnerable to "
+"refactoring problems:"
 msgstr ""
 "Vejamos um exemplo. O seguinte código é prolixo e vulnerável a problemas de "
 "refatoração:"
@@ -1044,8 +1040,8 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"Not convinced? Then here&#39;s a second example. To inject HTTP parameters, "
-"we need to define a qualifier type:"
+"Not convinced? Then here's a second example. To inject HTTP parameters, we "
+"need to define a qualifier type:"
 msgstr ""
 "Não está convencido? Então aqui está um segundo exemplo. Para injetar "
 "parâmetros HTTP, precisamos definir um tipo de qualificador:"

Modified: doc/trunk/reference/src/main/docbook/pt-BR/interceptors.po
===================================================================
--- doc/trunk/reference/src/main/docbook/pt-BR/interceptors.po	2010-07-24 16:36:48 UTC (rev 6808)
+++ doc/trunk/reference/src/main/docbook/pt-BR/interceptors.po	2010-07-25 04:22:37 UTC (rev 6809)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: Introduction_to_Web_Beans VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-05-01T13:53:43\n"
+"POT-Creation-Date: 2010-07-25T03:52:14\n"
 "PO-Revision-Date: 2009-12-19 18:05-0300\n"
 "Last-Translator: João Paulo Viragine <joao.viragine at redhat.com>\n"
 "Language-Team: none\n"
@@ -87,7 +87,7 @@
 msgid ""
 "Suppose we want to declare that some of our beans are transactional. The "
 "first thing we need is an <emphasis>interceptor binding type</emphasis> to "
-"specify exactly which beans we&#39;re interested in:"
+"specify exactly which beans we're interested in:"
 msgstr ""
 
 #. Tag: para
@@ -110,9 +110,9 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"That&#39;s great, but somewhere along the line we&#39;re going to have to "
-"actually implement the interceptor that provides this transaction management "
-"aspect. All we need to do is create a standard interceptor, and annotate it "
+"That's great, but somewhere along the line we're going to have to actually "
+"implement the interceptor that provides this transaction management aspect. "
+"All we need to do is create a standard interceptor, and annotate it "
 "<literal>@Interceptor</literal> and <literal>@Transactional</literal>."
 msgstr ""
 

Modified: doc/trunk/reference/src/main/docbook/pt-BR/intro.po
===================================================================
--- doc/trunk/reference/src/main/docbook/pt-BR/intro.po	2010-07-24 16:36:48 UTC (rev 6808)
+++ doc/trunk/reference/src/main/docbook/pt-BR/intro.po	2010-07-25 04:22:37 UTC (rev 6809)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: Introduction_to_Web_Beans VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-05-01T14:44:09\n"
+"POT-Creation-Date: 2010-07-25T03:52:14\n"
 "PO-Revision-Date: 2010-04-14 14:18-0300\n"
 "Last-Translator: Bruno Leonardo Gonçalves <brunolmfg at gmail.com>\n"
 "Language-Team: none\n"
@@ -21,11 +21,11 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"So you&#39;re keen to get started writing your first bean? Or perhaps "
-"you&#39;re skeptical, wondering what kinds of hoops the CDI specification "
-"will make you jump through! The good news is that you&#39;ve probably "
-"already written and used hundreds, perhaps thousands of beans. CDI just "
-"makes it easier to actually use them to build an application!"
+"So you're keen to get started writing your first bean? Or perhaps you're "
+"skeptical, wondering what kinds of hoops the CDI specification will make you "
+"jump through! The good news is that you've probably already written and used "
+"hundreds, perhaps thousands of beans. CDI just makes it easier to actually "
+"use them to build an application!"
 msgstr ""
 "Então você está interessado em começar a escrever seu primeiro bean? Ou "
 "talvez você seja cético, imaginando que tipos de argolas a especificação CDI "
@@ -50,14 +50,13 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"Prior to Java EE 6, there was no clear definition of the term &#34;bean&#34; "
-"in the Java EE platform. Of course, we&#39;ve been calling Java classes used "
-"in web and enterprise applications &#34;beans&#34; for years. There were "
-"even a couple of different kinds of things called &#34;beans&#34; in EE "
-"specifications, including EJB beans and JSF managed beans. Meanwhile, other "
-"third-party frameworks such as Spring and Seam introduced their own ideas of "
-"what it meant to be a &#34;bean&#34;. What we&#39;ve been missing is a "
-"common definition."
+"Prior to Java EE 6, there was no clear definition of the term \"bean\" in "
+"the Java EE platform. Of course, we've been calling Java classes used in web "
+"and enterprise applications \"beans\" for years. There were even a couple of "
+"different kinds of things called \"beans\" in EE specifications, including "
+"EJB beans and JSF managed beans. Meanwhile, other third-party frameworks "
+"such as Spring and Seam introduced their own ideas of what it meant to be a "
+"\"bean\". What we've been missing is a common definition."
 msgstr ""
 "Antes do Java EE 6, não havia uma definição clara do termo \"bean\" na "
 "plataforma Java EE. Claro, nós fomos chamando as classes Java usadas em "
@@ -77,8 +76,8 @@
 "Old Java Object). They support a small set of basic services, such as "
 "resource injection, lifecycle callbacks and interceptors. Companion "
 "specifications, such as EJB and CDI, build on this basic model. But, "
-"<emphasis>at last</emphasis>, there&#39;s a uniform concept of a bean and a "
-"lightweight component model that&#39;s aligned across the Java EE platform."
+"<emphasis>at last</emphasis>, there's a uniform concept of a bean and a "
+"lightweight component model that's aligned across the Java EE platform."
 msgstr ""
 "Java EE 6, finalmente, estabelece que a definição comum está na "
 "especificação de Managed Beans. Managed Beans são definidos como objetos "
@@ -96,13 +95,12 @@
 "With very few exceptions, almost every concrete Java class that has a "
 "constructor with no parameters (or a constructor designated with the "
 "annotation <literal>@Inject</literal>) is a bean. This includes every "
-"JavaBean and every EJB session bean. If you&#39;ve already got some "
-"JavaBeans or session beans lying around, they&#39;re already beans—you "
-"won&#39;t need any additional special metadata. There&#39;s just little one "
-"thing you need to do before you can start injecting them into stuff: you "
-"need to put them in an archive (a jar, or a Java EE module such as a war or "
-"EJB jar) that contains a special marker file: <literal>META-INF/beans.xml</"
-"literal>."
+"JavaBean and every EJB session bean. If you've already got some JavaBeans or "
+"session beans lying around, they're already beans—you won't need any "
+"additional special metadata. There's just little one thing you need to do "
+"before you can start injecting them into stuff: you need to put them in an "
+"archive (a jar, or a Java EE module such as a war or EJB jar) that contains "
+"a special marker file: <literal>META-INF/beans.xml</literal>."
 msgstr ""
 "Com pouquíssimas exceções, quase toda classe Java concreta que possui um "
 "construtor com nenhum parâmetro (ou um construtor designado com a anotação "
@@ -117,14 +115,14 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"The JavaBeans and EJBs you&#39;ve been writing every day, up until now, have "
-"not been able to take advantage of the new services defined by the CDI "
-"specification. But you&#39;ll be able to use every one of them with CDI—"
-"allowing the container to create and destroy instances of your beans and "
-"associate them with a designated context, injecting them into other beans, "
-"using them in EL expressions, specializing them with qualifier annotations, "
-"even adding interceptors and decorators to them—without modifying your "
-"existing code. At most, you&#39;ll need to add some annotations."
+"The JavaBeans and EJBs you've been writing every day, up until now, have not "
+"been able to take advantage of the new services defined by the CDI "
+"specification. But you'll be able to use every one of them with CDI—allowing "
+"the container to create and destroy instances of your beans and associate "
+"them with a designated context, injecting them into other beans, using them "
+"in EL expressions, specializing them with qualifier annotations, even adding "
+"interceptors and decorators to them—without modifying your existing code. At "
+"most, you'll need to add some annotations."
 msgstr ""
 "Os JavaBeans e EJBs que você tem escrito todo dia, até agora, não foram "
 "capazes de tirar proveito dos novos serviços definidos pela especificação "
@@ -137,7 +135,7 @@
 
 #. Tag: para
 #, fuzzy, no-c-format
-msgid "Now let&#39;s see how to create your first bean that actually uses CDI."
+msgid "Now let's see how to create your first bean that actually uses CDI."
 msgstr ""
 "Agora vamos ver como criar seu primeiro bean que realmente utiliza CDI."
 
@@ -149,7 +147,7 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"Suppose that we have two existing Java classes that we&#39;ve been using for "
+"Suppose that we have two existing Java classes that we've been using for "
 "years in various applications. The first class parses a string into a list "
 "of sentences:"
 msgstr ""
@@ -176,8 +174,8 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"Unfortunately, we don&#39;t have a class that translates whole text "
-"documents. So let&#39;s write a bean for this job:"
+"Unfortunately, we don't have a class that translates whole text documents. "
+"So let's write a bean for this job:"
 msgstr ""
 "Infelizmente, não temos uma classe pré-existente que traduz todo o texto de "
 "documentos. Então vamos escrever um bean que faz este trabalho:"
@@ -198,11 +196,11 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"As you&#39;ve guessed, the <literal>@Inject</literal> annotation has "
-"something to do with dependency injection! <literal>@Inject</literal> may be "
-"applied to a constructor or method of a bean, and tells the container to "
-"call that constructor or method when instantiating the bean. The container "
-"will inject other beans into the parameters of the constructor or method."
+"As you've guessed, the <literal>@Inject</literal> annotation has something "
+"to do with dependency injection! <literal>@Inject</literal> may be applied "
+"to a constructor or method of a bean, and tells the container to call that "
+"constructor or method when instantiating the bean. The container will inject "
+"other beans into the parameters of the constructor or method."
 msgstr ""
 "Como você imaginou, a anotação <literal>@Inject</literal> tem algo a ver com "
 "injeção de dependencia! <literal>@Inject</literal> pode ser aplicada a um "
@@ -228,7 +226,7 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"Let&#39;s create a UI controller bean that uses field injection to obtain an "
+"Let's create a UI controller bean that uses field injection to obtain an "
 "instance of the <literal>TextTranslator</literal>, translating the text "
 "entered by a user:"
 msgstr ""
@@ -246,10 +244,10 @@
 #, fuzzy, no-c-format
 msgid ""
 "Notice the controller bean is request-scoped and named. Since this "
-"combination is so common in web applications, there&#39;s a built-in "
-"annotation for it in CDI that we could have used as a shorthand. When the "
-"(stereotype) annotation <literal>@Model</literal> is declared on a class, it "
-"creates a request-scoped and named bean."
+"combination is so common in web applications, there's a built-in annotation "
+"for it in CDI that we could have used as a shorthand. When the (stereotype) "
+"annotation <literal>@Model</literal> is declared on a class, it creates a "
+"request-scoped and named bean."
 msgstr ""
 "Observe que o bean controlador tem escopo de solicitação e é nomeado. Uma "
 "vez que esta combinação é tão comum em aplicações web uma anotação embutida "
@@ -271,11 +269,11 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"Notice that it isn&#39;t necessary to create a getter or setter method to "
-"inject one bean into another. CDI can access an injected field directly "
-"(even if it&#39;s private!), which sometimes helps eliminate some wasteful "
-"code. The name of the field is arbitrary. It&#39;s the field&#39;s type that "
-"determines what is injected."
+"Notice that it isn't necessary to create a getter or setter method to inject "
+"one bean into another. CDI can access an injected field directly (even if "
+"it's private!), which sometimes helps eliminate some wasteful code. The name "
+"of the field is arbitrary. It's the field's type that determines what is "
+"injected."
 msgstr ""
 "Repare que não é necessário criar um método getter ou setter para injetar um "
 "bean dentro de outro. CDI pode acessar um campo injetado diretamente (mesmo "
@@ -306,10 +304,10 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"Before we get too deep in the details, let&#39;s pause and examine a "
-"bean&#39;s anatomy. What aspects of the bean are significant, and what gives "
-"it its identity? Instead of just giving examples of beans, we&#39;re going "
-"to define what <emphasis>makes</emphasis> something a bean."
+"Before we get too deep in the details, let's pause and examine a bean's "
+"anatomy. What aspects of the bean are significant, and what gives it its "
+"identity? Instead of just giving examples of beans, we're going to define "
+"what <emphasis>makes</emphasis> something a bean."
 msgstr ""
 "Antes de aprofundarmos nos detalhes, vamos fazer uma pausa e examinar a "
 "anatomia de um bean. Que aspectos do bean são significantes e o que lhe "

Modified: doc/trunk/reference/src/main/docbook/pt-BR/master.po
===================================================================
--- doc/trunk/reference/src/main/docbook/pt-BR/master.po	2010-07-24 16:36:48 UTC (rev 6808)
+++ doc/trunk/reference/src/main/docbook/pt-BR/master.po	2010-07-25 04:22:37 UTC (rev 6809)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: Introduction_to_Web_Beans VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-05-01T14:44:09\n"
+"POT-Creation-Date: 2010-07-25T03:52:14\n"
 "PO-Revision-Date: 2010-04-14 14:08-0300\n"
 "Last-Translator: Bruno Leonardo Gonçalves <brunolmfg at gmail.com>\n"
 "Language-Team: none\n"
@@ -22,14 +22,14 @@
 #, fuzzy, no-c-format
 msgid ""
 "Shortly before the final draft of JSR-299 was submitted, the specification "
-"changed its name from &#34;Web Beans&#34; to &#34;Java Contexts and "
-"Dependency Injection for the Java EE platform&#34;, abbreviated CDI. For a "
-"brief period after the renaming, the reference implementation adopted the "
-"name &#34;Web Beans&#34;. However, this ended up causing more confusion than "
-"it solved and Red Hat decided to change the name of the reference "
-"implementation to &#34;Weld&#34;. You may still find other documentation, "
-"blogs, forum posts, etc. that use the old nomenclature. Please update any "
-"references you can. The naming game is over."
+"changed its name from \"Web Beans\" to \"Java Contexts and Dependency "
+"Injection for the Java EE platform\", abbreviated CDI. For a brief period "
+"after the renaming, the reference implementation adopted the name \"Web Beans"
+"\". However, this ended up causing more confusion than it solved and Red Hat "
+"decided to change the name of the reference implementation to \"Weld\". You "
+"may still find other documentation, blogs, forum posts, etc. that use the "
+"old nomenclature. Please update any references you can. The naming game is "
+"over."
 msgstr ""
 "Pouco antes do rascunho final da JSR-299 ser submetido, a especificação "
 "mudou seu nome de \"Web Beans\" para \"Java Contexts and Dependency "
@@ -44,7 +44,7 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"You&#39;ll also find that some of the functionality that once existed in the "
+"You'll also find that some of the functionality that once existed in the "
 "specification is now missing, such as defining beans in XML. These features "
 "will be available as portable extensions for CDI in the Weld project, and "
 "perhaps other implementations."
@@ -58,11 +58,11 @@
 #, fuzzy, no-c-format
 msgid ""
 "Note that this reference guide was started while changes were still being "
-"made to the specification. We&#39;ve done our best to update it for "
-"accuracy. If you discover a conflict between what is written in this guide "
-"and the specification, the specification is the authority—assume it is "
-"correct. If you believe you have found an error in the specification, please "
-"report it to the JSR-299 EG."
+"made to the specification. We've done our best to update it for accuracy. If "
+"you discover a conflict between what is written in this guide and the "
+"specification, the specification is the authority—assume it is correct. If "
+"you believe you have found an error in the specification, please report it "
+"to the JSR-299 EG."
 msgstr ""
 "Note que este guia de referência foi iniciado enquanto mudanças ainda eram "
 "realizadas na especificação. Nós fizemos o nosso melhor para atualizá-lo "

Modified: doc/trunk/reference/src/main/docbook/pt-BR/next.po
===================================================================
--- doc/trunk/reference/src/main/docbook/pt-BR/next.po	2010-07-24 16:36:48 UTC (rev 6808)
+++ doc/trunk/reference/src/main/docbook/pt-BR/next.po	2010-07-25 04:22:37 UTC (rev 6809)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: Introduction_to_Web_Beans VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-05-01T13:53:43\n"
+"POT-Creation-Date: 2010-07-25T03:52:14\n"
 "PO-Revision-Date: 2009-12-19 17:59-0300\n"
 "Last-Translator: João Paulo Viragine <joao.viragine at redhat.com>\n"
 "Language-Team: none\n"
@@ -21,13 +21,13 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Because CDI is so new, there&#39;s not yet a lot of information available "
+"Because CDI is so new, there's not yet a lot of information available "
 "online. That will change over time. Regardless, the CDI specification "
 "remains the authority for information on CDI. The spec is less than 100 "
-"pages and is quite readable (don&#39;t worry, it&#39;s not like your Blu-ray "
-"player manual). Of course, it covers many details we&#39;ve skipped over "
-"here. The spec is available on the <ulink url=\"http://jcp.org/en/jsr/detail?"
-"id=299\">JSR-299 page</ulink> at the JCP website."
+"pages and is quite readable (don't worry, it's not like your Blu-ray player "
+"manual). Of course, it covers many details we've skipped over here. The spec "
+"is available on the <ulink url=\"http://jcp.org/en/jsr/detail?id=299\">JSR-"
+"299 page</ulink> at the JCP website."
 msgstr ""
 
 #. Tag: para
@@ -37,8 +37,8 @@
 "\"http://seamframework.org/Weld\">Seam project</ulink>. The RI development "
 "team and the CDI spec lead blog at <ulink url=\"http://in.relation.to\">in."
 "relation.to</ulink>. This guide was originally based on a series of blog "
-"entries published there while the specification was being developed. It&#39;"
-"s probably the best source of information about the future of CDI, Weld and "
+"entries published there while the specification was being developed. It's "
+"probably the best source of information about the future of CDI, Weld and "
 "Seam."
 msgstr ""
 "A implementação de referência da CDI (CDI RI) está sendo desenvolvida em "
@@ -78,8 +78,8 @@
 #, no-c-format
 msgid ""
 "Edit the <literal>pom.xml</literal> file in the root of the checkout and "
-"remove the &#34;<literal>-SNAPSHOT</literal>&#34; from the version element "
-"(so you don&#39;t have to build other Weld modules)."
+"remove the \"<literal>-SNAPSHOT</literal>\" from the version element (so you "
+"don't have to build other Weld modules)."
 msgstr ""
 
 #. Tag: para

Modified: doc/trunk/reference/src/main/docbook/pt-BR/part1.po
===================================================================
--- doc/trunk/reference/src/main/docbook/pt-BR/part1.po	2010-07-24 16:36:48 UTC (rev 6808)
+++ doc/trunk/reference/src/main/docbook/pt-BR/part1.po	2010-07-25 04:22:37 UTC (rev 6809)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: Introduction_to_Web_Beans VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-05-01T14:44:09\n"
+"POT-Creation-Date: 2010-07-25T03:52:14\n"
 "PO-Revision-Date: 2010-04-14 14:13-0300\n"
 "Last-Translator: Bruno Leonardo Gonçalves <brunolmfg at gmail.com>\n"
 "Language-Team: none\n"
@@ -194,7 +194,7 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"Where should I keep the reference to it when I&#39;m not currently using it?"
+"Where should I keep the reference to it when I'm not currently using it?"
 msgstr ""
 "Onde devo manter referência a ele quando não estiver usando-o diretamente?"
 
@@ -216,9 +216,9 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"CDI is more than a framework. It&#39;s a whole, rich programming model. The "
+"CDI is more than a framework. It's a whole, rich programming model. The "
 "<emphasis>theme</emphasis> of CDI is <emphasis>loose-coupling with strong "
-"typing</emphasis>. Let&#39;s study what that phrase means."
+"typing</emphasis>. Let's study what that phrase means."
 msgstr ""
 "CDI é mais do que um framework. É um completo e rico modelo de programação. "
 "O <emphasis>tema</emphasis> de CDI é <emphasis>baixo acoplamento com tipagem "
@@ -281,8 +281,8 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"What&#39;s even more powerful (and comforting) is that CDI provides all "
-"these facilities in a <emphasis>typesafe</emphasis> way. CDI never relies on "
+"What's even more powerful (and comforting) is that CDI provides all these "
+"facilities in a <emphasis>typesafe</emphasis> way. CDI never relies on "
 "string-based identifiers to determine how collaborating objects fit "
 "together. Instead, CDI uses the typing information that is already available "
 "in the Java object model, augmented using a new programming pattern, called "
@@ -304,10 +304,10 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"But CDI isn&#39;t a restrictive programming model. It doesn&#39;t tell you "
-"how you should to structure your application into layers, how you should "
-"handle persistence, or what web framework you have to use. You&#39;ll have "
-"to decide those kinds of things for yourself."
+"But CDI isn't a restrictive programming model. It doesn't tell you how you "
+"should to structure your application into layers, how you should handle "
+"persistence, or what web framework you have to use. You'll have to decide "
+"those kinds of things for yourself."
 msgstr ""
 "Mas CDI não é um modelo de programação restritivo. Ele não diz como você "
 "deve estruturar sua aplicação em camadas, como você deve lidar com a "
@@ -333,8 +333,8 @@
 "CDI was influenced by a number of existing Java frameworks, including Seam, "
 "Guice and Spring. However, CDI has its own, very distinct, character: more "
 "typesafe than Seam, more stateful and less XML-centric than Spring, more web "
-"and enterprise-application capable than Guice. But it couldn&#39;t have been "
-"any of these without inspiration from the frameworks mentioned and "
+"and enterprise-application capable than Guice. But it couldn't have been any "
+"of these without inspiration from the frameworks mentioned and "
 "<emphasis>lots</emphasis> of collaboration and hard work by the JSR-299 "
 "Expert Group (EG)."
 msgstr ""

Modified: doc/trunk/reference/src/main/docbook/pt-BR/part3.po
===================================================================
--- doc/trunk/reference/src/main/docbook/pt-BR/part3.po	2010-07-24 16:36:48 UTC (rev 6808)
+++ doc/trunk/reference/src/main/docbook/pt-BR/part3.po	2010-07-25 04:22:37 UTC (rev 6809)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: Introduction_to_Web_Beans VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-05-01T13:53:43\n"
+"POT-Creation-Date: 2010-07-25T03:52:14\n"
 "PO-Revision-Date: 2009-04-10 13:21-0300\n"
 "Last-Translator: João Paulo Viragine <joao.viragine at redhat.com>\n"
 "Language-Team: none\n"
@@ -16,8 +16,8 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"The first major theme of CDI is <emphasis>loose coupling</emphasis>. We&#39;"
-"ve already seen three means of achieving loose coupling:"
+"The first major theme of CDI is <emphasis>loose coupling</emphasis>. We've "
+"already seen three means of achieving loose coupling:"
 msgstr ""
 
 #. Tag: para
@@ -102,10 +102,10 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"You don&#39;t see string-based identifiers in CDI code, not because the "
+"You don't see string-based identifiers in CDI code, not because the "
 "framework is hiding them from you using clever defaulting rules—so-called "
-"&#34;configuration by convention&#34;—but because there are simply no "
-"strings there to begin with!"
+"\"configuration by convention\"—but because there are simply no strings "
+"there to begin with!"
 msgstr ""
 "Você não vê identificadores baseados em strings no código Web Beans - não "
 "porque o framework está escondendo-os de você utilizando padrões de regras "
@@ -214,11 +214,11 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"We&#39;re now ready to meet some more advanced features of CDI. Bear in mind "
+"We're now ready to meet some more advanced features of CDI. Bear in mind "
 "that these features exist to make our code both easier to validate and more "
-"understandable. Most of the time you don&#39;t ever really <emphasis>need</"
-"emphasis> to use these features, but if you use them wisely, you&#39;ll come "
-"to appreciate their power."
+"understandable. Most of the time you don't ever really <emphasis>need</"
+"emphasis> to use these features, but if you use them wisely, you'll come to "
+"appreciate their power."
 msgstr ""
 "Nós agora estamos prontos para verificar mais algumas funcionalidades "
 "avançadas da Web Beans. Tenha em mente que essas funcionalidades existem "

Modified: doc/trunk/reference/src/main/docbook/pt-BR/part4.po
===================================================================
--- doc/trunk/reference/src/main/docbook/pt-BR/part4.po	2010-07-24 16:36:48 UTC (rev 6808)
+++ doc/trunk/reference/src/main/docbook/pt-BR/part4.po	2010-07-25 04:22:37 UTC (rev 6809)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: Introduction_to_Web_Beans VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-05-01T13:53:43\n"
+"POT-Creation-Date: 2010-07-25T03:52:14\n"
 "PO-Revision-Date: 2009-04-10 20:34-0300\n"
 "Last-Translator: João Paulo Viragine <joao.viragine at redhat.com>\n"
 "Language-Team: none\n"
@@ -16,12 +16,12 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"The third theme of CDI is <emphasis>integration</emphasis>. We&#39;ve "
-"already seen how CDI helps integrate EJB and JSF, allowing EJBs to be bound "
-"directly to JSF pages. That&#39;s just the beginning. The CDI services are "
-"integrated into the very core of the Java EE platform. Even EJB session "
-"beans can take advantage of the dependency injection, event bus, and "
-"contextual lifecycle management that CDI provides."
+"The third theme of CDI is <emphasis>integration</emphasis>. We've already "
+"seen how CDI helps integrate EJB and JSF, allowing EJBs to be bound directly "
+"to JSF pages. That's just the beginning. The CDI services are integrated "
+"into the very core of the Java EE platform. Even EJB session beans can take "
+"advantage of the dependency injection, event bus, and contextual lifecycle "
+"management that CDI provides."
 msgstr ""
 
 #. Tag: para
@@ -53,12 +53,12 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"We&#39;re about to see how to take full advantage of the Java EE platform in "
-"an application that uses CDI. We&#39;ll also briefly meet a set of SPIs that "
-"are provided to support portable extensions to CDI. You might not ever need "
-"to use these SPIs directly, but don&#39;t take them for granted. You will "
-"likely be using them indirectly, every time you use a third-party extension, "
-"such as Seam."
+"We're about to see how to take full advantage of the Java EE platform in an "
+"application that uses CDI. We'll also briefly meet a set of SPIs that are "
+"provided to support portable extensions to CDI. You might not ever need to "
+"use these SPIs directly, but don't take them for granted. You will likely be "
+"using them indirectly, every time you use a third-party extension, such as "
+"Seam."
 msgstr ""
 "Estamos prestes a ver como tirar o máximo proveito da plataforma Java EE em "
 "uma aplicação que utiliza Web Beans. Reuniremos, brevemente, um conjunto de "

Modified: doc/trunk/reference/src/main/docbook/pt-BR/producermethods.po
===================================================================
--- doc/trunk/reference/src/main/docbook/pt-BR/producermethods.po	2010-07-24 16:36:48 UTC (rev 6808)
+++ doc/trunk/reference/src/main/docbook/pt-BR/producermethods.po	2010-07-25 04:22:37 UTC (rev 6809)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: Introduction_to_Web_Beans VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-05-01T13:53:43\n"
+"POT-Creation-Date: 2010-07-25T03:52:15\n"
 "PO-Revision-Date: 2009-12-19 18:07-0300\n"
 "Last-Translator: João Paulo Viragine <joao.viragine at redhat.com>\n"
 "Language-Team: none\n"
@@ -23,7 +23,7 @@
 msgid ""
 "Producer methods let us overcome certain limitations that arise when a "
 "container, instead of the application, is responsible for instantiating "
-"objects. They&#39;re also the easiest way to integrate objects which are not "
+"objects. They're also the easiest way to integrate objects which are not "
 "beans into the CDI environment."
 msgstr ""
 "Métodos produtores permitem superarmos certas limitações que surgem quando o "
@@ -100,9 +100,9 @@
 #, fuzzy, no-c-format
 msgid ""
 "In particular, producer methods let us use runtime polymorphism with CDI. As "
-"we&#39;ve seen, alternative beans are one solution to the problem of "
-"deployment-time polymorphism. But once the system is deployed, the CDI "
-"implementation is fixed. A producer method has no such limitation:"
+"we've seen, alternative beans are one solution to the problem of deployment-"
+"time polymorphism. But once the system is deployed, the CDI implementation "
+"is fixed. A producer method has no such limitation:"
 msgstr ""
 "Em particular, métodos produtores permite-nos utilizar o polimorfismo em "
 "tempo de execução com Web Beans. Como vimos, os tipo de implantação são uma "
@@ -162,7 +162,7 @@
 msgid ""
 "Now, when the producer method is called, the returned "
 "<literal>PaymentStrategy</literal> will be bound to the session context. The "
-"producer method won&#39;t be called again in the same session."
+"producer method won't be called again in the same session."
 msgstr ""
 "Agora, quando o método produtor é chamado, o <literal>PaymentStrategy</"
 "literal> retornado será associado ao contexto sessão. O método produtor não "
@@ -188,11 +188,11 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"There&#39;s one potential problem with the code above. The implementations "
-"of <literal>CreditCardPaymentStrategy</literal> are instantiated using the "
-"Java <literal>new</literal> operator. Objects instantiated directly by the "
-"application can&#39;t take advantage of dependency injection and don&#39;t "
-"have interceptors."
+"There's one potential problem with the code above. The implementations of "
+"<literal>CreditCardPaymentStrategy</literal> are instantiated using the Java "
+"<literal>new</literal> operator. Objects instantiated directly by the "
+"application can't take advantage of dependency injection and don't have "
+"interceptors."
 msgstr ""
 "Existe um problema potencial com o código acima. As implementações de "
 "<literal>CreditCardPaymentStrategy</literal> são instanciadas utilizando o "
@@ -203,7 +203,7 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"If this isn&#39;t what we want, we can use dependency injection into the "
+"If this isn't what we want, we can use dependency injection into the "
 "producer method to obtain bean instances:"
 msgstr ""
 "Se  não é isso  o que queremos, podemos utilizar a injeção de dependência no "
@@ -213,13 +213,13 @@
 #, fuzzy, no-c-format
 msgid ""
 "Wait, what if <literal>CreditCardPaymentStrategy</literal> is a request-"
-"scoped bean? Then the producer method has the effect of &#34;promoting&#34; "
-"the current request scoped instance into session scope. This is almost "
-"certainly a bug! The request scoped object will be destroyed by the "
-"container before the session ends, but the reference to the object will be "
-"left &#34;hanging&#34; in the session scope. This error will <emphasis>not</"
-"emphasis> be detected by the container, so please take extra care when "
-"returning bean instances from producer methods!"
+"scoped bean? Then the producer method has the effect of \"promoting\" the "
+"current request scoped instance into session scope. This is almost certainly "
+"a bug! The request scoped object will be destroyed by the container before "
+"the session ends, but the reference to the object will be left \"hanging\" "
+"in the session scope. This error will <emphasis>not</emphasis> be detected "
+"by the container, so please take extra care when returning bean instances "
+"from producer methods!"
 msgstr ""
 "Espere, o que se <literal>CreditCardPaymentStrategy</literal> é um Web Bean "
 "de escopo de requisição? Então o método produtor tem o efeito de \"promover"
@@ -233,7 +233,7 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"There&#39;s at least three ways we could go about fixing this bug. We could "
+"There's at least three ways we could go about fixing this bug. We could "
 "change the scope of the <literal>CreditCardPaymentStrategy</literal> "
 "implementation, but this would affect other clients of that bean. A better "
 "option would be to change the scope of the producer method to "
@@ -270,7 +270,7 @@
 "Then a new <emphasis>dependent</emphasis> instance of "
 "<literal>CreditCardPaymentStrategy</literal> will be created, passed to the "
 "producer method, returned by the producer method and finally bound to the "
-"session context. The dependent object won&#39;t be destroyed until the "
+"session context. The dependent object won't be destroyed until the "
 "<literal>Preferences</literal> object is destroyed, at the end of the "
 "session."
 msgstr ""

Modified: doc/trunk/reference/src/main/docbook/pt-BR/resources.po
===================================================================
--- doc/trunk/reference/src/main/docbook/pt-BR/resources.po	2010-07-24 16:36:48 UTC (rev 6808)
+++ doc/trunk/reference/src/main/docbook/pt-BR/resources.po	2010-07-25 04:22:37 UTC (rev 6809)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: Weld_-_JSR-299_Reference_Implementation VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-05-01T13:53:43\n"
+"POT-Creation-Date: 2010-07-25T03:52:15\n"
 "PO-Revision-Date: 2009-12-19 18:06-0300\n"
 "Last-Translator: João Paulo Viragine <joao.viragine at redhat.com>\n"
 "Language-Team: none\n"
@@ -34,8 +34,8 @@
 "injection in CDI. Most notably, component environment injection relies on "
 "string-based names to qualify ambiguous types, and there is no real "
 "consistency as to the nature of the names (sometimes a JNDI name, sometimes "
-"a persistence unit name, sometimes an EJB link, sometimes a nonportable &#34;"
-"mapped name&#34;). Producer fields turned out to be an elegant adaptor to "
+"a persistence unit name, sometimes an EJB link, sometimes a nonportable "
+"\"mapped name\"). Producer fields turned out to be an elegant adaptor to "
 "reduce all this complexity to a common model and get component environment "
 "resources to participate in the CDI system just like any other kind of bean."
 msgstr ""
@@ -127,10 +127,10 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"It might feel strange to be declaring resources in Java code. Isn&#39;t this "
-"stuff that might be deployment-specific? Certainly, and that&#39;s why it "
-"makes sense to declare your resources in a class annotated "
-"<literal>@Alternative</literal>."
+"It might feel strange to be declaring resources in Java code. Isn't this "
+"stuff that might be deployment-specific? Certainly, and that's why it makes "
+"sense to declare your resources in a class annotated <literal>@Alternative</"
+"literal>."
 msgstr ""
 
 #. Tag: title
@@ -156,9 +156,9 @@
 "It might seem like a pain to have to write these extra producer field "
 "declarations, just to gain an additional level of indirection. You could "
 "just as well use component environment injection directly, right? But "
-"remember that you&#39;re going to be using resources like the "
-"<literal>EntityManager</literal> in several different beans. Isn&#39;t it "
-"nicer and more typesafe to write"
+"remember that you're going to be using resources like the "
+"<literal>EntityManager</literal> in several different beans. Isn't it nicer "
+"and more typesafe to write"
 msgstr ""
 
 #. Tag: para

Modified: doc/trunk/reference/src/main/docbook/pt-BR/ri-spi.po
===================================================================
--- doc/trunk/reference/src/main/docbook/pt-BR/ri-spi.po	2010-07-24 16:36:48 UTC (rev 6808)
+++ doc/trunk/reference/src/main/docbook/pt-BR/ri-spi.po	2010-07-25 04:22:37 UTC (rev 6809)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: Introduction_to_Web_Beans VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-05-01T13:53:43\n"
+"POT-Creation-Date: 2010-07-25T03:52:15\n"
 "PO-Revision-Date: 2009-12-19 18:04-0300\n"
 "Last-Translator: João Paulo Viragine <joao.viragine at redhat.com>\n"
 "Language-Team: none\n"
@@ -37,8 +37,8 @@
 "If you just want to use managed beans, and not take advantage of enterprise "
 "services (EE resource injection, CDI injection into EE component classes, "
 "transactional events, support for CDI services in EJBs) and non-flat "
-"deployments, then the generic servlet support provided by the &#34;Weld: "
-"Servlets&#34; extension will be sufficient, and will work in any container "
+"deployments, then the generic servlet support provided by the \"Weld: "
+"Servlets\" extension will be sufficient, and will work in any container "
 "supporting the Servlet API."
 msgstr ""
 
@@ -89,8 +89,8 @@
 "implementation of the <literal>Environment</literal> interface. A number of "
 "standard environments are built in, and described by the "
 "<literal>Environments</literal> enumeration. Different environments require "
-"different services to be present (for example a Servlet container doesn&#39;"
-"t require transaction, EJB or JPA services). By default an EE environment is "
+"different services to be present (for example a Servlet container doesn't "
+"require transaction, EJB or JPA services). By default an EE environment is "
 "assumed, but you can adjust the environment by calling <literal>bootstrap."
 "setEnvironment()</literal>."
 msgstr ""
@@ -169,7 +169,7 @@
 "BDAs it can access. However many containers will allow an easy mechanism to "
 "make BDAs bi-directionally accessible (such as a library directory). In this "
 "case, it is allowable (and reasonable) to describe all such archives as a "
-"single, &#39;virtual&#39; <literal>BeanDeploymentArchive</literal>."
+"single, 'virtual' <literal>BeanDeploymentArchive</literal>."
 msgstr ""
 
 #. Tag: para
@@ -184,7 +184,7 @@
 #, no-c-format
 msgid ""
 "<literal>BeanDeploymentArchive</literal> provides three methods which allow "
-"it&#39;s contents to be discovered by Weld—<literal>BeanDeploymentArchive."
+"it's contents to be discovered by Weld—<literal>BeanDeploymentArchive."
 "getBeanClasses()</literal> must return all the classes in the BDA, "
 "<literal>BeanDeploymentArchive.getBeansXml()</literal> must return all the "
 "deployment descriptors in the archive, and <literal>BeanDeploymentArchive."
@@ -213,7 +213,7 @@
 "In practice, you can regard the deployment structure represented by "
 "<literal>Deployment</literal>, and the virtual BDA graph as a mirror of the "
 "classloader structure for a deployment. If a class can from BDA X can be "
-"loaded by another in BDA Y, it is accessible, and therefore BDA Y&#39;s "
+"loaded by another in BDA Y, it is accessible, and therefore BDA Y's "
 "accessible BDAs should include BDA X."
 msgstr ""
 
@@ -249,7 +249,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Weld delegates EJB 3 bean discovery to the container so that it doesn&#39;t "
+"Weld delegates EJB 3 bean discovery to the container so that it doesn't "
 "duplicate the work done by the EJB container, and respects any vendor-"
 "extensions to the EJB definition."
 msgstr ""
@@ -315,7 +315,7 @@
 msgid ""
 "If you use a non-EE environment then you may implement any of the EE service "
 "SPIs, and Weld will provide the associated functionality. There is no need "
-"to implement those services you don&#39;t need!"
+"to implement those services you don't need!"
 msgstr ""
 
 #. Tag: title
@@ -548,9 +548,9 @@
 #, no-c-format
 msgid ""
 "Weld expects the Application Server or other container to provide the "
-"storage for each application&#39;s context. The <literal>org.jboss.weld."
-"context.api.BeanStore</literal> should be implemented to provide an "
-"application scoped storage."
+"storage for each application's context. The <literal>org.jboss.weld.context."
+"api.BeanStore</literal> should be implemented to provide an application "
+"scoped storage."
 msgstr ""
 
 #. Tag: title

Modified: doc/trunk/reference/src/main/docbook/pt-BR/scopescontexts.po
===================================================================
--- doc/trunk/reference/src/main/docbook/pt-BR/scopescontexts.po	2010-07-24 16:36:48 UTC (rev 6808)
+++ doc/trunk/reference/src/main/docbook/pt-BR/scopescontexts.po	2010-07-25 04:22:37 UTC (rev 6809)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: Introduction_to_Web_Beans VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-05-01T14:44:10\n"
+"POT-Creation-Date: 2010-07-25T03:52:15\n"
 "PO-Revision-Date: 2010-04-14 17:27-0300\n"
 "Last-Translator: Bruno Leonardo Gonçalves <brunolmfg at gmail.com>\n"
 "Language-Team: none\n"
@@ -21,7 +21,7 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"So far, we&#39;ve seen a few examples of <emphasis>scope type annotations</"
+"So far, we've seen a few examples of <emphasis>scope type annotations</"
 "emphasis>. The scope of a bean determines the lifecycle of instances of the "
 "bean. The scope also determines which clients refer to which instances of "
 "the bean. According to the CDI specification, a scope determines:"
@@ -70,13 +70,13 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"JPA entities aren&#39;t a great fit for this model. Entities have their "
-"whole own lifecycle and identity model which just doesn&#39;t map naturally "
-"to the model used in CDI. Therefore, we recommend against treating entities "
-"as CDI beans. You&#39;re certainly going to run into problems if you try to "
-"give an entity a scope other than the default scope <literal>@Dependent</"
-"literal>. The client proxy will get in the way if you try to pass an "
-"injected instance to the JPA <literal>EntityManager</literal>."
+"JPA entities aren't a great fit for this model. Entities have their whole "
+"own lifecycle and identity model which just doesn't map naturally to the "
+"model used in CDI. Therefore, we recommend against treating entities as CDI "
+"beans. You're certainly going to run into problems if you try to give an "
+"entity a scope other than the default scope <literal>@Dependent</literal>. "
+"The client proxy will get in the way if you try to pass an injected instance "
+"to the JPA <literal>EntityManager</literal>."
 msgstr ""
 "Entidades JPA não se encaixam muito bem nesse modelo. Entidades possuem seu "
 "próprio ciclo de vida e modelo de identidade que não pode ser mapeado "
@@ -94,8 +94,8 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"CDI features an <emphasis>extensible context model</emphasis>. It&#39;s "
-"possible to define new scopes by creating a new scope type annotation:"
+"CDI features an <emphasis>extensible context model</emphasis>. It's possible "
+"to define new scopes by creating a new scope type annotation:"
 msgstr ""
 "CDI possui um <emphasis>modelo extensível de contexto</emphasis>. É possível "
 "definir novos escopos, criando uma nova anotação de tipo de escopo:"
@@ -103,7 +103,7 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"Of course, that&#39;s the easy part of the job. For this scope type to be "
+"Of course, that's the easy part of the job. For this scope type to be "
 "useful, we will also need to define a <literal>Context</literal> object that "
 "implements the scope! Implementing a <literal>Context</literal> is usually a "
 "very technical task, intended for framework development only. You can expect "
@@ -128,7 +128,7 @@
 
 #. Tag: para
 #, fuzzy, no-c-format
-msgid "Usually, you&#39;ll use one of CDI&#39;s built-in scopes."
+msgid "Usually, you'll use one of CDI's built-in scopes."
 msgstr "Normalmente, você usará um dos escopos pré-definidos do CDI."
 
 #. Tag: title
@@ -251,7 +251,7 @@
 #, fuzzy, no-c-format
 msgid ""
 "Three of the four built-in scopes should be extremely familiar to every Java "
-"EE developer, so let&#39;s not waste time discussing them here. One of the "
+"EE developer, so let's not waste time discussing them here. One of the "
 "scopes, however, is new."
 msgstr ""
 "Três dos quatro escopos pré-definidos devem ser extremamente familiares a "
@@ -410,7 +410,7 @@
 
 #. Tag: para
 #, fuzzy, no-c-format
-msgid "It&#39;s probably better to use one of the link components in JSF 2:"
+msgid "It's probably better to use one of the link components in JSF 2:"
 msgstr "É provavelmente melhor usar um dos componentes de link em JSF 2:"
 
 #. Tag: para
@@ -418,8 +418,8 @@
 msgid ""
 "The conversation context propagates across redirects, making it very easy to "
 "implement the common POST-then-redirect pattern, without resort to fragile "
-"constructs such as a &#34;flash&#34; object. The container automatically "
-"adds the conversation id to the redirect URL as a request parameter."
+"constructs such as a \"flash\" object. The container automatically adds the "
+"conversation id to the redirect URL as a request parameter."
 msgstr ""
 "O contexto da conversação se propaga sobre redirecionamentos, tornando muito "
 "fácil implementar o padrão POST-então-redirecione, sem ter de recorrer a "
@@ -492,12 +492,12 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"You can guess what &#34;singleton&#34; means here. It means a bean that is "
-"instantiated once. Unfortunately, there&#39;s a little problem with this "
-"pseudo-scope. Beans with scope <literal>@Singleton</literal> don&#39;t have "
-"a proxy object. Clients hold a direct reference to the singleton instance. "
-"So we need to consider the case of a client that can be serialized, for "
-"example, any bean with scope <literal>@SessionScoped</literal> or "
+"You can guess what \"singleton\" means here. It means a bean that is "
+"instantiated once. Unfortunately, there's a little problem with this pseudo-"
+"scope. Beans with scope <literal>@Singleton</literal> don't have a proxy "
+"object. Clients hold a direct reference to the singleton instance. So we "
+"need to consider the case of a client that can be serialized, for example, "
+"any bean with scope <literal>@SessionScoped</literal> or "
 "<literal>@ConversationScoped</literal>, any dependent object of a bean with "
 "scope <literal>@SessionScoped</literal> or <literal>@ConversationScoped</"
 "literal>, or any stateful session bean."
@@ -517,7 +517,7 @@
 #, fuzzy, no-c-format
 msgid ""
 "Now, if the singleton instance is a simple, immutable, serializable object "
-"like a string, a number or a date, we probably don&#39;t mind too much if it "
+"like a string, a number or a date, we probably don't mind too much if it "
 "gets duplicated via serialization. However, that makes it no stop being a "
 "true singleton, and we may as well have just declared it with the default "
 "scope."
@@ -560,7 +560,7 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"give the client a reference of type <literal>Instance&#60;X&#62;</literal> "
+"give the client a reference of type <literal>Instance&lt;X&gt;</literal> "
 "where <literal>X</literal> is the bean type of the singleton bean."
 msgstr ""
 "dar ao cliente uma referência do tipo <literal>Instance&lt;X&gt;</literal>, "
@@ -632,8 +632,8 @@
 "If you need to access a bean directly by EL name in a JSF page, you probably "
 "need to give it a scope other than <literal>@Dependent</literal>. Otherwise, "
 "any value that gets set to the bean by a JSF input will be lost immediately. "
-"That&#39;s why CDI features the <literal>@Model</literal> stereotype; it "
-"lets you give a bean a name, and set its scope to <literal>@RequestScoped</"
+"That's why CDI features the <literal>@Model</literal> stereotype; it lets "
+"you give a bean a name, and set its scope to <literal>@RequestScoped</"
 "literal> in one stroke. If you need to access a bean that really "
 "<emphasis>has</emphasis> to have the scope <literal>@Dependent</literal> "
 "from a JSF page, inject it into a different bean, and expose it to EL via a "
@@ -653,8 +653,8 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"Beans with scope <literal>@Dependent</literal> don&#39;t need a proxy "
-"object. The client holds a direct reference to its instance."
+"Beans with scope <literal>@Dependent</literal> don't need a proxy object. "
+"The client holds a direct reference to its instance."
 msgstr ""
 "Os beans com escopo <literal>@Dependent</literal> não precisam de um objeto "
 "de proxy. O cliente mantém uma referência direta para sua instância."
@@ -726,8 +726,8 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"This feature is particularly useful with producer methods, as we&#39;ll see "
-"in the next chapter."
+"This feature is particularly useful with producer methods, as we'll see in "
+"the next chapter."
 msgstr ""
 "Essa funcionalidade é particularmente útil em métodos produtores, como "
 "poderemos verificar no próximo capítulo."

Modified: doc/trunk/reference/src/main/docbook/pt-BR/specialization.po
===================================================================
--- doc/trunk/reference/src/main/docbook/pt-BR/specialization.po	2010-07-24 16:36:48 UTC (rev 6808)
+++ doc/trunk/reference/src/main/docbook/pt-BR/specialization.po	2010-07-25 04:22:37 UTC (rev 6809)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: Introduction_to_Web_Beans VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-05-01T13:53:43\n"
+"POT-Creation-Date: 2010-07-25T03:52:15\n"
 "PO-Revision-Date: 2009-12-19 18:08-0300\n"
 "Last-Translator: João Paulo Viragine <joao.viragine at redhat.com>\n"
 "Language-Team: none\n"
@@ -21,15 +21,15 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"When you first start developing with CDI, you&#39;ll likely be dealing only "
-"with a single bean implementation for each bean type. In this case, it&#39;s "
-"easy to understand how beans get selected for injection. As the complexity "
-"of your application grows, multiple occurrences of the same bean type start "
+"When you first start developing with CDI, you'll likely be dealing only with "
+"a single bean implementation for each bean type. In this case, it's easy to "
+"understand how beans get selected for injection. As the complexity of your "
+"application grows, multiple occurrences of the same bean type start "
 "appearing, either because you have multiple implementations or two beans "
-"share a common (Java) inheritance. That&#39;s when you have to begin "
-"studying the specialization, inheritance and alternative rules to work "
-"through unsatisfied or ambiguous dependencies or to avoid certain beans from "
-"being called."
+"share a common (Java) inheritance. That's when you have to begin studying "
+"the specialization, inheritance and alternative rules to work through "
+"unsatisfied or ambiguous dependencies or to avoid certain beans from being "
+"called."
 msgstr ""
 
 #. Tag: para
@@ -58,10 +58,10 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"The second case is the default assumed by CDI. It&#39;s possible to have two "
+"The second case is the default assumed by CDI. It's possible to have two "
 "beans in the system with the same part bean type (interface or parent "
-"class). As you&#39;ve learned, you select between the two implementations "
-"using qualifiers."
+"class). As you've learned, you select between the two implementations using "
+"qualifiers."
 msgstr ""
 
 #. Tag: para
@@ -71,7 +71,7 @@
 "deployment, only one bean can fulfill a given role at a time. That means one "
 "bean needs to be enabled and the other disabled. There are a two modifiers "
 "involved: <literal>@Alternative</literal> and <literal>@Specializes</"
-"literal>. We&#39;ll start by looking at alternatives and then show the "
+"literal>. We'll start by looking at alternatives and then show the "
 "guarantees that specialization adds."
 msgstr ""
 
@@ -96,8 +96,8 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"But in our staging environment, we don&#39;t really want to submit payments "
-"to the external system, so we override that implementation of "
+"But in our staging environment, we don't really want to submit payments to "
+"the external system, so we override that implementation of "
 "<literal>PaymentProcessor</literal> with a different bean:"
 msgstr ""
 "Mas, no nosso ambiente simulado, nos sobrepomos a implementação de "
@@ -111,19 +111,18 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"We&#39;ve already seen how we can enable this alternative by listing its "
-"class in the <literal>beans.xml</literal> descriptor."
+"We've already seen how we can enable this alternative by listing its class "
+"in the <literal>beans.xml</literal> descriptor."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
 msgid ""
 "But suppose we have many alternatives in the staging environment. It would "
-"be much more convenient to be able to enable them all at once. So let&#39;s "
-"make <literal>@Staging</literal> an <literal>@Alternative</literal> "
-"stereotype and annotate the staging beans with this stereotype instead. "
-"You&#39;ll see how this level of indirection pays off. First, we create the "
-"stereotype:"
+"be much more convenient to be able to enable them all at once. So let's make "
+"<literal>@Staging</literal> an <literal>@Alternative</literal> stereotype "
+"and annotate the staging beans with this stereotype instead. You'll see how "
+"this level of indirection pays off. First, we create the stereotype:"
 msgstr ""
 
 #. Tag: para
@@ -164,7 +163,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"So we haven&#39;t completely replaced the default implementation in this "
+"So we haven't completely replaced the default implementation in this "
 "deployment of the system. The only way one bean can completely override a "
 "second bean at all injection points is if it implements all the bean types "
 "and declares all the qualifiers of the second bean. However, if the second "
@@ -232,8 +231,8 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Since we&#39;re informing the container that our alternative bean is meant "
-"to stand in as a replacement for the default implementation, the alternative "
+"Since we're informing the container that our alternative bean is meant to "
+"stand in as a replacement for the default implementation, the alternative "
 "implementation automatically inherits all qualifiers of the default "
 "implementation. Thus, in our example, "
 "<literal>MockCreditCardPaymentProcessor</literal> inherits the qualifiers "

Modified: doc/trunk/reference/src/main/docbook/pt-BR/stereotypes.po
===================================================================
--- doc/trunk/reference/src/main/docbook/pt-BR/stereotypes.po	2010-07-24 16:36:48 UTC (rev 6808)
+++ doc/trunk/reference/src/main/docbook/pt-BR/stereotypes.po	2010-07-25 04:22:37 UTC (rev 6809)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: Introduction_to_Web_Beans VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-05-01T13:53:43\n"
+"POT-Creation-Date: 2010-07-25T03:52:15\n"
 "PO-Revision-Date: 2009-12-19 18:10-0300\n"
 "Last-Translator: João Paulo Viragine <joao.viragine at redhat.com>\n"
 "Language-Team: none\n"
@@ -94,7 +94,7 @@
 #, no-c-format
 msgid ""
 "Of course, we need to apply some other annotations to our stereotype or else "
-"it wouldn&#39;t be adding much value."
+"it wouldn't be adding much value."
 msgstr ""
 
 #. Tag: title
@@ -121,7 +121,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Naturally, overriding a single default isn&#39;t much use. But remember, "
+"Naturally, overriding a single default isn't much use. But remember, "
 "stereotypes can define more than just the default scope."
 msgstr ""
 
@@ -204,8 +204,8 @@
 #, no-c-format
 msgid ""
 "This may blow your mind a bit, but stereotypes may declare other "
-"stereotypes, which we&#39;ll call <emphasis>stereotype stacking</emphasis>. "
-"You may want to do this if you have two distinct stereotypes which are "
+"stereotypes, which we'll call <emphasis>stereotype stacking</emphasis>. You "
+"may want to do this if you have two distinct stereotypes which are "
 "meaningful on their own, but in other situation may be meaningful when "
 "combined."
 msgstr ""
@@ -213,7 +213,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Here&#39;s an example that combines the <literal>@Action</literal> and "
+"Here's an example that combines the <literal>@Action</literal> and "
 "<literal>@Auditable</literal> stereotypes:"
 msgstr ""
 
@@ -225,9 +225,8 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"We&#39;ve already met two standard stereotypes defined by the CDI "
-"specification: <literal>@Interceptor</literal> and <literal>@Decorator</"
-"literal>."
+"We've already met two standard stereotypes defined by the CDI specification: "
+"<literal>@Interceptor</literal> and <literal>@Decorator</literal>."
 msgstr ""
 "Já conhecemos dois estereótipos padrões definidos pela especificação de Web "
 "Beans: <literal>@Interceptor</literal> e <literal>@Decorator</literal>."

Modified: doc/trunk/reference/src/main/docbook/pt-BR/viewlayers.po
===================================================================
--- doc/trunk/reference/src/main/docbook/pt-BR/viewlayers.po	2010-07-24 16:36:48 UTC (rev 6808)
+++ doc/trunk/reference/src/main/docbook/pt-BR/viewlayers.po	2010-07-25 04:22:37 UTC (rev 6809)
@@ -6,7 +6,7 @@
 "Project-Id-Version: Web_Beans:_Java_Contexts_and_Dependency_Injection "
 "VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-05-01T13:53:43\n"
+"POT-Creation-Date: 2010-07-25T03:52:15\n"
 "PO-Revision-Date: 2009-12-19 18:08-0300\n"
 "Last-Translator: João Paulo Viragine <joao.viragine at redhat.com>\n"
 "Language-Team: none\n"
@@ -90,8 +90,8 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Storing the id of any long-running conversation in Wicket&#39;s metadata "
-"when the page response is complete"
+"Storing the id of any long-running conversation in Wicket's metadata when "
+"the page response is complete"
 msgstr ""
 
 #. Tag: para
@@ -134,9 +134,9 @@
 #, no-c-format
 msgid ""
 "When a conversation is marked as long-running, the id of that conversation "
-"will be stored in Wicket&#39;s metadata for the current page. If a new page "
-"is created and set as the response target through <literal>setResponsePage()"
-"</literal>, this new page will also participate in this conversation. This "
+"will be stored in Wicket's metadata for the current page. If a new page is "
+"created and set as the response target through <literal>setResponsePage()</"
+"literal>, this new page will also participate in this conversation. This "
 "occurs for both directly instantiated pages (<literal>setResponsePage(new "
 "OtherPage())</literal>), as well as for bookmarkable pages created with "
 "<literal>setResponsePage(OtherPage.class)</literal> where <literal>OtherPage."

Modified: doc/trunk/reference/src/main/docbook/pt-BR/weldexamples.po
===================================================================
--- doc/trunk/reference/src/main/docbook/pt-BR/weldexamples.po	2010-07-24 16:36:48 UTC (rev 6808)
+++ doc/trunk/reference/src/main/docbook/pt-BR/weldexamples.po	2010-07-25 04:22:37 UTC (rev 6809)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: Weld_-_JSR-299_Reference_Implementation VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-05-01T13:53:43\n"
+"POT-Creation-Date: 2010-07-25T03:52:15\n"
 "PO-Revision-Date: 2009-12-19 18:04-0300\n"
 "Last-Translator: João Paulo Viragine <joao.viragine at redhat.com>\n"
 "Language-Team: none\n"
@@ -21,8 +21,8 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"It&#39;s time to pull the covers back and dive into the internals of Weld "
-"example applications. Let&#39;s start with the simpler of the two examples, "
+"It's time to pull the covers back and dive into the internals of Weld "
+"example applications. Let's start with the simpler of the two examples, "
 "<literal>weld-numberguess</literal>."
 msgstr ""
 
@@ -35,15 +35,15 @@
 #, no-c-format
 msgid ""
 "In the numberguess application you get 10 attempts to guess a number between "
-"1 and 100. After each attempt, you&#39;re told whether your guess was too "
-"high or too low."
+"1 and 100. After each attempt, you're told whether your guess was too high "
+"or too low."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
 msgid ""
 "The numberguess example is comprised of a number of beans, configuration "
-"files and Facelets (JSF) views, packaged as a war module. Let&#39;s start by "
+"files and Facelets (JSF) views, packaged as a war module. Let's start by "
 "examining the configuration files."
 msgstr ""
 
@@ -54,21 +54,21 @@
 "</literal>, which can be found in the <literal>src/main/webapp</literal> "
 "directory of the example. First, we have the JSF 2.0 version of "
 "<literal>faces-config.xml</literal>. A standardized version of Facelets is "
-"the default view handler in JSF 2.0, so there&#39;s really nothing that we "
-"have to configure. Thus, the configuration consists of only the root element."
+"the default view handler in JSF 2.0, so there's really nothing that we have "
+"to configure. Thus, the configuration consists of only the root element."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
 msgid ""
-"There&#39;s also an empty <literal>beans.xml</literal> file, which tells the "
+"There's also an empty <literal>beans.xml</literal> file, which tells the "
 "container to look for beans in this application and to activate the CDI "
 "services."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Finally, there&#39;s the familiar <literal>web.xml</literal>:"
+msgid "Finally, there's the familiar <literal>web.xml</literal>:"
 msgstr ""
 
 #. Tag: para
@@ -105,8 +105,8 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Let&#39;s take a look at the main JSF view, <literal>src/main/webapp/home."
-"xhtml</literal>."
+"Let's take a look at the main JSF view, <literal>src/main/webapp/home.xhtml</"
+"literal>."
 msgstr ""
 
 #. Tag: para
@@ -119,8 +119,8 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"There are a number of messages which can be sent to the user, &#34;Higher!"
-"&#34;, &#34;Lower!&#34; and &#34;Correct!&#34;"
+"There are a number of messages which can be sent to the user, \"Higher!\", "
+"\"Lower!\" and \"Correct!\""
 msgstr ""
 
 #. Tag: para
@@ -138,10 +138,9 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"A validator binding is used to make sure the user doesn&#39;t accidentally "
-"input a number outside of the range in which they can guess - if the "
-"validator wasn&#39;t here, the user might use up a guess on an out of bounds "
-"number."
+"A validator binding is used to make sure the user doesn't accidentally input "
+"a number outside of the range in which they can guess - if the validator "
+"wasn't here, the user might use up a guess on an out of bounds number."
 msgstr ""
 
 #. Tag: para
@@ -177,8 +176,8 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"The <literal>Generator</literal> is application scoped, so we don&#39;t get "
-"a different random each time."
+"The <literal>Generator</literal> is application scoped, so we don't get a "
+"different random each time."
 msgstr ""
 
 #. Tag: para
@@ -192,20 +191,20 @@
 #, no-c-format
 msgid ""
 "The final bean in the application is the session-scoped <literal>Game</"
-"literal> class. This is the primary entry point of the application. It&#39;s "
+"literal> class. This is the primary entry point of the application. It's "
 "responsible for setting up or resetting the game, capturing and validating "
-"the user&#39;s guess and providing feedback to the user with a "
-"<literal>FacesMessage</literal>. We&#39;ve used the post-construct lifecycle "
+"the user's guess and providing feedback to the user with a "
+"<literal>FacesMessage</literal>. We've used the post-construct lifecycle "
 "method to initialize the game by retrieving a random number from the "
-"<literal>@Random Instance&#60;Integer&#62;</literal> bean."
+"<literal>@Random Instance&lt;Integer&gt;</literal> bean."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
 msgid ""
-"You&#39;ll notice that we&#39;ve also added the <literal>@Named</literal> "
-"annotation to this class. This annotation is only required when you want to "
-"make the bean accessible to a JSF view via EL (i.e., #{game})."
+"You'll notice that we've also added the <literal>@Named</literal> annotation "
+"to this class. This annotation is only required when you want to make the "
+"bean accessible to a JSF view via EL (i.e., #{game})."
 msgstr ""
 
 #. Tag: title
@@ -237,9 +236,8 @@
 #, no-c-format
 msgid ""
 "Second, we need to explicitly specify the servlet listener in <literal>web."
-"xml</literal>, again because the container isn&#39;t doing this stuff for "
-"you. The servlet listener boots Weld and controls it&#39;s interaction with "
-"requests."
+"xml</literal>, again because the container isn't doing this stuff for you. "
+"The servlet listener boots Weld and controls it's interaction with requests."
 msgstr ""
 
 #. Tag: para
@@ -248,8 +246,8 @@
 "When Weld boots, it places the <literal>javax.enterprise.inject.spi."
 "BeanManager</literal>, the portable SPI for obtaining bean instances, in the "
 "ServletContext under a variable name equal to the fully-qualified interface "
-"name. You generally don&#39;t need to access this interface, but Weld makes "
-"use of it."
+"name. You generally don't need to access this interface, but Weld makes use "
+"of it."
 msgstr ""
 
 #. Tag: title
@@ -262,7 +260,7 @@
 msgid ""
 "Weld includes a number of portable extensions for JSR-299, including an "
 "extension for Wicket, which allows you to inject beans into Wicket "
-"components and leverage the conversation context. In this section, we&#39;ll "
+"components and leverage the conversation context. In this section, we'll "
 "walk you through the Wicket version of the numberguess example."
 msgstr ""
 
@@ -271,7 +269,7 @@
 msgid ""
 "You may want to review the Wicket documentation at <ulink url=\"http://"
 "wicket.apache.org/\">http://wicket.apache.org/</ulink> before reading this "
-"section, if you aren&#39;t already familiar with the framework."
+"section, if you aren't already familiar with the framework."
 msgstr ""
 
 #. Tag: para
@@ -280,17 +278,17 @@
 "Wicket is another environment that relies on the Weld servlet extension. The "
 "use of <ulink url=\"http://jetty.mortbay.org\">Jetty</ulink> is common in "
 "the Wicket community, and is thus chosen here as the runtime container. "
-"You&#39;ve seen already that Jetty is perfectly capable of running CDI "
+"You've seen already that Jetty is perfectly capable of running CDI "
 "applications with Weld add-ons, and this environment is no different."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
 msgid ""
-"We&#39;ll also be using the Eclipse IDE in these examples. Instructions are "
+"We'll also be using the Eclipse IDE in these examples. Instructions are "
 "provided later for running the example from the command line, but since "
-"you&#39;ll likely need to do more than just deploy examples, we&#39;ll get "
-"setup in this full development environment."
+"you'll likely need to do more than just deploy examples, we'll get setup in "
+"this full development environment."
 msgstr ""
 
 #. Tag: title
@@ -313,7 +311,7 @@
 #, no-c-format
 msgid ""
 "If you have m2eclipse installed, you can open any Maven project directly. "
-"From within Eclipse, select <emphasis>File -&#62; Import... -&#62; Maven "
+"From within Eclipse, select <emphasis>File -&gt; Import... -&gt; Maven "
 "Projects</emphasis>. Then, browse to the location of the Wicket numberguess "
 "example. You should see that Eclipse recognizes the existence of a Maven "
 "project."
@@ -329,24 +327,24 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"You&#39;ll notice after importing, the project has a build error. That&#39;s "
-"because we need to enable a Maven profile. Right-click on the project and "
-"select <emphasis>Properties</emphasis>, then select the <emphasis>Maven</"
-"emphasis> tab in the window that appears. In the form field labeled &#34;"
-"Active Maven Profiles (comma separated):&#34;, type <literal>jetty</"
-"literal>. That will enable some extra dependencies that allow the project to "
-"compile. Additionally, <emphasis>uncheck</emphasis> the box labeled &#34;"
-"Skip Maven compile plugin when processing resources (recommended)&#34;. That "
-"solves an incompatiblity between the m2eclipse plugin and the Maven enforcer "
-"plugin that we use for the Weld project. Now, you&#39;re ready to develop!"
+"You'll notice after importing, the project has a build error. That's because "
+"we need to enable a Maven profile. Right-click on the project and select "
+"<emphasis>Properties</emphasis>, then select the <emphasis>Maven</emphasis> "
+"tab in the window that appears. In the form field labeled \"Active Maven "
+"Profiles (comma separated):\", type <literal>jetty</literal>. That will "
+"enable some extra dependencies that allow the project to compile. "
+"Additionally, <emphasis>uncheck</emphasis> the box labeled \"Skip Maven "
+"compile plugin when processing resources (recommended)\". That solves an "
+"incompatiblity between the m2eclipse plugin and the Maven enforcer plugin "
+"that we use for the Weld project. Now, you're ready to develop!"
 msgstr ""
 
 #. Tag: para
 #, no-c-format
 msgid ""
-"Be sure to uncheck the box &#34;Skip Maven compile plugin when processing "
-"resources (recommended)&#34; in the Maven properties screen or else the "
-"example might not run in Eclipse because beans.xml will be missing from the "
+"Be sure to uncheck the box \"Skip Maven compile plugin when processing "
+"resources (recommended)\" in the Maven properties screen or else the example "
+"might not run in Eclipse because beans.xml will be missing from the "
 "classpath! See the <ulink url=\"https://issues.sonatype.org/browse/"
 "MNGECLIPSE-768\">MNGECLIPSE-768</ulink> issue report for details."
 msgstr ""
@@ -363,15 +361,15 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Then, from Eclipse, choose <emphasis>File -&#62; Import... -&#62; General -"
-"&#62; Existing Projects into Workspace</emphasis>, select the root directory "
+"Then, from Eclipse, choose <emphasis>File -&gt; Import... -&gt; General -"
+"&gt; Existing Projects into Workspace</emphasis>, select the root directory "
 "of the numberguess example, and click Finish. This will create a project in "
 "your workspace called <literal>weld-wicket-numberguess</literal>."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "It&#39;s time to get the example running!"
+msgid "It's time to get the example running!"
 msgstr ""
 
 #. Tag: title
@@ -430,7 +428,7 @@
 
 #. Tag: para
 #, no-c-format
-msgid "Enough toying with deployment, let&#39;s dive into the code."
+msgid "Enough toying with deployment, let's dive into the code."
 msgstr ""
 
 #. Tag: title
@@ -462,7 +460,7 @@
 
 #. Tag: para
 #, no-c-format
-msgid "Here&#39;s where things differ from the JSF numberguess example:"
+msgid "Here's where things differ from the JSF numberguess example:"
 msgstr ""
 
 #. Tag: para
@@ -585,8 +583,8 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Let&#39;s have a look at the significant code and configuration files that "
-"make up this example."
+"Let's have a look at the significant code and configuration files that make "
+"up this example."
 msgstr ""
 
 #. Tag: para
@@ -600,8 +598,8 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"The game&#39;s main logic is located in <literal>Game.java</literal>. Here "
-"is the code for that class, highlighting the ways in which this differs from "
+"The game's main logic is located in <literal>Game.java</literal>. Here is "
+"the code for that class, highlighting the ways in which this differs from "
 "the web application version:"
 msgstr ""
 
@@ -609,14 +607,14 @@
 #, no-c-format
 msgid ""
 "The bean is application scoped rather than session scoped, since an instance "
-"of a Swing application typically represents a single &#39;session&#39;."
+"of a Swing application typically represents a single 'session'."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
 msgid ""
-"Notice that the bean is not named, since it doesn&#39;t need to be accessed "
-"via EL."
+"Notice that the bean is not named, since it doesn't need to be accessed via "
+"EL."
 msgstr ""
 
 #. Tag: para
@@ -657,9 +655,9 @@
 msgid ""
 "The <literal>reset()</literal> method makes a call to the injected "
 "<literal>rndGenerator</literal> in order to get the random number at the "
-"start of each game. Note that it can&#39;t use <literal>Instance.get()</"
-"literal> like the JSF example does because there will not be any active "
-"contexts like there are during a JSF request."
+"start of each game. Note that it can't use <literal>Instance.get()</literal> "
+"like the JSF example does because there will not be any active contexts like "
+"there are during a JSF request."
 msgstr ""
 
 #. Tag: para
@@ -667,8 +665,8 @@
 msgid ""
 "The <literal>MessageGenerator</literal> class depends on the current "
 "instance of <literal>Game</literal> and queries its state in order to "
-"determine the appropriate messages to provide as the prompt for the user&#39;"
-"s next guess and the response to the previous guess. The code for "
+"determine the appropriate messages to provide as the prompt for the user's "
+"next guess and the response to the previous guess. The code for "
 "<literal>MessageGenerator</literal> is as follows:"
 msgstr ""
 
@@ -681,7 +679,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"The <literal>Game</literal>&#39;s state is interrogated to determine the "
+"The <literal>Game</literal>'s state is interrogated to determine the "
 "appropriate challenge message ..."
 msgstr ""
 
@@ -726,8 +724,8 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"<literal>guessButtonActionPerformed</literal> is called when the &#39;"
-"Guess&#39; button is clicked, and it does the following:"
+"<literal>guessButtonActionPerformed</literal> is called when the 'Guess' "
+"button is clicked, and it does the following:"
 msgstr ""
 
 #. Tag: para
@@ -740,8 +738,8 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Calls <literal>game.check()</literal> to validate and perform one &#39;"
-"turn&#39; of the game"
+"Calls <literal>game.check()</literal> to validate and perform one 'turn' of "
+"the game"
 msgstr ""
 
 #. Tag: para
@@ -780,7 +778,7 @@
 #, no-c-format
 msgid ""
 "The translator example is built as an ear and contains EJBs. As a result, "
-"it&#39;s structure is more complex than the numberguess example."
+"it's structure is more complex than the numberguess example."
 msgstr ""
 
 #. Tag: para
@@ -794,10 +792,9 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"First, let&#39;s take a look at the ear aggregator, which is located in the "
-"example&#39;s <literal>ear</literal> directory. Maven automatically "
-"generates the <literal>application.xml</literal> for us from this plugin "
-"configuration:"
+"First, let's take a look at the ear aggregator, which is located in the "
+"example's <literal>ear</literal> directory. Maven automatically generates "
+"the <literal>application.xml</literal> for us from this plugin configuration:"
 msgstr ""
 
 #. Tag: para
@@ -811,18 +808,18 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"If you weren&#39;t using Maven to generate these files, you would need "
+"If you weren't using Maven to generate these files, you would need "
 "<literal>META-INF/application.xml</literal>:"
 msgstr ""
 
 #. Tag: para
 #, no-c-format
 msgid ""
-"Next, lets look at the war, which is located in the example&#39;s "
-"<literal>war</literal> directory. Just as in the numberguess example, we "
-"have a <literal>faces-config.xml</literal> for JSF 2.0 and a <literal>web."
-"xml</literal> (to activate JSF) under WEB-INF, both sourced from "
-"<literal>src/main/webapp/WEB-INF</literal>."
+"Next, lets look at the war, which is located in the example's <literal>war</"
+"literal> directory. Just as in the numberguess example, we have a "
+"<literal>faces-config.xml</literal> for JSF 2.0 and a <literal>web.xml</"
+"literal> (to activate JSF) under WEB-INF, both sourced from <literal>src/"
+"main/webapp/WEB-INF</literal>."
 msgstr ""
 
 #. Tag: para
@@ -843,21 +840,21 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Finally, let&#39;s look at the EJB module, which is located in the "
-"example&#39;s <literal>ejb</literal> directory. In <literal>src/main/"
-"resources/META-INF</literal> there is just an empty <literal>beans.xml</"
-"literal>, used to mark the archive as containing beans."
+"Finally, let's look at the EJB module, which is located in the example's "
+"<literal>ejb</literal> directory. In <literal>src/main/resources/META-INF</"
+"literal> there is just an empty <literal>beans.xml</literal>, used to mark "
+"the archive as containing beans."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
 msgid ""
-"We&#39;ve saved the most interesting bit to last, the code! The project has "
-"two simple beans, <literal>SentenceParser</literal> and "
-"<literal>TextTranslator</literal> and two session beans, "
-"<literal>TranslatorControllerBean</literal> and <literal>SentenceTranslator</"
-"literal>. You should be getting quite familiar with what a bean looks like "
-"by now, so we&#39;ll just highlight the most interesting bits here."
+"We've saved the most interesting bit to last, the code! The project has two "
+"simple beans, <literal>SentenceParser</literal> and <literal>TextTranslator</"
+"literal> and two session beans, <literal>TranslatorControllerBean</literal> "
+"and <literal>SentenceTranslator</literal>. You should be getting quite "
+"familiar with what a bean looks like by now, so we'll just highlight the "
+"most interesting bits here."
 msgstr ""
 
 #. Tag: para
@@ -874,9 +871,9 @@
 "<literal>TextTranslator</literal> uses the simple bean (really just a plain "
 "Java class!) <literal>SentenceParser</literal> to parse the sentence and "
 "then calls on the stateless bean with the local business interface "
-"<literal>Translator</literal> to perform the translation. That&#39;s where "
-"the magic happens. Of course, we couldn&#39;t develop a full translator, but "
-"it&#39;s convincing enough to anyone who doesn&#39;t understand Latin!"
+"<literal>Translator</literal> to perform the translation. That's where the "
+"magic happens. Of course, we couldn't develop a full translator, but it's "
+"convincing enough to anyone who doesn't understand Latin!"
 msgstr ""
 
 #. Tag: para

Modified: doc/trunk/reference/src/main/docbook/pt-BR/xml.po
===================================================================
--- doc/trunk/reference/src/main/docbook/pt-BR/xml.po	2010-07-24 16:36:48 UTC (rev 6808)
+++ doc/trunk/reference/src/main/docbook/pt-BR/xml.po	2010-07-25 04:22:37 UTC (rev 6809)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: Introduction_to_Web_Beans VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-05-01T13:53:43\n"
+"POT-Creation-Date: 2010-07-25T03:52:15\n"
 "PO-Revision-Date: 2009-12-19 18:03-0300\n"
 "Last-Translator: João Paulo Viragine <joao.viragine at redhat.com>\n"
 "Language-Team: none\n"
@@ -21,9 +21,9 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"So far, we&#39;ve seen plenty of examples of beans declared using "
-"annotations. However, there are a couple of occasions when we can&#39;t use "
-"annotations to define the bean:"
+"So far, we've seen plenty of examples of beans declared using annotations. "
+"However, there are a couple of occasions when we can't use annotations to "
+"define the bean:"
 msgstr ""
 "Até agora,vimos muitos exemplos de declaração de Web Beans usando anotações. "
 "No entanto, há várias situações em que não podemos usar anotações para "
@@ -70,10 +70,10 @@
 #, fuzzy, no-c-format
 msgid ""
 "The advantage of this approach is that you can write an XML schema that "
-"prevents spelling errors in your XML document. It&#39;s even possible for a "
-"tool to generate the XML schema automatically from the compiled Java code. "
-"Or, an integrated development environment could perform the same validation "
-"without the need for the explicit intermediate generation step."
+"prevents spelling errors in your XML document. It's even possible for a tool "
+"to generate the XML schema automatically from the compiled Java code. Or, an "
+"integrated development environment could perform the same validation without "
+"the need for the explicit intermediate generation step."
 msgstr ""
 "A vantagem dessa abordagem é que você pode escrever um esquema XML (XML "
 "schema) que evita erros ortográficos no seu documento XML. É até mesmo "
@@ -118,7 +118,7 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"For example, the element <literal>&#60;util:Date/&#62;</literal> in the "
+"For example, the element <literal>&lt;util:Date/&gt;</literal> in the "
 "following XML fragment refers to the class <literal>java.util.Date</literal>:"
 msgstr ""
 "Por exemplo, o elemento <literal>&lt;util:Date/&gt;</literal> no seguinte "
@@ -207,7 +207,7 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"The <literal>&#60;Name&#62;</literal> element declares a bean of scope "
+"The <literal>&lt;Name&gt;</literal> element declares a bean of scope "
 "<literal>@Dependent</literal> and class <literal>Name</literal>, with a set "
 "of initial field values. This bean has a special, container-generated "
 "qualifier and is therefore injectable only to the specific injection point "
@@ -223,8 +223,8 @@
 #, fuzzy, no-c-format
 msgid ""
 "This simple but powerful feature allows the Weld XML format to be used to "
-"specify whole graphs of Java objects. It&#39;s not quite a full databinding "
-"solution, but it&#39;s close!"
+"specify whole graphs of Java objects. It's not quite a full databinding "
+"solution, but it's close!"
 msgstr ""
 "Esse simples - mas poderoso - recurso permite que o formato XML do Web Beans "
 "seja utilizado para especificar grafos completos de objetos Java. Não é uma "
@@ -238,10 +238,9 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"If we want our XML document format to be authored by people who aren&#39;t "
-"Java developers, or who don&#39;t have access to our code, we need to "
-"provide a schema. There&#39;s nothing specific to Weld about writing or "
-"using the schema."
+"If we want our XML document format to be authored by people who aren't Java "
+"developers, or who don't have access to our code, we need to provide a "
+"schema. There's nothing specific to Weld about writing or using the schema."
 msgstr ""
 "Se desejamos que o formato do documento XML seja criado por pessoas que não "
 "são desenvolvedores Java, ou por pessoas que não têm acesso ao nosso código, "

Modified: doc/trunk/reference/src/main/docbook/zh-CN/beans.po
===================================================================
--- doc/trunk/reference/src/main/docbook/zh-CN/beans.po	2010-07-24 16:36:48 UTC (rev 6808)
+++ doc/trunk/reference/src/main/docbook/zh-CN/beans.po	2010-07-25 04:22:37 UTC (rev 6809)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: Weld_-_JSR-299_Reference_Implementation VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-05-01T13:53:42\n"
+"POT-Creation-Date: 2010-07-25T03:52:14\n"
 "PO-Revision-Date: 2009-11-11 15:00+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -32,13 +32,13 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Let&#39;s back up a second. What does it really mean to be "
-"<emphasis>contextual</emphasis>? Since beans may be stateful, it matters "
-"<emphasis>which</emphasis> bean instance I have. Unlike a stateless "
-"component model (for example, stateless session beans) or a singleton "
-"component model (such as servlets, or singleton beans), different clients of "
-"a bean see the bean in different states. The client-visible state depends "
-"upon which instance of the bean the client has a reference to."
+"Let's back up a second. What does it really mean to be <emphasis>contextual</"
+"emphasis>? Since beans may be stateful, it matters <emphasis>which</"
+"emphasis> bean instance I have. Unlike a stateless component model (for "
+"example, stateless session beans) or a singleton component model (such as "
+"servlets, or singleton beans), different clients of a bean see the bean in "
+"different states. The client-visible state depends upon which instance of "
+"the bean the client has a reference to."
 msgstr ""
 
 #. Tag: para
@@ -83,10 +83,10 @@
 msgid ""
 "One great advantage of the contextual model is that it allows stateful beans "
 "to be treated like services! The client need not concern itself with "
-"managing the lifecycle of the bean it&#39;s using, <emphasis>nor does it "
-"even need to know what that lifecycle is.</emphasis> Beans interact by "
-"passing messages, and the bean implementations define the lifecycle of their "
-"own state. The beans are loosely coupled because:"
+"managing the lifecycle of the bean it's using, <emphasis>nor does it even "
+"need to know what that lifecycle is.</emphasis> Beans interact by passing "
+"messages, and the bean implementations define the lifecycle of their own "
+"state. The beans are loosely coupled because:"
 msgstr ""
 
 #. Tag: para
@@ -171,7 +171,7 @@
 
 #. Tag: para
 #, no-c-format
-msgid "Let&#39;s see what all this new terminology means."
+msgid "Let's see what all this new terminology means."
 msgstr ""
 
 #. Tag: title
@@ -183,8 +183,8 @@
 #, no-c-format
 msgid ""
 "Beans usually acquire references to other beans via dependency injection. "
-"Any injected attribute specifies a &#34;contract&#34; that must be satisfied "
-"by the bean to be injected. The contract is:"
+"Any injected attribute specifies a \"contract\" that must be satisfied by "
+"the bean to be injected. The contract is:"
 msgstr ""
 
 #. Tag: para
@@ -211,7 +211,7 @@
 #, no-c-format
 msgid ""
 "The bean types are <literal>BookShop</literal>, <literal>Business</literal> "
-"and <literal>Shop&#60;Book&#62;</literal>, as well as the implicit type "
+"and <literal>Shop&lt;Book&gt;</literal>, as well as the implicit type "
 "<literal>java.lang.Object</literal>. (Notice that a parameterized type is a "
 "legal bean type)."
 msgstr ""
@@ -230,9 +230,9 @@
 msgid ""
 "The bean types of a session bean include local interfaces and the bean class "
 "local view (if any). EJB remote interfaces are not considered bean types of "
-"a session bean. You can&#39;t inject an EJB using its remote interface "
-"unless you define a <emphasis>resource</emphasis>, which we&#39;ll meet in "
-"<xref linkend=\"resources\" />."
+"a session bean. You can't inject an EJB using its remote interface unless "
+"you define a <emphasis>resource</emphasis>, which we'll meet in <xref "
+"linkend=\"resources\" />."
 msgstr ""
 
 #. Tag: para
@@ -241,7 +241,7 @@
 "Bean types may be restricted to an explicit set by annotating the bean with "
 "the <literal>@Typed</literal> annotation and listing the classes that should "
 "be bean types. For instance, the bean types of this bean have been "
-"restricted to <literal>Shop&#60;Book&#62;</literal>, together with "
+"restricted to <literal>Shop&lt;Book&gt;</literal>, together with "
 "<literal>java.lang.Object</literal>:"
 msgstr ""
 
@@ -255,8 +255,8 @@
 "<literal>DebitPaymentProcessor</literal>. Injecting a field of type "
 "<literal>PaymentProcessor</literal> introduces an ambiguous condition. In "
 "these cases, the client must specify some additional quality of the "
-"implementation it is interested in. We model this kind of &#34;quality&#34; "
-"using a qualifier."
+"implementation it is interested in. We model this kind of \"quality\" using "
+"a qualifier."
 msgstr ""
 
 #. Tag: para
@@ -265,23 +265,23 @@
 "A qualifier is a user-defined annotation that is itself annotated "
 "<literal>@Qualifer</literal>. A qualifier annotation is an extension of the "
 "type system. It lets us disambiguate a type without having to fall back to "
-"string-based names. Here&#39;s an example of a qualifier annotation:"
+"string-based names. Here's an example of a qualifier annotation:"
 msgstr ""
 
 #. Tag: para
 #, no-c-format
 msgid ""
 "You may not be used to seeing the definition of an annotation. In fact, this "
-"might be the first time you&#39;ve encountered one. With CDI, annotation "
-"definitions will become a familiar artifact as you&#39;ll be creating them "
-"from time to time."
+"might be the first time you've encountered one. With CDI, annotation "
+"definitions will become a familiar artifact as you'll be creating them from "
+"time to time."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
 msgid ""
 "Pay attention to the names of the built-in annotations in CDI and EJB. "
-"You&#39;ll notice that they are often adjectives. We encourage you to follow "
+"You'll notice that they are often adjectives. We encourage you to follow "
 "this convention when creating your custom annotations, since they serve to "
 "describe the behaviors and roles of the class."
 msgstr ""
@@ -308,7 +308,7 @@
 "For each injection point, the container searches for a bean which satisfies "
 "the contract, one which has the bean type and all the qualifiers. If it "
 "finds exactly one matching bean, it injects an instance of that bean. If it "
-"doesn&#39;t, it reports an error to the user."
+"doesn't, it reports an error to the user."
 msgstr ""
 
 #. Tag: para
@@ -330,10 +330,10 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"That&#39;s not quite the end of the story. CDI also defines a simple "
+"That's not quite the end of the story. CDI also defines a simple "
 "<emphasis>resolution rule</emphasis> that helps the container decide what to "
 "do if there is more than one bean that satisfies a particular contract. "
-"We&#39;ll get into the details in <xref linkend=\"injection\" />."
+"We'll get into the details in <xref linkend=\"injection\" />."
 msgstr ""
 
 #. Tag: title
@@ -370,7 +370,7 @@
 msgid ""
 "Keep in mind that once a bean is bound to a context, it remains in that "
 "context until the context is destroyed. There is no way to manually remove a "
-"bean from a context. If you don&#39;t want the bean to sit in the session "
+"bean from a context. If you don't want the bean to sit in the session "
 "indefinitely, consider using another scope with a shorted lifespan, such as "
 "the request or conversation scope."
 msgstr ""
@@ -386,8 +386,7 @@
 
 #. Tag: para
 #, no-c-format
-msgid ""
-"We&#39;ll talk more about scopes in <xref linkend=\"scopescontexts\" />."
+msgid "We'll talk more about scopes in <xref linkend=\"scopescontexts\" />."
 msgstr ""
 
 #. Tag: title
@@ -446,7 +445,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"We&#39;ve already seen how qualifiers let us choose between multiple "
+"We've already seen how qualifiers let us choose between multiple "
 "implementations of an interface at development time. But sometimes we have "
 "an interface (or other bean type) whose implementation varies depending upon "
 "the deployment environment. For example, we may want to use a mock "
@@ -483,9 +482,9 @@
 msgid ""
 "You might be familiar with the use of interceptors in EJB 3.0. In Java EE 6, "
 "this functionality has been generalized to work with other managed beans. "
-"That&#39;s right, you no longer have to make your bean an EJB just to "
-"intercept its methods. Holler. So what does CDI have to offer above and "
-"beyond that? Well, quite a lot actually. Let&#39;s cover some background."
+"That's right, you no longer have to make your bean an EJB just to intercept "
+"its methods. Holler. So what does CDI have to offer above and beyond that? "
+"Well, quite a lot actually. Let's cover some background."
 msgstr ""
 
 #. Tag: para
@@ -498,10 +497,10 @@
 "descriptor. You might as well just put the interceptor code <emphasis>in</"
 "emphasis> the implementation! Second, the order in which the interceptors "
 "are applied is taken from the order in which they are declared in the "
-"annotation or the XML descriptor. Perhaps this isn&#39;t so bad if you&#39;"
-"re applying the interceptors to a single bean. But, if you are applying them "
-"repeatedly, then there&#39;s a good chance that you&#39;ll inadvertently "
-"define a different order for different beans. Now that&#39;s a problem."
+"annotation or the XML descriptor. Perhaps this isn't so bad if you're "
+"applying the interceptors to a single bean. But, if you are applying them "
+"repeatedly, then there's a good chance that you'll inadvertently define a "
+"different order for different beans. Now that's a problem."
 msgstr ""
 
 #. Tag: para
@@ -540,14 +539,14 @@
 #, no-c-format
 msgid ""
 "Notice that <literal>ShoppingCart</literal> and "
-"<literal>TransactionInterceptor</literal> don&#39;t know anything about each "
+"<literal>TransactionInterceptor</literal> don't know anything about each "
 "other."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
 msgid ""
-"Interceptors are deployment-specific. (We don&#39;t need a "
+"Interceptors are deployment-specific. (We don't need a "
 "<literal>TransactionInterceptor</literal> in our unit tests!) By default, an "
 "interceptor is disabled. We can enable an interceptor using the CDI "
 "deployment descriptor <literal>META-INF/beans.xml</literal> of the jar or "
@@ -557,8 +556,8 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"We&#39;ll discuss interceptors, and their cousins, decorators, in <xref "
-"linkend=\"interceptors\" /> and <xref linkend=\"decorators\" />."
+"We'll discuss interceptors, and their cousins, decorators, in <xref linkend="
+"\"interceptors\" /> and <xref linkend=\"decorators\" />."
 msgstr ""
 
 #. Tag: title
@@ -569,10 +568,9 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"We&#39;ve already seen two types of beans: JavaBeans and EJB session beans. "
-"Is that the whole story? Actually, it&#39;s just the beginning. Let&#39;s "
-"explore the various kinds of beans that CDI implementations must support out-"
-"of-the-box."
+"We've already seen two types of beans: JavaBeans and EJB session beans. Is "
+"that the whole story? Actually, it's just the beginning. Let's explore the "
+"various kinds of beans that CDI implementations must support out-of-the-box."
 msgstr ""
 
 #. Tag: title
@@ -586,8 +584,8 @@
 "A managed bean is a Java class. The basic lifecycle and semantics of a "
 "managed bean are defined by the Managed Beans specification. You can "
 "explicitly declare a managed bean by annotating the bean class "
-"<literal>@ManagedBean</literal>, but in CDI you don&#39;t need to. According "
-"to the specification, the CDI container treats any class that satisfies the "
+"<literal>@ManagedBean</literal>, but in CDI you don't need to. According to "
+"the specification, the CDI container treats any class that satisfies the "
 "following conditions as a managed bean:"
 msgstr ""
 
@@ -636,7 +634,7 @@
 "According to this definition, JPA entities are technically managed beans. "
 "However, entities have their own special lifecycle, state and identity model "
 "and are usually instantiated by JPA or using <literal>new</literal>. "
-"Therefore we don&#39;t recommend directly injecting an entity class. We "
+"Therefore we don't recommend directly injecting an entity class. We "
 "especially recommend against assigning a scope other than "
 "<literal>@Dependent</literal> to an entity class, since JPA is not able to "
 "persist injected CDI proxies."
@@ -715,7 +713,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"There&#39;s no reason to explicitly declare the scope of a stateless session "
+"There's no reason to explicitly declare the scope of a stateless session "
 "bean or singleton session bean. The EJB container controls the lifecycle of "
 "these beans, according to the semantics of the <literal>@Stateless</literal> "
 "or <literal>@Singleton</literal> declaration. On the other hand, a stateful "
@@ -771,8 +769,8 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"When we don&#39;t need any of these things, an ordinary managed bean will "
-"serve just fine."
+"When we don't need any of these things, an ordinary managed bean will serve "
+"just fine."
 msgstr ""
 
 #. Tag: para
@@ -796,7 +794,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Finally, it&#39;s usually obvious when method-level transaction management, "
+"Finally, it's usually obvious when method-level transaction management, "
 "method-level security, timers, remote methods or asynchronous methods are "
 "needed."
 msgstr ""
@@ -804,11 +802,11 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"The point we&#39;re trying to make is: use a session bean when you need the "
+"The point we're trying to make is: use a session bean when you need the "
 "services it provides, not just because you want to use dependency injection, "
 "lifecycle management, or interceptors. Java EE 6 provides a graduated "
-"programming model. It&#39;s usually easy to start with an ordinary managed "
-"bean, and later turn it into an EJB just by adding one of the following "
+"programming model. It's usually easy to start with an ordinary managed bean, "
+"and later turn it into an EJB just by adding one of the following "
 "annotations: <literal>@Stateless</literal>, <literal>@Stateful</literal> or "
 "<literal>@Singleton</literal>."
 msgstr ""
@@ -816,14 +814,13 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"On the other hand, don&#39;t be scared to use session beans just because "
-"you&#39;ve heard your friends say they&#39;re &#34;heavyweight&#34;. It&#39;"
-"s nothing more than superstition to think that something is &#34;"
-"heavier&#34; just because it&#39;s hosted natively within the Java EE "
-"container, instead of by a proprietary bean container or dependency "
-"injection framework that runs as an additional layer of obfuscation. And as "
-"a general principle, you should be skeptical of folks who use vaguely "
-"defined terminology like &#34;heavyweight&#34;."
+"On the other hand, don't be scared to use session beans just because you've "
+"heard your friends say they're \"heavyweight\". It's nothing more than "
+"superstition to think that something is \"heavier\" just because it's hosted "
+"natively within the Java EE container, instead of by a proprietary bean "
+"container or dependency injection framework that runs as an additional layer "
+"of obfuscation. And as a general principle, you should be skeptical of folks "
+"who use vaguely defined terminology like \"heavyweight\"."
 msgstr ""
 
 #. Tag: title
@@ -862,7 +859,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"We can&#39;t write a bean class that is itself a random number. But we can "
+"We can't write a bean class that is itself a random number. But we can "
 "certainly write a method that returns a random number. By making the method "
 "a producer method, we allow the return value of the method—in this case an "
 "<literal>Integer</literal>—to be injected. We can even specify a qualifier—"
@@ -934,7 +931,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"We&#39;ll talk much more about producer methods in <xref linkend="
+"We'll talk much more about producer methods in <xref linkend="
 "\"producermethods\" />."
 msgstr ""
 
@@ -965,7 +962,7 @@
 "A producer field is really just a shortcut that lets us avoid writing a "
 "useless getter method. However, in addition to convenience, producer fields "
 "serve a specific purpose as an adaptor for Java EE component environment "
-"injection, but to learn more about that, you&#39;ll have to wait until <xref "
-"linkend=\"resources\" />. Because we can&#39;t wait to get to work on some "
+"injection, but to learn more about that, you'll have to wait until <xref "
+"linkend=\"resources\" />. Because we can't wait to get to work on some "
 "examples."
 msgstr ""

Modified: doc/trunk/reference/src/main/docbook/zh-CN/decorators.po
===================================================================
--- doc/trunk/reference/src/main/docbook/zh-CN/decorators.po	2010-07-24 16:36:48 UTC (rev 6808)
+++ doc/trunk/reference/src/main/docbook/zh-CN/decorators.po	2010-07-25 04:22:37 UTC (rev 6809)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: master.xml\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-05-01T13:53:42\n"
+"POT-Creation-Date: 2010-07-25T03:52:14\n"
 "PO-Revision-Date: 2009-02-10 11:18+0800\n"
 "Last-Translator: Sean Wu <alartin at gmail.com>\n"
 "Language-Team: none\n"
@@ -26,8 +26,8 @@
 "interceptor is able to intercept invocations of any Java type. This makes "
 "them perfect for solving technical concerns such as transaction management, "
 "security and call logging. However, by nature, interceptors are unaware of "
-"the actual semantics of the events they intercept. Thus, interceptors "
-"aren&#39;t an appropriate tool for separating business-related concerns."
+"the actual semantics of the events they intercept. Thus, interceptors aren't "
+"an appropriate tool for separating business-related concerns."
 msgstr ""
 "拦截器能够以一种强大的方式来捕获和分离关注点,拦截器和类型系统的关系是正交"
 "的。任何拦截器都能够拦截任何Java类型的调用。这种特性能够让拦截器很好的处理技"
@@ -42,11 +42,10 @@
 "aware of all the semantics attached to that interface. Since decorators "
 "directly implement operations with business semantics, it makes them the "
 "perfect tool for modeling some kinds of business concerns. It also means "
-"that a decorator doesn&#39;t have the generality of an interceptor. "
-"Decorators aren&#39;t able to solve technical concerns that cut across many "
-"disparate types. Interceptors and decorators, though similar in many ways, "
-"are complementary. Let&#39;s look at some cases where decorators fit the "
-"bill."
+"that a decorator doesn't have the generality of an interceptor. Decorators "
+"aren't able to solve technical concerns that cut across many disparate "
+"types. Interceptors and decorators, though similar in many ways, are "
+"complementary. Let's look at some cases where decorators fit the bill."
 msgstr ""
 "对装饰器来说,反之亦然。一个装饰器只拦截特定Java接口的调用,因此它能够领会这"
 "个接口关联的语义。装饰器的特性使其成为某些业务关注点的理想的建模工具。这也意"
@@ -90,9 +89,8 @@
 #, fuzzy, no-c-format
 msgid ""
 "Unlike other beans, a decorator may be an abstract class. Therefore, if "
-"there&#39;s nothing special the decorator needs to do for a particular "
-"method of the decorated interface, you don&#39;t need to implement that "
-"method."
+"there's nothing special the decorator needs to do for a particular method of "
+"the decorated interface, you don't need to implement that method."
 msgstr ""
 "和其他简单的Web Beans不同,一个装饰器可以是一个抽象类。如果被装饰的接口中一个"
 "特殊方法对装饰器没有用处,那么装饰器可以不实现这个方法。"
@@ -179,8 +177,7 @@
 #, fuzzy, no-c-format
 msgid ""
 "This declaration serves the same purpose for decorators that the "
-"<literal>&#60;interceptors&#62;</literal> declaration serves for "
-"interceptors:"
+"<literal>&lt;interceptors&gt;</literal> declaration serves for interceptors:"
 msgstr ""
 "这个声明对于装饰器来说和<literal>&lt;Interceptors&gt;</literal>声明对于拦截器"
 "来说是一样的:"

Modified: doc/trunk/reference/src/main/docbook/zh-CN/ee.po
===================================================================
--- doc/trunk/reference/src/main/docbook/zh-CN/ee.po	2010-07-24 16:36:48 UTC (rev 6808)
+++ doc/trunk/reference/src/main/docbook/zh-CN/ee.po	2010-07-25 04:22:37 UTC (rev 6809)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: master.xml\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-05-01T13:53:42\n"
+"POT-Creation-Date: 2010-07-25T03:52:14\n"
 "PO-Revision-Date: 2009-02-11 13:00+0800\n"
 "Last-Translator: Sean Wu <alartin at gmail.com>\n"
 "Language-Team: none\n"
@@ -74,7 +74,7 @@
 "The CDI specification does not require the servlet context objects, "
 "<literal>HttpServletRequest</literal>, <literal>HttpSession</literal> and "
 "<literal>ServletContext</literal> to be exposed as injectable beans. If you "
-"really want to be able to inject these objects, it&#39;s easy to create a "
+"really want to be able to inject these objects, it's easy to create a "
 "portable extension to expose them as beans. However, we recommend that "
 "direct access to these objects be limited to servlets, servlet filters and "
 "servlet event listeners, where they may be obtained in the usual way as "
@@ -101,8 +101,8 @@
 "All managed beans may take advantage of Java EE component environment "
 "injection using <literal>@Resource</literal>, <literal>@EJB</literal>, "
 "<literal>@PersistenceContext</literal>, <literal>@PeristenceUnit</literal> "
-"and <literal>@WebServiceRef</literal>. We&#39;ve already seen a couple of "
-"examples of this, though we didn&#39;t pay much attention at the time:"
+"and <literal>@WebServiceRef</literal>. We've already seen a couple of "
+"examples of this, though we didn't pay much attention at the time:"
 msgstr ""
 "所有简单的和企业的Web Beans都可以通过<literal>@Resource</literal>, "
 "<literal>@EJB</literal>和<literal>@PersistenceContext</literal>来使用Java EE"
@@ -135,8 +135,8 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"It&#39;s easy to use a bean from a servlet in Java EE 6. Simply inject the "
-"bean using field or initializer method injection."
+"It's easy to use a bean from a servlet in Java EE 6. Simply inject the bean "
+"using field or initializer method injection."
 msgstr ""
 "在Java EE 6中,从一个Servlet中调用一个Web Bean非常容易,只须使用Web Beans域注"
 "入一个Web Bean或者将初始方法注入即可。"
@@ -160,9 +160,9 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"CDI injection applies to all EJBs, even when they aren&#39;t managed beans. "
-"In particular, you can use CDI injection in message-driven beans, which are "
-"by nature not contextual objects."
+"CDI injection applies to all EJBs, even when they aren't managed beans. In "
+"particular, you can use CDI injection in message-driven beans, which are by "
+"nature not contextual objects."
 msgstr ""
 
 #. Tag: para
@@ -243,15 +243,15 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"CDI doesn&#39;t define any special deployment archive. You can package beans "
-"in jars, ejb jars or wars—any deployment location in the application "
-"classpath. However, the archive must be a &#34;bean archive&#34;. That means "
-"each archive that contains beans <emphasis>must</emphasis> include a file "
-"named <literal>beans.xml</literal> in the <literal>META-INF</literal> "
-"directory of the classpath or <literal>WEB-INF</literal> directory of the "
-"web root (for war archives). The file may be empty. Beans deployed in "
-"archives that do not have a <literal>beans.xml</literal> file will not be "
-"available for use in the application."
+"CDI doesn't define any special deployment archive. You can package beans in "
+"jars, ejb jars or wars—any deployment location in the application classpath. "
+"However, the archive must be a \"bean archive\". That means each archive "
+"that contains beans <emphasis>must</emphasis> include a file named "
+"<literal>beans.xml</literal> in the <literal>META-INF</literal> directory of "
+"the classpath or <literal>WEB-INF</literal> directory of the web root (for "
+"war archives). The file may be empty. Beans deployed in archives that do not "
+"have a <literal>beans.xml</literal> file will not be available for use in "
+"the application."
 msgstr ""
 "Web Beans并没有指定特殊的部署包。你可以以JAR, EJB-JAR或者WAR&#151;形式将Web "
 "Beans打包在任何应用类路径中的部署位置上。然而,每个包含Web Beans的包必须在"

Modified: doc/trunk/reference/src/main/docbook/zh-CN/environments.po
===================================================================
--- doc/trunk/reference/src/main/docbook/zh-CN/environments.po	2010-07-24 16:36:48 UTC (rev 6808)
+++ doc/trunk/reference/src/main/docbook/zh-CN/environments.po	2010-07-25 04:22:37 UTC (rev 6809)
@@ -6,7 +6,7 @@
 "Project-Id-Version: Web_Beans:_Java_Contexts_and_Dependency_Injection "
 "VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-05-01T14:44:09\n"
+"POT-Creation-Date: 2010-07-25T03:52:14\n"
 "PO-Revision-Date: 2009-03-28 17:09+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -37,9 +37,9 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Unfortunately, you can&#39;t use Weld with earlier versions of JBoss AS "
-"since they are missing key libraries. If you want to learn how to upgrade "
-"the built-in support on JBoss AS 6.0, then read on."
+"Unfortunately, you can't use Weld with earlier versions of JBoss AS since "
+"they are missing key libraries. If you want to learn how to upgrade the "
+"built-in support on JBoss AS 6.0, then read on."
 msgstr ""
 
 #. Tag: para
@@ -107,7 +107,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"There is a major limitation to using a servlet container. Weld doesn&#39;t "
+"There is a major limitation to using a servlet container. Weld doesn't "
 "support deploying session beans, injection using <literal>@EJB</literal> or "
 "<literal>@PersistenceContext</literal>, or using transactional events in "
 "servlet containers. For enterprise features such as these, you should really "
@@ -119,10 +119,10 @@
 msgid ""
 "Weld should be used as a web application library in a servlet container. You "
 "should place <literal>weld-servlet.jar</literal> in <literal>WEB-INF/lib</"
-"literal> in the web root. <literal>weld-servlet.jar</literal> is an &#34;"
-"uber-jar&#34;, meaning it bundles all the bits of Weld and CDI required for "
-"running in a servlet container, provided for your convenience. "
-"Alternatively, you could use its component jars:"
+"literal> in the web root. <literal>weld-servlet.jar</literal> is an \"uber-"
+"jar\", meaning it bundles all the bits of Weld and CDI required for running "
+"in a servlet container, provided for your convenience. Alternatively, you "
+"could use its component jars:"
 msgstr ""
 
 #. Tag: para
@@ -186,7 +186,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Tomcat has a read-only JNDI, so Weld can&#39;t automatically bind the "
+"Tomcat has a read-only JNDI, so Weld can't automatically bind the "
 "BeanManager extension SPI. To bind the BeanManager into JNDI, you should "
 "populate <literal>META-INF/context.xml</literal> in the web root with the "
 "following contents:"
@@ -220,18 +220,18 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Like Tomcat, Jetty has a read-only JNDI, so Weld can&#39;t automatically "
-"bind the Manager. To bind the Manager to JNDI, you should populate "
-"<literal>WEB-INF/jetty-env.xml</literal> with the following contents:"
+"Like Tomcat, Jetty has a read-only JNDI, so Weld can't automatically bind "
+"the Manager. To bind the Manager to JNDI, you should populate <literal>WEB-"
+"INF/jetty-env.xml</literal> with the following contents:"
 msgstr ""
 
 #. Tag: para
 #, no-c-format
 msgid ""
-"Notice that Jetty doesn&#39;t not have built-in support for an "
-"<literal>javax.naming.spi.ObjectFactory</literal> like Tomcat, so it&#39;s "
-"necessary to manually create the <literal>javax.naming.Reference</literal> "
-"to wrap around it."
+"Notice that Jetty doesn't not have built-in support for an <literal>javax."
+"naming.spi.ObjectFactory</literal> like Tomcat, so it's necessary to "
+"manually create the <literal>javax.naming.Reference</literal> to wrap around "
+"it."
 msgstr ""
 
 #. Tag: para
@@ -258,13 +258,13 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"In addition to improved integration of the Enterprise Java stack, the &#34;"
-"Contexts and Dependency Injection for the Java EE platform&#34; "
-"specification also defines a state of the art typesafe, stateful dependency "
-"injection framework, which can prove useful in a wide range of application "
-"types. To help developers take advantage of this, Weld provides a simple "
-"means for being executed in the Java Standard Edition (SE) environment "
-"independently of any Java EE APIs."
+"In addition to improved integration of the Enterprise Java stack, the "
+"\"Contexts and Dependency Injection for the Java EE platform\" specification "
+"also defines a state of the art typesafe, stateful dependency injection "
+"framework, which can prove useful in a wide range of application types. To "
+"help developers take advantage of this, Weld provides a simple means for "
+"being executed in the Java Standard Edition (SE) environment independently "
+"of any Java EE APIs."
 msgstr ""
 
 #. Tag: para
@@ -348,7 +348,7 @@
 
 #. Tag: para
 #, no-c-format
-msgid "Here&#39;s an example of a simple CDI SE application:"
+msgid "Here's an example of a simple CDI SE application:"
 msgstr ""
 
 #. Tag: title
@@ -369,9 +369,9 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Thanks to the power of CDI&#39;s typesafe event model, application "
-"developers need not write any bootstrapping code. The Weld SE module comes "
-"with a built-in main method which will bootstrap CDI for you and then fire a "
+"Thanks to the power of CDI's typesafe event model, application developers "
+"need not write any bootstrapping code. The Weld SE module comes with a built-"
+"in main method which will bootstrap CDI for you and then fire a "
 "<literal>ContainerInitialized</literal> event. The entry point for your "
 "application code would therefore be a simple bean which observes the "
 "<literal>ContainerInitialized</literal> event, as in the previous example."
@@ -394,15 +394,15 @@
 msgid ""
 "For added flexibility, CDI SE also comes with a bootstrap API which can be "
 "called from within your application in order to initialize CDI and obtain "
-"references to your application&#39;s beans and events. The API consists of "
-"two classes: <literal>Weld</literal> and <literal>WeldContainer</literal>."
+"references to your application's beans and events. The API consists of two "
+"classes: <literal>Weld</literal> and <literal>WeldContainer</literal>."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
 msgid ""
-"Here&#39;s an example application main method which uses this API to "
-"initialize a bean of type <literal>MyApplicationBean</literal>."
+"Here's an example application main method which uses this API to initialize "
+"a bean of type <literal>MyApplicationBean</literal>."
 msgstr ""
 
 #. Tag: para
@@ -435,10 +435,10 @@
 #, no-c-format
 msgid ""
 "To use the @ThreadScoped annotation you need to enable the "
-"<literal>RunnableDecorator</literal> which &#39;listens&#39; for all "
-"executions of <literal>Runnable.run()</literal> and decorates them by "
-"setting up the thread context beforehand, bound to the current thread, and "
-"destroying the context afterwards."
+"<literal>RunnableDecorator</literal> which 'listens' for all executions of "
+"<literal>Runnable.run()</literal> and decorates them by setting up the "
+"thread context beforehand, bound to the current thread, and destroying the "
+"context afterwards."
 msgstr ""
 
 #. Tag: para
@@ -459,8 +459,8 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Weld SE comes packaged as a &#39;shaded&#39; jar which includes the CDI API, "
-"Weld Core and all dependant classes bundled into a single jar. Therefore the "
-"only Weld jar you need on the classpath, in addition to your application&#39;"
-"s classes and dependant jars, is the Weld SE jar."
+"Weld SE comes packaged as a 'shaded' jar which includes the CDI API, Weld "
+"Core and all dependant classes bundled into a single jar. Therefore the only "
+"Weld jar you need on the classpath, in addition to your application's "
+"classes and dependant jars, is the Weld SE jar."
 msgstr ""

Modified: doc/trunk/reference/src/main/docbook/zh-CN/events.po
===================================================================
--- doc/trunk/reference/src/main/docbook/zh-CN/events.po	2010-07-24 16:36:48 UTC (rev 6808)
+++ doc/trunk/reference/src/main/docbook/zh-CN/events.po	2010-07-25 04:22:37 UTC (rev 6809)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: master.xml\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-05-01T13:53:42\n"
+"POT-Creation-Date: 2010-07-25T03:52:14\n"
 "PO-Revision-Date: 2009-02-16 11:17+0800\n"
 "Last-Translator: Sean Wu <alartin at gmail.com>\n"
 "Language-Team: none\n"
@@ -45,8 +45,8 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"observers can specify a combination of &#34;selectors&#34; to narrow the set "
-"of event notifications they will receive, and"
+"observers can specify a combination of \"selectors\" to narrow the set of "
+"event notifications they will receive, and"
 msgstr "观察者可以指定一个\"选择器\"组合来限定接受的事件通知,并且"
 
 #. Tag: para
@@ -60,7 +60,7 @@
 #, no-c-format
 msgid ""
 "The CDI event notification facility uses more or less the same typesafe "
-"approach that we&#39;ve already seen with the dependency injection service."
+"approach that we've already seen with the dependency injection service."
 msgstr ""
 
 #. Tag: title
@@ -83,7 +83,7 @@
 #, no-c-format
 msgid ""
 "An event qualifier is just a normal qualifier, defined using "
-"<literal>@Qualifier</literal>. Here&#39;s an example:"
+"<literal>@Qualifier</literal>. Here's an example:"
 msgstr ""
 
 #. Tag: title
@@ -118,7 +118,7 @@
 msgid ""
 "An observer method need not specify any event qualifiers—in this case it is "
 "interested in <emphasis>all</emphasis> events of a particular type. If it "
-"does specify qualifiers, it&#39;s only interested in events which have those "
+"does specify qualifiers, it's only interested in events which have those "
 "qualifiers."
 msgstr ""
 "一个观察者方法无须指定一个事件绑定 &#151; 在这种情况下,它对一个特定类型的 "
@@ -233,8 +233,8 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"The downside of annotating the injection point is that we can&#39;t specify "
-"the qualifier dynamically. CDI lets us obtain a qualifier instance by "
+"The downside of annotating the injection point is that we can't specify the "
+"qualifier dynamically. CDI lets us obtain a qualifier instance by "
 "subclassing the helper class <literal>AnnotationLiteral</literal>. That way, "
 "we can pass the qualifier to the <literal>select()</literal> method of "
 "<literal>Event</literal>."
@@ -258,8 +258,8 @@
 msgid ""
 "By default, if there is no instance of an observer in the current context, "
 "the container will instantiate the observer in order to deliver an event to "
-"it. This behavior isn&#39;t always desirable. We may want to deliver events "
-"only to instances of the observer that already exist in the current contexts."
+"it. This behavior isn't always desirable. We may want to deliver events only "
+"to instances of the observer that already exist in the current contexts."
 msgstr ""
 
 #. Tag: para

Modified: doc/trunk/reference/src/main/docbook/zh-CN/example.po
===================================================================
--- doc/trunk/reference/src/main/docbook/zh-CN/example.po	2010-07-24 16:36:48 UTC (rev 6808)
+++ doc/trunk/reference/src/main/docbook/zh-CN/example.po	2010-07-25 04:22:37 UTC (rev 6809)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: master.xml\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-05-01T13:53:42\n"
+"POT-Creation-Date: 2010-07-25T03:52:14\n"
 "PO-Revision-Date: 2009-03-12 11:27+0800\n"
 "Last-Translator: Sean Wu <alartin at gmail.com>\n"
 "Language-Team: none\n"
@@ -21,11 +21,11 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"Let&#39;s illustrate these ideas with a full example. We&#39;re going to "
-"implement user login/logout for an application that uses JSF. First, we&#39;"
-"ll define a request-scoped bean to hold the username and password entered "
-"during login, with constraints defined using annotations from the Bean "
-"Validation specification:"
+"Let's illustrate these ideas with a full example. We're going to implement "
+"user login/logout for an application that uses JSF. First, we'll define a "
+"request-scoped bean to hold the username and password entered during login, "
+"with constraints defined using annotations from the Bean Validation "
+"specification:"
 msgstr ""
 "让我们通过一个完整的例子来演示这些想法。我们将是使用JSF来实现一个应用的用户登"
 "录/退出功能。首先,我们定一个Web Bean来持有登录过程中用户输入的用户名和密码:"
@@ -43,7 +43,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"(Note that we&#39;re also going to need a <literal>persistence.xml</literal> "
+"(Note that we're also going to need a <literal>persistence.xml</literal> "
 "file to configure the JPA persistence unit containing <literal>User</"
 "literal>.)"
 msgstr ""
@@ -88,7 +88,7 @@
 #, fuzzy, no-c-format
 msgid ""
 "Hopefully, this example gave you a taste of the CDI programming model. In "
-"the next chapter, we&#39;ll explore dependency injection in greater depth."
+"the next chapter, we'll explore dependency injection in greater depth."
 msgstr ""
 "希望这个例子能够让你尝试了Web Bean的编程模型。在下一章中,我们将更加深入的研"
 "究Web Bean的依赖注入。"

Modified: doc/trunk/reference/src/main/docbook/zh-CN/extend.po
===================================================================
--- doc/trunk/reference/src/main/docbook/zh-CN/extend.po	2010-07-24 16:36:48 UTC (rev 6808)
+++ doc/trunk/reference/src/main/docbook/zh-CN/extend.po	2010-07-25 04:22:37 UTC (rev 6809)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: master.xml\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-05-01T13:53:42\n"
+"POT-Creation-Date: 2010-07-25T03:52:14\n"
 "PO-Revision-Date: 2009-02-16 14:16+0800\n"
 "Last-Translator: Sean Wu <alartin at gmail.com>\n"
 "Language-Team: none\n"
@@ -91,8 +91,8 @@
 msgid ""
 "The first step in creating a portable extension is to write a class that "
 "implements <literal>Extension</literal>. This marker interface does not "
-"define any methods, but it&#39;s needed to satisfy the requirements of Java "
-"SE&#39;s service provider architecture."
+"define any methods, but it's needed to satisfy the requirements of Java SE's "
+"service provider architecture."
 msgstr ""
 
 #. Tag: para
@@ -173,8 +173,8 @@
 #, no-c-format
 msgid ""
 "In fact, the extension can do a lot more than just observe. The extension is "
-"permitted to modify the container&#39;s metamodel and more. Here&#39;s a "
-"very simple example:"
+"permitted to modify the container's metamodel and more. Here's a very simple "
+"example:"
 msgstr ""
 
 #. Tag: para
@@ -216,7 +216,7 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"Let&#39;s study some of the interfaces exposed by the <literal>BeanManager</"
+"Let's study some of the interfaces exposed by the <literal>BeanManager</"
 "literal>."
 msgstr "扩展Web Bean的神经中枢是 <literal>Manager</literal> 对象。"
 
@@ -271,8 +271,7 @@
 
 #. Tag: para
 #, no-c-format
-msgid ""
-"There&#39;s an easy way to find out what beans exist in the application:"
+msgid "There's an easy way to find out what beans exist in the application:"
 msgstr ""
 
 #. Tag: para
@@ -306,9 +305,9 @@
 msgid ""
 "In this example, we make a framework class, <literal>SecurityManager</"
 "literal> available for injection. To make things a bit more interesting, "
-"we&#39;re going to delegate back to the container&#39;s "
-"<literal>InjectionTarget</literal> to perform instantiation and injection "
-"upon the <literal>SecurityManager</literal> instance."
+"we're going to delegate back to the container's <literal>InjectionTarget</"
+"literal> to perform instantiation and injection upon the "
+"<literal>SecurityManager</literal> instance."
 msgstr ""
 
 #. Tag: para
@@ -334,8 +333,8 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Let&#39;s start with an example of an extension that provides support for "
-"the use of <literal>@Named</literal> at the package level. The package-level "
+"Let's start with an example of an extension that provides support for the "
+"use of <literal>@Named</literal> at the package level. The package-level "
 "name is used to qualify the EL names of all beans defined in that package. "
 "The portable extension uses the <literal>ProcessAnnotatedType</literal> "
 "event to wrap the <literal>AnnotatedType</literal> object and override the "
@@ -345,7 +344,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Here&#39;s a second example, which adds the <literal>@Alternative</literal> "
+"Here's a second example, which adds the <literal>@Alternative</literal> "
 "annotation to any class which implements a certain <literal>Service</"
 "literal> interface."
 msgstr ""
@@ -376,12 +375,12 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Here&#39;s a CDI portable extension that reads values from properties files "
-"and configures fields of Java EE components, including servlets, EJBs, "
-"managed beans, interceptors and more. In this example, properties for a "
-"class such as <literal>org.mydomain.blog.Blogger</literal> go in a resource "
-"named <literal>org/mydomain/blog/Blogger.properties</literal>, and the name "
-"of a property must match the name of the field to be configured. So "
+"Here's a CDI portable extension that reads values from properties files and "
+"configures fields of Java EE components, including servlets, EJBs, managed "
+"beans, interceptors and more. In this example, properties for a class such "
+"as <literal>org.mydomain.blog.Blogger</literal> go in a resource named "
+"<literal>org/mydomain/blog/Blogger.properties</literal>, and the name of a "
+"property must match the name of the field to be configured. So "
 "<literal>Blogger.properties</literal> could contain:"
 msgstr ""
 
@@ -396,9 +395,9 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"There&#39;s a lot more to the portable extension SPI than what we&#39;ve "
-"discussed here. Check out the CDI spec or Javadoc for more information. For "
-"now, we&#39;ll just mention one more extension point."
+"There's a lot more to the portable extension SPI than what we've discussed "
+"here. Check out the CDI spec or Javadoc for more information. For now, we'll "
+"just mention one more extension point."
 msgstr ""
 
 #. Tag: title

Modified: doc/trunk/reference/src/main/docbook/zh-CN/extensions.po
===================================================================
--- doc/trunk/reference/src/main/docbook/zh-CN/extensions.po	2010-07-24 16:36:48 UTC (rev 6808)
+++ doc/trunk/reference/src/main/docbook/zh-CN/extensions.po	2010-07-25 04:22:37 UTC (rev 6809)
@@ -6,7 +6,7 @@
 "Project-Id-Version: Web_Beans:_Java_Contexts_and_Dependency_Injection "
 "VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-05-01T13:53:42\n"
+"POT-Creation-Date: 2010-07-25T03:52:14\n"
 "PO-Revision-Date: 2009-03-28 17:09+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -59,6 +59,6 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"If you are using Weld as your JSR-299 implementation, there&#39;s no need to "
-"include sl4j as it&#39;s already included (and used internally)."
+"If you are using Weld as your JSR-299 implementation, there's no need to "
+"include sl4j as it's already included (and used internally)."
 msgstr ""

Modified: doc/trunk/reference/src/main/docbook/zh-CN/gettingstarted.po
===================================================================
--- doc/trunk/reference/src/main/docbook/zh-CN/gettingstarted.po	2010-07-24 16:36:48 UTC (rev 6808)
+++ doc/trunk/reference/src/main/docbook/zh-CN/gettingstarted.po	2010-07-25 04:22:37 UTC (rev 6809)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: master.xml\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-05-01T13:53:42\n"
+"POT-Creation-Date: 2010-07-25T03:52:14\n"
 "PO-Revision-Date: 2009-03-30 09:39+0800\n"
 "Last-Translator: Sean Wu <alartin at gmail.com>\n"
 "Language-Team: none\n"
@@ -46,7 +46,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"To run the examples with the provided build scripts, you&#39;ll need the "
+"To run the examples with the provided build scripts, you'll need the "
 "following:"
 msgstr ""
 
@@ -94,7 +94,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"You&#39;ll need a full install of Ant 1.7.0. Some linux distributions only "
+"You'll need a full install of Ant 1.7.0. Some linux distributions only "
 "supply a partial installation of Ant which cause the build to fail. If you "
 "encounter problems, verify that ant-nodeps.jar is on the classpath."
 msgstr ""
@@ -102,7 +102,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"In the next few sections, you&#39;ll be using the Ant command (<literal>ant</"
+"In the next few sections, you'll be using the Ant command (<literal>ant</"
 "literal>) to invoke the Ant build script in each example to compile, "
 "assemble and deploy the example to JBoss AS and, for the war example, Apache "
 "Tomcat. You can also deploy the generated artifact (war or ear) to any other "
@@ -121,7 +121,7 @@
 #, no-c-format
 msgid ""
 "The sections below cover the steps for deploying with both Ant and Maven in "
-"detail. Let&#39;s start with JBoss AS."
+"detail. Let's start with JBoss AS."
 msgstr ""
 
 #. Tag: title
@@ -132,25 +132,25 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"To deploy the examples to JBoss AS, you&#39;ll need <ulink url=\"http://"
-"jboss.org/jbossas/\">JBoss AS 6.0.0</ulink> or above. If a release of the "
-"JBoss AS 6.0 line isn&#39;t yet available, you can download a <ulink url="
-"\"http://hudson.jboss.org/hudson/view/JBoss%20AS/job/JBoss-AS-6.0.x/"
-"\">nightly snapshot</ulink>. The reason JBoss AS 6.0.0 or above is required "
-"is because it&#39;s the first release that has both CDI and Bean Validation "
-"support built-in, making it close enough to Java EE 6 to run the examples. "
-"The good news is that there are no additional modifications you have to make "
-"to the server. It&#39;s ready to go!"
+"To deploy the examples to JBoss AS, you'll need <ulink url=\"http://jboss."
+"org/jbossas/\">JBoss AS 6.0.0</ulink> or above. If a release of the JBoss AS "
+"6.0 line isn't yet available, you can download a <ulink url=\"http://hudson."
+"jboss.org/hudson/view/JBoss%20AS/job/JBoss-AS-6.0.x/\">nightly snapshot</"
+"ulink>. The reason JBoss AS 6.0.0 or above is required is because it's the "
+"first release that has both CDI and Bean Validation support built-in, making "
+"it close enough to Java EE 6 to run the examples. The good news is that "
+"there are no additional modifications you have to make to the server. It's "
+"ready to go!"
 msgstr ""
 
 #. Tag: para
 #, no-c-format
 msgid ""
 "After you have downloaded JBoss AS, extract it. (We recommended renaming the "
-"folder to include the <literal>as</literal> qualifier so it&#39;s clear that "
-"it&#39;s the application server). You can move the extracted folder anywhere "
-"you like. Wherever it lays to rest, that&#39;s what we&#39;ll call the JBoss "
-"AS installation directory, or <literal>JBOSS_HOME</literal>."
+"folder to include the <literal>as</literal> qualifier so it's clear that "
+"it's the application server). You can move the extracted folder anywhere you "
+"like. Wherever it lays to rest, that's what we'll call the JBoss AS "
+"installation directory, or <literal>JBOSS_HOME</literal>."
 msgstr ""
 
 #. Tag: para
@@ -166,7 +166,7 @@
 
 #. Tag: para
 #, fuzzy, no-c-format
-msgid "You&#39;re now ready to deploy your first example!"
+msgid "You're now ready to deploy your first example!"
 msgstr "现在,你可以部署你的第一个例子了!"
 
 #. Tag: para
@@ -179,8 +179,8 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"If you haven&#39;t already, start JBoss AS. You can either start JBoss AS "
-"from a Linux shell:"
+"If you haven't already, start JBoss AS. You can either start JBoss AS from a "
+"Linux shell:"
 msgstr ""
 
 #. Tag: para
@@ -266,16 +266,16 @@
 msgid ""
 "The translator uses session beans, which are packaged in an EJB module "
 "within an ear. Java EE 6 will allow session beans to be deployed in war "
-"modules, but that&#39;s a topic for a later chapter."
+"modules, but that's a topic for a later chapter."
 msgstr ""
 
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"Again, wait a few seconds for the application to deploy (if you&#39;re "
-"really bored, read the log messages), and visit <ulink url=\"http://"
-"localhost:8080/weld-translator\">http://localhost:8080/weld-translator</"
-"ulink> to begin pseudo-translating."
+"Again, wait a few seconds for the application to deploy (if you're really "
+"bored, read the log messages), and visit <ulink url=\"http://localhost:8080/"
+"weld-translator\">http://localhost:8080/weld-translator</ulink> to begin "
+"pseudo-translating."
 msgstr ""
 "我们需要在这里做些事情-首先我们需要设置上下文路径为一个不错的URL(<ulink url="
 "\"http://localhost:8080/webbeans-translator\">http://localhost:8080/webbeans-"
@@ -289,21 +289,21 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Deploying to GlassFish should be easy and familiar, right? After all, it&#39;"
-"s the Java EE 6 reference implementation and Weld is the JSR-299 reference "
-"implementation, meaning Weld gets bundled with GlassFish. So yes, it&#39;s "
-"all quite easy and familiar."
+"Deploying to GlassFish should be easy and familiar, right? After all, it's "
+"the Java EE 6 reference implementation and Weld is the JSR-299 reference "
+"implementation, meaning Weld gets bundled with GlassFish. So yes, it's all "
+"quite easy and familiar."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
 msgid ""
-"To deploy the examples to GlassFish, you&#39;ll need the final <ulink url="
+"To deploy the examples to GlassFish, you'll need the final <ulink url="
 "\"https://glassfish.dev.java.net/downloads/v3-final.html\">GlassFish V3</"
 "ulink> release. Select the release that ends in either <literal>-unix.sh</"
 "literal> or <literal>-windows.exe</literal> depending on your platform. "
-"After the download is complete, execute the installer. On Linux/Unix, "
-"you&#39;ll need to first make the script executable."
+"After the download is complete, execute the installer. On Linux/Unix, you'll "
+"need to first make the script executable."
 msgstr ""
 
 #. Tag: para
@@ -311,15 +311,15 @@
 msgid ""
 "On Windows you can just click on the executable. Follow the instructions in "
 "the installer. It will create a single domain named <literal>domain1</"
-"literal>. You&#39;ll use that domain to deploy the example. We recommend "
-"that you choose <literal>7070</literal> as the main HTTP port to avoid "
-"conflicts with a running instance of JBoss AS (or Apache Tomcat)."
+"literal>. You'll use that domain to deploy the example. We recommend that "
+"you choose <literal>7070</literal> as the main HTTP port to avoid conflicts "
+"with a running instance of JBoss AS (or Apache Tomcat)."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
 msgid ""
-"If you&#39;ve deployed either of the starter examples, <literal>weld-"
+"If you've deployed either of the starter examples, <literal>weld-"
 "numberguess</literal> or <literal>weld-translator</literal>, to JBoss AS, "
 "then you already have the deployable artifact you need. If not, switch to "
 "either of the two directories and build it."
@@ -329,11 +329,11 @@
 #, no-c-format
 msgid ""
 "The deployable archive for the <literal>weld-numberguess</literal>, named "
-"<literal>weld-numberguess.war</literal>, ends up in the example&#39;s "
+"<literal>weld-numberguess.war</literal>, ends up in the example's "
 "<literal>target</literal> directory. The archive for the <literal>weld-"
 "translator</literal> example, named <literal>weld-translator.ear</literal>, "
-"ends up in the example&#39;s <literal>ear/target</literal> directory. All "
-"you need to do now is deploy them to GlassFish."
+"ends up in the example's <literal>ear/target</literal> directory. All you "
+"need to do now is deploy them to GlassFish."
 msgstr ""
 
 #. Tag: para
@@ -352,15 +352,15 @@
 msgid ""
 "After a few seconds you can visit the Admin Console in the browser at the "
 "URL <ulink url=\"http://localhost:4848\">http://localhost:4848</ulink>. In "
-"the tree on the left-hand side of the page, click on &#34;Applications&#34;, "
-"then click on the &#34;Deploy...&#34; button under the heading &#34;"
-"Applications&#34; and select the deployable artifact for either of the two "
-"examples. The deployer should recognize that you have selected a Java EE "
-"artifact and allow you to start it. You can see the examples running at "
-"either <ulink url=\"http://localhost:7070/weld-numberguess\">http://"
-"localhost:7070/weld-numberguess</ulink> or <ulink url=\"http://"
-"localhost:7070/weld-translator\">http://localhost:7070/weld-translator</"
-"ulink>, depending on which example you deployed."
+"the tree on the left-hand side of the page, click on \"Applications\", then "
+"click on the \"Deploy...\" button under the heading \"Applications\" and "
+"select the deployable artifact for either of the two examples. The deployer "
+"should recognize that you have selected a Java EE artifact and allow you to "
+"start it. You can see the examples running at either <ulink url=\"http://"
+"localhost:7070/weld-numberguess\">http://localhost:7070/weld-numberguess</"
+"ulink> or <ulink url=\"http://localhost:7070/weld-translator\">http://"
+"localhost:7070/weld-translator</ulink>, depending on which example you "
+"deployed."
 msgstr ""
 
 #. Tag: para
@@ -397,16 +397,16 @@
 "Weld comes with a servlet listener which bootstraps the CDI environment, "
 "registers the <literal>BeanManager</literal> in JNDI and provides injection "
 "into servlets. Basically, it emulates some of the work done by the Java EE "
-"container. (But you don&#39;t get enterprise features such as session beans "
-"and container-managed transactions.)"
+"container. (But you don't get enterprise features such as session beans and "
+"container-managed transactions.)"
 msgstr ""
 
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"Let&#39;s give the Weld servlet extension a spin on Apache Tomcat. First, "
-"you&#39;ll need to download Tomcat 6.0.18 or later from <ulink url=\"http://"
-"tomcat.apache.org/download-60.cgi\">tomcat.apache.org</ulink> and extract it."
+"Let's give the Weld servlet extension a spin on Apache Tomcat. First, you'll "
+"need to download Tomcat 6.0.18 or later from <ulink url=\"http://tomcat."
+"apache.org/download-60.cgi\">tomcat.apache.org</ulink> and extract it."
 msgstr ""
 "然后从<ulink url=\"http://seamframework.org/WebBeans\">seamframework.org</"
 "ulink>下载Web Beans的参考实现,然后解压。例如:"
@@ -417,8 +417,8 @@
 "You have two choices for how you can deploy the application to Tomcat. You "
 "can deploy it by pushing the artifact to the hot deploy directory using Ant "
 "or you can deploy to the server across HTTP using a Maven plugin. The Ant "
-"approach doesn&#39;t require that you have Maven installed, so we&#39;ll "
-"start there. If you want to use Maven, you can just skip ahead."
+"approach doesn't require that you have Maven installed, so we'll start "
+"there. If you want to use Maven, you can just skip ahead."
 msgstr ""
 
 #. Tag: title
@@ -432,14 +432,14 @@
 "In order for Ant to push the artifact to the Tomcat hot deploy directory, it "
 "needs to know where the Tomcat installation is located. Again, we need to "
 "set a property in the <literal>local.build.properties</literal> file in the "
-"examples directory of the Weld distribution. If you haven&#39;t yet created "
-"this file, do so now. Then assign the path of your Tomcat installation to "
-"the property key <literal>tomcat.home</literal>."
+"examples directory of the Weld distribution. If you haven't yet created this "
+"file, do so now. Then assign the path of your Tomcat installation to the "
+"property key <literal>tomcat.home</literal>."
 msgstr ""
 
 #. Tag: para
 #, fuzzy, no-c-format
-msgid "Now you&#39;re ready to deploy the numberguess example to Tomcat!"
+msgid "Now you're ready to deploy the numberguess example to Tomcat!"
 msgstr "部署猜数字(numberguess)例子:"
 
 #. Tag: para
@@ -454,7 +454,7 @@
 msgid ""
 "The Ant build script includes additional targets for Tomcat to deploy and "
 "undeploy the archive in either exploded or packaged format. They are the "
-"same target names used for JBoss AS, prefixed with &#34;tomcat.&#34;."
+"same target names used for JBoss AS, prefixed with \"tomcat.\"."
 msgstr ""
 
 #. Tag: para
@@ -487,7 +487,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"If you haven&#39;t already, start Tomcat. You can either start Tomcat from a "
+"If you haven't already, start Tomcat. You can either start Tomcat from a "
 "Linux shell:"
 msgstr ""
 
@@ -510,15 +510,15 @@
 #, no-c-format
 msgid ""
 "You can also deploy the application to Tomcat using Maven. This section is a "
-"bit more advanced, so skip it unless you&#39;re itching to use Maven "
-"natively. Of course, you&#39;ll first need to make sure that you have Maven "
-"installed on your path, similar to how you setup Ant."
+"bit more advanced, so skip it unless you're itching to use Maven natively. "
+"Of course, you'll first need to make sure that you have Maven installed on "
+"your path, similar to how you setup Ant."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
 msgid ""
-"The Maven plugin communicates with Tomcat over HTTP, so it doesn&#39;t care "
+"The Maven plugin communicates with Tomcat over HTTP, so it doesn't care "
 "where you have installed Tomcat. However, the plugin configuration assumes "
 "you are running Tomcat in its default configuration, with a hostname of "
 "localhost and port <literal>8080</literal>. The <literal>readme.txt</"
@@ -576,7 +576,7 @@
 #, no-c-format
 msgid ""
 "There are several other Maven goals that you can use if you are hacking on "
-"the example, which are documented in the example&#39;s <literal>readme.txt</"
+"the example, which are documented in the example's <literal>readme.txt</"
 "literal> file."
 msgstr ""
 
@@ -598,10 +598,10 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"If you&#39;ve read through the entire Tomcat section, then you&#39;re all "
-"ready to go. The Maven build parallels the embedded Tomcat deployment. If "
-"not, don&#39;t worry. We&#39;ll still go over everything that you need to "
-"know again in this section."
+"If you've read through the entire Tomcat section, then you're all ready to "
+"go. The Maven build parallels the embedded Tomcat deployment. If not, don't "
+"worry. We'll still go over everything that you need to know again in this "
+"section."
 msgstr ""
 
 #. Tag: para
@@ -610,7 +610,7 @@
 "The Maven POM (<literal>pom.xml</literal>) includes a profile named "
 "<literal>jetty</literal> that activates the Maven Jetty plugin, which you "
 "can use to start Jetty in embedded mode and deploy the application in place. "
-"You don&#39;t need anything else installed except to have the Maven command "
+"You don't need anything else installed except to have the Maven command "
 "(<literal>mvn</literal>) on your path. The rest will be downloaded from the "
 "internet when the build is run."
 msgstr ""
@@ -682,9 +682,9 @@
 #, no-c-format
 msgid ""
 "Now, you are ready to run the server in Eclipse. Import the project into "
-"your Eclipse workspace using &#34;Import Existing Project into Workspace. "
-"Then, find the start class in <literal>src/jetty/java</literal> and run its "
-"main method as a Java Application. Jetty will launch. You can view the "
+"your Eclipse workspace using \"Import Existing Project into Workspace. Then, "
+"find the start class in <literal>src/jetty/java</literal> and run its main "
+"method as a Java Application. Jetty will launch. You can view the "
 "application at the following local URL: <ulink url=\"http://localhost:8080"
 "\">http://localhost:8080</ulink>. Pay particular attention to the port in "
 "the URL and the lack of a trailing context path."

Modified: doc/trunk/reference/src/main/docbook/zh-CN/injection.po
===================================================================
--- doc/trunk/reference/src/main/docbook/zh-CN/injection.po	2010-07-24 16:36:48 UTC (rev 6808)
+++ doc/trunk/reference/src/main/docbook/zh-CN/injection.po	2010-07-25 04:22:37 UTC (rev 6809)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: master.xml\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-05-01T14:44:09\n"
+"POT-Creation-Date: 2010-07-25T03:52:14\n"
 "PO-Revision-Date: 2009-03-13 10:08+0800\n"
 "Last-Translator: Sean Wu <alartin at gmail.com>\n"
 "Language-Team: none\n"
@@ -101,7 +101,7 @@
 #, fuzzy, no-c-format
 msgid ""
 "Next, the container calls all initializer methods of bean (the call order is "
-"not portable, don&#39;t rely on it)."
+"not portable, don't rely on it)."
 msgstr "然后,Web Bean管理器调用这个Web Bean的初始化方法。"
 
 #. Tag: para
@@ -139,7 +139,7 @@
 msgid ""
 "This is a case where the <literal>@Inject</literal> annotation <emphasis>is "
 "not</emphasis> required at the injection point. The same is true for "
-"observer methods (which we&#39;ll meet in <xref linkend=\"events\" />) and "
+"observer methods (which we'll meet in <xref linkend=\"events\" />) and "
 "disposer methods."
 msgstr ""
 
@@ -154,9 +154,9 @@
 "The CDI specification defines a procedure, called <emphasis>typesafe "
 "resolution</emphasis>, that the container follows when identifying the bean "
 "to inject to an injection point. This algorithm looks complex at first, but "
-"once you understand it, it&#39;s really quite intuitive. Typesafe resolution "
-"is performed at system initialization time, which means that the container "
-"will inform the developer immediately if a bean&#39;s dependencies cannot be "
+"once you understand it, it's really quite intuitive. Typesafe resolution is "
+"performed at system initialization time, which means that the container will "
+"inform the developer immediately if a bean's dependencies cannot be "
 "satisfied."
 msgstr ""
 "Web Beans规范定义了一个称为 <emphasis>类型安全解析算法</emphasis>的过程,当在"
@@ -199,17 +199,17 @@
 #, no-c-format
 msgid ""
 "Obviously, if you have exactly one bean of a given type, and an injection "
-"point with that same type, then bean A is going to go into slot A. That&#39;"
-"s the simplest possible scenario. When you first start your application, "
-"you&#39;ll likely have lots of those."
+"point with that same type, then bean A is going to go into slot A. That's "
+"the simplest possible scenario. When you first start your application, "
+"you'll likely have lots of those."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
 msgid ""
-"But then, things start to get complicated. Let&#39;s explore how the "
-"container determines which bean to inject in more advanced cases. We&#39;ll "
-"start by taking a closer look at qualifiers."
+"But then, things start to get complicated. Let's explore how the container "
+"determines which bean to inject in more advanced cases. We'll start by "
+"taking a closer look at qualifiers."
 msgstr ""
 
 #. Tag: title
@@ -280,12 +280,12 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Now, you may be thinking, <emphasis>&#34;What&#39;s the different between "
-"using a qualifier and just specifying the exact implementation class you "
-"want?&#34;</emphasis> It&#39;s important to understand that a qualifier is "
-"like an extension of the interface. It does not create a direct dependency "
-"to any particular implementation. There may be multiple alterative "
-"implementations of <literal>@Asynchronous PaymentProcessor</literal>!"
+"Now, you may be thinking, <emphasis>\"What's the different between using a "
+"qualifier and just specifying the exact implementation class you want?\"</"
+"emphasis> It's important to understand that a qualifier is like an extension "
+"of the interface. It does not create a direct dependency to any particular "
+"implementation. There may be multiple alterative implementations of "
+"<literal>@Asynchronous PaymentProcessor</literal>!"
 msgstr ""
 
 #. Tag: title
@@ -302,12 +302,11 @@
 msgid ""
 "Whenever a bean or injection point does not explicitly declare a qualifier, "
 "the container assumes the qualifier <literal>@Default</literal>. From time "
-"to time, you&#39;ll need to decare an injection point without specifying a "
-"qualifier. There&#39;s a qualifier for that too. All beans have the "
-"qualifier <literal>@Any</literal>. Therefore, by explicitly specifying "
-"<literal>@Any</literal> at an injection point, you suppress the default "
-"qualifier, without otherwise restricting the beans that are eligible for "
-"injection."
+"to time, you'll need to decare an injection point without specifying a "
+"qualifier. There's a qualifier for that too. All beans have the qualifier "
+"<literal>@Any</literal>. Therefore, by explicitly specifying <literal>@Any</"
+"literal> at an injection point, you suppress the default qualifier, without "
+"otherwise restricting the beans that are eligible for injection."
 msgstr ""
 
 #. Tag: para
@@ -395,7 +394,7 @@
 "When an ambiguous dependency exists at an injection point, the container "
 "attempts to resolve the ambiguity by looking for an enabled alternative "
 "among the beans that could be injected. If there is exactly one enabled "
-"alternative, that&#39;s the bean that will be injected."
+"alternative, that's the bean that will be injected."
 msgstr ""
 
 #. Tag: title
@@ -419,8 +418,8 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"During the course of your development, you&#39;re going to encounter this "
-"situation. Let&#39;s learn how to resolve it."
+"During the course of your development, you're going to encounter this "
+"situation. Let's learn how to resolve it."
 msgstr ""
 
 #. Tag: para
@@ -494,7 +493,7 @@
 
 #. Tag: para
 #, no-c-format
-msgid "Just remember: &#34;There can be only one.&#34;"
+msgid "Just remember: \"There can be only one.\""
 msgstr ""
 
 #. Tag: para
@@ -502,14 +501,14 @@
 msgid ""
 "On the other hand, if you really do have an optional or multivalued "
 "injection point, you should change the type of your injection point to "
-"<literal>Instance</literal>, as we&#39;ll see in <xref linkend=\"lookup\" />."
+"<literal>Instance</literal>, as we'll see in <xref linkend=\"lookup\" />."
 msgstr ""
 
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"Now there&#39;s one more issue you need to be aware of when using the "
-"dependency injection service."
+"Now there's one more issue you need to be aware of when using the dependency "
+"injection service."
 msgstr "使用Web Bean依赖注入的时候还需要注意一个问题。"
 
 #. Tag: title
@@ -590,8 +589,7 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"classes which don&#39;t have a non-private constructor with no parameters, "
-"and"
+"classes which don't have a non-private constructor with no parameters, and"
 msgstr "没有无参非私有构造器的类,以及"
 
 #. Tag: para
@@ -611,7 +609,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"It&#39;s usually very easy to fix an unproxyable dependency problem. If an "
+"It's usually very easy to fix an unproxyable dependency problem. If an "
 "injection point of type <literal>X</literal> results in an unproxyable "
 "dependency, simply:"
 msgstr ""
@@ -624,7 +622,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"change the type of the injection point to <literal>Instance&#60;X&#62;</"
+"change the type of the injection point to <literal>Instance&lt;X&gt;</"
 "literal>,"
 msgstr ""
 
@@ -665,7 +663,7 @@
 
 #. Tag: para
 #, no-c-format
-msgid "But we didn&#39;t get around to implementing this yet."
+msgid "But we didn't get around to implementing this yet."
 msgstr ""
 
 #. Tag: title
@@ -756,11 +754,10 @@
 #, no-c-format
 msgid ""
 "Next, we need to obtain an instance of our qualifier type. Since annotatons "
-"are interfaces, we can&#39;t just write <literal>new Asynchronous()</"
-"literal>. It&#39;s also quite tedious to create a concrete implementation of "
-"an annotation type from scratch. Instead, CDI lets us obtain a qualifier "
-"instance by subclassing the helper class <literal>AnnotationLiteral</"
-"literal>."
+"are interfaces, we can't just write <literal>new Asynchronous()</literal>. "
+"It's also quite tedious to create a concrete implementation of an annotation "
+"type from scratch. Instead, CDI lets us obtain a qualifier instance by "
+"subclassing the helper class <literal>AnnotationLiteral</literal>."
 msgstr ""
 
 #. Tag: para
@@ -771,8 +768,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"We can&#39;t use an anonymous class to implement a qualifier type with "
-"members."
+"We can't use an anonymous class to implement a qualifier type with members."
 msgstr ""
 
 #. Tag: para
@@ -832,8 +828,8 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"Let&#39;s look at an example. The following code is verbose, and vulnerable "
-"to refactoring problems:"
+"Let's look at an example. The following code is verbose, and vulnerable to "
+"refactoring problems:"
 msgstr "我们看一个例子。下面的代码很冗长脆弱,有重构问题:"
 
 #. Tag: para
@@ -853,8 +849,8 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"Not convinced? Then here&#39;s a second example. To inject HTTP parameters, "
-"we need to define a qualifier type:"
+"Not convinced? Then here's a second example. To inject HTTP parameters, we "
+"need to define a qualifier type:"
 msgstr "没被说服?我们还有第二个例子。要注入HTTP参数,我们需要定一个绑定类型:"
 
 #. Tag: para

Modified: doc/trunk/reference/src/main/docbook/zh-CN/interceptors.po
===================================================================
--- doc/trunk/reference/src/main/docbook/zh-CN/interceptors.po	2010-07-24 16:36:48 UTC (rev 6808)
+++ doc/trunk/reference/src/main/docbook/zh-CN/interceptors.po	2010-07-25 04:22:37 UTC (rev 6809)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: master.xml\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-05-01T13:53:43\n"
+"POT-Creation-Date: 2010-07-25T03:52:14\n"
 "PO-Revision-Date: 2009-03-13 13:15+0800\n"
 "Last-Translator: Sean Wu <alartin at gmail.com>\n"
 "Language-Team: none\n"
@@ -91,7 +91,7 @@
 msgid ""
 "Suppose we want to declare that some of our beans are transactional. The "
 "first thing we need is an <emphasis>interceptor binding type</emphasis> to "
-"specify exactly which beans we&#39;re interested in:"
+"specify exactly which beans we're interested in:"
 msgstr ""
 "假定我们想声明我们的某些Web Beans是事务性的。我们要做的第一个事情就是需要一"
 "个 <emphasis>拦截器绑定注释</emphasis> 以便指定哪些Web Beans是事务性的:"
@@ -118,9 +118,9 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"That&#39;s great, but somewhere along the line we&#39;re going to have to "
-"actually implement the interceptor that provides this transaction management "
-"aspect. All we need to do is create a standard interceptor, and annotate it "
+"That's great, but somewhere along the line we're going to have to actually "
+"implement the interceptor that provides this transaction management aspect. "
+"All we need to do is create a standard interceptor, and annotate it "
 "<literal>@Interceptor</literal> and <literal>@Transactional</literal>."
 msgstr ""
 "很好,但是在代码中有些地方需要我们实现提供事务管理的拦截器。我们需要做的事情"

Modified: doc/trunk/reference/src/main/docbook/zh-CN/intro.po
===================================================================
--- doc/trunk/reference/src/main/docbook/zh-CN/intro.po	2010-07-24 16:36:48 UTC (rev 6808)
+++ doc/trunk/reference/src/main/docbook/zh-CN/intro.po	2010-07-25 04:22:37 UTC (rev 6809)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: master.xml\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-05-01T13:53:43\n"
+"POT-Creation-Date: 2010-07-25T03:52:14\n"
 "PO-Revision-Date: 2009-03-30 09:14+0800\n"
 "Last-Translator: Sean Wu <alartin at gmail.com>\n"
 "Language-Team: none\n"
@@ -21,11 +21,11 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"So you&#39;re keen to get started writing your first bean? Or perhaps "
-"you&#39;re skeptical, wondering what kinds of hoops the CDI specification "
-"will make you jump through! The good news is that you&#39;ve probably "
-"already written and used hundreds, perhaps thousands of beans. CDI just "
-"makes it easier to actually use them to build an application!"
+"So you're keen to get started writing your first bean? Or perhaps you're "
+"skeptical, wondering what kinds of hoops the CDI specification will make you "
+"jump through! The good news is that you've probably already written and used "
+"hundreds, perhaps thousands of beans. CDI just makes it easier to actually "
+"use them to build an application!"
 msgstr ""
 "你是否已经迫不及待想要开始编写你的第一个Web Bean了?或许,你仍旧抱有怀疑态"
 "度,想要知道Web Beans规范会给出什么样的圈套让你跳。好消息是你也许已经编写并且"
@@ -47,14 +47,13 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Prior to Java EE 6, there was no clear definition of the term &#34;bean&#34; "
-"in the Java EE platform. Of course, we&#39;ve been calling Java classes used "
-"in web and enterprise applications &#34;beans&#34; for years. There were "
-"even a couple of different kinds of things called &#34;beans&#34; in EE "
-"specifications, including EJB beans and JSF managed beans. Meanwhile, other "
-"third-party frameworks such as Spring and Seam introduced their own ideas of "
-"what it meant to be a &#34;bean&#34;. What we&#39;ve been missing is a "
-"common definition."
+"Prior to Java EE 6, there was no clear definition of the term \"bean\" in "
+"the Java EE platform. Of course, we've been calling Java classes used in web "
+"and enterprise applications \"beans\" for years. There were even a couple of "
+"different kinds of things called \"beans\" in EE specifications, including "
+"EJB beans and JSF managed beans. Meanwhile, other third-party frameworks "
+"such as Spring and Seam introduced their own ideas of what it meant to be a "
+"\"bean\". What we've been missing is a common definition."
 msgstr ""
 
 #. Tag: para
@@ -66,8 +65,8 @@
 "Old Java Object). They support a small set of basic services, such as "
 "resource injection, lifecycle callbacks and interceptors. Companion "
 "specifications, such as EJB and CDI, build on this basic model. But, "
-"<emphasis>at last</emphasis>, there&#39;s a uniform concept of a bean and a "
-"lightweight component model that&#39;s aligned across the Java EE platform."
+"<emphasis>at last</emphasis>, there's a uniform concept of a bean and a "
+"lightweight component model that's aligned across the Java EE platform."
 msgstr ""
 
 #. Tag: para
@@ -76,31 +75,30 @@
 "With very few exceptions, almost every concrete Java class that has a "
 "constructor with no parameters (or a constructor designated with the "
 "annotation <literal>@Inject</literal>) is a bean. This includes every "
-"JavaBean and every EJB session bean. If you&#39;ve already got some "
-"JavaBeans or session beans lying around, they&#39;re already beans—you "
-"won&#39;t need any additional special metadata. There&#39;s just little one "
-"thing you need to do before you can start injecting them into stuff: you "
-"need to put them in an archive (a jar, or a Java EE module such as a war or "
-"EJB jar) that contains a special marker file: <literal>META-INF/beans.xml</"
-"literal>."
+"JavaBean and every EJB session bean. If you've already got some JavaBeans or "
+"session beans lying around, they're already beans—you won't need any "
+"additional special metadata. There's just little one thing you need to do "
+"before you can start injecting them into stuff: you need to put them in an "
+"archive (a jar, or a Java EE module such as a war or EJB jar) that contains "
+"a special marker file: <literal>META-INF/beans.xml</literal>."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
 msgid ""
-"The JavaBeans and EJBs you&#39;ve been writing every day, up until now, have "
-"not been able to take advantage of the new services defined by the CDI "
-"specification. But you&#39;ll be able to use every one of them with CDI—"
-"allowing the container to create and destroy instances of your beans and "
-"associate them with a designated context, injecting them into other beans, "
-"using them in EL expressions, specializing them with qualifier annotations, "
-"even adding interceptors and decorators to them—without modifying your "
-"existing code. At most, you&#39;ll need to add some annotations."
+"The JavaBeans and EJBs you've been writing every day, up until now, have not "
+"been able to take advantage of the new services defined by the CDI "
+"specification. But you'll be able to use every one of them with CDI—allowing "
+"the container to create and destroy instances of your beans and associate "
+"them with a designated context, injecting them into other beans, using them "
+"in EL expressions, specializing them with qualifier annotations, even adding "
+"interceptors and decorators to them—without modifying your existing code. At "
+"most, you'll need to add some annotations."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Now let&#39;s see how to create your first bean that actually uses CDI."
+msgid "Now let's see how to create your first bean that actually uses CDI."
 msgstr ""
 
 #. Tag: title
@@ -111,7 +109,7 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"Suppose that we have two existing Java classes that we&#39;ve been using for "
+"Suppose that we have two existing Java classes that we've been using for "
 "years in various applications. The first class parses a string into a list "
 "of sentences:"
 msgstr ""
@@ -136,8 +134,8 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"Unfortunately, we don&#39;t have a class that translates whole text "
-"documents. So let&#39;s write a bean for this job:"
+"Unfortunately, we don't have a class that translates whole text documents. "
+"So let's write a bean for this job:"
 msgstr ""
 "不幸的是,我们没有Java类能够翻译整个文档。因此,让我们写一个Web Bean来做这个"
 "工作:"
@@ -157,11 +155,11 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"As you&#39;ve guessed, the <literal>@Inject</literal> annotation has "
-"something to do with dependency injection! <literal>@Inject</literal> may be "
-"applied to a constructor or method of a bean, and tells the container to "
-"call that constructor or method when instantiating the bean. The container "
-"will inject other beans into the parameters of the constructor or method."
+"As you've guessed, the <literal>@Inject</literal> annotation has something "
+"to do with dependency injection! <literal>@Inject</literal> may be applied "
+"to a constructor or method of a bean, and tells the container to call that "
+"constructor or method when instantiating the bean. The container will inject "
+"other beans into the parameters of the constructor or method."
 msgstr ""
 "就像你猜到的一样, <literal>@Initializer</literal>注释和依赖注入有关! "
 "<literal>@Initializer</literal>可以应用到一个Web Bean的构造器或者方法上,它告"
@@ -181,7 +179,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Let&#39;s create a UI controller bean that uses field injection to obtain an "
+"Let's create a UI controller bean that uses field injection to obtain an "
 "instance of the <literal>TextTranslator</literal>, translating the text "
 "entered by a user:"
 msgstr ""
@@ -195,10 +193,10 @@
 #, no-c-format
 msgid ""
 "Notice the controller bean is request-scoped and named. Since this "
-"combination is so common in web applications, there&#39;s a built-in "
-"annotation for it in CDI that we could have used as a shorthand. When the "
-"(stereotype) annotation <literal>@Model</literal> is declared on a class, it "
-"creates a request-scoped and named bean."
+"combination is so common in web applications, there's a built-in annotation "
+"for it in CDI that we could have used as a shorthand. When the (stereotype) "
+"annotation <literal>@Model</literal> is declared on a class, it creates a "
+"request-scoped and named bean."
 msgstr ""
 
 #. Tag: para
@@ -214,11 +212,11 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Notice that it isn&#39;t necessary to create a getter or setter method to "
-"inject one bean into another. CDI can access an injected field directly "
-"(even if it&#39;s private!), which sometimes helps eliminate some wasteful "
-"code. The name of the field is arbitrary. It&#39;s the field&#39;s type that "
-"determines what is injected."
+"Notice that it isn't necessary to create a getter or setter method to inject "
+"one bean into another. CDI can access an injected field directly (even if "
+"it's private!), which sometimes helps eliminate some wasteful code. The name "
+"of the field is arbitrary. It's the field's type that determines what is "
+"injected."
 msgstr ""
 
 #. Tag: para
@@ -242,10 +240,10 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Before we get too deep in the details, let&#39;s pause and examine a "
-"bean&#39;s anatomy. What aspects of the bean are significant, and what gives "
-"it its identity? Instead of just giving examples of beans, we&#39;re going "
-"to define what <emphasis>makes</emphasis> something a bean."
+"Before we get too deep in the details, let's pause and examine a bean's "
+"anatomy. What aspects of the bean are significant, and what gives it its "
+"identity? Instead of just giving examples of beans, we're going to define "
+"what <emphasis>makes</emphasis> something a bean."
 msgstr ""
 
 #, fuzzy

Modified: doc/trunk/reference/src/main/docbook/zh-CN/master.po
===================================================================
--- doc/trunk/reference/src/main/docbook/zh-CN/master.po	2010-07-24 16:36:48 UTC (rev 6808)
+++ doc/trunk/reference/src/main/docbook/zh-CN/master.po	2010-07-25 04:22:37 UTC (rev 6809)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: master.xml\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-05-01T13:53:43\n"
+"POT-Creation-Date: 2010-07-25T03:52:14\n"
 "PO-Revision-Date: 2009-03-27 13:37+0800\n"
 "Last-Translator: Sean Wu <alartin at gmail.com>\n"
 "Language-Team: none\n"
@@ -22,20 +22,20 @@
 #, no-c-format
 msgid ""
 "Shortly before the final draft of JSR-299 was submitted, the specification "
-"changed its name from &#34;Web Beans&#34; to &#34;Java Contexts and "
-"Dependency Injection for the Java EE platform&#34;, abbreviated CDI. For a "
-"brief period after the renaming, the reference implementation adopted the "
-"name &#34;Web Beans&#34;. However, this ended up causing more confusion than "
-"it solved and Red Hat decided to change the name of the reference "
-"implementation to &#34;Weld&#34;. You may still find other documentation, "
-"blogs, forum posts, etc. that use the old nomenclature. Please update any "
-"references you can. The naming game is over."
+"changed its name from \"Web Beans\" to \"Java Contexts and Dependency "
+"Injection for the Java EE platform\", abbreviated CDI. For a brief period "
+"after the renaming, the reference implementation adopted the name \"Web Beans"
+"\". However, this ended up causing more confusion than it solved and Red Hat "
+"decided to change the name of the reference implementation to \"Weld\". You "
+"may still find other documentation, blogs, forum posts, etc. that use the "
+"old nomenclature. Please update any references you can. The naming game is "
+"over."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
 msgid ""
-"You&#39;ll also find that some of the functionality that once existed in the "
+"You'll also find that some of the functionality that once existed in the "
 "specification is now missing, such as defining beans in XML. These features "
 "will be available as portable extensions for CDI in the Weld project, and "
 "perhaps other implementations."
@@ -45,11 +45,11 @@
 #, no-c-format
 msgid ""
 "Note that this reference guide was started while changes were still being "
-"made to the specification. We&#39;ve done our best to update it for "
-"accuracy. If you discover a conflict between what is written in this guide "
-"and the specification, the specification is the authority—assume it is "
-"correct. If you believe you have found an error in the specification, please "
-"report it to the JSR-299 EG."
+"made to the specification. We've done our best to update it for accuracy. If "
+"you discover a conflict between what is written in this guide and the "
+"specification, the specification is the authority—assume it is correct. If "
+"you believe you have found an error in the specification, please report it "
+"to the JSR-299 EG."
 msgstr ""
 
 #. Tag: title

Modified: doc/trunk/reference/src/main/docbook/zh-CN/next.po
===================================================================
--- doc/trunk/reference/src/main/docbook/zh-CN/next.po	2010-07-24 16:36:48 UTC (rev 6808)
+++ doc/trunk/reference/src/main/docbook/zh-CN/next.po	2010-07-25 04:22:37 UTC (rev 6809)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: master.xml\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-05-01T13:53:43\n"
+"POT-Creation-Date: 2010-07-25T03:52:14\n"
 "PO-Revision-Date: 2008-12-23 16:53+0800\n"
 "Last-Translator: Sean Wu <alartin at gmail.com>\n"
 "Language-Team: none\n"
@@ -21,13 +21,13 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Because CDI is so new, there&#39;s not yet a lot of information available "
+"Because CDI is so new, there's not yet a lot of information available "
 "online. That will change over time. Regardless, the CDI specification "
 "remains the authority for information on CDI. The spec is less than 100 "
-"pages and is quite readable (don&#39;t worry, it&#39;s not like your Blu-ray "
-"player manual). Of course, it covers many details we&#39;ve skipped over "
-"here. The spec is available on the <ulink url=\"http://jcp.org/en/jsr/detail?"
-"id=299\">JSR-299 page</ulink> at the JCP website."
+"pages and is quite readable (don't worry, it's not like your Blu-ray player "
+"manual). Of course, it covers many details we've skipped over here. The spec "
+"is available on the <ulink url=\"http://jcp.org/en/jsr/detail?id=299\">JSR-"
+"299 page</ulink> at the JCP website."
 msgstr ""
 
 #. Tag: para
@@ -37,8 +37,8 @@
 "\"http://seamframework.org/Weld\">Seam project</ulink>. The RI development "
 "team and the CDI spec lead blog at <ulink url=\"http://in.relation.to\">in."
 "relation.to</ulink>. This guide was originally based on a series of blog "
-"entries published there while the specification was being developed. It&#39;"
-"s probably the best source of information about the future of CDI, Weld and "
+"entries published there while the specification was being developed. It's "
+"probably the best source of information about the future of CDI, Weld and "
 "Seam."
 msgstr ""
 "Web Bean参考实现正在<literal>http://seamframework.org/WebBeans</literal>项目"
@@ -74,8 +74,8 @@
 #, no-c-format
 msgid ""
 "Edit the <literal>pom.xml</literal> file in the root of the checkout and "
-"remove the &#34;<literal>-SNAPSHOT</literal>&#34; from the version element "
-"(so you don&#39;t have to build other Weld modules)."
+"remove the \"<literal>-SNAPSHOT</literal>\" from the version element (so you "
+"don't have to build other Weld modules)."
 msgstr ""
 
 #. Tag: para

Modified: doc/trunk/reference/src/main/docbook/zh-CN/part1.po
===================================================================
--- doc/trunk/reference/src/main/docbook/zh-CN/part1.po	2010-07-24 16:36:48 UTC (rev 6808)
+++ doc/trunk/reference/src/main/docbook/zh-CN/part1.po	2010-07-25 04:22:37 UTC (rev 6809)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: master.xml\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-05-01T13:53:43\n"
+"POT-Creation-Date: 2010-07-25T03:52:14\n"
 "PO-Revision-Date: 2008-12-22 10:45+0800\n"
 "Last-Translator: Sean Wu <alartin at gmail.com>\n"
 "Language-Team: none\n"
@@ -169,7 +169,7 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"Where should I keep the reference to it when I&#39;m not currently using it?"
+"Where should I keep the reference to it when I'm not currently using it?"
 msgstr "当我不再直接使用它的时候,我需要将它的引用保存到哪里?"
 
 #. Tag: para
@@ -187,9 +187,9 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"CDI is more than a framework. It&#39;s a whole, rich programming model. The "
+"CDI is more than a framework. It's a whole, rich programming model. The "
 "<emphasis>theme</emphasis> of CDI is <emphasis>loose-coupling with strong "
-"typing</emphasis>. Let&#39;s study what that phrase means."
+"typing</emphasis>. Let's study what that phrase means."
 msgstr ""
 
 #. Tag: para
@@ -239,8 +239,8 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"What&#39;s even more powerful (and comforting) is that CDI provides all "
-"these facilities in a <emphasis>typesafe</emphasis> way. CDI never relies on "
+"What's even more powerful (and comforting) is that CDI provides all these "
+"facilities in a <emphasis>typesafe</emphasis> way. CDI never relies on "
 "string-based identifiers to determine how collaborating objects fit "
 "together. Instead, CDI uses the typing information that is already available "
 "in the Java object model, augmented using a new programming pattern, called "
@@ -258,10 +258,10 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"But CDI isn&#39;t a restrictive programming model. It doesn&#39;t tell you "
-"how you should to structure your application into layers, how you should "
-"handle persistence, or what web framework you have to use. You&#39;ll have "
-"to decide those kinds of things for yourself."
+"But CDI isn't a restrictive programming model. It doesn't tell you how you "
+"should to structure your application into layers, how you should handle "
+"persistence, or what web framework you have to use. You'll have to decide "
+"those kinds of things for yourself."
 msgstr ""
 
 #. Tag: para
@@ -282,8 +282,8 @@
 "CDI was influenced by a number of existing Java frameworks, including Seam, "
 "Guice and Spring. However, CDI has its own, very distinct, character: more "
 "typesafe than Seam, more stateful and less XML-centric than Spring, more web "
-"and enterprise-application capable than Guice. But it couldn&#39;t have been "
-"any of these without inspiration from the frameworks mentioned and "
+"and enterprise-application capable than Guice. But it couldn't have been any "
+"of these without inspiration from the frameworks mentioned and "
 "<emphasis>lots</emphasis> of collaboration and hard work by the JSR-299 "
 "Expert Group (EG)."
 msgstr ""

Modified: doc/trunk/reference/src/main/docbook/zh-CN/part3.po
===================================================================
--- doc/trunk/reference/src/main/docbook/zh-CN/part3.po	2010-07-24 16:36:48 UTC (rev 6808)
+++ doc/trunk/reference/src/main/docbook/zh-CN/part3.po	2010-07-25 04:22:37 UTC (rev 6809)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: master.xml\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-05-01T13:53:43\n"
+"POT-Creation-Date: 2010-07-25T03:52:14\n"
 "PO-Revision-Date: 2008-12-23 17:29+0800\n"
 "Last-Translator: Sean Wu <alartin at gmail.com>\n"
 "Language-Team: none\n"
@@ -16,8 +16,8 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"The first major theme of CDI is <emphasis>loose coupling</emphasis>. We&#39;"
-"ve already seen three means of achieving loose coupling:"
+"The first major theme of CDI is <emphasis>loose coupling</emphasis>. We've "
+"already seen three means of achieving loose coupling:"
 msgstr ""
 
 #. Tag: para
@@ -100,10 +100,10 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"You don&#39;t see string-based identifiers in CDI code, not because the "
+"You don't see string-based identifiers in CDI code, not because the "
 "framework is hiding them from you using clever defaulting rules—so-called "
-"&#34;configuration by convention&#34;—but because there are simply no "
-"strings there to begin with!"
+"\"configuration by convention\"—but because there are simply no strings "
+"there to begin with!"
 msgstr ""
 "在Web Bean代码中,你不会看到基于字符串的标识符。这不是因为这个框架使用智能默"
 "认规则 &#151; 也叫\"按惯例配置\" &#151; 将它们隐藏起来,这是因为从开始就没有"
@@ -204,11 +204,11 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"We&#39;re now ready to meet some more advanced features of CDI. Bear in mind "
+"We're now ready to meet some more advanced features of CDI. Bear in mind "
 "that these features exist to make our code both easier to validate and more "
-"understandable. Most of the time you don&#39;t ever really <emphasis>need</"
-"emphasis> to use these features, but if you use them wisely, you&#39;ll come "
-"to appreciate their power."
+"understandable. Most of the time you don't ever really <emphasis>need</"
+"emphasis> to use these features, but if you use them wisely, you'll come to "
+"appreciate their power."
 msgstr ""
 "我们现在可以接触Web Bean中更加高级的特性了。要记住这些特性能够让我们的代码不"
 "仅更容易验证,也更容易理解。大部分时间,你根本不<emphasis>需要</emphasis>这些"

Modified: doc/trunk/reference/src/main/docbook/zh-CN/part4.po
===================================================================
--- doc/trunk/reference/src/main/docbook/zh-CN/part4.po	2010-07-24 16:36:48 UTC (rev 6808)
+++ doc/trunk/reference/src/main/docbook/zh-CN/part4.po	2010-07-25 04:22:37 UTC (rev 6809)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: master.xml\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-05-01T13:53:43\n"
+"POT-Creation-Date: 2010-07-25T03:52:14\n"
 "PO-Revision-Date: 2008-12-23 17:48+0800\n"
 "Last-Translator: Sean Wu <alartin at gmail.com>\n"
 "Language-Team: none\n"
@@ -16,12 +16,12 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"The third theme of CDI is <emphasis>integration</emphasis>. We&#39;ve "
-"already seen how CDI helps integrate EJB and JSF, allowing EJBs to be bound "
-"directly to JSF pages. That&#39;s just the beginning. The CDI services are "
-"integrated into the very core of the Java EE platform. Even EJB session "
-"beans can take advantage of the dependency injection, event bus, and "
-"contextual lifecycle management that CDI provides."
+"The third theme of CDI is <emphasis>integration</emphasis>. We've already "
+"seen how CDI helps integrate EJB and JSF, allowing EJBs to be bound directly "
+"to JSF pages. That's just the beginning. The CDI services are integrated "
+"into the very core of the Java EE platform. Even EJB session beans can take "
+"advantage of the dependency injection, event bus, and contextual lifecycle "
+"management that CDI provides."
 msgstr ""
 
 #. Tag: para
@@ -49,12 +49,12 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"We&#39;re about to see how to take full advantage of the Java EE platform in "
-"an application that uses CDI. We&#39;ll also briefly meet a set of SPIs that "
-"are provided to support portable extensions to CDI. You might not ever need "
-"to use these SPIs directly, but don&#39;t take them for granted. You will "
-"likely be using them indirectly, every time you use a third-party extension, "
-"such as Seam."
+"We're about to see how to take full advantage of the Java EE platform in an "
+"application that uses CDI. We'll also briefly meet a set of SPIs that are "
+"provided to support portable extensions to CDI. You might not ever need to "
+"use these SPIs directly, but don't take them for granted. You will likely be "
+"using them indirectly, every time you use a third-party extension, such as "
+"Seam."
 msgstr ""
 "我们已经看到了如何在应用中使用Web Bean来充分利用Java EE平台。我们也粗略地看到"
 "了一些能够支持Web Bean的便携性扩展点的SPI。你也许永远不回直接使用这些SPI,但"

Modified: doc/trunk/reference/src/main/docbook/zh-CN/producermethods.po
===================================================================
--- doc/trunk/reference/src/main/docbook/zh-CN/producermethods.po	2010-07-24 16:36:48 UTC (rev 6808)
+++ doc/trunk/reference/src/main/docbook/zh-CN/producermethods.po	2010-07-25 04:22:37 UTC (rev 6809)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: master.xml\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-05-01T13:53:43\n"
+"POT-Creation-Date: 2010-07-25T03:52:15\n"
 "PO-Revision-Date: 2009-03-12 11:20+0800\n"
 "Last-Translator: Sean Wu <alartin at gmail.com>\n"
 "Language-Team: none\n"
@@ -23,7 +23,7 @@
 msgid ""
 "Producer methods let us overcome certain limitations that arise when a "
 "container, instead of the application, is responsible for instantiating "
-"objects. They&#39;re also the easiest way to integrate objects which are not "
+"objects. They're also the easiest way to integrate objects which are not "
 "beans into the CDI environment."
 msgstr ""
 "生产者方法能够让我们克服使用Web Bean管理器代替应用来负责实例化对象所带来的特"
@@ -88,9 +88,9 @@
 #, no-c-format
 msgid ""
 "In particular, producer methods let us use runtime polymorphism with CDI. As "
-"we&#39;ve seen, alternative beans are one solution to the problem of "
-"deployment-time polymorphism. But once the system is deployed, the CDI "
-"implementation is fixed. A producer method has no such limitation:"
+"we've seen, alternative beans are one solution to the problem of deployment-"
+"time polymorphism. But once the system is deployed, the CDI implementation "
+"is fixed. A producer method has no such limitation:"
 msgstr ""
 
 #. Tag: para
@@ -140,7 +140,7 @@
 msgid ""
 "Now, when the producer method is called, the returned "
 "<literal>PaymentStrategy</literal> will be bound to the session context. The "
-"producer method won&#39;t be called again in the same session."
+"producer method won't be called again in the same session."
 msgstr ""
 "现在,当这个生产者方法被调用时,它返回的 <literal>PaymentStrategy</literal> "
 "对象将被绑定到会话上下文中。这个生产者方法在同一个会话范围中不会被再次调用。"
@@ -165,11 +165,11 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"There&#39;s one potential problem with the code above. The implementations "
-"of <literal>CreditCardPaymentStrategy</literal> are instantiated using the "
-"Java <literal>new</literal> operator. Objects instantiated directly by the "
-"application can&#39;t take advantage of dependency injection and don&#39;t "
-"have interceptors."
+"There's one potential problem with the code above. The implementations of "
+"<literal>CreditCardPaymentStrategy</literal> are instantiated using the Java "
+"<literal>new</literal> operator. Objects instantiated directly by the "
+"application can't take advantage of dependency injection and don't have "
+"interceptors."
 msgstr ""
 "上面的代码有一个潜在的问题。 <literal>CreditCardPaymentStrategy</literal> 的"
 "实现使用Java的 <literal>new</literal> 操作符来实例化。应用直接实例化的对象无"
@@ -178,7 +178,7 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"If this isn&#39;t what we want, we can use dependency injection into the "
+"If this isn't what we want, we can use dependency injection into the "
 "producer method to obtain bean instances:"
 msgstr ""
 "如果这不是我们想要的,我们可以对生产者方法使用依赖注入来获得Web Bean实例:"
@@ -187,13 +187,13 @@
 #, fuzzy, no-c-format
 msgid ""
 "Wait, what if <literal>CreditCardPaymentStrategy</literal> is a request-"
-"scoped bean? Then the producer method has the effect of &#34;promoting&#34; "
-"the current request scoped instance into session scope. This is almost "
-"certainly a bug! The request scoped object will be destroyed by the "
-"container before the session ends, but the reference to the object will be "
-"left &#34;hanging&#34; in the session scope. This error will <emphasis>not</"
-"emphasis> be detected by the container, so please take extra care when "
-"returning bean instances from producer methods!"
+"scoped bean? Then the producer method has the effect of \"promoting\" the "
+"current request scoped instance into session scope. This is almost certainly "
+"a bug! The request scoped object will be destroyed by the container before "
+"the session ends, but the reference to the object will be left \"hanging\" "
+"in the session scope. This error will <emphasis>not</emphasis> be detected "
+"by the container, so please take extra care when returning bean instances "
+"from producer methods!"
 msgstr ""
 "等一下,如果 <literal>CreditCardPaymentStrategy</literal> 是一个请求范围的"
 "Web Bean,那会怎样?生产者方法将会把当前请求范围的实例\"提升\"到会话范围。这"
@@ -204,7 +204,7 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"There&#39;s at least three ways we could go about fixing this bug. We could "
+"There's at least three ways we could go about fixing this bug. We could "
 "change the scope of the <literal>CreditCardPaymentStrategy</literal> "
 "implementation, but this would affect other clients of that bean. A better "
 "option would be to change the scope of the producer method to "
@@ -238,7 +238,7 @@
 "Then a new <emphasis>dependent</emphasis> instance of "
 "<literal>CreditCardPaymentStrategy</literal> will be created, passed to the "
 "producer method, returned by the producer method and finally bound to the "
-"session context. The dependent object won&#39;t be destroyed until the "
+"session context. The dependent object won't be destroyed until the "
 "<literal>Preferences</literal> object is destroyed, at the end of the "
 "session."
 msgstr ""

Modified: doc/trunk/reference/src/main/docbook/zh-CN/resources.po
===================================================================
--- doc/trunk/reference/src/main/docbook/zh-CN/resources.po	2010-07-24 16:36:48 UTC (rev 6808)
+++ doc/trunk/reference/src/main/docbook/zh-CN/resources.po	2010-07-25 04:22:37 UTC (rev 6809)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: Weld_-_JSR-299_Reference_Implementation VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-05-01T13:53:43\n"
+"POT-Creation-Date: 2010-07-25T03:52:15\n"
 "PO-Revision-Date: 2009-11-11 15:00+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -34,8 +34,8 @@
 "injection in CDI. Most notably, component environment injection relies on "
 "string-based names to qualify ambiguous types, and there is no real "
 "consistency as to the nature of the names (sometimes a JNDI name, sometimes "
-"a persistence unit name, sometimes an EJB link, sometimes a nonportable &#34;"
-"mapped name&#34;). Producer fields turned out to be an elegant adaptor to "
+"a persistence unit name, sometimes an EJB link, sometimes a nonportable "
+"\"mapped name\"). Producer fields turned out to be an elegant adaptor to "
 "reduce all this complexity to a common model and get component environment "
 "resources to participate in the CDI system just like any other kind of bean."
 msgstr ""
@@ -127,10 +127,10 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"It might feel strange to be declaring resources in Java code. Isn&#39;t this "
-"stuff that might be deployment-specific? Certainly, and that&#39;s why it "
-"makes sense to declare your resources in a class annotated "
-"<literal>@Alternative</literal>."
+"It might feel strange to be declaring resources in Java code. Isn't this "
+"stuff that might be deployment-specific? Certainly, and that's why it makes "
+"sense to declare your resources in a class annotated <literal>@Alternative</"
+"literal>."
 msgstr ""
 
 #. Tag: title
@@ -156,9 +156,9 @@
 "It might seem like a pain to have to write these extra producer field "
 "declarations, just to gain an additional level of indirection. You could "
 "just as well use component environment injection directly, right? But "
-"remember that you&#39;re going to be using resources like the "
-"<literal>EntityManager</literal> in several different beans. Isn&#39;t it "
-"nicer and more typesafe to write"
+"remember that you're going to be using resources like the "
+"<literal>EntityManager</literal> in several different beans. Isn't it nicer "
+"and more typesafe to write"
 msgstr ""
 
 #. Tag: para

Modified: doc/trunk/reference/src/main/docbook/zh-CN/ri-spi.po
===================================================================
--- doc/trunk/reference/src/main/docbook/zh-CN/ri-spi.po	2010-07-24 16:36:48 UTC (rev 6808)
+++ doc/trunk/reference/src/main/docbook/zh-CN/ri-spi.po	2010-07-25 04:22:37 UTC (rev 6809)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: master.xml\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-05-01T13:53:43\n"
+"POT-Creation-Date: 2010-07-25T03:52:15\n"
 "PO-Revision-Date: 2009-03-27 13:50+0800\n"
 "Last-Translator: Sean Wu <alartin at gmail.com>\n"
 "Language-Team: none\n"
@@ -37,8 +37,8 @@
 "If you just want to use managed beans, and not take advantage of enterprise "
 "services (EE resource injection, CDI injection into EE component classes, "
 "transactional events, support for CDI services in EJBs) and non-flat "
-"deployments, then the generic servlet support provided by the &#34;Weld: "
-"Servlets&#34; extension will be sufficient, and will work in any container "
+"deployments, then the generic servlet support provided by the \"Weld: "
+"Servlets\" extension will be sufficient, and will work in any container "
 "supporting the Servlet API."
 msgstr ""
 
@@ -83,8 +83,8 @@
 "implementation of the <literal>Environment</literal> interface. A number of "
 "standard environments are built in, and described by the "
 "<literal>Environments</literal> enumeration. Different environments require "
-"different services to be present (for example a Servlet container doesn&#39;"
-"t require transaction, EJB or JPA services). By default an EE environment is "
+"different services to be present (for example a Servlet container doesn't "
+"require transaction, EJB or JPA services). By default an EE environment is "
 "assumed, but you can adjust the environment by calling <literal>bootstrap."
 "setEnvironment()</literal>."
 msgstr ""
@@ -163,7 +163,7 @@
 "BDAs it can access. However many containers will allow an easy mechanism to "
 "make BDAs bi-directionally accessible (such as a library directory). In this "
 "case, it is allowable (and reasonable) to describe all such archives as a "
-"single, &#39;virtual&#39; <literal>BeanDeploymentArchive</literal>."
+"single, 'virtual' <literal>BeanDeploymentArchive</literal>."
 msgstr ""
 
 #. Tag: para
@@ -178,7 +178,7 @@
 #, no-c-format
 msgid ""
 "<literal>BeanDeploymentArchive</literal> provides three methods which allow "
-"it&#39;s contents to be discovered by Weld—<literal>BeanDeploymentArchive."
+"it's contents to be discovered by Weld—<literal>BeanDeploymentArchive."
 "getBeanClasses()</literal> must return all the classes in the BDA, "
 "<literal>BeanDeploymentArchive.getBeansXml()</literal> must return all the "
 "deployment descriptors in the archive, and <literal>BeanDeploymentArchive."
@@ -207,7 +207,7 @@
 "In practice, you can regard the deployment structure represented by "
 "<literal>Deployment</literal>, and the virtual BDA graph as a mirror of the "
 "classloader structure for a deployment. If a class can from BDA X can be "
-"loaded by another in BDA Y, it is accessible, and therefore BDA Y&#39;s "
+"loaded by another in BDA Y, it is accessible, and therefore BDA Y's "
 "accessible BDAs should include BDA X."
 msgstr ""
 
@@ -243,7 +243,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Weld delegates EJB 3 bean discovery to the container so that it doesn&#39;t "
+"Weld delegates EJB 3 bean discovery to the container so that it doesn't "
 "duplicate the work done by the EJB container, and respects any vendor-"
 "extensions to the EJB definition."
 msgstr ""
@@ -313,7 +313,7 @@
 msgid ""
 "If you use a non-EE environment then you may implement any of the EE service "
 "SPIs, and Weld will provide the associated functionality. There is no need "
-"to implement those services you don&#39;t need!"
+"to implement those services you don't need!"
 msgstr ""
 
 #. Tag: title
@@ -570,9 +570,9 @@
 #, fuzzy, no-c-format
 msgid ""
 "Weld expects the Application Server or other container to provide the "
-"storage for each application&#39;s context. The <literal>org.jboss.weld."
-"context.api.BeanStore</literal> should be implemented to provide an "
-"application scoped storage."
+"storage for each application's context. The <literal>org.jboss.weld.context."
+"api.BeanStore</literal> should be implemented to provide an application "
+"scoped storage."
 msgstr ""
 "Web Bean期望应用服务器或者其他容器能够提供每个应用上下文的存储。<literal>org."
 "jboss.webbeans.context.api.BeanStore</literal> 应该被实现以便提供一个应用范围"

Modified: doc/trunk/reference/src/main/docbook/zh-CN/scopescontexts.po
===================================================================
--- doc/trunk/reference/src/main/docbook/zh-CN/scopescontexts.po	2010-07-24 16:36:48 UTC (rev 6808)
+++ doc/trunk/reference/src/main/docbook/zh-CN/scopescontexts.po	2010-07-25 04:22:37 UTC (rev 6809)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: master.xml\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-05-01T13:53:43\n"
+"POT-Creation-Date: 2010-07-25T03:52:15\n"
 "PO-Revision-Date: 2009-03-30 09:18+0800\n"
 "Last-Translator: Sean Wu <alartin at gmail.com>\n"
 "Language-Team: none\n"
@@ -21,7 +21,7 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"So far, we&#39;ve seen a few examples of <emphasis>scope type annotations</"
+"So far, we've seen a few examples of <emphasis>scope type annotations</"
 "emphasis>. The scope of a bean determines the lifecycle of instances of the "
 "bean. The scope also determines which clients refer to which instances of "
 "the bean. According to the CDI specification, a scope determines:"
@@ -64,13 +64,13 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"JPA entities aren&#39;t a great fit for this model. Entities have their "
-"whole own lifecycle and identity model which just doesn&#39;t map naturally "
-"to the model used in CDI. Therefore, we recommend against treating entities "
-"as CDI beans. You&#39;re certainly going to run into problems if you try to "
-"give an entity a scope other than the default scope <literal>@Dependent</"
-"literal>. The client proxy will get in the way if you try to pass an "
-"injected instance to the JPA <literal>EntityManager</literal>."
+"JPA entities aren't a great fit for this model. Entities have their whole "
+"own lifecycle and identity model which just doesn't map naturally to the "
+"model used in CDI. Therefore, we recommend against treating entities as CDI "
+"beans. You're certainly going to run into problems if you try to give an "
+"entity a scope other than the default scope <literal>@Dependent</literal>. "
+"The client proxy will get in the way if you try to pass an injected instance "
+"to the JPA <literal>EntityManager</literal>."
 msgstr ""
 
 #. Tag: title
@@ -81,8 +81,8 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"CDI features an <emphasis>extensible context model</emphasis>. It&#39;s "
-"possible to define new scopes by creating a new scope type annotation:"
+"CDI features an <emphasis>extensible context model</emphasis>. It's possible "
+"to define new scopes by creating a new scope type annotation:"
 msgstr ""
 "Web Bean有一个特性是<emphasis>可扩展的上下文模型</emphasis>。我们可以创建一个"
 "新的范围类型注释来定一个新的范围:"
@@ -90,7 +90,7 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"Of course, that&#39;s the easy part of the job. For this scope type to be "
+"Of course, that's the easy part of the job. For this scope type to be "
 "useful, we will also need to define a <literal>Context</literal> object that "
 "implements the scope! Implementing a <literal>Context</literal> is usually a "
 "very technical task, intended for framework development only. You can expect "
@@ -110,7 +110,7 @@
 
 #. Tag: para
 #, fuzzy, no-c-format
-msgid "Usually, you&#39;ll use one of CDI&#39;s built-in scopes."
+msgid "Usually, you'll use one of CDI's built-in scopes."
 msgstr "通常,你将会使用一个Web Bean内置的范围。"
 
 #. Tag: title
@@ -224,7 +224,7 @@
 #, fuzzy, no-c-format
 msgid ""
 "Three of the four built-in scopes should be extremely familiar to every Java "
-"EE developer, so let&#39;s not waste time discussing them here. One of the "
+"EE developer, so let's not waste time discussing them here. One of the "
 "scopes, however, is new."
 msgstr ""
 "这四个内置范围的其中三个对于每个Java EE程序员来说都非常熟悉,所以让我们别浪费"
@@ -364,7 +364,7 @@
 
 #. Tag: para
 #, no-c-format
-msgid "It&#39;s probably better to use one of the link components in JSF 2:"
+msgid "It's probably better to use one of the link components in JSF 2:"
 msgstr ""
 
 #. Tag: para
@@ -372,8 +372,8 @@
 msgid ""
 "The conversation context propagates across redirects, making it very easy to "
 "implement the common POST-then-redirect pattern, without resort to fragile "
-"constructs such as a &#34;flash&#34; object. The container automatically "
-"adds the conversation id to the redirect URL as a request parameter."
+"constructs such as a \"flash\" object. The container automatically adds the "
+"conversation id to the redirect URL as a request parameter."
 msgstr ""
 "Web Bean管理器也需要能够跨越任何重定向来传播对话,甚至这个对话没有被升级为长"
 "时对话。这样我们就能很容易实现常用的POST-then-redirect模式,而不需要构建一个"
@@ -437,12 +437,12 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"You can guess what &#34;singleton&#34; means here. It means a bean that is "
-"instantiated once. Unfortunately, there&#39;s a little problem with this "
-"pseudo-scope. Beans with scope <literal>@Singleton</literal> don&#39;t have "
-"a proxy object. Clients hold a direct reference to the singleton instance. "
-"So we need to consider the case of a client that can be serialized, for "
-"example, any bean with scope <literal>@SessionScoped</literal> or "
+"You can guess what \"singleton\" means here. It means a bean that is "
+"instantiated once. Unfortunately, there's a little problem with this pseudo-"
+"scope. Beans with scope <literal>@Singleton</literal> don't have a proxy "
+"object. Clients hold a direct reference to the singleton instance. So we "
+"need to consider the case of a client that can be serialized, for example, "
+"any bean with scope <literal>@SessionScoped</literal> or "
 "<literal>@ConversationScoped</literal>, any dependent object of a bean with "
 "scope <literal>@SessionScoped</literal> or <literal>@ConversationScoped</"
 "literal>, or any stateful session bean."
@@ -452,7 +452,7 @@
 #, no-c-format
 msgid ""
 "Now, if the singleton instance is a simple, immutable, serializable object "
-"like a string, a number or a date, we probably don&#39;t mind too much if it "
+"like a string, a number or a date, we probably don't mind too much if it "
 "gets duplicated via serialization. However, that makes it no stop being a "
 "true singleton, and we may as well have just declared it with the default "
 "scope."
@@ -483,7 +483,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"give the client a reference of type <literal>Instance&#60;X&#62;</literal> "
+"give the client a reference of type <literal>Instance&lt;X&gt;</literal> "
 "where <literal>X</literal> is the bean type of the singleton bean."
 msgstr ""
 
@@ -540,8 +540,8 @@
 "If you need to access a bean directly by EL name in a JSF page, you probably "
 "need to give it a scope other than <literal>@Dependent</literal>. Otherwise, "
 "any value that gets set to the bean by a JSF input will be lost immediately. "
-"That&#39;s why CDI features the <literal>@Model</literal> stereotype; it "
-"lets you give a bean a name, and set its scope to <literal>@RequestScoped</"
+"That's why CDI features the <literal>@Model</literal> stereotype; it lets "
+"you give a bean a name, and set its scope to <literal>@RequestScoped</"
 "literal> in one stroke. If you need to access a bean that really "
 "<emphasis>has</emphasis> to have the scope <literal>@Dependent</literal> "
 "from a JSF page, inject it into a different bean, and expose it to EL via a "
@@ -551,8 +551,8 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Beans with scope <literal>@Dependent</literal> don&#39;t need a proxy "
-"object. The client holds a direct reference to its instance."
+"Beans with scope <literal>@Dependent</literal> don't need a proxy object. "
+"The client holds a direct reference to its instance."
 msgstr ""
 
 #. Tag: para
@@ -616,8 +616,8 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"This feature is particularly useful with producer methods, as we&#39;ll see "
-"in the next chapter."
+"This feature is particularly useful with producer methods, as we'll see in "
+"the next chapter."
 msgstr "这个特性对于生产者方法来说特别有用,我们将在下一章看到。"
 
 #, fuzzy

Modified: doc/trunk/reference/src/main/docbook/zh-CN/specialization.po
===================================================================
--- doc/trunk/reference/src/main/docbook/zh-CN/specialization.po	2010-07-24 16:36:48 UTC (rev 6808)
+++ doc/trunk/reference/src/main/docbook/zh-CN/specialization.po	2010-07-25 04:22:37 UTC (rev 6809)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: master.xml\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-05-01T13:53:43\n"
+"POT-Creation-Date: 2010-07-25T03:52:15\n"
 "PO-Revision-Date: 2009-03-13 16:32+0800\n"
 "Last-Translator: Sean Wu <alartin at gmail.com>\n"
 "Language-Team: none\n"
@@ -21,15 +21,15 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"When you first start developing with CDI, you&#39;ll likely be dealing only "
-"with a single bean implementation for each bean type. In this case, it&#39;s "
-"easy to understand how beans get selected for injection. As the complexity "
-"of your application grows, multiple occurrences of the same bean type start "
+"When you first start developing with CDI, you'll likely be dealing only with "
+"a single bean implementation for each bean type. In this case, it's easy to "
+"understand how beans get selected for injection. As the complexity of your "
+"application grows, multiple occurrences of the same bean type start "
 "appearing, either because you have multiple implementations or two beans "
-"share a common (Java) inheritance. That&#39;s when you have to begin "
-"studying the specialization, inheritance and alternative rules to work "
-"through unsatisfied or ambiguous dependencies or to avoid certain beans from "
-"being called."
+"share a common (Java) inheritance. That's when you have to begin studying "
+"the specialization, inheritance and alternative rules to work through "
+"unsatisfied or ambiguous dependencies or to avoid certain beans from being "
+"called."
 msgstr ""
 
 #. Tag: para
@@ -58,10 +58,10 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"The second case is the default assumed by CDI. It&#39;s possible to have two "
+"The second case is the default assumed by CDI. It's possible to have two "
 "beans in the system with the same part bean type (interface or parent "
-"class). As you&#39;ve learned, you select between the two implementations "
-"using qualifiers."
+"class). As you've learned, you select between the two implementations using "
+"qualifiers."
 msgstr ""
 
 #. Tag: para
@@ -71,7 +71,7 @@
 "deployment, only one bean can fulfill a given role at a time. That means one "
 "bean needs to be enabled and the other disabled. There are a two modifiers "
 "involved: <literal>@Alternative</literal> and <literal>@Specializes</"
-"literal>. We&#39;ll start by looking at alternatives and then show the "
+"literal>. We'll start by looking at alternatives and then show the "
 "guarantees that specialization adds."
 msgstr ""
 
@@ -95,8 +95,8 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"But in our staging environment, we don&#39;t really want to submit payments "
-"to the external system, so we override that implementation of "
+"But in our staging environment, we don't really want to submit payments to "
+"the external system, so we override that implementation of "
 "<literal>PaymentProcessor</literal> with a different bean:"
 msgstr ""
 "但在我们的阶段开发环境中,我们可以使用一个不同的Web Bean来重载这个"
@@ -110,19 +110,18 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"We&#39;ve already seen how we can enable this alternative by listing its "
-"class in the <literal>beans.xml</literal> descriptor."
+"We've already seen how we can enable this alternative by listing its class "
+"in the <literal>beans.xml</literal> descriptor."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
 msgid ""
 "But suppose we have many alternatives in the staging environment. It would "
-"be much more convenient to be able to enable them all at once. So let&#39;s "
-"make <literal>@Staging</literal> an <literal>@Alternative</literal> "
-"stereotype and annotate the staging beans with this stereotype instead. "
-"You&#39;ll see how this level of indirection pays off. First, we create the "
-"stereotype:"
+"be much more convenient to be able to enable them all at once. So let's make "
+"<literal>@Staging</literal> an <literal>@Alternative</literal> stereotype "
+"and annotate the staging beans with this stereotype instead. You'll see how "
+"this level of indirection pays off. First, we create the stereotype:"
 msgstr ""
 
 #. Tag: para
@@ -163,7 +162,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"So we haven&#39;t completely replaced the default implementation in this "
+"So we haven't completely replaced the default implementation in this "
 "deployment of the system. The only way one bean can completely override a "
 "second bean at all injection points is if it implements all the bean types "
 "and declares all the qualifiers of the second bean. However, if the second "
@@ -232,8 +231,8 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Since we&#39;re informing the container that our alternative bean is meant "
-"to stand in as a replacement for the default implementation, the alternative "
+"Since we're informing the container that our alternative bean is meant to "
+"stand in as a replacement for the default implementation, the alternative "
 "implementation automatically inherits all qualifiers of the default "
 "implementation. Thus, in our example, "
 "<literal>MockCreditCardPaymentProcessor</literal> inherits the qualifiers "

Modified: doc/trunk/reference/src/main/docbook/zh-CN/stereotypes.po
===================================================================
--- doc/trunk/reference/src/main/docbook/zh-CN/stereotypes.po	2010-07-24 16:36:48 UTC (rev 6808)
+++ doc/trunk/reference/src/main/docbook/zh-CN/stereotypes.po	2010-07-25 04:22:37 UTC (rev 6809)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: master.xml\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-05-01T13:53:43\n"
+"POT-Creation-Date: 2010-07-25T03:52:15\n"
 "PO-Revision-Date: 2009-03-13 16:04+0800\n"
 "Last-Translator: Sean Wu <alartin at gmail.com>\n"
 "Language-Team: none\n"
@@ -89,7 +89,7 @@
 #, no-c-format
 msgid ""
 "Of course, we need to apply some other annotations to our stereotype or else "
-"it wouldn&#39;t be adding much value."
+"it wouldn't be adding much value."
 msgstr ""
 
 #. Tag: title
@@ -112,7 +112,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Naturally, overriding a single default isn&#39;t much use. But remember, "
+"Naturally, overriding a single default isn't much use. But remember, "
 "stereotypes can define more than just the default scope."
 msgstr ""
 
@@ -189,8 +189,8 @@
 #, no-c-format
 msgid ""
 "This may blow your mind a bit, but stereotypes may declare other "
-"stereotypes, which we&#39;ll call <emphasis>stereotype stacking</emphasis>. "
-"You may want to do this if you have two distinct stereotypes which are "
+"stereotypes, which we'll call <emphasis>stereotype stacking</emphasis>. You "
+"may want to do this if you have two distinct stereotypes which are "
 "meaningful on their own, but in other situation may be meaningful when "
 "combined."
 msgstr ""
@@ -198,7 +198,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Here&#39;s an example that combines the <literal>@Action</literal> and "
+"Here's an example that combines the <literal>@Action</literal> and "
 "<literal>@Auditable</literal> stereotypes:"
 msgstr ""
 
@@ -210,9 +210,8 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"We&#39;ve already met two standard stereotypes defined by the CDI "
-"specification: <literal>@Interceptor</literal> and <literal>@Decorator</"
-"literal>."
+"We've already met two standard stereotypes defined by the CDI specification: "
+"<literal>@Interceptor</literal> and <literal>@Decorator</literal>."
 msgstr ""
 "我们已经见到了Web Bean规范定义的两个标准的模板:<literal>@Interceptor</"
 "literal> 和 <literal>@Decorator</literal>。"

Modified: doc/trunk/reference/src/main/docbook/zh-CN/viewlayers.po
===================================================================
--- doc/trunk/reference/src/main/docbook/zh-CN/viewlayers.po	2010-07-24 16:36:48 UTC (rev 6808)
+++ doc/trunk/reference/src/main/docbook/zh-CN/viewlayers.po	2010-07-25 04:22:37 UTC (rev 6809)
@@ -6,7 +6,7 @@
 "Project-Id-Version: Web_Beans:_Java_Contexts_and_Dependency_Injection "
 "VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-05-01T13:53:43\n"
+"POT-Creation-Date: 2010-07-25T03:52:15\n"
 "PO-Revision-Date: 2009-04-19 20:36+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -90,8 +90,8 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Storing the id of any long-running conversation in Wicket&#39;s metadata "
-"when the page response is complete"
+"Storing the id of any long-running conversation in Wicket's metadata when "
+"the page response is complete"
 msgstr ""
 
 #. Tag: para
@@ -134,9 +134,9 @@
 #, no-c-format
 msgid ""
 "When a conversation is marked as long-running, the id of that conversation "
-"will be stored in Wicket&#39;s metadata for the current page. If a new page "
-"is created and set as the response target through <literal>setResponsePage()"
-"</literal>, this new page will also participate in this conversation. This "
+"will be stored in Wicket's metadata for the current page. If a new page is "
+"created and set as the response target through <literal>setResponsePage()</"
+"literal>, this new page will also participate in this conversation. This "
 "occurs for both directly instantiated pages (<literal>setResponsePage(new "
 "OtherPage())</literal>), as well as for bookmarkable pages created with "
 "<literal>setResponsePage(OtherPage.class)</literal> where <literal>OtherPage."

Modified: doc/trunk/reference/src/main/docbook/zh-CN/weldexamples.po
===================================================================
--- doc/trunk/reference/src/main/docbook/zh-CN/weldexamples.po	2010-07-24 16:36:48 UTC (rev 6808)
+++ doc/trunk/reference/src/main/docbook/zh-CN/weldexamples.po	2010-07-25 04:22:37 UTC (rev 6809)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: Weld_-_JSR-299_Reference_Implementation VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-05-01T13:53:43\n"
+"POT-Creation-Date: 2010-07-25T03:52:15\n"
 "PO-Revision-Date: 2009-11-11 15:00+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -21,8 +21,8 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"It&#39;s time to pull the covers back and dive into the internals of Weld "
-"example applications. Let&#39;s start with the simpler of the two examples, "
+"It's time to pull the covers back and dive into the internals of Weld "
+"example applications. Let's start with the simpler of the two examples, "
 "<literal>weld-numberguess</literal>."
 msgstr ""
 
@@ -35,15 +35,15 @@
 #, no-c-format
 msgid ""
 "In the numberguess application you get 10 attempts to guess a number between "
-"1 and 100. After each attempt, you&#39;re told whether your guess was too "
-"high or too low."
+"1 and 100. After each attempt, you're told whether your guess was too high "
+"or too low."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
 msgid ""
 "The numberguess example is comprised of a number of beans, configuration "
-"files and Facelets (JSF) views, packaged as a war module. Let&#39;s start by "
+"files and Facelets (JSF) views, packaged as a war module. Let's start by "
 "examining the configuration files."
 msgstr ""
 
@@ -54,21 +54,21 @@
 "</literal>, which can be found in the <literal>src/main/webapp</literal> "
 "directory of the example. First, we have the JSF 2.0 version of "
 "<literal>faces-config.xml</literal>. A standardized version of Facelets is "
-"the default view handler in JSF 2.0, so there&#39;s really nothing that we "
-"have to configure. Thus, the configuration consists of only the root element."
+"the default view handler in JSF 2.0, so there's really nothing that we have "
+"to configure. Thus, the configuration consists of only the root element."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
 msgid ""
-"There&#39;s also an empty <literal>beans.xml</literal> file, which tells the "
+"There's also an empty <literal>beans.xml</literal> file, which tells the "
 "container to look for beans in this application and to activate the CDI "
 "services."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Finally, there&#39;s the familiar <literal>web.xml</literal>:"
+msgid "Finally, there's the familiar <literal>web.xml</literal>:"
 msgstr ""
 
 #. Tag: para
@@ -105,8 +105,8 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Let&#39;s take a look at the main JSF view, <literal>src/main/webapp/home."
-"xhtml</literal>."
+"Let's take a look at the main JSF view, <literal>src/main/webapp/home.xhtml</"
+"literal>."
 msgstr ""
 
 #. Tag: para
@@ -119,8 +119,8 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"There are a number of messages which can be sent to the user, &#34;Higher!"
-"&#34;, &#34;Lower!&#34; and &#34;Correct!&#34;"
+"There are a number of messages which can be sent to the user, \"Higher!\", "
+"\"Lower!\" and \"Correct!\""
 msgstr ""
 
 #. Tag: para
@@ -138,10 +138,9 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"A validator binding is used to make sure the user doesn&#39;t accidentally "
-"input a number outside of the range in which they can guess - if the "
-"validator wasn&#39;t here, the user might use up a guess on an out of bounds "
-"number."
+"A validator binding is used to make sure the user doesn't accidentally input "
+"a number outside of the range in which they can guess - if the validator "
+"wasn't here, the user might use up a guess on an out of bounds number."
 msgstr ""
 
 #. Tag: para
@@ -177,8 +176,8 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"The <literal>Generator</literal> is application scoped, so we don&#39;t get "
-"a different random each time."
+"The <literal>Generator</literal> is application scoped, so we don't get a "
+"different random each time."
 msgstr ""
 
 #. Tag: para
@@ -192,20 +191,20 @@
 #, no-c-format
 msgid ""
 "The final bean in the application is the session-scoped <literal>Game</"
-"literal> class. This is the primary entry point of the application. It&#39;s "
+"literal> class. This is the primary entry point of the application. It's "
 "responsible for setting up or resetting the game, capturing and validating "
-"the user&#39;s guess and providing feedback to the user with a "
-"<literal>FacesMessage</literal>. We&#39;ve used the post-construct lifecycle "
+"the user's guess and providing feedback to the user with a "
+"<literal>FacesMessage</literal>. We've used the post-construct lifecycle "
 "method to initialize the game by retrieving a random number from the "
-"<literal>@Random Instance&#60;Integer&#62;</literal> bean."
+"<literal>@Random Instance&lt;Integer&gt;</literal> bean."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
 msgid ""
-"You&#39;ll notice that we&#39;ve also added the <literal>@Named</literal> "
-"annotation to this class. This annotation is only required when you want to "
-"make the bean accessible to a JSF view via EL (i.e., #{game})."
+"You'll notice that we've also added the <literal>@Named</literal> annotation "
+"to this class. This annotation is only required when you want to make the "
+"bean accessible to a JSF view via EL (i.e., #{game})."
 msgstr ""
 
 #. Tag: title
@@ -237,9 +236,8 @@
 #, no-c-format
 msgid ""
 "Second, we need to explicitly specify the servlet listener in <literal>web."
-"xml</literal>, again because the container isn&#39;t doing this stuff for "
-"you. The servlet listener boots Weld and controls it&#39;s interaction with "
-"requests."
+"xml</literal>, again because the container isn't doing this stuff for you. "
+"The servlet listener boots Weld and controls it's interaction with requests."
 msgstr ""
 
 #. Tag: para
@@ -248,8 +246,8 @@
 "When Weld boots, it places the <literal>javax.enterprise.inject.spi."
 "BeanManager</literal>, the portable SPI for obtaining bean instances, in the "
 "ServletContext under a variable name equal to the fully-qualified interface "
-"name. You generally don&#39;t need to access this interface, but Weld makes "
-"use of it."
+"name. You generally don't need to access this interface, but Weld makes use "
+"of it."
 msgstr ""
 
 #. Tag: title
@@ -262,7 +260,7 @@
 msgid ""
 "Weld includes a number of portable extensions for JSR-299, including an "
 "extension for Wicket, which allows you to inject beans into Wicket "
-"components and leverage the conversation context. In this section, we&#39;ll "
+"components and leverage the conversation context. In this section, we'll "
 "walk you through the Wicket version of the numberguess example."
 msgstr ""
 
@@ -271,7 +269,7 @@
 msgid ""
 "You may want to review the Wicket documentation at <ulink url=\"http://"
 "wicket.apache.org/\">http://wicket.apache.org/</ulink> before reading this "
-"section, if you aren&#39;t already familiar with the framework."
+"section, if you aren't already familiar with the framework."
 msgstr ""
 
 #. Tag: para
@@ -280,17 +278,17 @@
 "Wicket is another environment that relies on the Weld servlet extension. The "
 "use of <ulink url=\"http://jetty.mortbay.org\">Jetty</ulink> is common in "
 "the Wicket community, and is thus chosen here as the runtime container. "
-"You&#39;ve seen already that Jetty is perfectly capable of running CDI "
+"You've seen already that Jetty is perfectly capable of running CDI "
 "applications with Weld add-ons, and this environment is no different."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
 msgid ""
-"We&#39;ll also be using the Eclipse IDE in these examples. Instructions are "
+"We'll also be using the Eclipse IDE in these examples. Instructions are "
 "provided later for running the example from the command line, but since "
-"you&#39;ll likely need to do more than just deploy examples, we&#39;ll get "
-"setup in this full development environment."
+"you'll likely need to do more than just deploy examples, we'll get setup in "
+"this full development environment."
 msgstr ""
 
 #. Tag: title
@@ -313,7 +311,7 @@
 #, no-c-format
 msgid ""
 "If you have m2eclipse installed, you can open any Maven project directly. "
-"From within Eclipse, select <emphasis>File -&#62; Import... -&#62; Maven "
+"From within Eclipse, select <emphasis>File -&gt; Import... -&gt; Maven "
 "Projects</emphasis>. Then, browse to the location of the Wicket numberguess "
 "example. You should see that Eclipse recognizes the existence of a Maven "
 "project."
@@ -329,24 +327,24 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"You&#39;ll notice after importing, the project has a build error. That&#39;s "
-"because we need to enable a Maven profile. Right-click on the project and "
-"select <emphasis>Properties</emphasis>, then select the <emphasis>Maven</"
-"emphasis> tab in the window that appears. In the form field labeled &#34;"
-"Active Maven Profiles (comma separated):&#34;, type <literal>jetty</"
-"literal>. That will enable some extra dependencies that allow the project to "
-"compile. Additionally, <emphasis>uncheck</emphasis> the box labeled &#34;"
-"Skip Maven compile plugin when processing resources (recommended)&#34;. That "
-"solves an incompatiblity between the m2eclipse plugin and the Maven enforcer "
-"plugin that we use for the Weld project. Now, you&#39;re ready to develop!"
+"You'll notice after importing, the project has a build error. That's because "
+"we need to enable a Maven profile. Right-click on the project and select "
+"<emphasis>Properties</emphasis>, then select the <emphasis>Maven</emphasis> "
+"tab in the window that appears. In the form field labeled \"Active Maven "
+"Profiles (comma separated):\", type <literal>jetty</literal>. That will "
+"enable some extra dependencies that allow the project to compile. "
+"Additionally, <emphasis>uncheck</emphasis> the box labeled \"Skip Maven "
+"compile plugin when processing resources (recommended)\". That solves an "
+"incompatiblity between the m2eclipse plugin and the Maven enforcer plugin "
+"that we use for the Weld project. Now, you're ready to develop!"
 msgstr ""
 
 #. Tag: para
 #, no-c-format
 msgid ""
-"Be sure to uncheck the box &#34;Skip Maven compile plugin when processing "
-"resources (recommended)&#34; in the Maven properties screen or else the "
-"example might not run in Eclipse because beans.xml will be missing from the "
+"Be sure to uncheck the box \"Skip Maven compile plugin when processing "
+"resources (recommended)\" in the Maven properties screen or else the example "
+"might not run in Eclipse because beans.xml will be missing from the "
 "classpath! See the <ulink url=\"https://issues.sonatype.org/browse/"
 "MNGECLIPSE-768\">MNGECLIPSE-768</ulink> issue report for details."
 msgstr ""
@@ -363,15 +361,15 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Then, from Eclipse, choose <emphasis>File -&#62; Import... -&#62; General -"
-"&#62; Existing Projects into Workspace</emphasis>, select the root directory "
+"Then, from Eclipse, choose <emphasis>File -&gt; Import... -&gt; General -"
+"&gt; Existing Projects into Workspace</emphasis>, select the root directory "
 "of the numberguess example, and click Finish. This will create a project in "
 "your workspace called <literal>weld-wicket-numberguess</literal>."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "It&#39;s time to get the example running!"
+msgid "It's time to get the example running!"
 msgstr ""
 
 #. Tag: title
@@ -430,7 +428,7 @@
 
 #. Tag: para
 #, no-c-format
-msgid "Enough toying with deployment, let&#39;s dive into the code."
+msgid "Enough toying with deployment, let's dive into the code."
 msgstr ""
 
 #. Tag: title
@@ -462,7 +460,7 @@
 
 #. Tag: para
 #, no-c-format
-msgid "Here&#39;s where things differ from the JSF numberguess example:"
+msgid "Here's where things differ from the JSF numberguess example:"
 msgstr ""
 
 #. Tag: para
@@ -585,8 +583,8 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Let&#39;s have a look at the significant code and configuration files that "
-"make up this example."
+"Let's have a look at the significant code and configuration files that make "
+"up this example."
 msgstr ""
 
 #. Tag: para
@@ -600,8 +598,8 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"The game&#39;s main logic is located in <literal>Game.java</literal>. Here "
-"is the code for that class, highlighting the ways in which this differs from "
+"The game's main logic is located in <literal>Game.java</literal>. Here is "
+"the code for that class, highlighting the ways in which this differs from "
 "the web application version:"
 msgstr ""
 
@@ -609,14 +607,14 @@
 #, no-c-format
 msgid ""
 "The bean is application scoped rather than session scoped, since an instance "
-"of a Swing application typically represents a single &#39;session&#39;."
+"of a Swing application typically represents a single 'session'."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
 msgid ""
-"Notice that the bean is not named, since it doesn&#39;t need to be accessed "
-"via EL."
+"Notice that the bean is not named, since it doesn't need to be accessed via "
+"EL."
 msgstr ""
 
 #. Tag: para
@@ -657,9 +655,9 @@
 msgid ""
 "The <literal>reset()</literal> method makes a call to the injected "
 "<literal>rndGenerator</literal> in order to get the random number at the "
-"start of each game. Note that it can&#39;t use <literal>Instance.get()</"
-"literal> like the JSF example does because there will not be any active "
-"contexts like there are during a JSF request."
+"start of each game. Note that it can't use <literal>Instance.get()</literal> "
+"like the JSF example does because there will not be any active contexts like "
+"there are during a JSF request."
 msgstr ""
 
 #. Tag: para
@@ -667,8 +665,8 @@
 msgid ""
 "The <literal>MessageGenerator</literal> class depends on the current "
 "instance of <literal>Game</literal> and queries its state in order to "
-"determine the appropriate messages to provide as the prompt for the user&#39;"
-"s next guess and the response to the previous guess. The code for "
+"determine the appropriate messages to provide as the prompt for the user's "
+"next guess and the response to the previous guess. The code for "
 "<literal>MessageGenerator</literal> is as follows:"
 msgstr ""
 
@@ -681,7 +679,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"The <literal>Game</literal>&#39;s state is interrogated to determine the "
+"The <literal>Game</literal>'s state is interrogated to determine the "
 "appropriate challenge message ..."
 msgstr ""
 
@@ -726,8 +724,8 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"<literal>guessButtonActionPerformed</literal> is called when the &#39;"
-"Guess&#39; button is clicked, and it does the following:"
+"<literal>guessButtonActionPerformed</literal> is called when the 'Guess' "
+"button is clicked, and it does the following:"
 msgstr ""
 
 #. Tag: para
@@ -740,8 +738,8 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Calls <literal>game.check()</literal> to validate and perform one &#39;"
-"turn&#39; of the game"
+"Calls <literal>game.check()</literal> to validate and perform one 'turn' of "
+"the game"
 msgstr ""
 
 #. Tag: para
@@ -780,7 +778,7 @@
 #, no-c-format
 msgid ""
 "The translator example is built as an ear and contains EJBs. As a result, "
-"it&#39;s structure is more complex than the numberguess example."
+"it's structure is more complex than the numberguess example."
 msgstr ""
 
 #. Tag: para
@@ -794,10 +792,9 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"First, let&#39;s take a look at the ear aggregator, which is located in the "
-"example&#39;s <literal>ear</literal> directory. Maven automatically "
-"generates the <literal>application.xml</literal> for us from this plugin "
-"configuration:"
+"First, let's take a look at the ear aggregator, which is located in the "
+"example's <literal>ear</literal> directory. Maven automatically generates "
+"the <literal>application.xml</literal> for us from this plugin configuration:"
 msgstr ""
 
 #. Tag: para
@@ -811,18 +808,18 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"If you weren&#39;t using Maven to generate these files, you would need "
+"If you weren't using Maven to generate these files, you would need "
 "<literal>META-INF/application.xml</literal>:"
 msgstr ""
 
 #. Tag: para
 #, no-c-format
 msgid ""
-"Next, lets look at the war, which is located in the example&#39;s "
-"<literal>war</literal> directory. Just as in the numberguess example, we "
-"have a <literal>faces-config.xml</literal> for JSF 2.0 and a <literal>web."
-"xml</literal> (to activate JSF) under WEB-INF, both sourced from "
-"<literal>src/main/webapp/WEB-INF</literal>."
+"Next, lets look at the war, which is located in the example's <literal>war</"
+"literal> directory. Just as in the numberguess example, we have a "
+"<literal>faces-config.xml</literal> for JSF 2.0 and a <literal>web.xml</"
+"literal> (to activate JSF) under WEB-INF, both sourced from <literal>src/"
+"main/webapp/WEB-INF</literal>."
 msgstr ""
 
 #. Tag: para
@@ -843,21 +840,21 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Finally, let&#39;s look at the EJB module, which is located in the "
-"example&#39;s <literal>ejb</literal> directory. In <literal>src/main/"
-"resources/META-INF</literal> there is just an empty <literal>beans.xml</"
-"literal>, used to mark the archive as containing beans."
+"Finally, let's look at the EJB module, which is located in the example's "
+"<literal>ejb</literal> directory. In <literal>src/main/resources/META-INF</"
+"literal> there is just an empty <literal>beans.xml</literal>, used to mark "
+"the archive as containing beans."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
 msgid ""
-"We&#39;ve saved the most interesting bit to last, the code! The project has "
-"two simple beans, <literal>SentenceParser</literal> and "
-"<literal>TextTranslator</literal> and two session beans, "
-"<literal>TranslatorControllerBean</literal> and <literal>SentenceTranslator</"
-"literal>. You should be getting quite familiar with what a bean looks like "
-"by now, so we&#39;ll just highlight the most interesting bits here."
+"We've saved the most interesting bit to last, the code! The project has two "
+"simple beans, <literal>SentenceParser</literal> and <literal>TextTranslator</"
+"literal> and two session beans, <literal>TranslatorControllerBean</literal> "
+"and <literal>SentenceTranslator</literal>. You should be getting quite "
+"familiar with what a bean looks like by now, so we'll just highlight the "
+"most interesting bits here."
 msgstr ""
 
 #. Tag: para
@@ -874,9 +871,9 @@
 "<literal>TextTranslator</literal> uses the simple bean (really just a plain "
 "Java class!) <literal>SentenceParser</literal> to parse the sentence and "
 "then calls on the stateless bean with the local business interface "
-"<literal>Translator</literal> to perform the translation. That&#39;s where "
-"the magic happens. Of course, we couldn&#39;t develop a full translator, but "
-"it&#39;s convincing enough to anyone who doesn&#39;t understand Latin!"
+"<literal>Translator</literal> to perform the translation. That's where the "
+"magic happens. Of course, we couldn't develop a full translator, but it's "
+"convincing enough to anyone who doesn't understand Latin!"
 msgstr ""
 
 #. Tag: para

Modified: doc/trunk/reference/src/main/docbook/zh-CN/xml.po
===================================================================
--- doc/trunk/reference/src/main/docbook/zh-CN/xml.po	2010-07-24 16:36:48 UTC (rev 6808)
+++ doc/trunk/reference/src/main/docbook/zh-CN/xml.po	2010-07-25 04:22:37 UTC (rev 6809)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: master.xml\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-05-01T13:53:43\n"
+"POT-Creation-Date: 2010-07-25T03:52:15\n"
 "PO-Revision-Date: 2009-03-13 15:01+0800\n"
 "Last-Translator: Sean Wu <alartin at gmail.com>\n"
 "Language-Team: none\n"
@@ -21,9 +21,9 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"So far, we&#39;ve seen plenty of examples of beans declared using "
-"annotations. However, there are a couple of occasions when we can&#39;t use "
-"annotations to define the bean:"
+"So far, we've seen plenty of examples of beans declared using annotations. "
+"However, there are a couple of occasions when we can't use annotations to "
+"define the bean:"
 msgstr ""
 "目前为止,我们看了大量使用注释来声明Web Bean的例子。然而,我们有时候并不使用"
 "注释来定义Web Bean,如下列情况:"
@@ -64,10 +64,10 @@
 #, fuzzy, no-c-format
 msgid ""
 "The advantage of this approach is that you can write an XML schema that "
-"prevents spelling errors in your XML document. It&#39;s even possible for a "
-"tool to generate the XML schema automatically from the compiled Java code. "
-"Or, an integrated development environment could perform the same validation "
-"without the need for the explicit intermediate generation step."
+"prevents spelling errors in your XML document. It's even possible for a tool "
+"to generate the XML schema automatically from the compiled Java code. Or, an "
+"integrated development environment could perform the same validation without "
+"the need for the explicit intermediate generation step."
 msgstr ""
 "这种方法的好处是你可以使用XML模式来验证XML, 阻止XML文档中的拼写错误。它甚至可"
 "以让一个工具从编译好的Java代码中自动生成XML模式。或者一个整合开发环境(IDE)"
@@ -107,7 +107,7 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"For example, the element <literal>&#60;util:Date/&#62;</literal> in the "
+"For example, the element <literal>&lt;util:Date/&gt;</literal> in the "
 "following XML fragment refers to the class <literal>java.util.Date</literal>:"
 msgstr ""
 "例如, 在下面的XML片段中的元素<literal>&lt;util:Date/&gt;</literal>指的是 "
@@ -186,7 +186,7 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"The <literal>&#60;Name&#62;</literal> element declares a bean of scope "
+"The <literal>&lt;Name&gt;</literal> element declares a bean of scope "
 "<literal>@Dependent</literal> and class <literal>Name</literal>, with a set "
 "of initial field values. This bean has a special, container-generated "
 "qualifier and is therefore injectable only to the specific injection point "
@@ -201,8 +201,8 @@
 #, fuzzy, no-c-format
 msgid ""
 "This simple but powerful feature allows the Weld XML format to be used to "
-"specify whole graphs of Java objects. It&#39;s not quite a full databinding "
-"solution, but it&#39;s close!"
+"specify whole graphs of Java objects. It's not quite a full databinding "
+"solution, but it's close!"
 msgstr ""
 "这个简单但是很强大的特性能够让我们使用Web Bean XML配置格式来指定整个Java类的"
 "图。这并不是完整的数据绑定方案,但是它很接近了!"
@@ -215,10 +215,9 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"If we want our XML document format to be authored by people who aren&#39;t "
-"Java developers, or who don&#39;t have access to our code, we need to "
-"provide a schema. There&#39;s nothing specific to Weld about writing or "
-"using the schema."
+"If we want our XML document format to be authored by people who aren't Java "
+"developers, or who don't have access to our code, we need to provide a "
+"schema. There's nothing specific to Weld about writing or using the schema."
 msgstr ""
 "如果我们希望我们的XML文档格式由非Java开发者或者没有权限访问我们代码的人来制"
 "定,我们需要提供一个模式。在Web Beans中使用模式没有什么特殊的地方。"

Modified: doc/trunk/reference/src/main/docbook/zh-TW/beans.po
===================================================================
--- doc/trunk/reference/src/main/docbook/zh-TW/beans.po	2010-07-24 16:36:48 UTC (rev 6808)
+++ doc/trunk/reference/src/main/docbook/zh-TW/beans.po	2010-07-25 04:22:37 UTC (rev 6809)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: Weld_-_JSR-299_Reference_Implementation VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-05-01T13:53:42\n"
+"POT-Creation-Date: 2010-07-25T03:52:14\n"
 "PO-Revision-Date: 2009-11-11 15:00+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -32,13 +32,13 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Let&#39;s back up a second. What does it really mean to be "
-"<emphasis>contextual</emphasis>? Since beans may be stateful, it matters "
-"<emphasis>which</emphasis> bean instance I have. Unlike a stateless "
-"component model (for example, stateless session beans) or a singleton "
-"component model (such as servlets, or singleton beans), different clients of "
-"a bean see the bean in different states. The client-visible state depends "
-"upon which instance of the bean the client has a reference to."
+"Let's back up a second. What does it really mean to be <emphasis>contextual</"
+"emphasis>? Since beans may be stateful, it matters <emphasis>which</"
+"emphasis> bean instance I have. Unlike a stateless component model (for "
+"example, stateless session beans) or a singleton component model (such as "
+"servlets, or singleton beans), different clients of a bean see the bean in "
+"different states. The client-visible state depends upon which instance of "
+"the bean the client has a reference to."
 msgstr ""
 
 #. Tag: para
@@ -83,10 +83,10 @@
 msgid ""
 "One great advantage of the contextual model is that it allows stateful beans "
 "to be treated like services! The client need not concern itself with "
-"managing the lifecycle of the bean it&#39;s using, <emphasis>nor does it "
-"even need to know what that lifecycle is.</emphasis> Beans interact by "
-"passing messages, and the bean implementations define the lifecycle of their "
-"own state. The beans are loosely coupled because:"
+"managing the lifecycle of the bean it's using, <emphasis>nor does it even "
+"need to know what that lifecycle is.</emphasis> Beans interact by passing "
+"messages, and the bean implementations define the lifecycle of their own "
+"state. The beans are loosely coupled because:"
 msgstr ""
 
 #. Tag: para
@@ -171,7 +171,7 @@
 
 #. Tag: para
 #, no-c-format
-msgid "Let&#39;s see what all this new terminology means."
+msgid "Let's see what all this new terminology means."
 msgstr ""
 
 #. Tag: title
@@ -183,8 +183,8 @@
 #, no-c-format
 msgid ""
 "Beans usually acquire references to other beans via dependency injection. "
-"Any injected attribute specifies a &#34;contract&#34; that must be satisfied "
-"by the bean to be injected. The contract is:"
+"Any injected attribute specifies a \"contract\" that must be satisfied by "
+"the bean to be injected. The contract is:"
 msgstr ""
 
 #. Tag: para
@@ -211,7 +211,7 @@
 #, no-c-format
 msgid ""
 "The bean types are <literal>BookShop</literal>, <literal>Business</literal> "
-"and <literal>Shop&#60;Book&#62;</literal>, as well as the implicit type "
+"and <literal>Shop&lt;Book&gt;</literal>, as well as the implicit type "
 "<literal>java.lang.Object</literal>. (Notice that a parameterized type is a "
 "legal bean type)."
 msgstr ""
@@ -230,9 +230,9 @@
 msgid ""
 "The bean types of a session bean include local interfaces and the bean class "
 "local view (if any). EJB remote interfaces are not considered bean types of "
-"a session bean. You can&#39;t inject an EJB using its remote interface "
-"unless you define a <emphasis>resource</emphasis>, which we&#39;ll meet in "
-"<xref linkend=\"resources\" />."
+"a session bean. You can't inject an EJB using its remote interface unless "
+"you define a <emphasis>resource</emphasis>, which we'll meet in <xref "
+"linkend=\"resources\" />."
 msgstr ""
 
 #. Tag: para
@@ -241,7 +241,7 @@
 "Bean types may be restricted to an explicit set by annotating the bean with "
 "the <literal>@Typed</literal> annotation and listing the classes that should "
 "be bean types. For instance, the bean types of this bean have been "
-"restricted to <literal>Shop&#60;Book&#62;</literal>, together with "
+"restricted to <literal>Shop&lt;Book&gt;</literal>, together with "
 "<literal>java.lang.Object</literal>:"
 msgstr ""
 
@@ -255,8 +255,8 @@
 "<literal>DebitPaymentProcessor</literal>. Injecting a field of type "
 "<literal>PaymentProcessor</literal> introduces an ambiguous condition. In "
 "these cases, the client must specify some additional quality of the "
-"implementation it is interested in. We model this kind of &#34;quality&#34; "
-"using a qualifier."
+"implementation it is interested in. We model this kind of \"quality\" using "
+"a qualifier."
 msgstr ""
 
 #. Tag: para
@@ -265,23 +265,23 @@
 "A qualifier is a user-defined annotation that is itself annotated "
 "<literal>@Qualifer</literal>. A qualifier annotation is an extension of the "
 "type system. It lets us disambiguate a type without having to fall back to "
-"string-based names. Here&#39;s an example of a qualifier annotation:"
+"string-based names. Here's an example of a qualifier annotation:"
 msgstr ""
 
 #. Tag: para
 #, no-c-format
 msgid ""
 "You may not be used to seeing the definition of an annotation. In fact, this "
-"might be the first time you&#39;ve encountered one. With CDI, annotation "
-"definitions will become a familiar artifact as you&#39;ll be creating them "
-"from time to time."
+"might be the first time you've encountered one. With CDI, annotation "
+"definitions will become a familiar artifact as you'll be creating them from "
+"time to time."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
 msgid ""
 "Pay attention to the names of the built-in annotations in CDI and EJB. "
-"You&#39;ll notice that they are often adjectives. We encourage you to follow "
+"You'll notice that they are often adjectives. We encourage you to follow "
 "this convention when creating your custom annotations, since they serve to "
 "describe the behaviors and roles of the class."
 msgstr ""
@@ -308,7 +308,7 @@
 "For each injection point, the container searches for a bean which satisfies "
 "the contract, one which has the bean type and all the qualifiers. If it "
 "finds exactly one matching bean, it injects an instance of that bean. If it "
-"doesn&#39;t, it reports an error to the user."
+"doesn't, it reports an error to the user."
 msgstr ""
 
 #. Tag: para
@@ -330,10 +330,10 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"That&#39;s not quite the end of the story. CDI also defines a simple "
+"That's not quite the end of the story. CDI also defines a simple "
 "<emphasis>resolution rule</emphasis> that helps the container decide what to "
 "do if there is more than one bean that satisfies a particular contract. "
-"We&#39;ll get into the details in <xref linkend=\"injection\" />."
+"We'll get into the details in <xref linkend=\"injection\" />."
 msgstr ""
 
 #. Tag: title
@@ -370,7 +370,7 @@
 msgid ""
 "Keep in mind that once a bean is bound to a context, it remains in that "
 "context until the context is destroyed. There is no way to manually remove a "
-"bean from a context. If you don&#39;t want the bean to sit in the session "
+"bean from a context. If you don't want the bean to sit in the session "
 "indefinitely, consider using another scope with a shorted lifespan, such as "
 "the request or conversation scope."
 msgstr ""
@@ -386,8 +386,7 @@
 
 #. Tag: para
 #, no-c-format
-msgid ""
-"We&#39;ll talk more about scopes in <xref linkend=\"scopescontexts\" />."
+msgid "We'll talk more about scopes in <xref linkend=\"scopescontexts\" />."
 msgstr ""
 
 #. Tag: title
@@ -446,7 +445,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"We&#39;ve already seen how qualifiers let us choose between multiple "
+"We've already seen how qualifiers let us choose between multiple "
 "implementations of an interface at development time. But sometimes we have "
 "an interface (or other bean type) whose implementation varies depending upon "
 "the deployment environment. For example, we may want to use a mock "
@@ -483,9 +482,9 @@
 msgid ""
 "You might be familiar with the use of interceptors in EJB 3.0. In Java EE 6, "
 "this functionality has been generalized to work with other managed beans. "
-"That&#39;s right, you no longer have to make your bean an EJB just to "
-"intercept its methods. Holler. So what does CDI have to offer above and "
-"beyond that? Well, quite a lot actually. Let&#39;s cover some background."
+"That's right, you no longer have to make your bean an EJB just to intercept "
+"its methods. Holler. So what does CDI have to offer above and beyond that? "
+"Well, quite a lot actually. Let's cover some background."
 msgstr ""
 
 #. Tag: para
@@ -498,10 +497,10 @@
 "descriptor. You might as well just put the interceptor code <emphasis>in</"
 "emphasis> the implementation! Second, the order in which the interceptors "
 "are applied is taken from the order in which they are declared in the "
-"annotation or the XML descriptor. Perhaps this isn&#39;t so bad if you&#39;"
-"re applying the interceptors to a single bean. But, if you are applying them "
-"repeatedly, then there&#39;s a good chance that you&#39;ll inadvertently "
-"define a different order for different beans. Now that&#39;s a problem."
+"annotation or the XML descriptor. Perhaps this isn't so bad if you're "
+"applying the interceptors to a single bean. But, if you are applying them "
+"repeatedly, then there's a good chance that you'll inadvertently define a "
+"different order for different beans. Now that's a problem."
 msgstr ""
 
 #. Tag: para
@@ -540,14 +539,14 @@
 #, no-c-format
 msgid ""
 "Notice that <literal>ShoppingCart</literal> and "
-"<literal>TransactionInterceptor</literal> don&#39;t know anything about each "
+"<literal>TransactionInterceptor</literal> don't know anything about each "
 "other."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
 msgid ""
-"Interceptors are deployment-specific. (We don&#39;t need a "
+"Interceptors are deployment-specific. (We don't need a "
 "<literal>TransactionInterceptor</literal> in our unit tests!) By default, an "
 "interceptor is disabled. We can enable an interceptor using the CDI "
 "deployment descriptor <literal>META-INF/beans.xml</literal> of the jar or "
@@ -557,8 +556,8 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"We&#39;ll discuss interceptors, and their cousins, decorators, in <xref "
-"linkend=\"interceptors\" /> and <xref linkend=\"decorators\" />."
+"We'll discuss interceptors, and their cousins, decorators, in <xref linkend="
+"\"interceptors\" /> and <xref linkend=\"decorators\" />."
 msgstr ""
 
 #. Tag: title
@@ -569,10 +568,9 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"We&#39;ve already seen two types of beans: JavaBeans and EJB session beans. "
-"Is that the whole story? Actually, it&#39;s just the beginning. Let&#39;s "
-"explore the various kinds of beans that CDI implementations must support out-"
-"of-the-box."
+"We've already seen two types of beans: JavaBeans and EJB session beans. Is "
+"that the whole story? Actually, it's just the beginning. Let's explore the "
+"various kinds of beans that CDI implementations must support out-of-the-box."
 msgstr ""
 
 #. Tag: title
@@ -586,8 +584,8 @@
 "A managed bean is a Java class. The basic lifecycle and semantics of a "
 "managed bean are defined by the Managed Beans specification. You can "
 "explicitly declare a managed bean by annotating the bean class "
-"<literal>@ManagedBean</literal>, but in CDI you don&#39;t need to. According "
-"to the specification, the CDI container treats any class that satisfies the "
+"<literal>@ManagedBean</literal>, but in CDI you don't need to. According to "
+"the specification, the CDI container treats any class that satisfies the "
 "following conditions as a managed bean:"
 msgstr ""
 
@@ -636,7 +634,7 @@
 "According to this definition, JPA entities are technically managed beans. "
 "However, entities have their own special lifecycle, state and identity model "
 "and are usually instantiated by JPA or using <literal>new</literal>. "
-"Therefore we don&#39;t recommend directly injecting an entity class. We "
+"Therefore we don't recommend directly injecting an entity class. We "
 "especially recommend against assigning a scope other than "
 "<literal>@Dependent</literal> to an entity class, since JPA is not able to "
 "persist injected CDI proxies."
@@ -715,7 +713,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"There&#39;s no reason to explicitly declare the scope of a stateless session "
+"There's no reason to explicitly declare the scope of a stateless session "
 "bean or singleton session bean. The EJB container controls the lifecycle of "
 "these beans, according to the semantics of the <literal>@Stateless</literal> "
 "or <literal>@Singleton</literal> declaration. On the other hand, a stateful "
@@ -771,8 +769,8 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"When we don&#39;t need any of these things, an ordinary managed bean will "
-"serve just fine."
+"When we don't need any of these things, an ordinary managed bean will serve "
+"just fine."
 msgstr ""
 
 #. Tag: para
@@ -796,7 +794,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Finally, it&#39;s usually obvious when method-level transaction management, "
+"Finally, it's usually obvious when method-level transaction management, "
 "method-level security, timers, remote methods or asynchronous methods are "
 "needed."
 msgstr ""
@@ -804,11 +802,11 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"The point we&#39;re trying to make is: use a session bean when you need the "
+"The point we're trying to make is: use a session bean when you need the "
 "services it provides, not just because you want to use dependency injection, "
 "lifecycle management, or interceptors. Java EE 6 provides a graduated "
-"programming model. It&#39;s usually easy to start with an ordinary managed "
-"bean, and later turn it into an EJB just by adding one of the following "
+"programming model. It's usually easy to start with an ordinary managed bean, "
+"and later turn it into an EJB just by adding one of the following "
 "annotations: <literal>@Stateless</literal>, <literal>@Stateful</literal> or "
 "<literal>@Singleton</literal>."
 msgstr ""
@@ -816,14 +814,13 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"On the other hand, don&#39;t be scared to use session beans just because "
-"you&#39;ve heard your friends say they&#39;re &#34;heavyweight&#34;. It&#39;"
-"s nothing more than superstition to think that something is &#34;"
-"heavier&#34; just because it&#39;s hosted natively within the Java EE "
-"container, instead of by a proprietary bean container or dependency "
-"injection framework that runs as an additional layer of obfuscation. And as "
-"a general principle, you should be skeptical of folks who use vaguely "
-"defined terminology like &#34;heavyweight&#34;."
+"On the other hand, don't be scared to use session beans just because you've "
+"heard your friends say they're \"heavyweight\". It's nothing more than "
+"superstition to think that something is \"heavier\" just because it's hosted "
+"natively within the Java EE container, instead of by a proprietary bean "
+"container or dependency injection framework that runs as an additional layer "
+"of obfuscation. And as a general principle, you should be skeptical of folks "
+"who use vaguely defined terminology like \"heavyweight\"."
 msgstr ""
 
 #. Tag: title
@@ -862,7 +859,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"We can&#39;t write a bean class that is itself a random number. But we can "
+"We can't write a bean class that is itself a random number. But we can "
 "certainly write a method that returns a random number. By making the method "
 "a producer method, we allow the return value of the method—in this case an "
 "<literal>Integer</literal>—to be injected. We can even specify a qualifier—"
@@ -934,7 +931,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"We&#39;ll talk much more about producer methods in <xref linkend="
+"We'll talk much more about producer methods in <xref linkend="
 "\"producermethods\" />."
 msgstr ""
 
@@ -965,7 +962,7 @@
 "A producer field is really just a shortcut that lets us avoid writing a "
 "useless getter method. However, in addition to convenience, producer fields "
 "serve a specific purpose as an adaptor for Java EE component environment "
-"injection, but to learn more about that, you&#39;ll have to wait until <xref "
-"linkend=\"resources\" />. Because we can&#39;t wait to get to work on some "
+"injection, but to learn more about that, you'll have to wait until <xref "
+"linkend=\"resources\" />. Because we can't wait to get to work on some "
 "examples."
 msgstr ""

Modified: doc/trunk/reference/src/main/docbook/zh-TW/decorators.po
===================================================================
--- doc/trunk/reference/src/main/docbook/zh-TW/decorators.po	2010-07-24 16:36:48 UTC (rev 6808)
+++ doc/trunk/reference/src/main/docbook/zh-TW/decorators.po	2010-07-25 04:22:37 UTC (rev 6809)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: decorators\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-05-01T13:53:42\n"
+"POT-Creation-Date: 2010-07-25T03:52:14\n"
 "PO-Revision-Date: 2009-01-08 12:39+1000\n"
 "Last-Translator: Terry Chuang <tchuang at redhat.com>\n"
 "Language-Team: Traditional Chinese <zh at li.org>\n"
@@ -29,8 +29,8 @@
 "interceptor is able to intercept invocations of any Java type. This makes "
 "them perfect for solving technical concerns such as transaction management, "
 "security and call logging. However, by nature, interceptors are unaware of "
-"the actual semantics of the events they intercept. Thus, interceptors "
-"aren&#39;t an appropriate tool for separating business-related concerns."
+"the actual semantics of the events they intercept. Thus, interceptors aren't "
+"an appropriate tool for separating business-related concerns."
 msgstr ""
 "呼叫攔截器(Interceptors)是個用來擷取和區分與型別系統<emphasis>垂直</"
 "emphasis>的相關問題的強大方式。任何攔截器皆可攔截任何 Java 類型的調用"
@@ -46,11 +46,10 @@
 "aware of all the semantics attached to that interface. Since decorators "
 "directly implement operations with business semantics, it makes them the "
 "perfect tool for modeling some kinds of business concerns. It also means "
-"that a decorator doesn&#39;t have the generality of an interceptor. "
-"Decorators aren&#39;t able to solve technical concerns that cut across many "
-"disparate types. Interceptors and decorators, though similar in many ways, "
-"are complementary. Let&#39;s look at some cases where decorators fit the "
-"bill."
+"that a decorator doesn't have the generality of an interceptor. Decorators "
+"aren't able to solve technical concerns that cut across many disparate "
+"types. Interceptors and decorators, though similar in many ways, are "
+"complementary. Let's look at some cases where decorators fit the bill."
 msgstr ""
 "<emphasis>裝飾器(decorators)</emphasis>則是相反的。裝飾器只會針對於特定 "
 "java 介面來攔截調用,因此它知道該介面的所有語意。這使得裝飾器適用於模擬涉及商"
@@ -94,9 +93,8 @@
 #, fuzzy, no-c-format
 msgid ""
 "Unlike other beans, a decorator may be an abstract class. Therefore, if "
-"there&#39;s nothing special the decorator needs to do for a particular "
-"method of the decorated interface, you don&#39;t need to implement that "
-"method."
+"there's nothing special the decorator needs to do for a particular method of "
+"the decorated interface, you don't need to implement that method."
 msgstr ""
 "和其它單純的 Web Bean 不同的是,裝飾器可能會是個抽象類別(abstract class)。"
 "若裝飾器無須為被裝飾之介面的特定 method 進行任何特殊動作的話,您便無須實做該 "
@@ -185,8 +183,7 @@
 #, fuzzy, no-c-format
 msgid ""
 "This declaration serves the same purpose for decorators that the "
-"<literal>&#60;interceptors&#62;</literal> declaration serves for "
-"interceptors:"
+"<literal>&lt;interceptors&gt;</literal> declaration serves for interceptors:"
 msgstr ""
 "此宣告(declaration)對於裝飾器的目的和 <literal>&lt;Interceptors&gt;</"
 "literal> 宣告對於攔截器的目的是相同的:"

Modified: doc/trunk/reference/src/main/docbook/zh-TW/ee.po
===================================================================
--- doc/trunk/reference/src/main/docbook/zh-TW/ee.po	2010-07-24 16:36:48 UTC (rev 6808)
+++ doc/trunk/reference/src/main/docbook/zh-TW/ee.po	2010-07-25 04:22:37 UTC (rev 6809)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: ee\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-05-01T13:53:42\n"
+"POT-Creation-Date: 2010-07-25T03:52:14\n"
 "PO-Revision-Date: 2009-01-15 12:12+1000\n"
 "Last-Translator: Terry Chuang <tchuang at redhat.com>\n"
 "Language-Team: Traditional Chinese <zh at li.org>\n"
@@ -78,7 +78,7 @@
 "The CDI specification does not require the servlet context objects, "
 "<literal>HttpServletRequest</literal>, <literal>HttpSession</literal> and "
 "<literal>ServletContext</literal> to be exposed as injectable beans. If you "
-"really want to be able to inject these objects, it&#39;s easy to create a "
+"really want to be able to inject these objects, it's easy to create a "
 "portable extension to expose them as beans. However, we recommend that "
 "direct access to these objects be limited to servlets, servlet filters and "
 "servlet event listeners, where they may be obtained in the usual way as "
@@ -105,8 +105,8 @@
 "All managed beans may take advantage of Java EE component environment "
 "injection using <literal>@Resource</literal>, <literal>@EJB</literal>, "
 "<literal>@PersistenceContext</literal>, <literal>@PeristenceUnit</literal> "
-"and <literal>@WebServiceRef</literal>. We&#39;ve already seen a couple of "
-"examples of this, though we didn&#39;t pay much attention at the time:"
+"and <literal>@WebServiceRef</literal>. We've already seen a couple of "
+"examples of this, though we didn't pay much attention at the time:"
 msgstr ""
 "所有基本與企業的 Web Bean 都能透過 <literal>@Resource</literal>、"
 "<literal>@EJB</literal> 以及 <literal>@PersistenceContext</literal> 來有效利"
@@ -140,8 +140,8 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"It&#39;s easy to use a bean from a servlet in Java EE 6. Simply inject the "
-"bean using field or initializer method injection."
+"It's easy to use a bean from a servlet in Java EE 6. Simply inject the bean "
+"using field or initializer method injection."
 msgstr ""
 "在 Java EE 6 中透過 Servlet 來使用 Web Bean 相當地簡單。只要使用 Web Bean 欄"
 "位或是 initializer method 注入來注入 Web Bean 即可。"
@@ -166,9 +166,9 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"CDI injection applies to all EJBs, even when they aren&#39;t managed beans. "
-"In particular, you can use CDI injection in message-driven beans, which are "
-"by nature not contextual objects."
+"CDI injection applies to all EJBs, even when they aren't managed beans. In "
+"particular, you can use CDI injection in message-driven beans, which are by "
+"nature not contextual objects."
 msgstr ""
 
 #. Tag: para
@@ -250,15 +250,15 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"CDI doesn&#39;t define any special deployment archive. You can package beans "
-"in jars, ejb jars or wars—any deployment location in the application "
-"classpath. However, the archive must be a &#34;bean archive&#34;. That means "
-"each archive that contains beans <emphasis>must</emphasis> include a file "
-"named <literal>beans.xml</literal> in the <literal>META-INF</literal> "
-"directory of the classpath or <literal>WEB-INF</literal> directory of the "
-"web root (for war archives). The file may be empty. Beans deployed in "
-"archives that do not have a <literal>beans.xml</literal> file will not be "
-"available for use in the application."
+"CDI doesn't define any special deployment archive. You can package beans in "
+"jars, ejb jars or wars—any deployment location in the application classpath. "
+"However, the archive must be a \"bean archive\". That means each archive "
+"that contains beans <emphasis>must</emphasis> include a file named "
+"<literal>beans.xml</literal> in the <literal>META-INF</literal> directory of "
+"the classpath or <literal>WEB-INF</literal> directory of the web root (for "
+"war archives). The file may be empty. Beans deployed in archives that do not "
+"have a <literal>beans.xml</literal> file will not be available for use in "
+"the application."
 msgstr ""
 "Web Bean 不會定義任何特殊的建置 archive。您可將 Web Bean 封裝在 JARs、EJB-"
 "JARs 或是 WARs &#151;  中,應用程式 classpath 中的任何建置位置上。不過,各個"

Modified: doc/trunk/reference/src/main/docbook/zh-TW/environments.po
===================================================================
--- doc/trunk/reference/src/main/docbook/zh-TW/environments.po	2010-07-24 16:36:48 UTC (rev 6808)
+++ doc/trunk/reference/src/main/docbook/zh-TW/environments.po	2010-07-25 04:22:37 UTC (rev 6809)
@@ -6,7 +6,7 @@
 "Project-Id-Version: Web_Beans:_Java_Contexts_and_Dependency_Injection "
 "VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-05-01T14:44:09\n"
+"POT-Creation-Date: 2010-07-25T03:52:14\n"
 "PO-Revision-Date: 2009-03-28 17:09+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -37,9 +37,9 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Unfortunately, you can&#39;t use Weld with earlier versions of JBoss AS "
-"since they are missing key libraries. If you want to learn how to upgrade "
-"the built-in support on JBoss AS 6.0, then read on."
+"Unfortunately, you can't use Weld with earlier versions of JBoss AS since "
+"they are missing key libraries. If you want to learn how to upgrade the "
+"built-in support on JBoss AS 6.0, then read on."
 msgstr ""
 
 #. Tag: para
@@ -107,7 +107,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"There is a major limitation to using a servlet container. Weld doesn&#39;t "
+"There is a major limitation to using a servlet container. Weld doesn't "
 "support deploying session beans, injection using <literal>@EJB</literal> or "
 "<literal>@PersistenceContext</literal>, or using transactional events in "
 "servlet containers. For enterprise features such as these, you should really "
@@ -119,10 +119,10 @@
 msgid ""
 "Weld should be used as a web application library in a servlet container. You "
 "should place <literal>weld-servlet.jar</literal> in <literal>WEB-INF/lib</"
-"literal> in the web root. <literal>weld-servlet.jar</literal> is an &#34;"
-"uber-jar&#34;, meaning it bundles all the bits of Weld and CDI required for "
-"running in a servlet container, provided for your convenience. "
-"Alternatively, you could use its component jars:"
+"literal> in the web root. <literal>weld-servlet.jar</literal> is an \"uber-"
+"jar\", meaning it bundles all the bits of Weld and CDI required for running "
+"in a servlet container, provided for your convenience. Alternatively, you "
+"could use its component jars:"
 msgstr ""
 
 #. Tag: para
@@ -186,7 +186,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Tomcat has a read-only JNDI, so Weld can&#39;t automatically bind the "
+"Tomcat has a read-only JNDI, so Weld can't automatically bind the "
 "BeanManager extension SPI. To bind the BeanManager into JNDI, you should "
 "populate <literal>META-INF/context.xml</literal> in the web root with the "
 "following contents:"
@@ -220,18 +220,18 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Like Tomcat, Jetty has a read-only JNDI, so Weld can&#39;t automatically "
-"bind the Manager. To bind the Manager to JNDI, you should populate "
-"<literal>WEB-INF/jetty-env.xml</literal> with the following contents:"
+"Like Tomcat, Jetty has a read-only JNDI, so Weld can't automatically bind "
+"the Manager. To bind the Manager to JNDI, you should populate <literal>WEB-"
+"INF/jetty-env.xml</literal> with the following contents:"
 msgstr ""
 
 #. Tag: para
 #, no-c-format
 msgid ""
-"Notice that Jetty doesn&#39;t not have built-in support for an "
-"<literal>javax.naming.spi.ObjectFactory</literal> like Tomcat, so it&#39;s "
-"necessary to manually create the <literal>javax.naming.Reference</literal> "
-"to wrap around it."
+"Notice that Jetty doesn't not have built-in support for an <literal>javax."
+"naming.spi.ObjectFactory</literal> like Tomcat, so it's necessary to "
+"manually create the <literal>javax.naming.Reference</literal> to wrap around "
+"it."
 msgstr ""
 
 #. Tag: para
@@ -258,13 +258,13 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"In addition to improved integration of the Enterprise Java stack, the &#34;"
-"Contexts and Dependency Injection for the Java EE platform&#34; "
-"specification also defines a state of the art typesafe, stateful dependency "
-"injection framework, which can prove useful in a wide range of application "
-"types. To help developers take advantage of this, Weld provides a simple "
-"means for being executed in the Java Standard Edition (SE) environment "
-"independently of any Java EE APIs."
+"In addition to improved integration of the Enterprise Java stack, the "
+"\"Contexts and Dependency Injection for the Java EE platform\" specification "
+"also defines a state of the art typesafe, stateful dependency injection "
+"framework, which can prove useful in a wide range of application types. To "
+"help developers take advantage of this, Weld provides a simple means for "
+"being executed in the Java Standard Edition (SE) environment independently "
+"of any Java EE APIs."
 msgstr ""
 
 #. Tag: para
@@ -348,7 +348,7 @@
 
 #. Tag: para
 #, no-c-format
-msgid "Here&#39;s an example of a simple CDI SE application:"
+msgid "Here's an example of a simple CDI SE application:"
 msgstr ""
 
 #. Tag: title
@@ -369,9 +369,9 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Thanks to the power of CDI&#39;s typesafe event model, application "
-"developers need not write any bootstrapping code. The Weld SE module comes "
-"with a built-in main method which will bootstrap CDI for you and then fire a "
+"Thanks to the power of CDI's typesafe event model, application developers "
+"need not write any bootstrapping code. The Weld SE module comes with a built-"
+"in main method which will bootstrap CDI for you and then fire a "
 "<literal>ContainerInitialized</literal> event. The entry point for your "
 "application code would therefore be a simple bean which observes the "
 "<literal>ContainerInitialized</literal> event, as in the previous example."
@@ -394,15 +394,15 @@
 msgid ""
 "For added flexibility, CDI SE also comes with a bootstrap API which can be "
 "called from within your application in order to initialize CDI and obtain "
-"references to your application&#39;s beans and events. The API consists of "
-"two classes: <literal>Weld</literal> and <literal>WeldContainer</literal>."
+"references to your application's beans and events. The API consists of two "
+"classes: <literal>Weld</literal> and <literal>WeldContainer</literal>."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
 msgid ""
-"Here&#39;s an example application main method which uses this API to "
-"initialize a bean of type <literal>MyApplicationBean</literal>."
+"Here's an example application main method which uses this API to initialize "
+"a bean of type <literal>MyApplicationBean</literal>."
 msgstr ""
 
 #. Tag: para
@@ -435,10 +435,10 @@
 #, no-c-format
 msgid ""
 "To use the @ThreadScoped annotation you need to enable the "
-"<literal>RunnableDecorator</literal> which &#39;listens&#39; for all "
-"executions of <literal>Runnable.run()</literal> and decorates them by "
-"setting up the thread context beforehand, bound to the current thread, and "
-"destroying the context afterwards."
+"<literal>RunnableDecorator</literal> which 'listens' for all executions of "
+"<literal>Runnable.run()</literal> and decorates them by setting up the "
+"thread context beforehand, bound to the current thread, and destroying the "
+"context afterwards."
 msgstr ""
 
 #. Tag: para
@@ -459,8 +459,8 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Weld SE comes packaged as a &#39;shaded&#39; jar which includes the CDI API, "
-"Weld Core and all dependant classes bundled into a single jar. Therefore the "
-"only Weld jar you need on the classpath, in addition to your application&#39;"
-"s classes and dependant jars, is the Weld SE jar."
+"Weld SE comes packaged as a 'shaded' jar which includes the CDI API, Weld "
+"Core and all dependant classes bundled into a single jar. Therefore the only "
+"Weld jar you need on the classpath, in addition to your application's "
+"classes and dependant jars, is the Weld SE jar."
 msgstr ""

Modified: doc/trunk/reference/src/main/docbook/zh-TW/events.po
===================================================================
--- doc/trunk/reference/src/main/docbook/zh-TW/events.po	2010-07-24 16:36:48 UTC (rev 6808)
+++ doc/trunk/reference/src/main/docbook/zh-TW/events.po	2010-07-25 04:22:37 UTC (rev 6809)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: events\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-05-01T13:53:42\n"
+"POT-Creation-Date: 2010-07-25T03:52:14\n"
 "PO-Revision-Date: 2009-01-15 12:08+1000\n"
 "Last-Translator: Terry Chuang <tchuang at redhat.com>\n"
 "Language-Team: Traditional Chinese <zh at li.org>\n"
@@ -49,8 +49,8 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"observers can specify a combination of &#34;selectors&#34; to narrow the set "
-"of event notifications they will receive, and"
+"observers can specify a combination of \"selectors\" to narrow the set of "
+"event notifications they will receive, and"
 msgstr ""
 "觀察器可指定一組「選擇器(selectors)」的組合來過濾並減少它們所將會收到的事件"
 "通知數量,並且"
@@ -68,7 +68,7 @@
 #, no-c-format
 msgid ""
 "The CDI event notification facility uses more or less the same typesafe "
-"approach that we&#39;ve already seen with the dependency injection service."
+"approach that we've already seen with the dependency injection service."
 msgstr ""
 
 #. Tag: title
@@ -91,7 +91,7 @@
 #, no-c-format
 msgid ""
 "An event qualifier is just a normal qualifier, defined using "
-"<literal>@Qualifier</literal>. Here&#39;s an example:"
+"<literal>@Qualifier</literal>. Here's an example:"
 msgstr ""
 
 #. Tag: title
@@ -127,7 +127,7 @@
 msgid ""
 "An observer method need not specify any event qualifiers—in this case it is "
 "interested in <emphasis>all</emphasis> events of a particular type. If it "
-"does specify qualifiers, it&#39;s only interested in events which have those "
+"does specify qualifiers, it's only interested in events which have those "
 "qualifiers."
 msgstr ""
 "一個 observer method 不需要指定任何的事件綁定 &#151; 在此情況下它會專注於特"
@@ -245,8 +245,8 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"The downside of annotating the injection point is that we can&#39;t specify "
-"the qualifier dynamically. CDI lets us obtain a qualifier instance by "
+"The downside of annotating the injection point is that we can't specify the "
+"qualifier dynamically. CDI lets us obtain a qualifier instance by "
 "subclassing the helper class <literal>AnnotationLiteral</literal>. That way, "
 "we can pass the qualifier to the <literal>select()</literal> method of "
 "<literal>Event</literal>."
@@ -270,8 +270,8 @@
 msgid ""
 "By default, if there is no instance of an observer in the current context, "
 "the container will instantiate the observer in order to deliver an event to "
-"it. This behavior isn&#39;t always desirable. We may want to deliver events "
-"only to instances of the observer that already exist in the current contexts."
+"it. This behavior isn't always desirable. We may want to deliver events only "
+"to instances of the observer that already exist in the current contexts."
 msgstr ""
 
 #. Tag: para

Modified: doc/trunk/reference/src/main/docbook/zh-TW/example.po
===================================================================
--- doc/trunk/reference/src/main/docbook/zh-TW/example.po	2010-07-24 16:36:48 UTC (rev 6808)
+++ doc/trunk/reference/src/main/docbook/zh-TW/example.po	2010-07-25 04:22:37 UTC (rev 6809)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: example\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-05-01T13:53:42\n"
+"POT-Creation-Date: 2010-07-25T03:52:14\n"
 "PO-Revision-Date: 2009-01-15 12:13+1000\n"
 "Last-Translator: Terry Chuang <tchuang at redhat.com>\n"
 "Language-Team: Traditional Chinese <zh at li.org>\n"
@@ -24,11 +24,11 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"Let&#39;s illustrate these ideas with a full example. We&#39;re going to "
-"implement user login/logout for an application that uses JSF. First, we&#39;"
-"ll define a request-scoped bean to hold the username and password entered "
-"during login, with constraints defined using annotations from the Bean "
-"Validation specification:"
+"Let's illustrate these ideas with a full example. We're going to implement "
+"user login/logout for an application that uses JSF. First, we'll define a "
+"request-scoped bean to hold the username and password entered during login, "
+"with constraints defined using annotations from the Bean Validation "
+"specification:"
 msgstr ""
 "現在我們將採用一個完整的範例來描述這些概念。我們將要為一個使用 JSF 的應用程式"
 "實做用戶的登錄/登出。首先,我們將要定義一個 Web Bean 來在登錄時保持已輸入的用"
@@ -47,7 +47,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"(Note that we&#39;re also going to need a <literal>persistence.xml</literal> "
+"(Note that we're also going to need a <literal>persistence.xml</literal> "
 "file to configure the JPA persistence unit containing <literal>User</"
 "literal>.)"
 msgstr ""
@@ -93,7 +93,7 @@
 #, fuzzy, no-c-format
 msgid ""
 "Hopefully, this example gave you a taste of the CDI programming model. In "
-"the next chapter, we&#39;ll explore dependency injection in greater depth."
+"the next chapter, we'll explore dependency injection in greater depth."
 msgstr ""
 "但願此範例能針對於 Web Bean 程式撰寫模型(Programming Model)提供相關益處。在"
 "下個章節當中,我們將會更深入地探討 Web Bean 依賴注入(Web Beans dependency "

Modified: doc/trunk/reference/src/main/docbook/zh-TW/extend.po
===================================================================
--- doc/trunk/reference/src/main/docbook/zh-TW/extend.po	2010-07-24 16:36:48 UTC (rev 6808)
+++ doc/trunk/reference/src/main/docbook/zh-TW/extend.po	2010-07-25 04:22:37 UTC (rev 6809)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: extend\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-05-01T13:53:42\n"
+"POT-Creation-Date: 2010-07-25T03:52:14\n"
 "PO-Revision-Date: 2009-01-13 11:07+1000\n"
 "Last-Translator: Terry Chuang <tchuang at redhat.com>\n"
 "Language-Team: Traditional Chinese <zh at li.org>\n"
@@ -94,8 +94,8 @@
 msgid ""
 "The first step in creating a portable extension is to write a class that "
 "implements <literal>Extension</literal>. This marker interface does not "
-"define any methods, but it&#39;s needed to satisfy the requirements of Java "
-"SE&#39;s service provider architecture."
+"define any methods, but it's needed to satisfy the requirements of Java SE's "
+"service provider architecture."
 msgstr ""
 
 #. Tag: para
@@ -176,8 +176,8 @@
 #, no-c-format
 msgid ""
 "In fact, the extension can do a lot more than just observe. The extension is "
-"permitted to modify the container&#39;s metamodel and more. Here&#39;s a "
-"very simple example:"
+"permitted to modify the container's metamodel and more. Here's a very simple "
+"example:"
 msgstr ""
 
 #. Tag: para
@@ -219,7 +219,7 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"Let&#39;s study some of the interfaces exposed by the <literal>BeanManager</"
+"Let's study some of the interfaces exposed by the <literal>BeanManager</"
 "literal>."
 msgstr "延伸 Web Bean 的神經中樞為 <literal>Manager</literal> 這個物件。"
 
@@ -275,8 +275,7 @@
 
 #. Tag: para
 #, no-c-format
-msgid ""
-"There&#39;s an easy way to find out what beans exist in the application:"
+msgid "There's an easy way to find out what beans exist in the application:"
 msgstr ""
 
 #. Tag: para
@@ -311,9 +310,9 @@
 msgid ""
 "In this example, we make a framework class, <literal>SecurityManager</"
 "literal> available for injection. To make things a bit more interesting, "
-"we&#39;re going to delegate back to the container&#39;s "
-"<literal>InjectionTarget</literal> to perform instantiation and injection "
-"upon the <literal>SecurityManager</literal> instance."
+"we're going to delegate back to the container's <literal>InjectionTarget</"
+"literal> to perform instantiation and injection upon the "
+"<literal>SecurityManager</literal> instance."
 msgstr ""
 
 #. Tag: para
@@ -339,8 +338,8 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Let&#39;s start with an example of an extension that provides support for "
-"the use of <literal>@Named</literal> at the package level. The package-level "
+"Let's start with an example of an extension that provides support for the "
+"use of <literal>@Named</literal> at the package level. The package-level "
 "name is used to qualify the EL names of all beans defined in that package. "
 "The portable extension uses the <literal>ProcessAnnotatedType</literal> "
 "event to wrap the <literal>AnnotatedType</literal> object and override the "
@@ -350,7 +349,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Here&#39;s a second example, which adds the <literal>@Alternative</literal> "
+"Here's a second example, which adds the <literal>@Alternative</literal> "
 "annotation to any class which implements a certain <literal>Service</"
 "literal> interface."
 msgstr ""
@@ -381,12 +380,12 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Here&#39;s a CDI portable extension that reads values from properties files "
-"and configures fields of Java EE components, including servlets, EJBs, "
-"managed beans, interceptors and more. In this example, properties for a "
-"class such as <literal>org.mydomain.blog.Blogger</literal> go in a resource "
-"named <literal>org/mydomain/blog/Blogger.properties</literal>, and the name "
-"of a property must match the name of the field to be configured. So "
+"Here's a CDI portable extension that reads values from properties files and "
+"configures fields of Java EE components, including servlets, EJBs, managed "
+"beans, interceptors and more. In this example, properties for a class such "
+"as <literal>org.mydomain.blog.Blogger</literal> go in a resource named "
+"<literal>org/mydomain/blog/Blogger.properties</literal>, and the name of a "
+"property must match the name of the field to be configured. So "
 "<literal>Blogger.properties</literal> could contain:"
 msgstr ""
 
@@ -401,9 +400,9 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"There&#39;s a lot more to the portable extension SPI than what we&#39;ve "
-"discussed here. Check out the CDI spec or Javadoc for more information. For "
-"now, we&#39;ll just mention one more extension point."
+"There's a lot more to the portable extension SPI than what we've discussed "
+"here. Check out the CDI spec or Javadoc for more information. For now, we'll "
+"just mention one more extension point."
 msgstr ""
 
 #. Tag: title

Modified: doc/trunk/reference/src/main/docbook/zh-TW/extensions.po
===================================================================
--- doc/trunk/reference/src/main/docbook/zh-TW/extensions.po	2010-07-24 16:36:48 UTC (rev 6808)
+++ doc/trunk/reference/src/main/docbook/zh-TW/extensions.po	2010-07-25 04:22:37 UTC (rev 6809)
@@ -6,7 +6,7 @@
 "Project-Id-Version: Web_Beans:_Java_Contexts_and_Dependency_Injection "
 "VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-05-01T13:53:42\n"
+"POT-Creation-Date: 2010-07-25T03:52:14\n"
 "PO-Revision-Date: 2009-03-28 17:09+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -59,6 +59,6 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"If you are using Weld as your JSR-299 implementation, there&#39;s no need to "
-"include sl4j as it&#39;s already included (and used internally)."
+"If you are using Weld as your JSR-299 implementation, there's no need to "
+"include sl4j as it's already included (and used internally)."
 msgstr ""

Modified: doc/trunk/reference/src/main/docbook/zh-TW/gettingstarted.po
===================================================================
--- doc/trunk/reference/src/main/docbook/zh-TW/gettingstarted.po	2010-07-24 16:36:48 UTC (rev 6808)
+++ doc/trunk/reference/src/main/docbook/zh-TW/gettingstarted.po	2010-07-25 04:22:37 UTC (rev 6809)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: ri\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-05-01T13:53:42\n"
+"POT-Creation-Date: 2010-07-25T03:52:14\n"
 "PO-Revision-Date: 2009-01-19 18:21+1000\n"
 "Last-Translator: Terry Chuang <tchuang at redhat.com>\n"
 "Language-Team: Traditional Chinese <zh at li.org>\n"
@@ -49,7 +49,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"To run the examples with the provided build scripts, you&#39;ll need the "
+"To run the examples with the provided build scripts, you'll need the "
 "following:"
 msgstr ""
 
@@ -97,7 +97,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"You&#39;ll need a full install of Ant 1.7.0. Some linux distributions only "
+"You'll need a full install of Ant 1.7.0. Some linux distributions only "
 "supply a partial installation of Ant which cause the build to fail. If you "
 "encounter problems, verify that ant-nodeps.jar is on the classpath."
 msgstr ""
@@ -105,7 +105,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"In the next few sections, you&#39;ll be using the Ant command (<literal>ant</"
+"In the next few sections, you'll be using the Ant command (<literal>ant</"
 "literal>) to invoke the Ant build script in each example to compile, "
 "assemble and deploy the example to JBoss AS and, for the war example, Apache "
 "Tomcat. You can also deploy the generated artifact (war or ear) to any other "
@@ -124,7 +124,7 @@
 #, no-c-format
 msgid ""
 "The sections below cover the steps for deploying with both Ant and Maven in "
-"detail. Let&#39;s start with JBoss AS."
+"detail. Let's start with JBoss AS."
 msgstr ""
 
 #. Tag: title
@@ -135,25 +135,25 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"To deploy the examples to JBoss AS, you&#39;ll need <ulink url=\"http://"
-"jboss.org/jbossas/\">JBoss AS 6.0.0</ulink> or above. If a release of the "
-"JBoss AS 6.0 line isn&#39;t yet available, you can download a <ulink url="
-"\"http://hudson.jboss.org/hudson/view/JBoss%20AS/job/JBoss-AS-6.0.x/"
-"\">nightly snapshot</ulink>. The reason JBoss AS 6.0.0 or above is required "
-"is because it&#39;s the first release that has both CDI and Bean Validation "
-"support built-in, making it close enough to Java EE 6 to run the examples. "
-"The good news is that there are no additional modifications you have to make "
-"to the server. It&#39;s ready to go!"
+"To deploy the examples to JBoss AS, you'll need <ulink url=\"http://jboss."
+"org/jbossas/\">JBoss AS 6.0.0</ulink> or above. If a release of the JBoss AS "
+"6.0 line isn't yet available, you can download a <ulink url=\"http://hudson."
+"jboss.org/hudson/view/JBoss%20AS/job/JBoss-AS-6.0.x/\">nightly snapshot</"
+"ulink>. The reason JBoss AS 6.0.0 or above is required is because it's the "
+"first release that has both CDI and Bean Validation support built-in, making "
+"it close enough to Java EE 6 to run the examples. The good news is that "
+"there are no additional modifications you have to make to the server. It's "
+"ready to go!"
 msgstr ""
 
 #. Tag: para
 #, no-c-format
 msgid ""
 "After you have downloaded JBoss AS, extract it. (We recommended renaming the "
-"folder to include the <literal>as</literal> qualifier so it&#39;s clear that "
-"it&#39;s the application server). You can move the extracted folder anywhere "
-"you like. Wherever it lays to rest, that&#39;s what we&#39;ll call the JBoss "
-"AS installation directory, or <literal>JBOSS_HOME</literal>."
+"folder to include the <literal>as</literal> qualifier so it's clear that "
+"it's the application server). You can move the extracted folder anywhere you "
+"like. Wherever it lays to rest, that's what we'll call the JBoss AS "
+"installation directory, or <literal>JBOSS_HOME</literal>."
 msgstr ""
 
 #. Tag: para
@@ -169,7 +169,7 @@
 
 #. Tag: para
 #, fuzzy, no-c-format
-msgid "You&#39;re now ready to deploy your first example!"
+msgid "You're now ready to deploy your first example!"
 msgstr "現在,您已準備好建置您的第一個範例!"
 
 #. Tag: para
@@ -182,8 +182,8 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"If you haven&#39;t already, start JBoss AS. You can either start JBoss AS "
-"from a Linux shell:"
+"If you haven't already, start JBoss AS. You can either start JBoss AS from a "
+"Linux shell:"
 msgstr ""
 
 #. Tag: para
@@ -272,16 +272,16 @@
 msgid ""
 "The translator uses session beans, which are packaged in an EJB module "
 "within an ear. Java EE 6 will allow session beans to be deployed in war "
-"modules, but that&#39;s a topic for a later chapter."
+"modules, but that's a topic for a later chapter."
 msgstr ""
 
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"Again, wait a few seconds for the application to deploy (if you&#39;re "
-"really bored, read the log messages), and visit <ulink url=\"http://"
-"localhost:8080/weld-translator\">http://localhost:8080/weld-translator</"
-"ulink> to begin pseudo-translating."
+"Again, wait a few seconds for the application to deploy (if you're really "
+"bored, read the log messages), and visit <ulink url=\"http://localhost:8080/"
+"weld-translator\">http://localhost:8080/weld-translator</ulink> to begin "
+"pseudo-translating."
 msgstr ""
 "在此我們將設置 context 路徑,它能提供給我們一個網址(<ulink url=\"http://"
 "localhost:8080/webbeans-translator\">http://localhost:8080/webbeans-"
@@ -295,21 +295,21 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Deploying to GlassFish should be easy and familiar, right? After all, it&#39;"
-"s the Java EE 6 reference implementation and Weld is the JSR-299 reference "
-"implementation, meaning Weld gets bundled with GlassFish. So yes, it&#39;s "
-"all quite easy and familiar."
+"Deploying to GlassFish should be easy and familiar, right? After all, it's "
+"the Java EE 6 reference implementation and Weld is the JSR-299 reference "
+"implementation, meaning Weld gets bundled with GlassFish. So yes, it's all "
+"quite easy and familiar."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
 msgid ""
-"To deploy the examples to GlassFish, you&#39;ll need the final <ulink url="
+"To deploy the examples to GlassFish, you'll need the final <ulink url="
 "\"https://glassfish.dev.java.net/downloads/v3-final.html\">GlassFish V3</"
 "ulink> release. Select the release that ends in either <literal>-unix.sh</"
 "literal> or <literal>-windows.exe</literal> depending on your platform. "
-"After the download is complete, execute the installer. On Linux/Unix, "
-"you&#39;ll need to first make the script executable."
+"After the download is complete, execute the installer. On Linux/Unix, you'll "
+"need to first make the script executable."
 msgstr ""
 
 #. Tag: para
@@ -317,15 +317,15 @@
 msgid ""
 "On Windows you can just click on the executable. Follow the instructions in "
 "the installer. It will create a single domain named <literal>domain1</"
-"literal>. You&#39;ll use that domain to deploy the example. We recommend "
-"that you choose <literal>7070</literal> as the main HTTP port to avoid "
-"conflicts with a running instance of JBoss AS (or Apache Tomcat)."
+"literal>. You'll use that domain to deploy the example. We recommend that "
+"you choose <literal>7070</literal> as the main HTTP port to avoid conflicts "
+"with a running instance of JBoss AS (or Apache Tomcat)."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
 msgid ""
-"If you&#39;ve deployed either of the starter examples, <literal>weld-"
+"If you've deployed either of the starter examples, <literal>weld-"
 "numberguess</literal> or <literal>weld-translator</literal>, to JBoss AS, "
 "then you already have the deployable artifact you need. If not, switch to "
 "either of the two directories and build it."
@@ -335,11 +335,11 @@
 #, no-c-format
 msgid ""
 "The deployable archive for the <literal>weld-numberguess</literal>, named "
-"<literal>weld-numberguess.war</literal>, ends up in the example&#39;s "
+"<literal>weld-numberguess.war</literal>, ends up in the example's "
 "<literal>target</literal> directory. The archive for the <literal>weld-"
 "translator</literal> example, named <literal>weld-translator.ear</literal>, "
-"ends up in the example&#39;s <literal>ear/target</literal> directory. All "
-"you need to do now is deploy them to GlassFish."
+"ends up in the example's <literal>ear/target</literal> directory. All you "
+"need to do now is deploy them to GlassFish."
 msgstr ""
 
 #. Tag: para
@@ -358,15 +358,15 @@
 msgid ""
 "After a few seconds you can visit the Admin Console in the browser at the "
 "URL <ulink url=\"http://localhost:4848\">http://localhost:4848</ulink>. In "
-"the tree on the left-hand side of the page, click on &#34;Applications&#34;, "
-"then click on the &#34;Deploy...&#34; button under the heading &#34;"
-"Applications&#34; and select the deployable artifact for either of the two "
-"examples. The deployer should recognize that you have selected a Java EE "
-"artifact and allow you to start it. You can see the examples running at "
-"either <ulink url=\"http://localhost:7070/weld-numberguess\">http://"
-"localhost:7070/weld-numberguess</ulink> or <ulink url=\"http://"
-"localhost:7070/weld-translator\">http://localhost:7070/weld-translator</"
-"ulink>, depending on which example you deployed."
+"the tree on the left-hand side of the page, click on \"Applications\", then "
+"click on the \"Deploy...\" button under the heading \"Applications\" and "
+"select the deployable artifact for either of the two examples. The deployer "
+"should recognize that you have selected a Java EE artifact and allow you to "
+"start it. You can see the examples running at either <ulink url=\"http://"
+"localhost:7070/weld-numberguess\">http://localhost:7070/weld-numberguess</"
+"ulink> or <ulink url=\"http://localhost:7070/weld-translator\">http://"
+"localhost:7070/weld-translator</ulink>, depending on which example you "
+"deployed."
 msgstr ""
 
 #. Tag: para
@@ -403,16 +403,16 @@
 "Weld comes with a servlet listener which bootstraps the CDI environment, "
 "registers the <literal>BeanManager</literal> in JNDI and provides injection "
 "into servlets. Basically, it emulates some of the work done by the Java EE "
-"container. (But you don&#39;t get enterprise features such as session beans "
-"and container-managed transactions.)"
+"container. (But you don't get enterprise features such as session beans and "
+"container-managed transactions.)"
 msgstr ""
 
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"Let&#39;s give the Weld servlet extension a spin on Apache Tomcat. First, "
-"you&#39;ll need to download Tomcat 6.0.18 or later from <ulink url=\"http://"
-"tomcat.apache.org/download-60.cgi\">tomcat.apache.org</ulink> and extract it."
+"Let's give the Weld servlet extension a spin on Apache Tomcat. First, you'll "
+"need to download Tomcat 6.0.18 or later from <ulink url=\"http://tomcat."
+"apache.org/download-60.cgi\">tomcat.apache.org</ulink> and extract it."
 msgstr ""
 "接下來,請由 <ulink url=\"http://seamframework.org/Download\">seamframework."
 "org</ulink> 下載 Web Beans RI 並將它解壓縮。例如"
@@ -423,8 +423,8 @@
 "You have two choices for how you can deploy the application to Tomcat. You "
 "can deploy it by pushing the artifact to the hot deploy directory using Ant "
 "or you can deploy to the server across HTTP using a Maven plugin. The Ant "
-"approach doesn&#39;t require that you have Maven installed, so we&#39;ll "
-"start there. If you want to use Maven, you can just skip ahead."
+"approach doesn't require that you have Maven installed, so we'll start "
+"there. If you want to use Maven, you can just skip ahead."
 msgstr ""
 
 #. Tag: title
@@ -438,14 +438,14 @@
 "In order for Ant to push the artifact to the Tomcat hot deploy directory, it "
 "needs to know where the Tomcat installation is located. Again, we need to "
 "set a property in the <literal>local.build.properties</literal> file in the "
-"examples directory of the Weld distribution. If you haven&#39;t yet created "
-"this file, do so now. Then assign the path of your Tomcat installation to "
-"the property key <literal>tomcat.home</literal>."
+"examples directory of the Weld distribution. If you haven't yet created this "
+"file, do so now. Then assign the path of your Tomcat installation to the "
+"property key <literal>tomcat.home</literal>."
 msgstr ""
 
 #. Tag: para
 #, fuzzy, no-c-format
-msgid "Now you&#39;re ready to deploy the numberguess example to Tomcat!"
+msgid "Now you're ready to deploy the numberguess example to Tomcat!"
 msgstr "若要建置 numberguess 範例:"
 
 #. Tag: para
@@ -460,7 +460,7 @@
 msgid ""
 "The Ant build script includes additional targets for Tomcat to deploy and "
 "undeploy the archive in either exploded or packaged format. They are the "
-"same target names used for JBoss AS, prefixed with &#34;tomcat.&#34;."
+"same target names used for JBoss AS, prefixed with \"tomcat.\"."
 msgstr ""
 
 #. Tag: para
@@ -493,7 +493,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"If you haven&#39;t already, start Tomcat. You can either start Tomcat from a "
+"If you haven't already, start Tomcat. You can either start Tomcat from a "
 "Linux shell:"
 msgstr ""
 
@@ -516,15 +516,15 @@
 #, no-c-format
 msgid ""
 "You can also deploy the application to Tomcat using Maven. This section is a "
-"bit more advanced, so skip it unless you&#39;re itching to use Maven "
-"natively. Of course, you&#39;ll first need to make sure that you have Maven "
-"installed on your path, similar to how you setup Ant."
+"bit more advanced, so skip it unless you're itching to use Maven natively. "
+"Of course, you'll first need to make sure that you have Maven installed on "
+"your path, similar to how you setup Ant."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
 msgid ""
-"The Maven plugin communicates with Tomcat over HTTP, so it doesn&#39;t care "
+"The Maven plugin communicates with Tomcat over HTTP, so it doesn't care "
 "where you have installed Tomcat. However, the plugin configuration assumes "
 "you are running Tomcat in its default configuration, with a hostname of "
 "localhost and port <literal>8080</literal>. The <literal>readme.txt</"
@@ -582,7 +582,7 @@
 #, no-c-format
 msgid ""
 "There are several other Maven goals that you can use if you are hacking on "
-"the example, which are documented in the example&#39;s <literal>readme.txt</"
+"the example, which are documented in the example's <literal>readme.txt</"
 "literal> file."
 msgstr ""
 
@@ -604,10 +604,10 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"If you&#39;ve read through the entire Tomcat section, then you&#39;re all "
-"ready to go. The Maven build parallels the embedded Tomcat deployment. If "
-"not, don&#39;t worry. We&#39;ll still go over everything that you need to "
-"know again in this section."
+"If you've read through the entire Tomcat section, then you're all ready to "
+"go. The Maven build parallels the embedded Tomcat deployment. If not, don't "
+"worry. We'll still go over everything that you need to know again in this "
+"section."
 msgstr ""
 
 #. Tag: para
@@ -616,7 +616,7 @@
 "The Maven POM (<literal>pom.xml</literal>) includes a profile named "
 "<literal>jetty</literal> that activates the Maven Jetty plugin, which you "
 "can use to start Jetty in embedded mode and deploy the application in place. "
-"You don&#39;t need anything else installed except to have the Maven command "
+"You don't need anything else installed except to have the Maven command "
 "(<literal>mvn</literal>) on your path. The rest will be downloaded from the "
 "internet when the build is run."
 msgstr ""
@@ -688,9 +688,9 @@
 #, no-c-format
 msgid ""
 "Now, you are ready to run the server in Eclipse. Import the project into "
-"your Eclipse workspace using &#34;Import Existing Project into Workspace. "
-"Then, find the start class in <literal>src/jetty/java</literal> and run its "
-"main method as a Java Application. Jetty will launch. You can view the "
+"your Eclipse workspace using \"Import Existing Project into Workspace. Then, "
+"find the start class in <literal>src/jetty/java</literal> and run its main "
+"method as a Java Application. Jetty will launch. You can view the "
 "application at the following local URL: <ulink url=\"http://localhost:8080"
 "\">http://localhost:8080</ulink>. Pay particular attention to the port in "
 "the URL and the lack of a trailing context path."

Modified: doc/trunk/reference/src/main/docbook/zh-TW/injection.po
===================================================================
--- doc/trunk/reference/src/main/docbook/zh-TW/injection.po	2010-07-24 16:36:48 UTC (rev 6808)
+++ doc/trunk/reference/src/main/docbook/zh-TW/injection.po	2010-07-25 04:22:37 UTC (rev 6809)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: injection\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-05-01T14:44:09\n"
+"POT-Creation-Date: 2010-07-25T03:52:14\n"
 "PO-Revision-Date: 2009-01-19 16:05+1000\n"
 "Last-Translator: Terry Chuang <tchuang at redhat.com>\n"
 "Language-Team: Traditional Chinese <zh at li.org>\n"
@@ -106,7 +106,7 @@
 #, fuzzy, no-c-format
 msgid ""
 "Next, the container calls all initializer methods of bean (the call order is "
-"not portable, don&#39;t rely on it)."
+"not portable, don't rely on it)."
 msgstr "然後,Web Bean 管理員將會調用 Web Bean 的所有 initializer method。"
 
 #. Tag: para
@@ -145,7 +145,7 @@
 msgid ""
 "This is a case where the <literal>@Inject</literal> annotation <emphasis>is "
 "not</emphasis> required at the injection point. The same is true for "
-"observer methods (which we&#39;ll meet in <xref linkend=\"events\" />) and "
+"observer methods (which we'll meet in <xref linkend=\"events\" />) and "
 "disposer methods."
 msgstr ""
 
@@ -160,9 +160,9 @@
 "The CDI specification defines a procedure, called <emphasis>typesafe "
 "resolution</emphasis>, that the container follows when identifying the bean "
 "to inject to an injection point. This algorithm looks complex at first, but "
-"once you understand it, it&#39;s really quite intuitive. Typesafe resolution "
-"is performed at system initialization time, which means that the container "
-"will inform the developer immediately if a bean&#39;s dependencies cannot be "
+"once you understand it, it's really quite intuitive. Typesafe resolution is "
+"performed at system initialization time, which means that the container will "
+"inform the developer immediately if a bean's dependencies cannot be "
 "satisfied."
 msgstr ""
 "Web Bean 規格定義了一個流程,該流程稱為 <emphasis>typesafe resolution "
@@ -207,17 +207,17 @@
 #, no-c-format
 msgid ""
 "Obviously, if you have exactly one bean of a given type, and an injection "
-"point with that same type, then bean A is going to go into slot A. That&#39;"
-"s the simplest possible scenario. When you first start your application, "
-"you&#39;ll likely have lots of those."
+"point with that same type, then bean A is going to go into slot A. That's "
+"the simplest possible scenario. When you first start your application, "
+"you'll likely have lots of those."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
 msgid ""
-"But then, things start to get complicated. Let&#39;s explore how the "
-"container determines which bean to inject in more advanced cases. We&#39;ll "
-"start by taking a closer look at qualifiers."
+"But then, things start to get complicated. Let's explore how the container "
+"determines which bean to inject in more advanced cases. We'll start by "
+"taking a closer look at qualifiers."
 msgstr ""
 
 #. Tag: title
@@ -289,12 +289,12 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Now, you may be thinking, <emphasis>&#34;What&#39;s the different between "
-"using a qualifier and just specifying the exact implementation class you "
-"want?&#34;</emphasis> It&#39;s important to understand that a qualifier is "
-"like an extension of the interface. It does not create a direct dependency "
-"to any particular implementation. There may be multiple alterative "
-"implementations of <literal>@Asynchronous PaymentProcessor</literal>!"
+"Now, you may be thinking, <emphasis>\"What's the different between using a "
+"qualifier and just specifying the exact implementation class you want?\"</"
+"emphasis> It's important to understand that a qualifier is like an extension "
+"of the interface. It does not create a direct dependency to any particular "
+"implementation. There may be multiple alterative implementations of "
+"<literal>@Asynchronous PaymentProcessor</literal>!"
 msgstr ""
 
 #. Tag: title
@@ -311,12 +311,11 @@
 msgid ""
 "Whenever a bean or injection point does not explicitly declare a qualifier, "
 "the container assumes the qualifier <literal>@Default</literal>. From time "
-"to time, you&#39;ll need to decare an injection point without specifying a "
-"qualifier. There&#39;s a qualifier for that too. All beans have the "
-"qualifier <literal>@Any</literal>. Therefore, by explicitly specifying "
-"<literal>@Any</literal> at an injection point, you suppress the default "
-"qualifier, without otherwise restricting the beans that are eligible for "
-"injection."
+"to time, you'll need to decare an injection point without specifying a "
+"qualifier. There's a qualifier for that too. All beans have the qualifier "
+"<literal>@Any</literal>. Therefore, by explicitly specifying <literal>@Any</"
+"literal> at an injection point, you suppress the default qualifier, without "
+"otherwise restricting the beans that are eligible for injection."
 msgstr ""
 
 #. Tag: para
@@ -404,7 +403,7 @@
 "When an ambiguous dependency exists at an injection point, the container "
 "attempts to resolve the ambiguity by looking for an enabled alternative "
 "among the beans that could be injected. If there is exactly one enabled "
-"alternative, that&#39;s the bean that will be injected."
+"alternative, that's the bean that will be injected."
 msgstr ""
 
 #. Tag: title
@@ -429,8 +428,8 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"During the course of your development, you&#39;re going to encounter this "
-"situation. Let&#39;s learn how to resolve it."
+"During the course of your development, you're going to encounter this "
+"situation. Let's learn how to resolve it."
 msgstr ""
 
 #. Tag: para
@@ -504,7 +503,7 @@
 
 #. Tag: para
 #, no-c-format
-msgid "Just remember: &#34;There can be only one.&#34;"
+msgid "Just remember: \"There can be only one.\""
 msgstr ""
 
 #. Tag: para
@@ -512,14 +511,14 @@
 msgid ""
 "On the other hand, if you really do have an optional or multivalued "
 "injection point, you should change the type of your injection point to "
-"<literal>Instance</literal>, as we&#39;ll see in <xref linkend=\"lookup\" />."
+"<literal>Instance</literal>, as we'll see in <xref linkend=\"lookup\" />."
 msgstr ""
 
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"Now there&#39;s one more issue you need to be aware of when using the "
-"dependency injection service."
+"Now there's one more issue you need to be aware of when using the dependency "
+"injection service."
 msgstr "當您在 Web Bean 中使用依賴注入時,您還需要注意一個問題。"
 
 #. Tag: title
@@ -603,8 +602,7 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"classes which don&#39;t have a non-private constructor with no parameters, "
-"and"
+"classes which don't have a non-private constructor with no parameters, and"
 msgstr "沒有非私密 constructor 的無參數 class,以及"
 
 #. Tag: para
@@ -624,7 +622,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"It&#39;s usually very easy to fix an unproxyable dependency problem. If an "
+"It's usually very easy to fix an unproxyable dependency problem. If an "
 "injection point of type <literal>X</literal> results in an unproxyable "
 "dependency, simply:"
 msgstr ""
@@ -637,7 +635,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"change the type of the injection point to <literal>Instance&#60;X&#62;</"
+"change the type of the injection point to <literal>Instance&lt;X&gt;</"
 "literal>,"
 msgstr ""
 
@@ -678,7 +676,7 @@
 
 #. Tag: para
 #, no-c-format
-msgid "But we didn&#39;t get around to implementing this yet."
+msgid "But we didn't get around to implementing this yet."
 msgstr ""
 
 #. Tag: title
@@ -770,11 +768,10 @@
 #, no-c-format
 msgid ""
 "Next, we need to obtain an instance of our qualifier type. Since annotatons "
-"are interfaces, we can&#39;t just write <literal>new Asynchronous()</"
-"literal>. It&#39;s also quite tedious to create a concrete implementation of "
-"an annotation type from scratch. Instead, CDI lets us obtain a qualifier "
-"instance by subclassing the helper class <literal>AnnotationLiteral</"
-"literal>."
+"are interfaces, we can't just write <literal>new Asynchronous()</literal>. "
+"It's also quite tedious to create a concrete implementation of an annotation "
+"type from scratch. Instead, CDI lets us obtain a qualifier instance by "
+"subclassing the helper class <literal>AnnotationLiteral</literal>."
 msgstr ""
 
 #. Tag: para
@@ -785,8 +782,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"We can&#39;t use an anonymous class to implement a qualifier type with "
-"members."
+"We can't use an anonymous class to implement a qualifier type with members."
 msgstr ""
 
 #. Tag: para
@@ -851,8 +847,8 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"Let&#39;s look at an example. The following code is verbose, and vulnerable "
-"to refactoring problems:"
+"Let's look at an example. The following code is verbose, and vulnerable to "
+"refactoring problems:"
 msgstr ""
 "讓我們來探討下列範例。下列程式碼較為冗長,並且有重構(refactoring)問題上的弱"
 "點:"
@@ -874,8 +870,8 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"Not convinced? Then here&#39;s a second example. To inject HTTP parameters, "
-"we need to define a qualifier type:"
+"Not convinced? Then here's a second example. To inject HTTP parameters, we "
+"need to define a qualifier type:"
 msgstr ""
 "若您無法被說服的話,我們還有第二個範例。若要注入 HTTP 參數,我們需要定義一個"
 "綁定類型:"

Modified: doc/trunk/reference/src/main/docbook/zh-TW/interceptors.po
===================================================================
--- doc/trunk/reference/src/main/docbook/zh-TW/interceptors.po	2010-07-24 16:36:48 UTC (rev 6808)
+++ doc/trunk/reference/src/main/docbook/zh-TW/interceptors.po	2010-07-25 04:22:37 UTC (rev 6809)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: interceptors\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-05-01T13:53:43\n"
+"POT-Creation-Date: 2010-07-25T03:52:14\n"
 "PO-Revision-Date: 2009-01-15 12:13+1000\n"
 "Last-Translator: Terry Chuang <tchuang at redhat.com>\n"
 "Language-Team: Traditional Chinese <zh at li.org>\n"
@@ -94,7 +94,7 @@
 msgid ""
 "Suppose we want to declare that some of our beans are transactional. The "
 "first thing we need is an <emphasis>interceptor binding type</emphasis> to "
-"specify exactly which beans we&#39;re interested in:"
+"specify exactly which beans we're interested in:"
 msgstr ""
 "假設我們希望宣告我們有些 Web Bean 屬於交易性的 Web Bean。我們首先需要的就是一"
 "個 <emphasis>攔截器綁定標記(interceptor binding annotation)</emphasis>來明"
@@ -122,9 +122,9 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"That&#39;s great, but somewhere along the line we&#39;re going to have to "
-"actually implement the interceptor that provides this transaction management "
-"aspect. All we need to do is create a standard interceptor, and annotate it "
+"That's great, but somewhere along the line we're going to have to actually "
+"implement the interceptor that provides this transaction management aspect. "
+"All we need to do is create a standard interceptor, and annotate it "
 "<literal>@Interceptor</literal> and <literal>@Transactional</literal>."
 msgstr ""
 "我們必須在某個階段實際地實做提供此交易管理功能的攔截器。我們只需要建立一個標"

Modified: doc/trunk/reference/src/main/docbook/zh-TW/intro.po
===================================================================
--- doc/trunk/reference/src/main/docbook/zh-TW/intro.po	2010-07-24 16:36:48 UTC (rev 6808)
+++ doc/trunk/reference/src/main/docbook/zh-TW/intro.po	2010-07-25 04:22:37 UTC (rev 6809)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: intro\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-05-01T13:53:43\n"
+"POT-Creation-Date: 2010-07-25T03:52:14\n"
 "PO-Revision-Date: 2009-01-21 12:44+1000\n"
 "Last-Translator: Terry Chuang <tchuang at redhat.com>\n"
 "Language-Team: Traditional Chinese <zh at li.org>\n"
@@ -24,11 +24,11 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"So you&#39;re keen to get started writing your first bean? Or perhaps "
-"you&#39;re skeptical, wondering what kinds of hoops the CDI specification "
-"will make you jump through! The good news is that you&#39;ve probably "
-"already written and used hundreds, perhaps thousands of beans. CDI just "
-"makes it easier to actually use them to build an application!"
+"So you're keen to get started writing your first bean? Or perhaps you're "
+"skeptical, wondering what kinds of hoops the CDI specification will make you "
+"jump through! The good news is that you've probably already written and used "
+"hundreds, perhaps thousands of beans. CDI just makes it easier to actually "
+"use them to build an application!"
 msgstr ""
 "您是否已準備好開始編寫您的第一個 Web Bean 了呢?或是您針對於 Web Bean 本身的"
 "規格還是存有著一些疑問呢?不過好消息就是您從以前到現在可能早就已經編寫並使用"
@@ -50,14 +50,13 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Prior to Java EE 6, there was no clear definition of the term &#34;bean&#34; "
-"in the Java EE platform. Of course, we&#39;ve been calling Java classes used "
-"in web and enterprise applications &#34;beans&#34; for years. There were "
-"even a couple of different kinds of things called &#34;beans&#34; in EE "
-"specifications, including EJB beans and JSF managed beans. Meanwhile, other "
-"third-party frameworks such as Spring and Seam introduced their own ideas of "
-"what it meant to be a &#34;bean&#34;. What we&#39;ve been missing is a "
-"common definition."
+"Prior to Java EE 6, there was no clear definition of the term \"bean\" in "
+"the Java EE platform. Of course, we've been calling Java classes used in web "
+"and enterprise applications \"beans\" for years. There were even a couple of "
+"different kinds of things called \"beans\" in EE specifications, including "
+"EJB beans and JSF managed beans. Meanwhile, other third-party frameworks "
+"such as Spring and Seam introduced their own ideas of what it meant to be a "
+"\"bean\". What we've been missing is a common definition."
 msgstr ""
 
 #. Tag: para
@@ -69,8 +68,8 @@
 "Old Java Object). They support a small set of basic services, such as "
 "resource injection, lifecycle callbacks and interceptors. Companion "
 "specifications, such as EJB and CDI, build on this basic model. But, "
-"<emphasis>at last</emphasis>, there&#39;s a uniform concept of a bean and a "
-"lightweight component model that&#39;s aligned across the Java EE platform."
+"<emphasis>at last</emphasis>, there's a uniform concept of a bean and a "
+"lightweight component model that's aligned across the Java EE platform."
 msgstr ""
 
 #. Tag: para
@@ -79,31 +78,30 @@
 "With very few exceptions, almost every concrete Java class that has a "
 "constructor with no parameters (or a constructor designated with the "
 "annotation <literal>@Inject</literal>) is a bean. This includes every "
-"JavaBean and every EJB session bean. If you&#39;ve already got some "
-"JavaBeans or session beans lying around, they&#39;re already beans—you "
-"won&#39;t need any additional special metadata. There&#39;s just little one "
-"thing you need to do before you can start injecting them into stuff: you "
-"need to put them in an archive (a jar, or a Java EE module such as a war or "
-"EJB jar) that contains a special marker file: <literal>META-INF/beans.xml</"
-"literal>."
+"JavaBean and every EJB session bean. If you've already got some JavaBeans or "
+"session beans lying around, they're already beans—you won't need any "
+"additional special metadata. There's just little one thing you need to do "
+"before you can start injecting them into stuff: you need to put them in an "
+"archive (a jar, or a Java EE module such as a war or EJB jar) that contains "
+"a special marker file: <literal>META-INF/beans.xml</literal>."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
 msgid ""
-"The JavaBeans and EJBs you&#39;ve been writing every day, up until now, have "
-"not been able to take advantage of the new services defined by the CDI "
-"specification. But you&#39;ll be able to use every one of them with CDI—"
-"allowing the container to create and destroy instances of your beans and "
-"associate them with a designated context, injecting them into other beans, "
-"using them in EL expressions, specializing them with qualifier annotations, "
-"even adding interceptors and decorators to them—without modifying your "
-"existing code. At most, you&#39;ll need to add some annotations."
+"The JavaBeans and EJBs you've been writing every day, up until now, have not "
+"been able to take advantage of the new services defined by the CDI "
+"specification. But you'll be able to use every one of them with CDI—allowing "
+"the container to create and destroy instances of your beans and associate "
+"them with a designated context, injecting them into other beans, using them "
+"in EL expressions, specializing them with qualifier annotations, even adding "
+"interceptors and decorators to them—without modifying your existing code. At "
+"most, you'll need to add some annotations."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Now let&#39;s see how to create your first bean that actually uses CDI."
+msgid "Now let's see how to create your first bean that actually uses CDI."
 msgstr ""
 
 #. Tag: title
@@ -114,7 +112,7 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"Suppose that we have two existing Java classes that we&#39;ve been using for "
+"Suppose that we have two existing Java classes that we've been using for "
 "years in various applications. The first class parses a string into a list "
 "of sentences:"
 msgstr ""
@@ -139,8 +137,8 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"Unfortunately, we don&#39;t have a class that translates whole text "
-"documents. So let&#39;s write a bean for this job:"
+"Unfortunately, we don't have a class that translates whole text documents. "
+"So let's write a bean for this job:"
 msgstr ""
 "不巧的是,我們沒有一個可翻譯整個文字文件的現有 class。所以讓我們來編寫一個能"
 "夠完成這項工作的 Web Bean 吧:"
@@ -161,11 +159,11 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"As you&#39;ve guessed, the <literal>@Inject</literal> annotation has "
-"something to do with dependency injection! <literal>@Inject</literal> may be "
-"applied to a constructor or method of a bean, and tells the container to "
-"call that constructor or method when instantiating the bean. The container "
-"will inject other beans into the parameters of the constructor or method."
+"As you've guessed, the <literal>@Inject</literal> annotation has something "
+"to do with dependency injection! <literal>@Inject</literal> may be applied "
+"to a constructor or method of a bean, and tells the container to call that "
+"constructor or method when instantiating the bean. The container will inject "
+"other beans into the parameters of the constructor or method."
 msgstr ""
 "就如您所猜測地,<literal>@Initializer</literal> 這個標記和依賴注入有關係!"
 "<literal>@Initializer</literal> 可套用至一個 Web Bean 的 constructor 或是 "
@@ -186,7 +184,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Let&#39;s create a UI controller bean that uses field injection to obtain an "
+"Let's create a UI controller bean that uses field injection to obtain an "
 "instance of the <literal>TextTranslator</literal>, translating the text "
 "entered by a user:"
 msgstr ""
@@ -200,10 +198,10 @@
 #, no-c-format
 msgid ""
 "Notice the controller bean is request-scoped and named. Since this "
-"combination is so common in web applications, there&#39;s a built-in "
-"annotation for it in CDI that we could have used as a shorthand. When the "
-"(stereotype) annotation <literal>@Model</literal> is declared on a class, it "
-"creates a request-scoped and named bean."
+"combination is so common in web applications, there's a built-in annotation "
+"for it in CDI that we could have used as a shorthand. When the (stereotype) "
+"annotation <literal>@Model</literal> is declared on a class, it creates a "
+"request-scoped and named bean."
 msgstr ""
 
 #. Tag: para
@@ -219,11 +217,11 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Notice that it isn&#39;t necessary to create a getter or setter method to "
-"inject one bean into another. CDI can access an injected field directly "
-"(even if it&#39;s private!), which sometimes helps eliminate some wasteful "
-"code. The name of the field is arbitrary. It&#39;s the field&#39;s type that "
-"determines what is injected."
+"Notice that it isn't necessary to create a getter or setter method to inject "
+"one bean into another. CDI can access an injected field directly (even if "
+"it's private!), which sometimes helps eliminate some wasteful code. The name "
+"of the field is arbitrary. It's the field's type that determines what is "
+"injected."
 msgstr ""
 
 #. Tag: para
@@ -247,10 +245,10 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Before we get too deep in the details, let&#39;s pause and examine a "
-"bean&#39;s anatomy. What aspects of the bean are significant, and what gives "
-"it its identity? Instead of just giving examples of beans, we&#39;re going "
-"to define what <emphasis>makes</emphasis> something a bean."
+"Before we get too deep in the details, let's pause and examine a bean's "
+"anatomy. What aspects of the bean are significant, and what gives it its "
+"identity? Instead of just giving examples of beans, we're going to define "
+"what <emphasis>makes</emphasis> something a bean."
 msgstr ""
 
 #, fuzzy

Modified: doc/trunk/reference/src/main/docbook/zh-TW/master.po
===================================================================
--- doc/trunk/reference/src/main/docbook/zh-TW/master.po	2010-07-24 16:36:48 UTC (rev 6808)
+++ doc/trunk/reference/src/main/docbook/zh-TW/master.po	2010-07-25 04:22:37 UTC (rev 6809)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: master\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-05-01T13:53:43\n"
+"POT-Creation-Date: 2010-07-25T03:52:14\n"
 "PO-Revision-Date: 2009-01-08 10:09+1000\n"
 "Last-Translator: Terry Chuang <tchuang at redhat.com>\n"
 "Language-Team: Traditional Chinese <zh at li.org>\n"
@@ -25,20 +25,20 @@
 #, no-c-format
 msgid ""
 "Shortly before the final draft of JSR-299 was submitted, the specification "
-"changed its name from &#34;Web Beans&#34; to &#34;Java Contexts and "
-"Dependency Injection for the Java EE platform&#34;, abbreviated CDI. For a "
-"brief period after the renaming, the reference implementation adopted the "
-"name &#34;Web Beans&#34;. However, this ended up causing more confusion than "
-"it solved and Red Hat decided to change the name of the reference "
-"implementation to &#34;Weld&#34;. You may still find other documentation, "
-"blogs, forum posts, etc. that use the old nomenclature. Please update any "
-"references you can. The naming game is over."
+"changed its name from \"Web Beans\" to \"Java Contexts and Dependency "
+"Injection for the Java EE platform\", abbreviated CDI. For a brief period "
+"after the renaming, the reference implementation adopted the name \"Web Beans"
+"\". However, this ended up causing more confusion than it solved and Red Hat "
+"decided to change the name of the reference implementation to \"Weld\". You "
+"may still find other documentation, blogs, forum posts, etc. that use the "
+"old nomenclature. Please update any references you can. The naming game is "
+"over."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
 msgid ""
-"You&#39;ll also find that some of the functionality that once existed in the "
+"You'll also find that some of the functionality that once existed in the "
 "specification is now missing, such as defining beans in XML. These features "
 "will be available as portable extensions for CDI in the Weld project, and "
 "perhaps other implementations."
@@ -48,11 +48,11 @@
 #, no-c-format
 msgid ""
 "Note that this reference guide was started while changes were still being "
-"made to the specification. We&#39;ve done our best to update it for "
-"accuracy. If you discover a conflict between what is written in this guide "
-"and the specification, the specification is the authority—assume it is "
-"correct. If you believe you have found an error in the specification, please "
-"report it to the JSR-299 EG."
+"made to the specification. We've done our best to update it for accuracy. If "
+"you discover a conflict between what is written in this guide and the "
+"specification, the specification is the authority—assume it is correct. If "
+"you believe you have found an error in the specification, please report it "
+"to the JSR-299 EG."
 msgstr ""
 
 #. Tag: title

Modified: doc/trunk/reference/src/main/docbook/zh-TW/next.po
===================================================================
--- doc/trunk/reference/src/main/docbook/zh-TW/next.po	2010-07-24 16:36:48 UTC (rev 6808)
+++ doc/trunk/reference/src/main/docbook/zh-TW/next.po	2010-07-25 04:22:37 UTC (rev 6809)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: next\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-05-01T13:53:43\n"
+"POT-Creation-Date: 2010-07-25T03:52:14\n"
 "PO-Revision-Date: 2009-01-08 10:54+1000\n"
 "Last-Translator: Terry Chuang <tchuang at redhat.com>\n"
 "Language-Team: Traditional Chinese <zh at li.org>\n"
@@ -24,13 +24,13 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Because CDI is so new, there&#39;s not yet a lot of information available "
+"Because CDI is so new, there's not yet a lot of information available "
 "online. That will change over time. Regardless, the CDI specification "
 "remains the authority for information on CDI. The spec is less than 100 "
-"pages and is quite readable (don&#39;t worry, it&#39;s not like your Blu-ray "
-"player manual). Of course, it covers many details we&#39;ve skipped over "
-"here. The spec is available on the <ulink url=\"http://jcp.org/en/jsr/detail?"
-"id=299\">JSR-299 page</ulink> at the JCP website."
+"pages and is quite readable (don't worry, it's not like your Blu-ray player "
+"manual). Of course, it covers many details we've skipped over here. The spec "
+"is available on the <ulink url=\"http://jcp.org/en/jsr/detail?id=299\">JSR-"
+"299 page</ulink> at the JCP website."
 msgstr ""
 
 #. Tag: para
@@ -40,8 +40,8 @@
 "\"http://seamframework.org/Weld\">Seam project</ulink>. The RI development "
 "team and the CDI spec lead blog at <ulink url=\"http://in.relation.to\">in."
 "relation.to</ulink>. This guide was originally based on a series of blog "
-"entries published there while the specification was being developed. It&#39;"
-"s probably the best source of information about the future of CDI, Weld and "
+"entries published there while the specification was being developed. It's "
+"probably the best source of information about the future of CDI, Weld and "
 "Seam."
 msgstr ""
 "Web Beans Reference 的實做開發於 <literal>http://seamframework.org/WebBeans</"
@@ -77,8 +77,8 @@
 #, no-c-format
 msgid ""
 "Edit the <literal>pom.xml</literal> file in the root of the checkout and "
-"remove the &#34;<literal>-SNAPSHOT</literal>&#34; from the version element "
-"(so you don&#39;t have to build other Weld modules)."
+"remove the \"<literal>-SNAPSHOT</literal>\" from the version element (so you "
+"don't have to build other Weld modules)."
 msgstr ""
 
 #. Tag: para

Modified: doc/trunk/reference/src/main/docbook/zh-TW/part1.po
===================================================================
--- doc/trunk/reference/src/main/docbook/zh-TW/part1.po	2010-07-24 16:36:48 UTC (rev 6808)
+++ doc/trunk/reference/src/main/docbook/zh-TW/part1.po	2010-07-25 04:22:37 UTC (rev 6809)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: part1\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-05-01T13:53:43\n"
+"POT-Creation-Date: 2010-07-25T03:52:14\n"
 "PO-Revision-Date: 2009-01-15 12:16+1000\n"
 "Last-Translator: Terry Chuang <tchuang at redhat.com>\n"
 "Language-Team: Traditional Chinese <zh at li.org>\n"
@@ -175,7 +175,7 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"Where should I keep the reference to it when I&#39;m not currently using it?"
+"Where should I keep the reference to it when I'm not currently using it?"
 msgstr "當我沒有在直接使用它時,我應該將它的參照保留在哪裡呢?"
 
 #. Tag: para
@@ -194,9 +194,9 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"CDI is more than a framework. It&#39;s a whole, rich programming model. The "
+"CDI is more than a framework. It's a whole, rich programming model. The "
 "<emphasis>theme</emphasis> of CDI is <emphasis>loose-coupling with strong "
-"typing</emphasis>. Let&#39;s study what that phrase means."
+"typing</emphasis>. Let's study what that phrase means."
 msgstr ""
 
 #. Tag: para
@@ -251,8 +251,8 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"What&#39;s even more powerful (and comforting) is that CDI provides all "
-"these facilities in a <emphasis>typesafe</emphasis> way. CDI never relies on "
+"What's even more powerful (and comforting) is that CDI provides all these "
+"facilities in a <emphasis>typesafe</emphasis> way. CDI never relies on "
 "string-based identifiers to determine how collaborating objects fit "
 "together. Instead, CDI uses the typing information that is already available "
 "in the Java object model, augmented using a new programming pattern, called "
@@ -271,10 +271,10 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"But CDI isn&#39;t a restrictive programming model. It doesn&#39;t tell you "
-"how you should to structure your application into layers, how you should "
-"handle persistence, or what web framework you have to use. You&#39;ll have "
-"to decide those kinds of things for yourself."
+"But CDI isn't a restrictive programming model. It doesn't tell you how you "
+"should to structure your application into layers, how you should handle "
+"persistence, or what web framework you have to use. You'll have to decide "
+"those kinds of things for yourself."
 msgstr ""
 
 #. Tag: para
@@ -295,8 +295,8 @@
 "CDI was influenced by a number of existing Java frameworks, including Seam, "
 "Guice and Spring. However, CDI has its own, very distinct, character: more "
 "typesafe than Seam, more stateful and less XML-centric than Spring, more web "
-"and enterprise-application capable than Guice. But it couldn&#39;t have been "
-"any of these without inspiration from the frameworks mentioned and "
+"and enterprise-application capable than Guice. But it couldn't have been any "
+"of these without inspiration from the frameworks mentioned and "
 "<emphasis>lots</emphasis> of collaboration and hard work by the JSR-299 "
 "Expert Group (EG)."
 msgstr ""

Modified: doc/trunk/reference/src/main/docbook/zh-TW/part3.po
===================================================================
--- doc/trunk/reference/src/main/docbook/zh-TW/part3.po	2010-07-24 16:36:48 UTC (rev 6808)
+++ doc/trunk/reference/src/main/docbook/zh-TW/part3.po	2010-07-25 04:22:37 UTC (rev 6809)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: part3\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-05-01T13:53:43\n"
+"POT-Creation-Date: 2010-07-25T03:52:14\n"
 "PO-Revision-Date: 2009-01-14 16:07+1000\n"
 "Last-Translator: Terry Chuang <tchuang at redhat.com>\n"
 "Language-Team: Traditional Chinese <zh at li.org>\n"
@@ -19,8 +19,8 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"The first major theme of CDI is <emphasis>loose coupling</emphasis>. We&#39;"
-"ve already seen three means of achieving loose coupling:"
+"The first major theme of CDI is <emphasis>loose coupling</emphasis>. We've "
+"already seen three means of achieving loose coupling:"
 msgstr ""
 
 #. Tag: para
@@ -103,10 +103,10 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"You don&#39;t see string-based identifiers in CDI code, not because the "
+"You don't see string-based identifiers in CDI code, not because the "
 "framework is hiding them from you using clever defaulting rules—so-called "
-"&#34;configuration by convention&#34;—but because there are simply no "
-"strings there to begin with!"
+"\"configuration by convention\"—but because there are simply no strings "
+"there to begin with!"
 msgstr ""
 "您在 Web Bean 的程式碼中不會看見基於字串的識別符號,這不是因為 framework 透過"
 "使用預設的規則來將它隱藏起來 &#151; 又稱為「configuration by convention」 "
@@ -209,11 +209,11 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"We&#39;re now ready to meet some more advanced features of CDI. Bear in mind "
+"We're now ready to meet some more advanced features of CDI. Bear in mind "
 "that these features exist to make our code both easier to validate and more "
-"understandable. Most of the time you don&#39;t ever really <emphasis>need</"
-"emphasis> to use these features, but if you use them wisely, you&#39;ll come "
-"to appreciate their power."
+"understandable. Most of the time you don't ever really <emphasis>need</"
+"emphasis> to use these features, but if you use them wisely, you'll come to "
+"appreciate their power."
 msgstr ""
 "我們現在已準備好談到一些更為進階的 Web Bean 功能。請記得,這些功能是為了使我"
 "們的程式碼變得易於驗證和較容易理解。實際上大部分的時候您都不會真的<emphasis>"

Modified: doc/trunk/reference/src/main/docbook/zh-TW/part4.po
===================================================================
--- doc/trunk/reference/src/main/docbook/zh-TW/part4.po	2010-07-24 16:36:48 UTC (rev 6808)
+++ doc/trunk/reference/src/main/docbook/zh-TW/part4.po	2010-07-25 04:22:37 UTC (rev 6809)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: part4\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-05-01T13:53:43\n"
+"POT-Creation-Date: 2010-07-25T03:52:14\n"
 "PO-Revision-Date: 2009-01-14 16:59+1000\n"
 "Last-Translator: Terry Chuang <tchuang at redhat.com>\n"
 "Language-Team: Traditional Chinese <zh at li.org>\n"
@@ -19,12 +19,12 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"The third theme of CDI is <emphasis>integration</emphasis>. We&#39;ve "
-"already seen how CDI helps integrate EJB and JSF, allowing EJBs to be bound "
-"directly to JSF pages. That&#39;s just the beginning. The CDI services are "
-"integrated into the very core of the Java EE platform. Even EJB session "
-"beans can take advantage of the dependency injection, event bus, and "
-"contextual lifecycle management that CDI provides."
+"The third theme of CDI is <emphasis>integration</emphasis>. We've already "
+"seen how CDI helps integrate EJB and JSF, allowing EJBs to be bound directly "
+"to JSF pages. That's just the beginning. The CDI services are integrated "
+"into the very core of the Java EE platform. Even EJB session beans can take "
+"advantage of the dependency injection, event bus, and contextual lifecycle "
+"management that CDI provides."
 msgstr ""
 
 #. Tag: para
@@ -52,12 +52,12 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"We&#39;re about to see how to take full advantage of the Java EE platform in "
-"an application that uses CDI. We&#39;ll also briefly meet a set of SPIs that "
-"are provided to support portable extensions to CDI. You might not ever need "
-"to use these SPIs directly, but don&#39;t take them for granted. You will "
-"likely be using them indirectly, every time you use a third-party extension, "
-"such as Seam."
+"We're about to see how to take full advantage of the Java EE platform in an "
+"application that uses CDI. We'll also briefly meet a set of SPIs that are "
+"provided to support portable extensions to CDI. You might not ever need to "
+"use these SPIs directly, but don't take them for granted. You will likely be "
+"using them indirectly, every time you use a third-party extension, such as "
+"Seam."
 msgstr ""
 "我們正要探討如何在一個使用 Web Bean 的應用程式中有效地利用 Java EE 平台。我們"
 "也將簡短地探討一組提供來讓 Web Bean 支援 portable extension 的 SPI。您可能永"

Modified: doc/trunk/reference/src/main/docbook/zh-TW/producermethods.po
===================================================================
--- doc/trunk/reference/src/main/docbook/zh-TW/producermethods.po	2010-07-24 16:36:48 UTC (rev 6808)
+++ doc/trunk/reference/src/main/docbook/zh-TW/producermethods.po	2010-07-25 04:22:37 UTC (rev 6809)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: producermethods\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-05-01T13:53:43\n"
+"POT-Creation-Date: 2010-07-25T03:52:15\n"
 "PO-Revision-Date: 2009-01-16 12:31+1000\n"
 "Last-Translator: Terry Chuang <tchuang at redhat.com>\n"
 "Language-Team: Traditional Chinese <zh at li.org>\n"
@@ -26,7 +26,7 @@
 msgid ""
 "Producer methods let us overcome certain limitations that arise when a "
 "container, instead of the application, is responsible for instantiating "
-"objects. They&#39;re also the easiest way to integrate objects which are not "
+"objects. They're also the easiest way to integrate objects which are not "
 "beans into the CDI environment."
 msgstr ""
 "Producer method 讓我們在當 Web Bean 管理員(而不是應用程式)負責舉例說明"
@@ -92,9 +92,9 @@
 #, no-c-format
 msgid ""
 "In particular, producer methods let us use runtime polymorphism with CDI. As "
-"we&#39;ve seen, alternative beans are one solution to the problem of "
-"deployment-time polymorphism. But once the system is deployed, the CDI "
-"implementation is fixed. A producer method has no such limitation:"
+"we've seen, alternative beans are one solution to the problem of deployment-"
+"time polymorphism. But once the system is deployed, the CDI implementation "
+"is fixed. A producer method has no such limitation:"
 msgstr ""
 
 #. Tag: para
@@ -145,7 +145,7 @@
 msgid ""
 "Now, when the producer method is called, the returned "
 "<literal>PaymentStrategy</literal> will be bound to the session context. The "
-"producer method won&#39;t be called again in the same session."
+"producer method won't be called again in the same session."
 msgstr ""
 "現在,當 producer method 被調用時,回傳的 <literal>PaymentStrategy</literal> "
 "將會被綁定至 session context。Producer method 將不會在相同的 session 中再次被"
@@ -171,11 +171,11 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"There&#39;s one potential problem with the code above. The implementations "
-"of <literal>CreditCardPaymentStrategy</literal> are instantiated using the "
-"Java <literal>new</literal> operator. Objects instantiated directly by the "
-"application can&#39;t take advantage of dependency injection and don&#39;t "
-"have interceptors."
+"There's one potential problem with the code above. The implementations of "
+"<literal>CreditCardPaymentStrategy</literal> are instantiated using the Java "
+"<literal>new</literal> operator. Objects instantiated directly by the "
+"application can't take advantage of dependency injection and don't have "
+"interceptors."
 msgstr ""
 "上述程式碼有個潛在的問題。<literal>CreditCardPaymentStrategy</literal> 的實做"
 "是透過使用 Java 的 <literal>new</literal> operator 來例示(instantiate)的。"
@@ -185,7 +185,7 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"If this isn&#39;t what we want, we can use dependency injection into the "
+"If this isn't what we want, we can use dependency injection into the "
 "producer method to obtain bean instances:"
 msgstr ""
 "若這不是我們所想要的,我們可使用依賴注入至 producer method 之中來取得 Web "
@@ -195,13 +195,13 @@
 #, fuzzy, no-c-format
 msgid ""
 "Wait, what if <literal>CreditCardPaymentStrategy</literal> is a request-"
-"scoped bean? Then the producer method has the effect of &#34;promoting&#34; "
-"the current request scoped instance into session scope. This is almost "
-"certainly a bug! The request scoped object will be destroyed by the "
-"container before the session ends, but the reference to the object will be "
-"left &#34;hanging&#34; in the session scope. This error will <emphasis>not</"
-"emphasis> be detected by the container, so please take extra care when "
-"returning bean instances from producer methods!"
+"scoped bean? Then the producer method has the effect of \"promoting\" the "
+"current request scoped instance into session scope. This is almost certainly "
+"a bug! The request scoped object will be destroyed by the container before "
+"the session ends, but the reference to the object will be left \"hanging\" "
+"in the session scope. This error will <emphasis>not</emphasis> be detected "
+"by the container, so please take extra care when returning bean instances "
+"from producer methods!"
 msgstr ""
 "請稍等,若 <literal>CreditCardPaymentStrategy</literal> 是個請求 scope 的 "
 "Web Bean 的話要怎麼辦?若是如此那麼 producer method 便有將現有的 request "
@@ -214,7 +214,7 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"There&#39;s at least three ways we could go about fixing this bug. We could "
+"There's at least three ways we could go about fixing this bug. We could "
 "change the scope of the <literal>CreditCardPaymentStrategy</literal> "
 "implementation, but this would affect other clients of that bean. A better "
 "option would be to change the scope of the producer method to "
@@ -248,7 +248,7 @@
 "Then a new <emphasis>dependent</emphasis> instance of "
 "<literal>CreditCardPaymentStrategy</literal> will be created, passed to the "
 "producer method, returned by the producer method and finally bound to the "
-"session context. The dependent object won&#39;t be destroyed until the "
+"session context. The dependent object won't be destroyed until the "
 "<literal>Preferences</literal> object is destroyed, at the end of the "
 "session."
 msgstr ""

Modified: doc/trunk/reference/src/main/docbook/zh-TW/resources.po
===================================================================
--- doc/trunk/reference/src/main/docbook/zh-TW/resources.po	2010-07-24 16:36:48 UTC (rev 6808)
+++ doc/trunk/reference/src/main/docbook/zh-TW/resources.po	2010-07-25 04:22:37 UTC (rev 6809)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: Weld_-_JSR-299_Reference_Implementation VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-05-01T13:53:43\n"
+"POT-Creation-Date: 2010-07-25T03:52:15\n"
 "PO-Revision-Date: 2009-11-11 15:00+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -34,8 +34,8 @@
 "injection in CDI. Most notably, component environment injection relies on "
 "string-based names to qualify ambiguous types, and there is no real "
 "consistency as to the nature of the names (sometimes a JNDI name, sometimes "
-"a persistence unit name, sometimes an EJB link, sometimes a nonportable &#34;"
-"mapped name&#34;). Producer fields turned out to be an elegant adaptor to "
+"a persistence unit name, sometimes an EJB link, sometimes a nonportable "
+"\"mapped name\"). Producer fields turned out to be an elegant adaptor to "
 "reduce all this complexity to a common model and get component environment "
 "resources to participate in the CDI system just like any other kind of bean."
 msgstr ""
@@ -127,10 +127,10 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"It might feel strange to be declaring resources in Java code. Isn&#39;t this "
-"stuff that might be deployment-specific? Certainly, and that&#39;s why it "
-"makes sense to declare your resources in a class annotated "
-"<literal>@Alternative</literal>."
+"It might feel strange to be declaring resources in Java code. Isn't this "
+"stuff that might be deployment-specific? Certainly, and that's why it makes "
+"sense to declare your resources in a class annotated <literal>@Alternative</"
+"literal>."
 msgstr ""
 
 #. Tag: title
@@ -156,9 +156,9 @@
 "It might seem like a pain to have to write these extra producer field "
 "declarations, just to gain an additional level of indirection. You could "
 "just as well use component environment injection directly, right? But "
-"remember that you&#39;re going to be using resources like the "
-"<literal>EntityManager</literal> in several different beans. Isn&#39;t it "
-"nicer and more typesafe to write"
+"remember that you're going to be using resources like the "
+"<literal>EntityManager</literal> in several different beans. Isn't it nicer "
+"and more typesafe to write"
 msgstr ""
 
 #. Tag: para

Modified: doc/trunk/reference/src/main/docbook/zh-TW/ri-spi.po
===================================================================
--- doc/trunk/reference/src/main/docbook/zh-TW/ri-spi.po	2010-07-24 16:36:48 UTC (rev 6808)
+++ doc/trunk/reference/src/main/docbook/zh-TW/ri-spi.po	2010-07-25 04:22:37 UTC (rev 6809)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: ri-spi\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-05-01T13:53:43\n"
+"POT-Creation-Date: 2010-07-25T03:52:15\n"
 "PO-Revision-Date: 2009-01-20 11:43+1000\n"
 "Last-Translator: Terry Chuang <tchuang at redhat.com>\n"
 "Language-Team: Traditional Chinese <zh at li.org>\n"
@@ -40,8 +40,8 @@
 "If you just want to use managed beans, and not take advantage of enterprise "
 "services (EE resource injection, CDI injection into EE component classes, "
 "transactional events, support for CDI services in EJBs) and non-flat "
-"deployments, then the generic servlet support provided by the &#34;Weld: "
-"Servlets&#34; extension will be sufficient, and will work in any container "
+"deployments, then the generic servlet support provided by the \"Weld: "
+"Servlets\" extension will be sufficient, and will work in any container "
 "supporting the Servlet API."
 msgstr ""
 
@@ -86,8 +86,8 @@
 "implementation of the <literal>Environment</literal> interface. A number of "
 "standard environments are built in, and described by the "
 "<literal>Environments</literal> enumeration. Different environments require "
-"different services to be present (for example a Servlet container doesn&#39;"
-"t require transaction, EJB or JPA services). By default an EE environment is "
+"different services to be present (for example a Servlet container doesn't "
+"require transaction, EJB or JPA services). By default an EE environment is "
 "assumed, but you can adjust the environment by calling <literal>bootstrap."
 "setEnvironment()</literal>."
 msgstr ""
@@ -166,7 +166,7 @@
 "BDAs it can access. However many containers will allow an easy mechanism to "
 "make BDAs bi-directionally accessible (such as a library directory). In this "
 "case, it is allowable (and reasonable) to describe all such archives as a "
-"single, &#39;virtual&#39; <literal>BeanDeploymentArchive</literal>."
+"single, 'virtual' <literal>BeanDeploymentArchive</literal>."
 msgstr ""
 
 #. Tag: para
@@ -181,7 +181,7 @@
 #, no-c-format
 msgid ""
 "<literal>BeanDeploymentArchive</literal> provides three methods which allow "
-"it&#39;s contents to be discovered by Weld—<literal>BeanDeploymentArchive."
+"it's contents to be discovered by Weld—<literal>BeanDeploymentArchive."
 "getBeanClasses()</literal> must return all the classes in the BDA, "
 "<literal>BeanDeploymentArchive.getBeansXml()</literal> must return all the "
 "deployment descriptors in the archive, and <literal>BeanDeploymentArchive."
@@ -210,7 +210,7 @@
 "In practice, you can regard the deployment structure represented by "
 "<literal>Deployment</literal>, and the virtual BDA graph as a mirror of the "
 "classloader structure for a deployment. If a class can from BDA X can be "
-"loaded by another in BDA Y, it is accessible, and therefore BDA Y&#39;s "
+"loaded by another in BDA Y, it is accessible, and therefore BDA Y's "
 "accessible BDAs should include BDA X."
 msgstr ""
 
@@ -246,7 +246,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Weld delegates EJB 3 bean discovery to the container so that it doesn&#39;t "
+"Weld delegates EJB 3 bean discovery to the container so that it doesn't "
 "duplicate the work done by the EJB container, and respects any vendor-"
 "extensions to the EJB definition."
 msgstr ""
@@ -316,7 +316,7 @@
 msgid ""
 "If you use a non-EE environment then you may implement any of the EE service "
 "SPIs, and Weld will provide the associated functionality. There is no need "
-"to implement those services you don&#39;t need!"
+"to implement those services you don't need!"
 msgstr ""
 
 #. Tag: title
@@ -546,9 +546,9 @@
 #, no-c-format
 msgid ""
 "Weld expects the Application Server or other container to provide the "
-"storage for each application&#39;s context. The <literal>org.jboss.weld."
-"context.api.BeanStore</literal> should be implemented to provide an "
-"application scoped storage."
+"storage for each application's context. The <literal>org.jboss.weld.context."
+"api.BeanStore</literal> should be implemented to provide an application "
+"scoped storage."
 msgstr ""
 
 #. Tag: title

Modified: doc/trunk/reference/src/main/docbook/zh-TW/scopescontexts.po
===================================================================
--- doc/trunk/reference/src/main/docbook/zh-TW/scopescontexts.po	2010-07-24 16:36:48 UTC (rev 6808)
+++ doc/trunk/reference/src/main/docbook/zh-TW/scopescontexts.po	2010-07-25 04:22:37 UTC (rev 6809)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: scopescontexts\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-05-01T13:53:43\n"
+"POT-Creation-Date: 2010-07-25T03:52:15\n"
 "PO-Revision-Date: 2009-01-20 16:49+1000\n"
 "Last-Translator: Terry Chuang <tchuang at redhat.com>\n"
 "Language-Team: Traditional Chinese <zh at li.org>\n"
@@ -24,7 +24,7 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"So far, we&#39;ve seen a few examples of <emphasis>scope type annotations</"
+"So far, we've seen a few examples of <emphasis>scope type annotations</"
 "emphasis>. The scope of a bean determines the lifecycle of instances of the "
 "bean. The scope also determines which clients refer to which instances of "
 "the bean. According to the CDI specification, a scope determines:"
@@ -69,13 +69,13 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"JPA entities aren&#39;t a great fit for this model. Entities have their "
-"whole own lifecycle and identity model which just doesn&#39;t map naturally "
-"to the model used in CDI. Therefore, we recommend against treating entities "
-"as CDI beans. You&#39;re certainly going to run into problems if you try to "
-"give an entity a scope other than the default scope <literal>@Dependent</"
-"literal>. The client proxy will get in the way if you try to pass an "
-"injected instance to the JPA <literal>EntityManager</literal>."
+"JPA entities aren't a great fit for this model. Entities have their whole "
+"own lifecycle and identity model which just doesn't map naturally to the "
+"model used in CDI. Therefore, we recommend against treating entities as CDI "
+"beans. You're certainly going to run into problems if you try to give an "
+"entity a scope other than the default scope <literal>@Dependent</literal>. "
+"The client proxy will get in the way if you try to pass an injected instance "
+"to the JPA <literal>EntityManager</literal>."
 msgstr ""
 
 #. Tag: title
@@ -86,8 +86,8 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"CDI features an <emphasis>extensible context model</emphasis>. It&#39;s "
-"possible to define new scopes by creating a new scope type annotation:"
+"CDI features an <emphasis>extensible context model</emphasis>. It's possible "
+"to define new scopes by creating a new scope type annotation:"
 msgstr ""
 "Web Bean 含有著一個 <emphasis>extensible context model(可延伸的 context 模"
 "型)</emphasis>。您可藉由建立新的 scope 類型標記來定義新的 scope:"
@@ -95,7 +95,7 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"Of course, that&#39;s the easy part of the job. For this scope type to be "
+"Of course, that's the easy part of the job. For this scope type to be "
 "useful, we will also need to define a <literal>Context</literal> object that "
 "implements the scope! Implementing a <literal>Context</literal> is usually a "
 "very technical task, intended for framework development only. You can expect "
@@ -118,7 +118,7 @@
 
 #. Tag: para
 #, fuzzy, no-c-format
-msgid "Usually, you&#39;ll use one of CDI&#39;s built-in scopes."
+msgid "Usually, you'll use one of CDI's built-in scopes."
 msgstr "您通常會使用到其中一個 Web Bean 的內建 scope。"
 
 #. Tag: title
@@ -234,7 +234,7 @@
 #, fuzzy, no-c-format
 msgid ""
 "Three of the four built-in scopes should be extremely familiar to every Java "
-"EE developer, so let&#39;s not waste time discussing them here. One of the "
+"EE developer, so let's not waste time discussing them here. One of the "
 "scopes, however, is new."
 msgstr ""
 "四個內建 scope 中有其中的三個對於所有 Java EE 開發人員來說應該都不陌生,所以"
@@ -379,7 +379,7 @@
 
 #. Tag: para
 #, no-c-format
-msgid "It&#39;s probably better to use one of the link components in JSF 2:"
+msgid "It's probably better to use one of the link components in JSF 2:"
 msgstr ""
 
 #. Tag: para
@@ -387,8 +387,8 @@
 msgid ""
 "The conversation context propagates across redirects, making it very easy to "
 "implement the common POST-then-redirect pattern, without resort to fragile "
-"constructs such as a &#34;flash&#34; object. The container automatically "
-"adds the conversation id to the redirect URL as a request parameter."
+"constructs such as a \"flash\" object. The container automatically adds the "
+"conversation id to the redirect URL as a request parameter."
 msgstr ""
 "Web Bean 管理員也必須將 conversation 在任何重定向作業之間進行傳播,儘管該 "
 "conversation 沒有被標記為 long-running。這使得實做一般的 POST-then-redirect "
@@ -453,12 +453,12 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"You can guess what &#34;singleton&#34; means here. It means a bean that is "
-"instantiated once. Unfortunately, there&#39;s a little problem with this "
-"pseudo-scope. Beans with scope <literal>@Singleton</literal> don&#39;t have "
-"a proxy object. Clients hold a direct reference to the singleton instance. "
-"So we need to consider the case of a client that can be serialized, for "
-"example, any bean with scope <literal>@SessionScoped</literal> or "
+"You can guess what \"singleton\" means here. It means a bean that is "
+"instantiated once. Unfortunately, there's a little problem with this pseudo-"
+"scope. Beans with scope <literal>@Singleton</literal> don't have a proxy "
+"object. Clients hold a direct reference to the singleton instance. So we "
+"need to consider the case of a client that can be serialized, for example, "
+"any bean with scope <literal>@SessionScoped</literal> or "
 "<literal>@ConversationScoped</literal>, any dependent object of a bean with "
 "scope <literal>@SessionScoped</literal> or <literal>@ConversationScoped</"
 "literal>, or any stateful session bean."
@@ -468,7 +468,7 @@
 #, no-c-format
 msgid ""
 "Now, if the singleton instance is a simple, immutable, serializable object "
-"like a string, a number or a date, we probably don&#39;t mind too much if it "
+"like a string, a number or a date, we probably don't mind too much if it "
 "gets duplicated via serialization. However, that makes it no stop being a "
 "true singleton, and we may as well have just declared it with the default "
 "scope."
@@ -499,7 +499,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"give the client a reference of type <literal>Instance&#60;X&#62;</literal> "
+"give the client a reference of type <literal>Instance&lt;X&gt;</literal> "
 "where <literal>X</literal> is the bean type of the singleton bean."
 msgstr ""
 
@@ -557,8 +557,8 @@
 "If you need to access a bean directly by EL name in a JSF page, you probably "
 "need to give it a scope other than <literal>@Dependent</literal>. Otherwise, "
 "any value that gets set to the bean by a JSF input will be lost immediately. "
-"That&#39;s why CDI features the <literal>@Model</literal> stereotype; it "
-"lets you give a bean a name, and set its scope to <literal>@RequestScoped</"
+"That's why CDI features the <literal>@Model</literal> stereotype; it lets "
+"you give a bean a name, and set its scope to <literal>@RequestScoped</"
 "literal> in one stroke. If you need to access a bean that really "
 "<emphasis>has</emphasis> to have the scope <literal>@Dependent</literal> "
 "from a JSF page, inject it into a different bean, and expose it to EL via a "
@@ -568,8 +568,8 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Beans with scope <literal>@Dependent</literal> don&#39;t need a proxy "
-"object. The client holds a direct reference to its instance."
+"Beans with scope <literal>@Dependent</literal> don't need a proxy object. "
+"The client holds a direct reference to its instance."
 msgstr ""
 
 #. Tag: para
@@ -634,8 +634,8 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"This feature is particularly useful with producer methods, as we&#39;ll see "
-"in the next chapter."
+"This feature is particularly useful with producer methods, as we'll see in "
+"the next chapter."
 msgstr ""
 "這項功能對於 producer method 來講特別有幫助,我們將在下個章節中討論到。"
 

Modified: doc/trunk/reference/src/main/docbook/zh-TW/specialization.po
===================================================================
--- doc/trunk/reference/src/main/docbook/zh-TW/specialization.po	2010-07-24 16:36:48 UTC (rev 6808)
+++ doc/trunk/reference/src/main/docbook/zh-TW/specialization.po	2010-07-25 04:22:37 UTC (rev 6809)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: specialization\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-05-01T13:53:43\n"
+"POT-Creation-Date: 2010-07-25T03:52:15\n"
 "PO-Revision-Date: 2009-01-20 11:42+1000\n"
 "Last-Translator: Terry Chuang <tchuang at redhat.com>\n"
 "Language-Team: Traditional Chinese <zh at li.org>\n"
@@ -24,15 +24,15 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"When you first start developing with CDI, you&#39;ll likely be dealing only "
-"with a single bean implementation for each bean type. In this case, it&#39;s "
-"easy to understand how beans get selected for injection. As the complexity "
-"of your application grows, multiple occurrences of the same bean type start "
+"When you first start developing with CDI, you'll likely be dealing only with "
+"a single bean implementation for each bean type. In this case, it's easy to "
+"understand how beans get selected for injection. As the complexity of your "
+"application grows, multiple occurrences of the same bean type start "
 "appearing, either because you have multiple implementations or two beans "
-"share a common (Java) inheritance. That&#39;s when you have to begin "
-"studying the specialization, inheritance and alternative rules to work "
-"through unsatisfied or ambiguous dependencies or to avoid certain beans from "
-"being called."
+"share a common (Java) inheritance. That's when you have to begin studying "
+"the specialization, inheritance and alternative rules to work through "
+"unsatisfied or ambiguous dependencies or to avoid certain beans from being "
+"called."
 msgstr ""
 
 #. Tag: para
@@ -61,10 +61,10 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"The second case is the default assumed by CDI. It&#39;s possible to have two "
+"The second case is the default assumed by CDI. It's possible to have two "
 "beans in the system with the same part bean type (interface or parent "
-"class). As you&#39;ve learned, you select between the two implementations "
-"using qualifiers."
+"class). As you've learned, you select between the two implementations using "
+"qualifiers."
 msgstr ""
 
 #. Tag: para
@@ -74,7 +74,7 @@
 "deployment, only one bean can fulfill a given role at a time. That means one "
 "bean needs to be enabled and the other disabled. There are a two modifiers "
 "involved: <literal>@Alternative</literal> and <literal>@Specializes</"
-"literal>. We&#39;ll start by looking at alternatives and then show the "
+"literal>. We'll start by looking at alternatives and then show the "
 "guarantees that specialization adds."
 msgstr ""
 
@@ -98,8 +98,8 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"But in our staging environment, we don&#39;t really want to submit payments "
-"to the external system, so we override that implementation of "
+"But in our staging environment, we don't really want to submit payments to "
+"the external system, so we override that implementation of "
 "<literal>PaymentProcessor</literal> with a different bean:"
 msgstr ""
 "不過在我們的中繼環境(staging environment)中,我們利用了不同的 Web Bean 來置"
@@ -113,19 +113,18 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"We&#39;ve already seen how we can enable this alternative by listing its "
-"class in the <literal>beans.xml</literal> descriptor."
+"We've already seen how we can enable this alternative by listing its class "
+"in the <literal>beans.xml</literal> descriptor."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
 msgid ""
 "But suppose we have many alternatives in the staging environment. It would "
-"be much more convenient to be able to enable them all at once. So let&#39;s "
-"make <literal>@Staging</literal> an <literal>@Alternative</literal> "
-"stereotype and annotate the staging beans with this stereotype instead. "
-"You&#39;ll see how this level of indirection pays off. First, we create the "
-"stereotype:"
+"be much more convenient to be able to enable them all at once. So let's make "
+"<literal>@Staging</literal> an <literal>@Alternative</literal> stereotype "
+"and annotate the staging beans with this stereotype instead. You'll see how "
+"this level of indirection pays off. First, we create the stereotype:"
 msgstr ""
 
 #. Tag: para
@@ -166,7 +165,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"So we haven&#39;t completely replaced the default implementation in this "
+"So we haven't completely replaced the default implementation in this "
 "deployment of the system. The only way one bean can completely override a "
 "second bean at all injection points is if it implements all the bean types "
 "and declares all the qualifiers of the second bean. However, if the second "
@@ -236,8 +235,8 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Since we&#39;re informing the container that our alternative bean is meant "
-"to stand in as a replacement for the default implementation, the alternative "
+"Since we're informing the container that our alternative bean is meant to "
+"stand in as a replacement for the default implementation, the alternative "
 "implementation automatically inherits all qualifiers of the default "
 "implementation. Thus, in our example, "
 "<literal>MockCreditCardPaymentProcessor</literal> inherits the qualifiers "

Modified: doc/trunk/reference/src/main/docbook/zh-TW/stereotypes.po
===================================================================
--- doc/trunk/reference/src/main/docbook/zh-TW/stereotypes.po	2010-07-24 16:36:48 UTC (rev 6808)
+++ doc/trunk/reference/src/main/docbook/zh-TW/stereotypes.po	2010-07-25 04:22:37 UTC (rev 6809)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: stereotypes\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-05-01T13:53:43\n"
+"POT-Creation-Date: 2010-07-25T03:52:15\n"
 "PO-Revision-Date: 2009-01-13 15:44+1000\n"
 "Last-Translator: Terry Chuang <tchuang at redhat.com>\n"
 "Language-Team: Traditional Chinese <zh at li.org>\n"
@@ -96,7 +96,7 @@
 #, no-c-format
 msgid ""
 "Of course, we need to apply some other annotations to our stereotype or else "
-"it wouldn&#39;t be adding much value."
+"it wouldn't be adding much value."
 msgstr ""
 
 #. Tag: title
@@ -121,7 +121,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Naturally, overriding a single default isn&#39;t much use. But remember, "
+"Naturally, overriding a single default isn't much use. But remember, "
 "stereotypes can define more than just the default scope."
 msgstr ""
 
@@ -200,8 +200,8 @@
 #, no-c-format
 msgid ""
 "This may blow your mind a bit, but stereotypes may declare other "
-"stereotypes, which we&#39;ll call <emphasis>stereotype stacking</emphasis>. "
-"You may want to do this if you have two distinct stereotypes which are "
+"stereotypes, which we'll call <emphasis>stereotype stacking</emphasis>. You "
+"may want to do this if you have two distinct stereotypes which are "
 "meaningful on their own, but in other situation may be meaningful when "
 "combined."
 msgstr ""
@@ -209,7 +209,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Here&#39;s an example that combines the <literal>@Action</literal> and "
+"Here's an example that combines the <literal>@Action</literal> and "
 "<literal>@Auditable</literal> stereotypes:"
 msgstr ""
 
@@ -221,9 +221,8 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"We&#39;ve already met two standard stereotypes defined by the CDI "
-"specification: <literal>@Interceptor</literal> and <literal>@Decorator</"
-"literal>."
+"We've already met two standard stereotypes defined by the CDI specification: "
+"<literal>@Interceptor</literal> and <literal>@Decorator</literal>."
 msgstr ""
 "我們已談到了 Web Bean 規格所定義的兩個標準主要探討模板:"
 "<literal>@Interceptor</literal> 與 <literal>@Decorator</literal>。"

Modified: doc/trunk/reference/src/main/docbook/zh-TW/viewlayers.po
===================================================================
--- doc/trunk/reference/src/main/docbook/zh-TW/viewlayers.po	2010-07-24 16:36:48 UTC (rev 6808)
+++ doc/trunk/reference/src/main/docbook/zh-TW/viewlayers.po	2010-07-25 04:22:37 UTC (rev 6809)
@@ -6,7 +6,7 @@
 "Project-Id-Version: Web_Beans:_Java_Contexts_and_Dependency_Injection "
 "VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-05-01T13:53:43\n"
+"POT-Creation-Date: 2010-07-25T03:52:15\n"
 "PO-Revision-Date: 2009-04-19 20:36+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -90,8 +90,8 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Storing the id of any long-running conversation in Wicket&#39;s metadata "
-"when the page response is complete"
+"Storing the id of any long-running conversation in Wicket's metadata when "
+"the page response is complete"
 msgstr ""
 
 #. Tag: para
@@ -134,9 +134,9 @@
 #, no-c-format
 msgid ""
 "When a conversation is marked as long-running, the id of that conversation "
-"will be stored in Wicket&#39;s metadata for the current page. If a new page "
-"is created and set as the response target through <literal>setResponsePage()"
-"</literal>, this new page will also participate in this conversation. This "
+"will be stored in Wicket's metadata for the current page. If a new page is "
+"created and set as the response target through <literal>setResponsePage()</"
+"literal>, this new page will also participate in this conversation. This "
 "occurs for both directly instantiated pages (<literal>setResponsePage(new "
 "OtherPage())</literal>), as well as for bookmarkable pages created with "
 "<literal>setResponsePage(OtherPage.class)</literal> where <literal>OtherPage."

Modified: doc/trunk/reference/src/main/docbook/zh-TW/weldexamples.po
===================================================================
--- doc/trunk/reference/src/main/docbook/zh-TW/weldexamples.po	2010-07-24 16:36:48 UTC (rev 6808)
+++ doc/trunk/reference/src/main/docbook/zh-TW/weldexamples.po	2010-07-25 04:22:37 UTC (rev 6809)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: Weld_-_JSR-299_Reference_Implementation VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-05-01T13:53:43\n"
+"POT-Creation-Date: 2010-07-25T03:52:15\n"
 "PO-Revision-Date: 2009-11-11 15:00+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -21,8 +21,8 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"It&#39;s time to pull the covers back and dive into the internals of Weld "
-"example applications. Let&#39;s start with the simpler of the two examples, "
+"It's time to pull the covers back and dive into the internals of Weld "
+"example applications. Let's start with the simpler of the two examples, "
 "<literal>weld-numberguess</literal>."
 msgstr ""
 
@@ -35,15 +35,15 @@
 #, no-c-format
 msgid ""
 "In the numberguess application you get 10 attempts to guess a number between "
-"1 and 100. After each attempt, you&#39;re told whether your guess was too "
-"high or too low."
+"1 and 100. After each attempt, you're told whether your guess was too high "
+"or too low."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
 msgid ""
 "The numberguess example is comprised of a number of beans, configuration "
-"files and Facelets (JSF) views, packaged as a war module. Let&#39;s start by "
+"files and Facelets (JSF) views, packaged as a war module. Let's start by "
 "examining the configuration files."
 msgstr ""
 
@@ -54,21 +54,21 @@
 "</literal>, which can be found in the <literal>src/main/webapp</literal> "
 "directory of the example. First, we have the JSF 2.0 version of "
 "<literal>faces-config.xml</literal>. A standardized version of Facelets is "
-"the default view handler in JSF 2.0, so there&#39;s really nothing that we "
-"have to configure. Thus, the configuration consists of only the root element."
+"the default view handler in JSF 2.0, so there's really nothing that we have "
+"to configure. Thus, the configuration consists of only the root element."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
 msgid ""
-"There&#39;s also an empty <literal>beans.xml</literal> file, which tells the "
+"There's also an empty <literal>beans.xml</literal> file, which tells the "
 "container to look for beans in this application and to activate the CDI "
 "services."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Finally, there&#39;s the familiar <literal>web.xml</literal>:"
+msgid "Finally, there's the familiar <literal>web.xml</literal>:"
 msgstr ""
 
 #. Tag: para
@@ -105,8 +105,8 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Let&#39;s take a look at the main JSF view, <literal>src/main/webapp/home."
-"xhtml</literal>."
+"Let's take a look at the main JSF view, <literal>src/main/webapp/home.xhtml</"
+"literal>."
 msgstr ""
 
 #. Tag: para
@@ -119,8 +119,8 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"There are a number of messages which can be sent to the user, &#34;Higher!"
-"&#34;, &#34;Lower!&#34; and &#34;Correct!&#34;"
+"There are a number of messages which can be sent to the user, \"Higher!\", "
+"\"Lower!\" and \"Correct!\""
 msgstr ""
 
 #. Tag: para
@@ -138,10 +138,9 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"A validator binding is used to make sure the user doesn&#39;t accidentally "
-"input a number outside of the range in which they can guess - if the "
-"validator wasn&#39;t here, the user might use up a guess on an out of bounds "
-"number."
+"A validator binding is used to make sure the user doesn't accidentally input "
+"a number outside of the range in which they can guess - if the validator "
+"wasn't here, the user might use up a guess on an out of bounds number."
 msgstr ""
 
 #. Tag: para
@@ -177,8 +176,8 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"The <literal>Generator</literal> is application scoped, so we don&#39;t get "
-"a different random each time."
+"The <literal>Generator</literal> is application scoped, so we don't get a "
+"different random each time."
 msgstr ""
 
 #. Tag: para
@@ -192,20 +191,20 @@
 #, no-c-format
 msgid ""
 "The final bean in the application is the session-scoped <literal>Game</"
-"literal> class. This is the primary entry point of the application. It&#39;s "
+"literal> class. This is the primary entry point of the application. It's "
 "responsible for setting up or resetting the game, capturing and validating "
-"the user&#39;s guess and providing feedback to the user with a "
-"<literal>FacesMessage</literal>. We&#39;ve used the post-construct lifecycle "
+"the user's guess and providing feedback to the user with a "
+"<literal>FacesMessage</literal>. We've used the post-construct lifecycle "
 "method to initialize the game by retrieving a random number from the "
-"<literal>@Random Instance&#60;Integer&#62;</literal> bean."
+"<literal>@Random Instance&lt;Integer&gt;</literal> bean."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
 msgid ""
-"You&#39;ll notice that we&#39;ve also added the <literal>@Named</literal> "
-"annotation to this class. This annotation is only required when you want to "
-"make the bean accessible to a JSF view via EL (i.e., #{game})."
+"You'll notice that we've also added the <literal>@Named</literal> annotation "
+"to this class. This annotation is only required when you want to make the "
+"bean accessible to a JSF view via EL (i.e., #{game})."
 msgstr ""
 
 #. Tag: title
@@ -237,9 +236,8 @@
 #, no-c-format
 msgid ""
 "Second, we need to explicitly specify the servlet listener in <literal>web."
-"xml</literal>, again because the container isn&#39;t doing this stuff for "
-"you. The servlet listener boots Weld and controls it&#39;s interaction with "
-"requests."
+"xml</literal>, again because the container isn't doing this stuff for you. "
+"The servlet listener boots Weld and controls it's interaction with requests."
 msgstr ""
 
 #. Tag: para
@@ -248,8 +246,8 @@
 "When Weld boots, it places the <literal>javax.enterprise.inject.spi."
 "BeanManager</literal>, the portable SPI for obtaining bean instances, in the "
 "ServletContext under a variable name equal to the fully-qualified interface "
-"name. You generally don&#39;t need to access this interface, but Weld makes "
-"use of it."
+"name. You generally don't need to access this interface, but Weld makes use "
+"of it."
 msgstr ""
 
 #. Tag: title
@@ -262,7 +260,7 @@
 msgid ""
 "Weld includes a number of portable extensions for JSR-299, including an "
 "extension for Wicket, which allows you to inject beans into Wicket "
-"components and leverage the conversation context. In this section, we&#39;ll "
+"components and leverage the conversation context. In this section, we'll "
 "walk you through the Wicket version of the numberguess example."
 msgstr ""
 
@@ -271,7 +269,7 @@
 msgid ""
 "You may want to review the Wicket documentation at <ulink url=\"http://"
 "wicket.apache.org/\">http://wicket.apache.org/</ulink> before reading this "
-"section, if you aren&#39;t already familiar with the framework."
+"section, if you aren't already familiar with the framework."
 msgstr ""
 
 #. Tag: para
@@ -280,17 +278,17 @@
 "Wicket is another environment that relies on the Weld servlet extension. The "
 "use of <ulink url=\"http://jetty.mortbay.org\">Jetty</ulink> is common in "
 "the Wicket community, and is thus chosen here as the runtime container. "
-"You&#39;ve seen already that Jetty is perfectly capable of running CDI "
+"You've seen already that Jetty is perfectly capable of running CDI "
 "applications with Weld add-ons, and this environment is no different."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
 msgid ""
-"We&#39;ll also be using the Eclipse IDE in these examples. Instructions are "
+"We'll also be using the Eclipse IDE in these examples. Instructions are "
 "provided later for running the example from the command line, but since "
-"you&#39;ll likely need to do more than just deploy examples, we&#39;ll get "
-"setup in this full development environment."
+"you'll likely need to do more than just deploy examples, we'll get setup in "
+"this full development environment."
 msgstr ""
 
 #. Tag: title
@@ -313,7 +311,7 @@
 #, no-c-format
 msgid ""
 "If you have m2eclipse installed, you can open any Maven project directly. "
-"From within Eclipse, select <emphasis>File -&#62; Import... -&#62; Maven "
+"From within Eclipse, select <emphasis>File -&gt; Import... -&gt; Maven "
 "Projects</emphasis>. Then, browse to the location of the Wicket numberguess "
 "example. You should see that Eclipse recognizes the existence of a Maven "
 "project."
@@ -329,24 +327,24 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"You&#39;ll notice after importing, the project has a build error. That&#39;s "
-"because we need to enable a Maven profile. Right-click on the project and "
-"select <emphasis>Properties</emphasis>, then select the <emphasis>Maven</"
-"emphasis> tab in the window that appears. In the form field labeled &#34;"
-"Active Maven Profiles (comma separated):&#34;, type <literal>jetty</"
-"literal>. That will enable some extra dependencies that allow the project to "
-"compile. Additionally, <emphasis>uncheck</emphasis> the box labeled &#34;"
-"Skip Maven compile plugin when processing resources (recommended)&#34;. That "
-"solves an incompatiblity between the m2eclipse plugin and the Maven enforcer "
-"plugin that we use for the Weld project. Now, you&#39;re ready to develop!"
+"You'll notice after importing, the project has a build error. That's because "
+"we need to enable a Maven profile. Right-click on the project and select "
+"<emphasis>Properties</emphasis>, then select the <emphasis>Maven</emphasis> "
+"tab in the window that appears. In the form field labeled \"Active Maven "
+"Profiles (comma separated):\", type <literal>jetty</literal>. That will "
+"enable some extra dependencies that allow the project to compile. "
+"Additionally, <emphasis>uncheck</emphasis> the box labeled \"Skip Maven "
+"compile plugin when processing resources (recommended)\". That solves an "
+"incompatiblity between the m2eclipse plugin and the Maven enforcer plugin "
+"that we use for the Weld project. Now, you're ready to develop!"
 msgstr ""
 
 #. Tag: para
 #, no-c-format
 msgid ""
-"Be sure to uncheck the box &#34;Skip Maven compile plugin when processing "
-"resources (recommended)&#34; in the Maven properties screen or else the "
-"example might not run in Eclipse because beans.xml will be missing from the "
+"Be sure to uncheck the box \"Skip Maven compile plugin when processing "
+"resources (recommended)\" in the Maven properties screen or else the example "
+"might not run in Eclipse because beans.xml will be missing from the "
 "classpath! See the <ulink url=\"https://issues.sonatype.org/browse/"
 "MNGECLIPSE-768\">MNGECLIPSE-768</ulink> issue report for details."
 msgstr ""
@@ -363,15 +361,15 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Then, from Eclipse, choose <emphasis>File -&#62; Import... -&#62; General -"
-"&#62; Existing Projects into Workspace</emphasis>, select the root directory "
+"Then, from Eclipse, choose <emphasis>File -&gt; Import... -&gt; General -"
+"&gt; Existing Projects into Workspace</emphasis>, select the root directory "
 "of the numberguess example, and click Finish. This will create a project in "
 "your workspace called <literal>weld-wicket-numberguess</literal>."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "It&#39;s time to get the example running!"
+msgid "It's time to get the example running!"
 msgstr ""
 
 #. Tag: title
@@ -430,7 +428,7 @@
 
 #. Tag: para
 #, no-c-format
-msgid "Enough toying with deployment, let&#39;s dive into the code."
+msgid "Enough toying with deployment, let's dive into the code."
 msgstr ""
 
 #. Tag: title
@@ -462,7 +460,7 @@
 
 #. Tag: para
 #, no-c-format
-msgid "Here&#39;s where things differ from the JSF numberguess example:"
+msgid "Here's where things differ from the JSF numberguess example:"
 msgstr ""
 
 #. Tag: para
@@ -585,8 +583,8 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Let&#39;s have a look at the significant code and configuration files that "
-"make up this example."
+"Let's have a look at the significant code and configuration files that make "
+"up this example."
 msgstr ""
 
 #. Tag: para
@@ -600,8 +598,8 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"The game&#39;s main logic is located in <literal>Game.java</literal>. Here "
-"is the code for that class, highlighting the ways in which this differs from "
+"The game's main logic is located in <literal>Game.java</literal>. Here is "
+"the code for that class, highlighting the ways in which this differs from "
 "the web application version:"
 msgstr ""
 
@@ -609,14 +607,14 @@
 #, no-c-format
 msgid ""
 "The bean is application scoped rather than session scoped, since an instance "
-"of a Swing application typically represents a single &#39;session&#39;."
+"of a Swing application typically represents a single 'session'."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
 msgid ""
-"Notice that the bean is not named, since it doesn&#39;t need to be accessed "
-"via EL."
+"Notice that the bean is not named, since it doesn't need to be accessed via "
+"EL."
 msgstr ""
 
 #. Tag: para
@@ -657,9 +655,9 @@
 msgid ""
 "The <literal>reset()</literal> method makes a call to the injected "
 "<literal>rndGenerator</literal> in order to get the random number at the "
-"start of each game. Note that it can&#39;t use <literal>Instance.get()</"
-"literal> like the JSF example does because there will not be any active "
-"contexts like there are during a JSF request."
+"start of each game. Note that it can't use <literal>Instance.get()</literal> "
+"like the JSF example does because there will not be any active contexts like "
+"there are during a JSF request."
 msgstr ""
 
 #. Tag: para
@@ -667,8 +665,8 @@
 msgid ""
 "The <literal>MessageGenerator</literal> class depends on the current "
 "instance of <literal>Game</literal> and queries its state in order to "
-"determine the appropriate messages to provide as the prompt for the user&#39;"
-"s next guess and the response to the previous guess. The code for "
+"determine the appropriate messages to provide as the prompt for the user's "
+"next guess and the response to the previous guess. The code for "
 "<literal>MessageGenerator</literal> is as follows:"
 msgstr ""
 
@@ -681,7 +679,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"The <literal>Game</literal>&#39;s state is interrogated to determine the "
+"The <literal>Game</literal>'s state is interrogated to determine the "
 "appropriate challenge message ..."
 msgstr ""
 
@@ -726,8 +724,8 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"<literal>guessButtonActionPerformed</literal> is called when the &#39;"
-"Guess&#39; button is clicked, and it does the following:"
+"<literal>guessButtonActionPerformed</literal> is called when the 'Guess' "
+"button is clicked, and it does the following:"
 msgstr ""
 
 #. Tag: para
@@ -740,8 +738,8 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Calls <literal>game.check()</literal> to validate and perform one &#39;"
-"turn&#39; of the game"
+"Calls <literal>game.check()</literal> to validate and perform one 'turn' of "
+"the game"
 msgstr ""
 
 #. Tag: para
@@ -780,7 +778,7 @@
 #, no-c-format
 msgid ""
 "The translator example is built as an ear and contains EJBs. As a result, "
-"it&#39;s structure is more complex than the numberguess example."
+"it's structure is more complex than the numberguess example."
 msgstr ""
 
 #. Tag: para
@@ -794,10 +792,9 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"First, let&#39;s take a look at the ear aggregator, which is located in the "
-"example&#39;s <literal>ear</literal> directory. Maven automatically "
-"generates the <literal>application.xml</literal> for us from this plugin "
-"configuration:"
+"First, let's take a look at the ear aggregator, which is located in the "
+"example's <literal>ear</literal> directory. Maven automatically generates "
+"the <literal>application.xml</literal> for us from this plugin configuration:"
 msgstr ""
 
 #. Tag: para
@@ -811,18 +808,18 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"If you weren&#39;t using Maven to generate these files, you would need "
+"If you weren't using Maven to generate these files, you would need "
 "<literal>META-INF/application.xml</literal>:"
 msgstr ""
 
 #. Tag: para
 #, no-c-format
 msgid ""
-"Next, lets look at the war, which is located in the example&#39;s "
-"<literal>war</literal> directory. Just as in the numberguess example, we "
-"have a <literal>faces-config.xml</literal> for JSF 2.0 and a <literal>web."
-"xml</literal> (to activate JSF) under WEB-INF, both sourced from "
-"<literal>src/main/webapp/WEB-INF</literal>."
+"Next, lets look at the war, which is located in the example's <literal>war</"
+"literal> directory. Just as in the numberguess example, we have a "
+"<literal>faces-config.xml</literal> for JSF 2.0 and a <literal>web.xml</"
+"literal> (to activate JSF) under WEB-INF, both sourced from <literal>src/"
+"main/webapp/WEB-INF</literal>."
 msgstr ""
 
 #. Tag: para
@@ -843,21 +840,21 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Finally, let&#39;s look at the EJB module, which is located in the "
-"example&#39;s <literal>ejb</literal> directory. In <literal>src/main/"
-"resources/META-INF</literal> there is just an empty <literal>beans.xml</"
-"literal>, used to mark the archive as containing beans."
+"Finally, let's look at the EJB module, which is located in the example's "
+"<literal>ejb</literal> directory. In <literal>src/main/resources/META-INF</"
+"literal> there is just an empty <literal>beans.xml</literal>, used to mark "
+"the archive as containing beans."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
 msgid ""
-"We&#39;ve saved the most interesting bit to last, the code! The project has "
-"two simple beans, <literal>SentenceParser</literal> and "
-"<literal>TextTranslator</literal> and two session beans, "
-"<literal>TranslatorControllerBean</literal> and <literal>SentenceTranslator</"
-"literal>. You should be getting quite familiar with what a bean looks like "
-"by now, so we&#39;ll just highlight the most interesting bits here."
+"We've saved the most interesting bit to last, the code! The project has two "
+"simple beans, <literal>SentenceParser</literal> and <literal>TextTranslator</"
+"literal> and two session beans, <literal>TranslatorControllerBean</literal> "
+"and <literal>SentenceTranslator</literal>. You should be getting quite "
+"familiar with what a bean looks like by now, so we'll just highlight the "
+"most interesting bits here."
 msgstr ""
 
 #. Tag: para
@@ -874,9 +871,9 @@
 "<literal>TextTranslator</literal> uses the simple bean (really just a plain "
 "Java class!) <literal>SentenceParser</literal> to parse the sentence and "
 "then calls on the stateless bean with the local business interface "
-"<literal>Translator</literal> to perform the translation. That&#39;s where "
-"the magic happens. Of course, we couldn&#39;t develop a full translator, but "
-"it&#39;s convincing enough to anyone who doesn&#39;t understand Latin!"
+"<literal>Translator</literal> to perform the translation. That's where the "
+"magic happens. Of course, we couldn't develop a full translator, but it's "
+"convincing enough to anyone who doesn't understand Latin!"
 msgstr ""
 
 #. Tag: para

Modified: doc/trunk/reference/src/main/docbook/zh-TW/xml.po
===================================================================
--- doc/trunk/reference/src/main/docbook/zh-TW/xml.po	2010-07-24 16:36:48 UTC (rev 6808)
+++ doc/trunk/reference/src/main/docbook/zh-TW/xml.po	2010-07-25 04:22:37 UTC (rev 6809)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: xml\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-05-01T13:53:43\n"
+"POT-Creation-Date: 2010-07-25T03:52:15\n"
 "PO-Revision-Date: 2009-01-13 11:55+1000\n"
 "Last-Translator: Terry Chuang <tchuang at redhat.com>\n"
 "Language-Team: Traditional Chinese <zh at li.org>\n"
@@ -24,9 +24,9 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"So far, we&#39;ve seen plenty of examples of beans declared using "
-"annotations. However, there are a couple of occasions when we can&#39;t use "
-"annotations to define the bean:"
+"So far, we've seen plenty of examples of beans declared using annotations. "
+"However, there are a couple of occasions when we can't use annotations to "
+"define the bean:"
 msgstr ""
 "到目前為止,我們已看過了許多透過使用標記來宣告的 Web Bean 了。不過,在某些情"
 "況下我們無法透過使用標記來定義 Web Bean:"
@@ -68,10 +68,10 @@
 #, fuzzy, no-c-format
 msgid ""
 "The advantage of this approach is that you can write an XML schema that "
-"prevents spelling errors in your XML document. It&#39;s even possible for a "
-"tool to generate the XML schema automatically from the compiled Java code. "
-"Or, an integrated development environment could perform the same validation "
-"without the need for the explicit intermediate generation step."
+"prevents spelling errors in your XML document. It's even possible for a tool "
+"to generate the XML schema automatically from the compiled Java code. Or, an "
+"integrated development environment could perform the same validation without "
+"the need for the explicit intermediate generation step."
 msgstr ""
 "這種作法的好處就是您可編寫一個防止您 XML 文件中有拼字錯誤的 XML schema。甚至"
 "有工具可藉由已編譯的 Java 程式碼來自動地產生該 XML schema。或是,某個整合的開"
@@ -112,7 +112,7 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"For example, the element <literal>&#60;util:Date/&#62;</literal> in the "
+"For example, the element <literal>&lt;util:Date/&gt;</literal> in the "
 "following XML fragment refers to the class <literal>java.util.Date</literal>:"
 msgstr ""
 "比方說,下列這段 XML 中的 <literal>&lt;util:Date/&gt;</literal> 要素代表 "
@@ -193,7 +193,7 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"The <literal>&#60;Name&#62;</literal> element declares a bean of scope "
+"The <literal>&lt;Name&gt;</literal> element declares a bean of scope "
 "<literal>@Dependent</literal> and class <literal>Name</literal>, with a set "
 "of initial field values. This bean has a special, container-generated "
 "qualifier and is therefore injectable only to the specific injection point "
@@ -207,8 +207,8 @@
 #, fuzzy, no-c-format
 msgid ""
 "This simple but powerful feature allows the Weld XML format to be used to "
-"specify whole graphs of Java objects. It&#39;s not quite a full databinding "
-"solution, but it&#39;s close!"
+"specify whole graphs of Java objects. It's not quite a full databinding "
+"solution, but it's close!"
 msgstr ""
 "這項簡易卻強大的功能可允許 Web Bean XML 格式被使用來指定 Java 物件的整個 "
 "graph。它固然不是完整的 databinding 解決方案,不過卻也差得不遠!"
@@ -221,10 +221,9 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"If we want our XML document format to be authored by people who aren&#39;t "
-"Java developers, or who don&#39;t have access to our code, we need to "
-"provide a schema. There&#39;s nothing specific to Weld about writing or "
-"using the schema."
+"If we want our XML document format to be authored by people who aren't Java "
+"developers, or who don't have access to our code, we need to provide a "
+"schema. There's nothing specific to Weld about writing or using the schema."
 msgstr ""
 "若我們希望我們的 XML 文件格式能由 Java 開發人員以外的人員或是無法存取我們的程"
 "式碼的人員來進行編寫的話,我們將需要提供一個 schema。針對於 Web Bean,編寫或"



More information about the weld-commits mailing list