[weld-commits] Weld SVN: r6206 - in doc/trunk/reference: es-ES and 8 other directories.

weld-commits at lists.jboss.org weld-commits at lists.jboss.org
Sat May 1 11:04:18 EDT 2010


Author: nico.ben
Date: 2010-05-01 11:04:10 -0400 (Sat, 01 May 2010)
New Revision: 6206

Modified:
   doc/trunk/reference/de-DE/Author_Group.po
   doc/trunk/reference/de-DE/beans.po
   doc/trunk/reference/de-DE/decorators.po
   doc/trunk/reference/de-DE/ee.po
   doc/trunk/reference/de-DE/environments.po
   doc/trunk/reference/de-DE/events.po
   doc/trunk/reference/de-DE/example.po
   doc/trunk/reference/de-DE/extend.po
   doc/trunk/reference/de-DE/extensions.po
   doc/trunk/reference/de-DE/gettingstarted.po
   doc/trunk/reference/de-DE/injection.po
   doc/trunk/reference/de-DE/interceptors.po
   doc/trunk/reference/de-DE/intro.po
   doc/trunk/reference/de-DE/master.po
   doc/trunk/reference/de-DE/next.po
   doc/trunk/reference/de-DE/part1.po
   doc/trunk/reference/de-DE/part3.po
   doc/trunk/reference/de-DE/part4.po
   doc/trunk/reference/de-DE/producermethods.po
   doc/trunk/reference/de-DE/resources.po
   doc/trunk/reference/de-DE/ri-spi.po
   doc/trunk/reference/de-DE/scopescontexts.po
   doc/trunk/reference/de-DE/specialization.po
   doc/trunk/reference/de-DE/stereotypes.po
   doc/trunk/reference/de-DE/viewlayers.po
   doc/trunk/reference/de-DE/weldexamples.po
   doc/trunk/reference/de-DE/xml.po
   doc/trunk/reference/es-ES/Author_Group.po
   doc/trunk/reference/es-ES/beans.po
   doc/trunk/reference/es-ES/decorators.po
   doc/trunk/reference/es-ES/ee.po
   doc/trunk/reference/es-ES/environments.po
   doc/trunk/reference/es-ES/events.po
   doc/trunk/reference/es-ES/example.po
   doc/trunk/reference/es-ES/extend.po
   doc/trunk/reference/es-ES/extensions.po
   doc/trunk/reference/es-ES/gettingstarted.po
   doc/trunk/reference/es-ES/injection.po
   doc/trunk/reference/es-ES/interceptors.po
   doc/trunk/reference/es-ES/intro.po
   doc/trunk/reference/es-ES/master.po
   doc/trunk/reference/es-ES/next.po
   doc/trunk/reference/es-ES/part1.po
   doc/trunk/reference/es-ES/part3.po
   doc/trunk/reference/es-ES/part4.po
   doc/trunk/reference/es-ES/producermethods.po
   doc/trunk/reference/es-ES/resources.po
   doc/trunk/reference/es-ES/ri-spi.po
   doc/trunk/reference/es-ES/scopescontexts.po
   doc/trunk/reference/es-ES/specialization.po
   doc/trunk/reference/es-ES/stereotypes.po
   doc/trunk/reference/es-ES/viewlayers.po
   doc/trunk/reference/es-ES/weldexamples.po
   doc/trunk/reference/es-ES/xml.po
   doc/trunk/reference/fr-FR/Author_Group.po
   doc/trunk/reference/fr-FR/beans.po
   doc/trunk/reference/fr-FR/decorators.po
   doc/trunk/reference/fr-FR/ee.po
   doc/trunk/reference/fr-FR/environments.po
   doc/trunk/reference/fr-FR/events.po
   doc/trunk/reference/fr-FR/example.po
   doc/trunk/reference/fr-FR/extend.po
   doc/trunk/reference/fr-FR/extensions.po
   doc/trunk/reference/fr-FR/gettingstarted.po
   doc/trunk/reference/fr-FR/injection.po
   doc/trunk/reference/fr-FR/interceptors.po
   doc/trunk/reference/fr-FR/intro.po
   doc/trunk/reference/fr-FR/master.po
   doc/trunk/reference/fr-FR/next.po
   doc/trunk/reference/fr-FR/part1.po
   doc/trunk/reference/fr-FR/part3.po
   doc/trunk/reference/fr-FR/part4.po
   doc/trunk/reference/fr-FR/producermethods.po
   doc/trunk/reference/fr-FR/resources.po
   doc/trunk/reference/fr-FR/ri-spi.po
   doc/trunk/reference/fr-FR/scopescontexts.po
   doc/trunk/reference/fr-FR/specialization.po
   doc/trunk/reference/fr-FR/stereotypes.po
   doc/trunk/reference/fr-FR/viewlayers.po
   doc/trunk/reference/fr-FR/weldexamples.po
   doc/trunk/reference/fr-FR/xml.po
   doc/trunk/reference/it-IT/Author_Group.po
   doc/trunk/reference/it-IT/beans.po
   doc/trunk/reference/it-IT/decorators.po
   doc/trunk/reference/it-IT/ee.po
   doc/trunk/reference/it-IT/environments.po
   doc/trunk/reference/it-IT/events.po
   doc/trunk/reference/it-IT/example.po
   doc/trunk/reference/it-IT/extend.po
   doc/trunk/reference/it-IT/extensions.po
   doc/trunk/reference/it-IT/gettingstarted.po
   doc/trunk/reference/it-IT/injection.po
   doc/trunk/reference/it-IT/interceptors.po
   doc/trunk/reference/it-IT/intro.po
   doc/trunk/reference/it-IT/master.po
   doc/trunk/reference/it-IT/next.po
   doc/trunk/reference/it-IT/part1.po
   doc/trunk/reference/it-IT/part3.po
   doc/trunk/reference/it-IT/part4.po
   doc/trunk/reference/it-IT/producermethods.po
   doc/trunk/reference/it-IT/resources.po
   doc/trunk/reference/it-IT/ri-spi.po
   doc/trunk/reference/it-IT/scopescontexts.po
   doc/trunk/reference/it-IT/specialization.po
   doc/trunk/reference/it-IT/stereotypes.po
   doc/trunk/reference/it-IT/viewlayers.po
   doc/trunk/reference/it-IT/weldexamples.po
   doc/trunk/reference/it-IT/xml.po
   doc/trunk/reference/ja-JP/Author_Group.po
   doc/trunk/reference/ja-JP/beans.po
   doc/trunk/reference/ja-JP/decorators.po
   doc/trunk/reference/ja-JP/ee.po
   doc/trunk/reference/ja-JP/environments.po
   doc/trunk/reference/ja-JP/events.po
   doc/trunk/reference/ja-JP/example.po
   doc/trunk/reference/ja-JP/extend.po
   doc/trunk/reference/ja-JP/extensions.po
   doc/trunk/reference/ja-JP/gettingstarted.po
   doc/trunk/reference/ja-JP/injection.po
   doc/trunk/reference/ja-JP/interceptors.po
   doc/trunk/reference/ja-JP/intro.po
   doc/trunk/reference/ja-JP/master.po
   doc/trunk/reference/ja-JP/next.po
   doc/trunk/reference/ja-JP/part1.po
   doc/trunk/reference/ja-JP/part3.po
   doc/trunk/reference/ja-JP/part4.po
   doc/trunk/reference/ja-JP/producermethods.po
   doc/trunk/reference/ja-JP/resources.po
   doc/trunk/reference/ja-JP/ri-spi.po
   doc/trunk/reference/ja-JP/scopescontexts.po
   doc/trunk/reference/ja-JP/specialization.po
   doc/trunk/reference/ja-JP/stereotypes.po
   doc/trunk/reference/ja-JP/viewlayers.po
   doc/trunk/reference/ja-JP/weldexamples.po
   doc/trunk/reference/ja-JP/xml.po
   doc/trunk/reference/ko-KR/Author_Group.po
   doc/trunk/reference/ko-KR/beans.po
   doc/trunk/reference/ko-KR/decorators.po
   doc/trunk/reference/ko-KR/ee.po
   doc/trunk/reference/ko-KR/environments.po
   doc/trunk/reference/ko-KR/events.po
   doc/trunk/reference/ko-KR/example.po
   doc/trunk/reference/ko-KR/extend.po
   doc/trunk/reference/ko-KR/extensions.po
   doc/trunk/reference/ko-KR/gettingstarted.po
   doc/trunk/reference/ko-KR/injection.po
   doc/trunk/reference/ko-KR/interceptors.po
   doc/trunk/reference/ko-KR/intro.po
   doc/trunk/reference/ko-KR/master.po
   doc/trunk/reference/ko-KR/next.po
   doc/trunk/reference/ko-KR/part1.po
   doc/trunk/reference/ko-KR/part3.po
   doc/trunk/reference/ko-KR/part4.po
   doc/trunk/reference/ko-KR/producermethods.po
   doc/trunk/reference/ko-KR/resources.po
   doc/trunk/reference/ko-KR/ri-spi.po
   doc/trunk/reference/ko-KR/scopescontexts.po
   doc/trunk/reference/ko-KR/specialization.po
   doc/trunk/reference/ko-KR/stereotypes.po
   doc/trunk/reference/ko-KR/viewlayers.po
   doc/trunk/reference/ko-KR/weldexamples.po
   doc/trunk/reference/ko-KR/xml.po
   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/pt-BR/Author_Group.po
   doc/trunk/reference/pt-BR/beans.po
   doc/trunk/reference/pt-BR/decorators.po
   doc/trunk/reference/pt-BR/ee.po
   doc/trunk/reference/pt-BR/environments.po
   doc/trunk/reference/pt-BR/events.po
   doc/trunk/reference/pt-BR/example.po
   doc/trunk/reference/pt-BR/extend.po
   doc/trunk/reference/pt-BR/extensions.po
   doc/trunk/reference/pt-BR/gettingstarted.po
   doc/trunk/reference/pt-BR/injection.po
   doc/trunk/reference/pt-BR/interceptors.po
   doc/trunk/reference/pt-BR/intro.po
   doc/trunk/reference/pt-BR/master.po
   doc/trunk/reference/pt-BR/next.po
   doc/trunk/reference/pt-BR/part1.po
   doc/trunk/reference/pt-BR/part3.po
   doc/trunk/reference/pt-BR/part4.po
   doc/trunk/reference/pt-BR/producermethods.po
   doc/trunk/reference/pt-BR/resources.po
   doc/trunk/reference/pt-BR/ri-spi.po
   doc/trunk/reference/pt-BR/scopescontexts.po
   doc/trunk/reference/pt-BR/specialization.po
   doc/trunk/reference/pt-BR/stereotypes.po
   doc/trunk/reference/pt-BR/viewlayers.po
   doc/trunk/reference/pt-BR/weldexamples.po
   doc/trunk/reference/pt-BR/xml.po
   doc/trunk/reference/zh-CN/Author_Group.po
   doc/trunk/reference/zh-CN/beans.po
   doc/trunk/reference/zh-CN/decorators.po
   doc/trunk/reference/zh-CN/ee.po
   doc/trunk/reference/zh-CN/environments.po
   doc/trunk/reference/zh-CN/events.po
   doc/trunk/reference/zh-CN/example.po
   doc/trunk/reference/zh-CN/extend.po
   doc/trunk/reference/zh-CN/extensions.po
   doc/trunk/reference/zh-CN/gettingstarted.po
   doc/trunk/reference/zh-CN/injection.po
   doc/trunk/reference/zh-CN/interceptors.po
   doc/trunk/reference/zh-CN/intro.po
   doc/trunk/reference/zh-CN/master.po
   doc/trunk/reference/zh-CN/next.po
   doc/trunk/reference/zh-CN/part1.po
   doc/trunk/reference/zh-CN/part3.po
   doc/trunk/reference/zh-CN/part4.po
   doc/trunk/reference/zh-CN/producermethods.po
   doc/trunk/reference/zh-CN/resources.po
   doc/trunk/reference/zh-CN/ri-spi.po
   doc/trunk/reference/zh-CN/scopescontexts.po
   doc/trunk/reference/zh-CN/specialization.po
   doc/trunk/reference/zh-CN/stereotypes.po
   doc/trunk/reference/zh-CN/viewlayers.po
   doc/trunk/reference/zh-CN/weldexamples.po
   doc/trunk/reference/zh-CN/xml.po
   doc/trunk/reference/zh-TW/Author_Group.po
   doc/trunk/reference/zh-TW/beans.po
   doc/trunk/reference/zh-TW/decorators.po
   doc/trunk/reference/zh-TW/ee.po
   doc/trunk/reference/zh-TW/environments.po
   doc/trunk/reference/zh-TW/events.po
   doc/trunk/reference/zh-TW/example.po
   doc/trunk/reference/zh-TW/extend.po
   doc/trunk/reference/zh-TW/extensions.po
   doc/trunk/reference/zh-TW/gettingstarted.po
   doc/trunk/reference/zh-TW/injection.po
   doc/trunk/reference/zh-TW/interceptors.po
   doc/trunk/reference/zh-TW/intro.po
   doc/trunk/reference/zh-TW/master.po
   doc/trunk/reference/zh-TW/next.po
   doc/trunk/reference/zh-TW/part1.po
   doc/trunk/reference/zh-TW/part3.po
   doc/trunk/reference/zh-TW/part4.po
   doc/trunk/reference/zh-TW/producermethods.po
   doc/trunk/reference/zh-TW/resources.po
   doc/trunk/reference/zh-TW/ri-spi.po
   doc/trunk/reference/zh-TW/scopescontexts.po
   doc/trunk/reference/zh-TW/specialization.po
   doc/trunk/reference/zh-TW/stereotypes.po
   doc/trunk/reference/zh-TW/viewlayers.po
   doc/trunk/reference/zh-TW/weldexamples.po
   doc/trunk/reference/zh-TW/xml.po
Log:
Updated POTs and regenerated all POs

Modified: doc/trunk/reference/de-DE/Author_Group.po
===================================================================
--- doc/trunk/reference/de-DE/Author_Group.po	2010-04-29 23:54:14 UTC (rev 6205)
+++ doc/trunk/reference/de-DE/Author_Group.po	2010-05-01 15:04:10 UTC (rev 6206)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: Author_Group\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-03-02T13:07:17\n"
+"POT-Creation-Date: 2010-05-01T13:53:42\n"
 "PO-Revision-Date: 2009-02-07 14:52+1100\n"
 "Last-Translator: \n"
 "Language-Team:  <en at li.org>\n"
@@ -15,86 +15,36 @@
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#. Tag: firstname
-#, no-c-format
-msgid "Gavin"
-msgstr ""
-
 #. Tag: contrib
 #, no-c-format
 msgid "JSR-299: Contexts and Dependency Injection Lead"
 msgstr ""
 
-#. Tag: firstname
-#, no-c-format
-msgid "Pete"
-msgstr ""
-
 #. Tag: contrib
 #, no-c-format
 msgid "Weld (JSR-299 RI) Lead"
 msgstr ""
 
-#. Tag: firstname
-#, no-c-format
-msgid "Dan"
-msgstr ""
-
-#. Tag: firstname
-#, no-c-format
-msgid "David"
-msgstr ""
-
-#. Tag: firstname
-#, no-c-format
-msgid "Nicola"
-msgstr ""
-
 #. Tag: contrib
 #, no-c-format
 msgid "Italian Translation"
 msgstr "Italienische Übersetzung"
 
-#. Tag: firstname
-#, no-c-format
-msgid "Gladys"
-msgstr ""
-
 #. Tag: contrib
 #, no-c-format
 msgid "Spanish Translation"
 msgstr "Spanische Übersetzung"
 
-#. Tag: firstname
-#, no-c-format
-msgid "Eun-Ju"
-msgstr ""
-
 #. Tag: contrib
 #, no-c-format
 msgid "Korean Translation"
 msgstr "Koreanische Übersetzung"
 
-#. Tag: firstname
-#, no-c-format
-msgid "Terry"
-msgstr ""
-
 #. Tag: contrib
 #, no-c-format
 msgid "Traditional Chinese Translation"
 msgstr "Chinesische Übersetzung (traditionell)"
 
-#. Tag: firstname
-#, no-c-format
-msgid "Francesco"
-msgstr ""
-
-#. Tag: firstname
-#, no-c-format
-msgid "Sean"
-msgstr ""
-
 #. Tag: contrib
 #, fuzzy, no-c-format
 msgid "Simplified Chinese Translation"

Modified: doc/trunk/reference/de-DE/beans.po
===================================================================
--- doc/trunk/reference/de-DE/beans.po	2010-04-29 23:54:14 UTC (rev 6205)
+++ doc/trunk/reference/de-DE/beans.po	2010-05-01 15:04:10 UTC (rev 6206)
@@ -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-03-02T13:07:17\n"
+"POT-Creation-Date: 2010-05-01T13:53:42\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'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&#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."
 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'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&#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:"
 msgstr ""
 
 #. Tag: para
@@ -171,7 +171,7 @@
 
 #. Tag: para
 #, no-c-format
-msgid "Let's see what all this new terminology means."
+msgid "Let&#39;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 \"contract\" that must be satisfied by "
-"the bean to be injected. The contract is:"
+"Any injected attribute specifies a &#34;contract&#34; 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&lt;Book&gt;</literal>, as well as the implicit type "
+"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)."
 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't inject an EJB using its remote interface unless "
-"you define a <emphasis>resource</emphasis>, which we'll meet in <xref "
-"linkend=\"resources\" />."
+"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\" />."
 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&lt;Book&gt;</literal>, together with "
+"restricted to <literal>Shop&#60;Book&#62;</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 \"quality\" using "
-"a qualifier."
+"implementation it is interested in. We model this kind of &#34;quality&#34; "
+"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's an example of a qualifier annotation:"
+"string-based names. Here&#39;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've encountered one. With CDI, annotation "
-"definitions will become a familiar artifact as you'll be creating them from "
-"time to time."
+"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."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
 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 "
+"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."
 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't, it reports an error to the user."
+"doesn&#39;t, it reports an error to the user."
 msgstr ""
 
 #. Tag: para
@@ -330,10 +330,10 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"That's not quite the end of the story. CDI also defines a simple "
+"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'll get into the details in <xref linkend=\"injection\" />."
+"We&#39;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't want the bean to sit in the session "
+"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."
 msgstr ""
@@ -386,7 +386,8 @@
 
 #. Tag: para
 #, no-c-format
-msgid "We'll talk more about scopes in <xref linkend=\"scopescontexts\" />."
+msgid ""
+"We&#39;ll talk more about scopes in <xref linkend=\"scopescontexts\" />."
 msgstr ""
 
 #. Tag: title
@@ -445,7 +446,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"We've already seen how qualifiers let us choose between multiple "
+"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 "
@@ -482,9 +483,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'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."
+"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."
 msgstr ""
 
 #. Tag: para
@@ -497,10 +498,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'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."
+"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."
 msgstr ""
 
 #. Tag: para
@@ -539,14 +540,14 @@
 #, no-c-format
 msgid ""
 "Notice that <literal>ShoppingCart</literal> and "
-"<literal>TransactionInterceptor</literal> don't know anything about each "
+"<literal>TransactionInterceptor</literal> don&#39;t know anything about each "
 "other."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
 msgid ""
-"Interceptors are deployment-specific. (We don't need a "
+"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 "
@@ -556,8 +557,8 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"We'll discuss interceptors, and their cousins, decorators, in <xref linkend="
-"\"interceptors\" /> and <xref linkend=\"decorators\" />."
+"We&#39;ll discuss interceptors, and their cousins, decorators, in <xref "
+"linkend=\"interceptors\" /> and <xref linkend=\"decorators\" />."
 msgstr ""
 
 #. Tag: title
@@ -568,9 +569,10 @@
 #. Tag: para
 #, no-c-format
 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."
+"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."
 msgstr ""
 
 #. Tag: title
@@ -584,8 +586,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't need to. According to "
-"the specification, the CDI container treats any class that satisfies the "
+"<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:"
 msgstr ""
 
@@ -634,7 +636,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't recommend directly injecting an entity class. We "
+"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."
@@ -713,7 +715,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"There's no reason to explicitly declare the scope of a stateless session "
+"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 "
@@ -769,8 +771,8 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"When we don't need any of these things, an ordinary managed bean will serve "
-"just fine."
+"When we don&#39;t need any of these things, an ordinary managed bean will "
+"serve just fine."
 msgstr ""
 
 #. Tag: para
@@ -794,7 +796,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Finally, it's usually obvious when method-level transaction management, "
+"Finally, it&#39;s usually obvious when method-level transaction management, "
 "method-level security, timers, remote methods or asynchronous methods are "
 "needed."
 msgstr ""
@@ -802,11 +804,11 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"The point we're trying to make is: use a session bean when you need the "
+"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'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&#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>."
 msgstr ""
@@ -814,13 +816,14 @@
 #. Tag: para
 #, no-c-format
 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\"."
+"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;."
 msgstr ""
 
 #. Tag: title
@@ -859,7 +862,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"We can't write a bean class that is itself a random number. But we can "
+"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—"
@@ -931,7 +934,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"We'll talk much more about producer methods in <xref linkend="
+"We&#39;ll talk much more about producer methods in <xref linkend="
 "\"producermethods\" />."
 msgstr ""
 
@@ -962,7 +965,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'll have to wait until <xref "
-"linkend=\"resources\" />. Because we can't wait to get to work on some "
+"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."
 msgstr ""

Modified: doc/trunk/reference/de-DE/decorators.po
===================================================================
--- doc/trunk/reference/de-DE/decorators.po	2010-04-29 23:54:14 UTC (rev 6205)
+++ doc/trunk/reference/de-DE/decorators.po	2010-05-01 15:04:10 UTC (rev 6206)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: decorators\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-03-02T13:07:17\n"
+"POT-Creation-Date: 2010-05-01T13:53:42\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't "
-"an appropriate tool for separating business-related concerns."
+"the actual semantics of the events they intercept. Thus, interceptors "
+"aren&#39;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,10 +48,11 @@
 "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."
+"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 ""
 "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 "
@@ -100,8 +101,9 @@
 #, fuzzy, no-c-format
 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."
+"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 ""
 "Anders als andere einfache Web Beans, kann ein Dekorator eine abstrakte "
 "Klasse sein. Falls es nichts besonderes ist, dass der Dekorator für eine "
@@ -196,7 +198,8 @@
 #, fuzzy, no-c-format
 msgid ""
 "This declaration serves the same purpose for decorators that the "
-"<literal>&lt;interceptors&gt;</literal> declaration serves for interceptors:"
+"<literal>&#60;interceptors&#62;</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/de-DE/ee.po
===================================================================
--- doc/trunk/reference/de-DE/ee.po	2010-04-29 23:54:14 UTC (rev 6205)
+++ doc/trunk/reference/de-DE/ee.po	2010-05-01 15:04:10 UTC (rev 6206)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: ee\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-03-02T13:07:17\n"
+"POT-Creation-Date: 2010-05-01T13:53:42\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's easy to create a "
+"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 "
@@ -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've already seen a couple of "
-"examples of this, though we didn't pay much attention at the time:"
+"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:"
 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's easy to use a bean from a servlet in Java EE 6. Simply inject the bean "
-"using field or initializer method injection."
+"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."
 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'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&#39;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'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."
+"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."
 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/de-DE/environments.po
===================================================================
--- doc/trunk/reference/de-DE/environments.po	2010-04-29 23:54:14 UTC (rev 6205)
+++ doc/trunk/reference/de-DE/environments.po	2010-05-01 15:04:10 UTC (rev 6206)
@@ -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-03-02T13:07:17\n"
+"POT-Creation-Date: 2010-05-01T14:44:09\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'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&#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."
 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't "
+"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 "
@@ -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 \"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:"
+"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:"
 msgstr ""
 
 #. Tag: para
@@ -186,7 +186,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Tomcat has a read-only JNDI, so Weld can't automatically bind the "
+"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:"
@@ -209,10 +209,7 @@
 
 #. Tag: para
 #, no-c-format
-msgid ""
-"Weld also supports Servlet injection in Tomcat. To enable this, place the "
-"<literal>weld-tomcat-support.jar</literal> in <literal>$TOMCAT_HOME/lib</"
-"literal>, and add the following to <literal>META-INF/context.xml</literal>:"
+msgid "Weld also supports Servlet injection in Tomcat 6."
 msgstr ""
 
 #. Tag: title
@@ -223,18 +220,18 @@
 #. Tag: para
 #, no-c-format
 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:"
+"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:"
 msgstr ""
 
 #. Tag: para
 #, no-c-format
 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."
+"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."
 msgstr ""
 
 #. Tag: para
@@ -247,7 +244,10 @@
 
 #. Tag: para
 #, no-c-format
-msgid "Weld does not currently support Servlet injection in Jetty."
+msgid ""
+"Weld also supports Servlet injection in Jetty 6. To enable this, add the "
+"file <literal>META-INF/jetty-web.xml</literal> with the following content to "
+"your war:"
 msgstr ""
 
 #. Tag: title
@@ -258,13 +258,13 @@
 #. Tag: para
 #, no-c-format
 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."
+"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."
 msgstr ""
 
 #. Tag: para
@@ -348,7 +348,7 @@
 
 #. Tag: para
 #, no-c-format
-msgid "Here's an example of a simple CDI SE application:"
+msgid "Here&#39;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'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&#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."
@@ -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's beans and events. The API consists of two "
-"classes: <literal>Weld</literal> and <literal>WeldContainer</literal>."
+"references to your application&#39;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's an example application main method which uses this API to initialize "
-"a bean of type <literal>MyApplicationBean</literal>."
+"Here&#39;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 '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."
+"<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."
 msgstr ""
 
 #. Tag: para
@@ -459,8 +459,8 @@
 #. Tag: para
 #, no-c-format
 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."
+"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."
 msgstr ""

Modified: doc/trunk/reference/de-DE/events.po
===================================================================
--- doc/trunk/reference/de-DE/events.po	2010-04-29 23:54:14 UTC (rev 6205)
+++ doc/trunk/reference/de-DE/events.po	2010-05-01 15:04:10 UTC (rev 6206)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: events\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-03-02T13:07:17\n"
+"POT-Creation-Date: 2010-05-01T13:53:42\n"
 "PO-Revision-Date: 2009-02-13 08:17+1100\n"
 "Last-Translator: \n"
 "Language-Team:  <en at li.org>\n"
@@ -47,10 +47,10 @@
 "auch komplett von Producern abgekoppelt, "
 
 #. Tag: para
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"observers can specify a combination of \"selectors\" to narrow the set of "
-"event notifications they will receive, and"
+"observers can specify a combination of &#34;selectors&#34; 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've already seen with the dependency injection service."
+"approach that we&#39;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's an example:"
+"<literal>@Qualifier</literal>. Here&#39;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's only interested in events which have those "
+"does specify qualifiers, it&#39;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't specify the "
-"qualifier dynamically. CDI lets us obtain a qualifier instance by "
+"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>."
@@ -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'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&#39;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/de-DE/example.po
===================================================================
--- doc/trunk/reference/de-DE/example.po	2010-04-29 23:54:14 UTC (rev 6205)
+++ doc/trunk/reference/de-DE/example.po	2010-05-01 15:04:10 UTC (rev 6206)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: example\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-03-02T13:07:17\n"
+"POT-Creation-Date: 2010-05-01T13:53:42\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'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:"
+"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:"
 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're also going to need a <literal>persistence.xml</literal> "
+"(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>.)"
 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'll explore dependency injection in greater depth."
+"the next chapter, we&#39;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/de-DE/extend.po
===================================================================
--- doc/trunk/reference/de-DE/extend.po	2010-04-29 23:54:14 UTC (rev 6205)
+++ doc/trunk/reference/de-DE/extend.po	2010-05-01 15:04:10 UTC (rev 6206)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: extend\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-03-02T13:07:17\n"
+"POT-Creation-Date: 2010-05-01T13:53:42\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's needed to satisfy the requirements of Java SE's "
-"service provider architecture."
+"define any methods, but it&#39;s needed to satisfy the requirements of Java "
+"SE&#39;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's metamodel and more. Here's a very simple "
-"example:"
+"permitted to modify the container&#39;s metamodel and more. Here&#39;s a "
+"very simple example:"
 msgstr ""
 
 #. Tag: para
@@ -227,7 +227,7 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"Let's study some of the interfaces exposed by the <literal>BeanManager</"
+"Let&#39;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,7 +286,8 @@
 
 #. Tag: para
 #, no-c-format
-msgid "There's an easy way to find out what beans exist in the application:"
+msgid ""
+"There&#39;s an easy way to find out what beans exist in the application:"
 msgstr ""
 
 #. Tag: para
@@ -324,9 +325,9 @@
 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."
+"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."
 msgstr ""
 
 #. Tag: para
@@ -352,8 +353,8 @@
 #. Tag: para
 #, no-c-format
 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 "
+"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 "
@@ -363,7 +364,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Here's a second example, which adds the <literal>@Alternative</literal> "
+"Here&#39;s a second example, which adds the <literal>@Alternative</literal> "
 "annotation to any class which implements a certain <literal>Service</"
 "literal> interface."
 msgstr ""
@@ -394,12 +395,12 @@
 #. Tag: para
 #, no-c-format
 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 "
+"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:"
 msgstr ""
 
@@ -414,9 +415,9 @@
 #. Tag: para
 #, no-c-format
 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."
+"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."
 msgstr ""
 
 #. Tag: title

Modified: doc/trunk/reference/de-DE/extensions.po
===================================================================
--- doc/trunk/reference/de-DE/extensions.po	2010-04-29 23:54:14 UTC (rev 6205)
+++ doc/trunk/reference/de-DE/extensions.po	2010-05-01 15:04:10 UTC (rev 6206)
@@ -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-03-02T13:07:17\n"
+"POT-Creation-Date: 2010-05-01T13:53:42\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's no need to "
-"include sl4j as it's already included (and used internally)."
+"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)."
 msgstr ""

Modified: doc/trunk/reference/de-DE/gettingstarted.po
===================================================================
--- doc/trunk/reference/de-DE/gettingstarted.po	2010-04-29 23:54:14 UTC (rev 6205)
+++ doc/trunk/reference/de-DE/gettingstarted.po	2010-05-01 15:04:10 UTC (rev 6206)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: ri\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-03-02T13:07:17\n"
+"POT-Creation-Date: 2010-05-01T13:53:42\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'll need the "
+"To run the examples with the provided build scripts, you&#39;ll need the "
 "following:"
 msgstr ""
 
@@ -96,7 +96,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"You'll need a full install of Ant 1.7.0. Some linux distributions only "
+"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."
 msgstr ""
@@ -104,7 +104,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"In the next few sections, you'll be using the Ant command (<literal>ant</"
+"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 "
@@ -123,7 +123,7 @@
 #, no-c-format
 msgid ""
 "The sections below cover the steps for deploying with both Ant and Maven in "
-"detail. Let's start with JBoss AS."
+"detail. Let&#39;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'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!"
+"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!"
 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'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>."
+"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>."
 msgstr ""
 
 #. Tag: para
@@ -168,7 +168,7 @@
 
 #. Tag: para
 #, fuzzy, no-c-format
-msgid "You're now ready to deploy your first example!"
+msgid "You&#39;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't already, start JBoss AS. You can either start JBoss AS from a "
-"Linux shell:"
+"If you haven&#39;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's a topic for a later chapter."
+"modules, but that&#39;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'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&#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."
 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'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."
+"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."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
 msgid ""
-"To deploy the examples to GlassFish, you'll need the final <ulink url="
+"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'll "
-"need to first make the script executable."
+"After the download is complete, execute the installer. On Linux/Unix, "
+"you&#39;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'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&#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)."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
 msgid ""
-"If you've deployed either of the starter examples, <literal>weld-"
+"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."
@@ -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's "
+"<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's <literal>ear/target</literal> directory. All you "
-"need to do now is deploy them to GlassFish."
+"ends up in the example&#39;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 \"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."
+"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."
 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't get enterprise features such as session beans and "
-"container-managed transactions.)"
+"container. (But you don&#39;t get enterprise features such as session beans "
+"and container-managed transactions.)"
 msgstr ""
 
 #. Tag: para
 #, fuzzy, no-c-format
 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."
+"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."
 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't require that you have Maven installed, so we'll start "
-"there. If you want to use Maven, you can just skip ahead."
+"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."
 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'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&#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>."
 msgstr ""
 
 #. Tag: para
 #, fuzzy, no-c-format
-msgid "Now you're ready to deploy the numberguess example to Tomcat!"
+msgid "Now you&#39;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 \"tomcat.\"."
+"same target names used for JBoss AS, prefixed with &#34;tomcat.&#34;."
 msgstr ""
 
 #. Tag: para
@@ -503,7 +503,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"If you haven't already, start Tomcat. You can either start Tomcat from a "
+"If you haven&#39;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'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."
+"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."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
 msgid ""
-"The Maven plugin communicates with Tomcat over HTTP, so it doesn't care "
+"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</"
@@ -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's <literal>readme.txt</"
+"the example, which are documented in the example&#39;s <literal>readme.txt</"
 "literal> file."
 msgstr ""
 
@@ -614,10 +614,10 @@
 #. Tag: para
 #, no-c-format
 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."
+"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."
 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't need anything else installed except to have the Maven command "
+"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."
 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 \"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 &#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."

Modified: doc/trunk/reference/de-DE/injection.po
===================================================================
--- doc/trunk/reference/de-DE/injection.po	2010-04-29 23:54:14 UTC (rev 6205)
+++ doc/trunk/reference/de-DE/injection.po	2010-05-01 15:04:10 UTC (rev 6206)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: injection\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-04-14T10:16:01\n"
+"POT-Creation-Date: 2010-05-01T14:44:09\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't rely on it)."
+"not portable, don&#39;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'll meet in <xref linkend=\"events\" />) and "
+"observer methods (which we&#39;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'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 "
+"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."
 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's "
-"the simplest possible scenario. When you first start your application, "
-"you'll likely have lots of those."
+"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."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
 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."
+"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."
 msgstr ""
 
 #. Tag: title
@@ -305,12 +305,12 @@
 #. Tag: para
 #, no-c-format
 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>!"
+"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>!"
 msgstr ""
 
 #. Tag: title
@@ -327,11 +327,12 @@
 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."
+"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."
 msgstr ""
 
 #. Tag: para
@@ -421,7 +422,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's the bean that will be injected."
+"alternative, that&#39;s the bean that will be injected."
 msgstr ""
 
 #. Tag: title
@@ -447,8 +448,8 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"During the course of your development, you're going to encounter this "
-"situation. Let's learn how to resolve it."
+"During the course of your development, you&#39;re going to encounter this "
+"situation. Let&#39;s learn how to resolve it."
 msgstr ""
 
 #. Tag: para
@@ -522,7 +523,7 @@
 
 #. Tag: para
 #, no-c-format
-msgid "Just remember: \"There can be only one.\""
+msgid "Just remember: &#34;There can be only one.&#34;"
 msgstr ""
 
 #. Tag: para
@@ -530,14 +531,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'll see in <xref linkend=\"lookup\" />."
+"<literal>Instance</literal>, as we&#39;ll see in <xref linkend=\"lookup\" />."
 msgstr ""
 
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"Now there's one more issue you need to be aware of when using the dependency "
-"injection service."
+"Now there&#39;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."
@@ -635,7 +636,8 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"classes which don't have a non-private constructor with no parameters, and"
+"classes which don&#39;t have a non-private constructor with no parameters, "
+"and"
 msgstr ""
 "Klassen, die keinen nicht-privaten Konstruktor ohne Parameter besitzen sowie "
 
@@ -656,7 +658,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"It's usually very easy to fix an unproxyable dependency problem. If an "
+"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:"
 msgstr ""
@@ -669,7 +671,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"change the type of the injection point to <literal>Instance&lt;X&gt;</"
+"change the type of the injection point to <literal>Instance&#60;X&#62;</"
 "literal>,"
 msgstr ""
 
@@ -710,7 +712,7 @@
 
 #. Tag: para
 #, no-c-format
-msgid "But we didn't get around to implementing this yet."
+msgid "But we didn&#39;t get around to implementing this yet."
 msgstr ""
 
 #. Tag: title
@@ -803,10 +805,11 @@
 #, no-c-format
 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>."
+"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>."
 msgstr ""
 
 #. Tag: para
@@ -817,7 +820,8 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"We can't use an anonymous class to implement a qualifier type with members."
+"We can&#39;t use an anonymous class to implement a qualifier type with "
+"members."
 msgstr ""
 
 #. Tag: para
@@ -884,10 +888,10 @@
 "zugreifen, die mit dem zugehörigen Einspeisungspunkt zu tun haben."
 
 #. Tag: para
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"Let's look at an example. The following code is verbose, and vulnerable to "
-"refactoring problems:"
+"Let&#39;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:"
@@ -910,8 +914,8 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"Not convinced? Then here's a second example. To inject HTTP parameters, we "
-"need to define a qualifier type:"
+"Not convinced? Then here&#39;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/de-DE/interceptors.po
===================================================================
--- doc/trunk/reference/de-DE/interceptors.po	2010-04-29 23:54:14 UTC (rev 6205)
+++ doc/trunk/reference/de-DE/interceptors.po	2010-05-01 15:04:10 UTC (rev 6206)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: interceptors\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-03-02T13:07:17\n"
+"POT-Creation-Date: 2010-05-01T13:53:43\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're interested in:"
+"specify exactly which beans we&#39;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'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 "
+"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>."
 msgstr ""
 "Das ist toll, aber irgendwann müssen wir den den Managementaspekt dieser "

