Updated strings

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@18757 594d385d-05f5-0310-b6e9-bd551577e9d8

diff --git a/gosa-core/plugins/addons/propertyEditor/property-list.tpl b/gosa-core/plugins/addons/propertyEditor/property-list.tpl
index 9ecf221773b5a62ee065007a7a30819c2605773e..af9750405b8cdc24d0a6f2eee9e3a12a80f1ed17 100644 (file)
--- a/gosa-core/plugins/addons/propertyEditor/property-list.tpl
+++ b/gosa-core/plugins/addons/propertyEditor/property-list.tpl
@@ -4,14 +4,14 @@
      <tr>
       <td style='padding: 10px;'>{image path='images/warning.png'}</td>
       <td>
-        <h3>Attention</h3>
+        <h3>{t}Attention{/t}</h3>
        <p>
-        {t}Modifying properties may break your setup, destroy or mess up your ldap database, lead to security holes or it can even make logins impossible!{/t}
-        {t}Since configuration properties are stored in the ldap database a copy/backup can be handy.{/t}
+        {t}Modifying properties may break your setup, destroy or mess up your LDAP database, lead to security holes or it can even make a login impossible!{/t}
+        {t}Since configuration properties are stored in the LDAP database a copy/backup can be handy.{/t}
        </p>
 
        <p>
-        {t}If we've locked yourself out, you can try to set 'ignoreLdapProperties' to 'true' in your gosa.conf. With this option set to true, GOsa will ignore LDAP based property values, but it cannot reverse damage done to your LDAP database.{/t}
+        {t}If you've debarred yourself, you can try to set 'ignoreLdapProperties' to 'true' in your gosa.conf main section. This will make GOsa ignore LDAP based property values.{/t}
        </p>
 
       </td> 
@@ -19,7 +19,7 @@
     </table>
     <hr>
       <input type='checkbox' name='warningAccepted' value='1' id='warningAccepted'>
-      <label for='warningAccepted'>{t}I know the risks and want to modify properties!{/t}</label>
+      <label for='warningAccepted'>{t}I understand that there are certain risks, but I want to modify properties!{/t}</label>
     <hr>
     <div class="plugin-actions">
         <button name='goOn'>{msgPool type='okButton'}</button> 

diff --git a/gosa-core/setup/class_setup.inc b/gosa-core/setup/class_setup.inc
index 2cb1010285661c1ccb3e71425711ead062a43ac1..bf050d5945d4017b8ea6ccc2cb52f3e87662a9d3 100644 (file)
--- a/gosa-core/setup/class_setup.inc
+++ b/gosa-core/setup/class_setup.inc
@@ -224,6 +224,7 @@ class setup
             $str ="";
         }else{
             $str ="<div class='plugin-actions'>";
+
             if(isset($this->o_steps[$this->i_current -1]) && $this->o_steps[$this->i_current -1]->is_enabled()){
                 $str .= "<button type='submit' name='last'>".msgPool::backButton()."</button>";
             }else{
@@ -231,11 +232,11 @@ class setup
             }
 
             if($this->o_steps[$this->i_current]->b_displayCheckbutton){
-                $str .= "<button type='submit' name='test'>"._("check")."</button>";
+                $str .= "&nbsp;<button type='submit' name='test'>"._("Check again")."</button>";
             }
 
             if(isset($this->o_steps[$this->i_current +1])){
-                $str .= "<button type='submit' name='next'>"._("next")."</button>";
+                $str .= "&nbsp;<button type='submit' name='next'>"._("Next")."</button>";
             }
             $str .="</div>";
         }

diff --git a/gosa-core/setup/class_setupStep_Welcome.inc b/gosa-core/setup/class_setupStep_Welcome.inc
index f5104f1a02e1705b57803ad9ad6ae7de0a0e77b8..9ac8ae03802493514441add20372049f15070049 100644 (file)
--- a/gosa-core/setup/class_setupStep_Welcome.inc
+++ b/gosa-core/setup/class_setupStep_Welcome.inc
@@ -37,7 +37,7 @@ class Step_Welcome  extends setup_step
   {
     $this->s_title      = _("Welcome");
     $this->s_info       = _("The welcome message");
-    $this->s_title_long = _("Welcome to GOsa setup wizard");
+    $this->s_title_long = _("Welcome to the GOsa setup assistent");
   }
   
   function execute()

