[tokkee]

tokkee.org

Code

projects / gosa.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: cebc136)
Further english text cleanup
authorcajus <cajus@594d385d-05f5-0310-b6e9-bd551577e9d8>
Wed, 2 Nov 2005 12:14:01 +0000 (12:14 +0000)
committercajus <cajus@594d385d-05f5-0310-b6e9-bd551577e9d8>
Wed, 2 Nov 2005 12:14:01 +0000 (12:14 +0000)
git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@1790 594d385d-05f5-0310-b6e9-bd551577e9d8

plugins/personal/connectivity/class_oxchangeAccount.inc patch | blob | history
plugins/personal/environment/selectPrinterDialog.tpl patch | blob | history
plugins/personal/nagios/nagios.tpl patch | blob | history

diff --git a/plugins/personal/connectivity/class_oxchangeAccount.inc b/plugins/personal/connectivity/class_oxchangeAccount.inc
index 379c474a2d9460d75eece7c6a071bed599bb17e1..d68794de2be2eb9ed3261d63c51001919db3f0a8 100644 (file)
--- a/plugins/personal/connectivity/class_oxchangeAccount.inc
+++ b/plugins/personal/connectivity/class_oxchangeAccount.inc
@@ -611,7 +611,7 @@ class oxchangeAccount extends plugin
 
         } else {
          if (! $obj2->is_account){
-           $display= "<BR><BR><CENTER>"._("This account has <b>OpenXchange</b> features disabled. Mail features are needed for openXchange accounts, enable them first.")."</CENTER><BR><BR>";
+           $display= "<BR><BR><CENTER>".sprintf(_("This account has %s features disabled. Mail features are needed for openXchange accounts, enable them first."), "<b>"._("OpenXchange")."</b>")."</CENTER><BR><BR>";
             return ($display);
          }
         }
@@ -693,15 +693,15 @@ 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){
-          print_red(_("Couldn't Connect To Postgresql Database"));
+          print_red(_("Couldn't connect to postgresql database!"));
           return;
         }
       }else{
-        print_red(_("Needed Parameters to openexchange connectivity plugin failed!"));
+        print_red(_("Needed parameters to openexchange connectivity plugin are missing!"));
         return;
       }
     }else{
-      print_red(_("PHP4 module for Postgresql Database Failed!"));
+      print_red(_("PHP4 module for postgresql database is missing!"));
       return;
     }
 
@@ -783,15 +783,15 @@ 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){
-            print_red(_("Couldn't Connect To Postgresql Database"));
+            print_red(_("Couldn't connect to postgresql database!"));
             return;
           }
         }else{
-          print_red(_("Needed Parameters to openexchange connectivity plugin failed!"));
+          print_red(_("Needed parameters for openexchange connectivity plugin are missing!"));
           return;
         }
       }else{
-        print_red(_("PHP4 module for Postgresql Database Failed!"));
+        print_red(_("PHP4 module for postgresql database is missing!"));
         return;
       }
     }
diff --git a/plugins/personal/environment/selectPrinterDialog.tpl b/plugins/personal/environment/selectPrinterDialog.tpl
index 7a68a34d0df91936d9e97c9aed79061218d9a19b..521c77f50bc75fac32c783b9292bbf14966b8ac2 100644 (file)
--- a/plugins/personal/environment/selectPrinterDialog.tpl
+++ b/plugins/personal/environment/selectPrinterDialog.tpl
@@ -25,8 +25,7 @@
                                </div>
                                <div class="contentboxb">
                                        <p class="contentboxb" style="background-color:#F8F8F8">
-                                       {t}This menu allows you to create, edit and delete selected printers. 
-                                                       Having a great number of printers, you may want to use the range selectors on top of the printers list.{/t}
+                                       {t}This menu allows you to create, edit and delete selected printers. Having a great number of printers, you may want to use the range selectors on top of the printers list.{/t}
                                </p>
                                </div>
                                <br>
diff --git a/plugins/personal/nagios/nagios.tpl b/plugins/personal/nagios/nagios.tpl
index b81f1cb86f994611682d479645765fd9105f837e..24355eb8ac04ebb47f68b502c4bd508de6cd7534 100644 (file)
--- a/plugins/personal/nagios/nagios.tpl
+++ b/plugins/personal/nagios/nagios.tpl
@@ -4,17 +4,17 @@
    <h2><img alt="" align="middle" src="images/rightarrow.png"> {t}Nagios Account{/t}</h2>
    <table summary="">
     <tr>
-     <td><LABEL for="NagiosAlias">{t}alias{/t}</LABEL>{$must}</td>
+     <td><LABEL for="NagiosAlias">{t}Alias{/t}</LABEL>{$must}</td>
      <td><input id="NagiosAlias" name="NagiosAlias" size=25 maxlength=65 {$NagiosAliasACL} value="{$NagiosAlias}"></td>
     </tr>
 
     <tr>