Modified: doc/trunk/reference/de-DE/intro.po
===================================================================
--- doc/trunk/reference/de-DE/intro.po	2010-04-29 23:54:14 UTC (rev 6205)
+++ doc/trunk/reference/de-DE/intro.po	2010-05-01 15:04:10 UTC (rev 6206)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: intro\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-03-02T13:07:18\n"
+"POT-Creation-Date: 2010-05-01T13:53:43\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'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!"
+"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!"
 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,13 +51,14 @@
 #. Tag: para
 #, no-c-format
 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."
+"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."
 msgstr ""
 
 #. Tag: para
@@ -69,8 +70,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's a uniform concept of a bean and a "
-"lightweight component model that's aligned across the Java EE platform."
+"<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."
 msgstr ""
 
 #. Tag: para
@@ -79,30 +80,31 @@
 "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>."
+"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>."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
 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."
+"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."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Now let's see how to create your first bean that actually uses CDI."
+msgid "Now let&#39;s see how to create your first bean that actually uses CDI."
 msgstr ""
 
 #. Tag: title
@@ -113,7 +115,7 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"Suppose that we have two existing Java classes that we've been using for "
+"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:"
 msgstr ""
@@ -140,8 +142,8 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"Unfortunately, we don't have a class that translates whole text documents. "
-"So let's write a bean for this job:"
+"Unfortunately, we don&#39;t have a class that translates whole text "
+"documents. So let&#39;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:"
@@ -163,11 +165,11 @@
 #. Tag: para
 #, fuzzy, no-c-format
 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."
+"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."
 msgstr ""
 "Wie Sie wahrscheinlich bereits erraten haben, hat die <literal>@Initializer</"
 "literal>-Annotation etwas mit Dependency-Einspeisung zu tun! "
@@ -190,7 +192,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Let's create a UI controller bean that uses field injection to obtain an "
+"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:"
 msgstr ""
@@ -204,10 +206,10 @@
 #, no-c-format
 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."
+"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."
 msgstr ""
 
 #. Tag: para
@@ -223,11 +225,11 @@
 #. Tag: para
 #, no-c-format
 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."
+"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."
 msgstr ""
 
 #. Tag: para
@@ -254,10 +256,10 @@
 #. Tag: para
 #, no-c-format
 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."
+"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."
 msgstr ""
 
 #, fuzzy

Modified: doc/trunk/reference/de-DE/master.po
===================================================================
--- doc/trunk/reference/de-DE/master.po	2010-04-29 23:54:14 UTC (rev 6205)
+++ doc/trunk/reference/de-DE/master.po	2010-05-01 15:04:10 UTC (rev 6206)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: master\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-03-02T13:07:18\n"
+"POT-Creation-Date: 2010-05-01T13:53:43\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 \"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."
+"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."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
 msgid ""
-"You'll also find that some of the functionality that once existed in the "
+"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."
@@ -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'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&#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."
 msgstr ""
 
 #. Tag: title

Modified: doc/trunk/reference/de-DE/next.po
===================================================================
--- doc/trunk/reference/de-DE/next.po	2010-04-29 23:54:14 UTC (rev 6205)
+++ doc/trunk/reference/de-DE/next.po	2010-05-01 15:04:10 UTC (rev 6206)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: next\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-03-02T13:07:18\n"
+"POT-Creation-Date: 2010-05-01T13:53:43\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's not yet a lot of information available "
+"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'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."
+"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."
 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's "
-"probably the best source of information about the future of CDI, Weld and "
+"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."
 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 \"<literal>-SNAPSHOT</literal>\" from the version element (so you "
-"don't have to build other Weld modules)."
+"remove the &#34;<literal>-SNAPSHOT</literal>&#34; from the version element "
+"(so you don&#39;t have to build other Weld modules)."
 msgstr ""
 
 #. Tag: para

Modified: doc/trunk/reference/de-DE/part1.po
===================================================================
--- doc/trunk/reference/de-DE/part1.po	2010-04-29 23:54:14 UTC (rev 6205)
+++ doc/trunk/reference/de-DE/part1.po	2010-05-01 15:04:10 UTC (rev 6206)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: part1\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-03-02T13:07:18\n"
+"POT-Creation-Date: 2010-05-01T13:53:43\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'm not currently using it?"
+"Where should I keep the reference to it when I&#39;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's a whole, rich programming model. The "
+"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's study what that phrase means."
+"typing</emphasis>. Let&#39;s study what that phrase means."
 msgstr ""
 
 #. Tag: para
@@ -263,8 +263,8 @@
 #. Tag: para
 #, fuzzy, no-c-format
 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 "
+"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 "
@@ -286,10 +286,10 @@
 #. Tag: para
 #, no-c-format
 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."
+"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."
 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't have been any "
-"of these without inspiration from the frameworks mentioned and "
+"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)."
 msgstr ""

Modified: doc/trunk/reference/de-DE/part3.po
===================================================================
--- doc/trunk/reference/de-DE/part3.po	2010-04-29 23:54:14 UTC (rev 6205)
+++ doc/trunk/reference/de-DE/part3.po	2010-05-01 15:04:10 UTC (rev 6206)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: part3\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-03-02T13:07:18\n"
+"POT-Creation-Date: 2010-05-01T13:53:43\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've "
-"already seen three means of achieving loose coupling:"
+"The first major theme of CDI is <emphasis>loose coupling</emphasis>. We&#39;"
+"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't see string-based identifiers in CDI code, not because the "
+"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 "
-"\"configuration by convention\"—but because there are simply no strings "
-"there to begin with!"
+"&#34;configuration by convention&#34;—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're now ready to meet some more advanced features of CDI. Bear in mind "
+"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't ever really <emphasis>need</"
-"emphasis> to use these features, but if you use them wisely, you'll come to "
-"appreciate their power."
+"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."
 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/de-DE/part4.po
===================================================================
--- doc/trunk/reference/de-DE/part4.po	2010-04-29 23:54:14 UTC (rev 6205)
+++ doc/trunk/reference/de-DE/part4.po	2010-05-01 15:04:10 UTC (rev 6206)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: part4\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-03-02T13:07:18\n"
+"POT-Creation-Date: 2010-05-01T13:53:43\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'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."
+"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."
 msgstr ""
 
 #. Tag: para
@@ -56,12 +56,12 @@
 #. Tag: para
 #, fuzzy, no-c-format
 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."
+"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."
 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/de-DE/producermethods.po
===================================================================
--- doc/trunk/reference/de-DE/producermethods.po	2010-04-29 23:54:14 UTC (rev 6205)
+++ doc/trunk/reference/de-DE/producermethods.po	2010-05-01 15:04:10 UTC (rev 6206)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: producermethods\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-03-02T13:07:18\n"
+"POT-Creation-Date: 2010-05-01T13:53:43\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're also the easiest way to integrate objects which are not "
+"objects. They&#39;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'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&#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:"
 msgstr ""
 
 #. Tag: para
@@ -142,11 +142,11 @@
 "<literal>@SessionScoped</literal>-Annotation hinzufügen."
 
 #. Tag: para
-#, no-c-format
+#, fuzzy, 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't be called again in the same session."
+"producer method won&#39;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 "
@@ -170,13 +170,13 @@
 msgstr "Einspeisung in Producer-Methoden"
 
 #. Tag: para
-#, no-c-format
+#, fuzzy, no-c-format
 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."
+"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."
 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't what we want, we can use dependency injection into the "
+"If this isn&#39;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 \"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!"
+"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!"
 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's at least three ways we could go about fixing this bug. We could "
+"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 "
@@ -252,12 +252,12 @@
 msgstr "Sehen Sie sich folgende Producer-Methode an:"
 
 #. Tag: para
-#, no-c-format
+#, fuzzy, 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't be destroyed until 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."
 msgstr ""

Modified: doc/trunk/reference/de-DE/resources.po
===================================================================
--- doc/trunk/reference/de-DE/resources.po	2010-04-29 23:54:14 UTC (rev 6205)
+++ doc/trunk/reference/de-DE/resources.po	2010-05-01 15:04:10 UTC (rev 6206)
@@ -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-03-02T13:07:18\n"
+"POT-Creation-Date: 2010-05-01T13:53:43\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 "
-"\"mapped name\"). Producer fields turned out to be an elegant adaptor to "
+"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."
 msgstr ""
@@ -127,10 +127,10 @@
 #. Tag: para
 #, no-c-format
 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>."
+"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>."
 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're going to be using resources like the "
-"<literal>EntityManager</literal> in several different beans. Isn't it nicer "
-"and more typesafe to write"
+"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"
 msgstr ""
 
 #. Tag: para

Modified: doc/trunk/reference/de-DE/ri-spi.po
===================================================================
--- doc/trunk/reference/de-DE/ri-spi.po	2010-04-29 23:54:14 UTC (rev 6205)
+++ doc/trunk/reference/de-DE/ri-spi.po	2010-05-01 15:04:10 UTC (rev 6206)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: ri-spi\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-03-02T13:07:18\n"
+"POT-Creation-Date: 2010-05-01T13:53:43\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 \"Weld: "
-"Servlets\" extension will be sufficient, and will work in any container "
+"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."
 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't "
-"require transaction, EJB or JPA services). By default an EE environment is "
+"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>."
 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, 'virtual' <literal>BeanDeploymentArchive</literal>."
+"single, &#39;virtual&#39; <literal>BeanDeploymentArchive</literal>."
 msgstr ""
 
 #. Tag: para
@@ -181,7 +181,7 @@
 #, no-c-format
 msgid ""
 "<literal>BeanDeploymentArchive</literal> provides three methods which allow "
-"it's contents to be discovered by Weld—<literal>BeanDeploymentArchive."
+"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."
@@ -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's "
+"loaded by another in BDA Y, it is accessible, and therefore BDA Y&#39;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't "
+"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."
 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't need!"
+"to implement those services you don&#39;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's context. The <literal>org.jboss.weld.context."
-"api.BeanStore</literal> should be implemented to provide an application "
-"scoped storage."
+"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."
 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/de-DE/scopescontexts.po
===================================================================
--- doc/trunk/reference/de-DE/scopescontexts.po	2010-04-29 23:54:14 UTC (rev 6205)
+++ doc/trunk/reference/de-DE/scopescontexts.po	2010-05-01 15:04:10 UTC (rev 6206)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: scopescontexts\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-03-02T13:07:18\n"
+"POT-Creation-Date: 2010-05-01T13:53:43\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've seen a few examples of <emphasis>scope type annotations</"
+"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:"
@@ -76,13 +76,13 @@
 #. Tag: para
 #, no-c-format
 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>."
+"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>."
 msgstr ""
 
 #. Tag: title
@@ -93,8 +93,8 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"CDI features an <emphasis>extensible context model</emphasis>. It's possible "
-"to define new scopes by creating a new scope type annotation:"
+"CDI features an <emphasis>extensible context model</emphasis>. It&#39;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's the easy part of the job. For this scope type to be "
+"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 "
@@ -128,7 +128,7 @@
 
 #. Tag: para
 #, fuzzy, no-c-format
-msgid "Usually, you'll use one of CDI's built-in scopes."
+msgid "Usually, you&#39;ll use one of CDI&#39;s built-in scopes."
 msgstr ""
 "In der Regel verwenden Sie einen der eingebauten Geltungsbereiche der Web "
 "Beans."
@@ -245,10 +245,10 @@
 msgstr ""
 
 #. Tag: para
-#, no-c-format
+#, fuzzy, no-c-format
 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 "
+"EE developer, so let&#39;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's probably better to use one of the link components in JSF 2:"
+msgid "It&#39;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 \"flash\" object. The container automatically adds the "
-"conversation id to the redirect URL as a request parameter."
+"constructs such as a &#34;flash&#34; 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 \"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 "
+"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."
@@ -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't mind too much if it "
+"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."
@@ -532,7 +532,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"give the client a reference of type <literal>Instance&lt;X&gt;</literal> "
+"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."
 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'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&#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 "
@@ -604,8 +604,8 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Beans with scope <literal>@Dependent</literal> don't need a proxy object. "
-"The client holds a direct reference to its instance."
+"Beans with scope <literal>@Dependent</literal> don&#39;t need a proxy "
+"object. The client holds a direct reference to its instance."
 msgstr ""
 
 #. Tag: para
@@ -672,10 +672,10 @@
 "den besitzenden <literal>PaymentCalc</literal> gebunden ist."
 
 #. Tag: para
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"This feature is particularly useful with producer methods, as we'll see in "
-"the next chapter."
+"This feature is particularly useful with producer methods, as we&#39;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/de-DE/specialization.po
===================================================================
--- doc/trunk/reference/de-DE/specialization.po	2010-04-29 23:54:14 UTC (rev 6205)
+++ doc/trunk/reference/de-DE/specialization.po	2010-05-01 15:04:10 UTC (rev 6206)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: specialization\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-03-02T13:07:18\n"
+"POT-Creation-Date: 2010-05-01T13:53:43\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'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 "
+"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'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&#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."
 msgstr ""
 
 #. Tag: para
@@ -60,10 +60,10 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"The second case is the default assumed by CDI. It's possible to have two "
+"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've learned, you select between the two implementations using "
-"qualifiers."
+"class). As you&#39;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'll start by looking at alternatives and then show the "
+"literal>. We&#39;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't really want to submit payments to "
-"the external system, so we override that implementation of "
+"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:"
 msgstr ""
 "Aber in unserer Staging-Umgebung setzen wir diese Implementierung von "
@@ -114,18 +114,19 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"We've already seen how we can enable this alternative by listing its class "
-"in the <literal>beans.xml</literal> descriptor."
+"We&#39;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'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:"
+"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:"
 msgstr ""
 
 #. Tag: para
@@ -166,7 +167,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"So we haven't completely replaced the default implementation in this "
+"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 "
@@ -239,8 +240,8 @@
 #. Tag: para
 #, no-c-format
 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 "
+"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 "

Modified: doc/trunk/reference/de-DE/stereotypes.po
===================================================================
--- doc/trunk/reference/de-DE/stereotypes.po	2010-04-29 23:54:14 UTC (rev 6205)
+++ doc/trunk/reference/de-DE/stereotypes.po	2010-05-01 15:04:10 UTC (rev 6206)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: stereotypes\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-03-02T13:07:18\n"
+"POT-Creation-Date: 2010-05-01T13:53:43\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't be adding much value."
+"it wouldn&#39;t be adding much value."
 msgstr ""
 
 #. Tag: title
@@ -125,7 +125,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Naturally, overriding a single default isn't much use. But remember, "
+"Naturally, overriding a single default isn&#39;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'll call <emphasis>stereotype stacking</emphasis>. You "
-"may want to do this if you have two distinct stereotypes which are "
+"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."
 msgstr ""
@@ -218,7 +218,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Here's an example that combines the <literal>@Action</literal> and "
+"Here&#39;s an example that combines the <literal>@Action</literal> and "
 "<literal>@Auditable</literal> stereotypes:"
 msgstr ""
 
@@ -230,8 +230,9 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"We've already met two standard stereotypes defined by the CDI specification: "
-"<literal>@Interceptor</literal> and <literal>@Decorator</literal>."
+"We&#39;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/de-DE/viewlayers.po
===================================================================
--- doc/trunk/reference/de-DE/viewlayers.po	2010-04-29 23:54:14 UTC (rev 6205)
+++ doc/trunk/reference/de-DE/viewlayers.po	2010-05-01 15:04:10 UTC (rev 6206)
@@ -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-03-02T13:07:18\n"
+"POT-Creation-Date: 2010-05-01T13:53:43\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's metadata when "
-"the page response is complete"
+"Storing the id of any long-running conversation in Wicket&#39;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'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&#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."

Modified: doc/trunk/reference/de-DE/weldexamples.po
===================================================================
--- doc/trunk/reference/de-DE/weldexamples.po	2010-04-29 23:54:14 UTC (rev 6205)
+++ doc/trunk/reference/de-DE/weldexamples.po	2010-05-01 15:04:10 UTC (rev 6206)
@@ -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-03-02T13:07:18\n"
+"POT-Creation-Date: 2010-05-01T13:53:43\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'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, "
+"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>."
 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're told whether your guess was too high "
-"or too low."
+"1 and 100. After each attempt, you&#39;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's start by "
+"files and Facelets (JSF) views, packaged as a war module. Let&#39;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'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&#39;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's also an empty <literal>beans.xml</literal> file, which tells the "
+"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."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Finally, there's the familiar <literal>web.xml</literal>:"
+msgid "Finally, there&#39;s the familiar <literal>web.xml</literal>:"
 msgstr ""
 
 #. Tag: para
@@ -105,8 +105,8 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Let's take a look at the main JSF view, <literal>src/main/webapp/home.xhtml</"
-"literal>."
+"Let&#39;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, \"Higher!\", "
-"\"Lower!\" and \"Correct!\""
+"There are a number of messages which can be sent to the user, &#34;Higher!"
+"&#34;, &#34;Lower!&#34; and &#34;Correct!&#34;"
 msgstr ""
 
 #. Tag: para
@@ -138,9 +138,10 @@
 #. Tag: para
 #, no-c-format
 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."
+"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."
 msgstr ""
 
 #. Tag: para
@@ -176,8 +177,8 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"The <literal>Generator</literal> is application scoped, so we don't get a "
-"different random each time."
+"The <literal>Generator</literal> is application scoped, so we don&#39;t get "
+"a different random each time."
 msgstr ""
 
 #. Tag: para
@@ -191,20 +192,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's "
+"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's guess and providing feedback to the user with a "
-"<literal>FacesMessage</literal>. We've used the post-construct lifecycle "
+"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&lt;Integer&gt;</literal> bean."
+"<literal>@Random Instance&#60;Integer&#62;</literal> bean."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
 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})."
+"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})."
 msgstr ""
 
 #. Tag: title
@@ -236,8 +237,9 @@
 #, no-c-format
 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."
+"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."
 msgstr ""
 
 #. Tag: para
@@ -246,8 +248,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't need to access this interface, but Weld makes use "
-"of it."
+"name. You generally don&#39;t need to access this interface, but Weld makes "
+"use of it."
 msgstr ""
 
 #. Tag: title
@@ -260,7 +262,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'll "
+"components and leverage the conversation context. In this section, we&#39;ll "
 "walk you through the Wicket version of the numberguess example."
 msgstr ""
 
@@ -269,7 +271,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't already familiar with the framework."
+"section, if you aren&#39;t already familiar with the framework."
 msgstr ""
 
 #. Tag: para
@@ -278,17 +280,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've seen already that Jetty is perfectly capable of running CDI "
+"You&#39;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'll also be using the Eclipse IDE in these examples. Instructions are "
+"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'll likely need to do more than just deploy examples, we'll get setup in "
-"this full development environment."
+"you&#39;ll likely need to do more than just deploy examples, we&#39;ll get "
+"setup in this full development environment."
 msgstr ""
 
 #. Tag: title
@@ -311,7 +313,7 @@
 #, no-c-format
 msgid ""
 "If you have m2eclipse installed, you can open any Maven project directly. "
-"From within Eclipse, select <emphasis>File -&gt; Import... -&gt; Maven "
+"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."
@@ -327,24 +329,24 @@
 #. Tag: para
 #, no-c-format
 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!"
+"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!"
 msgstr ""
 
 #. Tag: para
 #, no-c-format
 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 "
+"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."
 msgstr ""
@@ -361,15 +363,15 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Then, from Eclipse, choose <emphasis>File -&gt; Import... -&gt; General -"
-"&gt; Existing Projects into Workspace</emphasis>, select the root directory "
+"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>."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "It's time to get the example running!"
+msgid "It&#39;s time to get the example running!"
 msgstr ""
 
 #. Tag: title
@@ -428,7 +430,7 @@
 
 #. Tag: para
 #, no-c-format
-msgid "Enough toying with deployment, let's dive into the code."
+msgid "Enough toying with deployment, let&#39;s dive into the code."
 msgstr ""
 
 #. Tag: title
@@ -460,7 +462,7 @@
 
 #. Tag: para
 #, no-c-format
-msgid "Here's where things differ from the JSF numberguess example:"
+msgid "Here&#39;s where things differ from the JSF numberguess example:"
 msgstr ""
 
 #. Tag: para
@@ -583,8 +585,8 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Let's have a look at the significant code and configuration files that make "
-"up this example."
+"Let&#39;s have a look at the significant code and configuration files that "
+"make up this example."
 msgstr ""
 
 #. Tag: para
@@ -598,8 +600,8 @@
 #. Tag: para
 #, no-c-format
 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 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:"
 msgstr ""
 
@@ -607,14 +609,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 'session'."
+"of a Swing application typically represents a single &#39;session&#39;."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
 msgid ""
-"Notice that the bean is not named, since it doesn't need to be accessed via "
-"EL."
+"Notice that the bean is not named, since it doesn&#39;t need to be accessed "
+"via EL."
 msgstr ""
 
 #. Tag: para
@@ -655,9 +657,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'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&#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."
 msgstr ""
 
 #. Tag: para
@@ -665,8 +667,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'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&#39;"
+"s next guess and the response to the previous guess. The code for "
 "<literal>MessageGenerator</literal> is as follows:"
 msgstr ""
 
@@ -679,7 +681,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"The <literal>Game</literal>'s state is interrogated to determine the "
+"The <literal>Game</literal>&#39;s state is interrogated to determine the "
 "appropriate challenge message ..."
 msgstr ""
 
@@ -724,8 +726,8 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"<literal>guessButtonActionPerformed</literal> is called when the 'Guess' "
-"button is clicked, and it does the following:"
+"<literal>guessButtonActionPerformed</literal> is called when the &#39;"
+"Guess&#39; button is clicked, and it does the following:"
 msgstr ""
 
 #. Tag: para
@@ -738,8 +740,8 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Calls <literal>game.check()</literal> to validate and perform one 'turn' of "
-"the game"
+"Calls <literal>game.check()</literal> to validate and perform one &#39;"
+"turn&#39; of the game"
 msgstr ""
 
 #. Tag: para
@@ -778,7 +780,7 @@
 #, no-c-format
 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."
+"it&#39;s structure is more complex than the numberguess example."
 msgstr ""
 
 #. Tag: para
@@ -792,9 +794,10 @@
 #. Tag: para
 #, no-c-format
 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:"
+"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:"
 msgstr ""
 
 #. Tag: para
@@ -808,18 +811,18 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"If you weren't using Maven to generate these files, you would need "
+"If you weren&#39;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'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&#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>."
 msgstr ""
 
 #. Tag: para
@@ -840,21 +843,21 @@
 #. Tag: para
 #, no-c-format
 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."
+"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."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
 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."
+"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."
 msgstr ""
 
 #. Tag: para
@@ -871,9 +874,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'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!"
+"<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!"
 msgstr ""
 
 #. Tag: para

Modified: doc/trunk/reference/de-DE/xml.po
===================================================================
--- doc/trunk/reference/de-DE/xml.po	2010-04-29 23:54:14 UTC (rev 6205)
+++ doc/trunk/reference/de-DE/xml.po	2010-05-01 15:04:10 UTC (rev 6206)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: xml\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-03-02T13:07:18\n"
+"POT-Creation-Date: 2010-05-01T13:53:43\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'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:"
+"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:"
 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 "
@@ -72,13 +72,13 @@
 "Namens als Name des XML-Elements."
 
 #. Tag: para
-#, no-c-format
+#, 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'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&#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."
 msgstr ""
 "Der Vorteil bei dieser Vorgehensweise ist, dass Sie ein XML-Schema schreiben "
 "können, dass Rechtschreibfehler in Ihrem XML-Dokument verhindert. Es ist "
@@ -123,9 +123,9 @@
 "des Elements festgelegt."
 
 #. Tag: para
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"For example, the element <literal>&lt;util:Date/&gt;</literal> in the "
+"For example, the element <literal>&#60;util:Date/&#62;</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>&lt;Name&gt;</literal> element declares a bean of scope "
+"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 "
@@ -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's not quite a full databinding "
-"solution, but it's close!"
+"specify whole graphs of Java objects. It&#39;s not quite a full databinding "
+"solution, but it&#39;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,9 +244,10 @@
 #. Tag: para
 #, fuzzy, no-c-format
 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."
+"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."
 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/es-ES/Author_Group.po
===================================================================
--- doc/trunk/reference/es-ES/Author_Group.po	2010-04-29 23:54:14 UTC (rev 6205)
+++ doc/trunk/reference/es-ES/Author_Group.po	2010-05-01 15:04:10 UTC (rev 6206)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: Author_Group\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-03-02T13:07:17\n"
+"POT-Creation-Date: 2010-05-01T13:53:42\n"
 "PO-Revision-Date: 2009-01-14 09:26+1000\n"
 "Last-Translator: Gladys Guerrero Lozano <gguerrer at redhat.com>\n"
 "Language-Team: Spanish <fedora-trans-es at redhat.com>\n"
@@ -16,86 +16,36 @@
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#. Tag: firstname
-#, no-c-format
-msgid "Gavin"
-msgstr ""
-
 #. Tag: contrib
 #, no-c-format
 msgid "JSR-299: Contexts and Dependency Injection Lead"
 msgstr ""
 
-#. Tag: firstname
-#, no-c-format
-msgid "Pete"
-msgstr ""
-
 #. Tag: contrib
 #, no-c-format
 msgid "Weld (JSR-299 RI) Lead"
 msgstr ""
 
-#. Tag: firstname
-#, no-c-format
-msgid "Dan"
-msgstr ""
-
-#. Tag: firstname
-#, no-c-format
-msgid "David"
-msgstr ""
-
-#. Tag: firstname
-#, no-c-format
-msgid "Nicola"
-msgstr ""
-
 #. Tag: contrib
 #, no-c-format
 msgid "Italian Translation"
 msgstr "Traducción en italiano"
 
-#. Tag: firstname
-#, no-c-format
-msgid "Gladys"
-msgstr ""
-
 #. Tag: contrib
 #, fuzzy, no-c-format
 msgid "Spanish Translation"
 msgstr "Traducción en italiano"
 
-#. Tag: firstname
-#, no-c-format
-msgid "Eun-Ju"
-msgstr ""
-
 #. Tag: contrib
 #, fuzzy, no-c-format
 msgid "Korean Translation"
 msgstr "Traducción en italiano"
 
-#. Tag: firstname
-#, no-c-format
-msgid "Terry"
-msgstr ""
-
 #. Tag: contrib
 #, fuzzy, no-c-format
 msgid "Traditional Chinese Translation"
 msgstr "Traducción en italiano"
 
-#. Tag: firstname
-#, no-c-format
-msgid "Francesco"
-msgstr ""
-
-#. Tag: firstname
-#, no-c-format
-msgid "Sean"
-msgstr ""
-
 #. Tag: contrib
 #, fuzzy, no-c-format
 msgid "Simplified Chinese Translation"

Modified: doc/trunk/reference/es-ES/beans.po
===================================================================
--- doc/trunk/reference/es-ES/beans.po	2010-04-29 23:54:14 UTC (rev 6205)
+++ doc/trunk/reference/es-ES/beans.po	2010-05-01 15:04:10 UTC (rev 6206)
@@ -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-03-02T13:07:17\n"
+"POT-Creation-Date: 2010-05-01T13:53:42\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'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&#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."
 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'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&#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:"
 msgstr ""
 
 #. Tag: para
@@ -171,7 +171,7 @@
 
 #. Tag: para
 #, no-c-format
-msgid "Let's see what all this new terminology means."
+msgid "Let&#39;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 \"contract\" that must be satisfied by "
-"the bean to be injected. The contract is:"
+"Any injected attribute specifies a &#34;contract&#34; 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&lt;Book&gt;</literal>, as well as the implicit type "
+"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)."
 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't inject an EJB using its remote interface unless "
-"you define a <emphasis>resource</emphasis>, which we'll meet in <xref "
-"linkend=\"resources\" />."
+"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\" />."
 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&lt;Book&gt;</literal>, together with "
+"restricted to <literal>Shop&#60;Book&#62;</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 \"quality\" using "
-"a qualifier."
+"implementation it is interested in. We model this kind of &#34;quality&#34; "
+"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's an example of a qualifier annotation:"
+"string-based names. Here&#39;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've encountered one. With CDI, annotation "
-"definitions will become a familiar artifact as you'll be creating them from "
-"time to time."
+"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."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
 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 "
+"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."
 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't, it reports an error to the user."
+"doesn&#39;t, it reports an error to the user."
 msgstr ""
 
 #. Tag: para
@@ -330,10 +330,10 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"That's not quite the end of the story. CDI also defines a simple "
+"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'll get into the details in <xref linkend=\"injection\" />."
+"We&#39;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't want the bean to sit in the session "
+"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."
 msgstr ""
@@ -386,7 +386,8 @@
 
 #. Tag: para
 #, no-c-format
-msgid "We'll talk more about scopes in <xref linkend=\"scopescontexts\" />."
+msgid ""
+"We&#39;ll talk more about scopes in <xref linkend=\"scopescontexts\" />."
 msgstr ""
 
 #. Tag: title
@@ -445,7 +446,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"We've already seen how qualifiers let us choose between multiple "
+"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 "
@@ -482,9 +483,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'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."
+"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."
 msgstr ""
 
 #. Tag: para
@@ -497,10 +498,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'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."
+"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."
 msgstr ""
 
 #. Tag: para
@@ -539,14 +540,14 @@
 #, no-c-format
 msgid ""
 "Notice that <literal>ShoppingCart</literal> and "
-"<literal>TransactionInterceptor</literal> don't know anything about each "
+"<literal>TransactionInterceptor</literal> don&#39;t know anything about each "
 "other."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
 msgid ""
-"Interceptors are deployment-specific. (We don't need a "
+"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 "
@@ -556,8 +557,8 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"We'll discuss interceptors, and their cousins, decorators, in <xref linkend="
-"\"interceptors\" /> and <xref linkend=\"decorators\" />."
+"We&#39;ll discuss interceptors, and their cousins, decorators, in <xref "
+"linkend=\"interceptors\" /> and <xref linkend=\"decorators\" />."
 msgstr ""
 
 #. Tag: title
@@ -568,9 +569,10 @@
 #. Tag: para
 #, no-c-format
 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."
+"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."
 msgstr ""
 
 #. Tag: title
@@ -584,8 +586,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't need to. According to "
-"the specification, the CDI container treats any class that satisfies the "
+"<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:"
 msgstr ""
 
@@ -634,7 +636,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't recommend directly injecting an entity class. We "
+"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."
@@ -713,7 +715,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"There's no reason to explicitly declare the scope of a stateless session "
+"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 "
@@ -769,8 +771,8 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"When we don't need any of these things, an ordinary managed bean will serve "
-"just fine."
+"When we don&#39;t need any of these things, an ordinary managed bean will "
+"serve just fine."
 msgstr ""
 
 #. Tag: para
@@ -794,7 +796,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Finally, it's usually obvious when method-level transaction management, "
+"Finally, it&#39;s usually obvious when method-level transaction management, "
 "method-level security, timers, remote methods or asynchronous methods are "
 "needed."
 msgstr ""
@@ -802,11 +804,11 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"The point we're trying to make is: use a session bean when you need the "
+"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'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&#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>."
 msgstr ""
@@ -814,13 +816,14 @@
 #. Tag: para
 #, no-c-format
 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\"."
+"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;."
 msgstr ""
 
 #. Tag: title
@@ -859,7 +862,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"We can't write a bean class that is itself a random number. But we can "
+"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—"
@@ -931,7 +934,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"We'll talk much more about producer methods in <xref linkend="
+"We&#39;ll talk much more about producer methods in <xref linkend="
 "\"producermethods\" />."
 msgstr ""
 
@@ -962,7 +965,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'll have to wait until <xref "
-"linkend=\"resources\" />. Because we can't wait to get to work on some "
+"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."
 msgstr ""

Modified: doc/trunk/reference/es-ES/decorators.po
===================================================================
--- doc/trunk/reference/es-ES/decorators.po	2010-04-29 23:54:14 UTC (rev 6205)
+++ doc/trunk/reference/es-ES/decorators.po	2010-05-01 15:04:10 UTC (rev 6206)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: decorators\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-03-02T13:07:17\n"
+"POT-Creation-Date: 2010-05-01T13:53:42\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't "
-"an appropriate tool for separating business-related concerns."
+"the actual semantics of the events they intercept. Thus, interceptors "
+"aren&#39;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,10 +49,11 @@
 "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."
+"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 ""
 "En cambio, los <emphasis>decoradores</emphasis> interceptan invocaciones "
 "únicamente para una determinada interfaz de Java y por lo tanto, conocen "
@@ -101,8 +102,9 @@
 #, fuzzy, no-c-format
 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."
+"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 ""
 "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 "
@@ -196,7 +198,8 @@
 #, fuzzy, no-c-format
 msgid ""
 "This declaration serves the same purpose for decorators that the "
-"<literal>&lt;interceptors&gt;</literal> declaration serves for interceptors:"
+"<literal>&#60;interceptors&#62;</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/es-ES/ee.po
===================================================================
--- doc/trunk/reference/es-ES/ee.po	2010-04-29 23:54:14 UTC (rev 6205)
+++ doc/trunk/reference/es-ES/ee.po	2010-05-01 15:04:10 UTC (rev 6206)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: ee\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-03-02T13:07:17\n"
+"POT-Creation-Date: 2010-05-01T13:53:42\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's easy to create a "
+"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 "
@@ -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've already seen a couple of "
-"examples of this, though we didn't pay much attention at the time:"
+"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:"
 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's easy to use a bean from a servlet in Java EE 6. Simply inject the bean "
-"using field or initializer method injection."
+"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."
 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'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&#39;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'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."
+"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."
 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/es-ES/environments.po
===================================================================
--- doc/trunk/reference/es-ES/environments.po	2010-04-29 23:54:14 UTC (rev 6205)
+++ doc/trunk/reference/es-ES/environments.po	2010-05-01 15:04:10 UTC (rev 6206)
@@ -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-03-02T13:07:17\n"
+"POT-Creation-Date: 2010-05-01T14:44:09\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'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&#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."
 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't "
+"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 "
@@ -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 \"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:"
+"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:"
 msgstr ""
 
 #. Tag: para
@@ -186,7 +186,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Tomcat has a read-only JNDI, so Weld can't automatically bind the "
+"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:"
@@ -209,10 +209,7 @@
 
 #. Tag: para
 #, no-c-format
-msgid ""
-"Weld also supports Servlet injection in Tomcat. To enable this, place the "
-"<literal>weld-tomcat-support.jar</literal> in <literal>$TOMCAT_HOME/lib</"
-"literal>, and add the following to <literal>META-INF/context.xml</literal>:"
+msgid "Weld also supports Servlet injection in Tomcat 6."
 msgstr ""
 
 #. Tag: title
@@ -223,18 +220,18 @@
 #. Tag: para
 #, no-c-format
 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:"
+"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:"
 msgstr ""
 
 #. Tag: para
 #, no-c-format
 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."
+"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."
 msgstr ""
 
 #. Tag: para
@@ -247,7 +244,10 @@
 
 #. Tag: para
 #, no-c-format
-msgid "Weld does not currently support Servlet injection in Jetty."
+msgid ""
+"Weld also supports Servlet injection in Jetty 6. To enable this, add the "
+"file <literal>META-INF/jetty-web.xml</literal> with the following content to "
+"your war:"
 msgstr ""
 
 #. Tag: title
@@ -258,13 +258,13 @@
 #. Tag: para
 #, no-c-format
 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."
+"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."
 msgstr ""
 
 #. Tag: para
@@ -348,7 +348,7 @@
 
 #. Tag: para
 #, no-c-format
-msgid "Here's an example of a simple CDI SE application:"
+msgid "Here&#39;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'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&#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."
@@ -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's beans and events. The API consists of two "
-"classes: <literal>Weld</literal> and <literal>WeldContainer</literal>."
+"references to your application&#39;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's an example application main method which uses this API to initialize "
-"a bean of type <literal>MyApplicationBean</literal>."
+"Here&#39;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 '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."
+"<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."
 msgstr ""
 
 #. Tag: para
@@ -459,8 +459,8 @@
 #. Tag: para
 #, no-c-format
 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."
+"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."
 msgstr ""

Modified: doc/trunk/reference/es-ES/events.po
===================================================================
--- doc/trunk/reference/es-ES/events.po	2010-04-29 23:54:14 UTC (rev 6205)
+++ doc/trunk/reference/es-ES/events.po	2010-05-01 15:04:10 UTC (rev 6206)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: events\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-03-02T13:07:17\n"
+"POT-Creation-Date: 2010-05-01T13:53:42\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"
@@ -49,10 +49,10 @@
 "productores."
 
 #. Tag: para
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"observers can specify a combination of \"selectors\" to narrow the set of "
-"event notifications they will receive, and"
+"observers can specify a combination of &#34;selectors&#34; 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've already seen with the dependency injection service."
+"approach that we&#39;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's an example:"
+"<literal>@Qualifier</literal>. Here&#39;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's only interested in events which have those "
+"does specify qualifiers, it&#39;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't specify the "
-"qualifier dynamically. CDI lets us obtain a qualifier instance by "
+"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>."
@@ -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'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&#39;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/es-ES/example.po
===================================================================
--- doc/trunk/reference/es-ES/example.po	2010-04-29 23:54:14 UTC (rev 6205)
+++ doc/trunk/reference/es-ES/example.po	2010-05-01 15:04:10 UTC (rev 6206)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: example\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-03-02T13:07:17\n"
+"POT-Creation-Date: 2010-05-01T13:53:42\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'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:"
+"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:"
 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're also going to need a <literal>persistence.xml</literal> "
+"(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>.)"
 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'll explore dependency injection in greater depth."
