[Phpgroupware-cvs] CVS: admin/inc class.uiaclmanager.inc.php,1.5.2.1,1.5.2.2 class.uiaccess_history.inc.php,1.6.2.1,1.6.2.2 class.uiserver.inc.php,1.3.2.1,1.3.2.2 class.uiaccounts.inc.php,1.23.2.4,1.23.2.5 class.uicategories.inc.php,1.6.2.6,1.6.2.7

[Guillaume Courtois <address@hidden>]

Update of /cvsroot/phpgroupware/admin/inc
In directory subversions:/tmp/cvs-serv8951/admin/inc

Modified Files:
      Tag: Version-0_9_14-branch
        class.uiaclmanager.inc.php class.uiaccess_history.inc.php 
        class.uiserver.inc.php class.uiaccounts.inc.php 
        class.uicategories.inc.php 
Log Message:
Modified all x's into %'s in lang calls and lang files.


Index: class.uiaclmanager.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/admin/inc/class.uiaclmanager.inc.php,v
retrieving revision 1.5.2.1
retrieving revision 1.5.2.2
diff -C2 -r1.5.2.1 -r1.5.2.2
*** class.uiaclmanager.inc.php  6 Feb 2003 22:46:02 -0000       1.5.2.1
--- class.uiaclmanager.inc.php  27 Feb 2003 21:30:35 -0000      1.5.2.2
***************
*** 112,116 ****
                        $afn = 
$GLOBALS['phpgw']->common->display_fullname($acc->data['account_lid'],$acc->data['firstname'],$acc->data['lastname']);
  
!                       $this->template->set_var('lang_message',lang('Check 
items to <b>x</b> to x for x',$acl_manager['name'],$GLOBALS['acl_app'],$afn));
                        $link_values = array(
                                'menuaction' => 'admin.boaclmanager.submit',
--- 112,116 ----
                        $afn = 
$GLOBALS['phpgw']->common->display_fullname($acc->data['account_lid'],$acc->data['firstname'],$acc->data['lastname']);
  
!                       $this->template->set_var('lang_message',lang('Check 
items to <b>%1</b> to %2 for 
%3',$acl_manager['name'],$GLOBALS['acl_app'],$afn));
                        $link_values = array(
                                'menuaction' => 'admin.boaclmanager.submit',

Index: class.uiaccess_history.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/admin/inc/class.uiaccess_history.inc.php,v
retrieving revision 1.6.2.1
retrieving revision 1.6.2.2
diff -C2 -r1.6.2.1 -r1.6.2.2
*** class.uiaccess_history.inc.php      6 Feb 2003 22:15:05 -0000       1.6.2.1
--- class.uiaccess_history.inc.php      27 Feb 2003 21:30:35 -0000      1.6.2.2
***************
*** 66,74 ****
                                        )
                                ) . '">' . lang('Return to view account') . 
'</a>';
!                               $var['lang_last_x_logins'] = lang('Last x 
logins for x',$total_records,$this->bo->grab_fullname($account_id));
                        }
                        else
                        {
!                               $var['lang_last_x_logins'] = lang('Last x 
logins',$total_records);
                        }
  
--- 66,74 ----
                                        )
                                ) . '">' . lang('Return to view account') . 
'</a>';
!                               $var['lang_last_x_logins'] = lang('Last %1 
logins for %2',$total_records,$this->bo->grab_fullname($account_id));
                        }
                        else
                        {
!                               $var['lang_last_x_logins'] = lang('Last %1 
logins',$total_records);
                        }
  

Index: class.uiserver.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/admin/inc/class.uiserver.inc.php,v
retrieving revision 1.3.2.1
retrieving revision 1.3.2.2
diff -C2 -r1.3.2.1 -r1.3.2.2
*** class.uiserver.inc.php      18 Feb 2002 05:07:59 -0000      1.3.2.1
--- class.uiserver.inc.php      27 Feb 2003 21:30:35 -0000      1.3.2.2
***************
*** 231,239 ****
                                if($GLOBALS['HTTP_GET_VARS']['server_id'])
                                {
!                                       
$GLOBALS['phpgw']->template->set_var('message',lang('Server x has been 
updated',$GLOBALS['HTTP_POST_VARS']['server_name']));
                                }
                                else
                                {
!                                       
$GLOBALS['phpgw']->template->set_var('message',lang('Server x has been 
added',$GLOBALS['HTTP_POST_VARS']['server_name']));
                                }
                        }
--- 231,239 ----
                                if($GLOBALS['HTTP_GET_VARS']['server_id'])
                                {
!                                       
$GLOBALS['phpgw']->template->set_var('message',lang('Server %1 has been 
updated',$GLOBALS['HTTP_POST_VARS']['server_name']));
                                }
                                else
                                {
!                                       
$GLOBALS['phpgw']->template->set_var('message',lang('Server %1 has been 
added',$GLOBALS['HTTP_POST_VARS']['server_name']));
                                }
                        }

Index: class.uiaccounts.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/admin/inc/class.uiaccounts.inc.php,v
retrieving revision 1.23.2.4
retrieving revision 1.23.2.5
diff -C2 -r1.23.2.4 -r1.23.2.5
*** class.uiaccounts.inc.php    23 Nov 2002 23:45:36 -0000      1.23.2.4
--- class.uiaccounts.inc.php    27 Feb 2003 21:30:35 -0000      1.23.2.5
***************
*** 379,383 ****
                                $p->parse('messages','message_row',True);
  
!                               $p->set_var('message_display',lang("Sorry, the 
above users are still a member of the group x",$group_name)
                                        . '.<br>' . lang('They must be removed 
before you can continue'). '.<br>' . lang('Remove all users from this 
group').'?');
                                $p->parse('messages','message_row',True);
--- 379,383 ----
                                $p->parse('messages','message_row',True);
  
!                               $p->set_var('message_display',lang("Sorry, the 
above users are still a member of the group %1",$group_name)
                                        . '.<br>' . lang('They must be removed 
before you can continue'). '.<br>' . lang('Remove all users from this 
group').'?');
                                $p->parse('messages','message_row',True);

Index: class.uicategories.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/admin/inc/class.uicategories.inc.php,v
retrieving revision 1.6.2.6
retrieving revision 1.6.2.7
diff -C2 -r1.6.2.6 -r1.6.2.7
*** class.uicategories.inc.php  4 Oct 2002 19:31:20 -0000       1.6.2.6
--- class.uicategories.inc.php  27 Feb 2003 21:30:35 -0000      1.6.2.7
***************
*** 255,259 ****
                        if ($GLOBALS['appname'])
                        {
!                               
$this->template->set_var('title_categories',lang('Add global category for 
x',$GLOBALS['phpgw_info']['apps'][$GLOBALS['appname']]['title']));
                        }
                        else
--- 255,259 ----
                        if ($GLOBALS['appname'])
                        {
!                               
$this->template->set_var('title_categories',lang('Add global category for 
%1',$GLOBALS['phpgw_info']['apps'][$GLOBALS['appname']]['title']));
                        }
                        else
***************
*** 366,370 ****
                        if ($GLOBALS['appname'])
                        {
!                               
$this->template->set_var('title_categories',lang('Edit global category for 
x',$GLOBALS['phpgw_info']['apps'][$GLOBALS['appname']]['title']));
                        }
                        else
--- 366,370 ----
                        if ($GLOBALS['appname'])
                        {
!                               
$this->template->set_var('title_categories',lang('Edit global category for 
%1',$GLOBALS['phpgw_info']['apps'][$GLOBALS['appname']]['title']));
                        }
                        else