-     <td><LABEL for="NagiosMail">{t}email{/t}</LABEL>{$must}</td>
+     <td><LABEL for="NagiosMail">{t}Mail address{/t}</LABEL>{$must}</td>
      <td><input id="NagiosMail" name="NagiosMail" size=25 maxlength=65 {$NagiosMailACL} value="{$NagiosMail}"></td>
     </tr>
 
        <tr>
-       <td><LABEL for="HostNotificationPeriod">{t}Host Notification Period{/t}</LABEL>{$must}</td>
+       <td><LABEL for="HostNotificationPeriod">{t}Host notification period{/t}</LABEL>{$must}</td>
        <td><select name="HostNotificationPeriod" id="HostNotificationPeriod">
        {html_options options=$HostNotificationPeriodValues values=$HostNotificationPeriodValues selected=$HostNotificationPeriod }
        </select>
@@ -22,14 +22,14 @@
        </tr>
 
        <tr>
-       <td><LABEL for="ServiceNotificationPeriod">{t}Service Notification Period{/t}</LABEL>{$must}</td>
+       <td><LABEL for="ServiceNotificationPeriod">{t}Service notification period{/t}</LABEL>{$must}</td>
        <td><select name="ServiceNotificationPeriod" id="ServiceNotificationPeriod">
        {html_options options=$ServiceNotificationPeriodValues values=$ServiceNotificationPeriodValues selected=$ServiceNotificationPeriod}
        </select>
        </td>
        </tr>
        <tr>
-       <td><LABEL for="ServiceNotificationOptions">{t}Service Notification Options{/t}</LABEL>{$must}</td>
+       <td><LABEL for="ServiceNotificationOptions">{t}Service notification options{/t}</LABEL>{$must}</td>
        <td><select name="ServiceNotificationOptions" id="ServiceNotificationOptions">
        {html_options options=$ServiceNotificationOptionsValues values=$ServiceNotificationOptionsValues selected=$ServiceNotificationOptions}
        </select>
@@ -38,23 +38,23 @@
 
 
        <tr>
-       <td><LABEL for="HostNotificationOptions">{t}Host Notification Options{/t}</LABEL>{$must}</td>
+       <td><LABEL for="HostNotificationOptions">{t}Host notification options{/t}</LABEL>{$must}</td>
        <td><select name="HostNotificationOptions" id="HostNotificationOptions">
        {html_options options=$HostNotificationOptionsValues values=$HostNotificationOptionsValues selected=$HostNotificationOptions }
        </select>
        </td>
        </tr>
     <tr>
-     <td><LABEL for="NagiosPager">{t}pager{/t}</LABEL></td>
+     <td><LABEL for="NagiosPager">{t}Pager{/t}</LABEL></td>
      <td><input id="NagiosPager" name="NagiosPager" size=25 maxlength=65 {$NagiosPagerACL} value="{$NagiosPager}"></td>
     </tr>
 
     <tr>
-     <td><LABEL for="ServiceNotificationCommands">{t}Service Notification Commands{/t}</LABEL></td>
+     <td><LABEL for="ServiceNotificationCommands">{t}Service notification commands{/t}</LABEL></td>
      <td><input id="ServiceNotificationCommands" disabled name="ServiceNotificationCommands" size=25 maxlength=65 {$ServiceNotificationCommandsACL} value="{$ServiceNotificationCommands}"></td>
     </tr>
     <tr>
-     <td><LABEL for="HostNotificationCommands">{t}Host Notification Commands{/t}</LABEL></td>
+     <td><LABEL for="HostNotificationCommands">{t}Host notification commands{/t}</LABEL></td>
      <td><input id="HostNotificationCommands" disabled name="HostNotificationCommands" size=25 maxlength=65 {$HostNotificationCommandsACL} value="{$HostNotificationCommands}"></td>
     </tr>
 </table>
@@ -63,9 +63,9 @@
    &nbsp;
   </td>
 <td style="width:100%; vertical-align:top;">
-   <h2><img alt="" align="middle" src="images/rightarrow.png"> {t}Nagios Auth{/t}</h2>
+   <h2><img alt="" align="middle" src="images/rightarrow.png"> {t}Nagios authentification{/t}</h2>
    <table summary="">
-       <tr><td><input type="checkbox" name="AuthorizedSystemInformation" value="{$AuthorizedSystemInformation}"  {$AuthorizedSystemInformation}>{t}authorized_for_system_information{/t}</td></tr>
+       <tr><td><input type="checkbox" name="AuthorizedSystemInformation" value="{$AuthorizedSystemInformation}"  {$AuthorizedSystemInformation}>{t}can view system informations{/t}</td></tr>
        
        <tr><td><input type="checkbox" name="AuthorizedConfigurationInformation" {$AuthorizedConfigurationInformationACL} value="{$AuthorizedConfigurationInformation}" {$AuthorizedConfigurationInformation}>authorized_for_configuration_information</td></tr>
        
GONICUS system administrator (SVN clone)