+"the next chapter, we&#39;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/es-ES/extend.po
===================================================================
--- doc/trunk/reference/es-ES/extend.po	2010-04-29 23:54:14 UTC (rev 6205)
+++ doc/trunk/reference/es-ES/extend.po	2010-05-01 15:04:10 UTC (rev 6206)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: extend\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-03-02T13:07:17\n"
+"POT-Creation-Date: 2010-05-01T13:53:42\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's needed to satisfy the requirements of Java SE's "
-"service provider architecture."
+"define any methods, but it&#39;s needed to satisfy the requirements of Java "
+"SE&#39;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's metamodel and more. Here's a very simple "
-"example:"
+"permitted to modify the container&#39;s metamodel and more. Here&#39;s a "
+"very simple example:"
 msgstr ""
 
 #. Tag: para
@@ -227,7 +227,7 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"Let's study some of the interfaces exposed by the <literal>BeanManager</"
+"Let&#39;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,7 +285,8 @@
 
 #. Tag: para
 #, no-c-format
-msgid "There's an easy way to find out what beans exist in the application:"
+msgid ""
+"There&#39;s an easy way to find out what beans exist in the application:"
 msgstr ""
 
 #. Tag: para
@@ -322,9 +323,9 @@
 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."
+"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."
 msgstr ""
 
 #. Tag: para
@@ -350,8 +351,8 @@
 #. Tag: para
 #, no-c-format
 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 "
+"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 "
@@ -361,7 +362,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Here's a second example, which adds the <literal>@Alternative</literal> "
+"Here&#39;s a second example, which adds the <literal>@Alternative</literal> "
 "annotation to any class which implements a certain <literal>Service</"
 "literal> interface."
 msgstr ""
@@ -392,12 +393,12 @@
 #. Tag: para
 #, no-c-format
 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 "
+"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:"
 msgstr ""
 
@@ -412,9 +413,9 @@
 #. Tag: para
 #, no-c-format
 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."
+"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."
 msgstr ""
 
 #. Tag: title

Modified: doc/trunk/reference/es-ES/extensions.po
===================================================================
--- doc/trunk/reference/es-ES/extensions.po	2010-04-29 23:54:14 UTC (rev 6205)
+++ doc/trunk/reference/es-ES/extensions.po	2010-05-01 15:04:10 UTC (rev 6206)
@@ -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-03-02T13:07:17\n"
+"POT-Creation-Date: 2010-05-01T13:53:42\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's no need to "
-"include sl4j as it's already included (and used internally)."
+"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)."
 msgstr ""

Modified: doc/trunk/reference/es-ES/gettingstarted.po
===================================================================
--- doc/trunk/reference/es-ES/gettingstarted.po	2010-04-29 23:54:14 UTC (rev 6205)
+++ doc/trunk/reference/es-ES/gettingstarted.po	2010-05-01 15:04:10 UTC (rev 6206)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: ri\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-03-02T13:07:17\n"
+"POT-Creation-Date: 2010-05-01T13:53:42\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'll need the "
+"To run the examples with the provided build scripts, you&#39;ll need the "
 "following:"
 msgstr ""
 
@@ -97,7 +97,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"You'll need a full install of Ant 1.7.0. Some linux distributions only "
+"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."
 msgstr ""
@@ -105,7 +105,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"In the next few sections, you'll be using the Ant command (<literal>ant</"
+"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 "
@@ -124,7 +124,7 @@
 #, no-c-format
 msgid ""
 "The sections below cover the steps for deploying with both Ant and Maven in "
-"detail. Let's start with JBoss AS."
+"detail. Let&#39;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'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!"
+"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!"
 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'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>."
+"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>."
 msgstr ""
 
 #. Tag: para
@@ -169,7 +169,7 @@
 
 #. Tag: para
 #, fuzzy, no-c-format
-msgid "You're now ready to deploy your first example!"
+msgid "You&#39;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't already, start JBoss AS. You can either start JBoss AS from a "
-"Linux shell:"
+"If you haven&#39;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's a topic for a later chapter."
+"modules, but that&#39;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'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&#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."
 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'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."
+"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."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
 msgid ""
-"To deploy the examples to GlassFish, you'll need the final <ulink url="
+"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'll "
-"need to first make the script executable."
+"After the download is complete, execute the installer. On Linux/Unix, "
+"you&#39;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'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&#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)."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
 msgid ""
-"If you've deployed either of the starter examples, <literal>weld-"
+"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."
@@ -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's "
+"<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's <literal>ear/target</literal> directory. All you "
-"need to do now is deploy them to GlassFish."
+"ends up in the example&#39;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 \"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."
+"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."
 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't get enterprise features such as session beans and "
-"container-managed transactions.)"
+"container. (But you don&#39;t get enterprise features such as session beans "
+"and container-managed transactions.)"
 msgstr ""
 
 #. Tag: para
 #, fuzzy, no-c-format
 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."
+"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."
 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't require that you have Maven installed, so we'll start "
-"there. If you want to use Maven, you can just skip ahead."
+"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."
 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'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&#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>."
 msgstr ""
 
 #. Tag: para
 #, fuzzy, no-c-format
-msgid "Now you're ready to deploy the numberguess example to Tomcat!"
+msgid "Now you&#39;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 \"tomcat.\"."
+"same target names used for JBoss AS, prefixed with &#34;tomcat.&#34;."
 msgstr ""
 
 #. Tag: para
@@ -501,7 +501,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"If you haven't already, start Tomcat. You can either start Tomcat from a "
+"If you haven&#39;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'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."
+"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."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
 msgid ""
-"The Maven plugin communicates with Tomcat over HTTP, so it doesn't care "
+"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</"
@@ -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's <literal>readme.txt</"
+"the example, which are documented in the example&#39;s <literal>readme.txt</"
 "literal> file."
 msgstr ""
 
@@ -612,10 +612,10 @@
 #. Tag: para
 #, no-c-format
 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."
+"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."
 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't need anything else installed except to have the Maven command "
+"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."
 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 \"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 &#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."

Modified: doc/trunk/reference/es-ES/injection.po
===================================================================
--- doc/trunk/reference/es-ES/injection.po	2010-04-29 23:54:14 UTC (rev 6205)
+++ doc/trunk/reference/es-ES/injection.po	2010-05-01 15:04:10 UTC (rev 6206)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: injection\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-04-14T10:16:01\n"
+"POT-Creation-Date: 2010-05-01T14:44:09\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't rely on it)."
+"not portable, don&#39;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'll meet in <xref linkend=\"events\" />) and "
+"observer methods (which we&#39;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'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 "
+"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."
 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's "
-"the simplest possible scenario. When you first start your application, "
-"you'll likely have lots of those."
+"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."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
 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."
+"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."
 msgstr ""
 
 #. Tag: title
@@ -304,12 +304,12 @@
 #. Tag: para
 #, no-c-format
 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>!"
+"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>!"
 msgstr ""
 
 #. Tag: title
@@ -326,11 +326,12 @@
 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."
+"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."
 msgstr ""
 
 #. Tag: para
@@ -421,7 +422,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's the bean that will be injected."
+"alternative, that&#39;s the bean that will be injected."
 msgstr ""
 
 #. Tag: title
@@ -447,8 +448,8 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"During the course of your development, you're going to encounter this "
-"situation. Let's learn how to resolve it."
+"During the course of your development, you&#39;re going to encounter this "
+"situation. Let&#39;s learn how to resolve it."
 msgstr ""
 
 #. Tag: para
@@ -522,7 +523,7 @@
 
 #. Tag: para
 #, no-c-format
-msgid "Just remember: \"There can be only one.\""
+msgid "Just remember: &#34;There can be only one.&#34;"
 msgstr ""
 
 #. Tag: para
@@ -530,14 +531,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'll see in <xref linkend=\"lookup\" />."
+"<literal>Instance</literal>, as we&#39;ll see in <xref linkend=\"lookup\" />."
 msgstr ""
 
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"Now there's one more issue you need to be aware of when using the dependency "
-"injection service."
+"Now there&#39;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."
@@ -635,7 +636,8 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"classes which don't have a non-private constructor with no parameters, and"
+"classes which don&#39;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
@@ -655,7 +657,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"It's usually very easy to fix an unproxyable dependency problem. If an "
+"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:"
 msgstr ""
@@ -668,7 +670,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"change the type of the injection point to <literal>Instance&lt;X&gt;</"
+"change the type of the injection point to <literal>Instance&#60;X&#62;</"
 "literal>,"
 msgstr ""
 
@@ -709,7 +711,7 @@
 
 #. Tag: para
 #, no-c-format
-msgid "But we didn't get around to implementing this yet."
+msgid "But we didn&#39;t get around to implementing this yet."
 msgstr ""
 
 #. Tag: title
@@ -802,10 +804,11 @@
 #, no-c-format
 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>."
+"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>."
 msgstr ""
 
 #. Tag: para
@@ -816,7 +819,8 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"We can't use an anonymous class to implement a qualifier type with members."
+"We can&#39;t use an anonymous class to implement a qualifier type with "
+"members."
 msgstr ""
 
 #. Tag: para
@@ -883,10 +887,10 @@
 "relativos al punto de inyección al que pertenezca."
 
 #. Tag: para
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"Let's look at an example. The following code is verbose, and vulnerable to "
-"refactoring problems:"
+"Let&#39;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:"
@@ -908,8 +912,8 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"Not convinced? Then here's a second example. To inject HTTP parameters, we "
-"need to define a qualifier type:"
+"Not convinced? Then here&#39;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/es-ES/interceptors.po
===================================================================
--- doc/trunk/reference/es-ES/interceptors.po	2010-04-29 23:54:14 UTC (rev 6205)
+++ doc/trunk/reference/es-ES/interceptors.po	2010-05-01 15:04:10 UTC (rev 6206)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: interceptors\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-03-02T13:07:17\n"
+"POT-Creation-Date: 2010-05-01T13:53:43\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're interested in:"
+"specify exactly which beans we&#39;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'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 "
+"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>."
 msgstr ""
 "Es maravilloso, pero en alguna parte de la línea vamos a tener que "

Modified: doc/trunk/reference/es-ES/intro.po
===================================================================
--- doc/trunk/reference/es-ES/intro.po	2010-04-29 23:54:14 UTC (rev 6205)
+++ doc/trunk/reference/es-ES/intro.po	2010-05-01 15:04:10 UTC (rev 6206)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: intro\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-03-02T13:07:18\n"
+"POT-Creation-Date: 2010-05-01T13:53:43\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'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!"
+"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!"
 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,13 +51,14 @@
 #. Tag: para
 #, no-c-format
 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."
+"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."
 msgstr ""
 
 #. Tag: para
@@ -69,8 +70,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's a uniform concept of a bean and a "
-"lightweight component model that's aligned across the Java EE platform."
+"<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."
 msgstr ""
 
 #. Tag: para
@@ -79,30 +80,31 @@
 "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>."
+"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>."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
 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."
+"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."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Now let's see how to create your first bean that actually uses CDI."
+msgid "Now let&#39;s see how to create your first bean that actually uses CDI."
 msgstr ""
 
 #. Tag: title
@@ -113,7 +115,7 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"Suppose that we have two existing Java classes that we've been using for "
+"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:"
 msgstr ""
@@ -139,8 +141,8 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"Unfortunately, we don't have a class that translates whole text documents. "
-"So let's write a bean for this job:"
+"Unfortunately, we don&#39;t have a class that translates whole text "
+"documents. So let&#39;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:"
@@ -161,11 +163,11 @@
 #. Tag: para
 #, fuzzy, no-c-format
 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."
+"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."
 msgstr ""
 "Como pudo adivinar, la anotación <literal>@Initializer</literal> tiene algo "
 "que ver con la ¡inyección de dependencia! <literal>@Initializer</literal> "
@@ -187,7 +189,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Let's create a UI controller bean that uses field injection to obtain an "
+"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:"
 msgstr ""
@@ -201,10 +203,10 @@
 #, no-c-format
 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."
+"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."
 msgstr ""
 
 #. Tag: para
@@ -220,11 +222,11 @@
 #. Tag: para
 #, no-c-format
 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."
+"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."
 msgstr ""
 
 #. Tag: para
@@ -252,10 +254,10 @@
 #. Tag: para
 #, no-c-format
 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."
+"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."
 msgstr ""
 
 #, fuzzy

Modified: doc/trunk/reference/es-ES/master.po
===================================================================
--- doc/trunk/reference/es-ES/master.po	2010-04-29 23:54:14 UTC (rev 6205)
+++ doc/trunk/reference/es-ES/master.po	2010-05-01 15:04:10 UTC (rev 6206)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: master\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-03-02T13:07:18\n"
+"POT-Creation-Date: 2010-05-01T13:53:43\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 \"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."
+"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."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
 msgid ""
-"You'll also find that some of the functionality that once existed in the "
+"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."
@@ -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'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&#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."
 msgstr ""
 
 #. Tag: title

Modified: doc/trunk/reference/es-ES/next.po
===================================================================
--- doc/trunk/reference/es-ES/next.po	2010-04-29 23:54:14 UTC (rev 6205)
+++ doc/trunk/reference/es-ES/next.po	2010-05-01 15:04:10 UTC (rev 6206)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: next\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-03-02T13:07:18\n"
+"POT-Creation-Date: 2010-05-01T13:53:43\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's not yet a lot of information available "
+"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'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."
+"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."
 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's "
-"probably the best source of information about the future of CDI, Weld and "
+"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."
 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 \"<literal>-SNAPSHOT</literal>\" from the version element (so you "
-"don't have to build other Weld modules)."
+"remove the &#34;<literal>-SNAPSHOT</literal>&#34; from the version element "
+"(so you don&#39;t have to build other Weld modules)."
 msgstr ""
 
 #. Tag: para

Modified: doc/trunk/reference/es-ES/part1.po
===================================================================
--- doc/trunk/reference/es-ES/part1.po	2010-04-29 23:54:14 UTC (rev 6205)
+++ doc/trunk/reference/es-ES/part1.po	2010-05-01 15:04:10 UTC (rev 6206)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: part1\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-03-02T13:07:18\n"
+"POT-Creation-Date: 2010-05-01T13:53:43\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'm not currently using it?"
+"Where should I keep the reference to it when I&#39;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's a whole, rich programming model. The "
+"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's study what that phrase means."
+"typing</emphasis>. Let&#39;s study what that phrase means."
 msgstr ""
 
 #. Tag: para
@@ -261,8 +261,8 @@
 #. Tag: para
 #, fuzzy, no-c-format
 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 "
+"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 "
@@ -283,10 +283,10 @@
 #. Tag: para
 #, no-c-format
 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."
+"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."
 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't have been any "
-"of these without inspiration from the frameworks mentioned and "
+"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)."
 msgstr ""

Modified: doc/trunk/reference/es-ES/part3.po
===================================================================
--- doc/trunk/reference/es-ES/part3.po	2010-04-29 23:54:14 UTC (rev 6205)
+++ doc/trunk/reference/es-ES/part3.po	2010-05-01 15:04:10 UTC (rev 6206)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: part3\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-03-02T13:07:18\n"
+"POT-Creation-Date: 2010-05-01T13:53:43\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've "
-"already seen three means of achieving loose coupling:"
+"The first major theme of CDI is <emphasis>loose coupling</emphasis>. We&#39;"
+"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't see string-based identifiers in CDI code, not because the "
+"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 "
-"\"configuration by convention\"—but because there are simply no strings "
-"there to begin with!"
+"&#34;configuration by convention&#34;—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're now ready to meet some more advanced features of CDI. Bear in mind "
+"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't ever really <emphasis>need</"
-"emphasis> to use these features, but if you use them wisely, you'll come to "
-"appreciate their power."
+"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."
 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/es-ES/part4.po
===================================================================
--- doc/trunk/reference/es-ES/part4.po	2010-04-29 23:54:14 UTC (rev 6205)
+++ doc/trunk/reference/es-ES/part4.po	2010-05-01 15:04:10 UTC (rev 6206)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: part4\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-03-02T13:07:18\n"
+"POT-Creation-Date: 2010-05-01T13:53:43\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'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."
+"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."
 msgstr ""
 
 #. Tag: para
@@ -56,12 +56,12 @@
 #. Tag: para
 #, fuzzy, no-c-format
 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."
+"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."
 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/es-ES/producermethods.po
===================================================================
--- doc/trunk/reference/es-ES/producermethods.po	2010-04-29 23:54:14 UTC (rev 6205)
+++ doc/trunk/reference/es-ES/producermethods.po	2010-05-01 15:04:10 UTC (rev 6206)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: producermethods\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-03-02T13:07:18\n"
+"POT-Creation-Date: 2010-05-01T13:53:43\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're also the easiest way to integrate objects which are not "
+"objects. They&#39;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'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&#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:"
 msgstr ""
 
 #. Tag: para
@@ -142,11 +142,11 @@
 "<literal>@SessionScoped</literal> a este método."
 
 #. Tag: para
-#, no-c-format
+#, fuzzy, 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't be called again in the same session."
+"producer method won&#39;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 "
@@ -170,13 +170,13 @@
 msgstr "Inyección dentro de métodos de productor"
 
 #. Tag: para
-#, no-c-format
+#, fuzzy, no-c-format
 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."
+"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."
 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't what we want, we can use dependency injection into the "
+"If this isn&#39;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 \"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!"
+"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!"
 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's at least three ways we could go about fixing this bug. We could "
+"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 "
@@ -250,12 +250,12 @@
 msgstr "Considere el siguiente método de productor:"
 
 #. Tag: para
-#, no-c-format
+#, fuzzy, 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't be destroyed until 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."
 msgstr ""

Modified: doc/trunk/reference/es-ES/resources.po
===================================================================
--- doc/trunk/reference/es-ES/resources.po	2010-04-29 23:54:14 UTC (rev 6205)
+++ doc/trunk/reference/es-ES/resources.po	2010-05-01 15:04:10 UTC (rev 6206)
@@ -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-03-02T13:07:18\n"
+"POT-Creation-Date: 2010-05-01T13:53:43\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 "
-"\"mapped name\"). Producer fields turned out to be an elegant adaptor to "
+"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."
 msgstr ""
@@ -127,10 +127,10 @@
 #. Tag: para
 #, no-c-format
 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>."
+"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>."
 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're going to be using resources like the "
-"<literal>EntityManager</literal> in several different beans. Isn't it nicer "
-"and more typesafe to write"
+"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"
 msgstr ""
 
 #. Tag: para

Modified: doc/trunk/reference/es-ES/ri-spi.po
===================================================================
--- doc/trunk/reference/es-ES/ri-spi.po	2010-04-29 23:54:14 UTC (rev 6205)
+++ doc/trunk/reference/es-ES/ri-spi.po	2010-05-01 15:04:10 UTC (rev 6206)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: ri-spi\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-03-02T13:07:18\n"
+"POT-Creation-Date: 2010-05-01T13:53:43\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 \"Weld: "
-"Servlets\" extension will be sufficient, and will work in any container "
+"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."
 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't "
-"require transaction, EJB or JPA services). By default an EE environment is "
+"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>."
 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, 'virtual' <literal>BeanDeploymentArchive</literal>."
+"single, &#39;virtual&#39; <literal>BeanDeploymentArchive</literal>."
 msgstr ""
 
 #. Tag: para
@@ -182,7 +182,7 @@
 #, no-c-format
 msgid ""
 "<literal>BeanDeploymentArchive</literal> provides three methods which allow "
-"it's contents to be discovered by Weld—<literal>BeanDeploymentArchive."
+"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."
@@ -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's "
+"loaded by another in BDA Y, it is accessible, and therefore BDA Y&#39;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't "
+"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."
 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't need!"
+"to implement those services you don&#39;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's context. The <literal>org.jboss.weld.context."
-"api.BeanStore</literal> should be implemented to provide an application "
-"scoped storage."
+"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."
 msgstr ""
 
 #. Tag: title

Modified: doc/trunk/reference/es-ES/scopescontexts.po
===================================================================
--- doc/trunk/reference/es-ES/scopescontexts.po	2010-04-29 23:54:14 UTC (rev 6205)
+++ doc/trunk/reference/es-ES/scopescontexts.po	2010-05-01 15:04:10 UTC (rev 6206)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: scopescontexts\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-03-02T13:07:18\n"
+"POT-Creation-Date: 2010-05-01T13:53:43\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've seen a few examples of <emphasis>scope type annotations</"
+"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:"
@@ -74,13 +74,13 @@
 #. Tag: para
 #, no-c-format
 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>."
+"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>."
 msgstr ""
 
 #. Tag: title
@@ -91,8 +91,8 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"CDI features an <emphasis>extensible context model</emphasis>. It's possible "
-"to define new scopes by creating a new scope type annotation:"
+"CDI features an <emphasis>extensible context model</emphasis>. It&#39;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's the easy part of the job. For this scope type to be "
+"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 "
@@ -123,7 +123,7 @@
 
 #. Tag: para
 #, fuzzy, no-c-format
-msgid "Usually, you'll use one of CDI's built-in scopes."
+msgid "Usually, you&#39;ll use one of CDI&#39;s built-in scopes."
 msgstr ""
 "Por lo general, se utilizará uno de los ámbitos incorporados de Web Beans."
 
@@ -240,10 +240,10 @@
 msgstr ""
 
 #. Tag: para
-#, no-c-format
+#, fuzzy, no-c-format
 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 "
+"EE developer, so let&#39;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's probably better to use one of the link components in JSF 2:"
+msgid "It&#39;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 \"flash\" object. The container automatically adds the "
-"conversation id to the redirect URL as a request parameter."
+"constructs such as a &#34;flash&#34; 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 \"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 "
+"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."
@@ -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't mind too much if it "
+"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."
@@ -525,7 +525,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"give the client a reference of type <literal>Instance&lt;X&gt;</literal> "
+"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."
 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'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&#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 "
@@ -596,8 +596,8 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Beans with scope <literal>@Dependent</literal> don't need a proxy object. "
-"The client holds a direct reference to its instance."
+"Beans with scope <literal>@Dependent</literal> don&#39;t need a proxy "
+"object. The client holds a direct reference to its instance."
 msgstr ""
 
 #. Tag: para
@@ -662,10 +662,10 @@
 "propietario de <literal>PaymentCalc</literal>."
 
 #. Tag: para
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"This feature is particularly useful with producer methods, as we'll see in "
-"the next chapter."
+"This feature is particularly useful with producer methods, as we&#39;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/es-ES/specialization.po
===================================================================
--- doc/trunk/reference/es-ES/specialization.po	2010-04-29 23:54:14 UTC (rev 6205)
+++ doc/trunk/reference/es-ES/specialization.po	2010-05-01 15:04:10 UTC (rev 6206)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: specialization\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-03-02T13:07:18\n"
+"POT-Creation-Date: 2010-05-01T13:53:43\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'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 "
+"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'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&#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."
 msgstr ""
 
 #. Tag: para
@@ -61,10 +61,10 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"The second case is the default assumed by CDI. It's possible to have two "
+"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've learned, you select between the two implementations using "
-"qualifiers."
+"class). As you&#39;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'll start by looking at alternatives and then show the "
+"literal>. We&#39;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't really want to submit payments to "
-"the external system, so we override that implementation of "
+"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:"
 msgstr ""
 "Pero en nuestro entorno, omitimos esa implementación de "
@@ -115,18 +115,19 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"We've already seen how we can enable this alternative by listing its class "
-"in the <literal>beans.xml</literal> descriptor."
+"We&#39;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'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:"
+"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:"
 msgstr ""
 
 #. Tag: para
@@ -167,7 +168,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"So we haven't completely replaced the default implementation in this "
+"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 "
@@ -240,8 +241,8 @@
 #. Tag: para
 #, no-c-format
 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 "
+"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 "

Modified: doc/trunk/reference/es-ES/stereotypes.po
===================================================================
--- doc/trunk/reference/es-ES/stereotypes.po	2010-04-29 23:54:14 UTC (rev 6205)
+++ doc/trunk/reference/es-ES/stereotypes.po	2010-05-01 15:04:10 UTC (rev 6206)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: stereotypes\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-03-02T13:07:18\n"
+"POT-Creation-Date: 2010-05-01T13:53:43\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't be adding much value."
+"it wouldn&#39;t be adding much value."
 msgstr ""
 
 #. Tag: title
@@ -124,7 +124,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Naturally, overriding a single default isn't much use. But remember, "
+"Naturally, overriding a single default isn&#39;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'll call <emphasis>stereotype stacking</emphasis>. You "
-"may want to do this if you have two distinct stereotypes which are "
+"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."
 msgstr ""
@@ -216,7 +216,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Here's an example that combines the <literal>@Action</literal> and "
+"Here&#39;s an example that combines the <literal>@Action</literal> and "
 "<literal>@Auditable</literal> stereotypes:"
 msgstr ""
 
@@ -228,8 +228,9 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"We've already met two standard stereotypes defined by the CDI specification: "
-"<literal>@Interceptor</literal> and <literal>@Decorator</literal>."
+"We&#39;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/es-ES/viewlayers.po
===================================================================
--- doc/trunk/reference/es-ES/viewlayers.po	2010-04-29 23:54:14 UTC (rev 6205)
+++ doc/trunk/reference/es-ES/viewlayers.po	2010-05-01 15:04:10 UTC (rev 6206)
@@ -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-03-02T13:07:18\n"
+"POT-Creation-Date: 2010-05-01T13:53:43\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's metadata when "
-"the page response is complete"
+"Storing the id of any long-running conversation in Wicket&#39;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'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&#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."

Modified: doc/trunk/reference/es-ES/weldexamples.po
===================================================================
--- doc/trunk/reference/es-ES/weldexamples.po	2010-04-29 23:54:14 UTC (rev 6205)
+++ doc/trunk/reference/es-ES/weldexamples.po	2010-05-01 15:04:10 UTC (rev 6206)
@@ -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-03-02T13:07:18\n"
+"POT-Creation-Date: 2010-05-01T13:53:43\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'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, "
+"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>."
 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're told whether your guess was too high "
-"or too low."
+"1 and 100. After each attempt, you&#39;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's start by "
+"files and Facelets (JSF) views, packaged as a war module. Let&#39;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'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&#39;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's also an empty <literal>beans.xml</literal> file, which tells the "
+"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."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Finally, there's the familiar <literal>web.xml</literal>:"
+msgid "Finally, there&#39;s the familiar <literal>web.xml</literal>:"
 msgstr ""
 
 #. Tag: para
@@ -105,8 +105,8 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Let's take a look at the main JSF view, <literal>src/main/webapp/home.xhtml</"
-"literal>."
+"Let&#39;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, \"Higher!\", "
-"\"Lower!\" and \"Correct!\""
+"There are a number of messages which can be sent to the user, &#34;Higher!"
+"&#34;, &#34;Lower!&#34; and &#34;Correct!&#34;"
 msgstr ""
 
 #. Tag: para
@@ -138,9 +138,10 @@
 #. Tag: para
 #, no-c-format
 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."
+"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."
 msgstr ""
 
 #. Tag: para
@@ -176,8 +177,8 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"The <literal>Generator</literal> is application scoped, so we don't get a "
-"different random each time."
+"The <literal>Generator</literal> is application scoped, so we don&#39;t get "
+"a different random each time."
 msgstr ""
 
 #. Tag: para
@@ -191,20 +192,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's "
+"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's guess and providing feedback to the user with a "
-"<literal>FacesMessage</literal>. We've used the post-construct lifecycle "
+"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&lt;Integer&gt;</literal> bean."
+"<literal>@Random Instance&#60;Integer&#62;</literal> bean."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
 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})."
+"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})."
 msgstr ""
 
 #. Tag: title
@@ -236,8 +237,9 @@
 #, no-c-format
 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."
+"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."
 msgstr ""
 
 #. Tag: para
@@ -246,8 +248,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't need to access this interface, but Weld makes use "
-"of it."
+"name. You generally don&#39;t need to access this interface, but Weld makes "
+"use of it."
 msgstr ""
 
 #. Tag: title
@@ -260,7 +262,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'll "
+"components and leverage the conversation context. In this section, we&#39;ll "
 "walk you through the Wicket version of the numberguess example."
 msgstr ""
 
@@ -269,7 +271,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't already familiar with the framework."
+"section, if you aren&#39;t already familiar with the framework."
 msgstr ""
 
 #. Tag: para
@@ -278,17 +280,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've seen already that Jetty is perfectly capable of running CDI "
+"You&#39;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'll also be using the Eclipse IDE in these examples. Instructions are "
+"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'll likely need to do more than just deploy examples, we'll get setup in "
-"this full development environment."
+"you&#39;ll likely need to do more than just deploy examples, we&#39;ll get "
+"setup in this full development environment."
 msgstr ""
 
 #. Tag: title
@@ -311,7 +313,7 @@
 #, no-c-format
 msgid ""
 "If you have m2eclipse installed, you can open any Maven project directly. "
-"From within Eclipse, select <emphasis>File -&gt; Import... -&gt; Maven "
+"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."
@@ -327,24 +329,24 @@
 #. Tag: para
 #, no-c-format
 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!"
+"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!"
 msgstr ""
 
 #. Tag: para
 #, no-c-format
 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 "
+"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."
 msgstr ""
@@ -361,15 +363,15 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Then, from Eclipse, choose <emphasis>File -&gt; Import... -&gt; General -"
-"&gt; Existing Projects into Workspace</emphasis>, select the root directory "
+"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>."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "It's time to get the example running!"
+msgid "It&#39;s time to get the example running!"
 msgstr ""
 
 #. Tag: title
@@ -428,7 +430,7 @@
 
 #. Tag: para
 #, no-c-format
-msgid "Enough toying with deployment, let's dive into the code."
+msgid "Enough toying with deployment, let&#39;s dive into the code."
 msgstr ""
 
 #. Tag: title
@@ -460,7 +462,7 @@
 
 #. Tag: para
 #, no-c-format
-msgid "Here's where things differ from the JSF numberguess example:"
+msgid "Here&#39;s where things differ from the JSF numberguess example:"
 msgstr ""
 
 #. Tag: para
@@ -583,8 +585,8 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Let's have a look at the significant code and configuration files that make "
-"up this example."
+"Let&#39;s have a look at the significant code and configuration files that "
+"make up this example."
 msgstr ""
 
 #. Tag: para
@@ -598,8 +600,8 @@
 #. Tag: para
 #, no-c-format
 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 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:"
 msgstr ""
 
@@ -607,14 +609,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 'session'."
+"of a Swing application typically represents a single &#39;session&#39;."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
 msgid ""
-"Notice that the bean is not named, since it doesn't need to be accessed via "
-"EL."
+"Notice that the bean is not named, since it doesn&#39;t need to be accessed "
+"via EL."
 msgstr ""
 
 #. Tag: para
@@ -655,9 +657,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'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&#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."
 msgstr ""
 
 #. Tag: para
@@ -665,8 +667,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'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&#39;"
+"s next guess and the response to the previous guess. The code for "
 "<literal>MessageGenerator</literal> is as follows:"
 msgstr ""
 
@@ -679,7 +681,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"The <literal>Game</literal>'s state is interrogated to determine the "
+"The <literal>Game</literal>&#39;s state is interrogated to determine the "
 "appropriate challenge message ..."
 msgstr ""
 
@@ -724,8 +726,8 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"<literal>guessButtonActionPerformed</literal> is called when the 'Guess' "
-"button is clicked, and it does the following:"
+"<literal>guessButtonActionPerformed</literal> is called when the &#39;"
+"Guess&#39; button is clicked, and it does the following:"
 msgstr ""
 
 #. Tag: para
@@ -738,8 +740,8 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Calls <literal>game.check()</literal> to validate and perform one 'turn' of "
-"the game"
+"Calls <literal>game.check()</literal> to validate and perform one &#39;"
+"turn&#39; of the game"
 msgstr ""
 
 #. Tag: para
@@ -778,7 +780,7 @@
 #, no-c-format
 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."
+"it&#39;s structure is more complex than the numberguess example."
 msgstr ""
 
 #. Tag: para
@@ -792,9 +794,10 @@
 #. Tag: para
 #, no-c-format
 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:"
+"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:"
 msgstr ""
 
 #. Tag: para
@@ -808,18 +811,18 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"If you weren't using Maven to generate these files, you would need "
+"If you weren&#39;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'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&#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>."
 msgstr ""
 
 #. Tag: para
@@ -840,21 +843,21 @@
 #. Tag: para
 #, no-c-format
 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."
+"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."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
 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."
+"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."
 msgstr ""
 
 #. Tag: para
@@ -871,9 +874,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'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!"
+"<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!"
 msgstr ""
 
 #. Tag: para

Modified: doc/trunk/reference/es-ES/xml.po
===================================================================
--- doc/trunk/reference/es-ES/xml.po	2010-04-29 23:54:14 UTC (rev 6205)
+++ doc/trunk/reference/es-ES/xml.po	2010-05-01 15:04:10 UTC (rev 6206)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: xml\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-03-02T13:07:18\n"
+"POT-Creation-Date: 2010-05-01T13:53:43\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'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:"
+"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:"
 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 "
@@ -70,13 +70,13 @@
 "utilizar el nombre de clase o miembro como el nombre del elemento XML."
 
 #. Tag: para
-#, no-c-format
+#, 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'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&#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."
 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 "
@@ -120,9 +120,9 @@
 "anotación, los miembros son especificados por atributos del elemento."
 
 #. Tag: para
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"For example, the element <literal>&lt;util:Date/&gt;</literal> in the "
+"For example, the element <literal>&#60;util:Date/&#62;</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>&lt;Name&gt;</literal> element declares a bean of scope "
+"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 "
@@ -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's not quite a full databinding "
-"solution, but it's close!"
+"specify whole graphs of Java objects. It&#39;s not quite a full databinding "
+"solution, but it&#39;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,9 +241,10 @@
 #. Tag: para
 #, fuzzy, no-c-format
 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."
+"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."
 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/fr-FR/Author_Group.po
===================================================================
--- doc/trunk/reference/fr-FR/Author_Group.po	2010-04-29 23:54:14 UTC (rev 6205)
+++ doc/trunk/reference/fr-FR/Author_Group.po	2010-05-01 15:04:10 UTC (rev 6206)
@@ -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-03-02T13:07:17\n"
+"POT-Creation-Date: 2010-05-01T13:53:42\n"
 "PO-Revision-Date: 2009-02-02 22:03+0100\n"
 "Last-Translator: Vincent Latombe <vincent.latombe at gmail.com>\n"
 "Language-Team: none\n"
@@ -13,86 +13,36 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#. Tag: firstname
-#, no-c-format
-msgid "Gavin"
-msgstr ""
-
 #. Tag: contrib
 #, no-c-format
 msgid "JSR-299: Contexts and Dependency Injection Lead"
 msgstr ""
 
-#. Tag: firstname
-#, no-c-format
-msgid "Pete"
-msgstr ""
-
 #. Tag: contrib
 #, no-c-format
 msgid "Weld (JSR-299 RI) Lead"
 msgstr ""
 
-#. Tag: firstname
-#, no-c-format
-msgid "Dan"
-msgstr ""
-
-#. Tag: firstname
-#, no-c-format
-msgid "David"
-msgstr ""
-
-#. Tag: firstname
-#, no-c-format
-msgid "Nicola"
-msgstr ""
-
 #. Tag: contrib
 #, no-c-format
 msgid "Italian Translation"
 msgstr "Traduction italienne"
 
-#. Tag: firstname
-#, no-c-format
-msgid "Gladys"
-msgstr ""
-
 #. Tag: contrib
 #, no-c-format
 msgid "Spanish Translation"
 msgstr "Traduction espagnole"
 
-#. Tag: firstname
-#, no-c-format
-msgid "Eun-Ju"
-msgstr ""
-
 #. Tag: contrib
 #, no-c-format
 msgid "Korean Translation"
 msgstr "Traduction coréenne"
 
-#. Tag: firstname
-#, no-c-format
-msgid "Terry"
-msgstr ""
-
 #. Tag: contrib
 #, no-c-format
 msgid "Traditional Chinese Translation"
 msgstr "Traduction en chinois traditionnel"
 
-#. Tag: firstname
-#, no-c-format
-msgid "Francesco"
-msgstr ""
-
-#. Tag: firstname
-#, no-c-format
-msgid "Sean"
-msgstr ""
-
 #. Tag: contrib
 #, fuzzy, no-c-format
 msgid "Simplified Chinese Translation"

Modified: doc/trunk/reference/fr-FR/beans.po
===================================================================
--- doc/trunk/reference/fr-FR/beans.po	2010-04-29 23:54:14 UTC (rev 6205)
+++ doc/trunk/reference/fr-FR/beans.po	2010-05-01 15:04:10 UTC (rev 6206)
@@ -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-03-02T13:07:17\n"
+"POT-Creation-Date: 2010-05-01T13:53:42\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'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&#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."
 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'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&#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:"
 msgstr ""
 
 #. Tag: para
@@ -171,7 +171,7 @@
 
 #. Tag: para
 #, no-c-format
-msgid "Let's see what all this new terminology means."
+msgid "Let&#39;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 \"contract\" that must be satisfied by "
-"the bean to be injected. The contract is:"
+"Any injected attribute specifies a &#34;contract&#34; 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&lt;Book&gt;</literal>, as well as the implicit type "
+"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)."
 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't inject an EJB using its remote interface unless "
-"you define a <emphasis>resource</emphasis>, which we'll meet in <xref "
-"linkend=\"resources\" />."
+"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\" />."
 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&lt;Book&gt;</literal>, together with "
+"restricted to <literal>Shop&#60;Book&#62;</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 \"quality\" using "
-"a qualifier."
+"implementation it is interested in. We model this kind of &#34;quality&#34; "
+"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's an example of a qualifier annotation:"
+"string-based names. Here&#39;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've encountered one. With CDI, annotation "
-"definitions will become a familiar artifact as you'll be creating them from "
-"time to time."
+"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."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
 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 "
