From 5692e80e8985f583293b851f9f44a4060638c326 Mon Sep 17 00:00:00 2001 From: hickert Date: Wed, 3 Mar 2010 13:22:00 +0000 Subject: [PATCH]

=>

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@15929 594d385d-05f5-0310-b6e9-bd551577e9d8 --- gosa-plugins/fai/admin/fai/class_FAI.inc | 4 ++-- gosa-plugins/fai/admin/fai/class_debconfTemplate.inc | 10 +++++----- gosa-plugins/fai/admin/fai/class_faiSummaryTab.inc | 2 +- gosa-plugins/fai/admin/fai/faiDiskEntry.tpl | 6 +++--- gosa-plugins/fai/admin/fai/faiHook.tpl | 6 +++--- gosa-plugins/fai/admin/fai/faiHookEntry.tpl | 8 ++++---- gosa-plugins/fai/admin/fai/faiNewBranch.tpl | 2 +- gosa-plugins/fai/admin/fai/faiPackage.tpl | 6 +++--- gosa-plugins/fai/admin/fai/faiPartition.tpl | 4 ++-- gosa-plugins/fai/admin/fai/faiPartitionTable.tpl | 6 +++--- gosa-plugins/fai/admin/fai/faiPartitionTableEntry.tpl | 4 ++-- gosa-plugins/fai/admin/fai/faiProfile.tpl | 4 ++-- gosa-plugins/fai/admin/fai/faiScript.tpl | 6 +++--- gosa-plugins/fai/admin/fai/faiScriptEntry.tpl | 8 ++++---- gosa-plugins/fai/admin/fai/faiTemplate.tpl | 6 +++--- gosa-plugins/fai/admin/fai/faiTemplateEdit.tpl | 2 +- gosa-plugins/fai/admin/fai/faiTemplateEntry.tpl | 6 +++--- gosa-plugins/fai/admin/fai/faiVariable.tpl | 6 +++--- gosa-plugins/fai/admin/fai/faiVariableEntry.tpl | 4 ++-- gosa-plugins/fai/admin/fai/paste_generic.tpl | 2 +- 20 files changed, 51 insertions(+), 51 deletions(-) diff --git a/gosa-plugins/fai/admin/fai/class_FAI.inc b/gosa-plugins/fai/admin/fai/class_FAI.inc index 37a06c14f..17b72d61d 100644 --- a/gosa-plugins/fai/admin/fai/class_FAI.inc +++ b/gosa-plugins/fai/admin/fai/class_FAI.inc @@ -892,7 +892,7 @@ class FAI $start = microtime(TRUE); $source_release = trim($source_release,"/"); - echo "

".sprintf(_("Creating group application release for %s"),$destination_name)."

"; + echo "

".sprintf(_("Creating group application release for %s"),$destination_name)."

"; $sub_releases = array(); $source_dn = ""; @@ -1060,7 +1060,7 @@ class FAI /* Display current action information. */ if($is_first){ - echo "

".sprintf(_("Creating copy of %s"),"".LDAP::fix($sourcedn)."")."

"; + echo "

".sprintf(_("Creating copy of %s"),"".LDAP::fix($sourcedn)."")."

"; }else{ if(preg_match("/^ou=/",$sourcedn)){ echo "

"._("Processing")." ".LDAP::fix($destinationdn)."

"; diff --git a/gosa-plugins/fai/admin/fai/class_debconfTemplate.inc b/gosa-plugins/fai/admin/fai/class_debconfTemplate.inc index 6791eaf12..afff0d207 100644 --- a/gosa-plugins/fai/admin/fai/class_debconfTemplate.inc +++ b/gosa-plugins/fai/admin/fai/class_debconfTemplate.inc @@ -215,7 +215,7 @@ class debconf $result=" -

".$data['Topic']."

".$data['Description']." +

".$data['Topic']."

".$data['Description']." "; @@ -253,7 +253,7 @@ class debconf $result=" -

".$data['Topic']."

".$data['Description']." +

".$data['Topic']."

