diff options
author | Greg Cox <gcox@fibbsbozza.local> | 2014-07-29 18:52:12 -0400 |
---|---|---|
committer | Greg Cox <gcox@fibbsbozza.local> | 2014-07-29 18:52:12 -0400 |
commit | 4273dd06ff3e52094d6b267d00e8c51dd74de364 (patch) | |
tree | 425d127da5dbec7013999ed01b469fc3f72992d9 /po/monitoring-plugins.pot | |
parent | f05e7016320f4671fbf86cc5abc277efea20f79e (diff) | |
parent | 6f3d5825b203b75aef8d68bf0d117e7a1a4c0616 (diff) | |
download | monitoring-plugins-4273dd06ff3e52094d6b267d00e8c51dd74de364.tar.gz |
Merge remote-tracking branch 'upstream/master'
Conflicts:
plugins/netutils.c
Diffstat (limited to 'po/monitoring-plugins.pot')
-rw-r--r-- | po/monitoring-plugins.pot | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/po/monitoring-plugins.pot b/po/monitoring-plugins.pot index 07c1b98f..8f220e98 100644 --- a/po/monitoring-plugins.pot +++ b/po/monitoring-plugins.pot | |||
@@ -1944,7 +1944,7 @@ msgstr "" | |||
1944 | 1944 | ||
1945 | #: plugins/check_mrtg.c:359 | 1945 | #: plugins/check_mrtg.c:359 |
1946 | msgid "" | 1946 | msgid "" |
1947 | "packets/sec, etc. I use MRTG in conjuction with the Novell NLM that allows" | 1947 | "packets/sec, etc. I use MRTG in conjunction with the Novell NLM that allows" |
1948 | msgstr "" | 1948 | msgstr "" |
1949 | 1949 | ||
1950 | #: plugins/check_mrtg.c:360 | 1950 | #: plugins/check_mrtg.c:360 |
@@ -5217,7 +5217,7 @@ msgstr "" | |||
5217 | 5217 | ||
5218 | #: plugins/check_ide_smart.c:441 | 5218 | #: plugins/check_ide_smart.c:441 |
5219 | #, c-format | 5219 | #, c-format |
5220 | msgid "ERROR - Status '%d' unkown. %d/%d tests passed\n" | 5220 | msgid "ERROR - Status '%d' unknown. %d/%d tests passed\n" |
5221 | msgstr "" | 5221 | msgstr "" |
5222 | 5222 | ||
5223 | #: plugins/check_ide_smart.c:474 | 5223 | #: plugins/check_ide_smart.c:474 |