diff --git a/gosa-core/setup/setup_checks.tpl b/gosa-core/setup/setup_checks.tpl
index 39e17812de313d1fab8b829ff5d2b675ab9edce0..ab1dca6647d81b9c591a518d351a2bd27b999410 100644 (file)
--- a/gosa-core/setup/setup_checks.tpl
+++ b/gosa-core/setup/setup_checks.tpl
@@ -1,10 +1,13 @@
+<p>
+ {t}This step checks if your PHP server has all required modules and configuration settings.{/t}
+</p>
 
 <table style='width:100%;' summary='{t}Inspection{/t}'>
  <tr>
   <td style='text-align:top; width: 50%;'>
-   <h2 class='step2_container_title'>{t}PHP module and extension checks{/t}</h2>
+   <h2>{t}PHP module and extension checks{/t}</h2>
 
-   <table style='width:100%;' summary='{t}Basic checks{/t}'>
+   <table cellspacing='0' class='sortableListContainer' style='border:1px solid #CCC; width:100%;' summary='{t}Basic checks{/t}'>
     {foreach from=$basic item=val key=key}
      {if $basic[$key].SOLUTION != "" && !$basic[$key].RESULT}
       <tr class='entry_container_info'>
@@ -15,13 +18,13 @@
      <td>{$basic[$key].NAME}</td>
 
      {if $basic[$key].RESULT}
-       <td>{t}Ok{/t}</td>
+       <td style='color:#0A0'>{t}Ok{/t}</td>
       </tr>
      {else}
         {if $basic[$key].MUST}
-         <td>{t}Error{/t}</td>
+         <td style='color:red'>{t}Error{/t}</td>
         {else}
-         <td>{t}Warning{/t}</td>
+         <td style='color:orange'>{t}Warning{/t}</td>
         {/if}
        </tr>
 
@@ -44,8 +47,8 @@
    </table>
   </td>
   <td>
-   <h2 class='step2_container_title'>{t}PHP setup configuration{/t} (<a style='text-decoration:underline' href='?info' target='_blank'>{t}show information{/t})</a></h2>
-   <table style='width:100%;' summary='{t}Extended checks{/t}'>
+   <h2>{t}PHP setup configuration{/t} (<a style='text-decoration:underline' href='?info' target='_blank'>{t}show information{/t})</a></h2>
+   <table cellspacing='0' class='sortableListContainer' style='border:1px solid #CCC; width:100%;' summary='{t}Extended checks{/t}'>
     {foreach from=$config item=val key=key}
      {if $config[$key].SOLUTION != "" && !$config[$key].RESULT}
       <tr class='entry_container_info'>
@@ -56,13 +59,13 @@
      <td>{$config[$key].NAME}</td>
 
      {if $config[$key].RESULT}
-       <td>{t}Ok{/t}</td>
+       <td style='color:#0A0'>{t}Ok{/t}</td>
       </tr>
      {else}
         {if $config[$key].MUST}
-         <td>{t}Error{/t}</td>
+         <td style='color:red'>{t}Error{/t}</td>
         {else}
-         <td>{t}Warning{/t}</td>
+         <td style='color:orange'>{t}Warning{/t}</td>
         {/if}
        </tr>
 

diff --git a/gosa-core/setup/setup_frame.tpl b/gosa-core/setup/setup_frame.tpl
index e3d1673a46d05b439200ceddfede1788090471a5..800e2341ea378bb5f17933d211e04a6efb4b38ae 100644 (file)
--- a/gosa-core/setup/setup_frame.tpl
+++ b/gosa-core/setup/setup_frame.tpl
@@ -3,21 +3,13 @@
   <div class='title-bar'>
    <ul>
     <li><img src='themes/default/images/logo.png' alt='GOsa'></li>
-    <li>{t}GOsa setup wizard{/t}</li>
-    <li>{$version}</li>
+    <li class='right' style='padding-top:10px;padding-right:5px'>{$version}</li>
    </ul>
   </div>
 
   <form action='setup.php' name='mainform' method='post' enctype='multipart/form-data'>
    {$msg_dialogs}
 
- <!--  
-   <div class='navigation'>
-    <div class='menu'>
-     {$navigation}     
-    </div>     
-   </div>
- -->
    <div class='plugin-area' style='margin:10px;'>
     <div class='plugin'>
     {$errors}

