diff options
author | RincewindsHat <12514511+RincewindsHat@users.noreply.github.com> | 2023-09-05 13:24:12 (GMT) |
---|---|---|
committer | RincewindsHat <12514511+RincewindsHat@users.noreply.github.com> | 2023-09-05 13:24:12 (GMT) |
commit | a911d6877f10ac0287692cb431e714c4e3f27c84 (patch) | |
tree | d42eccf9d9f7af7a3630cccb6925f4589290a1b1 | |
parent | d3459f131e9a576fdf49a693923851843cf62e7d (diff) | |
parent | 88d668de7375610e9a70a5c5c70ee94539aa0866 (diff) | |
download | monitoring-plugins-a911d6877f10ac0287692cb431e714c4e3f27c84.tar.gz |
Merge branch 'master' into remove_translation_commentsrefs/pull/1912/head
-rw-r--r-- | .github/workflows/codeql-analysis.yml | 2 | ||||
-rw-r--r-- | .github/workflows/test.yml | 8 | ||||
-rw-r--r-- | plugins/check_radius.c | 2 | ||||
-rw-r--r-- | po/de.po | 4 | ||||
-rw-r--r-- | po/fr.po | 4 | ||||
-rw-r--r-- | po/monitoring-plugins.pot | 5 |
6 files changed, 12 insertions, 13 deletions
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 43b35d3..0317c8c 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml | |||
@@ -40,7 +40,7 @@ jobs: | |||
40 | 40 | ||
41 | steps: | 41 | steps: |
42 | - name: Checkout repository | 42 | - name: Checkout repository |
43 | uses: actions/checkout@v3 | 43 | uses: actions/checkout@v4 |
44 | 44 | ||
45 | # Initializes the CodeQL tools for scanning. | 45 | # Initializes the CodeQL tools for scanning. |
46 | - name: Initialize CodeQL | 46 | - name: Initialize CodeQL |
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 9c84acc..77b09f4 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml | |||
@@ -16,9 +16,9 @@ jobs: | |||
16 | runs-on: ubuntu-latest | 16 | runs-on: ubuntu-latest |
17 | steps: | 17 | steps: |
18 | - name: Checkout | 18 | - name: Checkout |
19 | uses: actions/checkout@v3 | 19 | uses: actions/checkout@v4 |
20 | - name: Codespell | 20 | - name: Codespell |
21 | uses: codespell-project/actions-codespell@master | 21 | uses: codespell-project/actions-codespell@v2 |
22 | with: | 22 | with: |
23 | skip: "./.git,./.gitignore,./ABOUT-NLS,*.po,./gl,./po,./tools/squid.conf,./build-aux/ltmain.sh" | 23 | skip: "./.git,./.gitignore,./ABOUT-NLS,*.po,./gl,./po,./tools/squid.conf,./build-aux/ltmain.sh" |
24 | ignore_words_list: allright,gord,didi,hda,nd,alis,clen,scrit,ser,fot,te,parm,isnt,consol,oneliners | 24 | ignore_words_list: allright,gord,didi,hda,nd,alis,clen,scrit,ser,fot,te,parm,isnt,consol,oneliners |
@@ -31,7 +31,7 @@ jobs: | |||
31 | # runs-on: ubuntu-latest | 31 | # runs-on: ubuntu-latest |
32 | # steps: | 32 | # steps: |
33 | # - name: Checkout | 33 | # - name: Checkout |
34 | # uses: actions/checkout@v3 | 34 | # uses: actions/checkout@v4 |
35 | # - name: Lint Code Base | 35 | # - name: Lint Code Base |
36 | # uses: github/super-linter@v5.0.0 | 36 | # uses: github/super-linter@v5.0.0 |
37 | # env: | 37 | # env: |
@@ -57,7 +57,7 @@ jobs: | |||
57 | #... | 57 | #... |
58 | steps: | 58 | steps: |
59 | - name: Git clone repository | 59 | - name: Git clone repository |
60 | uses: actions/checkout@v3 | 60 | uses: actions/checkout@v4 |
61 | #- name: Setup tmate session, see https://github.com/marketplace/actions/debugging-with-tmate | 61 | #- name: Setup tmate session, see https://github.com/marketplace/actions/debugging-with-tmate |
62 | # uses: mxschmitt/action-tmate@v3 | 62 | # uses: mxschmitt/action-tmate@v3 |
63 | - name: Run the tests on ${{ matrix.distro }} | 63 | - name: Run the tests on ${{ matrix.distro }} |
diff --git a/plugins/check_radius.c b/plugins/check_radius.c index 984aa37..b1b4938 100644 --- a/plugins/check_radius.c +++ b/plugins/check_radius.c | |||
@@ -381,7 +381,7 @@ print_help (void) | |||
381 | printf ("\n"); | 381 | printf ("\n"); |
382 | printf ("%s\n", _("This plugin tests a RADIUS server to see if it is accepting connections.")); | 382 | printf ("%s\n", _("This plugin tests a RADIUS server to see if it is accepting connections.")); |
383 | printf ("%s\n", _("The server to test must be specified in the invocation, as well as a user")); | 383 | printf ("%s\n", _("The server to test must be specified in the invocation, as well as a user")); |
384 | printf ("%s\n", _("name and password. A configuration file may also be present. The format of")); | 384 | printf ("%s\n", _("name and password. A configuration file must be present. The format of")); |
385 | printf ("%s\n", _("the configuration file is described in the radiusclient library sources.")); | 385 | printf ("%s\n", _("the configuration file is described in the radiusclient library sources.")); |
386 | printf ("%s\n", _("The password option presents a substantial security issue because the")); | 386 | printf ("%s\n", _("The password option presents a substantial security issue because the")); |
387 | printf ("%s\n", _("password can possibly be determined by careful watching of the command line")); | 387 | printf ("%s\n", _("password can possibly be determined by careful watching of the command line")); |
@@ -9,7 +9,7 @@ msgid "" | |||
9 | msgstr "" | 9 | msgstr "" |
10 | "Project-Id-Version: nagiosplug\n" | 10 | "Project-Id-Version: nagiosplug\n" |
11 | "Report-Msgid-Bugs-To: devel@monitoring-plugins.org\n" | 11 | "Report-Msgid-Bugs-To: devel@monitoring-plugins.org\n" |
12 | "POT-Creation-Date: 2023-09-04 13:34+0200\n" | 12 | "POT-Creation-Date: 2023-09-05 00:31+0200\n" |
13 | "PO-Revision-Date: 2004-12-23 17:46+0100\n" | 13 | "PO-Revision-Date: 2004-12-23 17:46+0100\n" |
14 | "Last-Translator: <>\n" | 14 | "Last-Translator: <>\n" |
15 | "Language-Team: English <en@li.org>\n" | 15 | "Language-Team: English <en@li.org>\n" |
@@ -3410,7 +3410,7 @@ msgid "" | |||
3410 | msgstr "" | 3410 | msgstr "" |
3411 | 3411 | ||
3412 | msgid "" | 3412 | msgid "" |
3413 | "name and password. A configuration file may also be present. The format of" | 3413 | "name and password. A configuration file must be present. The format of" |
3414 | msgstr "" | 3414 | msgstr "" |
3415 | 3415 | ||
3416 | msgid "" | 3416 | msgid "" |
@@ -10,7 +10,7 @@ msgid "" | |||
10 | msgstr "" | 10 | msgstr "" |
11 | "Project-Id-Version: fr\n" | 11 | "Project-Id-Version: fr\n" |
12 | "Report-Msgid-Bugs-To: devel@monitoring-plugins.org\n" | 12 | "Report-Msgid-Bugs-To: devel@monitoring-plugins.org\n" |
13 | "POT-Creation-Date: 2023-09-04 13:34+0200\n" | 13 | "POT-Creation-Date: 2023-09-05 00:31+0200\n" |
14 | "PO-Revision-Date: 2010-04-21 23:38-0400\n" | 14 | "PO-Revision-Date: 2010-04-21 23:38-0400\n" |
15 | "Last-Translator: Thomas Guyot-Sionnest <dermoth@aei.ca>\n" | 15 | "Last-Translator: Thomas Guyot-Sionnest <dermoth@aei.ca>\n" |
16 | "Language-Team: Nagios Plugin Development Mailing List <nagiosplug-" | 16 | "Language-Team: Nagios Plugin Development Mailing List <nagiosplug-" |
@@ -3498,7 +3498,7 @@ msgid "" | |||
3498 | msgstr "" | 3498 | msgstr "" |
3499 | 3499 | ||
3500 | msgid "" | 3500 | msgid "" |
3501 | "name and password. A configuration file may also be present. The format of" | 3501 | msgid "name and password. A configuration file must be present. The format of" |
3502 | msgstr "" | 3502 | msgstr "" |
3503 | 3503 | ||
3504 | msgid "" | 3504 | msgid "" |
diff --git a/po/monitoring-plugins.pot b/po/monitoring-plugins.pot index d1562d2..6efafef 100644 --- a/po/monitoring-plugins.pot +++ b/po/monitoring-plugins.pot | |||
@@ -8,7 +8,7 @@ msgid "" | |||
8 | msgstr "" | 8 | msgstr "" |
9 | "Project-Id-Version: PACKAGE VERSION\n" | 9 | "Project-Id-Version: PACKAGE VERSION\n" |
10 | "Report-Msgid-Bugs-To: devel@monitoring-plugins.org\n" | 10 | "Report-Msgid-Bugs-To: devel@monitoring-plugins.org\n" |
11 | "POT-Creation-Date: 2023-09-04 13:34+0200\n" | 11 | "POT-Creation-Date: 2023-09-05 15:21+0200\n" |
12 | "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" | 12 | "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" |
13 | "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" | 13 | "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" |
14 | "Language-Team: LANGUAGE <LL@li.org>\n" | 14 | "Language-Team: LANGUAGE <LL@li.org>\n" |
@@ -3300,8 +3300,7 @@ msgid "" | |||
3300 | "The server to test must be specified in the invocation, as well as a user" | 3300 | "The server to test must be specified in the invocation, as well as a user" |
3301 | msgstr "" | 3301 | msgstr "" |
3302 | 3302 | ||
3303 | msgid "" | 3303 | msgid "name and password. A configuration file must be present. The format of" |
3304 | "name and password. A configuration file may also be present. The format of" | ||
3305 | msgstr "" | 3304 | msgstr "" |
3306 | 3305 | ||
3307 | msgid "" | 3306 | msgid "" |