Only grab comments marked i18n to the template.

functions/addressbook.php

@@ -970,15 +970,13 @@ class addressbook_backend {
      * @since 1.5.2
      */
     function fullname($firstname,$lastname) {
-        /**
-         * i18n: allows to control fullname layout in address book listing
-         * first %s is for first name, second %s is for last name.
-         * Translate it to '%2$s %1$s', if surname must be displayed first in your language.
-         * Please note that variables can be set to empty string and extra formating 
-         * (for example '%2$s, %1$s' as in 'Smith, John') might break. Use it only for 
-         * setting name and surname order. scripts will remove all prepended and appended
-         *  whitespace.
-         */
+        // i18n: allows to control fullname layout in address book listing
+        // first %s is for first name, second %s is for last name.
+        // Translate it to '%2$s %1$s', if surname must be displayed first in your language.
+        // Please note that variables can be set to empty string and extra formating 
+        // (for example '%2$s, %1$s' as in 'Smith, John') might break. Use it only for 
+        // setting name and surname order. scripts will remove all prepended and appended
+        // whitespace.
         return trim(sprintf(dgettext('squirrelmail',"%s %s"),$firstname,$lastname));
     }
 }

plugins/fortune/functions.php

@@ -45,7 +45,7 @@ function fortune_function() {
     }
     /* if pclose return != 0, popen command failed. Yes, I know that it is broken when --enable-sigchild is used */
     if (pclose($handle)) {
-        // %s shows executed fortune cookie command.
+        // i18n: %s shows executed fortune cookie command.
         $fortune = sprintf(_("Unable to execute \"%s\"."),$fortune_command);
     }
 

plugins/squirrelspell/modules/lang_change.mod

