? Drupal-fix-pot-errors-big.patch
Index: includes/common.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/common.inc,v
retrieving revision 1.318
diff -u -r1.318 common.inc
--- includes/common.inc	1 Feb 2004 19:07:36 -0000	1.318
+++ includes/common.inc	3 Feb 2004 18:02:49 -0000
@@ -608,8 +608,9 @@
     $output = module_invoke($type, "search_item", $item);
   }
   else {
+    $modulename = module_invoke($type, 'help', 'admin/system/modules#name');
     $output = " <strong><u><a href=\"". $item["link"] ."\">". $item["title"] ."</a></u></strong><br />";
-    $output .= " <small>" . t($type) . ($item["user"] ? " - ". $item["user"] : "") ."". ($item["date"] ? " - ". format_date($item["date"], "small") : "") ."</small>";
+    $output .= " <small>" . $modulename . ($item["user"] ? " - ". $item["user"] : "") ."". ($item["date"] ? " - ". format_date($item["date"], "small") : "") ."</small>";
     $output .= "<br /><br />";
   }
 
@@ -645,7 +646,8 @@
 
     foreach (module_list() as $name) {
       if (module_hook($name, "search")) {
-        $output .= " <input type=\"checkbox\" name=\"edit[type][$name]\" ". ($edit["type"][$name] ? " checked=\"checked\"" : "") ." /> ". t($name);
+        $modulename = module_invoke($type, 'help', 'admin/system/modules#name');
+        $output .= " <input type=\"checkbox\" name=\"edit[type][$name]\" ". ($edit["type"][$name] ? " checked=\"checked\"" : "") ." /> ". $modulename;
       }
     }
   }
@@ -780,6 +782,14 @@
     }
   }
   return ($output) ? $output : t("0 sec");
