From: cajus <cajus@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Thu, 10 Jan 2008 16:04:29 +0000 (+0000)
Subject: Unified strings
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=f0733ebb19f43888ae7a83ba40f8a08d897bf3fc;p=gosa.git

Unified strings


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

diff --git a/gosa-core/plugins/personal/connectivity/class_opengwAccount.inc b/gosa-core/plugins/personal/connectivity/class_opengwAccount.inc
index f61846022..920c62e0f 100644
--- a/gosa-core/plugins/personal/connectivity/class_opengwAccount.inc
+++ b/gosa-core/plugins/personal/connectivity/class_opengwAccount.inc
@@ -169,7 +169,7 @@ class opengwAccount extends plugin
 
 			/* Check if config exists */
 			if($this->config->search("opengwAccount", 'DATABASE',array('tabs'))){
-        msg_dialog::display(_("Configuration error"), _("Missing database configuration!"), ERROR_DIALOG);
+        msg_dialog::display(_("Configuration error"), sprintf(_("%s database configuration is missing!"), "Open Groupware"), ERROR_DIALOG);
 			}else{
 
 				/* Create handle */
@@ -177,7 +177,7 @@ class opengwAccount extends plugin
 
 				/* Check if we are successfully connected to db */
 				if(!$this->handle->connected){
-          msg_dialog::display(_("Configuration error"), _("Cannot connect to database!"), ERROR_DIALOG);
+          msg_dialog::display(_("Configuration error"), sprintf( _("Cannot connect to %s database!"), "Open Groupware"), ERROR_DIALOG);
 				}else{
 
 					/* Assign LocationTeams */
diff --git a/gosa-core/plugins/personal/connectivity/class_oxchangeAccount.inc b/gosa-core/plugins/personal/connectivity/class_oxchangeAccount.inc
index e5c8d5bbe..410be0a50 100644
--- a/gosa-core/plugins/personal/connectivity/class_oxchangeAccount.inc
+++ b/gosa-core/plugins/personal/connectivity/class_oxchangeAccount.inc
@@ -720,11 +720,11 @@ class oxchangeAccount extends plugin
          isset($this->oxconf["PGPASSWD"])){
         $pgcon = @pg_connect("host=".$this->oxconf["PGHOST"]." user=".$this->oxconf["PGUSER"]." password=".$this->oxconf["PGPASSWD"]." dbname=".$this->oxconf["PGDBNAME"]);
         if (! $pgcon){
-          msg_dialog::display(_("Error"), _("Cannot connect to database!"), ERROR_DIALOG);
+          msg_dialog::display(_("Error"), sprintf(_("Cannot connect to %s database!"), "Open-Xchange"), ERROR_DIALOG);
           return;
         }
       }else{
-        msg_dialog::display(_("Configuration error"), _("Database configuration missing!"), ERROR_DIALOG);
+        msg_dialog::display(_("Configuration error"), sprintf(_("%s database configuration is missing!"), "Open-Xchange"), ERROR_DIALOG);
         return;
       }
     }else{
@@ -825,11 +825,11 @@ class oxchangeAccount extends plugin
         if(isset($this->oxconf["PGUSER"]) and isset($this->oxconf["PGHOST"]) and isset($this->oxconf["PGDBNAME"]) and isset($this->oxconf["PGPASSWD"])){
           $pgcon =  @pg_connect("host=".$this->oxconf["PGHOST"]." user=".$this->oxconf["PGUSER"]." password=".$this->oxconf["PGPASSWD"]." dbname=".$this->oxconf["PGDBNAME"]);
           if (! $pgcon){
-            msg::display(_("Error"), _("Cannot connect to database!"), ERROR_DIALOG);
+            msg::display(_("Error"), sprintf(_("Cannot connect to %s database!"), "Open-Xchange"), ERROR_DIALOG);
             return;
           }
         }else{
-          msg_dialog::display(_("Configuration error"), _("Database configuration missing!"), ERROR_DIALOG);
+          msg_dialog::display(_("Configuration error"), sprintf(_("%s database configuration is missing!"), "Open-Xchange"), ERROR_DIALOG);
           return;
         }
       }else{