@@ -44,11 +44,9 @@ if (sizeof($new_langs)>1) {
   // remove last comma and space
   $dsp_string = substr( $dsp_string, 0, -2 );
 
-  /**
-   * i18n: first %s is comma separated list of languages, second %s - default language.
-   * Language names are translated, if they are present in squirrelmail.po file.
-   * make sure that you don't use html codes in language name translations
-   */
+  // i18n: first %s is comma separated list of languages, second %s - default language.
+  // Language names are translated, if they are present in squirrelmail.po file.
+  // make sure that you don't use html codes in language name translations
   $msg = '<p>'
     . sprintf(_("Settings adjusted to: %s with %s as default dictionary."),
              '<strong>'.htmlspecialchars($dsp_string).'</strong>',

po/squirrelmail.pot

@@ -9,7 +9,7 @@ msgstr ""
 "Project-Id-Version: SquirrelMail DEVEL\n"
 "Report-Msgid-Bugs-To: SquirrelMail Internationalization <squirrelmail-"
 "i18n@lists.sourceforge.net>\n"
-"POT-Creation-Date: 2008-05-16 05:38+0200\n"
+"POT-Creation-Date: 2008-05-16 06:30+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <squirrelmail-i18n@lists.sourceforge.net>\n"
@@ -111,18 +111,19 @@ msgstr ""
 msgid "Add address"
 msgstr ""
 
-#. * To translators: %s is for author's name
+#. i18n: %s is for author's name
 #, php-format
 msgid "%s wrote:"
 msgstr ""
 
-#. * To translators:
-#. *  first %s is for date string, second %s is for author's name. Date uses
-#. *  formating from "D, F j, Y g:i a" and "D, F j, Y H:i" translations.
-#. * Example string:
-#. *  "On Sat, December 24, 2004 23:59, Santa wrote:"
-#. * If you have to put author's name in front of date string, check comments about
-#. * argument swapping at http://www.php.net/sprintf
+#. i18n:
+#. The first %s is for date string, the second %s is for author's name.
+#. The date uses formating from "D, F j, Y g:i a" and "D, F j, Y H:i"
+#. translations.
+#. Example string:
+#. "On Sat, December 24, 2004 23:59, Santa wrote:"
+#. If you have to put author's name in front of date string, check comments about
+#. argument swapping at http://php.net/sprintf
 #, php-format
 msgid "On %s, %s wrote:"
 msgstr ""
@@ -688,7 +689,7 @@ msgstr ""
 msgid "Title &amp; Org. / Dept."
 msgstr ""
 
-msgid "Personal address book"
+msgid "Personal Address Book"
 msgstr ""
 
 msgid ""
@@ -777,7 +778,7 @@ msgstr ""
 msgid "Error opening file %s"
 msgstr ""
 
-msgid "Global address book"
+msgid "Global Address Book"
 msgstr ""
 
 msgid "Error initializing global address book."
@@ -805,13 +806,13 @@ msgstr ""
 msgid "Nickname contains illegal characters"
 msgstr ""
 
-#. * i18n: allows to control fullname layout in address book listing
-#. * first %s is for first name, second %s is for last name.
-#. * Translate it to '%2$s %1$s', if surname must be displayed first in your language.
-#. * Please note that variables can be set to empty string and extra formating
-#. * (for example '%2$s, %1$s' as in 'Smith, John') might break. Use it only for
-#. * setting name and surname order. scripts will remove all prepended and appended
-#. *  whitespace.
+#. i18n: allows to control fullname layout in address book listing
+#. first %s is for first name, second %s is for last name.
+#. Translate it to '%2$s %1$s', if surname must be displayed first in your language.
+#. Please note that variables can be set to empty string and extra formating
+#. (for example '%2$s, %1$s' as in 'Smith, John') might break. Use it only for
+#. setting name and surname order. scripts will remove all prepended and appended
+#. whitespace.
 #, php-format
 msgid "%s %s"
 msgstr ""
@@ -2992,7 +2993,7 @@ msgstr ""
 msgid "OFF"
 msgstr ""
 
-#. %s shows executed fortune cookie command.
+#. i18n: %s shows executed fortune cookie command.
 #, php-format
 msgid "Unable to execute \"%s\"."
 msgstr ""
@@ -4236,25 +4237,16 @@ msgstr ""
 msgid "Not yet functional, currently does nothing"
 msgstr ""
 
-msgid "Nickname"
-msgstr ""
-
-msgid "sort by nickname"
-msgstr ""
-
-msgid "sort by name"
-msgstr ""
-
-msgid "sort by email"
+msgid "All address books"
 msgstr ""
 
-msgid "Info"
+msgid "Update Address"
 msgstr ""
 
-msgid "sort by info"
+msgid "Add to Address Book"
 msgstr ""
 
-msgid "All address books"
+msgid "Nickname"
 msgstr ""
 
 msgid "Must be unique"
@@ -4272,6 +4264,12 @@ msgstr ""
 msgid "Add to:"
 msgstr ""
 
+msgid "Add Address"
+msgstr ""
+
+msgid "Info"
+msgstr ""
+
 msgid "Source"
 msgstr ""
 
@@ -4290,6 +4288,9 @@ msgstr ""
 msgid "Delete Selected"
 msgstr ""
 
+msgid "Compose to Selected"
+msgstr ""
+
 msgid "Toggle All"
 msgstr ""
 

po/xgetpo

@@ -14,7 +14,7 @@ LANG=en_US.ISO8859-1
 export LC_ALL LANG
 
 # set common gettext options
-XGETTEXT_OPTIONS="--keyword=_ -keyword=N_ --keyword=ngettext:1,2 --default-domain=squirrelmail --no-location --add-comments"
+XGETTEXT_OPTIONS="--keyword=_ -keyword=N_ --keyword=ngettext:1,2 --default-domain=squirrelmail --no-location --add-comments=i18n"
 
 # Allows controlling language option
 # (gettext v.0.10.40 = -C, gettext 0.11+ = -L php).

src/compose.php

@@ -237,9 +237,7 @@ function getReplyCitation($orig_from, $orig_date) {
     /* Otherwise, try to select the desired citation style. */
     switch ($reply_citation_style) {
     case 'author_said':
-        /**
-         * To translators: %s is for author's name
-         */
+        // i18n: %s is for author's name
         $full_reply_citation = sprintf(_("%s wrote:"),$sOrig_from);
         break;
     case 'quote_who':
@@ -248,15 +246,14 @@ function getReplyCitation($orig_from, $orig_date) {
         $full_reply_citation = $start . $sOrig_from . $end;
         break;
     case 'date_time_author':
-        /**
-         * To translators:
-         *  first %s is for date string, second %s is for author's name. Date uses
-         *  formating from "D, F j, Y g:i a" and "D, F j, Y H:i" translations.
-         * Example string:
-         *  "On Sat, December 24, 2004 23:59, Santa wrote:"
-         * If you have to put author's name in front of date string, check comments about
-         * argument swapping at http://www.php.net/sprintf
-         */
+        // i18n:
+        // The first %s is for date string, the second %s is for author's name.
+        // The date uses formating from "D, F j, Y g:i a" and "D, F j, Y H:i"
+        // translations.
+        // Example string:
+        // "On Sat, December 24, 2004 23:59, Santa wrote:"
+        // If you have to put author's name in front of date string, check comments about
+        // argument swapping at http://php.net/sprintf
         $full_reply_citation = sprintf(_("On %s, %s wrote:"), getLongDateString($orig_date), $sOrig_from);
         break;
     case 'user-defined':