Moved language specific of WebHelp to gentext/locale/ as discussed with

Stefan following the "minimal intrusive approach". :)
In the long run, maybe moving the text into a context, not sure.

diff --git a/gentext/locale/cs.xml b/gentext/locale/cs.xml
index 96ae5d166b53647b539c2f1e3535f623807b24f9..2dabaaa7d2ec0cb66a190db517f9864c6ed59a2d 100644 (file)
--- a/gentext/locale/cs.xml
+++ b/gentext/locale/cs.xml
@@ -218,6 +218,21 @@
 <dingbat key="singleendquote" text="&#x2018;"/>
 <dingbat key="bullet" text="&#x2022;"/>
 
+<!-- WebHelp -->
+<gentext key="Search" text="Hledání"/>
+<gentext key="Enter_a_term_and_click" text="Zadejte pojem a klikněte "/>
+<gentext key="Go" text="Přejdi"/>
+<gentext key="to_perform_a_search" text=" pro hledání."/>
+<gentext key="txt_filesfound" text="Výsledky"/>
+<gentext key="txt_enter_at_least_1_char" text="Musíte zadat alespoň jeden znak."/>
+<gentext key="txt_browser_not_supported"
+        text="Váš prohlížeč není podporován. Použití prohlížeče Mozilla Firefox je doporučeno."/>
+<gentext key="txt_please_wait" text="Prosím čekejte. Probíhá hledání..."/>
+<gentext key="txt_results_for" text="Výsledky pro: "/>
+<gentext key="TableofContents" text="Obsah"/>
+<gentext key="HighlightButton" text="Přepnout zvýrazňování výsledků hledání"/>
+
+
 <context name="styles">
 
 <template name="person-name">first-last</template>

diff --git a/gentext/locale/de.xml b/gentext/locale/de.xml
index d3414794e3487c18c1e6af67fed67289c1e58383..803f3e6c234ebd0102ad9da3c18b4b7f39335bda 100644 (file)
--- a/gentext/locale/de.xml
+++ b/gentext/locale/de.xml
@@ -242,8 +242,20 @@
      ich verschiedene Bu"cher durchgebla"ttert habe.
      Oliver Fischer
      -->
- 
-  
+
+<!-- WebHelp --> 
+<gentext key="Search" text="suchen"/>
+<gentext key="Enter_a_term_and_click" text="Geben Sie einen Begriff ein und klicken Sie "/>
+<gentext key="Go" text="Go"/>
+<gentext key="to_perform_a_search" text=" to perform a search."/>
+<gentext key="txt_filesfound" text="Ergebnisse"/>
+<gentext key="txt_enter_at_least_1_char" text="Sie müssen mindestens ein Zeichen."/>
+<gentext key="txt_browser_not_supported"
+        text="Ihr Browser ist nicht unterstütz. Es wird empfohlen, Mozilla Firefox zu verwenden."/>
+<gentext key="txt_please_wait" text="Bitte warten Sie. Die Suche ist im Gange ..."/>
+<gentext key="txt_results_for" text="Ergebnisse für: "/>
+<gentext key="HighlightButton" text="Markierte Suchergebnisse ein/ausschalten"/>
+
 <context name="styles">
 
 <template name="person-name">first-last</template>

diff --git a/gentext/locale/en.xml b/gentext/locale/en.xml
index d7374ed6653ce6c560428f12b41f37fbc006801c..6ebbe90c48f738da10a3c39a9f22529d3fcece8f 100644 (file)
--- a/gentext/locale/en.xml
+++ b/gentext/locale/en.xml
@@ -218,6 +218,21 @@
 <gentext key="hyphenation-push-character-count" text="2"/>
 <gentext key="hyphenation-remain-character-count" text="2"/>
 
