diff options
| author | Lorenz Kästle <12514511+RincewindsHat@users.noreply.github.com> | 2023-10-15 20:11:39 (GMT) |
|---|---|---|
| committer | Lorenz Kästle <12514511+RincewindsHat@users.noreply.github.com> | 2023-10-15 20:11:39 (GMT) |
| commit | ed0779102d8d86559d7db257da6cedfa8e10fca0 (patch) | |
| tree | ef52abcc3add2dd828db68ac32ceaa93902ba2dd | |
| parent | 685c2931dfc3cb67b7605eba143598512a66c037 (diff) | |
| download | monitoring-plugins-dev/check_ssh-patches.tar.gz | |
Remove merge conflict artefact from previous mergerefs/pull/1738/headdev/check_ssh-patches
| -rw-r--r-- | po/fr.po | 4 |
1 files changed, 1 insertions, 3 deletions
| @@ -5364,17 +5364,15 @@ msgstr "" | |||
| 5364 | msgid "The -v switch can be specified several times for increased verbosity." | 5364 | msgid "The -v switch can be specified several times for increased verbosity." |
| 5365 | msgstr "" | 5365 | msgstr "" |
| 5366 | 5366 | ||
| 5367 | <<<<<<< HEAD | ||
| 5368 | #, c-format | 5367 | #, c-format |
| 5369 | #~ msgid "Server answer: %s" | 5368 | #~ msgid "Server answer: %s" |
| 5370 | #~ msgstr "Réponse du serveur: %s" | 5369 | #~ msgstr "Réponse du serveur: %s" |
| 5371 | ======= | 5370 | |
| 5372 | #, fuzzy | 5371 | #, fuzzy |
| 5373 | #~ msgid "Check only filesystems of indicated type (may be repeated)" | 5372 | #~ msgid "Check only filesystems of indicated type (may be repeated)" |
| 5374 | #~ msgstr "" | 5373 | #~ msgstr "" |
| 5375 | #~ "Ignorer tout les systèmes de fichiers qui correspondent au type indiqué " | 5374 | #~ "Ignorer tout les systèmes de fichiers qui correspondent au type indiqué " |
| 5376 | #~ "(peut être utilisé plusieurs fois)" | 5375 | #~ "(peut être utilisé plusieurs fois)" |
| 5377 | >>>>>>> master | ||
| 5378 | 5376 | ||
| 5379 | #~ msgid "Path or partition (may be repeated)" | 5377 | #~ msgid "Path or partition (may be repeated)" |
| 5380 | #~ msgstr "Répertoire ou partition (peut être utilisé plusieurs fois)" | 5378 | #~ msgstr "Répertoire ou partition (peut être utilisé plusieurs fois)" |