".$data['Description']." @@ -289,7 +289,7 @@ class debconf { $result= ""; $result.= ""; - $result.= "

".$data['Topic']."

".$data['Description']." 

"; + $result.= "

".$data['Topic']."

".$data['Description']." 

"; $result.= $data['Description']; $result.= ""; @@ -313,7 +313,7 @@ class debconf -

".$data['Topic']."

".$data['Description']." +

".$data['Topic']."

".$data['Description']." "; @@ -342,7 +342,7 @@ class debconf $result= " -

".$data['Topic']."

".$data['Description']." +

".$data['Topic']."

".$data['Description']." diff --git a/gosa-plugins/fai/admin/fai/class_faiSummaryTab.inc b/gosa-plugins/fai/admin/fai/class_faiSummaryTab.inc index 5887e932e..98b88eed5 100644 --- a/gosa-plugins/fai/admin/fai/class_faiSummaryTab.inc +++ b/gosa-plugins/fai/admin/fai/class_faiSummaryTab.inc @@ -180,7 +180,7 @@ class faiSummaryTab extends plugin{ /* Skip this if fai is deactivated */ $tmp = $this->config->search("faiManagement", "CLASS",array('menu','tabs')); if(empty($tmp)){ - $str = "

"._("You can't use this plugin until FAI is activated.")."

"; + $str = "

"._("You can't use this plugin until FAI is activated.")."

"; return $str; } diff --git a/gosa-plugins/fai/admin/fai/faiDiskEntry.tpl b/gosa-plugins/fai/admin/fai/faiDiskEntry.tpl index 67e958d3a..6ef8db387 100644 --- a/gosa-plugins/fai/admin/fai/faiDiskEntry.tpl +++ b/gosa-plugins/fai/admin/fai/faiDiskEntry.tpl @@ -1,5 +1,5 @@ -

 {t}Device{/t}

+

 {t}Device{/t}

@@ -68,7 +68,7 @@
-

{t}Combined physical partitions{/t}

+

{t}Combined physical partitions{/t}

-

 {t}Generic{/t}

+

 {t}Generic{/t}

@@ -35,9 +35,9 @@
-

  +

  {t}List of hook scripts{/t} -

+
diff --git a/gosa-plugins/fai/admin/fai/faiHookEntry.tpl b/gosa-plugins/fai/admin/fai/faiHookEntry.tpl index 7b940c59c..edbad4043 100644 --- a/gosa-plugins/fai/admin/fai/faiHookEntry.tpl +++ b/gosa-plugins/fai/admin/fai/faiHookEntry.tpl @@ -2,7 +2,7 @@
-

 {t}Generic{/t}

+

 {t}Generic{/t}

@@ -30,7 +30,7 @@   -

 {t}Hook attributes{/t}

+

 {t}Hook attributes{/t}

@@ -51,11 +51,11 @@

 

-

  +

  -

+
diff --git a/gosa-plugins/fai/admin/fai/faiNewBranch.tpl b/gosa-plugins/fai/admin/fai/faiNewBranch.tpl index fe1e58318..5a294d990 100644 --- a/gosa-plugins/fai/admin/fai/faiNewBranch.tpl +++ b/gosa-plugins/fai/admin/fai/faiNewBranch.tpl @@ -31,7 +31,7 @@ {else} -

{t}Processing the requested operation{/t}

+

{t}Processing the requested operation{/t}

{t}As soon as the copy operation has finished, you can scroll down to end of the page and press the 'Continue' button to continue with the fai management dialog.{/t}

diff --git a/gosa-plugins/fai/admin/fai/faiPackage.tpl b/gosa-plugins/fai/admin/fai/faiPackage.tpl index 9e66d6e21..24a6bf59f 100644 --- a/gosa-plugins/fai/admin/fai/faiPackage.tpl +++ b/gosa-plugins/fai/admin/fai/faiPackage.tpl @@ -1,7 +1,7 @@
-

 {t}Generic{/t}

+

 {t}Generic{/t}

@@ -30,7 +30,7 @@
-

 {t}Repository{/t}

+

 {t}Repository{/t}

@@ -68,7 +68,7 @@ diff --git a/gosa-plugins/fai/admin/fai/faiPartition.tpl b/gosa-plugins/fai/admin/fai/faiPartition.tpl index 59a9c0a29..989ca044f 100644 --- a/gosa-plugins/fai/admin/fai/faiPartition.tpl +++ b/gosa-plugins/fai/admin/fai/faiPartition.tpl @@ -1,5 +1,5 @@ -

{t}Partition{/t}

+

{t}Partition{/t}

-

 {t}Used packages{/t}

+

 {t}Used packages{/t}

{$divlist}
@@ -93,7 +93,7 @@
-

{t}Combined physical partitions{/t}

+

{t}Combined physical partitions{/t}

-

 {t}Generic{/t}

+

 {t}Generic{/t}

@@ -36,11 +36,11 @@   -

  +

  -

+ {$Entry_divlist} {if $sub_object_is_addable} diff --git a/gosa-plugins/fai/admin/fai/faiPartitionTableEntry.tpl b/gosa-plugins/fai/admin/fai/faiPartitionTableEntry.tpl index 95d5a0537..3c11236b4 100644 --- a/gosa-plugins/fai/admin/fai/faiPartitionTableEntry.tpl +++ b/gosa-plugins/fai/admin/fai/faiPartitionTableEntry.tpl @@ -1,5 +1,5 @@ -

 {t}Device{/t}

+

 {t}Device{/t}