From b22f436afb296f1453932ecdda8ea28816a67b54 Mon Sep 17 00:00:00 2001 From: Chris Buechler Date: Fri, 10 Oct 2014 19:09:57 -0500 Subject: [PATCH] s/removing/omitting/g for gateway monitor log entires. "Removing" is not necessarily correct, there are many circumstances where this runs where it wasn't there to begin with, and is potentially misleading. --- etc/inc/gwlb.inc | 6 +++--- .../share/locale/en/LC_MESSAGES/pfSense.pot | 6 +++--- .../share/locale/ja/LC_MESSAGES/pfSense.po | 6 +++--- .../pt_BR.ISO8859-1/LC_MESSAGES/pfSense.mo | Bin 642971 -> 642971 bytes .../pt_BR.ISO8859-1/LC_MESSAGES/pfSense.po | 6 +++--- .../share/locale/tr/LC_MESSAGES/pfSense.mo | Bin 622886 -> 622886 bytes .../share/locale/tr/LC_MESSAGES/pfSense.po | 6 +++--- 7 files changed, 15 insertions(+), 15 deletions(-) diff --git a/etc/inc/gwlb.inc b/etc/inc/gwlb.inc index c5121feed1..e32bea0593 100644 --- a/etc/inc/gwlb.inc +++ b/etc/inc/gwlb.inc @@ -822,15 +822,15 @@ function return_gateway_groups_array() { $status = $gateways_status[$gwname]; $gwdown = false; if (stristr($status['status'], "down")) { - $msg = sprintf(gettext("MONITOR: %s is down, removing from routing group {$group['name']}"), $gwname); + $msg = sprintf(gettext("MONITOR: %s is down, omitting from routing group {$group['name']}"), $gwname); $gwdown = true; } else if (stristr($status['status'], "loss") && strstr($group['trigger'], "loss")) { /* packet loss */ - $msg = sprintf(gettext("MONITOR: %s has packet loss, removing from routing group {$group['name']}"), $gwname); + $msg = sprintf(gettext("MONITOR: %s has packet loss, omitting from routing group {$group['name']}"), $gwname); $gwdown = true; } else if (stristr($status['status'], "delay") && strstr($group['trigger'] , "latency")) { /* high latency */ - $msg = sprintf(gettext("MONITOR: %s has high latency, removing from routing group {$group['name']}"), $gwname); + $msg = sprintf(gettext("MONITOR: %s has high latency, omitting from routing group {$group['name']}"), $gwname); $gwdown = true; } if ($gwdown == true) { diff --git a/usr/local/share/locale/en/LC_MESSAGES/pfSense.pot b/usr/local/share/locale/en/LC_MESSAGES/pfSense.pot index 6c078b4ec1..994c66cc2c 100644 --- a/usr/local/share/locale/en/LC_MESSAGES/pfSense.pot +++ b/usr/local/share/locale/en/LC_MESSAGES/pfSense.pot @@ -4053,17 +4053,17 @@ msgstr "" #: etc/inc/gwlb.inc:501 etc/inc/gwlb.inc:727 etc/inc/gwlb.inc:750 #, php-format -msgid "MONITOR: %s is down, removing from routing group" +msgid "MONITOR: %s is down, omitting from routing group" msgstr "" #: etc/inc/gwlb.inc:505 etc/inc/gwlb.inc:731 etc/inc/gwlb.inc:754 #, php-format -msgid "MONITOR: %s has packet loss, removing from routing group" +msgid "MONITOR: %s has packet loss, omitting from routing group" msgstr "" #: etc/inc/gwlb.inc:509 etc/inc/gwlb.inc:735 etc/inc/gwlb.inc:758 #, php-format -msgid "MONITOR: %s has high latency, removing from routing group" +msgid "MONITOR: %s has high latency, omitting from routing group" msgstr "" #: etc/inc/gwlb.inc:526 etc/inc/gwlb.inc:752 etc/inc/gwlb.inc:775 diff --git a/usr/local/share/locale/ja/LC_MESSAGES/pfSense.po b/usr/local/share/locale/ja/LC_MESSAGES/pfSense.po index 4996218950..9f31876c71 100644 --- a/usr/local/share/locale/ja/LC_MESSAGES/pfSense.po +++ b/usr/local/share/locale/ja/LC_MESSAGES/pfSense.po @@ -4063,17 +4063,17 @@ msgstr "「モニターは%1$sのスタティックルートの取り外しと%2 #: etc/inc/gwlb.inc:501 etc/inc/gwlb.inc:727 etc/inc/gwlb.inc:750 #, php-format -msgid "MONITOR: %s is down, removing from routing group" +msgid "MONITOR: %s is down, omitting from routing group" msgstr "モニタ： %s 、グループをルーティングから取り出し、ダウンしている" #: etc/inc/gwlb.inc:505 etc/inc/gwlb.inc:731 etc/inc/gwlb.inc:754 #, php-format -msgid "MONITOR: %s has packet loss, removing from routing group" +msgid "MONITOR: %s has packet loss, omitting from routing group" msgstr "MONITOR ： %sは、ルーティンググループから除去し、パケット損失を有する" #: etc/inc/gwlb.inc:509 etc/inc/gwlb.inc:735 etc/inc/gwlb.inc:758 #, php-format -msgid "MONITOR: %s has high latency, removing from routing group" +msgid "MONITOR: %s has high latency, omitting from routing group" msgstr "モニタ： %s 、グループをルーティングから取り出し、大きな遅延がある" #: etc/inc/gwlb.inc:526 etc/inc/gwlb.inc:752 etc/inc/gwlb.inc:775 diff --git a/usr/local/share/locale/pt_BR.ISO8859-1/LC_MESSAGES/pfSense.mo b/usr/local/share/locale/pt_BR.ISO8859-1/LC_MESSAGES/pfSense.mo index 1b78823bfe87f09c49f9b3efafa869939be06f70..f7ec68759118d534a2d190d4d99a30f1dd4cf01d 100644 GIT binary patch delta 92 zcmbO|Uw!s`^@bM47N#xC1$C_XxtS#;)9=?YOHA*rW0pbVbMs{uE2QL?=jkYb6}AHv X0x=5^vjQ<25VHd@$M*YmoO=QQjD{t{ delta 92 zcmbO|Uw!s`^@bM47N#xC1$C@Nsk!-O)9=?YOHA*rW0pbVbMs{uE2QL?=jkYb6}AHv X0x=5^vjQ<25VHd@$M*YmoO=QQiSH%1 diff --git a/usr/local/share/locale/pt_BR.ISO8859-1/LC_MESSAGES/pfSense.po b/usr/local/share/locale/pt_BR.ISO8859-1/LC_MESSAGES/pfSense.po index 00693d06fe..a0b909a1b7 100644 --- a/usr/local/share/locale/pt_BR.ISO8859-1/LC_MESSAGES/pfSense.po +++ b/usr/local/share/locale/pt_BR.ISO8859-1/LC_MESSAGES/pfSense.po @@ -3681,17 +3681,17 @@ msgstr "Removendo regras est #: etc/inc/gwlb.inc:501 etc/inc/gwlb.inc:727 etc/inc/gwlb.inc:750 #, php-format -msgid "MONITOR: %s is down, removing from routing group" +msgid "MONITOR: %s is down, omitting from routing group" msgstr "MONITOR: %s no responde, removendo do grupo de roteamento" #: etc/inc/gwlb.inc:505 etc/inc/gwlb.inc:731 etc/inc/gwlb.inc:754 #, php-format -msgid "MONITOR: %s has packet loss, removing from routing group" +msgid "MONITOR: %s has packet loss, omitting from routing group" msgstr "MONITOR: %s tem perda de pacote, removendo de grupo de roteamento" #: etc/inc/gwlb.inc:509 etc/inc/gwlb.inc:735 etc/inc/gwlb.inc:758 #, php-format -msgid "MONITOR: %s has high latency, removing from routing group" +msgid "MONITOR: %s has high latency, omitting from routing group" msgstr "MONITOR: %s tem alta latncia, removendo de grupo de roteamento" #: etc/inc/gwlb.inc:526 etc/inc/gwlb.inc:752 etc/inc/gwlb.inc:775 diff --git a/usr/local/share/locale/tr/LC_MESSAGES/pfSense.mo b/usr/local/share/locale/tr/LC_MESSAGES/pfSense.mo index fe81cbec9b1a8326ae2135653b9d7e994202d6cd..9ec540bc13ae04137222e3ff4c52311afb9bc2c5 100644 GIT binary patch delta 82 zcmZ41q_(U{t)Ydng=q`(v`E(c+{}`a>9Zr5O%P0FzRY5Ul>G8M9R;v-J8Kj(5VHU= TD-g2*F*^`*Y-f$)R8$85ro9Zr5O%P0FzRY5Ul>G8M9R;v-J8Kj(5VHU= TD-g2*F*^`*Y-f$)R8$85q-hzz diff --git a/usr/local/share/locale/tr/LC_MESSAGES/pfSense.po b/usr/local/share/locale/tr/LC_MESSAGES/pfSense.po index 50d488429e..be209c033a 100644 --- a/usr/local/share/locale/tr/LC_MESSAGES/pfSense.po +++ b/usr/local/share/locale/tr/LC_MESSAGES/pfSense.po @@ -3671,17 +3671,17 @@ msgstr "" #: etc/inc/gwlb.inc:501 etc/inc/gwlb.inc:727 etc/inc/gwlb.inc:750 #, php-format -msgid "MONITOR: %s is down, removing from routing group" +msgid "MONITOR: %s is down, omitting from routing group" msgstr "İZLEME: %s kapalı, yönlendirme grubundan kaldırılıyor." #: etc/inc/gwlb.inc:505 etc/inc/gwlb.inc:731 etc/inc/gwlb.inc:754 #, php-format -msgid "MONITOR: %s has packet loss, removing from routing group" +msgid "MONITOR: %s has packet loss, omitting from routing group" msgstr "İZLEME: %s paket kaybı var, yönlendirme grubundan kaldırılıyor." #: etc/inc/gwlb.inc:509 etc/inc/gwlb.inc:735 etc/inc/gwlb.inc:758 #, php-format -msgid "MONITOR: %s has high latency, removing from routing group" +msgid "MONITOR: %s has high latency, omitting from routing group" msgstr "İZLEME: %s gecikme oranı yüksek, yönlendirme grubundan kaldırılıyor." #: etc/inc/gwlb.inc:526 etc/inc/gwlb.inc:752 etc/inc/gwlb.inc:775