diff --git a/gosa-core/setup/setup_ldap.tpl b/gosa-core/setup/setup_ldap.tpl
index b9a6beeed289d249016b9d22aefdd6888e69b627..97e254cbc6fc9305c9b16b71848028af0b59eb9f 100644 (file)
--- a/gosa-core/setup/setup_ldap.tpl
+++ b/gosa-core/setup/setup_ldap.tpl
@@ -1,3 +1,8 @@
+ <p>
+  {t}The main data source used in GOsa is LDAP. In order to access the information stored there, please enter the required information.{/t}
+ </p>
+
+  <hr>
 
        {if $resolve_user}
 

diff --git a/gosa-core/setup/setup_license.tpl b/gosa-core/setup/setup_license.tpl
index 5322579866173472cbddcd8b5886ceeb87745c28..c9a0a914471dfc612d03689984fa31c31dabe025 100644 (file)
--- a/gosa-core/setup/setup_license.tpl
+++ b/gosa-core/setup/setup_license.tpl
@@ -1,10 +1,13 @@
 <div>
+ <p>
+  {t}GOsa is developed under the terms of the GNU General Public Licence V2. Please accept the terms below.{/t}
+ </p>
        <div class='default' style='margin:10px; border:1px solid #A0A0A0'>
                <div style='height:450px;padding:5px;overflow:auto; '>
                        {$License}
                </div>
        </div>  
-       <div style='width:95%; text-align: right'>
+       <div style='width:95%; text-align:center'>
                <input {if $accepted} checked {/if} id="accepted" type='checkbox' name='accepted' class="center"><label for="accepted">{t}I have read the license and accept it{/t}</label>
        </div>
 </div>

diff --git a/gosa-core/setup/setup_welcome.tpl b/gosa-core/setup/setup_welcome.tpl
index a44d036ce2d3c961dee796cec0cb9a19dfd3ab78..7fad847b8cd788d1baae797b371382f742859f6d 100644 (file)
--- a/gosa-core/setup/setup_welcome.tpl
+++ b/gosa-core/setup/setup_welcome.tpl
@@ -1,35 +1,35 @@
 <div>
     <div class='default'>
+       <h2>{t}How to get started{/t}</h2>
        <p>
-       {t}This seems to be the first time you start GOsa - we didn't find any configuration right now. This simple wizard intends to help you while setting it up.{/t}
+       {t}This seems to be the first time you run GOsa on this system. To start the GOsa web interface you need a working configuration file, which can be generated by this wizzard.{/t}
        </p>
-       
-       <p style='border-top:1px solid #AAAAAA; padding-top:10px;'>
-       <b>{t}What will the wizard do for you?{/t}</b>
-       </p>
-       <ul>
-        <li>{t}Create a basic, single site configuration{/t}</li>
-        <li>{t}Tries to find problems within your PHP and LDAP setup{/t}</li>
-       </ul>
+
        <p>
-       <b>{t}What will the wizard NOT do for you?{/t}</b>
+      {t}What you need to generate a configuration file:{/t}
        </p>
-       <ul>
-        <li>{t}Find every possible configuration error{/t}</li>
-        <li>{t}Migrate every possible LDAP setup - create backup dumps!{/t}</li>
-       </ul>
 
-       <p style='border-top:1px solid #AAAAAA; padding-top:10px;'>
-       <b>{t}To continue...{/t}</b>
+      <ul>
+       <li>{t}The hostname of your LDAP server{/t}</li>
+       <li>{t}Installed GOsa and supplementary schemas{/t}</li>
+       <li>{t}The LDAP base of your LDAP directory{/t}</li>
+       <li>{t}The DN and the password of the LDAP admin user{/t}</li>
+      </ul>
+       
+       <p>
+      {t}If you've collected the needed information, unlock the setup process like shown in the next paragraph.{/t}
        </p>
+
+    <hr>
+       <h2>{t}Starting the setup{/t}</h2>
        <p>
-       {t}For security reasons you need to authenticate for the installation by creating the file '/tmp/gosa.auth', containing the current session ID on the servers local filesystem. This can be done by executing the following command:{/t}
+       {t}For security reasons you need to authenticate the installation by creating the file '/tmp/gosa.auth', containing the current session ID on the servers local filesystem. This can be done by executing the following command:{/t}
        </p>
        <tt>
        echo -n <b>{$auth_id}</b> &gt; {$path}
        </tt>
        <p>
-       {t}Click the 'Continue' button when you've finished.{/t}
+       {t}Click the 'Next' button when you've finished.{/t}
        </p>
      </div>
 </div>