[Fmsystem-commits] [6470] Login: translation

[Sigurd Nes]

Revision: 6470
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=6470
Author:   sigurdne
Date:     2010-10-11 11:55:03 +0000 (Mon, 11 Oct 2010)
Log Message:
-----------
Login: translation

Modified Paths:
--------------
    trunk/phpgwapi/inc/sso/include_login.inc.php
    trunk/phpgwapi/setup/phpgw_en.lang
    trunk/phpgwapi/setup/phpgw_no.lang
    trunk/phpgwapi/templates/base/login.tpl

Modified: trunk/phpgwapi/inc/sso/include_login.inc.php
===================================================================
--- trunk/phpgwapi/inc/sso/include_login.inc.php        2010-10-11 11:28:53 UTC 
(rev 6469)
+++ trunk/phpgwapi/inc/sso/include_login.inc.php        2010-10-11 11:55:03 UTC 
(rev 6470)
@@ -398,10 +398,12 @@
                                $cd = (int) $_GET['cd'];
                        }
 
+                       $system_name = 
isset($GLOBALS['phpgw_info']['server']['system_name']) ? 
$GLOBALS['phpgw_info']['server']['system_name'] : 'Portico Estate';
                        $this->tmpl->set_var('login_url', 
$GLOBALS['phpgw_info']['server']['webserver_url'] . 
'/'.$variables['partial_url'].'?' . http_build_query($extra_vars) );
                        
$this->tmpl->set_var('registration_url',$GLOBALS['phpgw_info']['server']['webserver_url']
 . '/registration/');
-                       $this->tmpl->set_var('system', 
isset($GLOBALS['phpgw_info']['server']['system_name']) ? 
$GLOBALS['phpgw_info']['server']['system_name'] : 'phpGroupWare');
+                       $this->tmpl->set_var('system', $system_name);
                        $this->tmpl->set_var('version', 
isset($GLOBALS['phpgw_info']['server']['versions']['system']) ? 
$GLOBALS['phpgw_info']['server']['versions']['system'] : 
$GLOBALS['phpgw_info']['server']['versions']['phpgwapi']);
+                       $this->tmpl->set_var('instruction', lang('use a valid 
username and password to gain access to %1', $system_name));
 
                        $this->tmpl->set_var('cd', $this->check_logoutcode($cd) 
);
                        $this->tmpl->set_var('last_loginid', $last_loginid);

Modified: trunk/phpgwapi/setup/phpgw_en.lang
===================================================================
--- trunk/phpgwapi/setup/phpgw_en.lang  2010-10-11 11:28:53 UTC (rev 6469)
+++ trunk/phpgwapi/setup/phpgw_en.lang  2010-10-11 11:55:03 UTC (rev 6470)
@@ -499,6 +499,7 @@
 update common  en      Update
 url    common  en      URL
 uruguay        common  en      URUGUAY
+use a valid username and password to gain access to %1 login   en      Use a 
valid username and password to gain access to %1
 use button to search for       common  en      use Button to search for
 use button to search for address       common  en      use Button to search 
for Address
 use button to search for calendarevent common  en      use Button to search 
for Calendarevent

Modified: trunk/phpgwapi/setup/phpgw_no.lang
===================================================================
--- trunk/phpgwapi/setup/phpgw_no.lang  2010-10-11 11:28:53 UTC (rev 6469)
+++ trunk/phpgwapi/setup/phpgw_no.lang  2010-10-11 11:55:03 UTC (rev 6470)
@@ -124,5 +124,6 @@
 todays date, eg. %1    common  no      Dagens dato, %1
 use cookies    login   no      use cookies
 username       login   no      Brukernavn
+use a valid username and password to gain access to %1 login   no      Angi et 
gyldig brukernavn og passord for få tilgang til %1
 version        common  no      versjon
 you have been successfully logged out  login   no      Du har nå logget ut

Modified: trunk/phpgwapi/templates/base/login.tpl
===================================================================
--- trunk/phpgwapi/templates/base/login.tpl     2010-10-11 11:28:53 UTC (rev 
6469)
+++ trunk/phpgwapi/templates/base/login.tpl     2010-10-11 11:55:03 UTC (rev 
6470)
@@ -124,7 +124,7 @@
                                                                        <div 
class="button_holder">
                                                                                
<div class="button1">
                                                                                
        <div class="next">
-                                                                               
                <a onclick="login.submit();">Login</a>
+                                                                               
                <a onclick="login.submit();">{lang_login}</a>
                                                                                
        </div>
                                                                                
</div>
                                                                        </div>
@@ -149,7 +149,7 @@
                                                </div>
                                        </div>
 
-                                       <p>Use a valid username and password to 
gain access to {system}.</p>
+                                       <p>{instruction}</p>
 
                                        <div id="lock"></div>