summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 83876f0)
raw | patch | inline | side by side (parent: 83876f0)
author | cajus <cajus@594d385d-05f5-0310-b6e9-bd551577e9d8> | |
Wed, 1 Dec 2010 11:05:15 +0000 (11:05 +0000) | ||
committer | cajus <cajus@594d385d-05f5-0310-b6e9-bd551577e9d8> | |
Wed, 1 Dec 2010 11:05:15 +0000 (11:05 +0000) |
git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@20482 594d385d-05f5-0310-b6e9-bd551577e9d8
diff --git a/gosa-plugins/goto/admin/ConfigManagement/AddItemDialog.tpl b/gosa-plugins/goto/admin/ConfigManagement/AddItemDialog.tpl
index 2d9823c0722b1455e846659922a0fa84cd50fb92..859ce16e7ebf6f49fde526793061aea882782672 100644 (file)
<h3>{t}Add item{/t}</h3>
-{t}Please specify a name for the item to add, this name has to be uniq within the item configuration.{/t}
+{t}Please specify a name for the item to add. This name has to be unique within the item configuration.{/t}
<br>
<hr>
diff --git a/gosa-plugins/goto/admin/ConfigManagement/TemplateWidget_textEditor.tpl b/gosa-plugins/goto/admin/ConfigManagement/TemplateWidget_textEditor.tpl
index 4f2ae450e329026a43734fa033638e4e850a2c42..4427b4a4e9d0e0d706ee559d07e3bf5a4f286d60 100644 (file)
{if $write_protect}
- {t}The text is write protected, due to its encoding. Editing may break it!{/t}
+ {t}The text is write protected due to its encoding. Editing may break it!{/t}
<br>
<button type='submit' name='editAnyway'>{t}Edit anyway{/t}</button>
{/if}
diff --git a/gosa-plugins/goto/admin/ConfigManagement/class_ConfigManagement.inc b/gosa-plugins/goto/admin/ConfigManagement/class_ConfigManagement.inc
index f9bc5be7f7b0af262029756facd9a8ef9e721747..5f0c18ca7ccd17bfe8e89b96103b4d4e4ae3f927 100644 (file)
if(!isset($this->allItemConfigurations[$str])){
$this->itemConfig = array();
$this->invalidInstallMethod =TRUE;
- $this->errorMessage = sprintf(_("Invalid installation method selected '%s'!"), $str);
+ $this->errorMessage = sprintf(_("Invalid installation method %s selected!"), bold($str));
msg_dialog::display(_("Setup"), $this->errorMessage, ERROR_DIALOG);
return(FALSE);
}else{
}
}
if(!$root){
- $this->errorMessage = sprintf(_("Installation method '%s' is invalid, no root object found!"), $str);
+ $this->errorMessage = sprintf(_("Installation method %s is invalid: no root object found!"), bold($str));
msg_dialog::display(_("Setup"), $this->errorMessage , ERROR_DIALOG);
$this->initFailed = TRUE;
$this->itemConfig = array();
}
$this->allItemConfigurations = $res;
if(!count($this->allItemConfigurations)){
- $this->errorMessage = _("No selectable install methods returned!");
+ $this->errorMessage = _("No selectable install methods available!");
msg_dialog::display(_("Setup"), $this->errorMessage , ERROR_DIALOG);
$this->initFailed = TRUE;
return;
diff --git a/gosa-plugins/goto/admin/ConfigManagement/class_TemplateWidget_textEditor.inc b/gosa-plugins/goto/admin/ConfigManagement/class_TemplateWidget_textEditor.inc
index 4fc28545c1652e38f68dfc8d99d42382db89ef97..d3bc4fb432caab066a387a21aeb8c6372a1bbb02 100644 (file)
{
$msgs = TemplateWidget::check();
if($this->mb_extension && !$this->write_protect && $this->enc_after_edit !== $this->enc_before_edit ){
- $msg = sprintf(_("The text encodig has changed from '%s' to '%s'. Do you really want to save?"),
- "<i>".$this->enc_before_edit."</i>","<i>".$this->enc_after_edit."</i>");
+ $msg = sprintf(_("The text encodig has changed from %s to %s. Do you really want to save?"),
+ bold($this->enc_before_edit),bold($this->enc_after_edit));
$msgs[] = $msg;
$this->enc_before_edit = $this->enc_after_edit;
}