+"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."
 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't, it reports an error to the user."
+"doesn&#39;t, it reports an error to the user."
 msgstr ""
 
 #. Tag: para
@@ -330,10 +330,10 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"That's not quite the end of the story. CDI also defines a simple "
+"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'll get into the details in <xref linkend=\"injection\" />."
+"We&#39;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't want the bean to sit in the session "
+"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."
 msgstr ""
@@ -386,7 +386,8 @@
 
 #. Tag: para
 #, no-c-format
-msgid "We'll talk more about scopes in <xref linkend=\"scopescontexts\" />."
+msgid ""
+"We&#39;ll talk more about scopes in <xref linkend=\"scopescontexts\" />."
 msgstr ""
 
 #. Tag: title
@@ -445,7 +446,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"We've already seen how qualifiers let us choose between multiple "
+"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 "
@@ -482,9 +483,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'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."
+"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."
 msgstr ""
 
 #. Tag: para
@@ -497,10 +498,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'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."
+"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."
 msgstr ""
 
 #. Tag: para
@@ -539,14 +540,14 @@
 #, no-c-format
 msgid ""
 "Notice that <literal>ShoppingCart</literal> and "
-"<literal>TransactionInterceptor</literal> don't know anything about each "
+"<literal>TransactionInterceptor</literal> don&#39;t know anything about each "
 "other."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
 msgid ""
-"Interceptors are deployment-specific. (We don't need a "
+"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 "
@@ -556,8 +557,8 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"We'll discuss interceptors, and their cousins, decorators, in <xref linkend="
-"\"interceptors\" /> and <xref linkend=\"decorators\" />."
+"We&#39;ll discuss interceptors, and their cousins, decorators, in <xref "
+"linkend=\"interceptors\" /> and <xref linkend=\"decorators\" />."
 msgstr ""
 
 #. Tag: title
@@ -568,9 +569,10 @@
 #. Tag: para
 #, no-c-format
 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."
+"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."
 msgstr ""
 
 #. Tag: title
@@ -584,8 +586,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't need to. According to "
-"the specification, the CDI container treats any class that satisfies the "
+"<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:"
 msgstr ""
 
@@ -634,7 +636,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't recommend directly injecting an entity class. We "
+"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."
@@ -713,7 +715,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"There's no reason to explicitly declare the scope of a stateless session "
+"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 "
@@ -769,8 +771,8 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"When we don't need any of these things, an ordinary managed bean will serve "
-"just fine."
+"When we don&#39;t need any of these things, an ordinary managed bean will "
+"serve just fine."
 msgstr ""
 
 #. Tag: para
@@ -794,7 +796,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Finally, it's usually obvious when method-level transaction management, "
+"Finally, it&#39;s usually obvious when method-level transaction management, "
 "method-level security, timers, remote methods or asynchronous methods are "
 "needed."
 msgstr ""
@@ -802,11 +804,11 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"The point we're trying to make is: use a session bean when you need the "
+"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'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&#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>."
 msgstr ""
@@ -814,13 +816,14 @@
 #. Tag: para
 #, no-c-format
 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\"."
+"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;."
 msgstr ""
 
 #. Tag: title
@@ -859,7 +862,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"We can't write a bean class that is itself a random number. But we can "
+"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—"
@@ -931,7 +934,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"We'll talk much more about producer methods in <xref linkend="
+"We&#39;ll talk much more about producer methods in <xref linkend="
 "\"producermethods\" />."
 msgstr ""
 
@@ -962,7 +965,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'll have to wait until <xref "
-"linkend=\"resources\" />. Because we can't wait to get to work on some "
+"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."
 msgstr ""

Modified: doc/trunk/reference/fr-FR/decorators.po
===================================================================
--- doc/trunk/reference/fr-FR/decorators.po	2010-04-29 23:54:14 UTC (rev 6205)
+++ doc/trunk/reference/fr-FR/decorators.po	2010-05-01 15:04:10 UTC (rev 6206)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: master.xml\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-03-02T13:07:17\n"
+"POT-Creation-Date: 2010-05-01T13:53:42\n"
 "PO-Revision-Date: 2009-02-02 22:25+0100\n"
 "Last-Translator: Vincent Latombe <vincent.latombe 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't "
-"an appropriate tool for separating business-related concerns."
+"the actual semantics of the events they intercept. Thus, interceptors "
+"aren&#39;t an appropriate tool for separating business-related concerns."
 msgstr ""
 "Les intercepteurs sont une manière puissante de capter et de séparer les "
 "problèmes qui sont <emphasis>orthogonaux</emphasis> au type de système. Tout "
@@ -46,10 +46,11 @@
 "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."
+"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 ""
 "L'inverse est vrai pour les <emphasis>décorateurs</emphasis>. Un décorateur "
 "intercepte les invocations uniquement pour une certain interface Java, et "
@@ -98,8 +99,9 @@
 #, fuzzy, no-c-format
 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."
+"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 ""
 "Contrairement à d'autres Web Beans simples, un décorateur peut être une "
 "classe abstraite. Si le décorateur n'a rien de spécial à faire pour une "
@@ -193,7 +195,8 @@
 #, fuzzy, no-c-format
 msgid ""
 "This declaration serves the same purpose for decorators that the "
-"<literal>&lt;interceptors&gt;</literal> declaration serves for interceptors:"
+"<literal>&#60;interceptors&#62;</literal> declaration serves for "
+"interceptors:"
 msgstr ""
 "Cette déclaration a le même but pour les décorateurs que la déclaration "
 "<literal>&lt;Interceptors&gt;</literal> pour les intercepteurs:"

Modified: doc/trunk/reference/fr-FR/ee.po
===================================================================
--- doc/trunk/reference/fr-FR/ee.po	2010-04-29 23:54:14 UTC (rev 6205)
+++ doc/trunk/reference/fr-FR/ee.po	2010-05-01 15:04:10 UTC (rev 6206)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: master.xml\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-03-02T13:07:17\n"
+"POT-Creation-Date: 2010-05-01T13:53:42\n"
 "PO-Revision-Date: 2009-02-02 22:49+0100\n"
 "Last-Translator: Vincent Latombe <vincent.latombe 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's easy to create a "
+"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 "
@@ -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've already seen a couple of "
-"examples of this, though we didn't pay much attention at the time:"
+"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:"
 msgstr ""
 "Tous les Web Beans, qu'ils soient simples ou d'entreprise peuvent bénéficier "
 "de l'injection de dépendance de Java EE en utilisant <literal>@Resource</"
@@ -140,8 +140,8 @@
 #. Tag: para
 #, fuzzy, no-c-format
 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."
+"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."
 msgstr ""
 "Il est facile d'utiliser un Web Bean à partir d'une Servlet dans Java EE 6. "
 "Injectez simplement le Web Bean en utilisant les méthodes d'injection de "
@@ -167,9 +167,9 @@
 #. Tag: para
 #, no-c-format
 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."
+"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."
 msgstr ""
 
 #. Tag: para
@@ -257,15 +257,15 @@
 #. Tag: para
 #, fuzzy, no-c-format
 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."
+"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."
 msgstr ""
 "Les Web Beans ne définissent aucune archive spéciale pour le déploiement. "
 "Vous pouvez paqueter des Web Beans dans des JARs, des EJB-JARs ou des WARs : "

Modified: doc/trunk/reference/fr-FR/environments.po
===================================================================
--- doc/trunk/reference/fr-FR/environments.po	2010-04-29 23:54:14 UTC (rev 6205)
+++ doc/trunk/reference/fr-FR/environments.po	2010-05-01 15:04:10 UTC (rev 6206)
@@ -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-03-02T13:07:17\n"
+"POT-Creation-Date: 2010-05-01T14:44:09\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'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&#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."
 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't "
+"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 "
@@ -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 \"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:"
+"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:"
 msgstr ""
 
 #. Tag: para
@@ -186,7 +186,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Tomcat has a read-only JNDI, so Weld can't automatically bind the "
+"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:"
@@ -209,10 +209,7 @@
 
 #. Tag: para
 #, no-c-format
-msgid ""
-"Weld also supports Servlet injection in Tomcat. To enable this, place the "
-"<literal>weld-tomcat-support.jar</literal> in <literal>$TOMCAT_HOME/lib</"
-"literal>, and add the following to <literal>META-INF/context.xml</literal>:"
+msgid "Weld also supports Servlet injection in Tomcat 6."
 msgstr ""
 
 #. Tag: title
@@ -223,18 +220,18 @@
 #. Tag: para
 #, no-c-format
 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:"
+"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:"
 msgstr ""
 
 #. Tag: para
 #, no-c-format
 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."
+"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."
 msgstr ""
 
 #. Tag: para
@@ -247,7 +244,10 @@
 
 #. Tag: para
 #, no-c-format
-msgid "Weld does not currently support Servlet injection in Jetty."
+msgid ""
+"Weld also supports Servlet injection in Jetty 6. To enable this, add the "
+"file <literal>META-INF/jetty-web.xml</literal> with the following content to "
+"your war:"
 msgstr ""
 
 #. Tag: title
@@ -258,13 +258,13 @@
 #. Tag: para
 #, no-c-format
 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."
+"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."
 msgstr ""
 
 #. Tag: para
@@ -348,7 +348,7 @@
 
 #. Tag: para
 #, no-c-format
-msgid "Here's an example of a simple CDI SE application:"
+msgid "Here&#39;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'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&#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."
@@ -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's beans and events. The API consists of two "
-"classes: <literal>Weld</literal> and <literal>WeldContainer</literal>."
+"references to your application&#39;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's an example application main method which uses this API to initialize "
-"a bean of type <literal>MyApplicationBean</literal>."
+"Here&#39;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 '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."
+"<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."
 msgstr ""
 
 #. Tag: para
@@ -459,8 +459,8 @@
 #. Tag: para
 #, no-c-format
 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."
+"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."
 msgstr ""

Modified: doc/trunk/reference/fr-FR/events.po
===================================================================
--- doc/trunk/reference/fr-FR/events.po	2010-04-29 23:54:14 UTC (rev 6205)
+++ doc/trunk/reference/fr-FR/events.po	2010-05-01 15:04:10 UTC (rev 6206)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: master.xml\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-03-02T13:07:17\n"
+"POT-Creation-Date: 2010-05-01T13:53:42\n"
 "PO-Revision-Date: 2009-02-02 23:28+0100\n"
 "Last-Translator: Vincent Latombe <vincent.latombe at gmail.com>\n"
 "Language-Team: none\n"
@@ -45,10 +45,10 @@
 "mais les les observateurs sont complèment découplés des producteurs,"
 
 #. Tag: para
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"observers can specify a combination of \"selectors\" to narrow the set of "
-"event notifications they will receive, and"
+"observers can specify a combination of &#34;selectors&#34; to narrow the set "
+"of event notifications they will receive, and"
 msgstr ""
 "les observateurs peuvent spécifier une combinaison de \"sélécteurs\" pour "
 "limiter le nobmre de notifications d'évènemtns qu'ils vont recevoir, et"
@@ -67,7 +67,7 @@
 #, no-c-format
 msgid ""
 "The CDI event notification facility uses more or less the same typesafe "
-"approach that we've already seen with the dependency injection service."
+"approach that we&#39;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's an example:"
+"<literal>@Qualifier</literal>. Here&#39;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's only interested in events which have those "
+"does specify qualifiers, it&#39;s only interested in events which have those "
 "qualifiers."
 msgstr ""
 "Il n'est pas obligatoire de spécifier une quelconque liaison d'évènement sur "
@@ -253,8 +253,8 @@
 #. Tag: para
 #, no-c-format
 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 "
+"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>."
@@ -278,8 +278,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'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&#39;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/fr-FR/example.po
===================================================================
--- doc/trunk/reference/fr-FR/example.po	2010-04-29 23:54:14 UTC (rev 6205)
+++ doc/trunk/reference/fr-FR/example.po	2010-05-01 15:04:10 UTC (rev 6206)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: master.xml\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-03-02T13:07:17\n"
+"POT-Creation-Date: 2010-05-01T13:53:42\n"
 "PO-Revision-Date: 2009-02-04 23:07+0100\n"
 "Last-Translator: Vincent Latombe <vincent.latombe at gmail.com>\n"
 "Language-Team: none\n"
@@ -21,11 +21,11 @@
 #. Tag: para
 #, fuzzy, no-c-format
 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:"
+"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:"
 msgstr ""
 "Illustrons ces idées avec un exemple complet. Nous allons implémenter la "
 "connexion/déconnexion d'un utilisateur à une application utilisant JSF. "
@@ -46,7 +46,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"(Note that we're also going to need a <literal>persistence.xml</literal> "
+"(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>.)"
 msgstr ""
@@ -94,7 +94,7 @@
 #, fuzzy, no-c-format
 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."
+"the next chapter, we&#39;ll explore dependency injection in greater depth."
 msgstr ""
 "Cet exemple vous donne une idée du modèle de programmation Web Bean. Dans le "
 "prochain chapitre, nous explorerons l'injection de dépendance des Web Beans "

Modified: doc/trunk/reference/fr-FR/extend.po
===================================================================
--- doc/trunk/reference/fr-FR/extend.po	2010-04-29 23:54:14 UTC (rev 6205)
+++ doc/trunk/reference/fr-FR/extend.po	2010-05-01 15:04:10 UTC (rev 6206)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: master.xml\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-03-02T13:07:17\n"
+"POT-Creation-Date: 2010-05-01T13:53:42\n"
 "PO-Revision-Date: 2009-02-04 23:17+0100\n"
 "Last-Translator: Vincent Latombe <vincent.latombe at gmail.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's needed to satisfy the requirements of Java SE's "
-"service provider architecture."
+"define any methods, but it&#39;s needed to satisfy the requirements of Java "
+"SE&#39;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's metamodel and more. Here's a very simple "
-"example:"
+"permitted to modify the container&#39;s metamodel and more. Here&#39;s a "
+"very simple example:"
 msgstr ""
 
 #. Tag: para
@@ -227,7 +227,7 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"Let's study some of the interfaces exposed by the <literal>BeanManager</"
+"Let&#39;s study some of the interfaces exposed by the <literal>BeanManager</"
 "literal>."
 msgstr ""
 "Le centre nerveux pour l'extension des Web Beans est l'objet "
@@ -286,7 +286,8 @@
 
 #. Tag: para
 #, no-c-format
-msgid "There's an easy way to find out what beans exist in the application:"
+msgid ""
+"There&#39;s an easy way to find out what beans exist in the application:"
 msgstr ""
 
 #. Tag: para
@@ -323,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're going to delegate back to the container's <literal>InjectionTarget</"
-"literal> to perform instantiation and injection upon the "
-"<literal>SecurityManager</literal> instance."
+"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."
 msgstr ""
 
 #. Tag: para
@@ -351,8 +352,8 @@
 #. Tag: para
 #, no-c-format
 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 "
+"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 "
@@ -362,7 +363,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Here's a second example, which adds the <literal>@Alternative</literal> "
+"Here&#39;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 +394,12 @@
 #. Tag: para
 #, no-c-format
 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 "
+"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:"
 msgstr ""
 
@@ -413,9 +414,9 @@
 #. Tag: para
 #, no-c-format
 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."
+"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."
 msgstr ""
 
 #. Tag: title

Modified: doc/trunk/reference/fr-FR/extensions.po
===================================================================
--- doc/trunk/reference/fr-FR/extensions.po	2010-04-29 23:54:14 UTC (rev 6205)
+++ doc/trunk/reference/fr-FR/extensions.po	2010-05-01 15:04:10 UTC (rev 6206)
@@ -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-03-02T13:07:17\n"
+"POT-Creation-Date: 2010-05-01T13:53:42\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's no need to "
-"include sl4j as it's already included (and used internally)."
+"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)."
 msgstr ""

Modified: doc/trunk/reference/fr-FR/gettingstarted.po
===================================================================
--- doc/trunk/reference/fr-FR/gettingstarted.po	2010-04-29 23:54:14 UTC (rev 6205)
+++ doc/trunk/reference/fr-FR/gettingstarted.po	2010-05-01 15:04:10 UTC (rev 6206)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: master.xml \n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-03-02T13:07:17\n"
+"POT-Creation-Date: 2010-05-01T13:53:42\n"
 "PO-Revision-Date: 2008-12-19 20:26+0000\n"
 "Last-Translator: Automatically generated\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'll need the "
+"To run the examples with the provided build scripts, you&#39;ll need the "
 "following:"
 msgstr ""
 
@@ -94,7 +94,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"You'll need a full install of Ant 1.7.0. Some linux distributions only "
+"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."
 msgstr ""
@@ -102,7 +102,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"In the next few sections, you'll be using the Ant command (<literal>ant</"
+"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 "
@@ -121,7 +121,7 @@
 #, no-c-format
 msgid ""
 "The sections below cover the steps for deploying with both Ant and Maven in "
-"detail. Let's start with JBoss AS."
+"detail. Let&#39;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'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!"
+"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!"
 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'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>."
+"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>."
 msgstr ""
 
 #. Tag: para
@@ -166,7 +166,7 @@
 
 #. Tag: para
 #, no-c-format
-msgid "You're now ready to deploy your first example!"
+msgid "You&#39;re now ready to deploy your first example!"
 msgstr ""
 
 #. Tag: para
@@ -179,8 +179,8 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"If you haven't already, start JBoss AS. You can either start JBoss AS from a "
-"Linux shell:"
+"If you haven&#39;t already, start JBoss AS. You can either start JBoss AS "
+"from a Linux shell:"
 msgstr ""
 
 #. Tag: para
@@ -265,16 +265,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's a topic for a later chapter."
+"modules, but that&#39;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'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&#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."
 msgstr ""
 
 #. Tag: title
@@ -285,21 +285,21 @@
 #. Tag: para
 #, no-c-format
 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."
+"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."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
 msgid ""
-"To deploy the examples to GlassFish, you'll need the final <ulink url="
+"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'll "
-"need to first make the script executable."
+"After the download is complete, execute the installer. On Linux/Unix, "
+"you&#39;ll need to first make the script executable."
 msgstr ""
 
 #. Tag: para
@@ -307,15 +307,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'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&#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)."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
 msgid ""
-"If you've deployed either of the starter examples, <literal>weld-"
+"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."
@@ -325,11 +325,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's "
+"<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's <literal>ear/target</literal> directory. All you "
-"need to do now is deploy them to GlassFish."
+"ends up in the example&#39;s <literal>ear/target</literal> directory. All "
+"you need to do now is deploy them to GlassFish."
 msgstr ""
 
 #. Tag: para
@@ -348,15 +348,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 \"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."
+"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."
 msgstr ""
 
 #. Tag: para
@@ -393,16 +393,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't get enterprise features such as session beans and "
-"container-managed transactions.)"
+"container. (But you don&#39;t get enterprise features such as session beans "
+"and container-managed transactions.)"
 msgstr ""
 
 #. Tag: para
 #, no-c-format
 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."
+"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."
 msgstr ""
 
 #. Tag: para
@@ -411,8 +411,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't require that you have Maven installed, so we'll start "
-"there. If you want to use Maven, you can just skip ahead."
+"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."
 msgstr ""
 
 #. Tag: title
@@ -426,14 +426,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'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&#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>."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Now you're ready to deploy the numberguess example to Tomcat!"
+msgid "Now you&#39;re ready to deploy the numberguess example to Tomcat!"
 msgstr ""
 
 #. Tag: para
@@ -448,7 +448,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 \"tomcat.\"."
+"same target names used for JBoss AS, prefixed with &#34;tomcat.&#34;."
 msgstr ""
 
 #. Tag: para
@@ -480,7 +480,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"If you haven't already, start Tomcat. You can either start Tomcat from a "
+"If you haven&#39;t already, start Tomcat. You can either start Tomcat from a "
 "Linux shell:"
 msgstr ""
 
@@ -503,15 +503,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'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."
+"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."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
 msgid ""
-"The Maven plugin communicates with Tomcat over HTTP, so it doesn't care "
+"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</"
@@ -569,7 +569,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's <literal>readme.txt</"
+"the example, which are documented in the example&#39;s <literal>readme.txt</"
 "literal> file."
 msgstr ""
 
@@ -591,10 +591,10 @@
 #. Tag: para
 #, no-c-format
 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."
+"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."
 msgstr ""
 
 #. Tag: para
@@ -603,7 +603,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't need anything else installed except to have the Maven command "
+"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."
 msgstr ""
@@ -675,9 +675,9 @@
 #, no-c-format
 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 "
+"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."

Modified: doc/trunk/reference/fr-FR/injection.po
===================================================================
--- doc/trunk/reference/fr-FR/injection.po	2010-04-29 23:54:14 UTC (rev 6205)
+++ doc/trunk/reference/fr-FR/injection.po	2010-05-01 15:04:10 UTC (rev 6206)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: master.xml\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-04-14T10:16:01\n"
+"POT-Creation-Date: 2010-05-01T14:44:09\n"
 "PO-Revision-Date: 2009-02-05 00:00+0100\n"
 "Last-Translator: Vincent Latombe <vincent.latombe at gmail.com>\n"
 "Language-Team: none\n"
@@ -111,7 +111,7 @@
 #, fuzzy, no-c-format
 msgid ""
 "Next, the container calls all initializer methods of bean (the call order is "
-"not portable, don't rely on it)."
+"not portable, don&#39;t rely on it)."
 msgstr ""
 "Puis, le gestionnaire de Web Bean appelle toutes les méthodes "
 "d'initalisation du Web Bean."
@@ -152,7 +152,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'll meet in <xref linkend=\"events\" />) and "
+"observer methods (which we&#39;ll meet in <xref linkend=\"events\" />) and "
 "disposer methods."
 msgstr ""
 
@@ -167,9 +167,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'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 "
+"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."
 msgstr ""
 "La spécification Web Beans définie une procédure, appelée "
@@ -222,17 +222,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's "
-"the simplest possible scenario. When you first start your application, "
-"you'll likely have lots of those."
+"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."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
 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."
+"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."
 msgstr ""
 
 #. Tag: title
@@ -306,12 +306,12 @@
 #. Tag: para
 #, no-c-format
 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>!"
+"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>!"
 msgstr ""
 
 #. Tag: title
@@ -326,11 +326,12 @@
 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."
+"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."
 msgstr ""
 
 #. Tag: para
@@ -419,7 +420,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's the bean that will be injected."
+"alternative, that&#39;s the bean that will be injected."
 msgstr ""
 
 #. Tag: title
@@ -445,8 +446,8 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"During the course of your development, you're going to encounter this "
-"situation. Let's learn how to resolve it."
+"During the course of your development, you&#39;re going to encounter this "
+"situation. Let&#39;s learn how to resolve it."
 msgstr ""
 
 #. Tag: para
@@ -520,7 +521,7 @@
 
 #. Tag: para
 #, no-c-format
-msgid "Just remember: \"There can be only one.\""
+msgid "Just remember: &#34;There can be only one.&#34;"
 msgstr ""
 
 #. Tag: para
@@ -528,14 +529,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'll see in <xref linkend=\"lookup\" />."
+"<literal>Instance</literal>, as we&#39;ll see in <xref linkend=\"lookup\" />."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
 msgid ""
-"Now there's one more issue you need to be aware of when using the dependency "
-"injection service."
+"Now there&#39;s one more issue you need to be aware of when using the "
+"dependency injection service."
 msgstr ""
 
 #. Tag: title
@@ -602,7 +603,8 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"classes which don't have a non-private constructor with no parameters, and"
+"classes which don&#39;t have a non-private constructor with no parameters, "
+"and"
 msgstr ""
 
 #. Tag: para
@@ -620,7 +622,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"It's usually very easy to fix an unproxyable dependency problem. If an "
+"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:"
 msgstr ""
@@ -633,7 +635,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"change the type of the injection point to <literal>Instance&lt;X&gt;</"
+"change the type of the injection point to <literal>Instance&#60;X&#62;</"
 "literal>,"
 msgstr ""
 
@@ -674,7 +676,7 @@
 
 #. Tag: para
 #, no-c-format
-msgid "But we didn't get around to implementing this yet."
+msgid "But we didn&#39;t get around to implementing this yet."
 msgstr ""
 
 #. Tag: title
@@ -763,10 +765,11 @@
 #, no-c-format
 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>."
+"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>."
 msgstr ""
 
 #. Tag: para
@@ -777,7 +780,8 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"We can't use an anonymous class to implement a qualifier type with members."
+"We can&#39;t use an anonymous class to implement a qualifier type with "
+"members."
 msgstr ""
 
 #. Tag: para
@@ -833,8 +837,8 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Let's look at an example. The following code is verbose, and vulnerable to "
-"refactoring problems:"
+"Let&#39;s look at an example. The following code is verbose, and vulnerable "
+"to refactoring problems:"
 msgstr ""
 
 #. Tag: para
@@ -852,8 +856,8 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Not convinced? Then here's a second example. To inject HTTP parameters, we "
-"need to define a qualifier type:"
+"Not convinced? Then here&#39;s a second example. To inject HTTP parameters, "
+"we need to define a qualifier type:"
 msgstr ""
 
 #. Tag: para

Modified: doc/trunk/reference/fr-FR/interceptors.po
===================================================================
--- doc/trunk/reference/fr-FR/interceptors.po	2010-04-29 23:54:14 UTC (rev 6205)
+++ doc/trunk/reference/fr-FR/interceptors.po	2010-05-01 15:04:10 UTC (rev 6206)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: master.xml \n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-03-02T13:07:17\n"
+"POT-Creation-Date: 2010-05-01T13:53:43\n"
 "PO-Revision-Date: 2008-12-19 20:26+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -85,7 +85,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're interested in:"
+"specify exactly which beans we&#39;re interested in:"
 msgstr ""
 
 #. Tag: para
@@ -108,9 +108,9 @@
 #. Tag: para
 #, no-c-format
 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 "
+"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>."
 msgstr ""
 

Modified: doc/trunk/reference/fr-FR/intro.po
===================================================================
--- doc/trunk/reference/fr-FR/intro.po	2010-04-29 23:54:14 UTC (rev 6205)
+++ doc/trunk/reference/fr-FR/intro.po	2010-05-01 15:04:10 UTC (rev 6206)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: master.xml \n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-03-02T13:07:18\n"
+"POT-Creation-Date: 2010-05-01T13:53:43\n"
 "PO-Revision-Date: 2008-12-19 20:26+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -21,11 +21,11 @@
 #. Tag: para
 #, no-c-format
 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!"
+"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!"
 msgstr ""
 
 #. Tag: title
@@ -43,13 +43,14 @@
 #. Tag: para
 #, no-c-format
 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."
+"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."
 msgstr ""
 
 #. Tag: para
@@ -61,8 +62,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's a uniform concept of a bean and a "
-"lightweight component model that's aligned across the Java EE platform."
+"<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."
 msgstr ""
 
 #. Tag: para
@@ -71,30 +72,31 @@
 "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>."
+"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>."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
 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."
+"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."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Now let's see how to create your first bean that actually uses CDI."
+msgid "Now let&#39;s see how to create your first bean that actually uses CDI."
 msgstr ""
 
 #. Tag: title
@@ -105,7 +107,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Suppose that we have two existing Java classes that we've been using for "
+"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:"
 msgstr ""
@@ -126,8 +128,8 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Unfortunately, we don't have a class that translates whole text documents. "
-"So let's write a bean for this job:"
+"Unfortunately, we don&#39;t have a class that translates whole text "
+"documents. So let&#39;s write a bean for this job:"
 msgstr ""
 
 #. Tag: para
@@ -142,11 +144,11 @@
 #. Tag: para
 #, no-c-format
 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."
+"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."
 msgstr ""
 
 #. Tag: para
@@ -162,7 +164,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Let's create a UI controller bean that uses field injection to obtain an "
+"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:"
 msgstr ""
@@ -176,10 +178,10 @@
 #, no-c-format
 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."
+"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."
 msgstr ""
 
 #. Tag: para
@@ -193,11 +195,11 @@
 #. Tag: para
 #, no-c-format
 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."
+"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."
 msgstr ""
 
 #. Tag: para
@@ -215,8 +217,8 @@
 #. Tag: para
 #, no-c-format
 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."
+"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."
 msgstr ""

Modified: doc/trunk/reference/fr-FR/master.po
===================================================================
--- doc/trunk/reference/fr-FR/master.po	2010-04-29 23:54:14 UTC (rev 6205)
+++ doc/trunk/reference/fr-FR/master.po	2010-05-01 15:04:10 UTC (rev 6206)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: master.xml\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-03-02T13:07:18\n"
+"POT-Creation-Date: 2010-05-01T13:53:43\n"
 "PO-Revision-Date: 2009-02-05 00:03+0100\n"
 "Last-Translator: Vincent Latombe <vincent.latombe 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 \"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."
+"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."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
 msgid ""
-"You'll also find that some of the functionality that once existed in the "
+"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."
@@ -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'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&#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."
 msgstr ""
 
 #. Tag: title

Modified: doc/trunk/reference/fr-FR/next.po
===================================================================
--- doc/trunk/reference/fr-FR/next.po	2010-04-29 23:54:14 UTC (rev 6205)
+++ doc/trunk/reference/fr-FR/next.po	2010-05-01 15:04:10 UTC (rev 6206)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: master.xml\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-03-02T13:07:18\n"
+"POT-Creation-Date: 2010-05-01T13:53:43\n"
 "PO-Revision-Date: 2009-02-02 23:32+0100\n"
 "Last-Translator: Vincent Latombe <vincent.latombe at gmail.com>\n"
 "Language-Team: none\n"
@@ -21,13 +21,13 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Because CDI is so new, there's not yet a lot of information available "
+"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'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."
+"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."
 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's "
-"probably the best source of information about the future of CDI, Weld and "
+"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."
 msgstr ""
 "L'implémentation de référence des Web Beans est en train d'être développée "
@@ -76,8 +76,8 @@
 #, no-c-format
 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)."
+"remove the &#34;<literal>-SNAPSHOT</literal>&#34; from the version element "
+"(so you don&#39;t have to build other Weld modules)."
 msgstr ""
 
 #. Tag: para

Modified: doc/trunk/reference/fr-FR/part1.po
===================================================================
--- doc/trunk/reference/fr-FR/part1.po	2010-04-29 23:54:14 UTC (rev 6205)
+++ doc/trunk/reference/fr-FR/part1.po	2010-05-01 15:04:10 UTC (rev 6206)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: master.xml \n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-03-02T13:07:18\n"
+"POT-Creation-Date: 2010-05-01T13:53:43\n"
 "PO-Revision-Date: 2008-12-19 20:26+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -158,7 +158,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Where should I keep the reference to it when I'm not currently using it?"
+"Where should I keep the reference to it when I&#39;m not currently using it?"
 msgstr ""
 
 #. Tag: para
@@ -176,9 +176,9 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"CDI is more than a framework. It's a whole, rich programming model. The "
+"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's study what that phrase means."
+"typing</emphasis>. Let&#39;s study what that phrase means."
 msgstr ""
 
 #. Tag: para
@@ -223,8 +223,8 @@
 #. Tag: para
 #, no-c-format
 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 "
+"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 "
@@ -237,10 +237,10 @@
 #. Tag: para
 #, no-c-format
 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."
+"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."
 msgstr ""
 
 #. Tag: para
@@ -258,8 +258,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't have been any "
-"of these without inspiration from the frameworks mentioned and "
+"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)."
 msgstr ""

Modified: doc/trunk/reference/fr-FR/part3.po
===================================================================
--- doc/trunk/reference/fr-FR/part3.po	2010-04-29 23:54:14 UTC (rev 6205)
+++ doc/trunk/reference/fr-FR/part3.po	2010-05-01 15:04:10 UTC (rev 6206)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: master.xml\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-03-02T13:07:18\n"
+"POT-Creation-Date: 2010-05-01T13:53:43\n"
 "PO-Revision-Date: 2009-02-07 15:15+0100\n"
 "Last-Translator: Vincent Latombe <vincent.latombe 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've "
-"already seen three means of achieving loose coupling:"
+"The first major theme of CDI is <emphasis>loose coupling</emphasis>. We&#39;"
+"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't see string-based identifiers in CDI code, not because the "
+"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 "
-"\"configuration by convention\"—but because there are simply no strings "
-"there to begin with!"
+"&#34;configuration by convention&#34;—but because there are simply no "
+"strings there to begin with!"
 msgstr ""
 "Vous ne voyez pas d'identifiants basés sur des chaînes de caractères dans un "
 "code Web Bean, pas parce que le framework vous les cache en utilisant des "
@@ -216,11 +216,11 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"We're now ready to meet some more advanced features of CDI. Bear in mind "
+"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't ever really <emphasis>need</"
-"emphasis> to use these features, but if you use them wisely, you'll come to "
-"appreciate their power."
+"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."
 msgstr ""
 "Nous commes maintenant prêts à découvrir quelques fonctionnalités plus "
 "avancées des Web Beans. Gardez à l'esprit que ces fonctionnalités existent "

Modified: doc/trunk/reference/fr-FR/part4.po
===================================================================
--- doc/trunk/reference/fr-FR/part4.po	2010-04-29 23:54:14 UTC (rev 6205)
+++ doc/trunk/reference/fr-FR/part4.po	2010-05-01 15:04:10 UTC (rev 6206)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: master.xml\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-03-02T13:07:18\n"
+"POT-Creation-Date: 2010-05-01T13:53:43\n"
 "PO-Revision-Date: 2009-02-07 15:02+0100\n"
 "Last-Translator: Vincent Latombe <vincent.latombe 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'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."
+"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."
 msgstr ""
 
 #. Tag: para
@@ -53,12 +53,12 @@
 #. Tag: para
 #, fuzzy, no-c-format
 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."
+"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."
 msgstr ""
 "Nous sommes sur le point de tirer plein avantage de la plateforme Java EE "
 "dans une application utilisant les Web Beans. Nous rencontrerons aussi "

Modified: doc/trunk/reference/fr-FR/producermethods.po
===================================================================
--- doc/trunk/reference/fr-FR/producermethods.po	2010-04-29 23:54:14 UTC (rev 6205)
+++ doc/trunk/reference/fr-FR/producermethods.po	2010-05-01 15:04:10 UTC (rev 6206)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: master.xml \n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-03-02T13:07:18\n"
+"POT-Creation-Date: 2010-05-01T13:53:43\n"
 "PO-Revision-Date: 2008-12-19 20:26+0000\n"
 "Last-Translator: Automatically generated\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're also the easiest way to integrate objects which are not "
+"objects. They&#39;re also the easiest way to integrate objects which are not "
 "beans into the CDI environment."
 msgstr ""
 
@@ -85,9 +85,9 @@
 #, no-c-format
 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:"
+"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:"
 msgstr ""
 
 #. Tag: para
@@ -131,7 +131,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't be called again in the same session."
+"producer method won&#39;t be called again in the same session."
 msgstr ""
 
 #. Tag: para
@@ -154,17 +154,17 @@
 #. Tag: para
 #, no-c-format
 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."
+"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."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
 msgid ""
-"If this isn't what we want, we can use dependency injection into the "
+"If this isn&#39;t what we want, we can use dependency injection into the "
 "producer method to obtain bean instances:"
 msgstr ""
 
@@ -172,19 +172,19 @@
 #, no-c-format
 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!"
+"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!"
 msgstr ""
 
 #. Tag: para
 #, no-c-format
 msgid ""
-"There's at least three ways we could go about fixing this bug. We could "
+"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 "
@@ -214,7 +214,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't be destroyed until 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."
 msgstr ""

Modified: doc/trunk/reference/fr-FR/resources.po
===================================================================
--- doc/trunk/reference/fr-FR/resources.po	2010-04-29 23:54:14 UTC (rev 6205)
+++ doc/trunk/reference/fr-FR/resources.po	2010-05-01 15:04:10 UTC (rev 6206)
@@ -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-03-02T13:07:18\n"
+"POT-Creation-Date: 2010-05-01T13:53:43\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 "
-"\"mapped name\"). Producer fields turned out to be an elegant adaptor to "
+"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."
 msgstr ""
@@ -127,10 +127,10 @@
 #. Tag: para
 #, no-c-format
 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>."
+"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>."
 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're going to be using resources like the "
-"<literal>EntityManager</literal> in several different beans. Isn't it nicer "
-"and more typesafe to write"
+"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"
 msgstr ""
 
 #. Tag: para

Modified: doc/trunk/reference/fr-FR/ri-spi.po
===================================================================
--- doc/trunk/reference/fr-FR/ri-spi.po	2010-04-29 23:54:14 UTC (rev 6205)
+++ doc/trunk/reference/fr-FR/ri-spi.po	2010-05-01 15:04:10 UTC (rev 6206)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: master.xml \n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-03-02T13:07:18\n"
+"POT-Creation-Date: 2010-05-01T13:53:43\n"
 "PO-Revision-Date: 2008-12-20 22:07+0000\n"
 "Last-Translator: Automatically generated\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 \"Weld: "
-"Servlets\" extension will be sufficient, and will work in any container "
+"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."
 msgstr ""
 
@@ -80,8 +80,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't "
-"require transaction, EJB or JPA services). By default an EE environment is "
+"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>."
 msgstr ""
@@ -160,7 +160,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, 'virtual' <literal>BeanDeploymentArchive</literal>."
+"single, &#39;virtual&#39; <literal>BeanDeploymentArchive</literal>."
 msgstr ""
 
 #. Tag: para
@@ -175,7 +175,7 @@
 #, no-c-format
 msgid ""
 "<literal>BeanDeploymentArchive</literal> provides three methods which allow "
