From: cajus Date: Tue, 29 Dec 2009 12:25:02 +0000 (+0000) Subject: First update flush X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=747470103bf7a742c3150d6db829f032690ae292;p=gosa.git 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 43e542c7e..c67086183 100644 --- 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", "\\/"); $smarty->assign("upimg", "\\/"); $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 c97b8313f..03ac0f231 100644 --- a/gosa-plugins/rsyslog/addons/rsyslog/main.inc +++ b/gosa-plugins/rsyslog/addons/rsyslog/main.inc @@ -46,7 +46,7 @@ if ( $cleanup ){ $display.= "\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 e1989dbac..1971c1fe4 100644 --- a/gosa-plugins/rsyslog/addons/rsyslog/rSyslog.tpl +++ b/gosa-plugins/rsyslog/addons/rsyslog/rSyslog.tpl @@ -67,17 +67,17 @@ @@ -87,7 +87,7 @@ @@ -128,7 +128,7 @@ {if !$result.count == 0}

 

{/if} -
{$result.count} {t}entries matching filter{/t}
+
{$matches}
-{t}This server provides a rSyslog mysql database{/t} +{t}Server provides a syslog mysql database{/t}
- {t}Received{/t} + {t}Date{/t} {if $sort_value=="DeviceReportedTime"}{if $sort_type=="DESC"}{$downimg}{else}{$upimg}{/if}{/if} - {t}Host{/t} + {t}Source{/t} {if $sort_value=="FromHost"}{if $sort_type=="DESC"}{$downimg}{else}{$upimg}{/if}{/if} - {t}Log tag{/t} + {t}Header{/t} {if $sort_value=="SysLogTag"}{if $sort_type=="DESC"}{$downimg}{else}{$upimg}{/if}{/if} - {t}Priority{/t} + {t}Severity{/t} {if $sort_value=="Priority"}{if $sort_type=="DESC"}{$downimg}{else}{$upimg}{/if}{/if}
diff --git a/gosa-plugins/rsyslog/locale/de/LC_MESSAGES/messages.po b/gosa-plugins/rsyslog/locale/de/LC_MESSAGES/messages.po index 78122f96f..674cdc32f 100644 --- 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 \n" "Language-Team: de \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"
{t}Database{/t}{$must}