+<!-- WebHelp -->
+<gentext key="Search" text="Search"/>
+<gentext key="Enter_a_term_and_click" text="Enter a term and click "/>
+<gentext key="Go" text="Go"/>
+<gentext key="to_perform_a_search" text=" to perform a search."/>
+<gentext key="txt_filesfound" text="Results"/>
+<gentext key="txt_enter_at_least_1_char" text="You must enter at least one character."/>
+<gentext key="txt_browser_not_supported"
+        text="Your browser is not supported. Use of Mozilla Firefox is recommended."/>
+<gentext key="txt_please_wait" text="Please wait. Search in progress..."/>
+<gentext key="txt_results_for" text="Results for: "/>
+<gentext key="TableofContents" text="Contents"/>
+<gentext key="HighlightButton" text="Toggle search result highlighting"/>
+<gentext key="Your_search_returned_no_results" text="Your search returned no results."/>  
+
 <context name="styles">
 
 <template name="person-name">first-last</template>
@@ -601,6 +616,7 @@
 <template name="langcode">0x0409 English (UNITED STATES)</template>
 </context>
 
+
 <context name="index">
 <template name="term-separator">, </template>
 <template name="number-separator">, </template>

diff --git a/gentext/locale/fr.xml b/gentext/locale/fr.xml
index c5ee18b4db8d680c2d4e0a6ea6883f22a2674afa..71ad995c1f33fbadcbc7b987ec93fef181df80ee 100644 (file)
--- a/gentext/locale/fr.xml
+++ b/gentext/locale/fr.xml
@@ -224,6 +224,20 @@
 <gentext key="hyphenation-push-character-count" text="2"/>
 <gentext key="hyphenation-remain-character-count" text="2"/>
 
+<!-- WebHelp -->
+<gentext key="Search" text="rechercher"/>
+<gentext key="Enter_a_term_and_click" text="Saisissez un terme et cliquer "/>
+<gentext key="Go" text="Go"/>
+<gentext key="to_perform_a_search" text=" to perform a search."/>
+<gentext key="txt_filesfound" text="résultats"/>
+<gentext key="txt_enter_at_least_1_char" text="Vous devez entrer au moins un caractère."/>
+<gentext key="txt_browser_not_supported"
+        text="Your browser is not supported. Use of Mozilla Firefox is recommended."/>
+<gentext key="txt_please_wait" text="S'il vous plaît attendre. La recherche est en cours ..."/>
+<gentext key="txt_results_for" text="Résultats pour: "/>
+<gentext key="HighlightButton" text="Toggle search result highlighting"/>
+
+
 <context name="styles">
 
 <template name="person-name">first-last</template>

diff --git a/gentext/locale/ja.xml b/gentext/locale/ja.xml
index 7214f0bba7ef7e7e73ba93e6946f1261302bc58d..4192db3466ea0a25b0ca20661a2b13cbda448e32 100644 (file)
--- a/gentext/locale/ja.xml
+++ b/gentext/locale/ja.xml
@@ -221,6 +221,19 @@
 <dingbat key="nestedendquote" text="』"/>
 <dingbat key="bullet" text="●"/>
 
+<!-- WebHelp -->
+<gentext key="Search" text="検索"/>
+<gentext key="Enter_a_term_and_click" text="用語をクリックして入力してください。"/>
+<gentext key="Go" text="移動"/>
+<gentext key="to_perform_a_search" text=" to perform a search."/>
+<gentext key="txt_filesfound" text="検索結果"/>
+<gentext key="txt_enter_at_least_1_char" text="あなたは、少なくとも1つの文字を入力する必要があります。"/>
+<gentext key="txt_browser_not_supported"
+        text="お使いのブラウザがサポートされていません。 Mozilla Firefoxの使用が推奨されます"/>
+<gentext key="txt_please_wait" text="しばらくお待ちください。検索が進行中です..."/>
+<gentext key="txt_results_for" text="次の検索語の結果： "/>
+<gentext key="HighlightButton" text="強調表示の切り替えの検索結果"/>
+
 <context name="styles">
 
 <template name="person-name">family-given</template>

diff --git a/gentext/locale/zh.xml b/gentext/locale/zh.xml
index 57d75edac3e6e4db4350b9f71edcfe15a4208682..2ef4b2d6dafe7438285a7fc25ad2615114d9a5b0 100644 (file)
--- a/gentext/locale/zh.xml
+++ b/gentext/locale/zh.xml
@@ -230,6 +230,19 @@
 <gentext key="hyphenation-push-character-count" text="2"/>
 <gentext key="hyphenation-remain-character-count" text="2"/>
 
