I18n fixes

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

diff --git a/functions/mailbox_display.php b/functions/mailbox_display.php
index 688bfd3bce9c35aaf3247fcaf54c3f27a27e0f27..4229b4989c1ec36746304b063f392b036b296aa5 100644 (file)
--- a/functions/mailbox_display.php
+++ b/functions/mailbox_display.php
@@ -197,8 +197,8 @@ function printMessageInfo($aMsg) {
     }
     // If Sent, prefix with To: but only if not Sent folder
     if ($bHandleAsSent ^ $bSentFolder) {
-        $senderName = _("To:") . ' ' . $senderName;
-        $senderAddress = _("To:") . ' ' . $senderAddress;
+        $senderName = _("To") . ': ' . $senderName;
+        $senderAddress = _("To") . ': ' . $senderAddress;
     }
 
     // this is a column property which can apply to multiple columns. Do not use vars for one column

diff --git a/po/squirrelmail.pot b/po/squirrelmail.pot
index cd0b916d6370cbdb1dec7ae67f6d61a1e54fc0c5..250c817882e18a05ce23b687044dbd30f6032355 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-08-13 22:25+0200\n"
+"POT-Creation-Date: 2004-08-14 21:26+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"
@@ -29,6 +29,15 @@ msgstr ""
 msgid "Source"
 msgstr ""
 
+msgid "To"
+msgstr ""
+
+msgid "Cc"
+msgstr ""
+
+msgid "Bcc"
+msgstr ""
+
 msgid "No persons matching your search were found"
 msgstr ""
 
@@ -60,15 +69,6 @@ msgstr ""
 msgid "All"
 msgstr ""
 
-msgid "To"
-msgstr ""
-
-msgid "Cc"
-msgstr ""
-
-msgid "Bcc"
-msgstr ""
-
 msgid "Use Addresses"
 msgstr ""
 
@@ -174,18 +174,6 @@ msgstr ""
 msgid "From:"
 msgstr ""
 
-msgid "To:"
-msgstr ""
-
-msgid "CC:"
-msgstr ""
-
-msgid "BCC:"
-msgstr ""
-
-msgid "Subject:"
-msgstr ""
-
 msgid "Send"
 msgstr ""
 
@@ -625,9 +613,6 @@ msgstr ""
 msgid "Message not printable"
 msgstr ""
 
-msgid "CC"
-msgstr ""
-
 msgid "Printer Friendly"
 msgstr ""
 
@@ -643,7 +628,7 @@ msgstr ""
 msgid "Your message"
 msgstr ""
 
-msgid "Sent:"
+msgid "Sent"
 msgstr ""
 
 #, c-format
@@ -2617,9 +2602,6 @@ msgstr ""
 msgid "Connecting to Password Server"
 msgstr ""
 
-msgid "ERROR:"
-msgstr ""
-
 msgid ""
 "COMMERCIAL - This list contains servers that are verified spam senders. It "
 "is a pretty reliable list to scan spam from."

