diff --git a/pandora_console/operation/events/events_marquee.php b/pandora_console/operation/events/events_marquee.php index 9fb662eeed..9ffea8f61d 100644 --- a/pandora_console/operation/events/events_marquee.php +++ b/pandora_console/operation/events/events_marquee.php @@ -106,7 +106,7 @@ foreach ($result as $row) { echo ""; echo ""; -echo "Pandora FMS - Latest events "; +echo "" . __("%s - Latest events", get_product_name()) . ""; $query = ui_get_full_url(); echo ''; diff --git a/pandora_console/operation/events/events_rss.php b/pandora_console/operation/events/events_rss.php index bb81462dbe..9fbbbf1585 100644 --- a/pandora_console/operation/events/events_rss.php +++ b/pandora_console/operation/events/events_rss.php @@ -60,9 +60,9 @@ function rss_error_handler ($errno, $errstr, $errfile, $errline, $error_human_de $rss_feed .= "\n"; $rss_feed .= ''; $rss_feed .= "\n"; - $rss_feed .= 'Pandora RSS Feed'; + $rss_feed .= '' . get_product_name() . ' RSS Feed'; $rss_feed .= "\n"; - $rss_feed .= 'Latest events on Pandora'; + $rss_feed .= 'Latest events on ' . get_product_name() . ''; $rss_feed .= "\n"; $rss_feed .= ''.date (DATE_RFC822, 0).''; $rss_feed .= "\n"; @@ -138,7 +138,7 @@ require('events.build_query.php'); //////////////////////////////////////////////////////////////////////// $sql = "SELECT * - FROM tevento + FROM tevento LEFT JOIN tagent_secondary_group on id_grupo = id_group WHERE 1=1 " . $sql_post . " ORDER BY utimestamp DESC"; @@ -157,8 +157,8 @@ else { $rss_feed = '' . "\n"; // ' ' . "\n"; $rss_feed .= ''. "\n"; -$rss_feed .= 'Pandora RSS Feed'. "\n"; -$rss_feed .= 'Latest events on Pandora' . "\n"; +$rss_feed .= '' . get_product_name() . ' RSS Feed'. "\n"; +$rss_feed .= 'Latest events on ' . get_product_name() . '' . "\n"; $rss_feed .= ''.date (DATE_RFC822, $lastbuild).''. "\n"; //Last build date is the last event - that way readers won't mark it as having new posts $rss_feed .= ''.$url.''. "\n"; //Link back to the main Pandora page $rss_feed .= ''. "\n";; //Alternative for Atom feeds. It's the same. diff --git a/pandora_console/operation/netflow/nf_live_view.php b/pandora_console/operation/netflow/nf_live_view.php index 6e23dc11b3..13ebfcdd57 100644 --- a/pandora_console/operation/netflow/nf_live_view.php +++ b/pandora_console/operation/netflow/nf_live_view.php @@ -237,9 +237,9 @@ echo '
"calendar")) . - ui_print_help_tip(__('Date format in Pandora is year/month/day'), true) . + ui_print_help_tip(__('Date format is YY/MM/DD'), true) . html_print_input_text ('time', $time, false, 10, 8, true) . - ui_print_help_tip(__('Time format in Pandora is hours(24h):minutes:seconds'), true) . + ui_print_help_tip(__('Watch format is hours (24h):minutes:seconds'), true) . ""; echo "" . ''.__('Interval').'' . ""; diff --git a/pandora_console/operation/search_helps.php b/pandora_console/operation/search_helps.php index 84b08e9960..c53f7f5acf 100644 --- a/pandora_console/operation/search_helps.php +++ b/pandora_console/operation/search_helps.php @@ -20,7 +20,7 @@ $totalHelps = check_acl($config["id_user"], 0, "IR"); if ($helps === false || !$searchHelps) { echo "
" . __("Zero results found.") . - sprintf(__('You can find more help in the Pandora\'s wiki'), + sprintf(__('You can find more help in the wiki'), "http://wiki.pandorafms.com/index.php?search=" . $config['search_keywords']) . "
\n"; } diff --git a/pandora_console/operation/users/user_edit.php b/pandora_console/operation/users/user_edit.php index f5d1057941..ec8df08265 100644 --- a/pandora_console/operation/users/user_edit.php +++ b/pandora_console/operation/users/user_edit.php @@ -228,7 +228,7 @@ if ($view_mode === false) { } else { $data = array(); - $data[0] = ''.__('You can not change your password from Pandora FMS under the current authentication scheme').''; + $data[0] = ''.__('You cannot change your password under the current authentication scheme').''; $table->rowclass[] = ''; $table->rowstyle[] = ''; $table->colspan[count($table-data)][0] = 2; @@ -352,7 +352,7 @@ if (check_acl ($config['id_user'], 0, "ER")){ else if (license_free()) { $data[1] = __('Newsletter Subscribed') . ':'; if ($user_info["middlename"]) { - $data[1] .= $jump . '' . __('Already subscribed to Pandora FMS newsletter') . ""; + $data[1] .= $jump . '' . __('Already subscribed to %s newsletter', get_product_name()) . ""; } else { $data[1] .= $jump . '' . __('Subscribe to our newsletter') . ""; @@ -474,10 +474,9 @@ echo 'width . '; text-align:right;">'; if (!$config["user_can_update_info"]) { - echo ''.__('You can not change your user info from Pandora FMS under the current authentication scheme').''; + echo ''.__('You can not change your user info under the current authentication scheme').''; } else { html_print_submit_button (__('Update'), 'uptbutton', $view_mode, 'class="sub upd"');