Removing random double spaces in strings

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@7388 7612ce4b-ef26-0410-bec9-ea0150e637f0

diff --git a/plugins/filters/filters.php b/plugins/filters/filters.php
index 5c3a75bf8c083a32223fb61724335ba611fe6154..34ffd31dd5b355784e5c04ef10200e4f74b0b271 100644 (file)
--- a/plugins/filters/filters.php
+++ b/plugins/filters/filters.php
@@ -469,7 +469,7 @@ function load_spam_filters() {
         $filters['MAPS RSS']['dns'] = 'relays.mail-abuse.org';
         $filters['MAPS RSS']['result'] = '127.0.0.2';
         $filters['MAPS RSS']['comment'] =
-            _("COMMERCIAL - Servers that are configured (or misconfigured) to allow spam to be relayed through their system will be banned with this.  Another good one to use.");
+            _("COMMERCIAL - Servers that are configured (or misconfigured) to allow spam to be relayed through their system will be banned with this. Another good one to use.");
 
         $filters['MAPS DUL']['prefname'] = 'filters_spam_maps_dul';
         $filters['MAPS DUL']['name'] = 'MAPS Dial-Up List';
@@ -477,7 +477,7 @@ function load_spam_filters() {
         $filters['MAPS DUL']['dns'] = 'dialups.mail-abuse.org';
         $filters['MAPS DUL']['result'] = '127.0.0.3';
         $filters['MAPS DUL']['comment'] =
-            _("COMMERCIAL - Dial-up users are often filtered out since they should use their ISP's mail servers to send mail.  Spammers typically get a dial-up account and send spam directly from there.");
+            _("COMMERCIAL - Dial-up users are often filtered out since they should use their ISP's mail servers to send mail. Spammers typically get a dial-up account and send spam directly from there.");
 
         $filters['MAPS RBLplus-RBL']['prefname'] = 'filters_spam_maps_rblplus_rbl';
         $filters['MAPS RBLplus-RBL']['name'] = 'MAPS RBL+ RBL List';

diff --git a/plugins/filters/spamoptions.php b/plugins/filters/spamoptions.php
index 39cbb4e51d139a67b664f5ba59adb040105ee7a4..730086cf6bc788496d49cbcb4862a7ec4e4f6aca 100644 (file)
--- a/plugins/filters/spamoptions.php
+++ b/plugins/filters/spamoptions.php
@@ -155,7 +155,7 @@ if (isset($action) && $action == 'spam') {
     html_tag( 'tr',
           html_tag( 'td', ' ' ) .
           html_tag( 'td',
-              _("The more messages you scan, the longer it takes. I would suggest that you scan only new messages.  If you make a change to your filters, I would set it to scan all messages, then go view my INBOX, then come back and set it to scan only new messages. That way, your new spam filters will be applied and you'll scan even the spam you read with the new filters.") ,
+              _("The more messages you scan, the longer it takes. I would suggest that you scan only new messages. If you make a change to your filters, I would set it to scan all messages, then go view my INBOX, then come back and set it to scan only new messages. That way, your new spam filters will be applied and you'll scan even the spam you read with the new filters.") ,
           'left' )
       );
 

diff --git a/plugins/mail_fetch/options.php b/plugins/mail_fetch/options.php
index 1b91d718466196ab5b59cbbd12ea5cc71a8da03c..5a37918eeaa81463cd4e18a41e9b201d3eb186f6 100644 (file)
--- a/plugins/mail_fetch/options.php
+++ b/plugins/mail_fetch/options.php
@@ -162,7 +162,7 @@ sqgetGlobalVar('submit_mailfetch', $submit_mailfetch, SQ_POST);
             html_tag( 'table',
                 html_tag( 'tr',
                     html_tag( 'td',
-                        _("You should be aware that the encryption used to store your password is not perfectly secure.  However, if you are using pop, there is inherently no encryption anyway. Additionally, the encryption that we do to save it on the server can be undone by a hacker reading the source to this file." ) ,
+                        _("You should be aware that the encryption used to store your password is not perfectly secure. However, if you are using pop, there is inherently no encryption anyway. Additionally, the encryption that we do to save it on the server can be undone by a hacker reading the source to this file." ) ,
                     'left' )
                 ) .
                 html_tag( 'tr',

diff --git a/plugins/newmail/newmail_opt.php b/plugins/newmail/newmail_opt.php
index d41cb111203d2bc076e8f54791d4cdce61132f42..b06d6b33deca65943c0e2d87229bd1d3f42edac0 100644 (file)
--- a/plugins/newmail/newmail_opt.php
+++ b/plugins/newmail/newmail_opt.php
@@ -53,14 +53,14 @@ if ($allowsound == "true") {
                _("Selecting the <b>Show popup</b> option will enable the showing of a popup window when unseen mail is in your folders (requires JavaScript).")
            ) . "\n" .
            html_tag( 'p',
-               _("Use the <b>Check RECENT</b> to only check for messages that are recent. Recent messages are those that have just recently showed up and have not been \"viewed\" or checked yet.  This can prevent being continuously annoyed by sounds or popups for unseen mail.")
+               _("Use the <b>Check RECENT</b> to only check for messages that are recent. Recent messages are those that have just recently showed up and have not been \"viewed\" or checked yet. This can prevent being continuously annoyed by sounds or popups for unseen mail.")
            ) . "\n" .
            html_tag( 'p',
-               _("Selecting the <b>Change title</b> option will change the title in some browsers to let you know when you have new mail (requires JavaScript, and only works in IE but you won't see errors with other browsers).  This will always tell you if you have new mail, even if you have <b>Check RECENT</b> enabled.")
+               _("Selecting the <b>Change title</b> option will change the title in some browsers to let you know when you have new mail (requires JavaScript, and only works in IE but you won't see errors with other browsers). This will always tell you if you have new mail, even if you have <b>Check RECENT</b> enabled.")
            );
     if ($allowsound == "true") {
         echo html_tag( 'p',
-                    _("Select from the list of <b>server files</b> the media file to play when new mail arrives.  If no file is specified, \"(none)\", no sound will be used.")
+                    _("Select from the list of <b>server files</b> the media file to play when new mail arrives. If no file is specified, \"(none)\", no sound will be used.")
                ) . "\n";
     }
     echo '<form action="'.sqm_baseuri().'src/options.php" method=post>'.

diff --git a/plugins/spamcop/setup.php b/plugins/spamcop/setup.php
index 9437bf804531371dc65593e44bcda522f825f2ed..5f54c46c276df75e26389dd14fb1382f8b4ae4fc 100755 (executable)
--- a/plugins/spamcop/setup.php
+++ b/plugins/spamcop/setup.php
@@ -129,7 +129,7 @@ function spamcop_options()
    $optpage_blocks[] = array(
       'name' => _("SpamCop - Spam Reporting"),
       'url' => '../plugins/spamcop/options.php',
-      'desc' => _("Help fight the battle against unsolicited email.  SpamCop reads the spam email and determines the correct addresses to send complaints to.  Quite fast, really smart, and easy to use."),
+      'desc' => _("Help fight the battle against unsolicited email. SpamCop reads the spam email and determines the correct addresses to send complaints to. Quite fast, really smart, and easy to use."),
       'js' => false
    );
 }

diff --git a/plugins/spamcop/spamcop.php b/plugins/spamcop/spamcop.php
index 2cf67cdee115d559df55d2cee119ed8054ca81aa..da15b9af575f6232d4a5861214926f6e629e8f22 100644 (file)
--- a/plugins/spamcop/spamcop.php
+++ b/plugins/spamcop/spamcop.php
@@ -140,7 +140,7 @@ if ($js_web) {
 
 
 echo "<p>";
-echo _("Sending this spam report will give you back a reply with URLs that you can click on to properly report this spam message to the proper authorities. This is a free service.  By pressing the \"Send Spam Report\" button, you agree to follow SpamCop's rules/terms of service/etc.");
+echo _("Sending this spam report will give you back a reply with URLs that you can click on to properly report this spam message to the proper authorities. This is a free service. By pressing the \"Send Spam Report\" button, you agree to follow SpamCop's rules/terms of service/etc.");
 echo "</p>";
 
 ?>

diff --git a/po/squirrelmail.pot b/po/squirrelmail.pot
index 4ce3fd0f58f3df0da8d765689f3b252102977fab..fc792d2376e19ab8374161fe4b78b0ff9f685e1d 100644 (file)
--- a/po/squirrelmail.pot
+++ b/po/squirrelmail.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2004-05-04 15:36+0300\n"
+"POT-Creation-Date: 2004-05-05 23:36+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,9 +17,6 @@ msgstr ""
 msgid "Address Book"
 msgstr ""
 
-msgid "All"
-msgstr ""
-
 msgid "Name"
 msgstr ""
 
@@ -32,19 +29,7 @@ msgstr ""
 msgid "Source"
 msgstr ""
 
-msgid "To"
-msgstr ""
-
-msgid "Cc"
-msgstr ""
-
-msgid "Bcc"
-msgstr ""
-
-msgid "Use Addresses"
-msgstr ""
-
-msgid "Address Book Search"
+msgid "No persons matching your search were found"
 msgstr ""
 
 msgid "Search for"
@@ -62,6 +47,9 @@ msgstr ""
 msgid "List all"
 msgstr ""
 
+msgid "Close"
+msgstr ""
+
 #, c-format
 msgid "Unable to list addresses from %s"
 msgstr ""
@@ -69,13 +57,25 @@ msgstr ""
 msgid "Your search failed with the following error(s)"
 msgstr ""
 
-msgid "No persons matching your search were found"
+msgid "All"
 msgstr ""
 
-msgid "Return"
+msgid "To"
 msgstr ""
 
-msgid "Close"
+msgid "Cc"
+msgstr ""
+
+msgid "Bcc"
+msgstr ""
+
+msgid "Use Addresses"
+msgstr ""
+
+msgid "Address Book Search"
+msgstr ""
+
+msgid "Return"
 msgstr ""
 
 msgid "Nickname"
@@ -123,7 +123,16 @@ msgstr ""
 msgid "Delete selected"
 msgstr ""
 
-msgid "Click here to change the sorting of the address list"
+msgid "sort by nickname"
+msgstr ""
+
+msgid "sort by name"
+msgstr ""
+
+msgid "sort by email"
+msgstr ""
+
+msgid "sort by info"
 msgstr ""
 
 msgid "Add to address book"
@@ -229,28 +238,6 @@ msgstr ""
 msgid "Server replied: "
 msgstr ""
 
-msgid "Illegal folder name.  Please select a different name."
-msgstr ""
-
-msgid "Click here to go back"
-msgstr ""
-
-msgid "You have not selected a folder to delete. Please do so."
-msgstr ""
-
-msgid "Delete Folder"
-msgstr ""
-
-#, c-format
-msgid "Are you sure you want to delete %s?"
-msgstr ""
-
-msgid "Yes"
-msgstr ""
-
-msgid "No"
-msgstr ""
-
 msgid "Folders"
 msgstr ""
 
@@ -302,6 +289,9 @@ msgstr ""
 msgid "No folders found"
 msgstr ""
 
+msgid "Delete Folder"
+msgstr ""
+
 msgid "Delete"
 msgstr ""
 
@@ -320,6 +310,25 @@ msgstr ""
 msgid "Subscribe to:"
 msgstr ""
 
+msgid "Illegal folder name. Please select a different name."
+msgstr ""
+
+msgid "Click here to go back"
+msgstr ""
+
+msgid "You have not selected a folder to delete. Please do so."
+msgstr ""
+
+#, c-format
+msgid "Are you sure you want to delete %s?"
+msgstr ""
+
+msgid "Yes"
+msgstr ""
+
+msgid "No"
+msgstr ""
+
 msgid "You have not selected a folder to rename. Please do so."
 msgstr ""
 
@@ -340,7 +349,7 @@ msgstr ""
 
 #, c-format
 msgid ""
-"The help has not been translated to %s.  It will be displayed in English "
+"The help has not been translated to %s. It will be displayed in English "
 "instead."
 msgstr ""
 
@@ -407,12 +416,58 @@ msgstr ""
 msgid "No messages were selected."
 msgstr ""
 
-msgid "Options"
+msgid "Personal Information"
+msgstr ""
+
+msgid "Display Preferences"
 msgstr ""
 
 msgid "Message Highlighting"
 msgstr ""
 
+msgid "Folder Preferences"
+msgstr ""
+
+msgid "Index Order"
+msgstr ""
+
+msgid "Options"
+msgstr ""
+
+msgid "Successfully Saved Options"
+msgstr ""
+
+msgid "Refresh Folder List"
+msgstr ""
+
+msgid "Refresh Page"
+msgstr ""
+
+msgid ""
+"This contains personal information about yourself such as your name, your "
+"email address, etc."
+msgstr ""
+
+msgid ""
+"You can change the way that SquirrelMail looks and displays information to "
+"you, such as the colors, the language, and other settings."
+msgstr ""
+
+msgid ""
+"Based upon given criteria, incoming messages can have different background "
+"colors in the message list. This helps to easily distinguish who the "
+"messages are from, especially for mailing lists."
+msgstr ""
+
+msgid ""
+"These settings change the way your folders are displayed and manipulated."
+msgstr ""
+
+msgid ""
+"The order of the message index can be rearranged and changed to contain the "
+"headers in any order you want."
+msgstr ""
+
 msgid "New"
 msgstr ""
 
@@ -525,9 +580,6 @@ msgstr ""
 msgid "Move Up"
 msgstr ""
 
-msgid "Index Order"
-msgstr ""
-
 msgid "Checkbox"
 msgstr ""
 
@@ -539,8 +591,8 @@ msgstr ""
 
 msgid ""
 "The index order is the order that the columns are arranged in the message "
-"index.  You can add, remove, and move columns around to customize them to "
-"fit your needs."
+"index. You can add, remove, and move columns around to customize them to fit "
+"your needs."
 msgstr ""
 
 msgid "up"
@@ -555,49 +607,6 @@ msgstr ""
 msgid "Return to options page"
 msgstr ""
 
-msgid "Personal Information"
-msgstr ""
-
-msgid "Display Preferences"
-msgstr ""
-
-msgid "Folder Preferences"
-msgstr ""
-
-msgid "Successfully Saved Options"
-msgstr ""
-
-msgid "Refresh Folder List"
-msgstr ""
-
-msgid "Refresh Page"
-msgstr ""
-
-msgid ""
-"This contains personal information about yourself such as your name, your "
-"email address, etc."
-msgstr ""
-
-msgid ""
-"You can change the way that SquirrelMail looks and displays information to "
-"you, such as the colors, the language, and other settings."
-msgstr ""
-
-msgid ""
-"Based upon given criteria, incoming messages can have different background "
-"colors in the message list.  This helps to easily distinguish who the "
-"messages are from, especially for mailing lists."
-msgstr ""
-
-msgid ""
-"These settings change the way your folders are displayed and manipulated."
-msgstr ""
-
-msgid ""
-"The order of the message index can be rearranged and changed to contain the "
-"headers in any order you want."
-msgstr ""
-
 msgid "Message not printable"
 msgstr ""
 
@@ -736,6 +745,18 @@ msgstr ""
 msgid "(Spurious argument)"
 msgstr ""
 
+msgid "-"
+msgstr ""
+
+msgid "+"
+msgstr ""
+
+msgid "Hide"
+msgstr ""
+
+msgid "Show"
+msgstr ""
+
 msgid "edit"
 msgstr ""
 
@@ -781,6 +802,9 @@ msgstr ""
 msgid "Remove All Criteria"
 msgstr ""
 
+msgid "Not"
+msgstr ""
+
 msgid "Answered"
 msgstr ""
 
@@ -847,9 +871,6 @@ msgstr ""
 msgid "Sent To"
 msgstr ""
 
-msgid "Not"
-msgstr ""
-
 msgid "And In"
 msgstr ""
 
@@ -862,21 +883,6 @@ msgstr ""
 msgid "Or"
 msgstr ""
 
-msgid "No Messages Found"
-msgstr ""
-
-msgid "-"
-msgstr ""
-
-msgid "+"
-msgstr ""
-
-msgid "Hide"
-msgstr ""
-
-msgid "Show"
-msgstr ""
-
 msgid "Body"
 msgstr ""
 
@@ -889,6 +895,9 @@ msgstr ""
 msgid "Advanced search"
 msgstr ""
 
+msgid "No Messages Found"
+msgstr ""
+
 msgid "Sign Out"
 msgstr ""
 
@@ -1020,6 +1029,9 @@ msgstr ""
 msgid "Nickname contains illegal characters"
 msgstr ""
 
+msgid "Click here to change the sorting of the address list"
+msgstr ""
+
 msgid "view"
 msgstr ""
 
@@ -2297,16 +2309,16 @@ msgstr ""
 msgid "Show button in toolbar"
 msgstr ""
 
-#, c-format
-msgid "Could not write calendar file %s"
-msgstr ""
-
 msgid "TODAY"
 msgstr ""
 
 msgid "Go"
 msgstr ""
 
+#, c-format
+msgid "Could not write calendar file %s"
+msgstr ""
+
 msgid "l, F j Y"
 msgstr ""
 
@@ -2419,13 +2431,13 @@ msgstr ""
 
 msgid ""
 "COMMERCIAL - Servers that are configured (or misconfigured) to allow spam to "
-"be relayed through their system will be banned with this.  Another good one "
+"be relayed through their system will be banned with this. Another good one "
 "to use."
 msgstr ""
 
 msgid ""
 "COMMERCIAL - Dial-up users are often filtered out since they should use "
-"their ISP's mail servers to send mail.  Spammers typically get a dial-up "
+"their ISP's mail servers to send mail. Spammers typically get a dial-up "
 "account and send spam directly from there."
 msgstr ""
 
@@ -2619,8 +2631,8 @@ msgstr ""
 
 msgid ""
 "The more messages you scan, the longer it takes. I would suggest that you "
-"scan only new messages.  If you make a change to your filters, I would set "
-"it to scan all messages, then go view my INBOX, then come back and set it to "
+"scan only new messages. If you make a change to your filters, I would set it "
+"to scan all messages, then go view my INBOX, then come back and set it to "
 "scan only new messages. That way, your new spam filters will be applied and "
 "you'll scan even the spam you read with the new filters."
 msgstr ""
@@ -2927,7 +2939,7 @@ msgstr ""
 
 msgid ""
 "You should be aware that the encryption used to store your password is not "
-"perfectly secure.  However, if you are using pop, there is inherently no "
+"perfectly secure. However, if you are using pop, there is inherently no "
 "encryption anyway. Additionally, the encryption that we do to save it on the "
 "server can be undone by a hacker reading the source to this file."
 msgstr ""
@@ -3027,6 +3039,23 @@ msgstr ""
 msgid "View Message details"
 msgstr ""
 
+msgid "New Mail"
+msgstr ""
+
+msgid "SquirrelMail Notice:"
+msgstr ""
+
+msgid "You have"
+msgstr ""
+
+#, c-format
+msgid "%s new message"
+msgstr ""
+
+#, c-format
+msgid "%s new messages"
+msgstr ""
+
 msgid "New Mail Notification"
 msgstr ""
 
@@ -3049,21 +3078,21 @@ msgstr ""
 msgid ""
 "Use the <b>Check RECENT</b> to only check for messages that are recent. "
 "Recent messages are those that have just recently showed up and have not "
-"been \"viewed\" or checked yet.  This can prevent being continuously annoyed "
+"been \"viewed\" or checked yet. This can prevent being continuously annoyed "
 "by sounds or popups for unseen mail."
 msgstr ""
 
 msgid ""
 "Selecting the <b>Change title</b> option will change the title in some "
 "browsers to let you know when you have new mail (requires JavaScript, and "
-"only works in IE but you won't see errors with other browsers).  This will "
+"only works in IE but you won't see errors with other browsers). This will "
 "always tell you if you have new mail, even if you have <b>Check RECENT</b> "
 "enabled."
 msgstr ""
 
 msgid ""
 "Select from the list of <b>server files</b> the media file to play when new "
-"mail arrives.  If no file is specified, \"(none)\", no sound will be used."
+"mail arrives. If no file is specified, \"(none)\", no sound will be used."
 msgstr ""
 
 msgid "Enable Media Playing"
@@ -3096,23 +3125,6 @@ msgstr ""
 msgid "Current File:"
 msgstr ""
 
-msgid "New Mail"
-msgstr ""
-
-msgid "SquirrelMail Notice:"
-msgstr ""
-
-msgid "You have"
-msgstr ""
-
-#, c-format
-msgid "%s new message"
-msgstr ""
-
-#, c-format
-msgid "%s new messages"
-msgstr ""
-
 msgid "NewMail Options"
 msgstr ""
 
@@ -3310,8 +3322,8 @@ msgid "SpamCop - Spam Reporting"
 msgstr ""
 
 msgid ""
-"Help fight the battle against unsolicited email.  SpamCop reads the spam "
-"email and determines the correct addresses to send complaints to.  Quite "
+"Help fight the battle against unsolicited email. SpamCop reads the spam "
+"email and determines the correct addresses to send complaints to. Quite "
 "fast, really smart, and easy to use."
 msgstr ""
 
@@ -3321,7 +3333,7 @@ msgstr ""
 msgid ""
 "Sending this spam report will give you back a reply with URLs that you can "
 "click on to properly report this spam message to the proper authorities. "
-"This is a free service.  By pressing the \"Send Spam Report\" button, you "
+"This is a free service. By pressing the \"Send Spam Report\" button, you "
 "agree to follow SpamCop's rules/terms of service/etc."
 msgstr ""
 
@@ -3470,6 +3482,19 @@ msgstr ""
 msgid "No errors found"
 msgstr ""
 
+msgid ""
+"Your personal dictionary has been <strong>encrypted</strong> and is now "
+"stored in an <strong>encrypted format</strong>."
+msgstr ""
+
+msgid ""
+"Your personal dictionary has been <strong>decrypted</strong> and is now "
+"stored as <strong>clear text</strong>."
+msgstr ""
+
+msgid "Personal Dictionary Crypto Settings"
+msgstr ""
+
 msgid "Your personal dictionary was erased."
 msgstr ""
 
@@ -3501,19 +3526,6 @@ msgstr ""
 msgid "Dictionary re-encrypted"
 msgstr ""
 
-msgid ""
-"Your personal dictionary has been <strong>encrypted</strong> and is now "
-"stored in an <strong>encrypted format</strong>."
-msgstr ""
-
-msgid ""
-"Your personal dictionary has been <strong>decrypted</strong> and is now "
-"stored as <strong>clear text</strong>."
-msgstr ""
-
-msgid "Personal Dictionary Crypto Settings"
-msgstr ""
-
 msgid "Personal Dictionary"
 msgstr ""
 

diff --git a/src/folders_create.php b/src/folders_create.php
index b39258a7c4d4abdd3852b6304068ffc3e6b52b73..a4c472b2f9310ce7b9aa3433b1cdaea835303296 100644 (file)
--- a/src/folders_create.php
+++ b/src/folders_create.php
@@ -41,7 +41,7 @@ if (substr_count($folder_name, '"') || substr_count($folder_name, "\\") ||
     substr_count($folder_name, $delimiter) || ($folder_name == '')) {
     displayPageHeader($color, 'None');
 
-    plain_error_message(_("Illegal folder name.  Please select a different name.").
+    plain_error_message(_("Illegal folder name. Please select a different name.").
         '<BR><A HREF="../src/folders.php">'._("Click here to go back").'</A>.', $color);
 
     exit;

diff --git a/src/folders_rename_do.php b/src/folders_rename_do.php
index a3f83ac281258279d53037c5cedb561a2fac5089..e7db59ce45041aa800823fcf652273f65711d61d 100644 (file)
--- a/src/folders_rename_do.php
+++ b/src/folders_rename_do.php
@@ -41,7 +41,7 @@ if (substr_count($new_name, '"') || substr_count($new_name, "\\") ||
     substr_count($new_name, $delimiter) || ($new_name == '')) {
     displayPageHeader($color, 'None');
 
-    plain_error_message(_("Illegal folder name.  Please select a different name.").
+    plain_error_message(_("Illegal folder name. Please select a different name.").
         '<BR><A HREF="../src/folders.php">'._("Click here to go back").'</A>.', $color);
 
     exit;

diff --git a/src/help.php b/src/help.php
index f7c485d1466a7710b7d71a46ce277b6cf65caf2b..1fb1c309a4d4c0ca0041dab62b1ee134ad3712fa 100644 (file)
--- a/src/help.php
+++ b/src/help.php
@@ -120,7 +120,7 @@ if (file_exists("../help/$squirrelmail_language")) {
     $user_language = $squirrelmail_language;
 } else if (file_exists('../help/en_US')) {
     echo "<center><font color=\"$color[2]\">";
-    printf (_("The help has not been translated to %s.  It will be displayed in English instead."), $languages[$squirrelmail_language]['NAME']);
+    printf (_("The help has not been translated to %s. It will be displayed in English instead."), $languages[$squirrelmail_language]['NAME']);
     echo '</font></center><br>';
     $user_language = 'en_US';
 } else {

diff --git a/src/options.php b/src/options.php
index ab249e2bab576d13d305f07889d0c12859ed6088..42ecaedd5c4fbcb1b786c3e7c906076926a633bd 100644 (file)
--- a/src/options.php
+++ b/src/options.php
@@ -325,7 +325,7 @@ if ($optpage == SMOPT_PAGE_MAIN) {
     $optpage_blocks[] = array(
         'name' =>_("Message Highlighting"),
         'url'  => 'options_highlight.php',
-        'desc' =>_("Based upon given criteria, incoming messages can have different background colors in the message list.  This helps to easily distinguish who the messages are from, especially for mailing lists."),
+        'desc' =>_("Based upon given criteria, incoming messages can have different background colors in the message list. This helps to easily distinguish who the messages are from, especially for mailing lists."),
         'js'   => false
     );
 

diff --git a/src/options_order.php b/src/options_order.php
index 1e7c42bd7ee8ba3cfe5c19cb05cbb140ad5d37e7..20f413b39ff4781a305963c6529e843e2459f02b 100644 (file)
--- a/src/options_order.php
+++ b/src/options_order.php
@@ -96,7 +96,7 @@ displayPageHeader($color, 'None');
     echo html_tag( 'table',
                 html_tag( 'tr',
                     html_tag( 'td',
-                        _("The index order is the order that the columns are arranged in the message index.  You can add, remove, and move columns around to customize them to fit your needs.")
+                        _("The index order is the order that the columns are arranged in the message index. You can add, remove, and move columns around to customize them to fit your needs.")
                     )
                 ) ,
             '', '', '', 'width="65%" border="0" cellpadding="0" cellspacing="0"' ) . "<br>\n";