Updated strings

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

diff --git a/gosa-core/html/index.php b/gosa-core/html/index.php
index 2f0eeba2d6f1a33cb49cf6d92fd1e7931fff0cbe..6389fc4127e4456cc01e37fe7dd0dcd7618ac492 100644 (file)
--- a/gosa-core/html/index.php
+++ b/gosa-core/html/index.php
@@ -42,7 +42,7 @@ function displayLogin()
         $blocks= file("$BASE_DIR/ihtml/themes/$theme/blacklist");
         foreach ($blocks as $block) {
             if (preg_match('/'.preg_quote($block).'/', $_SERVER['HTTP_USER_AGENT'])) {
-                die(sprintf(_("Your browser (%s) is blacklisted for the current theme."), $block));
+                die(sprintf(_("Your browser (%s) is blacklisted for the current theme!"), $block));
             }
         }
     }
@@ -69,13 +69,13 @@ function displayLogin()
 
     /* Displasy SSL mode warning? */
     if ($ssl != "" && $config->get_cfg_value('warnssl') == 'true') {
-        $smarty->assign("ssl", sprintf(_("This session is not ecrypted. Click %s to enter an encrypted session."), "<a href=\"$ssl\">"._("here")."</a>"));
+        $smarty->assign("ssl", sprintf(_("This session is not ecrypted. Click %s to enter an encrypted session."), "<a href=\"$ssl\">".bold(_("here"))."</a>"));
     } else {
         $smarty->assign("ssl", "");
     }
 
     if(!$config->check_session_lifetime()) {
-        $smarty->assign ("lifetime", _("The session lifetime configured in your gosa.conf will be overridden by php.ini settings."));
+        $smarty->assign ("lifetime", _("The configured session lifetime will be overridden by php.ini settings!"));
     } else {
         $smarty->assign ("lifetime", "");
     }
