Fixing "broken" strings

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

diff --git a/plugins/newmail/newmail.php b/plugins/newmail/newmail.php
index 501225180e0fb7ad632505741aa61889a7c70e4c..da92e6d23d8927590763f48ea9f78032a79ca614 100644 (file)
--- a/plugins/newmail/newmail.php
+++ b/plugins/newmail/newmail.php
@@ -33,10 +33,10 @@ sqGetGlobalVar('numnew', $numnew, SQ_GET);
             ) .
             html_tag( 'tr', "\n" .
                 html_tag( 'td',
             ) .
             html_tag( 'tr', "\n" .
                 html_tag( 'td',

-                    '<br /><big><font color="' . $color[2] . '">' . _("You have").' '.
-                   sprintf( ( $numnew == 1 ?
-                       _("%s new message") :
-                       _("%s new messages") ), $numnew ) .
+                    '<br /><big><font color="' . $color[2] . '">'.
+                   sprintf( ( $numnew == 1 ?
+                       _("You have %s new message") :
+                       _("You have %s new messages") ), $numnew ) .

                     '</font><br /></big><br />' . "\n" .
                     '<form name="nm">' . "\n".
                     '<input type="button" name="bt" value="' . _("Close Window") .
                     '</font><br /></big><br />' . "\n" .
                     '<form name="nm">' . "\n".
                     '<input type="button" name="bt" value="' . _("Close Window") .

diff --git a/po/squirrelmail.pot b/po/squirrelmail.pot
index 1ef7a3768ef481bcf0989d56eeb551b111980958..57dd560ef36e7e6bafad05c3444b1aa6799fd68e 100644 (file)
--- a/po/squirrelmail.pot
+++ b/po/squirrelmail.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"

-"POT-Creation-Date: 2004-09-01 19:36+0300\n"
+"POT-Creation-Date: 2004-09-28 06:12+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"
 "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,15 +17,6 @@ msgstr ""
 msgid "Address Book"
 msgstr ""
 
 msgid "Address Book"
 msgstr ""
 

-msgid "All"
-msgstr ""
-
-msgid "To"
-msgstr ""
-
-msgid "Cc"
-msgstr ""
-

 msgid "Name"
 msgstr ""
 
 msgid "Name"
 msgstr ""
 


@@ -38,13 +29,16 @@ msgstr ""
 msgid "Source"
 msgstr ""
 
 msgid "Source"
 msgstr ""
 

-msgid "Bcc"
+msgid "To"

 msgstr ""
 
 msgstr ""
 

-msgid "Use Addresses"
+msgid "Cc"

 msgstr ""
 
 msgstr ""
 

-msgid "Address Book Search"
+msgid "Bcc"
+msgstr ""
+
+msgid "No persons matching your search were found"

 msgstr ""
 
 msgid "Search for"
 msgstr ""
 
 msgid "Search for"


@@ -62,6 +56,9 @@ msgstr ""
 msgid "List all"
 msgstr ""
 
 msgid "List all"
 msgstr ""
 

+msgid "Close"
+msgstr ""
+

 #, c-format
 msgid "Unable to list addresses from %s"
 msgstr ""
 #, c-format
 msgid "Unable to list addresses from %s"
 msgstr ""


@@ -69,13 +66,16 @@ msgstr ""
 msgid "Your search failed with the following error(s)"
 msgstr ""
 
 msgid "Your search failed with the following error(s)"
 msgstr ""
 

-msgid "No persons matching your search were found"
+msgid "All"

 msgstr ""
 
 msgstr ""
 

-msgid "Return"
+msgid "Use Addresses"

 msgstr ""
 
 msgstr ""
 

-msgid "Close"
+msgid "Address Book Search"
+msgstr ""
+
+msgid "Return"

 msgstr ""
 
 msgid "Nickname"
 msgstr ""
 
 msgid "Nickname"


@@ -226,28 +226,6 @@ msgstr ""
 msgid "Server replied: "
 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 ""
 
 msgid "Folders"
 msgstr ""
 


@@ -299,6 +277,9 @@ msgstr ""
 msgid "No folders found"
 msgstr ""
 
 msgid "No folders found"
 msgstr ""
 

+msgid "Delete Folder"
+msgstr ""
+

 msgid "Delete"
 msgstr ""
 
 msgid "Delete"
 msgstr ""
 


@@ -317,6 +298,25 @@ msgstr ""
 msgid "Subscribe to:"
 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 ""
 
 msgid "You have not selected a folder to rename. Please do so."
 msgstr ""
 


@@ -416,12 +416,64 @@ msgstr ""
 msgid "Password:"
 msgstr ""
 
 msgid "Password:"
 msgstr ""
 

-msgid "Options"
+msgid "Personal Information"
+msgstr ""
+
+msgid "Display Preferences"

 msgstr ""
 
 msgid "Message Highlighting"
 msgstr ""
 
 msgstr ""
 
 msgid "Message Highlighting"
 msgstr ""
 

+msgid "Folder Preferences"
+msgstr ""
+
+msgid "Index Order"
+msgstr ""
+
+msgid "Options"
+msgstr ""
+
+msgid "Error(s) happened while saving your options"
+msgstr ""
+
+msgid "Some of your preference changes are not applied."
+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 ""
 
 msgid "New"
 msgstr ""
 


@@ -534,9 +586,6 @@ msgstr ""
 msgid "Move Up"
 msgstr ""
 
 msgid "Move Up"
 msgstr ""
 

-msgid "Index Order"
-msgstr ""
-

 msgid "Checkbox"
 msgstr ""
 
 msgid "Checkbox"
 msgstr ""
 


@@ -564,56 +613,10 @@ msgstr ""
 msgid "Return to options page"
 msgstr ""
 
 msgid "Return to options page"
 msgstr ""
 

-msgid "Personal Information"
-msgstr ""
-
-msgid "Display Preferences"
-msgstr ""
-
-msgid "Folder Preferences"
-msgstr ""
-
-msgid "Error(s) happened while saving your options"
-msgstr ""
-
-msgid "Some of your preference changes are not applied."
-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."
+msgid "Message not printable"

 msgstr ""
 
 msgstr ""
 

-msgid "Message not printable"
+msgid "Invalid URL"

 msgstr ""
 
 msgid "Printer Friendly"
 msgstr ""
 
 msgid "Printer Friendly"


@@ -2426,16 +2429,16 @@ msgstr ""
 msgid "Show system specs"
 msgstr ""
 
 msgid "Show system specs"
 msgstr ""
 

-#, c-format
-msgid "Could not write calendar file %s"
-msgstr ""
-

 msgid "TODAY"
 msgstr ""
 
 msgid "Go"
 msgstr ""
 
 msgid "TODAY"
 msgstr ""
 
 msgid "Go"
 msgstr ""
 

+#, c-format
+msgid "Could not write calendar file %s"
+msgstr ""
+

 msgid "l, F j Y"
 msgstr ""
 
 msgid "l, F j Y"
 msgstr ""
 


@@ -2541,19 +2544,19 @@ msgstr ""
 msgid "Calendar"
 msgstr ""
 
 msgid "Calendar"
 msgstr ""
 

-msgid "You must type in your current password."
+msgid "You must type in a new password."

 msgstr ""
 
 msgstr ""
 

-msgid "Your current password is not correct."
+msgid "You must also type in your new password in the verify box."

 msgstr ""
 
 msgstr ""
 

-msgid "You must type in a new password."
+msgid "Your new password does not match the verify password."

 msgstr ""
 
 msgstr ""
 

-msgid "You must also type in your new password in the verify box."
+msgid "You must type in your current password."

 msgstr ""
 
 msgstr ""
 

-msgid "Your new password does not match the verify password."
+msgid "Your current password is not correct."

 msgstr ""
 
 #, c-format
 msgstr ""
 
 #, c-format


@@ -3235,6 +3238,20 @@ msgstr ""
 msgid "View Message details"
 msgstr ""
 
 msgid "View Message details"
 msgstr ""
 

+msgid "New Mail"
+msgstr ""
+
+msgid "SquirrelMail Notice:"
+msgstr ""
+
+#, c-format
+msgid "You have %s new message"
+msgstr ""
+
+#, c-format
+msgid "You have %s new messages"
+msgstr ""
+

 msgid "New Mail Notification"
 msgstr ""
 
 msgid "New Mail Notification"
 msgstr ""
 


@@ -3309,23 +3326,6 @@ msgstr ""
 msgid "Current File:"
 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 ""
 
 msgid "NewMail Options"
 msgstr ""
 


@@ -3610,9 +3610,6 @@ msgstr ""
 msgid "SquirrelSpell is misconfigured."
 msgstr ""
 
 msgid "SquirrelSpell is misconfigured."
 msgstr ""
 

-msgid "SquirrelSpell Results"
-msgstr ""
-

 msgid "Spellcheck completed. Commit changes?"
 msgstr ""
 
 msgid "Spellcheck completed. Commit changes?"
 msgstr ""
 


@@ -3622,6 +3619,9 @@ msgstr ""
 msgid "Now saving your personal dictionary... Please wait."
 msgstr ""
 
 msgid "Now saving your personal dictionary... Please wait."
 msgstr ""
 

+msgid "SquirrelSpell Results"
+msgstr ""
+

 #, c-format
 msgid "Found %s errors"
 msgstr ""
 #, c-format
 msgid "Found %s errors"
 msgstr ""


@@ -3689,6 +3689,18 @@ msgstr ""
 msgid "No errors found"
 msgstr ""
 
 msgid "No errors found"
 msgstr ""
 

+msgid ""
+"Your personal dictionary has been encrypted and is now stored in an "
+"encrypted format."
+msgstr ""
+
+msgid ""
+"Your personal dictionary has been decrypted and is now stored as plain text."
+msgstr ""
+
+msgid "Personal Dictionary Crypto Settings"
+msgstr ""
+

 msgid "Your personal dictionary was erased."
 msgstr ""
 
 msgid "Your personal dictionary was erased."
 msgstr ""
 


@@ -3720,18 +3732,6 @@ msgstr ""
 msgid "Dictionary re-encrypted"
 msgstr ""
 
 msgid "Dictionary re-encrypted"
 msgstr ""
 

-msgid ""
-"Your personal dictionary has been encrypted and is now stored in an "
-"encrypted format."
-msgstr ""
-
-msgid ""
-"Your personal dictionary has been decrypted and is now stored as plain text."
-msgstr ""
-
-msgid "Personal Dictionary Crypto Settings"
-msgstr ""
-

 msgid "Personal Dictionary"
 msgstr ""
 
 msgid "Personal Dictionary"
 msgstr ""