-"it's contents to be discovered by Weld—<literal>BeanDeploymentArchive."
+"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."
@@ -204,7 +204,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's "
+"loaded by another in BDA Y, it is accessible, and therefore BDA Y&#39;s "
 "accessible BDAs should include BDA X."
 msgstr ""
 
@@ -240,7 +240,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Weld delegates EJB 3 bean discovery to the container so that it doesn't "
+"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."
 msgstr ""
@@ -306,7 +306,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't need!"
+"to implement those services you don&#39;t need!"
 msgstr ""
 
 #. Tag: title
@@ -536,9 +536,9 @@
 #, no-c-format
 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."
+"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."
 msgstr ""
 
 #. Tag: title

Modified: doc/trunk/reference/fr-FR/scopescontexts.po
===================================================================
--- doc/trunk/reference/fr-FR/scopescontexts.po	2010-04-29 23:54:14 UTC (rev 6205)
+++ doc/trunk/reference/fr-FR/scopescontexts.po	2010-05-01 15:04:10 UTC (rev 6206)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: master.xml \n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-03-02T13:07:18\n"
+"POT-Creation-Date: 2010-05-01T13:53:43\n"
 "PO-Revision-Date: 2008-12-19 20:26+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -21,7 +21,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"So far, we've seen a few examples of <emphasis>scope type annotations</"
+"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:"
@@ -57,13 +57,13 @@
 #. Tag: para
 #, no-c-format
 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>."
+"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>."
 msgstr ""
 
 #. Tag: title
@@ -74,14 +74,14 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"CDI features an <emphasis>extensible context model</emphasis>. It's possible "
-"to define new scopes by creating a new scope type annotation:"
+"CDI features an <emphasis>extensible context model</emphasis>. It&#39;s "
+"possible to define new scopes by creating a new scope type annotation:"
 msgstr ""
 
 #. Tag: para
 #, no-c-format
 msgid ""
-"Of course, that's the easy part of the job. For this scope type to be "
+"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 "
@@ -98,7 +98,7 @@
 
 #. Tag: para
 #, no-c-format
-msgid "Usually, you'll use one of CDI's built-in scopes."
+msgid "Usually, you&#39;ll use one of CDI&#39;s built-in scopes."
 msgstr ""
 
 #. Tag: title
@@ -210,7 +210,7 @@
 #, no-c-format
 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 "
+"EE developer, so let&#39;s not waste time discussing them here. One of the "
 "scopes, however, is new."
 msgstr ""
 
@@ -327,7 +327,7 @@
 
 #. Tag: para
 #, no-c-format
-msgid "It's probably better to use one of the link components in JSF 2:"
+msgid "It&#39;s probably better to use one of the link components in JSF 2:"
 msgstr ""
 
 #. Tag: para
@@ -335,8 +335,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 \"flash\" object. The container automatically adds the "
-"conversation id to the redirect URL as a request parameter."
+"constructs such as a &#34;flash&#34; object. The container automatically "
+"adds the conversation id to the redirect URL as a request parameter."
 msgstr ""
 
 #. Tag: title
@@ -388,12 +388,12 @@
 #. Tag: para
 #, no-c-format
 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 "
+"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."
@@ -403,7 +403,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't mind too much if it "
+"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."
@@ -434,7 +434,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"give the client a reference of type <literal>Instance&lt;X&gt;</literal> "
+"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."
 msgstr ""
 
@@ -489,8 +489,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'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&#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 "
@@ -500,8 +500,8 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Beans with scope <literal>@Dependent</literal> don't need a proxy object. "
-"The client holds a direct reference to its instance."
+"Beans with scope <literal>@Dependent</literal> don&#39;t need a proxy "
+"object. The client holds a direct reference to its instance."
 msgstr ""
 
 #. Tag: para
@@ -556,6 +556,6 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"This feature is particularly useful with producer methods, as we'll see in "
-"the next chapter."
+"This feature is particularly useful with producer methods, as we&#39;ll see "
+"in the next chapter."
 msgstr ""

Modified: doc/trunk/reference/fr-FR/specialization.po
===================================================================
--- doc/trunk/reference/fr-FR/specialization.po	2010-04-29 23:54:14 UTC (rev 6205)
+++ doc/trunk/reference/fr-FR/specialization.po	2010-05-01 15:04:10 UTC (rev 6206)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: master.xml \n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-03-02T13:07:18\n"
+"POT-Creation-Date: 2010-05-01T13:53:43\n"
 "PO-Revision-Date: 2008-12-19 20:26+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -21,15 +21,15 @@
 #. Tag: para
 #, no-c-format
 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 "
+"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'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&#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."
 msgstr ""
 
 #. Tag: para
@@ -58,10 +58,10 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"The second case is the default assumed by CDI. It's possible to have two "
+"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've learned, you select between the two implementations using "
-"qualifiers."
+"class). As you&#39;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'll start by looking at alternatives and then show the "
+"literal>. We&#39;ll start by looking at alternatives and then show the "
 "guarantees that specialization adds."
 msgstr ""
 
@@ -92,8 +92,8 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"But in our staging environment, we don't really want to submit payments to "
-"the external system, so we override that implementation of "
+"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:"
 msgstr ""
 
@@ -105,18 +105,19 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"We've already seen how we can enable this alternative by listing its class "
-"in the <literal>beans.xml</literal> descriptor."
+"We&#39;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'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:"
+"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:"
 msgstr ""
 
 #. Tag: para
@@ -157,7 +158,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"So we haven't completely replaced the default implementation in this "
+"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 "
@@ -223,8 +224,8 @@
 #. Tag: para
 #, no-c-format
 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 "
+"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 "

Modified: doc/trunk/reference/fr-FR/stereotypes.po
===================================================================
--- doc/trunk/reference/fr-FR/stereotypes.po	2010-04-29 23:54:14 UTC (rev 6205)
+++ doc/trunk/reference/fr-FR/stereotypes.po	2010-05-01 15:04:10 UTC (rev 6206)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: master.xml \n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-03-02T13:07:18\n"
+"POT-Creation-Date: 2010-05-01T13:53:43\n"
 "PO-Revision-Date: 2008-12-19 20:26+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -86,7 +86,7 @@
 #, no-c-format
 msgid ""
 "Of course, we need to apply some other annotations to our stereotype or else "
-"it wouldn't be adding much value."
+"it wouldn&#39;t be adding much value."
 msgstr ""
 
 #. Tag: title
@@ -109,7 +109,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Naturally, overriding a single default isn't much use. But remember, "
+"Naturally, overriding a single default isn&#39;t much use. But remember, "
 "stereotypes can define more than just the default scope."
 msgstr ""
 
@@ -181,8 +181,8 @@
 #, no-c-format
 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 "
+"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."
 msgstr ""
@@ -190,7 +190,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Here's an example that combines the <literal>@Action</literal> and "
+"Here&#39;s an example that combines the <literal>@Action</literal> and "
 "<literal>@Auditable</literal> stereotypes:"
 msgstr ""
 
@@ -202,8 +202,9 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"We've already met two standard stereotypes defined by the CDI specification: "
-"<literal>@Interceptor</literal> and <literal>@Decorator</literal>."
+"We&#39;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/fr-FR/viewlayers.po
===================================================================
--- doc/trunk/reference/fr-FR/viewlayers.po	2010-04-29 23:54:14 UTC (rev 6205)
+++ doc/trunk/reference/fr-FR/viewlayers.po	2010-05-01 15:04:10 UTC (rev 6206)
@@ -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-03-02T13:07:18\n"
+"POT-Creation-Date: 2010-05-01T13:53:43\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's metadata when "
-"the page response is complete"
+"Storing the id of any long-running conversation in Wicket&#39;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'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&#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."

Modified: doc/trunk/reference/fr-FR/weldexamples.po
===================================================================
--- doc/trunk/reference/fr-FR/weldexamples.po	2010-04-29 23:54:14 UTC (rev 6205)
+++ doc/trunk/reference/fr-FR/weldexamples.po	2010-05-01 15:04:10 UTC (rev 6206)
@@ -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-03-02T13:07:18\n"
+"POT-Creation-Date: 2010-05-01T13:53:43\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'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, "
+"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>."
 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're told whether your guess was too high "
-"or too low."
+"1 and 100. After each attempt, you&#39;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's start by "
+"files and Facelets (JSF) views, packaged as a war module. Let&#39;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'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&#39;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's also an empty <literal>beans.xml</literal> file, which tells the "
+"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."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Finally, there's the familiar <literal>web.xml</literal>:"
+msgid "Finally, there&#39;s the familiar <literal>web.xml</literal>:"
 msgstr ""
 
 #. Tag: para
@@ -105,8 +105,8 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Let's take a look at the main JSF view, <literal>src/main/webapp/home.xhtml</"
-"literal>."
+"Let&#39;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, \"Higher!\", "
-"\"Lower!\" and \"Correct!\""
+"There are a number of messages which can be sent to the user, &#34;Higher!"
+"&#34;, &#34;Lower!&#34; and &#34;Correct!&#34;"
 msgstr ""
 
 #. Tag: para
@@ -138,9 +138,10 @@
 #. Tag: para
 #, no-c-format
 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."
+"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."
 msgstr ""
 
 #. Tag: para
@@ -176,8 +177,8 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"The <literal>Generator</literal> is application scoped, so we don't get a "
-"different random each time."
+"The <literal>Generator</literal> is application scoped, so we don&#39;t get "
+"a different random each time."
 msgstr ""
 
 #. Tag: para
@@ -191,20 +192,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's "
+"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's guess and providing feedback to the user with a "
-"<literal>FacesMessage</literal>. We've used the post-construct lifecycle "
+"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&lt;Integer&gt;</literal> bean."
+"<literal>@Random Instance&#60;Integer&#62;</literal> bean."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
 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})."
+"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})."
 msgstr ""
 
 #. Tag: title
@@ -236,8 +237,9 @@
 #, no-c-format
 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."
+"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."
 msgstr ""
 
 #. Tag: para
@@ -246,8 +248,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't need to access this interface, but Weld makes use "
-"of it."
+"name. You generally don&#39;t need to access this interface, but Weld makes "
+"use of it."
 msgstr ""
 
 #. Tag: title
@@ -260,7 +262,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'll "
+"components and leverage the conversation context. In this section, we&#39;ll "
 "walk you through the Wicket version of the numberguess example."
 msgstr ""
 
@@ -269,7 +271,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't already familiar with the framework."
+"section, if you aren&#39;t already familiar with the framework."
 msgstr ""
 
 #. Tag: para
@@ -278,17 +280,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've seen already that Jetty is perfectly capable of running CDI "
+"You&#39;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'll also be using the Eclipse IDE in these examples. Instructions are "
+"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'll likely need to do more than just deploy examples, we'll get setup in "
-"this full development environment."
+"you&#39;ll likely need to do more than just deploy examples, we&#39;ll get "
+"setup in this full development environment."
 msgstr ""
 
 #. Tag: title
@@ -311,7 +313,7 @@
 #, no-c-format
 msgid ""
 "If you have m2eclipse installed, you can open any Maven project directly. "
-"From within Eclipse, select <emphasis>File -&gt; Import... -&gt; Maven "
+"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."
@@ -327,24 +329,24 @@
 #. Tag: para
 #, no-c-format
 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!"
+"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!"
 msgstr ""
 
 #. Tag: para
 #, no-c-format
 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 "
+"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."
 msgstr ""
@@ -361,15 +363,15 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Then, from Eclipse, choose <emphasis>File -&gt; Import... -&gt; General -"
-"&gt; Existing Projects into Workspace</emphasis>, select the root directory "
+"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>."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "It's time to get the example running!"
+msgid "It&#39;s time to get the example running!"
 msgstr ""
 
 #. Tag: title
@@ -428,7 +430,7 @@
 
 #. Tag: para
 #, no-c-format
-msgid "Enough toying with deployment, let's dive into the code."
+msgid "Enough toying with deployment, let&#39;s dive into the code."
 msgstr ""
 
 #. Tag: title
@@ -460,7 +462,7 @@
 
 #. Tag: para
 #, no-c-format
-msgid "Here's where things differ from the JSF numberguess example:"
+msgid "Here&#39;s where things differ from the JSF numberguess example:"
 msgstr ""
 
 #. Tag: para
@@ -583,8 +585,8 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Let's have a look at the significant code and configuration files that make "
-"up this example."
+"Let&#39;s have a look at the significant code and configuration files that "
+"make up this example."
 msgstr ""
 
 #. Tag: para
@@ -598,8 +600,8 @@
 #. Tag: para
 #, no-c-format
 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 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:"
 msgstr ""
 
@@ -607,14 +609,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 'session'."
+"of a Swing application typically represents a single &#39;session&#39;."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
 msgid ""
-"Notice that the bean is not named, since it doesn't need to be accessed via "
-"EL."
+"Notice that the bean is not named, since it doesn&#39;t need to be accessed "
+"via EL."
 msgstr ""
 
 #. Tag: para
@@ -655,9 +657,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'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&#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."
 msgstr ""
 
 #. Tag: para
@@ -665,8 +667,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'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&#39;"
+"s next guess and the response to the previous guess. The code for "
 "<literal>MessageGenerator</literal> is as follows:"
 msgstr ""
 
@@ -679,7 +681,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"The <literal>Game</literal>'s state is interrogated to determine the "
+"The <literal>Game</literal>&#39;s state is interrogated to determine the "
 "appropriate challenge message ..."
 msgstr ""
 
@@ -724,8 +726,8 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"<literal>guessButtonActionPerformed</literal> is called when the 'Guess' "
-"button is clicked, and it does the following:"
+"<literal>guessButtonActionPerformed</literal> is called when the &#39;"
+"Guess&#39; button is clicked, and it does the following:"
 msgstr ""
 
 #. Tag: para
@@ -738,8 +740,8 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Calls <literal>game.check()</literal> to validate and perform one 'turn' of "
-"the game"
+"Calls <literal>game.check()</literal> to validate and perform one &#39;"
+"turn&#39; of the game"
 msgstr ""
 
 #. Tag: para
@@ -778,7 +780,7 @@
 #, no-c-format
 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."
+"it&#39;s structure is more complex than the numberguess example."
 msgstr ""
 
 #. Tag: para
@@ -792,9 +794,10 @@
 #. Tag: para
 #, no-c-format
 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:"
+"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:"
 msgstr ""
 
 #. Tag: para
@@ -808,18 +811,18 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"If you weren't using Maven to generate these files, you would need "
+"If you weren&#39;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'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&#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>."
 msgstr ""
 
 #. Tag: para
@@ -840,21 +843,21 @@
 #. Tag: para
 #, no-c-format
 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."
+"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."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
 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."
+"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."
 msgstr ""
 
 #. Tag: para
@@ -871,9 +874,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'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!"
+"<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!"
 msgstr ""
 
 #. Tag: para

Modified: doc/trunk/reference/fr-FR/xml.po
===================================================================
--- doc/trunk/reference/fr-FR/xml.po	2010-04-29 23:54:14 UTC (rev 6205)
+++ doc/trunk/reference/fr-FR/xml.po	2010-05-01 15:04:10 UTC (rev 6206)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: master.xml\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-03-02T13:07:18\n"
+"POT-Creation-Date: 2010-05-01T13:53:43\n"
 "PO-Revision-Date: 2009-02-07 14:53+0100\n"
 "Last-Translator: Vincent Latombe <vincent.latombe at gmail.com>\n"
 "Language-Team: none\n"
@@ -21,9 +21,9 @@
 #. Tag: para
 #, fuzzy, no-c-format
 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:"
+"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:"
 msgstr ""
 "Jusqu'ici, nous avons vu plein d'exemples de Web Beans déclarés à l'aide "
 "d'annotations. Cependant, il y a quelques cas où nous ne pouvons pas "
@@ -66,13 +66,13 @@
 "nom de class ou de membre comme nom de l'élément XML."
 
 #. Tag: para
-#, no-c-format
+#, 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'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&#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."
 msgstr ""
 "L'avantage de cette méthode est que vous pouvez écrire une schéma XML qui "
 "empêche les erreurs de saisies dans votre document XML. Il est même possible "
@@ -116,9 +116,9 @@
 "membres sont spécifiés par des attributs de l'élément."
 
 #. Tag: para
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"For example, the element <literal>&lt;util:Date/&gt;</literal> in the "
+"For example, the element <literal>&#60;util:Date/&#62;</literal> in the "
 "following XML fragment refers to the class <literal>java.util.Date</literal>:"
 msgstr ""
 "Par exemple, l'élément <literal>&lt;util:Date/&gt;</literal> dans le "
@@ -206,7 +206,7 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"The <literal>&lt;Name&gt;</literal> element declares a bean of scope "
+"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 "
@@ -222,8 +222,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's not quite a full databinding "
-"solution, but it's close!"
+"specify whole graphs of Java objects. It&#39;s not quite a full databinding "
+"solution, but it&#39;s close!"
 msgstr ""
 "Cette fonctionnalité simple, mais puissante permet au format XML des Web "
 "Beans d'être utilisé pour spécifier des graphes entiers d'objets Java. Ce "
@@ -238,9 +238,10 @@
 #. Tag: para
 #, fuzzy, no-c-format
 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."
+"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."
 msgstr ""
 "Si nous voulons que le format de notre document XML soit écrit par des gens "
 "qui ne sont pas des développeurs Java, ou qui n'ont pas accès à notre code, "

Modified: doc/trunk/reference/it-IT/Author_Group.po
===================================================================
--- doc/trunk/reference/it-IT/Author_Group.po	2010-04-29 23:54:14 UTC (rev 6205)
+++ doc/trunk/reference/it-IT/Author_Group.po	2010-05-01 15:04:10 UTC (rev 6206)
@@ -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-03-02T13:07:17\n"
+"POT-Creation-Date: 2010-05-01T13:53:42\n"
 "PO-Revision-Date: 2009-11-23 21:11+0100\n"
 "Last-Translator: Nicola Benaglia <nico.benaz at gmail.com>\n"
 "Language-Team: none\n"
@@ -13,86 +13,36 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#. Tag: firstname
-#, no-c-format
-msgid "Gavin"
-msgstr ""
-
 #. Tag: contrib
 #, no-c-format
 msgid "JSR-299: Contexts and Dependency Injection Lead"
 msgstr "JSR-299: Contexts and Dependency Injection Lead"
 
-#. Tag: firstname
-#, no-c-format
-msgid "Pete"
-msgstr ""
-
 #. Tag: contrib
 #, no-c-format
 msgid "Weld (JSR-299 RI) Lead"
 msgstr "Weld (JSR-299 RI) Lead"
 
-#. Tag: firstname
-#, no-c-format
-msgid "Dan"
-msgstr ""
-
-#. Tag: firstname
-#, no-c-format
-msgid "David"
-msgstr ""
-
-#. Tag: firstname
-#, no-c-format
-msgid "Nicola"
-msgstr ""
-
 #. Tag: contrib
 #, no-c-format
 msgid "Italian Translation"
 msgstr "Traduzione italiana"
 
-#. Tag: firstname
-#, no-c-format
-msgid "Gladys"
-msgstr ""
-
 #. Tag: contrib
 #, no-c-format
 msgid "Spanish Translation"
 msgstr "Traduzione spagnola"
 
-#. Tag: firstname
-#, no-c-format
-msgid "Eun-Ju"
-msgstr ""
-
 #. Tag: contrib
 #, no-c-format
 msgid "Korean Translation"
 msgstr "Traduzione coreana"
 
-#. Tag: firstname
-#, no-c-format
-msgid "Terry"
-msgstr ""
-
 #. Tag: contrib
 #, no-c-format
 msgid "Traditional Chinese Translation"
 msgstr "Traduzione cinese (tradizionale)"
 
-#. Tag: firstname
-#, no-c-format
-msgid "Francesco"
-msgstr ""
-
-#. Tag: firstname
-#, no-c-format
-msgid "Sean"
-msgstr ""
-
 #. Tag: contrib
 #, no-c-format
 msgid "Simplified Chinese Translation"

Modified: doc/trunk/reference/it-IT/beans.po
===================================================================
--- doc/trunk/reference/it-IT/beans.po	2010-04-29 23:54:14 UTC (rev 6205)
+++ doc/trunk/reference/it-IT/beans.po	2010-05-01 15:04:10 UTC (rev 6206)
@@ -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-03-02T13:07:17\n"
+"POT-Creation-Date: 2010-05-01T13:53:42\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'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&#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."
 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'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&#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:"
 msgstr ""
 
 #. Tag: para
@@ -171,7 +171,7 @@
 
 #. Tag: para
 #, no-c-format
-msgid "Let's see what all this new terminology means."
+msgid "Let&#39;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 \"contract\" that must be satisfied by "
-"the bean to be injected. The contract is:"
+"Any injected attribute specifies a &#34;contract&#34; 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&lt;Book&gt;</literal>, as well as the implicit type "
+"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)."
 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't inject an EJB using its remote interface unless "
-"you define a <emphasis>resource</emphasis>, which we'll meet in <xref "
-"linkend=\"resources\" />."
+"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\" />."
 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&lt;Book&gt;</literal>, together with "
+"restricted to <literal>Shop&#60;Book&#62;</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 \"quality\" using "
-"a qualifier."
+"implementation it is interested in. We model this kind of &#34;quality&#34; "
+"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's an example of a qualifier annotation:"
+"string-based names. Here&#39;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've encountered one. With CDI, annotation "
-"definitions will become a familiar artifact as you'll be creating them from "
-"time to time."
+"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."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
 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 "
+"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."
 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't, it reports an error to the user."
+"doesn&#39;t, it reports an error to the user."
 msgstr ""
 
 #. Tag: para
@@ -330,10 +330,10 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"That's not quite the end of the story. CDI also defines a simple "
+"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'll get into the details in <xref linkend=\"injection\" />."
+"We&#39;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't want the bean to sit in the session "
+"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."
 msgstr ""
@@ -386,7 +386,8 @@
 
 #. Tag: para
 #, no-c-format
-msgid "We'll talk more about scopes in <xref linkend=\"scopescontexts\" />."
+msgid ""
+"We&#39;ll talk more about scopes in <xref linkend=\"scopescontexts\" />."
 msgstr ""
 
 #. Tag: title
@@ -445,7 +446,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"We've already seen how qualifiers let us choose between multiple "
+"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 "
@@ -482,9 +483,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'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."
+"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."
 msgstr ""
 
 #. Tag: para
@@ -497,10 +498,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'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."
+"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."
 msgstr ""
 
 #. Tag: para
@@ -539,14 +540,14 @@
 #, no-c-format
 msgid ""
 "Notice that <literal>ShoppingCart</literal> and "
-"<literal>TransactionInterceptor</literal> don't know anything about each "
+"<literal>TransactionInterceptor</literal> don&#39;t know anything about each "
 "other."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
 msgid ""
-"Interceptors are deployment-specific. (We don't need a "
+"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 "
@@ -556,8 +557,8 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"We'll discuss interceptors, and their cousins, decorators, in <xref linkend="
-"\"interceptors\" /> and <xref linkend=\"decorators\" />."
+"We&#39;ll discuss interceptors, and their cousins, decorators, in <xref "
+"linkend=\"interceptors\" /> and <xref linkend=\"decorators\" />."
 msgstr ""
 
 #. Tag: title
@@ -568,9 +569,10 @@
 #. Tag: para
 #, no-c-format
 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."
+"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."
 msgstr ""
 
 #. Tag: title
@@ -584,8 +586,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't need to. According to "
-"the specification, the CDI container treats any class that satisfies the "
+"<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:"
 msgstr ""
 
@@ -634,7 +636,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't recommend directly injecting an entity class. We "
+"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."
@@ -713,7 +715,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"There's no reason to explicitly declare the scope of a stateless session "
+"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 "
@@ -769,8 +771,8 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"When we don't need any of these things, an ordinary managed bean will serve "
-"just fine."
+"When we don&#39;t need any of these things, an ordinary managed bean will "
+"serve just fine."
 msgstr ""
 
 #. Tag: para
@@ -794,7 +796,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Finally, it's usually obvious when method-level transaction management, "
+"Finally, it&#39;s usually obvious when method-level transaction management, "
 "method-level security, timers, remote methods or asynchronous methods are "
 "needed."
 msgstr ""
@@ -802,11 +804,11 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"The point we're trying to make is: use a session bean when you need the "
+"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'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&#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>."
 msgstr ""
@@ -814,13 +816,14 @@
 #. Tag: para
 #, no-c-format
 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\"."
+"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;."
 msgstr ""
 
 #. Tag: title
@@ -859,7 +862,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"We can't write a bean class that is itself a random number. But we can "
+"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—"
@@ -931,7 +934,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"We'll talk much more about producer methods in <xref linkend="
+"We&#39;ll talk much more about producer methods in <xref linkend="
 "\"producermethods\" />."
 msgstr ""
 
@@ -962,8 +965,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'll have to wait until <xref "
-"linkend=\"resources\" />. Because we can't wait to get to work on some "
+"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."
 msgstr ""
 

Modified: doc/trunk/reference/it-IT/decorators.po
===================================================================
--- doc/trunk/reference/it-IT/decorators.po	2010-04-29 23:54:14 UTC (rev 6205)
+++ doc/trunk/reference/it-IT/decorators.po	2010-05-01 15:04:10 UTC (rev 6206)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: master.xml\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-03-02T13:07:17\n"
+"POT-Creation-Date: 2010-05-01T13:53:42\n"
 "PO-Revision-Date: 2009-11-23 21:13+0100\n"
 "Last-Translator: Nicola Benaglia <nico.benaz 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't "
-"an appropriate tool for separating business-related concerns."
+"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 "
@@ -48,10 +48,11 @@
 "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."
+"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 "
@@ -99,8 +100,9 @@
 #, fuzzy, no-c-format
 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."
+"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, "
@@ -196,7 +198,8 @@
 #, fuzzy, no-c-format
 msgid ""
 "This declaration serves the same purpose for decorators that the "
-"<literal>&lt;interceptors&gt;</literal> declaration serves for interceptors:"
+"<literal>&#60;interceptors&#62;</literal> declaration serves for "
+"interceptors:"
 msgstr ""
 "Per i decoratori questa dichiarazione provvede alle stesse finalità di "
 "quanto la dichiarazione <literal>&lt;Interceptors&gt;</literal> fa per gli "

Modified: doc/trunk/reference/it-IT/ee.po
===================================================================
--- doc/trunk/reference/it-IT/ee.po	2010-04-29 23:54:14 UTC (rev 6205)
+++ doc/trunk/reference/it-IT/ee.po	2010-05-01 15:04:10 UTC (rev 6206)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: master.xml\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-03-02T13:07:17\n"
+"POT-Creation-Date: 2010-05-01T13:53:42\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's easy to create a "
+"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 "
@@ -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've already seen a couple of "
-"examples of this, though we didn't pay much attention at the time:"
+"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:"
 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's easy to use a bean from a servlet in Java EE 6. Simply inject the bean "
-"using field or initializer method injection."
+"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."
 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'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&#39;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'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."
+"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."
 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/it-IT/environments.po
===================================================================
--- doc/trunk/reference/it-IT/environments.po	2010-04-29 23:54:14 UTC (rev 6205)
+++ doc/trunk/reference/it-IT/environments.po	2010-05-01 15:04:10 UTC (rev 6206)
@@ -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-03-02T13:07:17\n"
+"POT-Creation-Date: 2010-05-01T14:44:09\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'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&#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."
 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't "
+"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 "
@@ -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 \"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:"
+"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:"
 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't automatically bind the "
+"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:"
@@ -234,15 +234,8 @@
 
 #. Tag: para
 #, fuzzy, no-c-format
-msgid ""
-"Weld also supports Servlet injection in Tomcat. To enable this, place the "
-"<literal>weld-tomcat-support.jar</literal> in <literal>$TOMCAT_HOME/lib</"
-"literal>, and add the following to <literal>META-INF/context.xml</literal>:"
-msgstr ""
-"Web Beans supporta anche l'iniezione dei servlet in Tomcat. Per abilitarla, "
-"collocare <literal>webbeans-tomcat-support.jar</literal> in <literal>"
-"$TOMCAT_HOME/lib</literal>, ed aggiungere il seguente codice a <literal>META-"
-"INF/context.xml</literal>:"
+msgid "Weld also supports Servlet injection in Tomcat 6."
+msgstr "Web Beans non supporta attualmente l'injection dei servlet in Jetty."
 
 #. Tag: title
 #, no-c-format
@@ -252,9 +245,9 @@
 #. Tag: para
 #, fuzzy, no-c-format
 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:"
+"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:"
 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 "
@@ -262,12 +255,12 @@
 "contesti:"
 
 #. Tag: para
-#, no-c-format
+#, fuzzy, no-c-format
 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."
+"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."
 msgstr ""
 "Si noti che Jetty non ha un supporto predefinito per <literal>javax.naming."
 "spi.ObjectFactory</literal> come Tomcat, quindi è necessario creare "
@@ -287,8 +280,15 @@
 
 #. Tag: para
 #, fuzzy, no-c-format
-msgid "Weld does not currently support Servlet injection in Jetty."
-msgstr "Web Beans non supporta attualmente l'injection dei servlet in Jetty."
+msgid ""
+"Weld also supports Servlet injection in Jetty 6. To enable this, add the "
+"file <literal>META-INF/jetty-web.xml</literal> with the following content to "
+"your war:"
+msgstr ""
+"Web Beans supporta anche l'iniezione dei servlet in Tomcat. Per abilitarla, "
+"collocare <literal>webbeans-tomcat-support.jar</literal> in <literal>"
+"$TOMCAT_HOME/lib</literal>, ed aggiungere il seguente codice a <literal>META-"
+"INF/context.xml</literal>:"
 
 #. Tag: title
 #, no-c-format
@@ -298,13 +298,13 @@
 #. Tag: para
 #, fuzzy, no-c-format
 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."
+"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."
 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's an example of a simple CDI SE application:"
+msgid "Here&#39;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'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&#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."
@@ -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's beans and events. The API consists of two "
-"classes: <literal>Weld</literal> and <literal>WeldContainer</literal>."
+"references to your application&#39;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's an example application main method which uses this API to initialize "
-"a bean of type <literal>MyApplicationBean</literal>."
+"Here&#39;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 '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."
+"<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."
 msgstr ""
 
 #. Tag: para
@@ -524,10 +524,10 @@
 #. Tag: para
 #, no-c-format
 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."
+"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."
 msgstr ""
 
 #~ msgid "<![CDATA[jboss.home=/path/to/jboss-as-5.x]]>"

Modified: doc/trunk/reference/it-IT/events.po
===================================================================
--- doc/trunk/reference/it-IT/events.po	2010-04-29 23:54:14 UTC (rev 6205)
+++ doc/trunk/reference/it-IT/events.po	2010-05-01 15:04:10 UTC (rev 6206)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: master.xml\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-03-02T13:07:17\n"
+"POT-Creation-Date: 2010-05-01T13:53:42\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"
@@ -45,10 +45,10 @@
 "osservatori sono completamente disaccoppiati dai produttori,"
 
 #. Tag: para
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"observers can specify a combination of \"selectors\" to narrow the set of "
-"event notifications they will receive, and"
+"observers can specify a combination of &#34;selectors&#34; 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've already seen with the dependency injection service."
+"approach that we&#39;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's an example:"
+"<literal>@Qualifier</literal>. Here&#39;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's only interested in events which have those "
+"does specify qualifiers, it&#39;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't specify the "
-"qualifier dynamically. CDI lets us obtain a qualifier instance by "
+"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>."
@@ -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'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&#39;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/it-IT/example.po
===================================================================
--- doc/trunk/reference/it-IT/example.po	2010-04-29 23:54:14 UTC (rev 6205)
+++ doc/trunk/reference/it-IT/example.po	2010-05-01 15:04:10 UTC (rev 6206)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: master.xml\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-03-02T13:07:17\n"
+"POT-Creation-Date: 2010-05-01T13:53:42\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'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:"
+"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:"
 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're also going to need a <literal>persistence.xml</literal> "
+"(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>.)"
 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'll explore dependency injection in greater depth."
+"the next chapter, we&#39;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/it-IT/extend.po
===================================================================
--- doc/trunk/reference/it-IT/extend.po	2010-04-29 23:54:14 UTC (rev 6205)
+++ doc/trunk/reference/it-IT/extend.po	2010-05-01 15:04:10 UTC (rev 6206)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: master.xml\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-03-02T13:07:17\n"
+"POT-Creation-Date: 2010-05-01T13:53:42\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's needed to satisfy the requirements of Java SE's "
-"service provider architecture."
+"define any methods, but it&#39;s needed to satisfy the requirements of Java "
+"SE&#39;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's metamodel and more. Here's a very simple "
-"example:"
+"permitted to modify the container&#39;s metamodel and more. Here&#39;s a "
+"very simple example:"
 msgstr ""
 
 #. Tag: para
@@ -223,7 +223,7 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"Let's study some of the interfaces exposed by the <literal>BeanManager</"
+"Let&#39;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,7 +281,8 @@
 
 #. Tag: para
 #, no-c-format
-msgid "There's an easy way to find out what beans exist in the application:"
+msgid ""
+"There&#39;s an easy way to find out what beans exist in the application:"
 msgstr ""
 
 #. Tag: para
@@ -317,9 +318,9 @@
 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."
+"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."
 msgstr ""
 
 #. Tag: para
@@ -345,8 +346,8 @@
 #. Tag: para
 #, no-c-format
 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 "
+"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 "
@@ -356,7 +357,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Here's a second example, which adds the <literal>@Alternative</literal> "
+"Here&#39;s a second example, which adds the <literal>@Alternative</literal> "
 "annotation to any class which implements a certain <literal>Service</"
 "literal> interface."
 msgstr ""
@@ -387,12 +388,12 @@
 #. Tag: para
 #, no-c-format
 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 "
+"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:"
 msgstr ""
 
@@ -407,9 +408,9 @@
 #. Tag: para
 #, no-c-format
 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."
+"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."
 msgstr ""
 
 #. Tag: title

Modified: doc/trunk/reference/it-IT/extensions.po
===================================================================
--- doc/trunk/reference/it-IT/extensions.po	2010-04-29 23:54:14 UTC (rev 6205)
+++ doc/trunk/reference/it-IT/extensions.po	2010-05-01 15:04:10 UTC (rev 6206)
@@ -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-03-02T13:07:17\n"
+"POT-Creation-Date: 2010-05-01T13:53:42\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's no need to "
-"include sl4j as it's already included (and used internally)."
+"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)."
 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/it-IT/gettingstarted.po
===================================================================
--- doc/trunk/reference/it-IT/gettingstarted.po	2010-04-29 23:54:14 UTC (rev 6205)
+++ doc/trunk/reference/it-IT/gettingstarted.po	2010-05-01 15:04:10 UTC (rev 6206)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: master.xml\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-03-02T13:07:17\n"
+"POT-Creation-Date: 2010-05-01T13:53:42\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'll need the "
+"To run the examples with the provided build scripts, you&#39;ll need the "
 "following:"
 msgstr ""
 
@@ -96,7 +96,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"You'll need a full install of Ant 1.7.0. Some linux distributions only "
+"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."
 msgstr ""
@@ -104,7 +104,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"In the next few sections, you'll be using the Ant command (<literal>ant</"
+"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 "
@@ -123,7 +123,7 @@
 #, no-c-format
 msgid ""
 "The sections below cover the steps for deploying with both Ant and Maven in "
-"detail. Let's start with JBoss AS."
+"detail. Let&#39;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'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!"
+"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!"
 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'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>."
+"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>."
 msgstr ""
 
 #. Tag: para
@@ -168,7 +168,7 @@
 
 #. Tag: para
 #, fuzzy, no-c-format
-msgid "You're now ready to deploy your first example!"
+msgid "You&#39;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't already, start JBoss AS. You can either start JBoss AS from a "
-"Linux shell:"
+"If you haven&#39;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's a topic for a later chapter."
+"modules, but that&#39;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'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&#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."
 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'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."
+"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."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
 msgid ""
-"To deploy the examples to GlassFish, you'll need the final <ulink url="
+"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'll "
-"need to first make the script executable."
+"After the download is complete, execute the installer. On Linux/Unix, "
+"you&#39;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'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&#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)."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
 msgid ""
-"If you've deployed either of the starter examples, <literal>weld-"
+"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."
@@ -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's "
+"<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's <literal>ear/target</literal> directory. All you "
-"need to do now is deploy them to GlassFish."
+"ends up in the example&#39;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 \"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."
+"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."
 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't get enterprise features such as session beans and "
-"container-managed transactions.)"
+"container. (But you don&#39;t get enterprise features such as session beans "
+"and container-managed transactions.)"
 msgstr ""
 
 #. Tag: para
 #, fuzzy, no-c-format
 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."
+"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."
 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't require that you have Maven installed, so we'll start "
-"there. If you want to use Maven, you can just skip ahead."
+"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."
 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'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&#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>."
 msgstr ""
 
 #. Tag: para
 #, fuzzy, no-c-format
-msgid "Now you're ready to deploy the numberguess example to Tomcat!"
+msgid "Now you&#39;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 \"tomcat.\"."
+"same target names used for JBoss AS, prefixed with &#34;tomcat.&#34;."
 msgstr ""
 
 #. Tag: para
@@ -501,7 +501,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"If you haven't already, start Tomcat. You can either start Tomcat from a "
+"If you haven&#39;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'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."
+"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."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
 msgid ""
-"The Maven plugin communicates with Tomcat over HTTP, so it doesn't care "
+"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</"
@@ -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's <literal>readme.txt</"
+"the example, which are documented in the example&#39;s <literal>readme.txt</"
 "literal> file."
 msgstr ""
 
@@ -612,10 +612,10 @@
 #. Tag: para
 #, no-c-format
 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."
