[Phpgroupware-cvs] CVS: felamimail/inc prefs.php,1.4,1.5 display_messages.php,1.4,1.5 imap_general.php,1.4,1.5

[Guillaume Courtois <address@hidden>]

Update of /cvsroot/phpgroupware/felamimail/inc
In directory subversions:/tmp/cvs-serv26771/felamimail/inc

Modified Files:
        prefs.php display_messages.php imap_general.php 
Log Message:
Changed all %s into %1 into lang calls and lang files, added missing english 
phrases and french translations and suppressed doublons.


Index: prefs.php
===================================================================
RCS file: /cvsroot/phpgroupware/felamimail/inc/prefs.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** prefs.php   24 Nov 2002 00:32:13 -0000      1.4
--- prefs.php   26 May 2003 20:39:37 -0000      1.5
***************
*** 18,22 ****
        $filename = "$data_dir$username.pref";
        if (!file_exists($filename)) {
!        printf (lang("Preference file %s not found. Exiting abnormally"), 
$filename);
           $phpgw->common->phpgw_exit(True);
        }
--- 18,22 ----
        $filename = "$data_dir$username.pref";
        if (!file_exists($filename)) {
!        printf (lang("Preference file %1 not found. Exiting abnormally"), 
$filename);
           $phpgw->common->phpgw_exit(True);
        }
***************
*** 41,45 ****
        $found = false;
        if (!file_exists($filename)) {
!        printf (lang("Preference file, %s, does not exist. Log out, and log 
back in to create a default preference file."), $filename);
         echo "<br>\n";
           exit;
--- 41,45 ----
        $found = false;
        if (!file_exists($filename)) {
!        printf (lang("Preference file, %1, does not exist. Log out, and log 
back in to create a default preference file."), $filename);
         echo "<br>\n";
           exit;
***************
*** 82,86 ****
        $found = false;
        if (!file_exists($filename)) {
!        printf (lang("Preference file, %s, does not exist. Log out, and log 
back in to create a default preference file."), $filename);
         echo "\n<br>\n";
           exit;
--- 82,86 ----
        $found = false;
        if (!file_exists($filename)) {
!        printf (lang("Preference file, %1, does not exist. Log out, and log 
back in to create a default preference file."), $filename);
         echo "\n<br>\n";
           exit;

Index: display_messages.php
===================================================================
RCS file: /cvsroot/phpgroupware/felamimail/inc/display_messages.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** display_messages.php        24 Nov 2002 00:32:13 -0000      1.4
--- display_messages.php        26 May 2003 20:39:37 -0000      1.5
***************
*** 31,35 ****
        echo "      <TD BGCOLOR=\"$color[0]\">";
        echo '         <B><CENTER>';
!       printf (lang("Welcome to %s's WebMail system"), $org_name);
        echo '         </CENTER></B>';
        echo '   <TR><TD BGCOLOR="#FFFFFF">';
--- 31,35 ----
        echo "      <TD BGCOLOR=\"$color[0]\">";
        echo '         <B><CENTER>';
!       printf (lang("Welcome to %1's WebMail system"), $org_name);
        echo '         </CENTER></B>';
        echo '   <TR><TD BGCOLOR="#FFFFFF">';
***************
*** 42,46 ****
           echo "               <B>$org_name</B>";
        echo '         <BR><CENTER>';
!       printf (lang("Running SquirrelMail version %s (c) 1999-2000."), 
$version);
        echo '            </CENTER><BR>';
        echo '            </CENTER></TD></TR><TR>';
--- 42,46 ----
           echo "               <B>$org_name</B>";
        echo '         <BR><CENTER>';
!       printf (lang("Running SquirrelMail version %1 (c) 1999-2000."), 
$version);
        echo '            </CENTER><BR>';
        echo '            </CENTER></TD></TR><TR>';
***************
*** 68,72 ****
        echo '      <BR>';
        echo "         <A HREF=\"". 
$phpgw->link("/felamimail/index.php","sort=$sort&startMessage=$startMessage&mailbox=$urlMailbox")."\">";
!       printf (lang("Click here to return to %s"), $mailbox);
        echo '</A>.';
        echo '   </TD></TR>';
--- 68,72 ----
        echo '      <BR>';
        echo "         <A HREF=\"". 
$phpgw->link("/felamimail/index.php","sort=$sort&startMessage=$startMessage&mailbox=$urlMailbox")."\">";
!       printf (lang("Click here to return to %1"), $mailbox);
        echo '</A>.';
        echo '   </TD></TR>';

Index: imap_general.php
===================================================================
RCS file: /cvsroot/phpgroupware/felamimail/inc/imap_general.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** imap_general.php    24 Nov 2002 00:32:13 -0000      1.4
--- imap_general.php    26 May 2003 20:39:37 -0000      1.5
***************
*** 121,125 ****
                        {
                                set_up_language($felamimail_language, true);
!                               printf (lang("Error connecting to IMAP server: 
%s.")."<br>\r\n", $imap_server_address);
                                echo "$error_number : $error_string<br>\r\n";
                        }
--- 121,125 ----
                        {
                                set_up_language($felamimail_language, true);
!                               printf (lang("Error connecting to IMAP server: 
%1.")."<br>\r\n", $imap_server_address);
                                echo "$error_number : $error_string<br>\r\n";
                        }
***************
*** 143,151 ****
                                        if ($response == 'BAD')
                                        {
!                                               printf (lang("Bad request: 
%s")."<br>\r\n", $message);
                                        }
                                        else
                                        {
!                                               printf (lang("Unknown error: 
%s") . "<br>\n", $message);
                                                echo '<br>';
                                        }
--- 143,151 ----
                                        if ($response == 'BAD')
                                        {
!                                               printf (lang("Bad request: 
%1")."<br>\r\n", $message);
                                        }
                                        else
                                        {
!                                               printf (lang("Unknown error: 
%1") . "<br>\n", $message);
                                                echo '<br>';
                                        }
***************
*** 162,166 ****
  
                      } else {
!                       echo '<b>' . lang('Invaild user name or password') . 
'</b>';
                                        $phpgw->common->phpgw_exit(True);
              }
--- 162,166 ----
  
                      } else {
!                       echo '<b>' . lang('Invalid user name or password') . 
'</b>';
                                        $phpgw->common->phpgw_exit(True);
              }