+  
+  // Never executed, but needed for the .pot extraction
+  format_plural(1, '1 year', '%count years');
+  format_plural(1, '1 week', '%count weeks');
+  format_plural(1, '1 day', '%count days');
+  format_plural(1, '1 hour', '%count hours');
+  format_plural(1, '1 min', '%count min');
+  format_plural(1, '1 sex', '%count sec');
 }
 
 function format_date($timestamp, $type = "medium", $format = "") {
@@ -803,10 +813,10 @@
   }
 
   for ($i = strlen($format); $i >= 0; $c = $format[--$i]) {
-    if (strstr("DFlMSw", $c)) {
+    if (strstr("AaDFlM", $c)) {
       $date = t(date($c, $timestamp)) . $date;
     }
-    else if (strstr("AaBdgGhHiIjLmnOrstTUWYyZz", $c)) {
+    else if (strstr("BdgGhHiIjLmnOrsStTUwWYyZz", $c)) {
       $date = date($c, $timestamp) . $date;
     }
     else {
Index: includes/tablesort.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/tablesort.inc,v
retrieving revision 1.14
diff -u -r1.14 tablesort.inc
--- includes/tablesort.inc	1 Feb 2004 10:39:23 -0000	1.14
+++ includes/tablesort.inc	3 Feb 2004 18:02:50 -0000
@@ -33,8 +33,7 @@
   if ($cell['data'] == $ts['order']) {
     $cell['class'] = 'cell-highlight';
     $image = '&nbsp;<img src="' . theme('image', 'arrow-' . $ts['sort'] . '.gif"') . ' alt="'. t('sort icon') .'" />';
-    $dir = array("asc" => "ascending", "desc" => "descending");
-    $title = t("sort ". $dir[$ts['sort']]);
+    $title = ($ts['sort'] == 'asc' ? t("sort ascending") : t("sort descending"));
   } else {
     // If the user clicks a different header, we want to sort ascending initially.
     $ts['sort'] = "asc";
Index: modules/admin.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/admin.module,v
retrieving revision 1.42
diff -u -r1.42 admin.module
--- modules/admin.module	1 Dec 2003 13:45:32 -0000	1.42
+++ modules/admin.module	3 Feb 2004 18:02:50 -0000
@@ -3,6 +3,8 @@
 
 function admin_help($section) {
   switch ($section) {
+    case "admin/system/modules#name":
+      return t("admin");
     case "admin/system/modules#description":
       return t("Handles the administration pages.");
     case "admin":
Index: modules/aggregator.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/aggregator.module,v
retrieving revision 1.161
diff -u -r1.161 aggregator.module
--- modules/aggregator.module	24 Jan 2004 15:47:44 -0000	1.161
+++ modules/aggregator.module	3 Feb 2004 18:02:54 -0000
@@ -53,6 +53,8 @@
       <h3>Technical details</h3>
       <p>When fetching feeds Drupal supports conditional GETs, this reduces the bandwidth usage for feeds that have not been updated since the last check.</p>
       <p>If a feed is permanently moved to a new location Drupal will automatically update the feed URL to the new address.</p>", array("%amphetadesk" => "<a href=\"http://www.disobey.com/amphetadesk/\">AmphetaDesk</a>", "%rss" => "<a href=\"http://groups.yahoo.com/group/rss-dev/files/specification.html\">Rich Site Summary</a>", "%slashdot-rss" => "<a href=\"http://slashdot.org/slashdot.rdf\">http://slashdot.org/slashdot.rdf</a>", "%syndic8" => "<a href=\"http://www.syndic8.com/\">Syndic8</a>", "%rss-what" => "<a href=\"http://www.xml.com/pub/a/2002/12/18/dive-into-xml.html\">What is RSS</a>", "%rss-evolution" => "<a href=\"http://www.webreference.com/authoring/languages/xml/rss/1/\">The Evolution of RSS</a>", "%admin-news" => l(t("RSS/RDF"), "admin/syndication/news"), "%new-feed" => l(t("new feed"), "admin/syndication/news/add/feed"), "%update-items" => l(t("update items"), "admin/syndication/news")));
+    case "admin/system/modules#name":
+      return t("aggregator");
     case 'admin/system/modules#description':
       return t("Used to aggregate syndicated content (RSS and RDF).");
     case 'admin/system/modules/aggregator':
@@ -82,7 +84,7 @@
 }
 
 function aggregator_perm() {
-  return array('administer news feeds', 'access news feeds');
+  return array('administer news feeds' => t('administer news feeds'), 'access news feeds' => t('access news feeds'));
 }
 
 function aggregator_link($type) {
Index: modules/archive.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/archive.module,v
retrieving revision 1.46
diff -u -r1.46 archive.module
--- modules/archive.module	6 Jan 2004 18:30:10 -0000	1.46
+++ modules/archive.module	3 Feb 2004 18:02:55 -0000
@@ -5,6 +5,8 @@
   $output = "";
 
   switch ($section) {
+    case "admin/system/modules#name":
+      return t("archive");
     case 'admin/system/modules#description':
       $output = t("Displays a calendar to navigate old content.");
       break;
@@ -83,10 +85,10 @@
   $output .= "\n<!-- calendar -->\n";
   $output .= "<div class=\"calendar\">";
   $output .= "<table>\n";
-  $output .= " <tr><td colspan=\"7\" class=\"header-month\">". l("&laquo;", "archive/". date("Y/m/d", $prev)) ." ". t(date("F", $requested)) . date(" Y", $requested) ." ". ($nextmonth <= time() ? l("&raquo;", "archive/". date("Y/m/d", $next)) : "&nbsp;") ."</td></tr>\n";
+  $output .= " <tr><td colspan=\"7\" class=\"header-month\">". l("&laquo;", "archive/". date("Y/m/d", $prev)) ." ". format_date($requested, "custom", "F") . date(" Y", $requested) ." ". ($nextmonth <= time() ? l("&raquo;", "archive/". date("Y/m/d", $next)) : "&nbsp;") ."</td></tr>\n";
 
   // First day of week (0 => Sunday, 1 => Monday, ...)
-  $weekstart = variable_get("default_firstday", 0);
+  $cday = $weekstart = variable_get("default_firstday", 0);
 
   // Last day of week
   ($weekstart - 1 == -1) ? $lastday = 6 : $lastday = $weekstart - 1;
@@ -95,8 +97,10 @@
   $firstcolumn = mktime(0, 0, 0, 3, 20 + $weekstart, 1994);
 
   $output .= " <tr class=\"header-week\">";
+  $days = array(t('Su'), t('Mo'), t('Tu'), t('We'), t('Th'), t('Fr'), t('Sa'));
   for ($i = 0; $i < 7; $i++) {
-    $output .= "<td>". t(substr(ucfirst(date("l", $firstcolumn + $i * 86400)), 0, 2)) ."</td>";
+    $output .= "<td>". $days[$cday] . "</td>";
+    $cday = ($cday < 6 : $cday+1 : 0);
   }
   $output .= "</tr>\n";
 
Index: modules/block.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/block.module,v
retrieving revision 1.102
diff -u -r1.102 block.module
--- modules/block.module	23 Jan 2004 18:42:43 -0000	1.102
+++ modules/block.module	3 Feb 2004 18:02:57 -0000
@@ -36,6 +36,8 @@
 </pre></blockquote>
 <p>For more in-depth examples, we recommend that you check the existing boxes and use them as a starting point.</p>", array("%pcre" => "http://php.net/pcre/"));
       break;
+    case "admin/system/modules#name":
+      return t("block");
     case 'admin/system/modules#description':
       $output = t("Controls the boxes that are displayed around the main content.");
       break;
@@ -58,7 +60,7 @@
 }
 
 function block_perm() {
-  return array("administer blocks");
+  return array("administer blocks" => t("administer blocks"));
 }
 
 function block_link($type) {
Index: modules/blog.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/blog.module,v
retrieving revision 1.165
diff -u -r1.165 blog.module
--- modules/blog.module	2 Feb 2004 01:55:08 -0000	1.165
+++ modules/blog.module	3 Feb 2004 18:02:58 -0000
@@ -13,7 +13,7 @@
 }
 
 function blog_perm() {
-  return array("maintain personal blog");
+  return array("maintain personal blog" => t('maintain personal blog'));
 }
 
 function blog_access($op, $node) {
@@ -58,6 +58,8 @@
       <p>The blog module adds a \"user blogs\" navigation link to the site, which takes any visitor to a page that displays the most recent blog entries from all the users on the site. Personal user menus gain a \"create a blog entry\" link (which takes you to a submission form) and a \"view personal blog\" link (which displays your blog entries as other people will see them).  On the bottom of each of your own blog entries, there is an \"edit this blog entry\" link that lets you edit or delete that entry.</p>
       <p>If a user has the ability to post blogs, then the import module (news aggregator) will display a blog-it link <strong>(b)</strong> next to each news item in its lists.  Click on this and you will be taken to the blog submission form, with the title, a link to the item, and a link to the source into the body text already in the text box, ready for you to add your explanation.  This actively encourages people to add blog entries about things they see and hear elsewhere in the Drupal site and from your syndicated partner sites.</p>", array("%scripting-com" => "<a href=\"http://www.scripting.com/\">http://www.scripting.com/</a>"));
       break;
+    case "admin/system/modules#name":
+      return t("blog");
     case 'admin/system/modules#description':
       $output .= t("Enables keeping a blog or easily and regularly updated web page.");
       break;
Index: modules/blogapi.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/blogapi.module,v
retrieving revision 1.5
diff -u -r1.5 blogapi.module
--- modules/blogapi.module	22 Dec 2003 11:28:07 -0000	1.5
+++ modules/blogapi.module	3 Feb 2004 18:02:59 -0000
@@ -6,6 +6,8 @@
   switch ($section) {
     case 'admin/help#blogapi':
       return t('This module adds support for several XML-RPC based blogging APIs. Specifically, it currently implements the %bloggerAPI, %metaweblogAPI, and most of the %moveabletype extensions.  This allows users to contribute to drupal using external GUI applications, which can often offer richer functionality that online forms based editing', array('%bloggerAPI' => '<a href="http://www.blogger.com/developers/api/1_docs/">Blogger API</a>', '%metaweblogAPI' => '<a href="http://www.xmlrpc.com/metaWeblogApi">MetaWeblog API</a>', '%moveabletype' => '<a href="http://www.movabletype.org/docs/mtmanual_programmatic.html">Moveable Type API</a>'));
+    case "admin/system/modules#name":
+      return t("blogapi");
     case 'admin/system/modules#description':
       return t('Enable users to post using applications that support XML-RPC blog APIs');
   }
Index: modules/book.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/book.module,v
retrieving revision 1.215
diff -u -r1.215 book.module
--- modules/book.module	27 Jan 2004 22:10:47 -0000	1.215
+++ modules/book.module	3 Feb 2004 18:03:03 -0000
@@ -6,7 +6,7 @@
 }
 
 function book_perm() {
-  return array("maintain books");
+  return array("maintain books" => t('maintain books'));
 }
 
 function book_access($op, $node) {
@@ -887,6 +887,8 @@
       <p>Whenever you come across a post which you want to include in your FAQ, click on the <i>administer</i> link. Then click on the <i>edit book outline</i> button at the bottom of the page. Then place the relevant post wherever is most appropriate in your book by selecting a <i>parent</i>. Books are quite flexible. They can have sections like <i>Flying to Estonia</i>, <i>Eating in Estonia</i> and so on. As you get more experienced with the book module, you can reorganize posts in your book so that it stays organized.</p>
       <p>Notes:</p><ul><li>Any comments attached to those relevant posts which you designate as book pages will also be transported into your book. This is a great feature, since much wisdom is shared via comments. Remember that all future comments and edits will automatically be reflected in your book.</li><li>You may wish to edit the title of posts when adding them to your FAQ. This is done on the same page as the <i>Edit book outline</i> button. Clear titles improve navigability enormously.</li><li>Book pages may come from any content type (blog, story, page, etc.). If you are creating a post solely for inclusion in your book, then use the <a href=\"%create\">submit content &raquo; book page</a> link.</li><li>If you don't see the <i>administer</i> link, then you probably have insufficient <a href=\"%permissions\">permissions</a>.</li><li>If you want to get really fancy, note that books are one of the few content types which allow raw PHP in their <i>body</i>. So you've got lots of geeky possibilities there.</li></ul>", array("%permissions" => url("admin/user/permission"), "%create" => url("node/add/book"), "%collaborative-book" => url("admin/node/book"), "%orphans-book" => url("admin/node/book/orphan"), "%export-book" => url("book/print")));
       break;
+    case "admin/system/modules#name":
+      return t("book");
     case 'admin/system/modules#description':
       $output = t("Allows users to collaboratively author a book.");
       break;
Index: modules/comment.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/comment.module,v
retrieving revision 1.215
diff -u -r1.215 comment.module
--- modules/comment.module	31 Jan 2004 21:16:42 -0000	1.215
+++ modules/comment.module	3 Feb 2004 18:03:10 -0000
@@ -69,6 +69,8 @@
       <h4>Initial comment scores</h4>
       <p>Finally, you may want to enter some <i>initial comment scores</i>. In <a href=\"%comment-initial\">administer &raquo; comments &raquo; initial comment scores</a> you can assign a beginning rating for all comments posted by a particular permission role. If you do not assign any initial scores, Drupal will assign a rating of <strong>0</strong> as the default.</p>", array("%comment-config" => url("admin/system/modules/comment"), "%site-config" => url("admin/system"), "%user-permissions" => url("admin/user/permission"), "%tracker" => url("tracker"), "%download-notify" => "http://drupal.org/project/releases", "%permission" => url("admin/user/permission"), "%comment-moderation" => url("admin/comment/moderation"), "%comment-votes" => url("admin/comment/moderation/votes"), "%comment-matrix" => url("admin/comment/moderation/matrix"), "%comment-thresholds" => url("admin/comment/moderation/filters"), "%slashdot" => " http://slashdot.org", "%comment-initial" => url("admin/comment/moderation/roles")));
       break;
+    case "admin/system/modules#name":
+      return t("comment");
     case 'admin/system/modules#description':
       $output = t("Enables user to comment on content (nodes).");
       break;
@@ -741,7 +743,7 @@
 }
 
 function comment_perm() {
-  return array("access comments", "post comments", "administer comments", "moderate comments", "post comments without approval", "administer moderation");
+  return array("access comments" => t("access comments"), "post comments" => t("post comments"), "administer comments" => t("administer comments"), "moderate comments" => t("moderate comments"), "post comments without approval" => t("post comments without approval"), "administer moderation" => t("administer moderation"));
 }
 
 function comment_link($type, $node = 0, $main = 0) {
Index: modules/drupal.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/drupal.module,v
retrieving revision 1.73
diff -u -r1.73 drupal.module
--- modules/drupal.module	23 Jan 2004 18:42:43 -0000	1.73
+++ modules/drupal.module	3 Feb 2004 18:03:11 -0000
@@ -12,6 +12,8 @@
 <p>The listing of your site will occur shortly after your site's next <a href=\"%cron-run\">cron run</a>. Note that cron.php should be called using the domain name which you want to have listed at <a href=\"%Drupal\">drupal.org</a>. For example, don't kick off cron by requesting http://127.0.0.1/cron.php. Instead, use a publicly accessible domain name such as http://www.example.com/cron.php.</p>
 <p>Also note that your installation need not use drupal.org as its directory server. For example, this feature is perfectly capable of aggregating pings from all of your departmental drupal installations sites within an enterprise.</p>", array("%drupal-sites" => "http://www.drupal.org/sites", "%Drupal" => "http://www.drupal.org", "%drupal-xml-rpc" => "http://www.drupal.org/xmlrpc.php", "%xml-rpc" => "http://www.xmlrpc.com/", "%site-admin" => url("admin/system"), "%drupal-settings" => url("admin/system/modules/drupal"), "%cron" => url("admin/system/help#cron")));
       break;
+    case "admin/system/modules#name":
+      return t("drupal");
     case 'admin/system/modules#description':
       return t("Lets users log in using a Drupal ID and can notify a central server about your site.");
       break;
Index: modules/filter.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/filter.module,v
retrieving revision 1.5
diff -u -r1.5 filter.module
--- modules/filter.module	31 Jan 2004 10:18:51 -0000	1.5
+++ modules/filter.module	3 Feb 2004 18:03:12 -0000
@@ -3,6 +3,8 @@
 
 function filter_help($section = "admin/help#filter") {
   switch ($section) {
+    case "admin/system/modules#name":
+      return t("filter");
     case 'admin/system/modules#description':
       return t("Framework for handling filtering of content.");
     case 'admin/system/filters':
Index: modules/forum.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/forum.module,v
retrieving revision 1.163
diff -u -r1.163 forum.module
--- modules/forum.module	1 Feb 2004 21:32:01 -0000	1.163
+++ modules/forum.module	3 Feb 2004 18:03:14 -0000
@@ -14,6 +14,8 @@
       <p>To disable icons, set the icon path as blank in <a href=\"%forums\">administer &raquo; configutation &raquo; modules &raquo; forum</a>.</p>
       <p>All files in the icon directory are assumed to be images. You may use images of whatever size you wish, but it is recommended to use 15x15 or 16x16.</p>", array("%taxonomy" => url("admin/taxonomy/add/vocabulary"), "%taxo-terms" => url("admin/taxonomy"), "%forums" => url("admin/system/modules/forum"), "%permission" => url("admin/user/permission")));
       break;
+    case "admin/system/modules#name":
+      return t("forum");
     case 'admin/system/modules#description':
       $output = t('Enable threaded discussions about general topics.');
       break;
@@ -45,7 +47,7 @@
 }
 
 function forum_perm() {
-  return array('create forum topics');
+  return array('create forum topics' => t('create forum topics'));
 }
 
 function forum_settings() {
Index: modules/help.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/help.module,v
retrieving revision 1.30
diff -u -r1.30 help.module
--- modules/help.module	23 Jan 2004 18:42:43 -0000	1.30
+++ modules/help.module	3 Feb 2004 18:03:14 -0000
@@ -52,6 +52,8 @@
       }
       $output = "<small>". implode(" &middot; ", $links) ."</small><hr />". $output;
       break;
+    case "admin/system/modules#name":
+      return t("help");
     case 'admin/system/modules#description':
       $output = t("Manages displaying online help.");
       break;
Index: modules/locale.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/locale.module,v
retrieving revision 1.93
diff -u -r1.93 locale.module
--- modules/locale.module	1 Feb 2004 21:04:41 -0000	1.93
+++ modules/locale.module	3 Feb 2004 18:03:16 -0000
@@ -33,6 +33,8 @@
     mysql> ALTER TABLE {locales} ADD fr TEXT DEFAULT '' NOT NULL;
   </pre>", array("%overview" => url("admin/locale")));
       break;
+    case "admin/system/modules#name":
+      return t("locale");
     case 'admin/system/modules#description':
       return t('Enables the translation of the user interface to languages other than English.');
     case 'admin/locale':
@@ -48,7 +50,7 @@
 }
 
 function locale_perm() {
-  return array('administer locales');
+  return array('administer locales' => t('administer locales'));
 }
 
 function locale_link($type) {
@@ -313,21 +315,16 @@
   ** to track if the locale table is up-to-date.
   */
 
-  $revision = 1;
+  $revision = 2;
 
   if (variable_get("locale_initialize_revision", 0) < $revision) {
     variable_set("locale_initialize_revision", $revision);
-    for ($i = 1; $i <= 12; $i++) {
-      $stamp = mktime(0, 0, 0, $i, 1, 1971);
-      t(date("F", $stamp));
-      t(date("M", $stamp));
-    }
-
-    for ($i = 0; $i <= 7; $i++) {
-      $stamp = $i * 86400;
-      t(date("D", $stamp));
-      t(date("l", $stamp));
-    }
+    
+    t('am'); t('pm'); t('AM'); t('PM');
+    t('Sunday'); t('Monday'); t('Tuesday'); t('Wednesday'); t('Thursday'); t('Friday'); t('Saturday');
+    t('Sun'); t('Mon'); t('Tue'); t('Wed'); t('Thu'); t('Fri'); t('Sat');
+    t('January'); t('February'); t('March'); t('April'); t('May'); t('June'); t('July'); t('August'); t('September'); t('October'); t('November'); t('December');
+    t('Jan'); t('Feb'); t('Mar'); t('Apr'); t('May'); t('Jun'); t('Jul'); t('Aug'); t('Sep'); t('Oct'); t('Nov'); t('Dec');
   }
 }
 
Index: modules/node.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/node.module,v
retrieving revision 1.325
diff -u -r1.325 node.module
--- modules/node.module	2 Feb 2004 02:05:20 -0000	1.325
+++ modules/node.module	3 Feb 2004 18:03:21 -0000
@@ -41,6 +41,8 @@
       }
       break;
 
+    case "admin/system/modules#name":
+      return t("node");
     case 'admin/system/modules#description':
       $output = t('The core that allows content to be submitted to the site.');
       break;
@@ -541,7 +543,7 @@
 }
 
 function node_perm() {
-  return array('administer nodes', 'access content');
+  return array('administer nodes' => t('administer nodes'), 'access content' => t('access content'));
 }
 
 function node_search($keys) {
Index: modules/page.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/page.module,v
retrieving revision 1.109
diff -u -r1.109 page.module
--- modules/page.module	31 Jan 2004 21:16:42 -0000	1.109
+++ modules/page.module	3 Feb 2004 18:03:21 -0000
@@ -10,6 +10,8 @@
       <p>The page module is used to create a <i>static page</i>.  Unlike a story, a static page is a persistent web page on your site which usually shortcuts the typical lifecycle of user generated content (i.e. submit -&gt; moderate -&gt; post -&gt; comment).  A static page is usually linked from the main navigation bar, using whatever text the author wishes.  To create a static page without this navigation link, simply skip the link text field.</p>
       <p>Site pages, unlike many other forms of Drupal content, may be made of PHP code in addition to HTML and text. All Drupal objects and functions are available to a site administrator.</p>");
       break;
+    case "admin/system/modules#name":
+      return t("page");
     case 'admin/system/modules#description':
       $output = t("Enables the creation of a static pages that can be added to the navigation system.");
       break;
@@ -22,7 +24,7 @@
 }
 
 function page_perm() {
-  return array("maintain static pages");
+  return array("maintain static pages" => t('maintain static pages'));
 }
 
 function page_node_name($node) {
Index: modules/path.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/path.module,v
retrieving revision 1.26
diff -u -r1.26 path.module
--- modules/path.module	1 Feb 2004 10:52:25 -0000	1.26
+++ modules/path.module	3 Feb 2004 18:03:23 -0000
@@ -105,6 +105,8 @@
 function path_help($section = "admin/help#path") {
 
   switch ($section) {
+    case "admin/system/modules#name":
+      return t("path");
     case "admin/system/modules#description":
       $output = t("Enables users to create custom URLs.");
       break;
@@ -213,7 +215,7 @@
 }
 
 function path_perm() {
-  return array("create url aliases", "administer url aliases");
+  return array("create url aliases" => t("create url aliases"), "administer url aliases" => t("administer url aliases"));
 }
 
 function path_overview() {
Index: modules/ping.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/ping.module,v
retrieving revision 1.14
diff -u -r1.14 ping.module
--- modules/ping.module	23 Jan 2004 18:42:43 -0000	1.14
+++ modules/ping.module	3 Feb 2004 18:03:23 -0000
@@ -14,6 +14,8 @@
       <p>The ping feature requires crontab.</p>", array("%weblogs" => "<a href=\"http://www.weblogs.com/\">Weblogs.com</a>", "%weblogs-XML" => "<a href=\"http://www.xmlrpc.com/weblogsCom/\">". t("XML-RPC interface of weblogs.com") ."</a>", "%weblogs-RSS" => "<a href=\"http://www.xmlrpc.com/weblogsComForRSS\">". t("Weblogs.Com for RSS") ."</a>", "%weblogs-RSS-changes" => "<a href=\"http://www.weblogs.com/rssUpdates/changes.xml\">". t("the weblogs.com for RSS") ."</a>", "%blo-gs" => "<a href=\"http://blo.gs/\">blo.gs</a>", "%blogtracker" => "<a href=\"http://www.dansanderson.com/blogtracker\">blogtracker</a>", "%blogrolling" => "<a href=\"http://www.blogrolling.com\">blogtolling.com</a>", "%blo-gs-XML" => "<a href=\"http://blo.gs/ping.php\">". t("XML-RPC interface of blo.gs") ."</a>"));
       break;
 
+    case "admin/system/modules#name":
+      return t("ping");
     case 'admin/system/modules#description':
       $output = t("Alerts other site(s) that your site has been updated.");
       break;
Index: modules/poll.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/poll.module,v
retrieving revision 1.128
diff -u -r1.128 poll.module
--- modules/poll.module	27 Jan 2004 18:47:07 -0000	1.128
+++ modules/poll.module	3 Feb 2004 18:03:24 -0000
@@ -153,6 +153,8 @@
       </ul>
       <p>Creating a poll is much like creating any other node. Click \"create poll\" in your user box. The title of the poll should be the question, then enter the answers and the \"base\" vote counts. You can also choose the time period over which the vote will run.</p><p>The <a href=\"%poll\">Poll</a> item in the navigation links will take you to a page where you can see all the current polls, vote on them (if you haven't already) and view the results.</p>", array("%permissions" => url("admin/user/permission"), "%poll" => url("poll")));
       break;