+"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."
 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't need anything else installed except to have the Maven command "
+"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."
 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 \"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 &#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."

Modified: doc/trunk/reference/it-IT/injection.po
===================================================================
--- doc/trunk/reference/it-IT/injection.po	2010-04-29 23:54:14 UTC (rev 6205)
+++ doc/trunk/reference/it-IT/injection.po	2010-05-01 15:04:10 UTC (rev 6206)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: master.xml\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-04-14T10:16:01\n"
+"POT-Creation-Date: 2010-05-01T14:44:09\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't rely on it)."
+"not portable, don&#39;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'll meet in <xref linkend=\"events\" />) and "
+"observer methods (which we&#39;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'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 "
+"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."
 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's "
-"the simplest possible scenario. When you first start your application, "
-"you'll likely have lots of those."
+"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."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
 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."
+"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."
 msgstr ""
 
 #. Tag: title
@@ -312,12 +312,12 @@
 #. Tag: para
 #, no-c-format
 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>!"
+"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>!"
 msgstr ""
 
 #. Tag: title
@@ -334,11 +334,12 @@
 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."
+"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."
 msgstr ""
 
 #. Tag: para
@@ -427,7 +428,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's the bean that will be injected."
+"alternative, that&#39;s the bean that will be injected."
 msgstr ""
 
 #. Tag: title
@@ -454,8 +455,8 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"During the course of your development, you're going to encounter this "
-"situation. Let's learn how to resolve it."
+"During the course of your development, you&#39;re going to encounter this "
+"situation. Let&#39;s learn how to resolve it."
 msgstr ""
 
 #. Tag: para
@@ -529,7 +530,7 @@
 
 #. Tag: para
 #, no-c-format
-msgid "Just remember: \"There can be only one.\""
+msgid "Just remember: &#34;There can be only one.&#34;"
 msgstr ""
 
 #. Tag: para
@@ -537,14 +538,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'll see in <xref linkend=\"lookup\" />."
+"<literal>Instance</literal>, as we&#39;ll see in <xref linkend=\"lookup\" />."
 msgstr ""
 
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"Now there's one more issue you need to be aware of when using the dependency "
-"injection service."
+"Now there&#39;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."
@@ -641,7 +642,8 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"classes which don't have a non-private constructor with no parameters, and"
+"classes which don&#39;t have a non-private constructor with no parameters, "
+"and"
 msgstr ""
 "classi che non abbiano costruttori non privati (non-private) senza "
 "parametri, e"
@@ -663,7 +665,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"It's usually very easy to fix an unproxyable dependency problem. If an "
+"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:"
 msgstr ""
@@ -676,7 +678,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"change the type of the injection point to <literal>Instance&lt;X&gt;</"
+"change the type of the injection point to <literal>Instance&#60;X&#62;</"
 "literal>,"
 msgstr ""
 
@@ -717,7 +719,7 @@
 
 #. Tag: para
 #, no-c-format
-msgid "But we didn't get around to implementing this yet."
+msgid "But we didn&#39;t get around to implementing this yet."
 msgstr ""
 
 #. Tag: title
@@ -811,10 +813,11 @@
 #, no-c-format
 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>."
+"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>."
 msgstr ""
 
 #. Tag: para
@@ -825,7 +828,8 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"We can't use an anonymous class to implement a qualifier type with members."
+"We can&#39;t use an anonymous class to implement a qualifier type with "
+"members."
 msgstr ""
 
 #. Tag: para
@@ -892,10 +896,10 @@
 "riguardanti il punto di iniezione cui appartiene."
 
 #. Tag: para
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"Let's look at an example. The following code is verbose, and vulnerable to "
-"refactoring problems:"
+"Let&#39;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:"
@@ -918,8 +922,8 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"Not convinced? Then here's a second example. To inject HTTP parameters, we "
-"need to define a qualifier type:"
+"Not convinced? Then here&#39;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/it-IT/interceptors.po
===================================================================
--- doc/trunk/reference/it-IT/interceptors.po	2010-04-29 23:54:14 UTC (rev 6205)
+++ doc/trunk/reference/it-IT/interceptors.po	2010-05-01 15:04:10 UTC (rev 6206)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: master.xml\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-03-02T13:07:17\n"
+"POT-Creation-Date: 2010-05-01T13:53:43\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're interested in:"
+"specify exactly which beans we&#39;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'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 "
+"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>."
 msgstr ""
 "Bene, ma da qualche parte è necessario implementare l'interceptor che "

Modified: doc/trunk/reference/it-IT/intro.po
===================================================================
--- doc/trunk/reference/it-IT/intro.po	2010-04-29 23:54:14 UTC (rev 6205)
+++ doc/trunk/reference/it-IT/intro.po	2010-05-01 15:04:10 UTC (rev 6206)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: master.xml\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-03-02T13:07:18\n"
+"POT-Creation-Date: 2010-05-01T13:53:43\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'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!"
+"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!"
 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,13 +49,14 @@
 #. Tag: para
 #, no-c-format
 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."
+"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."
 msgstr ""
 
 #. Tag: para
@@ -67,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's a uniform concept of a bean and a "
-"lightweight component model that's aligned across the Java EE platform."
+"<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."
 msgstr ""
 
 #. Tag: para
@@ -77,30 +78,31 @@
 "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>."
+"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>."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
 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."
+"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."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Now let's see how to create your first bean that actually uses CDI."
+msgid "Now let&#39;s see how to create your first bean that actually uses CDI."
 msgstr ""
 
 #. Tag: title
@@ -111,7 +113,7 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"Suppose that we have two existing Java classes that we've been using for "
+"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:"
 msgstr ""
@@ -137,8 +139,8 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"Unfortunately, we don't have a class that translates whole text documents. "
-"So let's write a bean for this job:"
+"Unfortunately, we don&#39;t have a class that translates whole text "
+"documents. So let&#39;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:"
@@ -159,11 +161,11 @@
 #. Tag: para
 #, fuzzy, no-c-format
 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."
+"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."
 msgstr ""
 "Come hai indovinato, l'annotazione <literal>@Initializer</literal> ha "
 "qualcosa che fare con la dependency injection! <literal>@Initializer</"
@@ -185,7 +187,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Let's create a UI controller bean that uses field injection to obtain an "
+"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:"
 msgstr ""
@@ -199,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'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&#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."
 msgstr ""
 
 #. Tag: para
@@ -218,11 +220,11 @@
 #. Tag: para
 #, no-c-format
 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."
+"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."
 msgstr ""
 
 #. Tag: para
@@ -249,10 +251,10 @@
 #. Tag: para
 #, no-c-format
 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."
+"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."
 msgstr ""
 
 #, fuzzy

Modified: doc/trunk/reference/it-IT/master.po
===================================================================
--- doc/trunk/reference/it-IT/master.po	2010-04-29 23:54:14 UTC (rev 6205)
+++ doc/trunk/reference/it-IT/master.po	2010-05-01 15:04:10 UTC (rev 6206)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: master.xml\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-03-02T13:07:18\n"
+"POT-Creation-Date: 2010-05-01T13:53:43\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 \"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."
+"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."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
 msgid ""
-"You'll also find that some of the functionality that once existed in the "
+"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."
@@ -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'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&#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."
 msgstr ""
 
 #. Tag: title

Modified: doc/trunk/reference/it-IT/next.po
===================================================================
--- doc/trunk/reference/it-IT/next.po	2010-04-29 23:54:14 UTC (rev 6205)
+++ doc/trunk/reference/it-IT/next.po	2010-05-01 15:04:10 UTC (rev 6206)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: master.xml\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-03-02T13:07:18\n"
+"POT-Creation-Date: 2010-05-01T13:53:43\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's not yet a lot of information available "
+"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'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."
+"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."
 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's "
-"probably the best source of information about the future of CDI, Weld and "
+"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."
 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 \"<literal>-SNAPSHOT</literal>\" from the version element (so you "
-"don't have to build other Weld modules)."
+"remove the &#34;<literal>-SNAPSHOT</literal>&#34; from the version element "
+"(so you don&#39;t have to build other Weld modules)."
 msgstr ""
 
 #. Tag: para

Modified: doc/trunk/reference/it-IT/part1.po
===================================================================
--- doc/trunk/reference/it-IT/part1.po	2010-04-29 23:54:14 UTC (rev 6205)
+++ doc/trunk/reference/it-IT/part1.po	2010-05-01 15:04:10 UTC (rev 6206)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: master.xml\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-03-02T13:07:18\n"
+"POT-Creation-Date: 2010-05-01T13:53:43\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'm not currently using it?"
+"Where should I keep the reference to it when I&#39;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's a whole, rich programming model. The "
+"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's study what that phrase means."
+"typing</emphasis>. Let&#39;s study what that phrase means."
 msgstr ""
 
 # implementazione concreta mi pare pleonastico
@@ -267,8 +267,8 @@
 #. Tag: para
 #, fuzzy, no-c-format
 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 "
+"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 "
@@ -289,10 +289,10 @@
 #. Tag: para
 #, no-c-format
 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."
+"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."
 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't have been any "
-"of these without inspiration from the frameworks mentioned and "
+"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)."
 msgstr ""

Modified: doc/trunk/reference/it-IT/part3.po
===================================================================
--- doc/trunk/reference/it-IT/part3.po	2010-04-29 23:54:14 UTC (rev 6205)
+++ doc/trunk/reference/it-IT/part3.po	2010-05-01 15:04:10 UTC (rev 6206)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: master.xml\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-03-02T13:07:18\n"
+"POT-Creation-Date: 2010-05-01T13:53:43\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've "
-"already seen three means of achieving loose coupling:"
+"The first major theme of CDI is <emphasis>loose coupling</emphasis>. We&#39;"
+"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't see string-based identifiers in CDI code, not because the "
+"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 "
-"\"configuration by convention\"—but because there are simply no strings "
-"there to begin with!"
+"&#34;configuration by convention&#34;—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're now ready to meet some more advanced features of CDI. Bear in mind "
+"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't ever really <emphasis>need</"
-"emphasis> to use these features, but if you use them wisely, you'll come to "
-"appreciate their power."
+"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."
 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/it-IT/part4.po
===================================================================
--- doc/trunk/reference/it-IT/part4.po	2010-04-29 23:54:14 UTC (rev 6205)
+++ doc/trunk/reference/it-IT/part4.po	2010-05-01 15:04:10 UTC (rev 6206)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: master.xml\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-03-02T13:07:18\n"
+"POT-Creation-Date: 2010-05-01T13:53:43\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'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."
+"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."
 msgstr ""
 
 # modelli a componenti o architetture a componenti?
@@ -54,12 +54,12 @@
 #. Tag: para
 #, fuzzy, no-c-format
 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."
+"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."
 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/it-IT/producermethods.po
===================================================================
--- doc/trunk/reference/it-IT/producermethods.po	2010-04-29 23:54:14 UTC (rev 6205)
+++ doc/trunk/reference/it-IT/producermethods.po	2010-05-01 15:04:10 UTC (rev 6206)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: master.xml\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-03-02T13:07:18\n"
+"POT-Creation-Date: 2010-05-01T13:53:43\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're also the easiest way to integrate objects which are not "
+"objects. They&#39;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'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&#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:"
 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 "
@@ -155,11 +155,11 @@
 "<literal>@SessionScoped</literal> al metodo."
 
 #. Tag: para
-#, no-c-format
+#, fuzzy, 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't be called again in the same session."
+"producer method won&#39;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 "
@@ -183,13 +183,13 @@
 msgstr "Iniezione nei metodi produttori"
 
 #. Tag: para
-#, no-c-format
+#, fuzzy, no-c-format
 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."
+"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."
 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't what we want, we can use dependency injection into the "
+"If this isn&#39;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 \"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!"
+"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!"
 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's at least three ways we could go about fixing this bug. We could "
+"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 "
@@ -262,12 +262,12 @@
 msgstr "Si consideri il seguente metodo produttore:"
 
 #. Tag: para
-#, no-c-format
+#, fuzzy, 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't be destroyed until 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."
 msgstr ""

Modified: doc/trunk/reference/it-IT/resources.po
===================================================================
--- doc/trunk/reference/it-IT/resources.po	2010-04-29 23:54:14 UTC (rev 6205)
+++ doc/trunk/reference/it-IT/resources.po	2010-05-01 15:04:10 UTC (rev 6206)
@@ -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-03-02T13:07:18\n"
+"POT-Creation-Date: 2010-05-01T13:53:43\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 "
-"\"mapped name\"). Producer fields turned out to be an elegant adaptor to "
+"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."
 msgstr ""
@@ -127,10 +127,10 @@
 #. Tag: para
 #, no-c-format
 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>."
+"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>."
 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're going to be using resources like the "
-"<literal>EntityManager</literal> in several different beans. Isn't it nicer "
-"and more typesafe to write"
+"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"
 msgstr ""
 
 #. Tag: para

Modified: doc/trunk/reference/it-IT/ri-spi.po
===================================================================
--- doc/trunk/reference/it-IT/ri-spi.po	2010-04-29 23:54:14 UTC (rev 6205)
+++ doc/trunk/reference/it-IT/ri-spi.po	2010-05-01 15:04:10 UTC (rev 6206)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: master.xml\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-03-02T13:07:18\n"
+"POT-Creation-Date: 2010-05-01T13:53:43\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 \"Weld: "
-"Servlets\" extension will be sufficient, and will work in any container "
+"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."
 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't "
-"require transaction, EJB or JPA services). By default an EE environment is "
+"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>."
 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, 'virtual' <literal>BeanDeploymentArchive</literal>."
+"single, &#39;virtual&#39; <literal>BeanDeploymentArchive</literal>."
 msgstr ""
 
 #. Tag: para
@@ -194,7 +194,7 @@
 #, no-c-format
 msgid ""
 "<literal>BeanDeploymentArchive</literal> provides three methods which allow "
-"it's contents to be discovered by Weld—<literal>BeanDeploymentArchive."
+"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."
@@ -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's "
+"loaded by another in BDA Y, it is accessible, and therefore BDA Y&#39;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't "
+"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."
 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't need!"
+"to implement those services you don&#39;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's context. The <literal>org.jboss.weld.context."
-"api.BeanStore</literal> should be implemented to provide an application "
-"scoped storage."
+"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."
 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/it-IT/scopescontexts.po
===================================================================
--- doc/trunk/reference/it-IT/scopescontexts.po	2010-04-29 23:54:14 UTC (rev 6205)
+++ doc/trunk/reference/it-IT/scopescontexts.po	2010-05-01 15:04:10 UTC (rev 6206)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: master.xml\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-03-02T13:07:18\n"
+"POT-Creation-Date: 2010-05-01T13:53:43\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've seen a few examples of <emphasis>scope type annotations</"
+"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:"
@@ -70,13 +70,13 @@
 #. Tag: para
 #, no-c-format
 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>."
+"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>."
 msgstr ""
 
 #. Tag: title
@@ -87,8 +87,8 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"CDI features an <emphasis>extensible context model</emphasis>. It's possible "
-"to define new scopes by creating a new scope type annotation:"
+"CDI features an <emphasis>extensible context model</emphasis>. It&#39;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's the easy part of the job. For this scope type to be "
+"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 "
@@ -120,7 +120,7 @@
 
 #. Tag: para
 #, fuzzy, no-c-format
-msgid "Usually, you'll use one of CDI's built-in scopes."
+msgid "Usually, you&#39;ll use one of CDI&#39;s built-in scopes."
 msgstr "Solitamente si userà uno degli scopi predefiniti di Web Beans."
 
 #. Tag: title
@@ -234,10 +234,10 @@
 msgstr ""
 
 #. Tag: para
-#, no-c-format
+#, fuzzy, no-c-format
 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 "
+"EE developer, so let&#39;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's probably better to use one of the link components in JSF 2:"
+msgid "It&#39;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 \"flash\" object. The container automatically adds the "
-"conversation id to the redirect URL as a request parameter."
+"constructs such as a &#34;flash&#34; 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 \"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 "
+"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."
@@ -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't mind too much if it "
+"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."
@@ -516,7 +516,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"give the client a reference of type <literal>Instance&lt;X&gt;</literal> "
+"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."
 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'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&#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 "
@@ -587,8 +587,8 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Beans with scope <literal>@Dependent</literal> don't need a proxy object. "
-"The client holds a direct reference to its instance."
+"Beans with scope <literal>@Dependent</literal> don&#39;t need a proxy "
+"object. The client holds a direct reference to its instance."
 msgstr ""
 
 #. Tag: para
@@ -653,10 +653,10 @@
 "<literal>PaymentCalc</literal>."
 
 #. Tag: para
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"This feature is particularly useful with producer methods, as we'll see in "
-"the next chapter."
+"This feature is particularly useful with producer methods, as we&#39;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/it-IT/specialization.po
===================================================================
--- doc/trunk/reference/it-IT/specialization.po	2010-04-29 23:54:14 UTC (rev 6205)
+++ doc/trunk/reference/it-IT/specialization.po	2010-05-01 15:04:10 UTC (rev 6206)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: master.xml\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-03-02T13:07:18\n"
+"POT-Creation-Date: 2010-05-01T13:53:43\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'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 "
+"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'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&#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."
 msgstr ""
 
 #. Tag: para
@@ -58,10 +58,10 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"The second case is the default assumed by CDI. It's possible to have two "
+"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've learned, you select between the two implementations using "
-"qualifiers."
+"class). As you&#39;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'll start by looking at alternatives and then show the "
+"literal>. We&#39;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't really want to submit payments to "
-"the external system, so we override that implementation of "
+"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:"
 msgstr ""
 "Ma in quest'ambiente di prova si procede con l'override dell'implementazione "
@@ -112,18 +112,19 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"We've already seen how we can enable this alternative by listing its class "
-"in the <literal>beans.xml</literal> descriptor."
+"We&#39;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'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:"
+"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:"
 msgstr ""
 
 #. Tag: para
@@ -164,7 +165,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"So we haven't completely replaced the default implementation in this "
+"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 "
@@ -237,8 +238,8 @@
 #. Tag: para
 #, no-c-format
 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 "
+"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 "

Modified: doc/trunk/reference/it-IT/stereotypes.po
===================================================================
--- doc/trunk/reference/it-IT/stereotypes.po	2010-04-29 23:54:14 UTC (rev 6205)
+++ doc/trunk/reference/it-IT/stereotypes.po	2010-05-01 15:04:10 UTC (rev 6206)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: master.xml\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-03-02T13:07:18\n"
+"POT-Creation-Date: 2010-05-01T13:53:43\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't be adding much value."
+"it wouldn&#39;t be adding much value."
 msgstr ""
 
 #. Tag: title
@@ -121,7 +121,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Naturally, overriding a single default isn't much use. But remember, "
+"Naturally, overriding a single default isn&#39;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'll call <emphasis>stereotype stacking</emphasis>. You "
-"may want to do this if you have two distinct stereotypes which are "
+"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."
 msgstr ""
@@ -212,7 +212,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Here's an example that combines the <literal>@Action</literal> and "
+"Here&#39;s an example that combines the <literal>@Action</literal> and "
 "<literal>@Auditable</literal> stereotypes:"
 msgstr ""
 
@@ -224,8 +224,9 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"We've already met two standard stereotypes defined by the CDI specification: "
-"<literal>@Interceptor</literal> and <literal>@Decorator</literal>."
+"We&#39;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/it-IT/viewlayers.po
===================================================================
--- doc/trunk/reference/it-IT/viewlayers.po	2010-04-29 23:54:14 UTC (rev 6205)
+++ doc/trunk/reference/it-IT/viewlayers.po	2010-05-01 15:04:10 UTC (rev 6206)
@@ -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-03-02T13:07:18\n"
+"POT-Creation-Date: 2010-05-01T13:53:43\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"
@@ -98,10 +98,10 @@
 "distruggerlo più avanti"
 
 #. Tag: para
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"Storing the id of any long-running conversation in Wicket's metadata when "
-"the page response is complete"
+"Storing the id of any long-running conversation in Wicket&#39;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'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&#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."

Modified: doc/trunk/reference/it-IT/weldexamples.po
===================================================================
--- doc/trunk/reference/it-IT/weldexamples.po	2010-04-29 23:54:14 UTC (rev 6205)
+++ doc/trunk/reference/it-IT/weldexamples.po	2010-05-01 15:04:10 UTC (rev 6206)
@@ -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-03-02T13:07:18\n"
+"POT-Creation-Date: 2010-05-01T13:53:43\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'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, "
+"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>."
 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're told whether your guess was too high "
-"or too low."
+"1 and 100. After each attempt, you&#39;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's start by "
+"files and Facelets (JSF) views, packaged as a war module. Let&#39;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'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&#39;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's also an empty <literal>beans.xml</literal> file, which tells the "
+"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."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Finally, there's the familiar <literal>web.xml</literal>:"
+msgid "Finally, there&#39;s the familiar <literal>web.xml</literal>:"
 msgstr ""
 
 #. Tag: para
@@ -105,8 +105,8 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Let's take a look at the main JSF view, <literal>src/main/webapp/home.xhtml</"
-"literal>."
+"Let&#39;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, \"Higher!\", "
-"\"Lower!\" and \"Correct!\""
+"There are a number of messages which can be sent to the user, &#34;Higher!"
+"&#34;, &#34;Lower!&#34; and &#34;Correct!&#34;"
 msgstr ""
 
 #. Tag: para
@@ -138,9 +138,10 @@
 #. Tag: para
 #, no-c-format
 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."
+"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."
 msgstr ""
 
 #. Tag: para
@@ -176,8 +177,8 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"The <literal>Generator</literal> is application scoped, so we don't get a "
-"different random each time."
+"The <literal>Generator</literal> is application scoped, so we don&#39;t get "
+"a different random each time."
 msgstr ""
 
 #. Tag: para
@@ -191,20 +192,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's "
+"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's guess and providing feedback to the user with a "
-"<literal>FacesMessage</literal>. We've used the post-construct lifecycle "
+"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&lt;Integer&gt;</literal> bean."
+"<literal>@Random Instance&#60;Integer&#62;</literal> bean."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
 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})."
+"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})."
 msgstr ""
 
 #. Tag: title
@@ -236,8 +237,9 @@
 #, no-c-format
 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."
+"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."
 msgstr ""
 
 #. Tag: para
@@ -246,8 +248,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't need to access this interface, but Weld makes use "
-"of it."
+"name. You generally don&#39;t need to access this interface, but Weld makes "
+"use of it."
 msgstr ""
 
 #. Tag: title
@@ -260,7 +262,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'll "
+"components and leverage the conversation context. In this section, we&#39;ll "
 "walk you through the Wicket version of the numberguess example."
 msgstr ""
 
@@ -269,7 +271,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't already familiar with the framework."
+"section, if you aren&#39;t already familiar with the framework."
 msgstr ""
 
 #. Tag: para
@@ -278,17 +280,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've seen already that Jetty is perfectly capable of running CDI "
+"You&#39;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'll also be using the Eclipse IDE in these examples. Instructions are "
+"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'll likely need to do more than just deploy examples, we'll get setup in "
-"this full development environment."
+"you&#39;ll likely need to do more than just deploy examples, we&#39;ll get "
+"setup in this full development environment."
 msgstr ""
 
 #. Tag: title
@@ -311,7 +313,7 @@
 #, no-c-format
 msgid ""
 "If you have m2eclipse installed, you can open any Maven project directly. "
-"From within Eclipse, select <emphasis>File -&gt; Import... -&gt; Maven "
+"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."
@@ -327,24 +329,24 @@
 #. Tag: para
 #, no-c-format
 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!"
+"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!"
 msgstr ""
 
 #. Tag: para
 #, no-c-format
 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 "
+"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."
 msgstr ""
@@ -361,15 +363,15 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Then, from Eclipse, choose <emphasis>File -&gt; Import... -&gt; General -"
-"&gt; Existing Projects into Workspace</emphasis>, select the root directory "
+"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>."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "It's time to get the example running!"
+msgid "It&#39;s time to get the example running!"
 msgstr ""
 
 #. Tag: title
@@ -428,7 +430,7 @@
 
 #. Tag: para
 #, no-c-format
-msgid "Enough toying with deployment, let's dive into the code."
+msgid "Enough toying with deployment, let&#39;s dive into the code."
 msgstr ""
 
 #. Tag: title
@@ -460,7 +462,7 @@
 
 #. Tag: para
 #, no-c-format
-msgid "Here's where things differ from the JSF numberguess example:"
+msgid "Here&#39;s where things differ from the JSF numberguess example:"
 msgstr ""
 
 #. Tag: para
@@ -583,8 +585,8 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Let's have a look at the significant code and configuration files that make "
-"up this example."
+"Let&#39;s have a look at the significant code and configuration files that "
+"make up this example."
 msgstr ""
 
 #. Tag: para
@@ -598,8 +600,8 @@
 #. Tag: para
 #, no-c-format
 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 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:"
 msgstr ""
 
@@ -607,14 +609,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 'session'."
+"of a Swing application typically represents a single &#39;session&#39;."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
 msgid ""
-"Notice that the bean is not named, since it doesn't need to be accessed via "
-"EL."
+"Notice that the bean is not named, since it doesn&#39;t need to be accessed "
+"via EL."
 msgstr ""
 
 #. Tag: para
@@ -655,9 +657,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'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&#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."
 msgstr ""
 
 #. Tag: para
@@ -665,8 +667,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'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&#39;"
+"s next guess and the response to the previous guess. The code for "
 "<literal>MessageGenerator</literal> is as follows:"
 msgstr ""
 
@@ -679,7 +681,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"The <literal>Game</literal>'s state is interrogated to determine the "
+"The <literal>Game</literal>&#39;s state is interrogated to determine the "
 "appropriate challenge message ..."
 msgstr ""
 
@@ -724,8 +726,8 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"<literal>guessButtonActionPerformed</literal> is called when the 'Guess' "
-"button is clicked, and it does the following:"
+"<literal>guessButtonActionPerformed</literal> is called when the &#39;"
+"Guess&#39; button is clicked, and it does the following:"
 msgstr ""
 
 #. Tag: para
@@ -738,8 +740,8 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Calls <literal>game.check()</literal> to validate and perform one 'turn' of "
-"the game"
+"Calls <literal>game.check()</literal> to validate and perform one &#39;"
+"turn&#39; of the game"
 msgstr ""
 
 #. Tag: para
@@ -778,7 +780,7 @@
 #, no-c-format
 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."
+"it&#39;s structure is more complex than the numberguess example."
 msgstr ""
 
 #. Tag: para
@@ -792,9 +794,10 @@
 #. Tag: para
 #, no-c-format
 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:"
+"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:"
 msgstr ""
 
 #. Tag: para
@@ -808,18 +811,18 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"If you weren't using Maven to generate these files, you would need "
+"If you weren&#39;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'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&#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>."
 msgstr ""
 
 #. Tag: para
@@ -840,21 +843,21 @@
 #. Tag: para
 #, no-c-format
 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."
+"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."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
 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."
+"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."
 msgstr ""
 
 #. Tag: para
@@ -871,9 +874,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'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!"
+"<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!"
 msgstr ""
 
 #. Tag: para

Modified: doc/trunk/reference/it-IT/xml.po
===================================================================
--- doc/trunk/reference/it-IT/xml.po	2010-04-29 23:54:14 UTC (rev 6205)
+++ doc/trunk/reference/it-IT/xml.po	2010-05-01 15:04:10 UTC (rev 6206)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: master.xml\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-03-02T13:07:18\n"
+"POT-Creation-Date: 2010-05-01T13:53:43\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'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:"
+"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:"
 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 "
@@ -69,13 +69,13 @@
 "classe o del membro come nome dell'elemento XML."
 
 #. Tag: para
-#, no-c-format
+#, 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'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&#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."
 msgstr ""
 "Il vantaggio di quest'approccio è che risulta possibile scrivere uno "
 "schemaXML che previene gli errori di scrittura nei documenti XML. E' "
@@ -119,9 +119,9 @@
 "membri sonospecificati dagli attributi dell'elemento."
 
 #. Tag: para
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"For example, the element <literal>&lt;util:Date/&gt;</literal> in the "
+"For example, the element <literal>&#60;util:Date/&#62;</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>&lt;Name&gt;</literal> element declares a bean of scope "
+"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 "
@@ -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's not quite a full databinding "
-"solution, but it's close!"
+"specify whole graphs of Java objects. It&#39;s not quite a full databinding "
+"solution, but it&#39;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,9 +239,10 @@
 #. Tag: para
 #, fuzzy, no-c-format
 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."
+"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."
 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/ja-JP/Author_Group.po
===================================================================
--- doc/trunk/reference/ja-JP/Author_Group.po	2010-04-29 23:54:14 UTC (rev 6205)
+++ doc/trunk/reference/ja-JP/Author_Group.po	2010-05-01 15:04:10 UTC (rev 6206)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: Author_Group\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-03-02T13:07:17\n"
+"POT-Creation-Date: 2010-05-01T13:53:42\n"
 "PO-Revision-Date: 2009-07-06 12:25+1000\n"
 "Last-Translator: Noriko Mizumoto <noriko at fedoraproject.org>\n"
 "Language-Team: Japanese <fedora-trans-ja at redhat.com>\n"
@@ -16,86 +16,36 @@
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#. Tag: firstname
-#, no-c-format
-msgid "Gavin"
-msgstr ""
-
 #. Tag: contrib
 #, no-c-format
 msgid "JSR-299: Contexts and Dependency Injection Lead"
 msgstr ""
 
-#. Tag: firstname
-#, no-c-format
-msgid "Pete"
-msgstr ""
-
 #. Tag: contrib
 #, no-c-format
 msgid "Weld (JSR-299 RI) Lead"
 msgstr ""
 
-#. Tag: firstname
-#, no-c-format
-msgid "Dan"
-msgstr ""
-
-#. Tag: firstname
-#, no-c-format
-msgid "David"
-msgstr ""
-
-#. Tag: firstname
-#, no-c-format
-msgid "Nicola"
-msgstr ""
-
 #. Tag: contrib
 #, no-c-format
 msgid "Italian Translation"
 msgstr "イタリア語翻訳"
 
-#. Tag: firstname
-#, no-c-format
-msgid "Gladys"
-msgstr ""
-
 #. Tag: contrib
 #, no-c-format
 msgid "Spanish Translation"
 msgstr "スペイン語翻訳"
 
-#. Tag: firstname
-#, no-c-format
-msgid "Eun-Ju"
-msgstr ""
-
 #. Tag: contrib
 #, no-c-format
 msgid "Korean Translation"
 msgstr "韓国語翻訳"
 
-#. Tag: firstname
-#, no-c-format
-msgid "Terry"
-msgstr ""
-
 #. Tag: contrib
 #, no-c-format
 msgid "Traditional Chinese Translation"
 msgstr "繁體中文翻訳"
 
-#. Tag: firstname
-#, no-c-format
-msgid "Francesco"
-msgstr ""
-
-#. Tag: firstname
-#, no-c-format
-msgid "Sean"
-msgstr ""
-
 #. Tag: contrib
 #, no-c-format
 msgid "Simplified Chinese Translation"

Modified: doc/trunk/reference/ja-JP/beans.po
===================================================================
--- doc/trunk/reference/ja-JP/beans.po	2010-04-29 23:54:14 UTC (rev 6205)
+++ doc/trunk/reference/ja-JP/beans.po	2010-05-01 15:04:10 UTC (rev 6206)
@@ -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-03-02T13:07:17\n"
+"POT-Creation-Date: 2010-05-01T13:53:42\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'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&#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."
 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'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&#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:"
 msgstr ""
 
 #. Tag: para
@@ -171,7 +171,7 @@
 
 #. Tag: para
 #, no-c-format
-msgid "Let's see what all this new terminology means."
+msgid "Let&#39;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 \"contract\" that must be satisfied by "
-"the bean to be injected. The contract is:"
+"Any injected attribute specifies a &#34;contract&#34; 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&lt;Book&gt;</literal>, as well as the implicit type "
+"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)."
 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't inject an EJB using its remote interface unless "
-"you define a <emphasis>resource</emphasis>, which we'll meet in <xref "
-"linkend=\"resources\" />."
+"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\" />."
 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&lt;Book&gt;</literal>, together with "
+"restricted to <literal>Shop&#60;Book&#62;</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 \"quality\" using "
-"a qualifier."
+"implementation it is interested in. We model this kind of &#34;quality&#34; "
+"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's an example of a qualifier annotation:"
+"string-based names. Here&#39;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've encountered one. With CDI, annotation "
-"definitions will become a familiar artifact as you'll be creating them from "
-"time to time."
+"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."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
 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 "
+"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."
 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't, it reports an error to the user."
+"doesn&#39;t, it reports an error to the user."
 msgstr ""
 
 #. Tag: para
@@ -330,10 +330,10 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"That's not quite the end of the story. CDI also defines a simple "
+"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'll get into the details in <xref linkend=\"injection\" />."
+"We&#39;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't want the bean to sit in the session "
+"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."
 msgstr ""
@@ -386,7 +386,8 @@
 
 #. Tag: para
 #, no-c-format
-msgid "We'll talk more about scopes in <xref linkend=\"scopescontexts\" />."
+msgid ""
+"We&#39;ll talk more about scopes in <xref linkend=\"scopescontexts\" />."
 msgstr ""
 
 #. Tag: title
@@ -445,7 +446,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"We've already seen how qualifiers let us choose between multiple "
+"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 "
@@ -482,9 +483,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'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."
+"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."
 msgstr ""
 
 #. Tag: para
@@ -497,10 +498,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'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."
+"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."
 msgstr ""
 
 #. Tag: para
@@ -539,14 +540,14 @@
 #, no-c-format
 msgid ""
 "Notice that <literal>ShoppingCart</literal> and "
-"<literal>TransactionInterceptor</literal> don't know anything about each "
+"<literal>TransactionInterceptor</literal> don&#39;t know anything about each "
 "other."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
 msgid ""
-"Interceptors are deployment-specific. (We don't need a "
+"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 "
@@ -556,8 +557,8 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"We'll discuss interceptors, and their cousins, decorators, in <xref linkend="
-"\"interceptors\" /> and <xref linkend=\"decorators\" />."
+"We&#39;ll discuss interceptors, and their cousins, decorators, in <xref "
+"linkend=\"interceptors\" /> and <xref linkend=\"decorators\" />."
 msgstr ""
 
 #. Tag: title
@@ -568,9 +569,10 @@
 #. Tag: para
 #, no-c-format
 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."
+"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."
 msgstr ""
 
 #. Tag: title
@@ -584,8 +586,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't need to. According to "
-"the specification, the CDI container treats any class that satisfies the "
+"<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:"
 msgstr ""
 
@@ -634,7 +636,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't recommend directly injecting an entity class. We "
+"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."
@@ -713,7 +715,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"There's no reason to explicitly declare the scope of a stateless session "
+"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 "
@@ -769,8 +771,8 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"When we don't need any of these things, an ordinary managed bean will serve "
-"just fine."
+"When we don&#39;t need any of these things, an ordinary managed bean will "
+"serve just fine."
 msgstr ""
 
 #. Tag: para
@@ -794,7 +796,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Finally, it's usually obvious when method-level transaction management, "
+"Finally, it&#39;s usually obvious when method-level transaction management, "
 "method-level security, timers, remote methods or asynchronous methods are "
 "needed."
 msgstr ""
@@ -802,11 +804,11 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"The point we're trying to make is: use a session bean when you need the "
+"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'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&#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>."
 msgstr ""
@@ -814,13 +816,14 @@
 #. Tag: para
 #, no-c-format
 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\"."
+"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;."
 msgstr ""
 
 #. Tag: title
@@ -859,7 +862,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"We can't write a bean class that is itself a random number. But we can "
+"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—"
@@ -931,7 +934,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"We'll talk much more about producer methods in <xref linkend="
+"We&#39;ll talk much more about producer methods in <xref linkend="
 "\"producermethods\" />."
 msgstr ""
 
@@ -962,7 +965,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'll have to wait until <xref "
-"linkend=\"resources\" />. Because we can't wait to get to work on some "
+"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."
 msgstr ""

Modified: doc/trunk/reference/ja-JP/decorators.po
===================================================================
--- doc/trunk/reference/ja-JP/decorators.po	2010-04-29 23:54:14 UTC (rev 6205)
+++ doc/trunk/reference/ja-JP/decorators.po	2010-05-01 15:04:10 UTC (rev 6206)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: master.xml\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-03-02T13:07:17\n"
+"POT-Creation-Date: 2010-05-01T13:53:42\n"
 "PO-Revision-Date: 2009-04-30 23:45+0900\n"
 "Last-Translator: Fusayuki Minamoto <miki.htmnet at nifty.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't "
-"an appropriate tool for separating business-related concerns."
+"the actual semantics of the events they intercept. Thus, interceptors "
+"aren&#39;t an appropriate tool for separating business-related concerns."
 msgstr ""
 "インタセプタは、型システムとは <emphasis>直交した</emphasis> (複数の)関心事"
 "をとらえて、それらを分離する強力な方法です。インタセプタは任意のJavaの型の呼"
@@ -45,10 +45,11 @@
 "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."
+"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 ""
 "反対のことは <emphasis>デコレータ</emphasis> についても言えます。デコレータは"
 "特定のJavaインタフェースのみの呼び出しに割り込むので、そのインタフェースに付"
@@ -97,8 +98,9 @@
 #, fuzzy, no-c-format
 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."
+"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 ""
 "他のシンプル Web Beans とは異なり、デコレータは抽象クラスにすることができま"
 "す。修飾されたインタフェースの特定のメソッドのためにデコレータとして何も特別"
@@ -190,7 +192,8 @@
 #, fuzzy, no-c-format
 msgid ""
 "This declaration serves the same purpose for decorators that the "
