From 380dafcdc7e95bf600b92a44474ecb1c68872cb0 Mon Sep 17 00:00:00 2001 From: cajus Date: Wed, 30 Sep 2009 10:16:15 +0000 Subject: [PATCH] First flush of textual adaptions git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@14403 594d385d-05f5-0310-b6e9-bd551577e9d8 --- .../opsi/admin/opsiLicenses/class_divListLicenses.inc | 4 ++-- .../opsi/admin/opsiLicenses/class_licenseUsageByHost.inc | 4 ++-- gosa-plugins/opsi/admin/opsiLicenses/class_opsiLicenses.inc | 2 +- gosa-plugins/opsi/admin/opsiLicenses/licenseByProduct.tpl | 2 +- gosa-plugins/opsi/admin/opsiLicenses/licenseGeneric.tpl | 6 +++--- gosa-plugins/opsi/admin/opsiLicenses/licensePoolGeneric.tpl | 2 +- gosa-plugins/opsi/admin/opsiLicenses/licenseUsage.tpl | 2 +- gosa-plugins/opsi/admin/opsiLicenses/licenseUsageByHost.tpl | 4 ++-- 8 files changed, 13 insertions(+), 13 deletions(-) diff --git a/gosa-plugins/opsi/admin/opsiLicenses/class_divListLicenses.inc b/gosa-plugins/opsi/admin/opsiLicenses/class_divListLicenses.inc index b5b47e147..7b32f3c4c 100644 --- a/gosa-plugins/opsi/admin/opsiLicenses/class_divListLicenses.inc +++ b/gosa-plugins/opsi/admin/opsiLicenses/class_divListLicenses.inc @@ -72,7 +72,7 @@ class divListLicense extends MultiSelectWindow "attach" => "style='width:".$action_col_size."px;border-right:0px;text-align:right;'")); // Add regex user input field - $this->AddRegex ("Regex", _("Regular expression for matching license names"), "*" , true); + $this->AddRegex ("Regex", _("Regular expression for matching license pools"), "*" , true); } @@ -183,7 +183,7 @@ class divListLicense extends MultiSelectWindow $num_deps = count($this->Added_Departments); } $num_objs = count($list); - $num_obj_str = _("Number of listed licenses"); + $num_obj_str = _("Number of listed license pools"); $str = "".$num_obj_str." ".$num_objs."    "; $this->set_List_Bottom_Info($str); diff --git a/gosa-plugins/opsi/admin/opsiLicenses/class_licenseUsageByHost.inc b/gosa-plugins/opsi/admin/opsiLicenses/class_licenseUsageByHost.inc index 21a81c777..c2b96e6f1 100644 --- a/gosa-plugins/opsi/admin/opsiLicenses/class_licenseUsageByHost.inc +++ b/gosa-plugins/opsi/admin/opsiLicenses/class_licenseUsageByHost.inc @@ -249,8 +249,8 @@ class licenseUsageByHost extends plugin "plSection" => array("administration"), "plCategory" => array("opsi"), "plProvidedAcls"=> array( - "hostId" => _("Used by host")." ("._("read only").")", - "boundToHost" => _("License revervation")) + "hostId" => _("Used by"), + "boundToHost" => _("License reservation")) )); } } diff --git a/gosa-plugins/opsi/admin/opsiLicenses/class_opsiLicenses.inc b/gosa-plugins/opsi/admin/opsiLicenses/class_opsiLicenses.inc index dd77e93b0..06f3534f8 100644 --- a/gosa-plugins/opsi/admin/opsiLicenses/class_opsiLicenses.inc +++ b/gosa-plugins/opsi/admin/opsiLicenses/class_opsiLicenses.inc @@ -23,7 +23,7 @@ class opsiLicenses extends plugin { /* Definitions */ - var $plHeadline= "Software licences"; + var $plHeadline= "Software licenses"; var $plDescription= "Software licenses"; var $plIcon= "plugins/opsi/images/plugin.png"; diff --git a/gosa-plugins/opsi/admin/opsiLicenses/licenseByProduct.tpl b/gosa-plugins/opsi/admin/opsiLicenses/licenseByProduct.tpl index c9536596e..44f9d77e4 100644 --- a/gosa-plugins/opsi/admin/opsiLicenses/licenseByProduct.tpl +++ b/gosa-plugins/opsi/admin/opsiLicenses/licenseByProduct.tpl @@ -2,7 +2,7 @@
{msgPool type=siError}
{t}Check if the GOsa support daemon (gosa-si) is running.{/t}  - +

{else} diff --git a/gosa-plugins/opsi/admin/opsiLicenses/licenseGeneric.tpl b/gosa-plugins/opsi/admin/opsiLicenses/licenseGeneric.tpl index 1ca85f471..428b8ec94 100644 --- a/gosa-plugins/opsi/admin/opsiLicenses/licenseGeneric.tpl +++ b/gosa-plugins/opsi/admin/opsiLicenses/licenseGeneric.tpl @@ -2,7 +2,7 @@
{msgPool type=siError}
{t}Check if the GOsa support daemon (gosa-si) is running.{/t}  - +

{else} @@ -169,7 +169,7 @@ {if $licenseModel == "OEM"} - {t}Reserved for Host{/t} + {t}Reserved for{/t} {render acl=$licenseACL} @@ -189,7 +189,7 @@
- {t}Used by Host{/t}
+ {t}Used by{/t}
{render acl=$licenseACL} +

{else} diff --git a/gosa-plugins/opsi/admin/opsiLicenses/licenseUsage.tpl b/gosa-plugins/opsi/admin/opsiLicenses/licenseUsage.tpl index 443d2f4f4..a84d6511e 100644 --- a/gosa-plugins/opsi/admin/opsiLicenses/licenseUsage.tpl +++ b/gosa-plugins/opsi/admin/opsiLicenses/licenseUsage.tpl @@ -2,7 +2,7 @@
{msgPool type=siError}
{t}Check if the GOsa support daemon (gosa-si) is running.{/t}  - +

{else} diff --git a/gosa-plugins/opsi/admin/opsiLicenses/licenseUsageByHost.tpl b/gosa-plugins/opsi/admin/opsiLicenses/licenseUsageByHost.tpl index 26a24c1b3..672cbce7a 100644 --- a/gosa-plugins/opsi/admin/opsiLicenses/licenseUsageByHost.tpl +++ b/gosa-plugins/opsi/admin/opsiLicenses/licenseUsageByHost.tpl @@ -2,7 +2,7 @@
{msgPool type=siError}
{t}Check if the GOsa support daemon (gosa-si) is running.{/t}  - +

{else} @@ -11,7 +11,7 @@
-

{t}Licenses reserved for this host{/t}

+

{t}Licenses reserved for{/t}

{render acl=$boundToHostACL} {$licenseReserved} {/render} -- 2.30.2