summaryrefslogtreecommitdiffstats
path: root/po/monitoring-plugins.pot
diff options
context:
space:
mode:
authorGreg Cox <gcox@fibbsbozza.local>2014-07-29 22:52:12 (GMT)
committerGreg Cox <gcox@fibbsbozza.local>2014-07-29 22:52:12 (GMT)
commit4273dd06ff3e52094d6b267d00e8c51dd74de364 (patch)
tree425d127da5dbec7013999ed01b469fc3f72992d9 /po/monitoring-plugins.pot
parentf05e7016320f4671fbf86cc5abc277efea20f79e (diff)
parent6f3d5825b203b75aef8d68bf0d117e7a1a4c0616 (diff)
downloadmonitoring-plugins-4273dd0.tar.gz
Merge remote-tracking branch 'upstream/master'refs/pull/1257/head
Conflicts: plugins/netutils.c
Diffstat (limited to 'po/monitoring-plugins.pot')
-rw-r--r--po/monitoring-plugins.pot4
1 files changed, 2 insertions, 2 deletions
diff --git a/po/monitoring-plugins.pot b/po/monitoring-plugins.pot
index 07c1b98..8f220e9 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
1946msgid "" 1946msgid ""
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"
1948msgstr "" 1948msgstr ""
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
5220msgid "ERROR - Status '%d' unkown. %d/%d tests passed\n" 5220msgid "ERROR - Status '%d' unknown. %d/%d tests passed\n"
5221msgstr "" 5221msgstr ""
5222 5222
5223#: plugins/check_ide_smart.c:474 5223#: plugins/check_ide_smart.c:474