-"<literal>&lt;interceptors&gt;</literal> declaration serves for interceptors:"
+"<literal>&#60;interceptors&#62;</literal> declaration serves for "
+"interceptors:"
 msgstr ""
 "この宣言はデコレータに対して <literal>&lt;Interceptors&gt;</literal> 宣言がイ"
 "ンタセプタに対するものと同じ目的を持ちます。"

Modified: doc/trunk/reference/ja-JP/ee.po
===================================================================
--- doc/trunk/reference/ja-JP/ee.po	2010-04-29 23:54:14 UTC (rev 6205)
+++ doc/trunk/reference/ja-JP/ee.po	2010-05-01 15:04:10 UTC (rev 6206)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: master.xml\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-03-02T13:07:17\n"
+"POT-Creation-Date: 2010-05-01T13:53:42\n"
 "PO-Revision-Date: 2009-04-19 01:59+0900\n"
 "Last-Translator: wadahiro <wadahiro 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's easy to create a "
+"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 "
@@ -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've already seen a couple of "
-"examples of this, though we didn't pay much attention at the time:"
+"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:"
 msgstr ""
 "すべてのシンプル、エンタープライズ Web Beansは、<literal>@Resource</"
 "literal>、<literal>@EJB</literal>、および<literal>@PersistenceContext</"
@@ -139,8 +139,8 @@
 #. Tag: para
 #, fuzzy, no-c-format
 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."
+"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."
 msgstr ""
 "Java EE 6でサーブレットからWeb Beanを使用することは簡単です。フィールドか初期"
 "化メソッドによるインジェクションを使用して、Web Beansをインジェクトしてくださ"
@@ -166,9 +166,9 @@
 #. Tag: para
 #, no-c-format
 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."
+"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."
 msgstr ""
 
 #. Tag: para
@@ -255,15 +255,15 @@
 #. Tag: para
 #, fuzzy, no-c-format
 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."
+"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."
 msgstr ""
 "Web Beansはどのような特別なデプロイのアーカイブも定義しません。アプリケーショ"
 "ンのクラスパスにおいてデプロイの場所である、JAR、EJB-JARまたはWARの中にWeb "

Modified: doc/trunk/reference/ja-JP/environments.po
===================================================================
--- doc/trunk/reference/ja-JP/environments.po	2010-04-29 23:54:14 UTC (rev 6205)
+++ doc/trunk/reference/ja-JP/environments.po	2010-05-01 15:04:10 UTC (rev 6206)
@@ -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-03-02T13:07:17\n"
+"POT-Creation-Date: 2010-05-01T14:44:09\n"
 "PO-Revision-Date: 2009-05-22 21:50+0900\n"
 "Last-Translator: TANABE Junnichi <jun at lmns.biz>\n"
 "Language-Team: none\n"
@@ -37,9 +37,9 @@
 #. Tag: para
 #, no-c-format
 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."
+"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."
 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't "
+"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 "
@@ -129,10 +129,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 \"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:"
+"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:"
 msgstr ""
 "Web Beansはサーブレットコンテナの中でWebアプリケーションライブラリとして使わ"
 "れるべきです。あなたがすべきことは、<literal>WEB-INF/lib</literal> 中に "
@@ -205,7 +205,7 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"Tomcat has a read-only JNDI, so Weld can't automatically bind the "
+"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:"
@@ -235,16 +235,9 @@
 "literal> で利用できるでしょう。"
 
 #. Tag: para
-#, fuzzy, no-c-format
-msgid ""
-"Weld also supports Servlet injection in Tomcat. To enable this, place the "
-"<literal>weld-tomcat-support.jar</literal> in <literal>$TOMCAT_HOME/lib</"
-"literal>, and add the following to <literal>META-INF/context.xml</literal>:"
+#, no-c-format
+msgid "Weld also supports Servlet injection in Tomcat 6."
 msgstr ""
-"Web Beansは、Tomcatへのサーブレットインジェクションもサポートします。これを有"
-"効化するために、 <literal>$TOMCAT_HOME/lib</literal> に <literal>webbeans-"
-"tomcat-support.jar</literal> を置いて、 <literal>META-INF/context.xml</"
-"literal> に下記を追加します。"
 
 #. Tag: title
 #, no-c-format
@@ -254,9 +247,9 @@
 #. Tag: para
 #, fuzzy, no-c-format
 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:"
+"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:"
 msgstr ""
 "Tomcatは読み取り専用のJNDIを持っていて、従ってWeb Beansは自動的にはマネージャ"
 "をバインドすることができません。マネージャをJNDIにバインドするために、あなた"
@@ -265,10 +258,10 @@
 #. Tag: para
 #, no-c-format
 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."
+"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."
 msgstr ""
 
 #. Tag: para
@@ -283,9 +276,16 @@
 "literal> で利用できるでしょう。"
 
 #. Tag: para
-#, no-c-format
-msgid "Weld does not currently support Servlet injection in Jetty."
+#, fuzzy, no-c-format
+msgid ""
+"Weld also supports Servlet injection in Jetty 6. To enable this, add the "
+"file <literal>META-INF/jetty-web.xml</literal> with the following content to "
+"your war:"
 msgstr ""
+"Web Beansは、Tomcatへのサーブレットインジェクションもサポートします。これを有"
+"効化するために、 <literal>$TOMCAT_HOME/lib</literal> に <literal>webbeans-"
+"tomcat-support.jar</literal> を置いて、 <literal>META-INF/context.xml</"
+"literal> に下記を追加します。"
 
 #. Tag: title
 #, no-c-format
@@ -295,13 +295,13 @@
 #. Tag: para
 #, fuzzy, no-c-format
 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."
+"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."
 msgstr ""
 "エンタープライズJavaスタックの向上した統合から離れて、Web Beansは最先端のタイ"
 "プセーフ、ステートフルな依存性注入フレームワークも提供します。これは広い範囲"
@@ -402,7 +402,7 @@
 
 #. Tag: para
 #, fuzzy, no-c-format
-msgid "Here's an example of a simple CDI SE application:"
+msgid "Here&#39;s an example of a simple CDI SE application:"
 msgstr "ここに簡単なWeb Beans SEアプリケーションのサンプルがあります。"
 
 #. Tag: title
@@ -425,9 +425,9 @@
 #. Tag: para
 #, no-c-format
 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 "
+"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."
@@ -452,15 +452,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's beans and events. The API consists of two "
-"classes: <literal>Weld</literal> and <literal>WeldContainer</literal>."
+"references to your application&#39;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's an example application main method which uses this API to initialize "
-"a bean of type <literal>MyApplicationBean</literal>."
+"Here&#39;s an example application main method which uses this API to "
+"initialize a bean of type <literal>MyApplicationBean</literal>."
 msgstr ""
 
 #. Tag: para
@@ -493,10 +493,10 @@
 #, no-c-format
 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."
+"<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."
 msgstr ""
 
 #. Tag: para
@@ -517,10 +517,10 @@
 #. Tag: para
 #, no-c-format
 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."
+"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."
 msgstr ""
 
 #, fuzzy

Modified: doc/trunk/reference/ja-JP/events.po
===================================================================
--- doc/trunk/reference/ja-JP/events.po	2010-04-29 23:54:14 UTC (rev 6205)
+++ doc/trunk/reference/ja-JP/events.po	2010-05-01 15:04:10 UTC (rev 6206)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: master.xml\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-03-02T13:07:17\n"
+"POT-Creation-Date: 2010-05-01T13:53:42\n"
 "PO-Revision-Date: 2009-04-30 23:50+0900\n"
 "Last-Translator: Fusayuki Minamoto <miki.htmnet at nifty.com>\n"
 "Language-Team: none\n"
@@ -45,10 +45,10 @@
 "プロデューサから完全に分離されています。"
 
 #. Tag: para
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"observers can specify a combination of \"selectors\" to narrow the set of "
-"event notifications they will receive, and"
+"observers can specify a combination of &#34;selectors&#34; to narrow the set "
+"of event notifications they will receive, and"
 msgstr ""
 "オブザーバは \"セレクタ\"の組み合わせを指定することで、受信するイベント通知の"
 "集まりを狭めることが可能です"
@@ -66,7 +66,7 @@
 #, no-c-format
 msgid ""
 "The CDI event notification facility uses more or less the same typesafe "
-"approach that we've already seen with the dependency injection service."
+"approach that we&#39;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's an example:"
+"<literal>@Qualifier</literal>. Here&#39;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's only interested in events which have those "
+"does specify qualifiers, it&#39;s only interested in events which have those "
 "qualifiers."
 msgstr ""
 "オブザーバメソッドはイベントバインディングを指定する必要はありません&#151; こ"
@@ -248,8 +248,8 @@
 #. Tag: para
 #, no-c-format
 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 "
+"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>."
@@ -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'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&#39;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/ja-JP/example.po
===================================================================
--- doc/trunk/reference/ja-JP/example.po	2010-04-29 23:54:14 UTC (rev 6205)
+++ doc/trunk/reference/ja-JP/example.po	2010-05-01 15:04:10 UTC (rev 6206)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: master.xml\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-03-02T13:07:17\n"
+"POT-Creation-Date: 2010-05-01T13:53:42\n"
 "PO-Revision-Date: 2009-06-09 03:51+0900\n"
 "Last-Translator: Shinobu NOGAMI <s-nogami at sourceforge.jp>\n"
 "Language-Team: none\n"
@@ -21,11 +21,11 @@
 #. Tag: para
 #, fuzzy, no-c-format
 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:"
+"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:"
 msgstr ""
 "完全な例でこの考えを説明しましょう。JSF を 使用するアプリケーションとしてユー"
 "ザのログイン / ログアウトを実装します。まず最初に、ログインしている間にユーザ"
@@ -45,7 +45,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"(Note that we're also going to need a <literal>persistence.xml</literal> "
+"(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>.)"
 msgstr ""
@@ -92,7 +92,7 @@
 #, fuzzy, no-c-format
 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."
+"the next chapter, we&#39;ll explore dependency injection in greater depth."
 msgstr ""
 "うまくいけば、このサンプルから Web Bean プログラミングモデルの感触をつかむこ"
 "とができます。次の章では、 Web Beans の依存性注入 (dependency injection) をよ"

Modified: doc/trunk/reference/ja-JP/extend.po
===================================================================
--- doc/trunk/reference/ja-JP/extend.po	2010-04-29 23:54:14 UTC (rev 6205)
+++ doc/trunk/reference/ja-JP/extend.po	2010-05-01 15:04:10 UTC (rev 6206)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: master.xml\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-03-02T13:07:17\n"
+"POT-Creation-Date: 2010-05-01T13:53:42\n"
 "PO-Revision-Date: 2009-04-27 12:26+0900\n"
 "Last-Translator: wadahiro <wadahiro 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's needed to satisfy the requirements of Java SE's "
-"service provider architecture."
+"define any methods, but it&#39;s needed to satisfy the requirements of Java "
+"SE&#39;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's metamodel and more. Here's a very simple "
-"example:"
+"permitted to modify the container&#39;s metamodel and more. Here&#39;s a "
+"very simple example:"
 msgstr ""
 
 #. Tag: para
@@ -222,7 +222,7 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"Let's study some of the interfaces exposed by the <literal>BeanManager</"
+"Let&#39;s study some of the interfaces exposed by the <literal>BeanManager</"
 "literal>."
 msgstr ""
 "Web Beansを拡張するための中枢部は<literal>Manager</literal>オブジェクトです。"
@@ -279,7 +279,8 @@
 
 #. Tag: para
 #, no-c-format
-msgid "There's an easy way to find out what beans exist in the application:"
+msgid ""
+"There&#39;s an easy way to find out what beans exist in the application:"
 msgstr ""
 
 #. Tag: para
@@ -315,9 +316,9 @@
 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."
+"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."
 msgstr ""
 
 #. Tag: para
@@ -343,8 +344,8 @@
 #. Tag: para
 #, no-c-format
 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 "
+"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 "
@@ -354,7 +355,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Here's a second example, which adds the <literal>@Alternative</literal> "
+"Here&#39;s a second example, which adds the <literal>@Alternative</literal> "
 "annotation to any class which implements a certain <literal>Service</"
 "literal> interface."
 msgstr ""
@@ -385,12 +386,12 @@
 #. Tag: para
 #, no-c-format
 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 "
+"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:"
 msgstr ""
 
@@ -405,9 +406,9 @@
 #. Tag: para
 #, no-c-format
 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."
+"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."
 msgstr ""
 
 #. Tag: title

Modified: doc/trunk/reference/ja-JP/extensions.po
===================================================================
--- doc/trunk/reference/ja-JP/extensions.po	2010-04-29 23:54:14 UTC (rev 6205)
+++ doc/trunk/reference/ja-JP/extensions.po	2010-05-01 15:04:10 UTC (rev 6206)
@@ -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-03-02T13:07:17\n"
+"POT-Creation-Date: 2010-05-01T13:53:42\n"
 "PO-Revision-Date: 2009-05-22 22:46+0900\n"
 "Last-Translator: TANABE Junnichi <jun at lmns.biz>\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's no need to "
-"include sl4j as it's already included (and used internally)."
+"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)."
 msgstr ""
 "もしあなたがJSR-299実装としてWeb Beansを利用しているのであれば、すでにインク"
 "ルード済みなので、 <literal>webbeans-logging.jar</literal> をインクルードする"

Modified: doc/trunk/reference/ja-JP/gettingstarted.po
===================================================================
--- doc/trunk/reference/ja-JP/gettingstarted.po	2010-04-29 23:54:14 UTC (rev 6205)
+++ doc/trunk/reference/ja-JP/gettingstarted.po	2010-05-01 15:04:10 UTC (rev 6206)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: master.xml \n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-03-02T13:07:17\n"
+"POT-Creation-Date: 2010-05-01T13:53:42\n"
 "PO-Revision-Date: 2008-12-19 20:26+0000\n"
 "Last-Translator: Automatically generated\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'll need the "
+"To run the examples with the provided build scripts, you&#39;ll need the "
 "following:"
 msgstr ""
 
@@ -96,7 +96,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"You'll need a full install of Ant 1.7.0. Some linux distributions only "
+"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."
 msgstr ""
@@ -104,7 +104,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"In the next few sections, you'll be using the Ant command (<literal>ant</"
+"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 "
@@ -123,7 +123,7 @@
 #, no-c-format
 msgid ""
 "The sections below cover the steps for deploying with both Ant and Maven in "
-"detail. Let's start with JBoss AS."
+"detail. Let&#39;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'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!"
+"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!"
 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'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>."
+"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>."
 msgstr ""
 
 #. Tag: para
@@ -168,7 +168,7 @@
 
 #. Tag: para
 #, fuzzy, no-c-format
-msgid "You're now ready to deploy your first example!"
+msgid "You&#39;re now ready to deploy your first example!"
 msgstr "これで、最初のサンプルをデプロイする用意ができました。"
 
 #. Tag: para
@@ -181,8 +181,8 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"If you haven't already, start JBoss AS. You can either start JBoss AS from a "
-"Linux shell:"
+"If you haven&#39;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's a topic for a later chapter."
+"modules, but that&#39;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'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&#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."
 msgstr ""
 "ここでは、コンテキストパスを親切なurl (<ulink url=\"http://localhost:8080/"
 "webbeans-translator\">http://localhost:8080/webbeans-translator</ulink>) に設"
@@ -299,21 +299,21 @@
 #. Tag: para
 #, no-c-format
 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."
+"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."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
 msgid ""
-"To deploy the examples to GlassFish, you'll need the final <ulink url="
+"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'll "
-"need to first make the script executable."
+"After the download is complete, execute the installer. On Linux/Unix, "
+"you&#39;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'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&#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)."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
 msgid ""
-"If you've deployed either of the starter examples, <literal>weld-"
+"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."
@@ -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's "
+"<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's <literal>ear/target</literal> directory. All you "
-"need to do now is deploy them to GlassFish."
+"ends up in the example&#39;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 \"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."
+"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."
 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't get enterprise features such as session beans and "
-"container-managed transactions.)"
+"container. (But you don&#39;t get enterprise features such as session beans "
+"and container-managed transactions.)"
 msgstr ""
 
 #. Tag: para
 #, fuzzy, no-c-format
 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."
+"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."
 msgstr ""
 "Tomcat 6.0.18 以降を <ulink url=\"http://tomcat.apache.org/download-60.cgi"
 "\">tomcat.apache.org</ulink> からダウンロードして展開する必要があります。例:"
@@ -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't require that you have Maven installed, so we'll start "
-"there. If you want to use Maven, you can just skip ahead."
+"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."
 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'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&#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>."
 msgstr ""
 
 #. Tag: para
 #, fuzzy, no-c-format
-msgid "Now you're ready to deploy the numberguess example to Tomcat!"
+msgid "Now you&#39;re ready to deploy the numberguess example to Tomcat!"
 msgstr "Tomcat への 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 \"tomcat.\"."
+"same target names used for JBoss AS, prefixed with &#34;tomcat.&#34;."
 msgstr ""
 
 #. Tag: para
@@ -502,7 +502,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"If you haven't already, start Tomcat. You can either start Tomcat from a "
+"If you haven&#39;t already, start Tomcat. You can either start Tomcat from a "
 "Linux shell:"
 msgstr ""
 
@@ -525,15 +525,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'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."
+"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."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
 msgid ""
-"The Maven plugin communicates with Tomcat over HTTP, so it doesn't care "
+"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</"
@@ -591,7 +591,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's <literal>readme.txt</"
+"the example, which are documented in the example&#39;s <literal>readme.txt</"
 "literal> file."
 msgstr ""
 
@@ -613,10 +613,10 @@
 #. Tag: para
 #, no-c-format
 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."
+"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."
 msgstr ""
 
 #. Tag: para
@@ -625,7 +625,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't need anything else installed except to have the Maven command "
+"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."
 msgstr ""
@@ -697,9 +697,9 @@
 #, no-c-format
 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 "
+"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."

Modified: doc/trunk/reference/ja-JP/injection.po
===================================================================
--- doc/trunk/reference/ja-JP/injection.po	2010-04-29 23:54:14 UTC (rev 6205)
+++ doc/trunk/reference/ja-JP/injection.po	2010-05-01 15:04:10 UTC (rev 6206)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: master.xml\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-04-14T10:16:01\n"
+"POT-Creation-Date: 2010-05-01T14:44:09\n"
 "PO-Revision-Date: 2009-06-02 01:32+0900\n"
 "Last-Translator: Daisuke Sano <d-sano at nri.co.jp>\n"
 "Language-Team: none\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't rely on it)."
+"not portable, don&#39;t rely on it)."
 msgstr ""
 "次に、Web Beanマネージャは、Web Beanの、すべての初期化メソッドを実行する"
 
@@ -146,7 +146,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'll meet in <xref linkend=\"events\" />) and "
+"observer methods (which we&#39;ll meet in <xref linkend=\"events\" />) and "
 "disposer methods."
 msgstr ""
 
@@ -161,9 +161,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'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 "
+"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."
 msgstr ""
 "Web Beansの仕様では、<emphasis>タイプセーフ解決アルゴリズム</emphasis>が定義"
@@ -213,17 +213,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's "
-"the simplest possible scenario. When you first start your application, "
-"you'll likely have lots of those."
+"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."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
 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."
+"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."
 msgstr ""
 
 #. Tag: title
@@ -298,12 +298,12 @@
 #. Tag: para
 #, no-c-format
 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>!"
+"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>!"
 msgstr ""
 
 #. Tag: title
@@ -320,11 +320,12 @@
 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."
+"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."
 msgstr ""
 
 #. Tag: para
@@ -414,7 +415,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's the bean that will be injected."
+"alternative, that&#39;s the bean that will be injected."
 msgstr ""
 
 #. Tag: title
@@ -439,8 +440,8 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"During the course of your development, you're going to encounter this "
-"situation. Let's learn how to resolve it."
+"During the course of your development, you&#39;re going to encounter this "
+"situation. Let&#39;s learn how to resolve it."
 msgstr ""
 
 #. Tag: para
@@ -514,7 +515,7 @@
 
 #. Tag: para
 #, no-c-format
-msgid "Just remember: \"There can be only one.\""
+msgid "Just remember: &#34;There can be only one.&#34;"
 msgstr ""
 
 #. Tag: para
@@ -522,14 +523,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'll see in <xref linkend=\"lookup\" />."
+"<literal>Instance</literal>, as we&#39;ll see in <xref linkend=\"lookup\" />."
 msgstr ""
 
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"Now there's one more issue you need to be aware of when using the dependency "
-"injection service."
+"Now there&#39;s one more issue you need to be aware of when using the "
+"dependency injection service."
 msgstr ""
 "Web Beansにおける依存性注入を行う際に気をつけるべきことが、もう少しあります。"
 
@@ -622,7 +623,8 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"classes which don't have a non-private constructor with no parameters, and"
+"classes which don&#39;t have a non-private constructor with no parameters, "
+"and"
 msgstr "プライベートでなく、引数を持たないコンストラクタを持たないクラス"
 
 #. Tag: para
@@ -642,7 +644,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"It's usually very easy to fix an unproxyable dependency problem. If an "
+"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:"
 msgstr ""
@@ -655,7 +657,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"change the type of the injection point to <literal>Instance&lt;X&gt;</"
+"change the type of the injection point to <literal>Instance&#60;X&#62;</"
 "literal>,"
 msgstr ""
 
@@ -696,7 +698,7 @@
 
 #. Tag: para
 #, no-c-format
-msgid "But we didn't get around to implementing this yet."
+msgid "But we didn&#39;t get around to implementing this yet."
 msgstr ""
 
 #. Tag: title
@@ -788,10 +790,11 @@
 #, no-c-format
 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>."
+"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>."
 msgstr ""
 
 #. Tag: para
@@ -802,7 +805,8 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"We can't use an anonymous class to implement a qualifier type with members."
+"We can&#39;t use an anonymous class to implement a qualifier type with "
+"members."
 msgstr ""
 
 #. Tag: para
@@ -868,10 +872,10 @@
 "注入箇所に関するメタデータにアクセスする可能性があります。"
 
 #. Tag: para
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"Let's look at an example. The following code is verbose, and vulnerable to "
-"refactoring problems:"
+"Let&#39;s look at an example. The following code is verbose, and vulnerable "
+"to refactoring problems:"
 msgstr ""
 "例を見てみましょう。次のコードは、煩雑なうえに、リファクタリングしにくいコー"
 "ドです。"
@@ -893,8 +897,8 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"Not convinced? Then here's a second example. To inject HTTP parameters, we "
-"need to define a qualifier type:"
+"Not convinced? Then here&#39;s a second example. To inject HTTP parameters, "
+"we need to define a qualifier type:"
 msgstr ""
 "納得できませんか?もう一つの例を見てみましょう。HTTPパラメタを注入するために"
 "は、バインディングタイプを定義する必要があります。"

Modified: doc/trunk/reference/ja-JP/interceptors.po
===================================================================
--- doc/trunk/reference/ja-JP/interceptors.po	2010-04-29 23:54:14 UTC (rev 6205)
+++ doc/trunk/reference/ja-JP/interceptors.po	2010-05-01 15:04:10 UTC (rev 6206)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: master.xml\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-03-02T13:07:17\n"
+"POT-Creation-Date: 2010-05-01T13:53:43\n"
 "PO-Revision-Date: 2009-04-30 23:14+0900\n"
 "Last-Translator: Fusayuki Minamoto <miki.htmnet at nifty.com>\n"
 "Language-Team: none\n"
@@ -95,7 +95,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're interested in:"
+"specify exactly which beans we&#39;re interested in:"
 msgstr ""
 "Web Beansをトランザクション型として宣言したいと仮定します。最初に必要なこと"
 "は、次のような、興味のあるWeb Beansを正確に指定するための <emphasis>インタセ"
@@ -125,9 +125,9 @@
 #. Tag: para
 #, fuzzy, no-c-format
 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 "
+"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>."
 msgstr ""
 "それは素晴らしいことではありますが、どこかでこのトランザクション管理アスペク"

Modified: doc/trunk/reference/ja-JP/intro.po
===================================================================
--- doc/trunk/reference/ja-JP/intro.po	2010-04-29 23:54:14 UTC (rev 6205)
+++ doc/trunk/reference/ja-JP/intro.po	2010-05-01 15:04:10 UTC (rev 6206)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: master.xml\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-03-02T13:07:18\n"
+"POT-Creation-Date: 2010-05-01T13:53:43\n"
 "PO-Revision-Date: 2009-06-09 03:50+0900\n"
 "Last-Translator: Shinobu NOGAMI <s-nogami at sourceforge.jp>\n"
 "Language-Team: none\n"
@@ -21,11 +21,11 @@
 #. Tag: para
 #, fuzzy, no-c-format
 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!"
+"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!"
 msgstr ""
 "あなたは、すでに最初の Web Bean を書き始めることに夢中ですか。あるいは、たぶ"
 "ん Web Beans 仕様によって、どのような種類のフープを跳ぶことができるのかを不思"
@@ -49,13 +49,14 @@
 #. Tag: para
 #, no-c-format
 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."
+"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."
 msgstr ""
 
 #. Tag: para
@@ -67,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's a uniform concept of a bean and a "
-"lightweight component model that's aligned across the Java EE platform."
+"<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."
 msgstr ""
 
 #. Tag: para
@@ -77,30 +78,31 @@
 "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>."
+"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>."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
 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."
+"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."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Now let's see how to create your first bean that actually uses CDI."
+msgid "Now let&#39;s see how to create your first bean that actually uses CDI."
 msgstr ""
 
 #. Tag: title
@@ -111,7 +113,7 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"Suppose that we have two existing Java classes that we've been using for "
+"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:"
 msgstr ""
@@ -136,8 +138,8 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"Unfortunately, we don't have a class that translates whole text documents. "
-"So let's write a bean for this job:"
+"Unfortunately, we don&#39;t have a class that translates whole text "
+"documents. So let&#39;s write a bean for this job:"
 msgstr ""
 "運悪く、すべてのテキストドキュメントを翻訳する既存のクラスはありません。そこ"
 "でこの仕事をする Web Bean を書きましょう:"
@@ -159,11 +161,11 @@
 #. Tag: para
 #, fuzzy, no-c-format
 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."
+"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."
 msgstr ""
 "あなたが推測しているように、 <literal>@Initializer</literal> ノテーションは依"
 "存性注入と関係があります。<literal>@Initializer</literal> は、Web Bean のコン"
@@ -185,7 +187,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Let's create a UI controller bean that uses field injection to obtain an "
+"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:"
 msgstr ""
@@ -199,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'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&#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."
 msgstr ""
 
 #. Tag: para
@@ -218,11 +220,11 @@
 #. Tag: para
 #, no-c-format
 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."
+"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."
 msgstr ""
 
 #. Tag: para
@@ -248,10 +250,10 @@
 #. Tag: para
 #, no-c-format
 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."
+"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."
 msgstr ""
 
 #, fuzzy

Modified: doc/trunk/reference/ja-JP/master.po
===================================================================
--- doc/trunk/reference/ja-JP/master.po	2010-04-29 23:54:14 UTC (rev 6205)
+++ doc/trunk/reference/ja-JP/master.po	2010-05-01 15:04:10 UTC (rev 6206)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: master.xml \n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-03-02T13:07:18\n"
+"POT-Creation-Date: 2010-05-01T13:53:43\n"
 "PO-Revision-Date: 2008-12-19 20:26+0000\n"
 "Last-Translator: Automatically generated\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 \"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."
+"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."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
 msgid ""
-"You'll also find that some of the functionality that once existed in the "
+"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."
@@ -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'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&#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."
 msgstr ""
 
 #. Tag: title

Modified: doc/trunk/reference/ja-JP/next.po
===================================================================
--- doc/trunk/reference/ja-JP/next.po	2010-04-29 23:54:14 UTC (rev 6205)
+++ doc/trunk/reference/ja-JP/next.po	2010-05-01 15:04:10 UTC (rev 6206)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: master.xml\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-03-02T13:07:18\n"
+"POT-Creation-Date: 2010-05-01T13:53:43\n"
 "PO-Revision-Date: 2009-04-19 02:20+0900\n"
 "Last-Translator: wadahiro <wadahiro at gmail.com>\n"
 "Language-Team: none\n"
@@ -21,13 +21,13 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Because CDI is so new, there's not yet a lot of information available "
+"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'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."
+"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."
 msgstr ""
 
 # substantiallyってどう訳す
@@ -38,8 +38,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's "
-"probably the best source of information about the future of CDI, Weld and "
+"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."
 msgstr ""
 "Web Beansの参照実装は、<literal>http://seamframework.org/WebBeans</literal>で"
@@ -76,8 +76,8 @@
 #, no-c-format
 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)."
+"remove the &#34;<literal>-SNAPSHOT</literal>&#34; from the version element "
+"(so you don&#39;t have to build other Weld modules)."
 msgstr ""
 
 #. Tag: para

Modified: doc/trunk/reference/ja-JP/part1.po
===================================================================
--- doc/trunk/reference/ja-JP/part1.po	2010-04-29 23:54:14 UTC (rev 6205)
+++ doc/trunk/reference/ja-JP/part1.po	2010-05-01 15:04:10 UTC (rev 6206)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: master.xml \n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-03-02T13:07:18\n"
+"POT-Creation-Date: 2010-05-01T13:53:43\n"
 "PO-Revision-Date: 2008-12-19 20:26+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -174,7 +174,7 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"Where should I keep the reference to it when I'm not currently using it?"
+"Where should I keep the reference to it when I&#39;m not currently using it?"
 msgstr ""
 "直接的に使用していないときに、それへのリファレンスはどこに保持すべきですか?"
 
@@ -195,9 +195,9 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"CDI is more than a framework. It's a whole, rich programming model. The "
+"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's study what that phrase means."
+"typing</emphasis>. Let&#39;s study what that phrase means."
 msgstr ""
 
 #. Tag: para
@@ -258,8 +258,8 @@
 #. Tag: para
 #, fuzzy, no-c-format
 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 "
+"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 "
@@ -281,10 +281,10 @@
 #. Tag: para
 #, no-c-format
 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."
+"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."
 msgstr ""
 
 #. Tag: para
@@ -307,8 +307,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't have been any "
-"of these without inspiration from the frameworks mentioned and "
+"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)."
 msgstr ""

Modified: doc/trunk/reference/ja-JP/part3.po
===================================================================
--- doc/trunk/reference/ja-JP/part3.po	2010-04-29 23:54:14 UTC (rev 6205)
+++ doc/trunk/reference/ja-JP/part3.po	2010-05-01 15:04:10 UTC (rev 6206)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: master.xml\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-03-02T13:07:18\n"
+"POT-Creation-Date: 2010-05-01T13:53:43\n"
 "PO-Revision-Date: 2009-07-02 12:31+0900\n"
 "Last-Translator: minamoto <minamoto 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've "
-"already seen three means of achieving loose coupling:"
+"The first major theme of CDI is <emphasis>loose coupling</emphasis>. We&#39;"
+"ve already seen three means of achieving loose coupling:"
 msgstr ""
 
 #. Tag: para
@@ -101,10 +101,10 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"You don't see string-based identifiers in CDI code, not because the "
+"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 "
-"\"configuration by convention\"—but because there are simply no strings "
-"there to begin with!"
+"&#34;configuration by convention&#34;—but because there are simply no "
+"strings there to begin with!"
 msgstr ""
 "Web Beans コードでストリングベースの識別子を認知しません。上手なデフォルティ"
 "ングを使うことで、&#151;いわゆる\"規則による構成\"&#151;を除外します。フレー"
@@ -211,11 +211,11 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"We're now ready to meet some more advanced features of CDI. Bear in mind "
+"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't ever really <emphasis>need</"
-"emphasis> to use these features, but if you use them wisely, you'll come to "
-"appreciate their power."
+"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."
 msgstr ""
 "現在、もう既に Web Beans のいくつかの先進機能に会う準備が整っています。これら"
 "の特徴がコードを妥当性を検査するのがより簡単で、より理解できるようにするため"

Modified: doc/trunk/reference/ja-JP/part4.po
===================================================================
--- doc/trunk/reference/ja-JP/part4.po	2010-04-29 23:54:14 UTC (rev 6205)
+++ doc/trunk/reference/ja-JP/part4.po	2010-05-01 15:04:10 UTC (rev 6206)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: master.xml\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-03-02T13:07:18\n"
+"POT-Creation-Date: 2010-05-01T13:53:43\n"
 "PO-Revision-Date: 2009-04-25 00:28+0900\n"
 "Last-Translator: tagawaman <karlgotch1924.2007 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'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."
+"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."
 msgstr ""
 
 #. Tag: para
@@ -52,12 +52,12 @@
 #. Tag: para
 #, fuzzy, no-c-format
 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."
+"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."
 msgstr ""
 "我々は、Web Beansを使うアプリケーションで、Java EEプラットフォームを最大限に"
 "活用する方法を、今まさに知ろうとしています。我々はまた、Web Beansへ持ち運び可"

Modified: doc/trunk/reference/ja-JP/producermethods.po
===================================================================
--- doc/trunk/reference/ja-JP/producermethods.po	2010-04-29 23:54:14 UTC (rev 6205)
+++ doc/trunk/reference/ja-JP/producermethods.po	2010-05-01 15:04:10 UTC (rev 6206)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: master.xml\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-03-02T13:07:18\n"
+"POT-Creation-Date: 2010-05-01T13:53:43\n"
 "PO-Revision-Date: 2009-06-23 23:39+0900\n"
 "Last-Translator: TANABE Junnichi <jun at lmns.biz>\n"
 "Language-Team: none\n"
@@ -24,7 +24,7 @@
 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 "
+"objects. They&#39;re also the easiest way to integrate objects which are not "
 "beans into the CDI environment."
 msgstr ""
 "Web Beanマネージャがアプリケーションの代わりにオブジェクトのインスタンス化に"
@@ -99,9 +99,9 @@
 #, fuzzy, no-c-format
 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:"
+"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:"
 msgstr ""
 "特に、プロデューサメソッドによってWeb Beanを利用した実行時ポリモフィズムを利"
 "用できるようになります。見てきたように、デプロイメントタイプはデプロイメント"
@@ -159,11 +159,11 @@
 "literal>アノテーションを追記することができます。"
 
 #. Tag: para
-#, no-c-format
+#, fuzzy, 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't be called again in the same session."
+"producer method won&#39;t be called again in the same session."
 msgstr ""
 "今度プロデューサメソッドが呼び出されると、戻された<literal>PaymentStrategy</"
 "literal>はセッションコンテキストに属することになります。プロデューサメソッド"
@@ -187,13 +187,13 @@
 msgstr "プロデューサメソッドへのインジェクション"
 
 #. Tag: para
-#, no-c-format
+#, fuzzy, no-c-format
 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."
+"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."
 msgstr ""
 "上のコードには1つの潜在的な問題があります。"
 "<literal>CreditCardPaymentStrategy</literal>の実装はJavaの<literal>new</"
@@ -204,7 +204,7 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"If this isn't what we want, we can use dependency injection into the "
+"If this isn&#39;t what we want, we can use dependency injection into the "
 "producer method to obtain bean instances:"
 msgstr ""
 "これが望むことでないのであれば、私たちはWeb Beanインスタンスを取得するために"
@@ -214,13 +214,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 \"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!"
+"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!"
 msgstr ""
 "待って!もし<literal>CreditCardPaymentStrategy</literal>がリクエストスコープ"
 "のWeb Beanだとしたら?その場合、プロデューサメソッドは現在のリクエストスコー"
@@ -234,7 +234,7 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"There's at least three ways we could go about fixing this bug. We could "
+"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 "
@@ -266,12 +266,12 @@
 msgstr "以下のプロデューサメソッドを見てみましょう。"
 
 #. Tag: para
-#, no-c-format
+#, fuzzy, 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't be destroyed until 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."
 msgstr ""

Modified: doc/trunk/reference/ja-JP/resources.po
===================================================================
--- doc/trunk/reference/ja-JP/resources.po	2010-04-29 23:54:14 UTC (rev 6205)
+++ doc/trunk/reference/ja-JP/resources.po	2010-05-01 15:04:10 UTC (rev 6206)
@@ -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-03-02T13:07:18\n"
+"POT-Creation-Date: 2010-05-01T13:53:43\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 "
-"\"mapped name\"). Producer fields turned out to be an elegant adaptor to "
+"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."
 msgstr ""
@@ -127,10 +127,10 @@
 #. Tag: para
 #, no-c-format
 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>."
+"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>."
 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're going to be using resources like the "
-"<literal>EntityManager</literal> in several different beans. Isn't it nicer "
-"and more typesafe to write"
+"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"
 msgstr ""
 
 #. Tag: para

Modified: doc/trunk/reference/ja-JP/ri-spi.po
===================================================================
--- doc/trunk/reference/ja-JP/ri-spi.po	2010-04-29 23:54:14 UTC (rev 6205)
+++ doc/trunk/reference/ja-JP/ri-spi.po	2010-05-01 15:04:10 UTC (rev 6206)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: master.xml\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-03-02T13:07:18\n"
+"POT-Creation-Date: 2010-05-01T13:53:43\n"
 "PO-Revision-Date: 2009-05-18 01:40+0900\n"
 "Last-Translator: wadahiro <wadahiro 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 \"Weld: "
-"Servlets\" extension will be sufficient, and will work in any container "
+"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."
 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't "
-"require transaction, EJB or JPA services). By default an EE environment is "
+"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>."
 msgstr ""
@@ -177,7 +177,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, 'virtual' <literal>BeanDeploymentArchive</literal>."
+"single, &#39;virtual&#39; <literal>BeanDeploymentArchive</literal>."
 msgstr ""
 
 #. Tag: para