diff --git a/src/compose.php b/src/compose.php
index 3caba2e48ea27c131ddb9e2f45993f50f56efa73..89f6d12da201c075eaa2f02ae8c11e641ab82023 100644 (file)
--- a/src/compose.php
+++ b/src/compose.php
@@ -996,28 +996,28 @@ function showInputForm ($session, $values=false) {
 
     echo '   <tr>' . "\n" .
                 html_tag( 'td', '', 'right', $color[4], 'width="10%"' ) .
-                _("To:") . '</td>' . "\n" .
+                _("To") . ':</td>' . "\n" .
                 html_tag( 'td', '', 'left', $color[4], 'width="90%"' ) .
                 addInput('send_to', $send_to, 60). '<br />' . "\n" .
          '      </td>' . "\n" .
          '   </tr>' . "\n" .
          '   <tr>' . "\n" .
                 html_tag( 'td', '', 'right', $color[4] ) .
-                _("CC:") . '</td>' . "\n" .
+                _("Cc") . ':</td>' . "\n" .
                 html_tag( 'td', '', 'left', $color[4] ) .
       addInput('send_to_cc', $send_to_cc, 60). '<br />' . "\n" .
          '      </td>' . "\n" .
          '   </tr>' . "\n" .
          '   <tr>' . "\n" .
                 html_tag( 'td', '', 'right', $color[4] ) .
-                _("BCC:") . '</td>' . "\n" .
+                _("Bcc") . ':</td>' . "\n" .
                 html_tag( 'td', '', 'left', $color[4] ) .
       addInput('send_to_bcc', $send_to_bcc, 60).'<br />' . "\n" .
          '      </td>' . "\n" .
          '   </tr>' . "\n" .
          '   <tr>' . "\n" .
                 html_tag( 'td', '', 'right', $color[4] ) .
-                _("Subject:") . '</td>' . "\n" .
+                _("Subject") . ':</td>' . "\n" .
                 html_tag( 'td', '', 'left', $color[4] ) . "\n";
     echo '         '.addInput('subject', $subject, 60).
          '      </td>' . "\n" .

diff --git a/src/printer_friendly_bottom.php b/src/printer_friendly_bottom.php
index a4280087c9b041c9464d98b4c156c45320e7e8e3..d1139de92ab937c2902cd9e4e36152acba93caca 100644 (file)
--- a/src/printer_friendly_bottom.php
+++ b/src/printer_friendly_bottom.php
@@ -136,9 +136,9 @@ echo '<body text="#000000" bgcolor="#FFFFFF" link="#000000" vlink="#000000" alin
          html_tag( 'td', _("To").'&nbsp;', 'left','','valign="top"' ) .
          html_tag( 'td', $to, 'left' )
     ) . "\n";
-    if ( strlen($cc) > 0 ) { /* only show CC: if it's there... */
+    if ( strlen($cc) > 0 ) { /* only show Cc: if it's there... */
          echo html_tag( 'tr',
-             html_tag( 'td', _("CC").'&nbsp;', 'left','','valign="top"' ) .
+             html_tag( 'td', _("Cc").'&nbsp;', 'left','','valign="top"' ) .
              html_tag( 'td', $cc, 'left' )
          );
      }

diff --git a/src/read_body.php b/src/read_body.php
index 0fc323fa0c55f283561d0a5637c8f435fd8515de..fa638803a37f358f4d4eb71397f5b38584b2d220 100644 (file)
--- a/src/read_body.php
+++ b/src/read_body.php
@@ -184,9 +184,9 @@ function SendMDN ( $mailbox, $passed_id, $sender, $message, $imapConnection) {
     $now = getLongDateString( time() );
     set_my_charset();
     $body = _("Your message") . "\r\n\r\n" .
-            "\t" . _("To:") . ' ' . decodeHeader($to,false,false) . "\r\n" .
-            "\t" . _("Subject:") . ' ' . decodeHeader($header->subject,false,false) . "\r\n" .
-            "\t" . _("Sent:") . ' ' . $senton . "\r\n" .
+            "\t" . _("To") . ': ' . decodeHeader($to,false,false) . "\r\n" .
+            "\t" . _("Subject") . ': ' . decodeHeader($header->subject,false,false) . "\r\n" .
+            "\t" . _("Sent") . ': ' . $senton . "\r\n" .
             "\r\n" .
             sprintf( _("Was displayed on %s"), $now );
 

diff --git a/src/search.php b/src/search.php
index 911ad35f59438b92162484e59fdd6c4bb92dd085..720cec595c9edb60dac04d78f7c340f4e0b0ccdb 100644 (file)
--- a/src/search.php
+++ b/src/search.php
@@ -1266,7 +1266,7 @@ if ($search_advanced) {
         'BCC' => _("Bcc"),
         'BEFORE' => _("Before"),
         'BODY' => _("Message Body"),
-        'CC' => _("CC"),
+        'CC' => _("Cc"),
         'DELETED' => _("Deleted"),
         'DRAFT' => _("Draft"),
         'FLAGGED' => _("Flagged"),
@@ -1480,4 +1480,4 @@ do_hook('search_bottom');
 sqimap_logout($imapConnection);
 echo '</body></html>';
 sqsession_register($mailbox_cache,'mailbox_cache');
-?>
+?>
\ No newline at end of file