+    case "admin/system/modules#name":
+      return t("poll");
     case 'admin/system/modules#description':
       $output = t("Enables your site to capture votes on different topics in the form of multiple choice questions.");
       break;
@@ -260,7 +262,7 @@
 }
 
 function poll_perm() {
-  return array("create polls", "vote on polls");
+  return array("create polls" => t("create polls"), "vote on polls" => t("vote on polls"));
 }
 
 function poll_teaser($node) {
Index: modules/profile.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/profile.module,v
retrieving revision 1.37
diff -u -r1.37 profile.module
--- modules/profile.module	11 Jan 2004 20:31:25 -0000	1.37
+++ modules/profile.module	3 Feb 2004 18:03:26 -0000
@@ -41,6 +41,8 @@
   $output = "";
 
   switch ($section) {
+    case "admin/system/modules#name":
+      return t("profile");
     case 'admin/system/modules#description':
       $output = t("Support for configurable user profiles.");
       break;
Index: modules/queue.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/queue.module,v
retrieving revision 1.102
diff -u -r1.102 queue.module
--- modules/queue.module	21 Jan 2004 18:08:17 -0000	1.102
+++ modules/queue.module	3 Feb 2004 18:03:27 -0000
@@ -5,6 +5,8 @@
   $output = "";
 
   switch ($section) {
+    case "admin/system/modules#name":
+      return t("queue");
     case 'admin/system/modules#description':
       $output = t("Enables content to be moderated by the community.");
       break;
@@ -29,7 +31,7 @@
 }
 
 function queue_perm() {
-  return array("access submission queue");
+  return array("access submission queue" => t("access submission queue"));
 }
 
 function queue_link($type) {
Index: modules/search.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/search.module,v
retrieving revision 1.73
diff -u -r1.73 search.module
--- modules/search.module	23 Jan 2004 18:42:43 -0000	1.73
+++ modules/search.module	3 Feb 2004 18:03:28 -0000
@@ -12,6 +12,8 @@
       <strong>Words excluded from the search</strong>
       <p>Words that frequently occur, typically called 'noise words', are ignored.  Example words are 'a', 'at', 'and', 'are', 'as', 'how', 'where', etc.  Words shorter than %number letters are also ignored.</p>", array("%number" => variable_get("minimum_word_size", 2)));
       break;
+    case "admin/system/modules#name":
+      return t("search");
     case 'admin/system/modules#description':
       $output = t("Enables site wide keyword searching.");
       break;
@@ -26,7 +28,7 @@
  * Return an array of valid search access permissions
  */
 function search_perm() {
-  return array("search content", "administer search");
+  return array("search content" => t("search content"), "administer search" => t("administer search"));
 }
 
 /**
Index: modules/statistics.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/statistics.module,v
retrieving revision 1.136
diff -u -r1.136 statistics.module
--- modules/statistics.module	1 Feb 2004 21:04:41 -0000	1.136
+++ modules/statistics.module	3 Feb 2004 18:03:31 -0000
@@ -41,7 +41,7 @@
   **   access statistics            - see how many times individual content has
   **                                  been viewed (if enabled)
   */
-  return array("administer statistics module", "administer statistics", "access statistics");
+  return array("administer statistics module" => t("administer statistics module"), "administer statistics" => t("administer statistics"), "access statistics" => t("access statistics"));
 }
 
 
@@ -153,6 +153,8 @@
       </ul>
       <p>\$dbrows is the number or rows you want returned in your array.</p>", array("%modules" => url("admin/system/modules"), "%permissions" => url("admin/user/permission"), "%referers" => url("admin/statistics/referrers"), "%access" => url("admin/statistics/log"), "%configuration" => url("admin/system/modules/statistics"), "%block" => url("admin/system/block")));
       break;
+    case "admin/system/modules#name":
+      return t("statistics");
     case 'admin/system/modules#description':
       $output = t("Logs access statistics for your site.");
       break;
Index: modules/story.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/story.module,v
retrieving revision 1.143
diff -u -r1.143 story.module
--- modules/story.module	27 Jan 2004 22:10:47 -0000	1.143
+++ modules/story.module	3 Feb 2004 18:03:32 -0000
@@ -5,6 +5,8 @@
   $output = "";
 
   switch ($section) {
+    case "admin/system/modules#name":
+      return t("story");
     case 'admin/system/modules#description':
       $output = t("Enables users to submit stories, articles or similar content.");
       break;
@@ -39,7 +41,7 @@
 }
 
 function story_perm() {
-  return array("create stories");
+  return array("create stories" => t("create stories"));
 }
 
 function story_access($op, $node) {
Index: modules/system.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/system.module,v
retrieving revision 1.124
diff -u -r1.124 system.module
--- modules/system.module	23 Jan 2004 18:42:43 -0000	1.124
+++ modules/system.module	3 Feb 2004 18:03:34 -0000
@@ -29,6 +29,8 @@
       <h3><a id=\"cache\">Cache</a></h3>
       <p>Drupal has a caching mechanism which stores dynamically generated web pages in a database.  By caching a web page, Drupal does not have to create the page each time someone wants to view it, instead it takes only one SQL query to display it, reducing response time and the server's load.  Only pages requested by \"anonymous\" users are cached.</p>", array("%base_url" => $base_url, "%cron-link" => "<a href=\"$base_url/cron.php\">$base_url/cron.php</a>", "%lynx" => "http://lynx.browser.org", "%wget" => "http://www.gnu.org/software/wget/wget.html" ));
       break;
+    case "admin/system/modules#name":
+      return t("system");
     case 'admin/system/modules#description':
       $output = t("Configuration system that lets administrators modify the workings of the site.");
       break;
@@ -42,7 +44,7 @@
 }
 
 function system_perm() {
-  return array("administer site configuration", "access administration pages", "bypass input data check", "create php content");
+  return array("administer site configuration" => t("administer site configuration"), "access administration pages" => t("access administration pages"), "bypass input data check" => t("bypass input data check"), "create php content" => t("create php content"));
 }
 
 function system_link($type) {
@@ -68,7 +70,7 @@
         // TODO: reenable 'forced refresh' once we move the menu_build() later in the request.  it added overhead with no benefit
         // NOTE: refresh the list because some modules might have been enabled/disabled.
         if (module_hook($name, "settings")) {
-          menu("admin/system/modules/$name", t($name), "system_admin");
+          menu("admin/system/modules/$name", module_invoke($name, 'help', 'admin/system/modules#name'), "system_admin");
         }
       }
       menu("admin/system/help", t("help"), "system_help_page", 9);
Index: modules/taxonomy.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/taxonomy.module,v
retrieving revision 1.99
diff -u -r1.99 taxonomy.module
--- modules/taxonomy.module	1 Feb 2004 21:51:28 -0000	1.99
+++ modules/taxonomy.module	3 Feb 2004 18:03:38 -0000
@@ -18,7 +18,7 @@
 }
 
 function taxonomy_perm() {
-  return array("administer taxonomy");
+  return array("administer taxonomy" => t("administer taxonomy"));
 }
 
 function taxonomy_link($type, $node = NULL) {
@@ -834,6 +834,8 @@
   $output = "";
 
   switch ($section) {
+    case "admin/system/modules#name":
+      return t("taxonomy");
     case 'admin/system/modules#description':
       $output = t("Enables the organization of content into categories.");
       break;
Index: modules/throttle.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/throttle.module,v
retrieving revision 1.27
diff -u -r1.27 throttle.module
--- modules/throttle.module	23 Jan 2004 18:42:43 -0000	1.27
+++ modules/throttle.module	3 Feb 2004 18:03:39 -0000
@@ -50,12 +50,14 @@
   ** throttle module defines the following permissions:
   **   access throttle block - see throttle statistics
   */
-  return array('access throttle block');
+  return array('access throttle block' => t('access throttle block'));
 }
 
 function throttle_help($section = "admin/help#throttle") {
 
   switch ($section) {
+    case "admin/system/modules#name":
+      return t("throttle");
     case "admin/system/modules#description":
       $output = t("Allows configuration of congestion control auto-throttle mechanism.");
       break;
Index: modules/title.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/title.module,v
retrieving revision 1.25
diff -u -r1.25 title.module
--- modules/title.module	1 Feb 2004 17:55:11 -0000	1.25
+++ modules/title.module	3 Feb 2004 18:03:39 -0000
@@ -5,6 +5,8 @@
   $output = "";
 
   switch ($section) {
+    case "admin/system/modules#name":
+      return t("title");
     case 'admin/system/modules#description':
       $output = t("Enables users to link to stories, articles or similar content by title.");
       break;
Index: modules/tracker.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/tracker.module,v
retrieving revision 1.73
diff -u -r1.73 tracker.module
--- modules/tracker.module	31 Jan 2004 21:32:06 -0000	1.73
+++ modules/tracker.module	3 Feb 2004 18:03:40 -0000
@@ -8,6 +8,8 @@
     case 'admin/help#tracer':
       $output =  t("<p>The tracker module is a handy module for displaying the most recent posts.  By following the <i>recent posts</i> link in the user block, a user may quickly review all recent postings.</p>");
       break;
+    case "admin/system/modules#name":
+      return t("tracker");
     case 'admin/system/modules#description':
       $output = t("Enables tracking of recent posts for users.");
       break;
Index: modules/user.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/user.module,v
retrieving revision 1.293
diff -u -r1.293 user.module
--- modules/user.module	31 Jan 2004 09:50:39 -0000	1.293
+++ modules/user.module	3 Feb 2004 18:03:48 -0000
@@ -291,7 +291,7 @@
 /*** Module hooks **********************************************************/
 
 function user_perm() {
-  return array("administer users", "access user list");
+  return array("administer users" => t("administer users"), "access user list" => t("access user list"));
 }
 
 function user_search($keys) {
@@ -1300,8 +1300,8 @@
 
   $header = array_merge(array("&nbsp;"), $role_names);
 
-  foreach ($perms as $perm) {
-    $row[] = t($perm);
+  foreach ($perms as $perm => $tperm) {
+    $row[] = $tperm;
     foreach ($role_names as $rid => $name) {
       $row[] = "<input type=\"checkbox\" name=\"edit[$rid][$perm]\"". (strstr($role_perms[$rid], $perm) ? " checked=\"checked\"" : "") ." />";
     }
@@ -1580,6 +1580,8 @@
     case 'admin/user/search':
       $output .= t("Enter a simple pattern ( '*' may be user as a wildcard match) to search for a username.  For example, one may search for 'br' and Drupal might return 'brian', 'brad', and 'brenda'.");
       break;
+    case "admin/system/modules#name":
+      return t("user");
     case 'admin/system/modules#description':
       $output .= t("Enables the user registration and login system.");
       break;
Index: modules/watchdog.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/watchdog.module,v
retrieving revision 1.90
diff -u -r1.90 watchdog.module
--- modules/watchdog.module	23 Jan 2004 18:42:43 -0000	1.90
+++ modules/watchdog.module	3 Feb 2004 18:03:49 -0000
@@ -34,6 +34,8 @@
   case 'admin/watchdog/warning':
     $output = t("Watchdog warning events. These events don't stop Drupal from running, but are things you should know.");
     break;
+  case "admin/system/modules#name":
+    return t("watchdog");
   case 'admin/system/modules#description':
     $output = t("Logs and records system events.");
     break;
@@ -46,7 +48,7 @@
 }
 
 function watchdog_perm() {
-  return array("administer watchdog");
+  return array("administer watchdog" => t("administer watchdog"));
 }
 
 function watchdog_link($type) {