@@ -192,7 +192,7 @@
 #, no-c-format
 msgid ""
 "<literal>BeanDeploymentArchive</literal> provides three methods which allow "
-"it's contents to be discovered by Weld—<literal>BeanDeploymentArchive."
+"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."
@@ -221,7 +221,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's "
+"loaded by another in BDA Y, it is accessible, and therefore BDA Y&#39;s "
 "accessible BDAs should include BDA X."
 msgstr ""
 
@@ -257,7 +257,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Weld delegates EJB 3 bean discovery to the container so that it doesn't "
+"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."
 msgstr ""
@@ -328,7 +328,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't need!"
+"to implement those services you don&#39;t need!"
 msgstr ""
 
 #. Tag: title
@@ -597,9 +597,9 @@
 #, fuzzy, no-c-format
 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."
+"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."
 msgstr ""
 "Web Beansは、アプリケーションサーバーかその他のコンテナが、アプリケーションコ"
 "ンテキストのための保存領域を提供することを想定しています。<literal>org.jboss."

Modified: doc/trunk/reference/ja-JP/scopescontexts.po
===================================================================
--- doc/trunk/reference/ja-JP/scopescontexts.po	2010-04-29 23:54:14 UTC (rev 6205)
+++ doc/trunk/reference/ja-JP/scopescontexts.po	2010-05-01 15:04:10 UTC (rev 6206)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: master.xml\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-03-02T13:07:18\n"
+"POT-Creation-Date: 2010-05-01T13:53:43\n"
 "PO-Revision-Date: 2009-06-04 00:47+0900\n"
 "Last-Translator: Daisuke Sano <d-sano at nri.co.jp>\n"
 "Language-Team: none\n"
@@ -21,7 +21,7 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"So far, we've seen a few examples of <emphasis>scope type annotations</"
+"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:"
@@ -68,13 +68,13 @@
 #. Tag: para
 #, no-c-format
 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>."
+"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>."
 msgstr ""
 
 #. Tag: title
@@ -85,8 +85,8 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"CDI features an <emphasis>extensible context model</emphasis>. It's possible "
-"to define new scopes by creating a new scope type annotation:"
+"CDI features an <emphasis>extensible context model</emphasis>. It&#39;s "
+"possible to define new scopes by creating a new scope type annotation:"
 msgstr ""
 "Web Beansでは、<emphasis>拡張コンテキストモデル</emphasis>という特徴をもって"
 "おり、新たなスコープタイプアノテーションを作成することによって、新たなスコー"
@@ -95,7 +95,7 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"Of course, that's the easy part of the job. For this scope type to be "
+"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 "
@@ -118,7 +118,7 @@
 
 #. Tag: para
 #, fuzzy, no-c-format
-msgid "Usually, you'll use one of CDI's built-in scopes."
+msgid "Usually, you&#39;ll use one of CDI&#39;s built-in scopes."
 msgstr "通常、Web Beansの組み込みスコープの中の一つを使います。"
 
 #. Tag: title
@@ -234,10 +234,10 @@
 msgstr ""
 
 #. Tag: para
-#, no-c-format
+#, fuzzy, no-c-format
 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 "
+"EE developer, so let&#39;s not waste time discussing them here. One of the "
 "scopes, however, is new."
 msgstr ""
 "四つの組み込みスコープの内の三つはJava EE開発者にとっては極めて身近なものであ"
@@ -389,7 +389,7 @@
 
 #. Tag: para
 #, no-c-format
-msgid "It's probably better to use one of the link components in JSF 2:"
+msgid "It&#39;s probably better to use one of the link components in JSF 2:"
 msgstr ""
 
 #. Tag: para
@@ -397,8 +397,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 \"flash\" object. The container automatically adds the "
-"conversation id to the redirect URL as a request parameter."
+"constructs such as a &#34;flash&#34; object. The container automatically "
+"adds the conversation id to the redirect URL as a request parameter."
 msgstr ""
 "またWeb Beanマネージャは、対話が長期対話として導入されていないとしても、あら"
 "ゆるリダイレクトをまたがって対話を伝播させる必要があります。これは、よくある"
@@ -467,12 +467,12 @@
 #. Tag: para
 #, no-c-format
 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 "
+"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."
@@ -482,7 +482,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't mind too much if it "
+"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."
@@ -513,7 +513,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"give the client a reference of type <literal>Instance&lt;X&gt;</literal> "
+"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."
 msgstr ""
 
@@ -572,8 +572,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'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&#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 "
@@ -583,8 +583,8 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Beans with scope <literal>@Dependent</literal> don't need a proxy object. "
-"The client holds a direct reference to its instance."
+"Beans with scope <literal>@Dependent</literal> don&#39;t need a proxy "
+"object. The client holds a direct reference to its instance."
 msgstr ""
 
 #. Tag: para
@@ -649,10 +649,10 @@
 "され、注入されます。"
 
 #. Tag: para
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"This feature is particularly useful with producer methods, as we'll see in "
-"the next chapter."
+"This feature is particularly useful with producer methods, as we&#39;ll see "
+"in the next chapter."
 msgstr ""
 "この機能は、特に次章で説明するプロデューサメソッドにおいて効果を発揮します。"
 

Modified: doc/trunk/reference/ja-JP/specialization.po
===================================================================
--- doc/trunk/reference/ja-JP/specialization.po	2010-04-29 23:54:14 UTC (rev 6205)
+++ doc/trunk/reference/ja-JP/specialization.po	2010-05-01 15:04:10 UTC (rev 6206)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: master.xml\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-03-02T13:07:18\n"
+"POT-Creation-Date: 2010-05-01T13:53:43\n"
 "PO-Revision-Date: 2009-06-09 19:23+0900\n"
 "Last-Translator: Keita Higashi <winnie_the_pooh at y3.dion.ne.jp>\n"
 "Language-Team: none\n"
@@ -21,15 +21,15 @@
 #. Tag: para
 #, no-c-format
 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 "
+"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'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&#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."
 msgstr ""
 
 #. Tag: para
@@ -58,10 +58,10 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"The second case is the default assumed by CDI. It's possible to have two "
+"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've learned, you select between the two implementations using "
-"qualifiers."
+"class). As you&#39;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'll start by looking at alternatives and then show the "
+"literal>. We&#39;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't really want to submit payments to "
-"the external system, so we override that implementation of "
+"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:"
 msgstr ""
 "しかし、ステージング環境で、異なる Web Bean で <literal>PaymentProcessor</"
@@ -111,18 +111,19 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"We've already seen how we can enable this alternative by listing its class "
-"in the <literal>beans.xml</literal> descriptor."
+"We&#39;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'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:"
+"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:"
 msgstr ""
 
 #. Tag: para
@@ -163,7 +164,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"So we haven't completely replaced the default implementation in this "
+"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 "
@@ -235,8 +236,8 @@
 #. Tag: para
 #, no-c-format
 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 "
+"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 "

Modified: doc/trunk/reference/ja-JP/stereotypes.po
===================================================================
--- doc/trunk/reference/ja-JP/stereotypes.po	2010-04-29 23:54:14 UTC (rev 6205)
+++ doc/trunk/reference/ja-JP/stereotypes.po	2010-05-01 15:04:10 UTC (rev 6206)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: master.xml\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-03-02T13:07:18\n"
+"POT-Creation-Date: 2010-05-01T13:53:43\n"
 "PO-Revision-Date: 2009-05-21 20:05+0900\n"
 "Last-Translator: Keita Higashi <winnie_the_pooh at y3.dion.ne.jp>\n"
 "Language-Team: none\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't be adding much value."
+"it wouldn&#39;t be adding much value."
 msgstr ""
 
 #. Tag: title
@@ -123,7 +123,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Naturally, overriding a single default isn't much use. But remember, "
+"Naturally, overriding a single default isn&#39;t much use. But remember, "
 "stereotypes can define more than just the default scope."
 msgstr ""
 
@@ -205,8 +205,8 @@
 #, no-c-format
 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 "
+"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."
 msgstr ""
@@ -214,7 +214,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Here's an example that combines the <literal>@Action</literal> and "
+"Here&#39;s an example that combines the <literal>@Action</literal> and "
 "<literal>@Auditable</literal> stereotypes:"
 msgstr ""
 
@@ -226,8 +226,9 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"We've already met two standard stereotypes defined by the CDI specification: "
-"<literal>@Interceptor</literal> and <literal>@Decorator</literal>."
+"We&#39;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/ja-JP/viewlayers.po
===================================================================
--- doc/trunk/reference/ja-JP/viewlayers.po	2010-04-29 23:54:14 UTC (rev 6205)
+++ doc/trunk/reference/ja-JP/viewlayers.po	2010-05-01 15:04:10 UTC (rev 6206)
@@ -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-03-02T13:07:18\n"
+"POT-Creation-Date: 2010-05-01T13:53:43\n"
 "PO-Revision-Date: 2009-05-22 23:05+0900\n"
 "Last-Translator: TANABE Junnichi <jun at lmns.biz>\n"
 "Language-Team: none\n"
@@ -97,10 +97,10 @@
 "Wicketリクエストの開始時に対話コンテキストを設定し、その後それを破棄すること"
 
 #. Tag: para
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"Storing the id of any long-running conversation in Wicket's metadata when "
-"the page response is complete"
+"Storing the id of any long-running conversation in Wicket&#39;s metadata "
+"when the page response is complete"
 msgstr ""
 "ページレスポンスが完了されたときにWicketのメタデータに長期対話のIDを保存する"
 "こと"
@@ -152,9 +152,9 @@
 #, fuzzy, no-c-format
 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 "
+"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."

Modified: doc/trunk/reference/ja-JP/weldexamples.po
===================================================================
--- doc/trunk/reference/ja-JP/weldexamples.po	2010-04-29 23:54:14 UTC (rev 6205)
+++ doc/trunk/reference/ja-JP/weldexamples.po	2010-05-01 15:04:10 UTC (rev 6206)
@@ -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-03-02T13:07:18\n"
+"POT-Creation-Date: 2010-05-01T13:53:43\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'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, "
+"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>."
 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're told whether your guess was too high "
-"or too low."
+"1 and 100. After each attempt, you&#39;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's start by "
+"files and Facelets (JSF) views, packaged as a war module. Let&#39;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'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&#39;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's also an empty <literal>beans.xml</literal> file, which tells the "
+"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."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Finally, there's the familiar <literal>web.xml</literal>:"
+msgid "Finally, there&#39;s the familiar <literal>web.xml</literal>:"
 msgstr ""
 
 #. Tag: para
@@ -105,8 +105,8 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Let's take a look at the main JSF view, <literal>src/main/webapp/home.xhtml</"
-"literal>."
+"Let&#39;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, \"Higher!\", "
-"\"Lower!\" and \"Correct!\""
+"There are a number of messages which can be sent to the user, &#34;Higher!"
+"&#34;, &#34;Lower!&#34; and &#34;Correct!&#34;"
 msgstr ""
 
 #. Tag: para
@@ -138,9 +138,10 @@
 #. Tag: para
 #, no-c-format
 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."
+"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."
 msgstr ""
 
 #. Tag: para
@@ -176,8 +177,8 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"The <literal>Generator</literal> is application scoped, so we don't get a "
-"different random each time."
+"The <literal>Generator</literal> is application scoped, so we don&#39;t get "
+"a different random each time."
 msgstr ""
 
 #. Tag: para
@@ -191,20 +192,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's "
+"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's guess and providing feedback to the user with a "
-"<literal>FacesMessage</literal>. We've used the post-construct lifecycle "
+"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&lt;Integer&gt;</literal> bean."
+"<literal>@Random Instance&#60;Integer&#62;</literal> bean."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
 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})."
+"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})."
 msgstr ""
 
 #. Tag: title
@@ -236,8 +237,9 @@
 #, no-c-format
 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."
+"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."
 msgstr ""
 
 #. Tag: para
@@ -246,8 +248,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't need to access this interface, but Weld makes use "
-"of it."
+"name. You generally don&#39;t need to access this interface, but Weld makes "
+"use of it."
 msgstr ""
 
 #. Tag: title
@@ -260,7 +262,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'll "
+"components and leverage the conversation context. In this section, we&#39;ll "
 "walk you through the Wicket version of the numberguess example."
 msgstr ""
 
@@ -269,7 +271,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't already familiar with the framework."
+"section, if you aren&#39;t already familiar with the framework."
 msgstr ""
 
 #. Tag: para
@@ -278,17 +280,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've seen already that Jetty is perfectly capable of running CDI "
+"You&#39;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'll also be using the Eclipse IDE in these examples. Instructions are "
+"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'll likely need to do more than just deploy examples, we'll get setup in "
-"this full development environment."
+"you&#39;ll likely need to do more than just deploy examples, we&#39;ll get "
+"setup in this full development environment."
 msgstr ""
 
 #. Tag: title
@@ -311,7 +313,7 @@
 #, no-c-format
 msgid ""
 "If you have m2eclipse installed, you can open any Maven project directly. "
-"From within Eclipse, select <emphasis>File -&gt; Import... -&gt; Maven "
+"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."
@@ -327,24 +329,24 @@
 #. Tag: para
 #, no-c-format
 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!"
+"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!"
 msgstr ""
 
 #. Tag: para
 #, no-c-format
 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 "
+"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."
 msgstr ""
@@ -361,15 +363,15 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Then, from Eclipse, choose <emphasis>File -&gt; Import... -&gt; General -"
-"&gt; Existing Projects into Workspace</emphasis>, select the root directory "
+"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>."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "It's time to get the example running!"
+msgid "It&#39;s time to get the example running!"
 msgstr ""
 
 #. Tag: title
@@ -428,7 +430,7 @@
 
 #. Tag: para
 #, no-c-format
-msgid "Enough toying with deployment, let's dive into the code."
+msgid "Enough toying with deployment, let&#39;s dive into the code."
 msgstr ""
 
 #. Tag: title
@@ -460,7 +462,7 @@
 
 #. Tag: para
 #, no-c-format
-msgid "Here's where things differ from the JSF numberguess example:"
+msgid "Here&#39;s where things differ from the JSF numberguess example:"
 msgstr ""
 
 #. Tag: para
@@ -583,8 +585,8 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Let's have a look at the significant code and configuration files that make "
-"up this example."
+"Let&#39;s have a look at the significant code and configuration files that "
+"make up this example."
 msgstr ""
 
 #. Tag: para
@@ -598,8 +600,8 @@
 #. Tag: para
 #, no-c-format
 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 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:"
 msgstr ""
 
@@ -607,14 +609,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 'session'."
+"of a Swing application typically represents a single &#39;session&#39;."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
 msgid ""
-"Notice that the bean is not named, since it doesn't need to be accessed via "
-"EL."
+"Notice that the bean is not named, since it doesn&#39;t need to be accessed "
+"via EL."
 msgstr ""
 
 #. Tag: para
@@ -655,9 +657,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'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&#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."
 msgstr ""
 
 #. Tag: para
@@ -665,8 +667,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'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&#39;"
+"s next guess and the response to the previous guess. The code for "
 "<literal>MessageGenerator</literal> is as follows:"
 msgstr ""
 
@@ -679,7 +681,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"The <literal>Game</literal>'s state is interrogated to determine the "
+"The <literal>Game</literal>&#39;s state is interrogated to determine the "
 "appropriate challenge message ..."
 msgstr ""
 
@@ -724,8 +726,8 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"<literal>guessButtonActionPerformed</literal> is called when the 'Guess' "
-"button is clicked, and it does the following:"
+"<literal>guessButtonActionPerformed</literal> is called when the &#39;"
+"Guess&#39; button is clicked, and it does the following:"
 msgstr ""
 
 #. Tag: para
@@ -738,8 +740,8 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Calls <literal>game.check()</literal> to validate and perform one 'turn' of "
-"the game"
+"Calls <literal>game.check()</literal> to validate and perform one &#39;"
+"turn&#39; of the game"
 msgstr ""
 
 #. Tag: para
@@ -778,7 +780,7 @@
 #, no-c-format
 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."
+"it&#39;s structure is more complex than the numberguess example."
 msgstr ""
 
 #. Tag: para
@@ -792,9 +794,10 @@
 #. Tag: para
 #, no-c-format
 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:"
+"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:"
 msgstr ""
 
 #. Tag: para
@@ -808,18 +811,18 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"If you weren't using Maven to generate these files, you would need "
+"If you weren&#39;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'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&#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>."
 msgstr ""
 
 #. Tag: para
@@ -840,21 +843,21 @@
 #. Tag: para
 #, no-c-format
 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."
+"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."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
 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."
+"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."
 msgstr ""
 
 #. Tag: para
@@ -871,9 +874,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'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!"
+"<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!"
 msgstr ""
 
 #. Tag: para

Modified: doc/trunk/reference/ja-JP/xml.po
===================================================================
--- doc/trunk/reference/ja-JP/xml.po	2010-04-29 23:54:14 UTC (rev 6205)
+++ doc/trunk/reference/ja-JP/xml.po	2010-05-01 15:04:10 UTC (rev 6206)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: master.xml\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-03-02T13:07:18\n"
+"POT-Creation-Date: 2010-05-01T13:53:43\n"
 "PO-Revision-Date: 2009-06-09 19:24+0900\n"
 "Last-Translator: Keita Higashi <winnie_the_pooh at y3.dion.ne.jp>\n"
 "Language-Team: none\n"
@@ -21,9 +21,9 @@
 #. Tag: para
 #, fuzzy, no-c-format
 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:"
+"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:"
 msgstr ""
 "これまで、アノテーションを使用して宣言される Web Beans の多くの例を見ました。"
 "しかし、Web Bean を定義するためにアノテーションを使うことができない場合があり"
@@ -65,13 +65,13 @@
 "クラスまたはメンバー名を XML 要素の名前として使うことができます。"
 
 #. Tag: para
-#, no-c-format
+#, 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'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&#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."
 msgstr ""
 "このアプローチの長所は、 XML 文書でスペルミスを防止する XML スキーマを記述す"
 "ることができるということです。ツールがコンパイルされた Java コードから自動的"
@@ -112,9 +112,9 @@
 "るならば、メンバーは要素の特質によって明示されます。"
 
 #. Tag: para
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"For example, the element <literal>&lt;util:Date/&gt;</literal> in the "
+"For example, the element <literal>&#60;util:Date/&#62;</literal> in the "
 "following XML fragment refers to the class <literal>java.util.Date</literal>:"
 msgstr ""
 "たとえば、以下の XML 断片の要素 <literal>&lt;util:Date/&gt;</literal> は、ク"
@@ -201,7 +201,7 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"The <literal>&lt;Name&gt;</literal> element declares a bean of scope "
+"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 "
@@ -215,8 +215,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's not quite a full databinding "
-"solution, but it's close!"
+"specify whole graphs of Java objects. It&#39;s not quite a full databinding "
+"solution, but it&#39;s close!"
 msgstr ""
 "この単純であるが、強力な機能によって、 Java オブジェクトの全部のグラフを明示"
 "するのにWeb Beans XML フォーマットを用いることができます。それは完全なデータ"
@@ -230,9 +230,10 @@
 #. Tag: para
 #, fuzzy, no-c-format
 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."
+"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."
 msgstr ""
 "XML 文書フォーマットに Java 開発者でない、または、コードにアクセスしない人々"
 "によって記述して欲しいならば、スキーマを提供する必要があります。 Web Beans に"

Modified: doc/trunk/reference/ko-KR/Author_Group.po
===================================================================
--- doc/trunk/reference/ko-KR/Author_Group.po	2010-04-29 23:54:14 UTC (rev 6205)
+++ doc/trunk/reference/ko-KR/Author_Group.po	2010-05-01 15:04:10 UTC (rev 6206)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: Author_Group\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-03-02T13:07:17\n"
+"POT-Creation-Date: 2010-05-01T13:53:42\n"
 "PO-Revision-Date: 2009-01-08 10:32+1000\n"
 "Last-Translator: Eunju Kim <eukim at redhat.com>\n"
 "Language-Team: Korean <ko at li.org>\n"
@@ -19,86 +19,36 @@
 "\n"
 "\n"
 
-#. Tag: firstname
-#, no-c-format
-msgid "Gavin"
-msgstr ""
-
 #. Tag: contrib
 #, no-c-format
 msgid "JSR-299: Contexts and Dependency Injection Lead"
 msgstr ""
 
-#. Tag: firstname
-#, no-c-format
-msgid "Pete"
-msgstr ""
-
 #. Tag: contrib
 #, no-c-format
 msgid "Weld (JSR-299 RI) Lead"
 msgstr ""
 
-#. Tag: firstname
-#, no-c-format
-msgid "Dan"
-msgstr ""
-
-#. Tag: firstname
-#, no-c-format
-msgid "David"
-msgstr ""
-
-#. Tag: firstname
-#, no-c-format
-msgid "Nicola"
-msgstr ""
-
 #. Tag: contrib
 #, no-c-format
 msgid "Italian Translation"
 msgstr "이탈리아어 번역 "
 
-#. Tag: firstname
-#, no-c-format
-msgid "Gladys"
-msgstr ""
-
 #. Tag: contrib
 #, fuzzy, no-c-format
 msgid "Spanish Translation"
 msgstr "이탈리아어 번역 "
 
-#. Tag: firstname
-#, no-c-format
-msgid "Eun-Ju"
-msgstr ""
-
 #. Tag: contrib
 #, fuzzy, no-c-format
 msgid "Korean Translation"
 msgstr "이탈리아어 번역 "
 
-#. Tag: firstname
-#, no-c-format
-msgid "Terry"
-msgstr ""
-
 #. Tag: contrib
 #, fuzzy, no-c-format
 msgid "Traditional Chinese Translation"
 msgstr "이탈리아어 번역 "
 
-#. Tag: firstname
-#, no-c-format
-msgid "Francesco"
-msgstr ""
-
-#. Tag: firstname
-#, no-c-format
-msgid "Sean"
-msgstr ""
-
 #. Tag: contrib
 #, fuzzy, no-c-format
 msgid "Simplified Chinese Translation"

Modified: doc/trunk/reference/ko-KR/beans.po
===================================================================
--- doc/trunk/reference/ko-KR/beans.po	2010-04-29 23:54:14 UTC (rev 6205)
+++ doc/trunk/reference/ko-KR/beans.po	2010-05-01 15:04:10 UTC (rev 6206)
@@ -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-03-02T13:07:17\n"
+"POT-Creation-Date: 2010-05-01T13:53:42\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'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&#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."
 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'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&#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:"
 msgstr ""
 
 #. Tag: para
@@ -171,7 +171,7 @@
 
 #. Tag: para
 #, no-c-format
-msgid "Let's see what all this new terminology means."
+msgid "Let&#39;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 \"contract\" that must be satisfied by "
-"the bean to be injected. The contract is:"
+"Any injected attribute specifies a &#34;contract&#34; 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&lt;Book&gt;</literal>, as well as the implicit type "
+"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)."
 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't inject an EJB using its remote interface unless "
-"you define a <emphasis>resource</emphasis>, which we'll meet in <xref "
-"linkend=\"resources\" />."
+"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\" />."
 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&lt;Book&gt;</literal>, together with "
+"restricted to <literal>Shop&#60;Book&#62;</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 \"quality\" using "
-"a qualifier."
+"implementation it is interested in. We model this kind of &#34;quality&#34; "
+"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's an example of a qualifier annotation:"
+"string-based names. Here&#39;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've encountered one. With CDI, annotation "
-"definitions will become a familiar artifact as you'll be creating them from "
-"time to time."
+"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."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
 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 "
+"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."
 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't, it reports an error to the user."
+"doesn&#39;t, it reports an error to the user."
 msgstr ""
 
 #. Tag: para
@@ -330,10 +330,10 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"That's not quite the end of the story. CDI also defines a simple "
+"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'll get into the details in <xref linkend=\"injection\" />."
+"We&#39;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't want the bean to sit in the session "
+"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."
 msgstr ""
@@ -386,7 +386,8 @@
 
 #. Tag: para
 #, no-c-format
-msgid "We'll talk more about scopes in <xref linkend=\"scopescontexts\" />."
+msgid ""
+"We&#39;ll talk more about scopes in <xref linkend=\"scopescontexts\" />."
 msgstr ""
 
 #. Tag: title
@@ -445,7 +446,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"We've already seen how qualifiers let us choose between multiple "
+"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 "
@@ -482,9 +483,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'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."
+"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."
 msgstr ""
 
 #. Tag: para
@@ -497,10 +498,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'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."
+"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."
 msgstr ""
 
 #. Tag: para
@@ -539,14 +540,14 @@
 #, no-c-format
 msgid ""
 "Notice that <literal>ShoppingCart</literal> and "
-"<literal>TransactionInterceptor</literal> don't know anything about each "
+"<literal>TransactionInterceptor</literal> don&#39;t know anything about each "
 "other."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
 msgid ""
-"Interceptors are deployment-specific. (We don't need a "
+"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 "
@@ -556,8 +557,8 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"We'll discuss interceptors, and their cousins, decorators, in <xref linkend="
-"\"interceptors\" /> and <xref linkend=\"decorators\" />."
+"We&#39;ll discuss interceptors, and their cousins, decorators, in <xref "
+"linkend=\"interceptors\" /> and <xref linkend=\"decorators\" />."
 msgstr ""
 
 #. Tag: title
@@ -568,9 +569,10 @@
 #. Tag: para
 #, no-c-format
 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."
+"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."
 msgstr ""
 
 #. Tag: title
@@ -584,8 +586,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't need to. According to "
-"the specification, the CDI container treats any class that satisfies the "
+"<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:"
 msgstr ""
 
@@ -634,7 +636,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't recommend directly injecting an entity class. We "
+"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."
@@ -713,7 +715,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"There's no reason to explicitly declare the scope of a stateless session "
+"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 "
@@ -769,8 +771,8 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"When we don't need any of these things, an ordinary managed bean will serve "
-"just fine."
+"When we don&#39;t need any of these things, an ordinary managed bean will "
+"serve just fine."
 msgstr ""
 
 #. Tag: para
@@ -794,7 +796,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Finally, it's usually obvious when method-level transaction management, "
+"Finally, it&#39;s usually obvious when method-level transaction management, "
 "method-level security, timers, remote methods or asynchronous methods are "
 "needed."
 msgstr ""
@@ -802,11 +804,11 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"The point we're trying to make is: use a session bean when you need the "
+"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'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&#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>."
 msgstr ""
@@ -814,13 +816,14 @@
 #. Tag: para
 #, no-c-format
 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\"."
+"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;."
 msgstr ""
 
 #. Tag: title
@@ -859,7 +862,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"We can't write a bean class that is itself a random number. But we can "
+"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—"
@@ -931,7 +934,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"We'll talk much more about producer methods in <xref linkend="
+"We&#39;ll talk much more about producer methods in <xref linkend="
 "\"producermethods\" />."
 msgstr ""
 
@@ -962,7 +965,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'll have to wait until <xref "
-"linkend=\"resources\" />. Because we can't wait to get to work on some "
+"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."
 msgstr ""

Modified: doc/trunk/reference/ko-KR/decorators.po
===================================================================
--- doc/trunk/reference/ko-KR/decorators.po	2010-04-29 23:54:14 UTC (rev 6205)
+++ doc/trunk/reference/ko-KR/decorators.po	2010-05-01 15:04:10 UTC (rev 6206)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: decorators\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-03-02T13:07:17\n"
+"POT-Creation-Date: 2010-05-01T13:53:42\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't "
-"an appropriate tool for separating business-related concerns."
+"the actual semantics of the events they intercept. Thus, interceptors "
+"aren&#39;t an appropriate tool for separating business-related concerns."
 msgstr ""
 "인터셉터는 유형 시스템에 <emphasis>직교</emphasis> 되어 있는 문제를 분리하고 "
 "캡쳐하는 강력한 방법입니다. 인터셉터는 모든 Java 유형 호출을 차단할 수 있습니"
@@ -55,10 +55,11 @@
 "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."
+"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 ""
 "역으로 기능하는 것이 <emphasis>데코레이터</emphasis>입니다. 데코레이터는 특"
 "정 Java 인터페이스에 대해서만 호출을 차단하며, 인터페이스에 부착된 모든 시멘"
@@ -105,8 +106,9 @@
 #, fuzzy, no-c-format
 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."
+"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 ""
 "기타 다른 심플 Web Beans와 다르게, 데코레이터는 추상클래스일 수 도 있습니다. "
 "데코레이터된 인터페이스의 특정 방식에 대해 데코레이터가 특별히 해야할 것이 없"
@@ -196,7 +198,8 @@
 #, fuzzy, no-c-format
 msgid ""
 "This declaration serves the same purpose for decorators that the "
-"<literal>&lt;interceptors&gt;</literal> declaration serves for interceptors:"
+"<literal>&#60;interceptors&#62;</literal> declaration serves for "
+"interceptors:"
 msgstr ""
 "이러한 명시 사항은 데코레이터에 대해 <literal>&lt;Interceptors&gt;</literal> "
 "명시가 인터셉터에 대해 실행하는 것과 동일한 목적을 실행합니다:  "

Modified: doc/trunk/reference/ko-KR/ee.po
===================================================================
--- doc/trunk/reference/ko-KR/ee.po	2010-04-29 23:54:14 UTC (rev 6205)
+++ doc/trunk/reference/ko-KR/ee.po	2010-05-01 15:04:10 UTC (rev 6206)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: ee\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-03-02T13:07:17\n"
+"POT-Creation-Date: 2010-05-01T13:53:42\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's easy to create a "
+"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 "
@@ -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've already seen a couple of "
-"examples of this, though we didn't pay much attention at the time:"
+"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:"
 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's easy to use a bean from a servlet in Java EE 6. Simply inject the bean "
-"using field or initializer method injection."
+"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."
 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'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&#39;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'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."
+"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."
 msgstr ""
 "Web Beans는 특정 배포 아카이브를 지정하지 않습니다. JAR, EJB-JAR 또는 WAR에 "
 "있는 Web Beans  &#151;  애플리케이션 classpath에 있는 배포 위치를 패키지화할 "

Modified: doc/trunk/reference/ko-KR/environments.po
===================================================================
--- doc/trunk/reference/ko-KR/environments.po	2010-04-29 23:54:14 UTC (rev 6205)
+++ doc/trunk/reference/ko-KR/environments.po	2010-05-01 15:04:10 UTC (rev 6206)
@@ -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-03-02T13:07:17\n"
+"POT-Creation-Date: 2010-05-01T14:44:09\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'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&#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."
 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't "
+"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 "
@@ -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 \"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:"
+"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:"
 msgstr ""
 
 #. Tag: para
@@ -186,7 +186,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Tomcat has a read-only JNDI, so Weld can't automatically bind the "
+"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:"
@@ -209,10 +209,7 @@
 
 #. Tag: para
 #, no-c-format
-msgid ""
-"Weld also supports Servlet injection in Tomcat. To enable this, place the "
-"<literal>weld-tomcat-support.jar</literal> in <literal>$TOMCAT_HOME/lib</"
-"literal>, and add the following to <literal>META-INF/context.xml</literal>:"
+msgid "Weld also supports Servlet injection in Tomcat 6."
 msgstr ""
 
 #. Tag: title
@@ -223,18 +220,18 @@
 #. Tag: para
 #, no-c-format
 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:"
+"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:"
 msgstr ""
 
 #. Tag: para
 #, no-c-format
 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."
+"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."
 msgstr ""
 
 #. Tag: para
@@ -247,7 +244,10 @@
 
 #. Tag: para
 #, no-c-format
-msgid "Weld does not currently support Servlet injection in Jetty."
+msgid ""
+"Weld also supports Servlet injection in Jetty 6. To enable this, add the "
+"file <literal>META-INF/jetty-web.xml</literal> with the following content to "
+"your war:"
 msgstr ""
 
 #. Tag: title
@@ -258,13 +258,13 @@
 #. Tag: para
 #, no-c-format
 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."
+"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."
 msgstr ""
 
 #. Tag: para
@@ -348,7 +348,7 @@
 
 #. Tag: para
 #, no-c-format
-msgid "Here's an example of a simple CDI SE application:"
+msgid "Here&#39;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'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&#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."
@@ -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's beans and events. The API consists of two "
-"classes: <literal>Weld</literal> and <literal>WeldContainer</literal>."
+"references to your application&#39;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's an example application main method which uses this API to initialize "
-"a bean of type <literal>MyApplicationBean</literal>."
+"Here&#39;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 '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."
+"<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."
 msgstr ""
 
 #. Tag: para
@@ -459,8 +459,8 @@
 #. Tag: para
 #, no-c-format
 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."
+"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."
 msgstr ""

Modified: doc/trunk/reference/ko-KR/events.po
===================================================================
--- doc/trunk/reference/ko-KR/events.po	2010-04-29 23:54:14 UTC (rev 6205)
+++ doc/trunk/reference/ko-KR/events.po	2010-05-01 15:04:10 UTC (rev 6206)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: events\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-03-02T13:07:17\n"
+"POT-Creation-Date: 2010-05-01T13:53:42\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"
@@ -61,10 +61,10 @@
 "전하게 연결 해제됩니다. "
 
 #. Tag: para
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"observers can specify a combination of \"selectors\" to narrow the set of "
-"event notifications they will receive, and"
+"observers can specify a combination of &#34;selectors&#34; 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've already seen with the dependency injection service."
+"approach that we&#39;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's an example:"
+"<literal>@Qualifier</literal>. Here&#39;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's only interested in events which have those "
+"does specify qualifiers, it&#39;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't specify the "
-"qualifier dynamically. CDI lets us obtain a qualifier instance by "
+"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>."
@@ -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'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&#39;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/ko-KR/example.po
===================================================================
--- doc/trunk/reference/ko-KR/example.po	2010-04-29 23:54:14 UTC (rev 6205)
+++ doc/trunk/reference/ko-KR/example.po	2010-05-01 15:04:10 UTC (rev 6206)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: example\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-03-02T13:07:17\n"
+"POT-Creation-Date: 2010-05-01T13:53:42\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'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:"
+"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:"
 msgstr ""
 "이러한 웹 애플리케이션의 예를 살펴봅시다. JSF를 사용하는 애플리케이션의 사용"
 "자 로그인/로그아웃을 구현할 것입니다. 먼저, 로그인시 입력한 사용자 이름 및 암"
@@ -53,7 +53,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"(Note that we're also going to need a <literal>persistence.xml</literal> "
+"(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>.)"
 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'll explore dependency injection in greater depth."
+"the next chapter, we&#39;ll explore dependency injection in greater depth."
 msgstr ""
 "이러한 예가 Web Bean 프로그래밍 모델의 맛을 보는 계기가 되었으면 합니다. 다"
 "음 부분에서는 Web Beans 의존성 삽입에 대해 자세히 살펴보겠습니다. "

Modified: doc/trunk/reference/ko-KR/extend.po
===================================================================
--- doc/trunk/reference/ko-KR/extend.po	2010-04-29 23:54:14 UTC (rev 6205)
+++ doc/trunk/reference/ko-KR/extend.po	2010-05-01 15:04:10 UTC (rev 6206)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: extend\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-03-02T13:07:17\n"
+"POT-Creation-Date: 2010-05-01T13:53:42\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's needed to satisfy the requirements of Java SE's "
-"service provider architecture."
+"define any methods, but it&#39;s needed to satisfy the requirements of Java "
+"SE&#39;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's metamodel and more. Here's a very simple "
-"example:"
+"permitted to modify the container&#39;s metamodel and more. Here&#39;s a "
+"very simple example:"
 msgstr ""
 
 #. Tag: para
@@ -227,7 +227,7 @@
 #. Tag: para
 #, fuzzy, no-c-format
 msgid ""
-"Let's study some of the interfaces exposed by the <literal>BeanManager</"
+"Let&#39;s study some of the interfaces exposed by the <literal>BeanManager</"
 "literal>."
 msgstr "Web Beans 확장의 중심은 <literal>Manager</literal> 객체입니다.  "
 
@@ -283,7 +283,8 @@
 
 #. Tag: para
 #, no-c-format
-msgid "There's an easy way to find out what beans exist in the application:"
+msgid ""
+"There&#39;s an easy way to find out what beans exist in the application:"
 msgstr ""
 
 #. Tag: para
@@ -319,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're going to delegate back to the container's <literal>InjectionTarget</"
-"literal> to perform instantiation and injection upon the "
-"<literal>SecurityManager</literal> instance."
+"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."
 msgstr ""
 
 #. Tag: para
@@ -347,8 +348,8 @@
 #. Tag: para
 #, no-c-format
 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 "
+"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 "
@@ -358,7 +359,7 @@
 #. Tag: para
 #, no-c-format
 msgid ""
-"Here's a second example, which adds the <literal>@Alternative</literal> "
+"Here&#39;s a second example, which adds the <literal>@Alternative</literal> "
 "annotation to any class which implements a certain <literal>Service</"
 "literal> interface."
 msgstr ""
@@ -389,12 +390,12 @@
 #. Tag: para
 #, no-c-format
 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 "
+"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:"
 msgstr ""
 
@@ -409,9 +410,9 @@
 #. Tag: para
 #, no-c-format
 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."
+"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."
 msgstr ""
 
 #. Tag: title

Modified: doc/trunk/reference/ko-KR/extensions.po
===================================================================
--- doc/trunk/reference/ko-KR/extensions.po	2010-04-29 23:54:14 UTC (rev 6205)
+++ doc/trunk/reference/ko-KR/extensions.po	2010-05-01 15:04:10 UTC (rev 6206)
@@ -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-03-02T13:07:17\n"
+"POT-Creation-Date: 2010-05-01T13:53:42\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's no need to "
-"include sl4j as it's already included (and used internally)."
+"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 i