Changing SPAMCOP to SpamCop

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

diff --git a/plugins/filters/filters.php b/plugins/filters/filters.php
index 1f82bafa05685b0a2a5801226d8f72ae1ce182fb..1a04ce27520f641e641a8a0ec6b80c60cf4f02aa 100644 (file)
--- a/plugins/filters/filters.php
+++ b/plugins/filters/filters.php
@@ -579,7 +579,7 @@ function load_spam_filters() {
     $filters['SPAMcop']['dns'] = 'bl.spamcop.net';
     $filters['SPAMcop']['result'] = '127.0.0.2';
     $filters['SPAMcop']['comment'] =
-        _("FREE, for now - SPAMCOP - An interesting solution that lists servers that have a very high spam to legit email ratio (85 percent or more).");
+        _("FREE, for now - SpamCop - An interesting solution that lists servers that have a very high spam to legit email ratio (85 percent or more).");
 
     $filters['dev.null.dk']['prefname'] = 'filters_spam_devnull';
     $filters['dev.null.dk']['name'] = 'dev.null.dk Lists';
@@ -793,4 +793,4 @@ function do_error($string) {
     echo $string;
     echo "</font></p>\n";
 }
-?>
+?>
\ No newline at end of file

diff --git a/po/squirrelmail.pot b/po/squirrelmail.pot
index 3106e7a3e1eef948eac7a3ff77ae48a90502213f..cb2be6c6a8fa1387398196b25d03753028837e33 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-23 18:10+0300\n"
+"POT-Creation-Date: 2004-06-05 19:24+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"
@@ -238,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 ""
 
@@ -311,6 +289,9 @@ msgstr ""
 msgid "No folders found"
 msgstr ""
 
+msgid "Delete Folder"
+msgstr ""
+
 msgid "Delete"
 msgstr ""
 
@@ -329,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 ""
 
@@ -413,15 +413,58 @@ msgstr ""
 msgid "Password:"
 msgstr ""
 
-msgid "No messages were selected."
+msgid "Personal Information"
 msgstr ""
 
-msgid "Options"
+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 ""
 
@@ -534,9 +577,6 @@ msgstr ""
 msgid "Move Up"
 msgstr ""
 
-msgid "Index Order"
-msgstr ""
-
 msgid "Checkbox"
 msgstr ""
 
@@ -564,49 +604,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 ""
 
@@ -715,6 +712,9 @@ msgstr ""
 msgid "You must be logged in to access this page."
 msgstr ""
 
+msgid "THIS FOLDER IS EMPTY"
+msgstr ""
+
 msgid "All Folders"
 msgstr ""
 
@@ -787,6 +787,9 @@ msgstr ""
 msgid "Folder:"
 msgstr ""
 
+msgid "No Messages Found"
+msgstr ""
+
 msgid "Add New Criteria"
 msgstr ""
 
@@ -889,9 +892,6 @@ msgstr ""
 msgid "Advanced search"
 msgstr ""
 
-msgid "No Messages Found"
-msgstr ""
-
 msgid "Signout"
 msgstr ""
 
@@ -1267,12 +1267,6 @@ msgstr ""
 msgid "Query:"
 msgstr ""
 
-msgid "The imap server failed to handle threading."
-msgstr ""
-
-msgid "Click here to unset thread view for this mailbox and start again."
-msgstr ""
-
 msgid "ERROR : No available imapstream."
 msgstr ""
 
@@ -1350,9 +1344,6 @@ msgstr ""
 msgid "Server-side sorting is not supported by your IMAP server."
 msgstr ""
 
-msgid "THIS FOLDER IS EMPTY"
-msgstr ""
-
 msgid "Unthread View"
 msgstr ""
 
@@ -1394,6 +1385,9 @@ msgstr ""
 msgid "Show All"
 msgstr ""
 
+msgid "No messages were selected."
+msgstr ""
+
 msgid "SquirrelMail could not decode the bodystructure of the message"
 msgstr ""
 
@@ -2397,16 +2391,16 @@ msgstr ""
 msgid "Show system specs"
 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 ""
 
@@ -2574,7 +2568,7 @@ msgid "FREE - SPAMhaus - A list of well-known SPAM sources."
 msgstr ""
 
 msgid ""
-"FREE, for now - SPAMCOP - An interesting solution that lists servers that "
+"FREE, for now - SpamCop - An interesting solution that lists servers that "
 "have a very high spam to legit email ratio (85 percent or more)."
 msgstr ""
 
@@ -2643,9 +2637,6 @@ msgstr ""
 msgid "FREE - Distributed Sender Boycott List - UN-Confirmed Relays"
 msgstr ""
 
-msgid "Unknown response from IMAP server: "
-msgstr ""
-
 msgid ""
 "WARNING! Header filters should be of the format &quot;Header: value&quot;"
 msgstr ""
@@ -3130,6 +3121,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 ""
 
@@ -3204,23 +3212,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 ""
 
@@ -3584,6 +3575,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 ""
 
@@ -3615,19 +3619,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 ""
 
@@ -3962,11 +3953,11 @@ msgstr ""
 msgid "Translation direction"
 msgstr ""
 
-msgid "This image has been removed for security reasons"
-msgstr ""
-
 msgid "Delivery error report"
 msgstr ""
 
 msgid "Undelivered Message Headers"
 msgstr ""
+
+msgid "This image has been removed for security reasons"
+msgstr ""