summaryrefslogtreecommitdiffstats
path: root/po
diff options
context:
space:
mode:
authorGreg Cox <gcox@fibbsbozza.local>2014-07-29 18:52:12 -0400
committerGreg Cox <gcox@fibbsbozza.local>2014-07-29 18:52:12 -0400
commit4273dd06ff3e52094d6b267d00e8c51dd74de364 (patch)
tree425d127da5dbec7013999ed01b469fc3f72992d9 /po
parentf05e7016320f4671fbf86cc5abc277efea20f79e (diff)
parent6f3d5825b203b75aef8d68bf0d117e7a1a4c0616 (diff)
downloadmonitoring-plugins-4273dd06ff3e52094d6b267d00e8c51dd74de364.tar.gz
Merge remote-tracking branch 'upstream/master'
Conflicts: plugins/netutils.c
Diffstat (limited to 'po')
-rw-r--r--po/de.po4
-rw-r--r--po/fr.po4
-rw-r--r--po/monitoring-plugins.pot4
3 files changed, 6 insertions, 6 deletions
diff --git a/po/de.po b/po/de.po
index b9dd8f26..51551aef 100644
--- a/po/de.po
+++ b/po/de.po
@@ -1998,7 +1998,7 @@ msgstr ""
1998 1998
1999#: plugins/check_mrtg.c:359 1999#: plugins/check_mrtg.c:359
2000msgid "" 2000msgid ""
2001"packets/sec, etc. I use MRTG in conjuction with the Novell NLM that allows" 2001"packets/sec, etc. I use MRTG in conjunction with the Novell NLM that allows"
2002msgstr "" 2002msgstr ""
2003 2003
2004#: plugins/check_mrtg.c:360 2004#: plugins/check_mrtg.c:360
@@ -5360,7 +5360,7 @@ msgstr ""
5360 5360
5361#: plugins/check_ide_smart.c:441 5361#: plugins/check_ide_smart.c:441
5362#, c-format 5362#, c-format
5363msgid "ERROR - Status '%d' unkown. %d/%d tests passed\n" 5363msgid "ERROR - Status '%d' unknown. %d/%d tests passed\n"
5364msgstr "" 5364msgstr ""
5365 5365
5366#: plugins/check_ide_smart.c:474 5366#: plugins/check_ide_smart.c:474
diff --git a/po/fr.po b/po/fr.po
index 0537949f..d88dfe2e 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -2050,7 +2050,7 @@ msgstr ""
2050 2050
2051#: plugins/check_mrtg.c:359 2051#: plugins/check_mrtg.c:359
2052msgid "" 2052msgid ""
2053"packets/sec, etc. I use MRTG in conjuction with the Novell NLM that allows" 2053"packets/sec, etc. I use MRTG in conjunction with the Novell NLM that allows"
2054msgstr "" 2054msgstr ""
2055 2055
2056#: plugins/check_mrtg.c:360 2056#: plugins/check_mrtg.c:360
@@ -5448,7 +5448,7 @@ msgstr "OK - En fonctionnement (%d/%d les tests on été réussi)\n"
5448 5448
5449#: plugins/check_ide_smart.c:441 5449#: plugins/check_ide_smart.c:441
5450#, c-format 5450#, c-format
5451msgid "ERROR - Status '%d' unkown. %d/%d tests passed\n" 5451msgid "ERROR - Status '%d' unknown. %d/%d tests passed\n"
5452msgstr "ERREUR - État '%d' inconnu. %d/%d les tests on réussi\n" 5452msgstr "ERREUR - État '%d' inconnu. %d/%d les tests on réussi\n"
5453 5453
5454#: plugins/check_ide_smart.c:474 5454#: plugins/check_ide_smart.c:474
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
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