First update flush

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

diff --git a/gosa-plugins/rsyslog/addons/rsyslog/class_rsyslog.inc b/gosa-plugins/rsyslog/addons/rsyslog/class_rsyslog.inc
index 43e542c7e18e60c063aaeb7e3efd4cf14887c4a6..c67086183cc34114f3df895bd36b307dad0187dd 100644 (file)
--- a/gosa-plugins/rsyslog/addons/rsyslog/class_rsyslog.inc
+++ b/gosa-plugins/rsyslog/addons/rsyslog/class_rsyslog.inc
@@ -139,6 +139,7 @@ class rsyslog extends plugin
     $smarty->assign("downimg", "<img src='images/lists/sort-down.png' class='center' alt='\\/' border='0'>");
     $smarty->assign("upimg", "<img src='images/lists/sort-up.png' class='center' alt='\\/' border='0'>");
     $smarty->assign("result", $result);
+    $smarty->assign("matches", sprintf(_("%s entries match the filter"), $result["count"]));
     if($this->limit != '-'){
       $smarty->assign("page_sel", range_selector($result['count'],$this->page,$this->limits[$this->limit]));
     }else{

diff --git a/gosa-plugins/rsyslog/addons/rsyslog/main.inc b/gosa-plugins/rsyslog/addons/rsyslog/main.inc
index c97b8313ffd2630122be58806512d89018f2a557..03ac0f231a2c949a8e3ac554509eeef3ffc656a6 100644 (file)
--- a/gosa-plugins/rsyslog/addons/rsyslog/main.inc
+++ b/gosa-plugins/rsyslog/addons/rsyslog/main.inc
@@ -46,7 +46,7 @@ if ( $cleanup ){
        $display.= "<input type=\"hidden\" name=\"ignore\">\n";
 
        /* Page header*/
-       $display= print_header(get_template_path('plugins/rsyslog/images/plugin.png'), _("System log view")).$display;
+       $display= print_header(get_template_path('plugins/rsyslog/images/plugin.png'), _("System logs")).$display;
 
        /* Store changes  in session */
        session::set('rsyslogObject',$rsyslogObject);

diff --git a/gosa-plugins/rsyslog/addons/rsyslog/rSyslog.tpl b/gosa-plugins/rsyslog/addons/rsyslog/rSyslog.tpl
index e1989dbacdd67e2a728c0b6a586bce5bffcee860..1971c1fe49b6a70b2677c94bff0c4a20354ce532 100644 (file)
--- a/gosa-plugins/rsyslog/addons/rsyslog/rSyslog.tpl
+++ b/gosa-plugins/rsyslog/addons/rsyslog/rSyslog.tpl
@@ -67,17 +67,17 @@
   <table style="width:100%;background-color: #B0B0B0;" cellspacing=1 cellpadding=2>
     <tr style="background-color: #E8E8E8; height:26px; font-weight:bold">
       <td>
-        <a href='?plug={$plug_id}&amp;sort_value=DeviceReportedTime'>{t}Received{/t}
+        <a href='?plug={$plug_id}&amp;sort_value=DeviceReportedTime'>{t}Date{/t}
           {if $sort_value=="DeviceReportedTime"}{if $sort_type=="DESC"}{$downimg}{else}{$upimg}{/if}{/if}
         </a>
       </td>
       <td>
-        <a href='?plug={$plug_id}&amp;sort_value=FromHost'>{t}Host{/t}
+        <a href='?plug={$plug_id}&amp;sort_value=FromHost'>{t}Source{/t}
           {if $sort_value=="FromHost"}{if $sort_type=="DESC"}{$downimg}{else}{$upimg}{/if}{/if}
         </a>
       </td>
       <td>
-        <a href='?plug={$plug_id}&amp;sort_value=SysLogTag'>{t}Log tag{/t}
+        <a href='?plug={$plug_id}&amp;sort_value=SysLogTag'>{t}Header{/t}
           {if $sort_value=="SysLogTag"}{if $sort_type=="DESC"}{$downimg}{else}{$upimg}{/if}{/if}
         </a>
       </td>
@@ -87,7 +87,7 @@
         </a>
       </td>
       <td>
-        <a href='?plug={$plug_id}&amp;sort_value=Priority'>{t}Priority{/t}
+        <a href='?plug={$plug_id}&amp;sort_value=Priority'>{t}Severity{/t}
           {if $sort_value=="Priority"}{if $sort_type=="DESC"}{$downimg}{else}{$upimg}{/if}{/if}
         </a>
       </td>
@@ -128,7 +128,7 @@
   {if !$result.count == 0}
   <p class="separator">&nbsp;</p>
   {/if}
-  <div style='width:40%;float:left;'>{$result.count} {t}entries matching filter{/t}</div>
+  <div style='width:40%;float:left;'>{$matches}</div>
   <div style='width:80px;float:right;'>
     <select name='limit' onChange='document.mainform.submit();'>
       {html_options options=$limits selected=$limit}

diff --git a/gosa-plugins/rsyslog/admin/systems/services/rsyslog/class_rSyslogServer.inc b/gosa-plugins/rsyslog/admin/systems/services/rsyslog/class_rSyslogServer.inc
index 9e21fea30c2e0b547866e0b138bb25bc817ac2dd..a69b21f8ebbe1f6f885866573385717b67d38db9 100644 (file)
--- a/gosa-plugins/rsyslog/admin/systems/services/rsyslog/class_rSyslogServer.inc
+++ b/gosa-plugins/rsyslog/admin/systems/services/rsyslog/class_rSyslogServer.inc
@@ -171,8 +171,8 @@ class rSyslogServer extends goService{
   static function plInfo()
   {
     return (array(
-          "plShortName"   => _("rSyslog logging service"),
-          "plDescription" => _("rSyslog logging service")." ("._("Services").")",
+          "plShortName"   => _("Logging service"),
+          "plDescription" => _("Logging service")." ("._("Services").")",
           "plSelfModify"  => FALSE,
           "plDepends"     => array(),
           "plPriority"    => 99,

diff --git a/gosa-plugins/rsyslog/admin/systems/services/rsyslog/rSyslogServer.tpl b/gosa-plugins/rsyslog/admin/systems/services/rsyslog/rSyslogServer.tpl
index 61f1ab0d197d15946c648c311a1e0e7c9b0c47f1..93df1cc59a5bc856c2adeb1612b64aed9815034a 100644 (file)
--- a/gosa-plugins/rsyslog/admin/systems/services/rsyslog/rSyslogServer.tpl
+++ b/gosa-plugins/rsyslog/admin/systems/services/rsyslog/rSyslogServer.tpl
@@ -4,7 +4,7 @@
 <input type="checkbox" name="use_database" value="1" {if $use_database} checked {/if}
   onChange="changeState('gosaLogDB'); changeState('goLogAdmin');changeState('goLogPassword');"
   class="center">
-<b>{t}This server provides a rSyslog mysql database{/t}</b>
+<b>{t}Server provides a syslog mysql database{/t}</b>
 <table summary="">
     <tr>
      <td>{t}Database{/t}{$must}</td>

diff --git a/gosa-plugins/rsyslog/locale/de/LC_MESSAGES/messages.po b/gosa-plugins/rsyslog/locale/de/LC_MESSAGES/messages.po
index 78122f96fb6ad91f22300ed000e6968ccd11191e..674cdc32fc0e0df0af2d855691f8b7ea0b3f3dea 100644 (file)
--- a/gosa-plugins/rsyslog/locale/de/LC_MESSAGES/messages.po
+++ b/gosa-plugins/rsyslog/locale/de/LC_MESSAGES/messages.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-29 14:10+0100\n"
+"POT-Creation-Date: 2009-12-29 14:24+0100\n"
 "PO-Revision-Date: 2009-10-05 15:19+0200\n"
 "Last-Translator: Cajus Pollmeier <pollmeier@gonicus.de>\n"
 "Language-Team: de <kde-i18n-de@kde.org>\n"
@@ -28,6 +28,8 @@ msgid "Logging"
 msgstr "Protokollierung"
 
 #: admin/systems/services/rsyslog/class_rSyslogServer.inc:67
+#: admin/systems/services/rsyslog/class_rSyslogServer.inc:174
+#: admin/systems/services/rsyslog/class_rSyslogServer.inc:175
 msgid "Logging service"
 msgstr "Protokoll-Dienst"
 
@@ -52,11 +54,6 @@ msgstr "Passwort"
 msgid "LDAP error"
 msgstr "LDAP-Fehler"
 
-#: admin/systems/services/rsyslog/class_rSyslogServer.inc:174
-#: admin/systems/services/rsyslog/class_rSyslogServer.inc:175
-msgid "rSyslog logging service"
-msgstr ""
-
 #: admin/systems/services/rsyslog/class_rSyslogServer.inc:175
 msgid "Services"
 msgstr "Dienste"
@@ -70,14 +67,14 @@ msgid "Syslog logging"
 msgstr "Syslog Protokollierung"
 
 #: admin/systems/services/rsyslog/rSyslogServer.tpl:7
-msgid "This server provides a rSyslog mysql database"
-msgstr ""
+msgid "Server provides a syslog mysql database"
+msgstr "Server stellt eine Syslog MySQL-Datenbank zur Verfügung"
 
 #: admin/systems/services/rsyslog/rSyslogServer.tpl:19
 msgid "Database user"
 msgstr "Datenbank-Benutzer"
 
-#: addons/rsyslog/class_rsyslog.inc:5
+#: addons/rsyslog/class_rsyslog.inc:5 addons/rsyslog/main.inc:49
 msgid "System logs"
 msgstr "Systemprotokolle"
 
@@ -93,14 +90,16 @@ msgstr "-"
 msgid "All"
 msgstr "Alle"
 
-#: addons/rsyslog/class_rsyslog.inc:161
+#: addons/rsyslog/class_rsyslog.inc:142
+#, php-format
+msgid "%s entries match the filter"
+msgstr "%s Einträge passten auf den Filter"
+
+#: addons/rsyslog/class_rsyslog.inc:162
+#, php-format
 msgid "The selected server '%s' does not exists!"
 msgstr "Der ausgewählte Server '%s' existiert nicht!"
 
-#: addons/rsyslog/main.inc:49
-msgid "System log view"
-msgstr ""
-
 #: addons/rsyslog/rSyslog.tpl:2
 msgid "Filter"
 msgstr "Filter"
@@ -109,11 +108,11 @@ msgstr "Filter"
 msgid "Server"
 msgstr "Server"
 
-#: addons/rsyslog/rSyslog.tpl:15 addons/rsyslog/rSyslog.tpl:75
+#: addons/rsyslog/rSyslog.tpl:15
 msgid "Host"
 msgstr "System"
 
-#: addons/rsyslog/rSyslog.tpl:23 addons/rsyslog/rSyslog.tpl:90
+#: addons/rsyslog/rSyslog.tpl:23
 msgid "Priority"
 msgstr "Priorität"
 
@@ -134,21 +133,25 @@ msgid "Error"
 msgstr "Fehler"
 
 #: addons/rsyslog/rSyslog.tpl:70
-msgid "Received"
-msgstr "Empfangen"
+msgid "Date"
+msgstr "Datum"
+
+#: addons/rsyslog/rSyslog.tpl:75
+msgid "Source"
+msgstr "Quelle"
 
 #: addons/rsyslog/rSyslog.tpl:80
-msgid "Log tag"
-msgstr ""
+msgid "Header"
+msgstr "Betreff"
 
 #: addons/rsyslog/rSyslog.tpl:85
 msgid "Facility"
-msgstr ""
+msgstr "Facility"
+
+#: addons/rsyslog/rSyslog.tpl:90
+msgid "Severity"
+msgstr "Schwere"
 
 #: addons/rsyslog/rSyslog.tpl:95
 msgid "Message"
-msgstr ""
-
-#: addons/rsyslog/rSyslog.tpl:131
-msgid "entries matching filter"
-msgstr ""
+msgstr "Nachricht"