gettext 1.92.0 → 1.93.0

data/doc/files/README.html

@@ -56,7 +56,7 @@
     </tr>
     <tr class="top-aligned-row">
       <td><strong>Last Update:</strong></td>
-      <td>Sat Aug 02 17:42:26 +0900 2008</td>
+      <td>Tue Sep 16 02:17:20 +0900 2008</td>
     </tr>
     </table>
   </div>
@@ -301,6 +301,9 @@ This program is licenced under the same licence as Ruby. (See the file
 <ul>
 <li>Bosnian(bs) - Sanjin Sehic &lt;saserr at gmail.com&gt;
 
+</li>
+<li>Bulgarian(bg) - Sava Chankov &lt;sava.chankov at gmail.com&gt;
+
 </li>
 <li>Catalan(ca) - Ramon Salvadó &lt;rsalvado at gnuine.com&gt;
 
@@ -334,9 +337,11 @@ This program is licenced under the same licence as Ruby. (See the file
 <li>Estonian(et) - Erkki Eilonen &lt;erkki at itech.ee&gt;
 
 </li>
-<li>French(fr) - David Sulc &lt;davidsulc at gmail.com&gt; (current)
+<li>French(fr) - Vincent Isambart &lt;vincent.isambart at gmail.com&gt;
+(current)
 
 <pre>
+                             David Sulc &lt;davidsulc at gmail.com&gt;
                              Laurent Sansonetti &lt;laurent.sansonetti at gmail.com&gt;
 </pre>
 </li>
@@ -408,16 +413,19 @@ rawuncut.elitemail.org&gt;
 <li>Bosnian(bs) - 1.90.0 (old)
 
 </li>
-<li>Catalan(ca) - 1.92.0
+<li>Bulgarian(bg) - 1.93.0 (new)
+
+</li>
+<li>Catalan(ca) - 1.93.0
 
 </li>
 <li>Croatian(hr) - 1.90.0 (old)
 
 </li>
-<li>Chinese(zh_CN) - 1.92.0
+<li>Chinese(zh_CN) - 1.93.0
 
 </li>
-<li>Chinese(zh_TW) - 1.92.0
+<li>Chinese(zh_TW) - 1.93.0
 
 </li>
 <li>Czech(cs) - 1.9.0 (old)
@@ -429,58 +437,58 @@ rawuncut.elitemail.org&gt;
 <li>English(default) - 1.90.0 (old)
 
 </li>
-<li>Esperanto(eo) - 1.92.0
+<li>Esperanto(eo) - 1.93.0
 
 </li>
-<li>Estonian(et) - 1.9.0 (old, rails.po only)
+<li>Estonian(et) - 1.93.0
 
 </li>
-<li>French(fr) - 1.90.0 (old)
+<li>French(fr) - 1.93.0
 
 </li>
-<li>German(de) - 1.92.0
+<li>German(de) - 1.93.0
 
 </li>
-<li>Greek(el) - 1.92.0
+<li>Greek(el) - 1.93.0
 
 </li>
-<li>Hungarian(hu) - 1.92.0
+<li>Hungarian(hu) - 1.93.0
 
 </li>
 <li>Italian(it) - 1.6.0 (old)
 
 </li>
-<li>Japanese(ja) - 1.92.0
+<li>Japanese(ja) - 1.93.0
 
 </li>
 <li>Korean(ko) - 1.9.0 (old)
 
 </li>
-<li>Latvian(lv) - 1.92.0 (new)
+<li>Latvian(lv) - 1.93.0 (new)
 
 </li>
-<li>Norwegian(nb) - 1.92.0
+<li>Norwegian(nb) - 1.93.0
 
 </li>
-<li>Portuguese(Brazil)(pt_BR) - 1.92.0
+<li>Portuguese(Brazil)(pt_BR) - 1.93.0
 
 </li>
-<li>Russian(ru) - 1.92.0
+<li>Russian(ru) - 1.93.0
 
 </li>
 <li>Serbian(sr) - 1.91.0 (old)
 
 </li>
-<li>Spanish(es) - 1.92.0
+<li>Spanish(es) - 1.93.0
 
 </li>
 <li>Swedish(sv) - 0.8.0 (too much old)
 
 </li>
-<li>Ukrainian(ua) - 1.92.0
+<li>Ukrainian(ua) - 1.93.0
 
 </li>
-<li>Vietnamese(vi) - 1.92.0
+<li>Vietnamese(vi) - 1.93.0
 
 </li>
 </ul>

data/doc/files/lib/gettext/parser/ruby_rb.html

@@ -56,7 +56,7 @@
     </tr>
     <tr class="top-aligned-row">
       <td><strong>Last Update:</strong></td>
-      <td>Sat Aug 02 17:42:26 +0900 2008</td>
+      <td>Mon Sep 15 01:57:21 +0900 2008</td>
     </tr>
     </table>
   </div>

data/doc/files/lib/gettext/rails_rb.html

@@ -56,7 +56,7 @@
     </tr>
     <tr class="top-aligned-row">
       <td><strong>Last Update:</strong></td>
-      <td>Sat Aug 02 17:42:26 +0900 2008</td>
+      <td>Mon Sep 15 01:57:21 +0900 2008</td>
     </tr>
     </table>
   </div>

data/doc/files/lib/gettext/rgettext_rb.html

@@ -56,7 +56,7 @@
     </tr>
     <tr class="top-aligned-row">
       <td><strong>Last Update:</strong></td>
-      <td>Sat Aug 02 17:42:26 +0900 2008</td>
+      <td>Mon Sep 15 01:57:21 +0900 2008</td>
     </tr>
     </table>
   </div>

data/doc/files/lib/gettext/utils_rb.html

@@ -56,7 +56,7 @@
     </tr>
     <tr class="top-aligned-row">
       <td><strong>Last Update:</strong></td>
-      <td>Sat Aug 02 17:42:26 +0900 2008</td>
+      <td>Mon Sep 15 01:57:21 +0900 2008</td>
     </tr>
     </table>
   </div>

data/doc/files/lib/gettext/version_rb.html

@@ -56,7 +56,7 @@
     </tr>
     <tr class="top-aligned-row">
       <td><strong>Last Update:</strong></td>
-      <td>Sat Aug 02 17:42:26 +0900 2008</td>
+      <td>Mon Sep 15 01:57:21 +0900 2008</td>
     </tr>
     </table>
   </div>

data/doc/files/lib/gettext_rb.html

@@ -56,7 +56,7 @@
     </tr>
     <tr class="top-aligned-row">
       <td><strong>Last Update:</strong></td>
-      <td>Sat Aug 02 17:42:26 +0900 2008</td>
+      <td>Mon Sep 15 01:57:21 +0900 2008</td>
     </tr>
     </table>
   </div>

data/doc/files/lib/locale/object_rb.html

@@ -56,7 +56,7 @@
     </tr>
     <tr class="top-aligned-row">
       <td><strong>Last Update:</strong></td>
-      <td>Wed Jan 30 01:34:54 +0900 2008</td>
+      <td>Mon Sep 15 01:57:22 +0900 2008</td>
     </tr>
     </table>
   </div>

data/doc/files/lib/locale/posix_rb.html

@@ -56,7 +56,7 @@
     </tr>
     <tr class="top-aligned-row">
       <td><strong>Last Update:</strong></td>
-      <td>Fri Nov 09 01:54:33 +0900 2007</td>
+      <td>Tue Sep 16 01:34:07 +0900 2008</td>
     </tr>
     </table>
   </div>

data/doc/fr_method_index.html

@@ -21,140 +21,142 @@
   <h1 class="section-bar">Methods</h1>
   <div id="index-entries">
     <a href="classes/String.html#M000017">% (String)</a><br />
-    <a href="classes/GetText.html#M000092">N_ (GetText)</a><br />
-    <a href="classes/GetText.html#M000093">Nn_ (GetText)</a><br />
-    <a href="classes/GetText.html#M000106">_ (GetText)</a><br />
-    <a href="classes/GetText/PoParser.html#M000135">_reduce_none (GetText::PoParser)</a><br />
-    <a href="classes/GetText.html#M000102">add_default_locale_path (GetText)</a><br />
-    <a href="classes/GetText/TextDomain.html#M000129">add_default_locale_path (GetText::TextDomain)</a><br />
-    <a href="classes/GetText/TextDomainManager.html#M000124">add_textdomain (GetText::TextDomainManager)</a><br />
+    <a href="classes/GetText.html#M000093">N_ (GetText)</a><br />
+    <a href="classes/GetText.html#M000094">Nn_ (GetText)</a><br />
+    <a href="classes/GetText.html#M000107">_ (GetText)</a><br />
+    <a href="classes/GetText/PoParser.html#M000137">_reduce_none (GetText::PoParser)</a><br />
+    <a href="classes/GetText.html#M000103">add_default_locale_path (GetText)</a><br />
+    <a href="classes/GetText/TextDomain.html#M000131">add_default_locale_path (GetText::TextDomain)</a><br />
+    <a href="classes/GetText/TextDomainManager.html#M000126">add_textdomain (GetText::TextDomainManager)</a><br />
     <a href="classes/Module.html#M000001">alias_method_chain (Module)</a><br />
-    <a href="classes/GetText/Rails.html#M000116">available_locales (GetText::Rails)</a><br />
-    <a href="classes/GetText.html#M000083">bindtextdomain (GetText)</a><br />
-    <a href="classes/GetText/Rails.html#M000115">bindtextdomain (GetText::Rails)</a><br />
-    <a href="classes/GetText.html#M000084">bindtextdomain_to (GetText)</a><br />
-    <a href="classes/GetText.html#M000080">cached= (GetText)</a><br />
-    <a href="classes/GetText.html#M000081">cached? (GetText)</a><br />
-    <a href="classes/GetText.html#M000078">cgi (GetText)</a><br />
+    <a href="classes/GetText/Rails.html#M000118">available_locales (GetText::Rails)</a><br />
+    <a href="classes/GetText/Rails.html#M000117">bindtextdomain (GetText::Rails)</a><br />
+    <a href="classes/GetText.html#M000084">bindtextdomain (GetText)</a><br />
+    <a href="classes/GetText.html#M000085">bindtextdomain_to (GetText)</a><br />
+    <a href="classes/GetText.html#M000081">cached= (GetText)</a><br />
+    <a href="classes/GetText.html#M000082">cached? (GetText)</a><br />
+    <a href="classes/GetText.html#M000079">cgi (GetText)</a><br />
+    <a href="classes/Locale/SystemCGI.html#M000052">cgi (Locale::SystemCGI)</a><br />
     <a href="classes/Locale.html#M000028">cgi (Locale)</a><br />
-    <a href="classes/Locale/SystemCGI.html#M000051">cgi (Locale::SystemCGI)</a><br />
-    <a href="classes/Locale/SystemCGI.html#M000050">cgi= (Locale::SystemCGI)</a><br />
+    <a href="classes/Locale/SystemCGI.html#M000051">cgi= (Locale::SystemCGI)</a><br />
+    <a href="classes/GetText.html#M000078">cgi= (GetText)</a><br />
     <a href="classes/Locale.html#M000027">cgi= (Locale)</a><br />
-    <a href="classes/GetText.html#M000077">cgi= (GetText)</a><br />
+    <a href="classes/Locale/SystemBase.html#M000048">charset (Locale::SystemBase)</a><br />
     <a href="classes/Locale.html#M000039">charset (Locale)</a><br />
-    <a href="classes/Locale/SystemBase.html#M000047">charset (Locale::SystemBase)</a><br />
-    <a href="classes/Locale/Object.html#M000055">charset= (Locale::Object)</a><br />
-    <a href="classes/GetText/TextDomain.html#M000128">check_mo= (GetText::TextDomain)</a><br />
-    <a href="classes/GetText/TextDomain.html#M000127">check_mo? (GetText::TextDomain)</a><br />
+    <a href="classes/Locale/Object.html#M000056">charset= (Locale::Object)</a><br />
+    <a href="classes/GetText/TextDomain.html#M000130">check_mo= (GetText::TextDomain)</a><br />
+    <a href="classes/GetText/TextDomain.html#M000129">check_mo? (GetText::TextDomain)</a><br />
     <a href="classes/Locale.html#M000041">clear (Locale)</a><br />
-    <a href="classes/Locale/Object.html#M000061">clear (Locale::Object)</a><br />
-    <a href="classes/GetText.html#M000082">clear_cache (GetText)</a><br />
+    <a href="classes/Locale/Object.html#M000062">clear (Locale::Object)</a><br />
+    <a href="classes/GetText.html#M000083">clear_cache (GetText)</a><br />
     <a href="classes/Locale.html#M000038">codeset (Locale)</a><br />
     <a href="classes/ActiveRecord/Base.html#M000023">columns_with_gettext (ActiveRecord::Base)</a><br />
     <a href="classes/Iconv.html#M000003">conv (Iconv)</a><br />
     <a href="classes/Iconv.html#M000002">conv (Iconv)</a><br />
-    <a href="classes/Locale/Object.html#M000054">country= (Locale::Object)</a><br />
-    <a href="classes/GetText.html#M000072">create_mofiles (GetText)</a><br />
+    <a href="classes/Locale/Object.html#M000055">country= (Locale::Object)</a><br />
+    <a href="classes/GetText.html#M000073">create_mofiles (GetText)</a><br />
     <a href="classes/Locale.html#M000033">current (Locale)</a><br />
     <a href="classes/Locale.html#M000035">current= (Locale)</a><br />
     <a href="classes/Locale.html#M000040">current_charset (Locale)</a><br />
-    <a href="classes/GetText.html#M000103">current_textdomain_info (GetText)</a><br />
+    <a href="classes/GetText.html#M000104">current_textdomain_info (GetText)</a><br />
     <a href="classes/Locale.html#M000032">default (Locale)</a><br />
     <a href="classes/Locale.html#M000030">default= (Locale)</a><br />
-    <a href="classes/Locale/SystemCGI.html#M000052">default_locale (Locale::SystemCGI)</a><br />
-    <a href="classes/GetText/TextDomainManager.html#M000125">each (GetText::TextDomainManager)</a><br />
-    <a href="classes/GetText/TextDomainManager.html#M000121">each_all (GetText::TextDomainManager)</a><br />
-    <a href="classes/GetText/ErbContainer.html#M000112">eval_file (GetText::ErbContainer)</a><br />
-    <a href="classes/GetText/ErbContainer.html#M000111">eval_src (GetText::ErbContainer)</a><br />
+    <a href="classes/Locale/SystemCGI.html#M000053">default_locale (Locale::SystemCGI)</a><br />
+    <a href="classes/GetText/TextDomainManager.html#M000127">each (GetText::TextDomainManager)</a><br />
+    <a href="classes/GetText/TextDomainManager.html#M000123">each_all (GetText::TextDomainManager)</a><br />
+    <a href="classes/GetText/ErbContainer.html#M000114">eval_file (GetText::ErbContainer)</a><br />
+    <a href="classes/GetText/ErbContainer.html#M000113">eval_src (GetText::ErbContainer)</a><br />
     <a href="classes/Locale.html#M000037">get (Locale)</a><br />
-    <a href="classes/Locale/SystemWin32.html#M000043">get_charset (Locale::SystemWin32)</a><br />
-    <a href="classes/Locale/SystemBase.html#M000044">get_charset (Locale::SystemBase)</a><br />
-    <a href="classes/GetText.html#M000087">gettext (GetText)</a><br />
-    <a href="classes/GetText/TextDomain.html#M000132">gettext (GetText::TextDomain)</a><br />
+    <a href="classes/Locale/SystemWin32.html#M000044">get_charset (Locale::SystemWin32)</a><br />
+    <a href="classes/Locale/SystemPosix.html#M000043">get_charset (Locale::SystemPosix)</a><br />
+    <a href="classes/Locale/SystemBase.html#M000045">get_charset (Locale::SystemBase)</a><br />
+    <a href="classes/GetText/TextDomain.html#M000134">gettext (GetText::TextDomain)</a><br />
+    <a href="classes/GetText.html#M000088">gettext (GetText)</a><br />
     <a href="classes/MOFile.html#M000012">hash_string (MOFile)</a><br />
     <a href="classes/ActiveRecord/ConnectionAdapters/Column.html#M000018">human_name_with_gettext (ActiveRecord::ConnectionAdapters::Column)</a><br />
     <a href="classes/Iconv.html#M000004">iconv (Iconv)</a><br />
-    <a href="classes/GetText/ErbParser.html#M000118">init (GetText::ErbParser)</a><br />
-    <a href="classes/GetText/ActiveRecordParser.html#M000113">init (GetText::ActiveRecordParser)</a><br />
-    <a href="classes/ActionView/Helpers/FormBuilder.html#M000069">label_with_gettext (ActionView::Helpers::FormBuilder)</a><br />
-    <a href="classes/Locale/Object.html#M000053">language= (Locale::Object)</a><br />
+    <a href="classes/GetText/ErbParser.html#M000120">init (GetText::ErbParser)</a><br />
+    <a href="classes/GetText/ActiveRecordParser.html#M000115">init (GetText::ActiveRecordParser)</a><br />
+    <a href="classes/ActionView/Helpers/FormBuilder.html#M000070">label_with_gettext (ActionView::Helpers::FormBuilder)</a><br />
+    <a href="classes/Locale/Object.html#M000054">language= (Locale::Object)</a><br />
     <a href="classes/MOFile.html#M000008">load (MOFile)</a><br />
     <a href="classes/MOFile.html#M000014">load_from_file (MOFile)</a><br />
     <a href="classes/MOFile.html#M000009">load_from_stream (MOFile)</a><br />
-    <a href="classes/GetText.html#M000101">locale (GetText)</a><br />
-    <a href="classes/GetText.html#M000097">locale= (GetText)</a><br />
-    <a href="classes/Locale/SystemBase.html#M000045">locale_from_env (Locale::SystemBase)</a><br />
-    <a href="classes/Locale/Object.html#M000058">modifier= (Locale::Object)</a><br />
-    <a href="classes/GetText.html#M000071">msgmerge (GetText)</a><br />
-    <a href="classes/GetText.html#M000107">n_ (GetText)</a><br />
-    <a href="classes/Locale/Object.html#M000060">new (Locale::Object)</a><br />
-    <a href="classes/GetText/TextDomainManager.html#M000123">new (GetText::TextDomainManager)</a><br />
+    <a href="classes/GetText.html#M000102">locale (GetText)</a><br />
+    <a href="classes/GetText.html#M000098">locale= (GetText)</a><br />
+    <a href="classes/Locale/SystemBase.html#M000046">locale_from_env (Locale::SystemBase)</a><br />
+    <a href="classes/Locale/Object.html#M000059">modifier= (Locale::Object)</a><br />
+    <a href="classes/GetText.html#M000072">msgmerge (GetText)</a><br />
+    <a href="classes/GetText.html#M000108">n_ (GetText)</a><br />
+    <a href="classes/Locale/Object.html#M000061">new (Locale::Object)</a><br />
+    <a href="classes/GetText/TextDomain.html#M000132">new (GetText::TextDomain)</a><br />
     <a href="classes/MOFile.html#M000006">new (MOFile)</a><br />
-    <a href="classes/GetText/TextDomain.html#M000130">new (GetText::TextDomain)</a><br />
+    <a href="classes/GetText/TextDomainManager.html#M000125">new (GetText::TextDomainManager)</a><br />
     <a href="classes/MOFile.html#M000011">next_prime (MOFile)</a><br />
-    <a href="classes/GetText.html#M000090">ngettext (GetText)</a><br />
-    <a href="classes/GetText/TextDomain.html#M000133">ngettext (GetText::TextDomain)</a><br />
-    <a href="classes/GetText/Rails.html#M000117">normalized_locale (GetText::Rails)</a><br />
-    <a href="classes/GetText.html#M000091">npgettext (GetText)</a><br />
+    <a href="classes/GetText/TextDomain.html#M000135">ngettext (GetText::TextDomain)</a><br />
+    <a href="classes/GetText.html#M000091">ngettext (GetText)</a><br />
+    <a href="classes/GetText/Rails.html#M000119">normalized_locale (GetText::Rails)</a><br />
+    <a href="classes/GetText.html#M000111">np_ (GetText)</a><br />
+    <a href="classes/GetText.html#M000092">npgettext (GetText)</a><br />
     <a href="classes/GetText.html#M000110">ns_ (GetText)</a><br />
-    <a href="classes/GetText.html#M000094">nsgettext (GetText)</a><br />
+    <a href="classes/GetText.html#M000095">nsgettext (GetText)</a><br />
     <a href="classes/MOFile.html#M000005">open (MOFile)</a><br />
-    <a href="classes/GetText/TextDomainManager.html#M000120">output_charset (GetText::TextDomainManager)</a><br />
-    <a href="classes/GetText.html#M000100">output_charset (GetText)</a><br />
-    <a href="classes/GetText.html#M000099">output_charset= (GetText)</a><br />
-    <a href="classes/GetText/TextDomainManager.html#M000119">output_charset= (GetText::TextDomainManager)</a><br />
-    <a href="classes/GetText.html#M000109">p_ (GetText)</a><br />
-    <a href="classes/Locale/Object.html#M000059">parse (Locale::Object)</a><br />
-    <a href="classes/GetText.html#M000089">pgettext (GetText)</a><br />
-    <a href="classes/ActionView/TemplateFinder.html#M000070">pick_template_with_gettext (ActionView::TemplateFinder)</a><br />
+    <a href="classes/GetText.html#M000101">output_charset (GetText)</a><br />
+    <a href="classes/GetText/TextDomainManager.html#M000122">output_charset (GetText::TextDomainManager)</a><br />
+    <a href="classes/GetText/TextDomainManager.html#M000121">output_charset= (GetText::TextDomainManager)</a><br />
+    <a href="classes/GetText.html#M000100">output_charset= (GetText)</a><br />
+    <a href="classes/GetText.html#M000112">p_ (GetText)</a><br />
+    <a href="classes/Locale/Object.html#M000060">parse (Locale::Object)</a><br />
+    <a href="classes/GetText.html#M000090">pgettext (GetText)</a><br />
+    <a href="classes/ActionView/TemplateFinder.html#M000071">pick_template_with_gettext (ActionView::TemplateFinder)</a><br />
     <a href="classes/MOFile.html#M000010">prime? (MOFile)</a><br />
-    <a href="classes/GetText.html#M000104">remove_all_textdomains (GetText)</a><br />
-    <a href="classes/GetText.html#M000074">rgettext (GetText)</a><br />
-    <a href="classes/GetText.html#M000075">rmsgfmt (GetText)</a><br />
-    <a href="classes/GetText.html#M000079">rmsgmerge (GetText)</a><br />
-    <a href="classes/GetText.html#M000108">s_ (GetText)</a><br />
-    <a href="classes/GetText/TextDomain.html#M000134">same_property? (GetText::TextDomain)</a><br />
+    <a href="classes/GetText.html#M000105">remove_all_textdomains (GetText)</a><br />
+    <a href="classes/GetText.html#M000075">rgettext (GetText)</a><br />
+    <a href="classes/GetText.html#M000076">rmsgfmt (GetText)</a><br />
+    <a href="classes/GetText.html#M000080">rmsgmerge (GetText)</a><br />
+    <a href="classes/GetText.html#M000109">s_ (GetText)</a><br />
+    <a href="classes/GetText/TextDomain.html#M000136">same_property? (GetText::TextDomain)</a><br />
     <a href="classes/MOFile.html#M000015">save_to_file (MOFile)</a><br />
     <a href="classes/MOFile.html#M000013">save_to_stream (MOFile)</a><br />
-    <a href="classes/Locale/Object.html#M000056">script= (Locale::Object)</a><br />
+    <a href="classes/Locale/Object.html#M000057">script= (Locale::Object)</a><br />
     <a href="classes/Locale.html#M000036">set (Locale)</a><br />
+    <a href="classes/GetText.html#M000077">set_cgi (GetText)</a><br />
     <a href="classes/Locale.html#M000026">set_cgi (Locale)</a><br />
-    <a href="classes/GetText.html#M000076">set_cgi (GetText)</a><br />
-    <a href="classes/Locale/SystemCGI.html#M000049">set_cgi (Locale::SystemCGI)</a><br />
+    <a href="classes/Locale/SystemCGI.html#M000050">set_cgi (Locale::SystemCGI)</a><br />
     <a href="classes/MOFile.html#M000016">set_comment (MOFile)</a><br />
     <a href="classes/Locale.html#M000034">set_current (Locale)</a><br />
     <a href="classes/Locale.html#M000029">set_default (Locale)</a><br />
     <a href="classes/ActiveRecord/Base.html#M000025">set_error_message_explanation (ActiveRecord::Base)</a><br />
     <a href="classes/ActiveRecord/Base.html#M000024">set_error_message_title (ActiveRecord::Base)</a><br />
-    <a href="classes/GetText.html#M000095">set_locale (GetText)</a><br />
-    <a href="classes/GetText/TextDomain.html#M000131">set_locale (GetText::TextDomain)</a><br />
-    <a href="classes/GetText/TextDomainManager.html#M000126">set_locale (GetText::TextDomainManager)</a><br />
-    <a href="classes/GetText.html#M000096">set_locale_all (GetText)</a><br />
-    <a href="classes/GetText.html#M000098">set_output_charset (GetText)</a><br />
-    <a href="classes/GetText.html#M000105">setlocale (GetText)</a><br />
-    <a href="classes/GetText.html#M000088">sgettext (GetText)</a><br />
+    <a href="classes/GetText/TextDomain.html#M000133">set_locale (GetText::TextDomain)</a><br />
+    <a href="classes/GetText.html#M000096">set_locale (GetText)</a><br />
+    <a href="classes/GetText/TextDomainManager.html#M000128">set_locale (GetText::TextDomainManager)</a><br />
+    <a href="classes/GetText.html#M000097">set_locale_all (GetText)</a><br />
+    <a href="classes/GetText.html#M000099">set_output_charset (GetText)</a><br />
+    <a href="classes/GetText.html#M000106">setlocale (GetText)</a><br />
+    <a href="classes/GetText.html#M000089">sgettext (GetText)</a><br />
     <a href="classes/Locale.html#M000031">system (Locale)</a><br />
-    <a href="classes/Locale/SystemCGI.html#M000048">system (Locale::SystemCGI)</a><br />
-    <a href="classes/Locale/SystemBase.html#M000046">system (Locale::SystemBase)</a><br />
+    <a href="classes/Locale/SystemCGI.html#M000049">system (Locale::SystemCGI)</a><br />
+    <a href="classes/Locale/SystemBase.html#M000047">system (Locale::SystemBase)</a><br />
     <a href="classes/Locale.html#M000042">system_module (Locale)</a><br />
-    <a href="classes/GetText.html#M000085">textdomain (GetText)</a><br />
-    <a href="classes/GetText/TextDomainManager.html#M000122">textdomain (GetText::TextDomainManager)</a><br />
-    <a href="classes/GetText.html#M000086">textdomain_to (GetText)</a><br />
-    <a href="classes/Locale/Object.html#M000066">to_a (Locale::Object)</a><br />
-    <a href="classes/Locale/Object.html#M000065">to_general (Locale::Object)</a><br />
-    <a href="classes/Locale/Object.html#M000063">to_iso3066 (Locale::Object)</a><br />
-    <a href="classes/Locale/Object.html#M000062">to_posix (Locale::Object)</a><br />
-    <a href="classes/Locale/Object.html#M000067">to_s (Locale::Object)</a><br />
-    <a href="classes/Locale/Object.html#M000068">to_str (Locale::Object)</a><br />
-    <a href="classes/Locale/Object.html#M000064">to_win (Locale::Object)</a><br />
+    <a href="classes/GetText/TextDomainManager.html#M000124">textdomain (GetText::TextDomainManager)</a><br />
+    <a href="classes/GetText.html#M000086">textdomain (GetText)</a><br />
+    <a href="classes/GetText.html#M000087">textdomain_to (GetText)</a><br />
+    <a href="classes/Locale/Object.html#M000067">to_a (Locale::Object)</a><br />
+    <a href="classes/Locale/Object.html#M000066">to_general (Locale::Object)</a><br />
+    <a href="classes/Locale/Object.html#M000064">to_iso3066 (Locale::Object)</a><br />
+    <a href="classes/Locale/Object.html#M000063">to_posix (Locale::Object)</a><br />
+    <a href="classes/Locale/Object.html#M000068">to_s (Locale::Object)</a><br />
+    <a href="classes/Locale/Object.html#M000069">to_str (Locale::Object)</a><br />
+    <a href="classes/Locale/Object.html#M000065">to_win (Locale::Object)</a><br />
     <a href="classes/ActiveRecord/Base.html#M000021">untranslate (ActiveRecord::Base)</a><br />
     <a href="classes/ActiveRecord/Base.html#M000022">untranslate? (ActiveRecord::Base)</a><br />
     <a href="classes/ActiveRecord/Base.html#M000019">untranslate_all (ActiveRecord::Base)</a><br />
     <a href="classes/ActiveRecord/Base.html#M000020">untranslate_all? (ActiveRecord::Base)</a><br />
-    <a href="classes/GetText/ActiveRecordParser.html#M000114">untranslate_column? (GetText::ActiveRecordParser)</a><br />
+    <a href="classes/GetText/ActiveRecordParser.html#M000116">untranslate_column? (GetText::ActiveRecordParser)</a><br />
     <a href="classes/MOFile.html#M000007">update! (MOFile)</a><br />
-    <a href="classes/GetText.html#M000073">update_pofiles (GetText)</a><br />
-    <a href="classes/Locale/Object.html#M000057">variant= (Locale::Object)</a><br />
+    <a href="classes/GetText.html#M000074">update_pofiles (GetText)</a><br />
+    <a href="classes/Locale/Object.html#M000058">variant= (Locale::Object)</a><br />
   </div>
 </div>
 </body>

data/lib/gettext.rb

@@ -10,7 +10,7 @@
   You may redistribute it and/or modify it under the same
   license terms as Ruby.
 
-  $Id: gettext.rb,v 1.43 2008/07/26 18:16:28 mutoh Exp $
+  $Id: gettext.rb,v 1.46 2008/09/13 18:23:55 mutoh Exp $
 =end
 
 require 'rbconfig'
@@ -355,12 +355,26 @@ module GetText
   # * n: a number used to determine the plural form.
   # * Returns: the localized text which key is msgid_plural if n is plural(follow plural-rule) or msgid.
   #   "plural-rule" is defined in po-file.
-  def npgettext(msgctxt, arg1, arg2 = nil)
+  def npgettext(msgctxt, arg1, arg2 = nil, arg3 = nil)
     if arg1.kind_of?(Array)
-      nsgettext(msgctxt + "\004" + arg1[0], arg1[1], arg2, nil)
+      msgid = arg1[0]
+      msgid_ctxt = "#{msgctxt}\004#{msgid}"
+      msgid_plural = arg1[1]
+      opt1 = arg2
+      opt2 = arg3
     else
-      nsgettext(msgctxt + "\004" + arg1, arg2, arg3, nil)
+      msgid = arg1
+      msgid_ctxt = "#{msgctxt}\004#{msgid}"
+      msgid_plural = arg2
+      opt1 = arg3
+      opt2 = nil
+    end
+    ret = nsgettext(msgid_ctxt, msgid_plural, opt1, opt2)
+    
+    if ret == msgid_ctxt
+      ret = msgid
     end
+    ret
   end
 
   # This function does nothing. But it is required in order to recognize the msgid by rgettext.
@@ -589,11 +603,18 @@ module GetText
   alias :_ :gettext   #:nodoc:
   alias :n_ :ngettext #:nodoc:
   alias :s_ :sgettext #:nodoc:
-  alias :p_ :pgettext #:nodoc:
   alias :ns_ :nsgettext #:nodoc:
+  alias :np_ :npgettext #:nodoc:
+
+unless defined? "XX"
+  # This is the workaround to conflict p_ methods with the xx("double x") library.
+  # http://rubyforge.org/projects/codeforpeople/
+  alias :p_ :pgettext #:nodoc:
+  module_function :p_
+end
 
   module_function :bindtextdomain, :textdomain, :each_textdomain, :cached=, :cached?, :clear_cache, 
-  :N_, :gettext, :_, :ngettext, :n_, :sgettext, :s_, :nsgettext, :ns_, :pgettext, :p_,
+  :N_, :gettext, :_, :ngettext, :n_, :sgettext, :s_, :nsgettext, :ns_, :pgettext, :npgettext, :np_,
   :bound_target, :bound_targets, :find_targets,
   :setlocale, :set_locale, :locale=, :set_locale_all, :locale, 
   :set_output_charset, :output_charset=, :output_charset, :current_textdomain_info, :remove_all_textdomains