+<!-- WebHelp -->
+<gentext key="Search" text="搜索"/>
+<gentext key="Enter_a_term_and_click" text="输入字词，然后点击 "/>
+<gentext key="Go" text="去"/>
+<gentext key="to_perform_a_search" text=" to perform a search."/>
+<gentext key="txt_filesfound" text="条结果"/>
+<gentext key="txt_enter_at_least_1_char" text="您必须输入至少一个字符。"/>
+<gentext key="txt_browser_not_supported"
+        text="Your browser is not supported. Use of Mozilla Firefox is recommended."/>
+<gentext key="txt_please_wait" text="请稍候。搜索中..."/>
+<gentext key="txt_results_for" text="结果： "/>
+<gentext key="HighlightButton" text="Toggle search result highlighting"/>
+
 <context name="styles">
 
 <template name="person-name">first-last</template>

diff --git a/xsl/webhelp/xsl/webhelp.xsl b/xsl/webhelp/xsl/webhelp.xsl
index 4fa307e8e5f983041b5e797604bc1b429e7dfe93..ed964eb140a7639244b7491e4f2a1b405d3eb3cd 100644 (file)
--- a/xsl/webhelp/xsl/webhelp.xsl
+++ b/xsl/webhelp/xsl/webhelp.xsl
@@ -53,7 +53,6 @@
     <!-- Generate the end-of-the-book index -->
     <xsl:param name="generate.index" select="1"/>
     <xsl:param name="inherit.keywords" select="'0'"/>
-    <xsl:param name="local.l10n.xml" select="document('')"/>
     <xsl:param name="para.propagates.style" select="1"/>
     <xsl:param name="phrase.propagates.style" select="1"/>
     <xsl:param name="chunk.first.sections" select="1"/>
@@ -102,91 +101,8 @@ set       toc,title
 
     <!-- Localizations of webhelp specific words. Your contributions for other languages are appreciated.
        Currently, only around 10 translations needed. -->
