From b266dc8c54aca1ffcac5d507785e1fface6b29b7 Mon Sep 17 00:00:00 2001 From: cajus Date: Wed, 26 May 2010 15:41:19 +0000 Subject: [PATCH] Updated strings git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@18757 594d385d-05f5-0310-b6e9-bd551577e9d8 --- .../addons/propertyEditor/property-list.tpl | 10 +++--- gosa-core/setup/class_setup.inc | 5 +-- gosa-core/setup/class_setupStep_Welcome.inc | 2 +- gosa-core/setup/setup_checks.tpl | 23 ++++++------ gosa-core/setup/setup_frame.tpl | 10 +----- gosa-core/setup/setup_ldap.tpl | 5 +++ gosa-core/setup/setup_license.tpl | 5 ++- gosa-core/setup/setup_welcome.tpl | 36 +++++++++---------- 8 files changed, 50 insertions(+), 46 deletions(-) diff --git a/gosa-core/plugins/addons/propertyEditor/property-list.tpl b/gosa-core/plugins/addons/propertyEditor/property-list.tpl index 9ecf22177..af9750405 100644 --- a/gosa-core/plugins/addons/propertyEditor/property-list.tpl +++ b/gosa-core/plugins/addons/propertyEditor/property-list.tpl @@ -4,14 +4,14 @@ {image path='images/warning.png'} -

Attention

+

{t}Attention{/t}

- {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}

- {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}

@@ -19,7 +19,7 @@
- +
diff --git a/gosa-core/setup/class_setup.inc b/gosa-core/setup/class_setup.inc index 2cb101028..bf050d594 100644 --- a/gosa-core/setup/class_setup.inc +++ b/gosa-core/setup/class_setup.inc @@ -224,6 +224,7 @@ class setup $str =""; }else{ $str ="
"; + if(isset($this->o_steps[$this->i_current -1]) && $this->o_steps[$this->i_current -1]->is_enabled()){ $str .= ""; }else{ @@ -231,11 +232,11 @@ class setup } if($this->o_steps[$this->i_current]->b_displayCheckbutton){ - $str .= ""; + $str .= " "; } if(isset($this->o_steps[$this->i_current +1])){ - $str .= ""; + $str .= " "; } $str .="
"; } diff --git a/gosa-core/setup/class_setupStep_Welcome.inc b/gosa-core/setup/class_setupStep_Welcome.inc index f5104f1a0..9ac8ae038 100644 --- 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 39e17812d..ab1dca664 100644 --- a/gosa-core/setup/setup_checks.tpl +++ b/gosa-core/setup/setup_checks.tpl @@ -1,10 +1,13 @@ +

+ {t}This step checks if your PHP server has all required modules and configuration settings.{/t} +

-

{t}PHP module and extension checks{/t}

+

{t}PHP module and extension checks{/t}

- +
{foreach from=$basic item=val key=key} {if $basic[$key].SOLUTION != "" && !$basic[$key].RESULT} @@ -15,13 +18,13 @@ {if $basic[$key].RESULT} - + {else} {if $basic[$key].MUST} - + {else} - + {/if} @@ -44,8 +47,8 @@
{$basic[$key].NAME}{t}Ok{/t}{t}Ok{/t}
{t}Error{/t}{t}Error{/t}{t}Warning{/t}{t}Warning{/t}
 -

{t}PHP setup configuration{/t} ({t}show information{/t})

- +

{t}PHP setup configuration{/t} ({t}show information{/t})

+
{foreach from=$config item=val key=key} {if $config[$key].SOLUTION != "" && !$config[$key].RESULT} @@ -56,13 +59,13 @@ {if $config[$key].RESULT} - + {else} {if $config[$key].MUST} - + {else} - + {/if} diff --git a/gosa-core/setup/setup_frame.tpl b/gosa-core/setup/setup_frame.tpl index e3d1673a4..800e2341e 100644 --- a/gosa-core/setup/setup_frame.tpl +++ b/gosa-core/setup/setup_frame.tpl @@ -3,21 +3,13 @@
  • GOsa
    • -
  • {t}GOsa setup wizard{/t}
    • -
  • {$version}
    • +
  • {$version}
{$msg_dialogs} -
{$errors} diff --git a/gosa-core/setup/setup_ldap.tpl b/gosa-core/setup/setup_ldap.tpl index b9a6beeed..97e254cbc 100644 --- a/gosa-core/setup/setup_ldap.tpl +++ b/gosa-core/setup/setup_ldap.tpl @@ -1,3 +1,8 @@ +

+ {t}The main data source used in GOsa is LDAP. In order to access the information stored there, please enter the required information.{/t} +

+ +
{if $resolve_user} diff --git a/gosa-core/setup/setup_license.tpl b/gosa-core/setup/setup_license.tpl index 532257986..c9a0a9144 100644 --- a/gosa-core/setup/setup_license.tpl +++ b/gosa-core/setup/setup_license.tpl @@ -1,10 +1,13 @@
+

+ {t}GOsa is developed under the terms of the GNU General Public Licence V2. Please accept the terms below.{/t} +

{$License}
-
+
diff --git a/gosa-core/setup/setup_welcome.tpl b/gosa-core/setup/setup_welcome.tpl index a44d036ce..7fad847b8 100644 --- a/gosa-core/setup/setup_welcome.tpl +++ b/gosa-core/setup/setup_welcome.tpl @@ -1,35 +1,35 @@
+

{t}How to get started{/t}

- {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}

- -

- {t}What will the wizard do for you?{/t} -

-
    -
  • {t}Create a basic, single site configuration{/t}
    • -
  • {t}Tries to find problems within your PHP and LDAP setup{/t}
    • -
+

- {t}What will the wizard NOT do for you?{/t} + {t}What you need to generate a configuration file:{/t}

-
    -
  • {t}Find every possible configuration error{/t}
    • -
  • {t}Migrate every possible LDAP setup - create backup dumps!{/t}
    • -
-

- {t}To continue...{/t} +

    +
  • {t}The hostname of your LDAP server{/t}
    • +
  • {t}Installed GOsa and supplementary schemas{/t}
    • +
  • {t}The LDAP base of your LDAP directory{/t}
    • +
  • {t}The DN and the password of the LDAP admin user{/t}
    • +
+ +

+ {t}If you've collected the needed information, unlock the setup process like shown in the next paragraph.{/t}

+ +
+

{t}Starting the setup{/t}

- {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}

echo -n {$auth_id} > {$path}

- {t}Click the 'Continue' button when you've finished.{/t} + {t}Click the 'Next' button when you've finished.{/t}

-- 2.30.2
{$config[$key].NAME}{t}Ok{/t}{t}Ok{/t}
{t}Error{/t}{t}Error{/t}{t}Warning{/t}{t}Warning{/t}