[Phpgroupware-cvs] CVS: squirrelmail/functions abook_database.php,1.2,1.3 abook_local_file.php,1.2,1.3 addressbook.php,1.2,1.3

[Guillaume Courtois <address@hidden>]

Update of /cvsroot/phpgroupware/squirrelmail/functions
In directory subversions:/tmp/cvs-serv21161/squirrelmail/functions

Modified Files:
        abook_database.php abook_local_file.php addressbook.php 
Log Message:
Corrected typos, suppressed doublons or useless phrases, changed all %s's into 
%x's in lang calls and lang files, added missing english phrases and french 
translations.


Index: abook_database.php
===================================================================
RCS file: /cvsroot/phpgroupware/squirrelmail/functions/abook_database.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** abook_database.php  5 May 2001 22:34:49 -0000       1.2
--- abook_database.php  18 Jun 2003 22:25:37 -0000      1.3
***************
*** 84,88 ****
           
           if(DB::isError($dbh) || DB::isWarning($dbh)) 
!             return $this->set_error(sprintf(lang("Database error: %s"),
                                              DB::errorMessage($dbh)));
           
--- 84,88 ----
           
           if(DB::isError($dbh) || DB::isWarning($dbh)) 
!             return $this->set_error(sprintf(lang("Database error: %1"),
                                              DB::errorMessage($dbh)));
           
***************
*** 120,124 ****
  
           if(DB::isError($res)) 
!             return $this->set_error(sprintf(lang("Database error: %s"),
                                              DB::errorMessage($res)));
  
--- 120,124 ----
  
           if(DB::isError($res)) 
!             return $this->set_error(sprintf(lang("Database error: %1"),
                                              DB::errorMessage($res)));
  
***************
*** 152,156 ****
  
           if(DB::isError($res)) 
!             return $this->set_error(sprintf(lang("Database error: %s"),
                                              DB::errorMessage($res)));
  
--- 152,156 ----
  
           if(DB::isError($res)) 
!             return $this->set_error(sprintf(lang("Database error: %1"),
                                              DB::errorMessage($res)));
  
***************
*** 181,185 ****
  
           if(DB::isError($res)) 
!             return $this->set_error(sprintf(lang("Database error: %s"),
                                              DB::errorMessage($res)));
  
--- 181,185 ----
  
           if(DB::isError($res)) 
!             return $this->set_error(sprintf(lang("Database error: %1"),
                                              DB::errorMessage($res)));
  
***************
*** 208,212 ****
           $ret = $this->lookup($userdata['nickname']);
           if(!empty($ret))
!             return $this->set_error(sprintf(lang("User '%s' already exist"),
                                              $ret['nickname']));
  
--- 208,212 ----
           $ret = $this->lookup($userdata['nickname']);
           if(!empty($ret))
!             return $this->set_error(sprintf(lang("User '%1' already exist"),
                                              $ret['nickname']));
  
***************
*** 227,231 ****
  
           // Fail
!          return $this->set_error(sprintf(lang("Database error: %s"),
                                           DB::errorMessage($r)));
        }
--- 227,231 ----
  
           // Fail
!          return $this->set_error(sprintf(lang("Database error: %1"),
                                           DB::errorMessage($r)));
        }
***************
*** 256,260 ****
  
           // Fail
!          return $this->set_error(sprintf(lang("Database error: %s"),
                                           DB::errorMessage($r)));
        }
--- 256,260 ----
  
           // Fail
!          return $this->set_error(sprintf(lang("Database error: %1"),
                                           DB::errorMessage($r)));
        }
***************
*** 271,275 ****
           $ret = $this->lookup($alias);
           if(empty($ret))
!             return $this->set_error(sprintf(lang("User '%s' does not exist"),
                                              $alias));
  
--- 271,275 ----
           $ret = $this->lookup($alias);
           if(empty($ret))
!             return $this->set_error(sprintf(lang("User '%1' does not exist"),
                                              $alias));
  
***************
*** 292,296 ****
  
           // Fail
!          return $this->set_error(sprintf(lang("Database error: %s"),
                                           DB::errorMessage($r)));
        }
--- 292,296 ----
  
           // Fail
!          return $this->set_error(sprintf(lang("Database error: %1"),
                                           DB::errorMessage($r)));
        }

Index: abook_local_file.php
===================================================================
RCS file: /cvsroot/phpgroupware/squirrelmail/functions/abook_local_file.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** abook_local_file.php        5 May 2001 22:34:49 -0000       1.2
--- abook_local_file.php        18 Jun 2003 22:25:37 -0000      1.3
***************
*** 230,234 ****
         $ret = $this->lookup($userdata['nickname']);
         if(!empty($ret))
!        return $this->set_error(sprintf(lang("User '%s' already exist"),
                                         $ret['nickname']));
  
--- 230,234 ----
         $ret = $this->lookup($userdata['nickname']);
         if(!empty($ret))
!        return $this->set_error(sprintf(lang("User '%1' already exist"),
                                         $ret['nickname']));
  
***************
*** 303,307 ****
         $ret = $this->lookup($alias);
         if(empty($ret))
!        return $this->set_error(sprintf(lang("User '%s' does not exist"),
                                         $alias));
  
--- 303,307 ----
         $ret = $this->lookup($alias);
         if(empty($ret))
!        return $this->set_error(sprintf(lang("User '%1' does not exist"),
                                         $alias));
  

Index: addressbook.php
===================================================================
RCS file: /cvsroot/phpgroupware/squirrelmail/functions/addressbook.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** addressbook.php     5 May 2001 22:34:49 -0000       1.2
--- addressbook.php     18 Jun 2003 22:25:37 -0000      1.3
***************
*** 29,33 ****
                                                   'create'   => true));
        if(!$r && $showerr) {
!        printf(lang("Error opening file %s"), $filename);
         exit;
        }
--- 29,33 ----
                                                   'create'   => true));
        if(!$r && $showerr) {
!        printf(lang("Error opening file %1"), $filename);
         exit;
        }
***************
*** 43,47 ****
               $r = $abook->add_backend('ldap_server', $param);
               if(!$r && $showerr) {
!                 printf(' ' . lang("Error initializing LDAP server %s:") .
                       "<BR>\n", $param['host']);
                  print('&nbsp;' . $abook->error);
--- 43,47 ----
               $r = $abook->add_backend('ldap_server', $param);
               if(!$r && $showerr) {
!                 printf('&nbsp;' . lang("Error initializing LDAP server %1:") .
                       "<BR>\n", $param['host']);
                  print('&nbsp;' . $abook->error);