@@ -177,7 +177,7 @@ $smarty->error_unassigned= true;
 
 /* Check for compile directory */
 if (!(is_dir($smarty->compile_dir) && is_writable($smarty->compile_dir))) {
-    msg_dialog::display(_("Smarty error"),sprintf(_("Directory '%s' specified as compile directory is not accessible!"),
+    msg_dialog::display(_("Smarty error"),sprintf(_("Compile directory %s is not accessible!"),
         $smarty->compile_dir),FATAL_ERROR_DIALOG);
     exit();
 }
@@ -228,7 +228,7 @@ if ($config->get_cfg_value("forcessl") == 'true' && $ssl != '') {
 $htaccess_authenticated= FALSE;
 if ($config->get_cfg_value("htaccessAuthentication") == "true" ) {
     if (!isset($_SERVER['REMOTE_USER'])) {
-        msg_dialog::display(_("Configuration error"), _("There is a problem with the authentication setup!"), FATAL_ERROR_DIALOG);
+        msg_dialog::display(_("Configuration error"), _("Broken HTTP authentication setup!"), FATAL_ERROR_DIALOG);
         exit;
     }
 
@@ -236,11 +236,11 @@ if ($config->get_cfg_value("htaccessAuthentication") == "true" ) {
     $username= $tmp['username'];
     $server= $tmp['server'];
     if ($username == "") {
-        msg_dialog::display(_("Error"), _("Cannot find a valid user for the current authentication setup!"), FATAL_ERROR_DIALOG);
+        msg_dialog::display(_("Error"), _("Cannot find a valid user for the current HTTP authentication!"), FATAL_ERROR_DIALOG);
         exit;
     }
     if ($server == "") {
-        msg_dialog::display(_("Error"), _("User information is not unique accross the configured LDAP trees!"), FATAL_ERROR_DIALOG);
+        msg_dialog::display(_("Error"), _("Cannot find a unique user for the current HTTP authentication!"), FATAL_ERROR_DIALOG);
         exit;
     }
 
@@ -277,7 +277,7 @@ if (($_SERVER["REQUEST_METHOD"] == "POST" && isset($_POST['login'])) || $htacces
         $tls =       ($config->get_cfg_value("ldapTLS") == "true");
 
         if(!count($ldap->get_objectclasses())) {
-            msg_dialog::display(_("LDAP error"), _("Cannot detect information about the installed LDAP schema!"), ERROR_DIALOG);
+            msg_dialog::display(_("LDAP error"), _("Cannot obtain information about the available LDAP schema!"), ERROR_DIALOG);
             displayLogin();
             exit()  ;
         }else{
@@ -290,7 +290,7 @@ if (($_SERVER["REQUEST_METHOD"] == "POST" && isset($_POST['login'])) || $htacces
             $checkarr = array();
             foreach($str as $tr) {
                 if(isset($tr['IS_MUST_HAVE']) && !$tr['STATUS']) {
-                    msg_dialog::display(_("LDAP error"), _("Your LDAP setup contains old schema definitions:")."<br><br><i>".$tr['MSG']."</i>", ERROR_DIALOG);
+                    msg_dialog::display(_("LDAP error"), _("Your LDAP setup contains old schema definitions:")."<br><br>".$tr['MSG'], ERROR_DIALOG);
                     displayLogin();
                     exit();
                 }
@@ -326,7 +326,7 @@ if (($_SERVER["REQUEST_METHOD"] == "POST" && isset($_POST['login'])) || $htacces
         if ($htaccess_authenticated) {
             $ui= ldap_login_user_htaccess($username);
             if ($ui === NULL || !$ui) {
-                msg_dialog::display(_("Authentication error"), _("Cannot retrieve user information for htaccess authentication!"), FATAL_ERROR_DIALOG);
+                msg_dialog::display(_("Authentication error"), _("Cannot retrieve user information for HTTP authentication!"), FATAL_ERROR_DIALOG);
                 exit;
             }
         } else {
@@ -425,7 +425,7 @@ if (!isset($message)) {
 $smarty->assign ("message", $message);
 
 /* Translation of cookie-warning. Whether to display it, is determined by JavaScript */
-$smarty->assign ("cookies", _("Your browser has cookies disabled. Please enable cookies and reload this page before logging in!"));
+$smarty->assign ("cookies", _("Your browser has cookies disabled: please enable cookies and reload this page before logging in!"));
 
 /* Generate server list */
 $servers= array();

diff --git a/gosa-core/html/main.php b/gosa-core/html/main.php
index c330f32f70cae30233e437a123d9c2931913da00..fc440536a34e4df802e974c6acd109c6a5c9d6ec 100644 (file)
--- a/gosa-core/html/main.php
+++ b/gosa-core/html/main.php
@@ -148,8 +148,8 @@ if (!session::global_is_set('plist')){
         require_once("$BASE_DIR/$path");
       } else {
         msg_dialog::display(_("Fatal error"),
-            sprintf(_("Cannot locate file '%s' - please run '%s' to fix this"),
-              "$BASE_DIR/$path", "<b>update-gosa</b>"), FATAL_ERROR_DIALOG);
+            sprintf(_("Cannot locate file %s - please run %s to fix this"),
+              bold("$BASE_DIR/$path"), bold("update-gosa")), FATAL_ERROR_DIALOG);
         exit;
       }
     }
@@ -168,7 +168,7 @@ $plist= session::global_get('plist');
 if (isset($global_check) && $config->get_cfg_value("forceglobals") == "true"){
   msg_dialog::display(
             _("PHP configuration"),
-            _("FATAL: Register globals is on. GOsa will refuse to login unless this is fixed by an administrator."),
+            _("FATAL: Register globals is active. Please fix this in order to continue."),
             FATAL_ERROR_DIALOG);
 
   new log("security","login","",array(),"Register globals is on. For security reasons, this should be turned off.") ;
@@ -351,7 +351,7 @@ if (is_file("$plugin_dir/main.inc")){
 } else {
   msg_dialog::display(
       _("Plugin"),
-      sprintf(_("FATAL: Cannot find any plugin definitions for plugin '%s'!"), $plug),
+      sprintf(_("FATAL: Cannot find any plugin definitions for plugin %s!"), bold($plug)),
       FATAL_ERROR_DIALOG);
   exit();
 }

diff --git a/gosa-core/html/password.php b/gosa-core/html/password.php
index 79e5b8d02b43068cd5172ca35761806cad556ab6..fae474500c3e70a29ccd64a61f9cb8f38b89ff5c 100644 (file)
--- a/gosa-core/html/password.php
+++ b/gosa-core/html/password.php
@@ -85,8 +85,8 @@ if (!(is_dir($smarty->compile_dir) && is_writable($smarty->compile_dir))) {
     msg_dialog::display(
         _("Configuration error"),
         sprintf(
-            _("Directory '%s' specified as compile directory is not accessible!"),
-            $smarty->compile_dir
+            _("Compile directory %s is not accessible!"),
+            bold($smarty->compile_dir)
         ),
         FATAL_ERROR_DIALOG
     );
@@ -215,7 +215,7 @@ if ($_SERVER["REQUEST_METHOD"] == "POST" && isset($_POST['apply'])) {
     /* Do new and repeated password fields match? */
     $new_password= $_POST['new_password'];
     if ($_POST['new_password'] != $_POST['new_password_repeated']) {
-        $message[]= _("The passwords you've entered as 'New password' and 'Repeated new password' do not match.");
+        $message[]= _("The values for 'New password' and 'Repeated new password' differ!");
     } else {
         if ($_POST['new_password'] == "") {
             $message[]= msgPool::required(_("New password"));
@@ -227,13 +227,13 @@ if ($_SERVER["REQUEST_METHOD"] == "POST" && isset($_POST['apply'])) {
         $l= $config->get_cfg_value("passwordMinDiffer");
         if (substr($_POST['current_password'], 0, $l) ==
             substr($_POST['new_password'], 0, $l)) {
-            $message[]= _("The password used as new and current are too similar.");
+            $message[]= _("The password used as new and current are too similar!");
         }
     }
     if ($config->get_cfg_value("passwordMinLength") != "") {
         if (strlen($_POST['new_password']) <
            $config->get_cfg_value("passwordMinLength")) {
-            $message[]= _("The password used as new is to short.");
+            $message[]= _("The password used as new is to short!");
         }
     }