First flush of textual adaptions

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

diff --git a/gosa-plugins/opsi/admin/opsiLicenses/class_divListLicenses.inc b/gosa-plugins/opsi/admin/opsiLicenses/class_divListLicenses.inc
index b5b47e147c5c52f2e909270c901d32be74dd2fcd..7b32f3c4cd1780c07fa7050d7115b958967dda21 100644 (file)
--- 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 = "<img class='center' src='plugins/opsi/images/license.png'
               title='".$num_obj_str."' alt='".$num_obj_str."'>&nbsp;".$num_objs."&nbsp;&nbsp;&nbsp;&nbsp;";
     $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 21a81c777e9665ab45277a714e56cd16b3368cb6..c2b96e6f1e826e1f94b2b464d9bd193d28487e21 100644 (file)
--- 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 dd77e93b0dedf52235bf736c1686881dc1f5f73d..06f3534f83c5d1a12aa02a28380bb99f3624a6ad 100644 (file)
--- 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 c9536596ec81eb53550630e399b03ff075a461c4..44f9d77e42870425106e1f517fbe3a80292dc077 100644 (file)
--- a/gosa-plugins/opsi/admin/opsiLicenses/licenseByProduct.tpl
+++ b/gosa-plugins/opsi/admin/opsiLicenses/licenseByProduct.tpl
@@ -2,7 +2,7 @@
 <br>
 <b>{msgPool type=siError}</b><br>
 {t}Check if the GOsa support daemon (gosa-si) is running.{/t}&nbsp;
-<input type='submit' name='retry_init' value="{t}retry{/t}">
+<input type='submit' name='retry_init' value="{t}Retry{/t}">
 <br>
 <br>
 {else}

diff --git a/gosa-plugins/opsi/admin/opsiLicenses/licenseGeneric.tpl b/gosa-plugins/opsi/admin/opsiLicenses/licenseGeneric.tpl
index 1ca85f471742ae44cd233ff07f5f6eaa66bfd222..428b8ec946206bd56701c36c44c1f5c955339a71 100644 (file)
--- a/gosa-plugins/opsi/admin/opsiLicenses/licenseGeneric.tpl
+++ b/gosa-plugins/opsi/admin/opsiLicenses/licenseGeneric.tpl
@@ -2,7 +2,7 @@
 <br>
 <b>{msgPool type=siError}</b><br>
 {t}Check if the GOsa support daemon (gosa-si) is running.{/t}&nbsp;
-<input type='submit' name='retry_init' value="{t}retry{/t}">
+<input type='submit' name='retry_init' value="{t}Retry{/t}">
 <br>
 <br>
 {else}
@@ -169,7 +169,7 @@
           {if $licenseModel == "OEM"}
           <tr>
             <td>
-              {t}Reserved for Host{/t}
+              {t}Reserved for{/t}
             </td>
             <td>
 {render acl=$licenseACL}
@@ -189,7 +189,7 @@
         <table width="100%">
           <tr>
             <td colspan="2">
-              <b>{t}Used by Host{/t}</b><br>
+              <b>{t}Used by{/t}</b><br>
 {render acl=$licenseACL}
               <select   disabled
                 name='selectedUsedHosts[]' multiple size=4 style='width:100%;'>

diff --git a/gosa-plugins/opsi/admin/opsiLicenses/licensePoolGeneric.tpl b/gosa-plugins/opsi/admin/opsiLicenses/licensePoolGeneric.tpl
index d2d311af6192ba2b4dd64308c670abb16bfe0a70..5487dc37320d2590d079800981461bc0ba6aab6f 100644 (file)
--- a/gosa-plugins/opsi/admin/opsiLicenses/licensePoolGeneric.tpl
+++ b/gosa-plugins/opsi/admin/opsiLicenses/licensePoolGeneric.tpl
@@ -2,7 +2,7 @@
 <br>
 <b>{msgPool type=siError}</b><br>
 {t}Check if the GOsa support daemon (gosa-si) is running.{/t}&nbsp;
-<input type='submit' name='retry_init' value="{t}retry{/t}">
+<input type='submit' name='retry_init' value="{t}Retry{/t}">
 <br>
 <br>
 {else}

diff --git a/gosa-plugins/opsi/admin/opsiLicenses/licenseUsage.tpl b/gosa-plugins/opsi/admin/opsiLicenses/licenseUsage.tpl
index 443d2f4f4f55fb328a5d82c6cef095528bbfe7fa..a84d6511ea4398db1841c29c23e9a7c99c9b500f 100644 (file)
--- a/gosa-plugins/opsi/admin/opsiLicenses/licenseUsage.tpl
+++ b/gosa-plugins/opsi/admin/opsiLicenses/licenseUsage.tpl
@@ -2,7 +2,7 @@
 <br>
 <b>{msgPool type=siError}</b><br>
 {t}Check if the GOsa support daemon (gosa-si) is running.{/t}&nbsp;
-<input type='submit' name='retry_init' value="{t}retry{/t}">
+<input type='submit' name='retry_init' value="{t}Retry{/t}">
 <br>
 <br>
 {else}

diff --git a/gosa-plugins/opsi/admin/opsiLicenses/licenseUsageByHost.tpl b/gosa-plugins/opsi/admin/opsiLicenses/licenseUsageByHost.tpl
index 26a24c1b3e3273fbbd2f6a2a8e5c9948b1339edb..672cbce7a288c422d520ba841e423fb385f64e55 100644 (file)
--- a/gosa-plugins/opsi/admin/opsiLicenses/licenseUsageByHost.tpl
+++ b/gosa-plugins/opsi/admin/opsiLicenses/licenseUsageByHost.tpl
@@ -2,7 +2,7 @@
 <br>
 <b>{msgPool type=siError}</b><br>
 {t}Check if the GOsa support daemon (gosa-si) is running.{/t}&nbsp;
-<input type='submit' name='retry_init' value="{t}retry{/t}">
+<input type='submit' name='retry_init' value="{t}Retry{/t}">
 <br>
 <br>
 {else}
@@ -11,7 +11,7 @@
 <table width="100%">
   <tr>
     <td style='vertical-align:top;width: 50%; padding: 5px; border-right: solid 1px #AAA; '>
-        <h2>{t}Licenses reserved for this host{/t}</h2>
+        <h2>{t}Licenses reserved for{/t}</h2>
 {render acl=$boundToHostACL}
         {$licenseReserved}
 {/render}