[Phpgroupware-cvs] CVS: setup index.php,1.113,1.113.2.1 manageheader.php,1.45,1.45.2.1

[Guillaume Courtois <address@hidden>]

Update of /cvsroot/phpgroupware/setup
In directory subversions:/tmp/cvs-serv1887/setup

Modified Files:
      Tag: Version-0_9_16-branch
        index.php manageheader.php 
Log Message:
Changed all x's into %'s in lang calls and lang files, added missing phrases 
and their french translation.


Index: index.php
===================================================================
RCS file: /cvsroot/phpgroupware/setup/index.php,v
retrieving revision 1.113
retrieving revision 1.113.2.1
diff -C2 -r1.113 -r1.113.2.1
*** index.php   22 Dec 2002 23:08:09 -0000      1.113
--- index.php   8 Apr 2003 20:10:05 -0000       1.113.2.1
***************
*** 199,204 ****
                        break;
                case 4:
!                       $setup_tpl->set_var('oldver',lang('You appear to be 
running version x of phpGroupWare',$setup_info['phpgwapi']['currentver']));
!                       $setup_tpl->set_var('automatic',lang('We will 
automatically update your tables/records to 
x',$setup_info['phpgwapi']['version']));
                        $setup_tpl->set_var('backupwarn',lang('backupwarn'));
                        $setup_tpl->set_var('upgrade',lang('Upgrade'));
--- 199,204 ----
                        break;
                case 4:
!                       $setup_tpl->set_var('oldver',lang('You appear to be 
running version %1 of phpGroupWare',$setup_info['phpgwapi']['currentver']));
!                       $setup_tpl->set_var('automatic',lang('We will 
automatically update your tables/records to 
%1',$setup_info['phpgwapi']['version']));
                        $setup_tpl->set_var('backupwarn',lang('backupwarn'));
                        $setup_tpl->set_var('upgrade',lang('Upgrade'));
***************
*** 405,409 ****
                        $setup_tpl->set_var('lang_status_alt','completed');
                        $btn_manage_lang = 
$GLOBALS['phpgw_setup']->html->make_frm_btn_simple(
!                               lang('This stage is completed<br>') . 
lang('Currently installed languages: x <br>',$langs_list),
                                'POST','lang.php',
                                'submit',lang('Manage Languages'),
--- 405,409 ----
                        $setup_tpl->set_var('lang_status_alt','completed');
                        $btn_manage_lang = 
$GLOBALS['phpgw_setup']->html->make_frm_btn_simple(
!                               lang('This stage is completed<br>') . 
lang('Currently installed languages: %1 <br>',$langs_list),
                                'POST','lang.php',
                                'submit',lang('Manage Languages'),

Index: manageheader.php
===================================================================
RCS file: /cvsroot/phpgroupware/setup/manageheader.php,v
retrieving revision 1.45
retrieving revision 1.45.2.1
diff -C2 -r1.45 -r1.45.2.1
*** manageheader.php    9 Mar 2003 14:28:26 -0000       1.45
--- manageheader.php    8 Apr 2003 20:10:06 -0000       1.45.2.1
***************
*** 46,50 ****
                        if(!$dom['config_pass'])
                        {
!                               $errors .= '<br>' . lang("You didn't enter a 
config password for domain x",$v);
                        }
                }
--- 46,50 ----
                        if(!$dom['config_pass'])
                        {
!                               $errors .= '<br>' . lang("You didn't enter a 
config password for domain %1",$v);
                        }
                }
***************
*** 469,473 ****
                                /*
                                $errors .= '<br><font color="red">' . 
lang('Warning!') . '<br>'
!                                       . lang('The db_type in defaults (x) is 
not supported on this server. using first supported 
type.',$GLOBALS['phpgw_info']['server']['db_type'])
                                        . '</font>';
                                */
--- 469,473 ----
                                /*
                                $errors .= '<br><font color="red">' . 
lang('Warning!') . '<br>'
!                                       . lang('The db_type in defaults (%1) is 
not supported on this server. using first supported 
type.',$GLOBALS['phpgw_info']['server']['db_type'])
                                        . '</font>';
                                */
***************
*** 484,488 ****
                        {
                                $errors .= '<br>'
!                                       . lang('Cannot create the 
header.inc.php due to file permission restrictions.<br> Instead you can x the 
file.',
                                        '<input type="submit" name="action" 
value="download">' . lang('or') . '&nbsp;<input type="submit" name="action" 
value="view">')
                                        . '</form>';
--- 484,488 ----
                        {
                                $errors .= '<br>'
!                                       . lang('Cannot create the 
header.inc.php due to file permission restrictions.<br> Instead you can %1 the 
file.',
                                        '<input type="submit" name="action" 
value="download">' . lang('or') . '&nbsp;<input type="submit" name="action" 
value="view">')
                                        . '</form>';