Unifying strings

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

diff --git a/plugins/translate/functions.php b/plugins/translate/functions.php
index f548be156e9f46e19f293a231a2c2aa0e2d58fba..3847af1cea9c92d93747d5710523607e9126387a 100644 (file)
--- a/plugins/translate/functions.php
+++ b/plugins/translate/functions.php
@@ -468,13 +468,13 @@ function translate_form_babelfish($message) {
     <input type="hidden" name="trtext" value="<?php echo $message; ?>" />
     <select name="lp"><?php
         echo translate_lang_opt('zh_CN',  '',     'zh_en',
-                            sprintf( _("%s to %s"),_("Chinese Simplified"),_("English"))) .
+                            sprintf( _("%s to %s"),_("Chinese, Simplified"),_("English"))) .
          translate_lang_opt('zh_TW',  '',     'zt_en',
-                            sprintf( _("%s to %s"),_("Chinese Traditional"),_("English"))) .
+                            sprintf( _("%s to %s"),_("Chinese, Traditional"),_("English"))) .
          translate_lang_opt('en_US', 'zh_CN', 'en_zh',
-                            sprintf( _("%s to %s"),_("English"),_("Chinese Simplified"))) .
+                            sprintf( _("%s to %s"),_("English"),_("Chinese, Simplified"))) .
          translate_lang_opt('en_US', 'zh_TW', 'en_zt',
-                            sprintf( _("%s to %s"),_("English"),_("Chinese Traditional"))) .
+                            sprintf( _("%s to %s"),_("English"),_("Chinese, Traditional"))) .
          translate_lang_opt('en_US', 'nl_NL',  'en_nl',
                             sprintf( _("%s to %s"),_("English"),_("Dutch"))) .
          translate_lang_opt('en_US', 'fr_FR',  'en_fr',
@@ -706,9 +706,9 @@ function translate_form_dictionary($message) {
          '<input type="hidden" name="ts" value="'.$time.'" />'.
          '<select name="lp">'.
          translate_lang_opt('en_US', 'zh_CN', 'en_zh',
-                            sprintf( _("%s to %s"),_("English"),_("Simplified Chinese"))) .
+                            sprintf( _("%s to %s"),_("English"),_("Chinese, Simplified"))) .
          translate_lang_opt('en_US', 'zh_TW', 'en_zt',
-                            sprintf( _("%s to %s"),_("English"),_("Traditional Chinese"))) .
+                            sprintf( _("%s to %s"),_("English"),_("Chinese, Traditional"))) .
          translate_lang_opt('en_US', 'nl_NL', 'en_nl',
                             sprintf( _("%s to %s"),_("English"),_("Dutch"))) .
          translate_lang_opt('en_US', 'fr_FR', 'en_fr',
@@ -730,9 +730,9 @@ function translate_form_dictionary($message) {
          translate_lang_opt('en_US', 'es_ES', 'en_es',
                             sprintf( _("%s to %s"),_("English"),_("Spanish"))) .
          translate_lang_opt('zh_CN',  '',     'zh_en',
-                            sprintf( _("%s to %s"),_("Simplified Chinese"),_("English"))) .
+                            sprintf( _("%s to %s"),_("Chinese, Simplified"),_("English"))) .
          translate_lang_opt('zh_TW',  '',     'zt_en',
-                            sprintf( _("%s to %s"),_("Traditional Chinese"),_("English"))) .
+                            sprintf( _("%s to %s"),_("Chinese, Traditional"),_("English"))) .
          translate_lang_opt('nl_NL',  '',     'nl_en',
                             sprintf( _("%s to %s"),_("Dutch"),_("English"))) .
          translate_lang_opt('fr_FR',  '',     'fr_en',

diff --git a/po/squirrelmail.pot b/po/squirrelmail.pot
index 1a377b6bd357fb5d317114eb0926c7d1dd99d2f6..1e3cb0d22c61d1ed32e3ae58dc3bd549293ec28a 100644 (file)
--- a/po/squirrelmail.pot
+++ b/po/squirrelmail.pot
@@ -1,31 +1,25 @@
 # SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR Free Software Foundation, Inc.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2004-10-24 16:17+0300\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2004-10-24 23:13+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"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
 msgid "Address Book"
 msgstr ""
 
-msgid "All"
-msgstr ""
-
-msgid "To"
-msgstr ""
-
-msgid "Cc"
-msgstr ""
-
 msgid "Name"
 msgstr ""
 
@@ -38,13 +32,16 @@ msgstr ""
 msgid "Source"
 msgstr ""
 
-msgid "Bcc"
+msgid "To"
 msgstr ""
 
-msgid "Use Addresses"
+msgid "Cc"
 msgstr ""
 
-msgid "Address Book Search"
+msgid "Bcc"
+msgstr ""
+
+msgid "No persons matching your search were found"
 msgstr ""
 
 msgid "Search for"
@@ -62,6 +59,9 @@ msgstr ""
 msgid "List all"
 msgstr ""
 
+msgid "Close"
+msgstr ""
+
 #, c-format
 msgid "Unable to list addresses from %s"
 msgstr ""
@@ -69,13 +69,16 @@ 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 "Use Addresses"
 msgstr ""
 
-msgid "Close"
+msgid "Address Book Search"
+msgstr ""
+
+msgid "Return"
 msgstr ""
 
 msgid "No personal address book is defined. Contact administrator."
@@ -208,28 +211,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 ""
 
@@ -281,6 +262,9 @@ msgstr ""
 msgid "No folders found"
 msgstr ""
 
+msgid "Delete Folder"
+msgstr ""
+
 msgid "Delete"
 msgstr ""
 
@@ -299,6 +283,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 ""
 
@@ -347,6 +350,7 @@ msgstr ""
 msgid "Download this as a file"
 msgstr ""
 
+#, c-format
 msgid "INBOX"
 msgstr ""
 
@@ -398,12 +402,64 @@ msgstr ""
 msgid "Password:"
 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 "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 ""
 
@@ -516,9 +572,6 @@ msgstr ""
 msgid "Move Up"
 msgstr ""
 
-msgid "Index Order"
-msgstr ""
-
 msgid "Checkbox"
 msgstr ""
 
@@ -546,55 +599,6 @@ 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."
-msgstr ""
-
 msgid "Message not printable"
 msgstr ""
 
@@ -2424,16 +2428,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 ""
 
@@ -3236,6 +3240,18 @@ msgstr ""
 msgid "View Message details"
 msgstr ""
 
+msgid "New Mail"
+msgstr ""
+
+msgid "SquirrelMail Notice:"
+msgstr ""
+
+#, c-format
+msgid "You have %s new message"
+msgid_plural "You have %s new messages"
+msgstr[0] ""
+msgstr[1] ""
+
 msgid "New Mail Notification"
 msgstr ""
 
@@ -3245,6 +3261,7 @@ msgid ""
 "inbox for notification."
 msgstr ""
 
+#, c-format
 msgid "Check all boxes, not just INBOX"
 msgstr ""
 
@@ -3254,6 +3271,7 @@ msgid ""
 "unseen mail is in your folders (requires JavaScript)."
 msgstr ""
 
+#, c-format
 msgid "Show popup window on new mail"
 msgstr ""
 
@@ -3265,6 +3283,7 @@ msgid ""
 "sounds or popups for unseen mail."
 msgstr ""
 
+#, c-format
 msgid "Count only messages that are RECENT"
 msgstr ""
 
@@ -3276,6 +3295,7 @@ msgid ""
 "have new mail, even if you have %s enabled."
 msgstr ""
 
+#, c-format
 msgid "Change title on supported browsers"
 msgstr ""
 
@@ -3286,6 +3306,7 @@ msgid ""
 "provided file box."
 msgstr ""
 
+#, c-format
 msgid "Enable Media Playing"
 msgstr ""
 
@@ -3295,6 +3316,7 @@ msgid ""
 "no file is specified, %s, no sound will be used."
 msgstr ""
 
+#, c-format
 msgid "Select server file"
 msgstr ""
 
@@ -3310,18 +3332,6 @@ msgstr ""
 msgid "Current File:"
 msgstr ""
 
-msgid "New Mail"
-msgstr ""
-
-msgid "SquirrelMail Notice:"
-msgstr ""
-
-#, c-format
-msgid "You have %s new message"
-msgid_plural "You have %s new messages"
-msgstr[0] ""
-msgstr[1] ""
-
 msgid "NewMail Options"
 msgstr ""
 
@@ -3683,6 +3693,18 @@ 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 ""
 
@@ -3714,18 +3736,6 @@ 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 ""
 
@@ -3928,42 +3938,55 @@ msgstr ""
 msgid "%s to %s"
 msgstr ""
 
-msgid "Chinese Simplified"
+#, c-format
+msgid "Chinese, Simplified"
 msgstr ""
 
+#, c-format
 msgid "English"
 msgstr ""
 
-msgid "Chinese Traditional"
+#, c-format
+msgid "Chinese, Traditional"
 msgstr ""
 
+#, c-format
 msgid "Dutch"
 msgstr ""
 
+#, c-format
 msgid "French"
 msgstr ""
 
+#, c-format
 msgid "German"
 msgstr ""
 
+#, c-format
 msgid "Greek"
 msgstr ""
 
+#, c-format
 msgid "Italian"
 msgstr ""
 
+#, c-format
 msgid "Japanese"
 msgstr ""
 
+#, c-format
 msgid "Korean"
 msgstr ""
 
+#, c-format
 msgid "Portuguese"
 msgstr ""
 
+#, c-format
 msgid "Russian"
 msgstr ""
 
+#, c-format
 msgid "Spanish"
 msgstr ""
 
@@ -4033,12 +4056,6 @@ msgstr ""
 msgid "from English"
 msgstr ""
 
-msgid "Simplified Chinese"
-msgstr ""
-
-msgid "Traditional Chinese"
-msgstr ""
-
 msgid "Interface language"
 msgstr ""