-    <!-- To be moved to files under 'gentext/locale/' -->
-    <i18n xmlns="http://docbook.sourceforge.net/xmlns/l10n/1.0">
-        <l10n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0" language="en">
-            <l:gentext key="Search" text="Search"/>
-            <l:gentext key="Enter_a_term_and_click" text="Enter a term and click "/>
-            <l:gentext key="Go" text="Go"/>
-            <l:gentext key="to_perform_a_search" text=" to perform a search."/>
-            <l:gentext key="txt_filesfound" text="Results"/>
-            <l:gentext key="txt_enter_at_least_1_char" text="You must enter at least one character."/>
-            <l:gentext key="txt_browser_not_supported"
-                       text="Your browser is not supported. Use of Mozilla Firefox is recommended."/>
-            <l:gentext key="txt_please_wait" text="Please wait. Search in progress..."/>
-            <l:gentext key="txt_results_for" text="Results for: "/>
-            <l:gentext key="TableofContents" text="Contents"/>
-               <l:gentext key="HighlightButton" text="Toggle search result highlighting"/>
-               <l:gentext key="Your_search_returned_no_results" text="Your search returned no results."/>
-        </l10n>
-       <!-- The fallback mechansim doesn't seem to work for local l10n stuff -->
-        <l10n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0" language="ja">
-            <l:gentext key="Search" text="検索"/>
-            <l:gentext key="Enter_a_term_and_click" text="用語をクリックして入力してください。"/>
-            <l:gentext key="Go" text="移動"/>
-            <l:gentext key="to_perform_a_search" text=" to perform a search."/>
-            <l:gentext key="txt_filesfound" text="検索結果"/>
-            <l:gentext key="txt_enter_at_least_1_char" text="あなたは、少なくとも1つの文字を入力する必要があります。"/>
-            <l:gentext key="txt_browser_not_supported"
-                       text="お使いのブラウザがサポートされていません。 Mozilla Firefoxの使用が推奨されます"/>
-            <l:gentext key="txt_please_wait" text="しばらくお待ちください。検索が進行中です..."/>
-            <l:gentext key="txt_results_for" text="次の検索語の結果： "/>
-           <l:gentext key="HighlightButton" text="強調表示の切り替えの検索結果"/>
-        </l10n>
-        <l10n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0" language="de">
-            <l:gentext key="Search" text="suchen"/>
-            <l:gentext key="Enter_a_term_and_click" text="Geben Sie einen Begriff ein und klicken Sie "/>
-            <l:gentext key="Go" text="Go"/>
-            <l:gentext key="to_perform_a_search" text=" to perform a search."/>
-            <l:gentext key="txt_filesfound" text="Ergebnisse"/>
-            <l:gentext key="txt_enter_at_least_1_char" text="Sie müssen mindestens ein Zeichen."/>
-            <l:gentext key="txt_browser_not_supported"
-                       text="Your browser is not supported. Use of Mozilla Firefox is recommended."/>
-            <l:gentext key="txt_please_wait" text="Bitte warten Sie. Die Suche ist im Gange ..."/>
-            <l:gentext key="txt_results_for" text="Ergebnisse für: "/>
-           <l:gentext key="HighlightButton" text="Toggle search result highlighting"/>
-        </l10n>
-        <l10n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0" language="fr">
-            <l:gentext key="Search" text="rechercher"/>
-            <l:gentext key="Enter_a_term_and_click" text="Saisissez un terme et cliquer "/>
-            <l:gentext key="Go" text="Go"/>
-            <l:gentext key="to_perform_a_search" text=" to perform a search."/>
-            <l:gentext key="txt_filesfound" text="résultats"/>
-            <l:gentext key="txt_enter_at_least_1_char" text="Vous devez entrer au moins un caractère."/>
-            <l:gentext key="txt_browser_not_supported"
-                       text="Your browser is not supported. Use of Mozilla Firefox is recommended."/>
-            <l:gentext key="txt_please_wait" text="S'il vous plaît attendre. La recherche est en cours ..."/>
-            <l:gentext key="txt_results_for" text="Résultats pour: "/>
-           <l:gentext key="HighlightButton" text="Toggle search result highlighting"/>
-        </l10n>
-        <l10n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0" language="zh">
-            <l:gentext key="Search" text="搜索"/>
-            <l:gentext key="Enter_a_term_and_click" text="输入字词，然后点击 "/>
-            <l:gentext key="Go" text="去"/>
-            <l:gentext key="to_perform_a_search" text=" to perform a search."/>
-            <l:gentext key="txt_filesfound" text="条结果"/>
-            <l:gentext key="txt_enter_at_least_1_char" text="您必须输入至少一个字符。"/>
-            <l:gentext key="txt_browser_not_supported"
-                       text="Your browser is not supported. Use of Mozilla Firefox is recommended."/>
-            <l:gentext key="txt_please_wait" text="请稍候。搜索中..."/>
-            <l:gentext key="txt_results_for" text="结果： "/>
-           <l:gentext key="HighlightButton" text="Toggle search result highlighting"/>
-        </l10n>
-        <l10n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0" language="cs">
-            <l:gentext key="Search" text="Hledání"/>
-            <l:gentext key="Enter_a_term_and_click" text="Zadejte pojem a klikněte "/>
-            <l:gentext key="Go" text="Přejdi"/>
-            <l:gentext key="to_perform_a_search" text=" pro hledání."/>
-            <l:gentext key="txt_filesfound" text="Výsledky"/>
-            <l:gentext key="txt_enter_at_least_1_char" text="Musíte zadat alespoň jeden znak."/>
-            <l:gentext key="txt_browser_not_supported"
-                       text="Váš prohlížeč není podporován. Použití prohlížeče Mozilla Firefox je doporučeno."/>
-            <l:gentext key="txt_please_wait" text="Prosím čekejte. Probíhá hledání..."/>
-            <l:gentext key="txt_results_for" text="Výsledky pro: "/>
-            <l:gentext key="TableofContents" text="Obsah"/>
-           <l:gentext key="HighlightButton" text="Přepnout zvýrazňování výsledků hledání"/>
-        </l10n>
-    </i18n>
+    <!-- Moved to files under 'gentext/locale/', search for WebHelp -->
+    
 
   <xsl:template name="system.head.content">
   <xsl:param name="node" select="."/>