[Phpgroupware-cvs] CVS: phpgwapi/inc class.common.inc.php,1.123.2.7,1.123.2.8 class.nextmatchs.inc.php,1.43.2.5,1.43.2.6

[Ralf Becker <address@hidden>]

Update of /cvsroot/phpgroupware/phpgwapi/inc
In directory subversions:/tmp/cvs-serv5472

Modified Files:
      Tag: Version-0_9_14-branch
        class.common.inc.php class.nextmatchs.inc.php 
Log Message:
gugux lang-update: x's to %#'s

Index: class.common.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/class.common.inc.php,v
retrieving revision 1.123.2.7
retrieving revision 1.123.2.8
diff -C2 -r1.123.2.7 -r1.123.2.8
*** class.common.inc.php        24 Nov 2002 21:49:13 -0000      1.123.2.7
--- class.common.inc.php        5 Mar 2003 00:11:58 -0000       1.123.2.8
***************
*** 990,994 ****
  
                        // We handle this here becuase its special
!                       $GLOBALS['phpgw_info']['navbar']['about']['title'] = 
lang('About x',$app);
  
                        $GLOBALS['phpgw_info']['navbar']['about']['url']   = 
$GLOBALS['phpgw']->link('/about.php','app='.$app);
--- 990,994 ----
  
                        // We handle this here becuase its special
!                       $GLOBALS['phpgw_info']['navbar']['about']['title'] = 
lang('About %1',$app);
  
                        $GLOBALS['phpgw_info']['navbar']['about']['url']   = 
$GLOBALS['phpgw']->link('/about.php','app='.$app);
***************
*** 1480,1484 ****
                                case 33:        $s .= lang('Group has been 
updated');   break;
                                case 34:        $s .= lang('Account has been 
deleted') . '<p>'
!                                               . lang('Error deleting x x 
directory',lang('users'),' '.lang('private').' ') 
                                                . ',<br>' . lang('Please x by 
hand',lang('delete')) . '<br><br>'
                                                . lang('To correct this error 
for the future you will need to properly set the')
--- 1480,1484 ----
                                case 33:        $s .= lang('Group has been 
updated');   break;
                                case 34:        $s .= lang('Account has been 
deleted') . '<p>'
!                                               . lang('Error deleting %1 %2 
directory',lang('users'),' '.lang('private').' ') 
                                                . ',<br>' . lang('Please x by 
hand',lang('delete')) . '<br><br>'
                                                . lang('To correct this error 
for the future you will need to properly set the')
***************
*** 1488,1492 ****
                                        break;
                                case 35:        $s .= lang('Account has been 
updated') . '<p>'
!                                               . lang('Error renaming x x 
directory',lang('users'),
                                                ' '.lang('private').' ') 
                                                . ',<br>' . lang('Please x by 
hand',
--- 1488,1492 ----
                                        break;
                                case 35:        $s .= lang('Account has been 
updated') . '<p>'
!                                               . lang('Error renaming %1 %2 
directory',lang('users'),
                                                ' '.lang('private').' ') 
                                                . ',<br>' . lang('Please x by 
hand',
***************
*** 1498,1502 ****
                                        break;
                                case 36:        $s .= lang('Account has been 
created') . '<p>'
!                                               . lang('Error creating x x 
directory',lang('users'),
                                                ' '.lang('private').' ') 
                                                . ',<br>' . lang('Please x by 
hand',
--- 1498,1502 ----
                                        break;
                                case 36:        $s .= lang('Account has been 
created') . '<p>'
!                                               . lang('Error creating %1 %2 
directory',lang('users'),
                                                ' '.lang('private').' ') 
                                                . ',<br>' . lang('Please x by 
hand',
***************
*** 1508,1512 ****
                                        break;
                                case 37:        $s .= lang('Group has been 
added') . '<p>'
!                                               . lang('Error creating x x 
directory',lang('groups'),' ')
                                                . ',<br>' . lang('Please x by 
hand',
                                                lang('create')) . '<br><br>'
--- 1508,1512 ----
                                        break;
                                case 37:        $s .= lang('Group has been 
added') . '<p>'
!                                               . lang('Error creating %1 %2 
directory',lang('groups'),' ')
                                                . ',<br>' . lang('Please x by 
hand',
                                                lang('create')) . '<br><br>'
***************
*** 1517,1521 ****
                                        break;
                                case 38:        $s .= lang('Group has been 
deleted') . '<p>'
!                                               . lang('Error deleting x x 
directory',lang('groups'),' ')
                                                . ',<br>' . lang('Please x by 
hand',
                                                lang('delete')) . '<br><br>'
--- 1517,1521 ----
                                        break;
                                case 38:        $s .= lang('Group has been 
deleted') . '<p>'
!                                               . lang('Error deleting %1 %2 
directory',lang('groups'),' ')
                                                . ',<br>' . lang('Please x by 
hand',
                                                lang('delete')) . '<br><br>'
***************
*** 1526,1530 ****
                                        break;
                                case 39:        $s .= lang('Group has been 
updated') . '<p>'
!                                               . lang('Error renaming x x 
directory',lang('groups'),' ')
                                                . ',<br>' . lang('Please x by 
hand',
                                                lang('rename')) . '<br><br>'
--- 1526,1530 ----
                                        break;
                                case 39:        $s .= lang('Group has been 
updated') . '<p>'
!                                               . lang('Error renaming %1 %2 
directory',lang('groups'),' ')
                                                . ',<br>' . lang('Please x by 
hand',
                                                lang('rename')) . '<br><br>'

Index: class.nextmatchs.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/class.nextmatchs.inc.php,v
retrieving revision 1.43.2.5
retrieving revision 1.43.2.6
diff -C2 -r1.43.2.5 -r1.43.2.6
*** class.nextmatchs.inc.php    27 Apr 2002 22:31:21 -0000      1.43.2.5
--- class.nextmatchs.inc.php    5 Mar 2003 00:11:58 -0000       1.43.2.6
***************
*** 687,695 ****
                                        $end = $start + $this->maxmatches;
                                }
!                               return lang('showing x - x of x',($start + 
1),$end,$total_records);
                        }
                        else
                        {
!                               return lang('showing x',$total_records);
                        }
                }
--- 687,695 ----
                                        $end = $start + $this->maxmatches;
                                }
!                               return lang('showing %1 - %2 of %3',($start + 
1),$end,$total_records);
                        }
                        else
                        {
!                               return lang('showing %1',$total_records);
                        }
                }