Merge pull request #209 from matsduf/merge-develop-into-master

Merge develop into master (CLI)

.github/pull_request_template.md

@@ -0,0 +1,15 @@
+## Purpose
+
+This PR...
+
+## Context
+
+(e.g. Fixes #9999, Follow-up to #9999, etc.)
+
+## Changes
+
+...
+
+## How to test this PR
+
+...

.gitignore

@@ -18,5 +18,8 @@ pod2htm*.tmp
 pm_to_blib
 Zonemaster-CLI-*
 Zonemaster-CLI-*.tar.gz
-*.bak
 share/Zonemaster-CLI.pot
+
+# Emacs and other backup files
+*.bak
+*~

CONTRIBUTING.md

@@ -0,0 +1,30 @@
+# Contributing to Zonemaster::CLI
+
+Contribution to this repository is welcome. Contribution can be either an issue
+report or a code or a documentation update. Also see the information in the
+[main README][Zonemaster/Zonemaster README] in the main Zonemaster respository.
+
+## Issue
+
+First search for a similar issue in the [issues list]. If a relevant issue is
+found, add your information as a comment. If no relevant issue is found, create
+[a new issue][create issue]. Give as many details as you have and describe, if
+possible, how the issue can be reproduced.
+
+## Pull request
+
+If you would like to contribute an update, first please look for issues and open
+[pull requests] that are about the same thing. If nothing relevant is found or
+you have a different solution, create [a new pull request][create pull request].
+Creating a pull request assumes that you have your proposal in a fork repository.
+
+When you create a pull request, please always start with the `develop` branch
+and create the pull request against the same branch.
+
+
+[issues list]:                        https://github.com/zonemaster/zonemaster-cli/issues
+[create issue]:                       https://github.com/zonemaster/zonemaster-cli/issues/new
+[pull requests]:                      https://github.com/zonemaster/zonemaster-cli/pulls
+[create pull request]:                https://github.com/zonemaster/zonemaster-cli/compare
+[Zonemaster/Zonemaster README]:       https://github.com/zonemaster/zonemaster#readme
+

Changes

@@ -1,5 +1,16 @@
 Release history for Zonemaster component Zonemaster-CLI 
 
+v3.1.0 2021-05-28 (public release version)
+
+ [Features]
+ - Adds Finnish translation (PO file) (#192, #191)
+
+ [Fixes]
+ - Updates the installation instructions (#193, #191)
+ - Updates translations (#204, #201, #205, #200,
+   #207, #202)
+
+
 v3.0.4 2021-02-10 (public release version)
 
  [Features]

MANIFEST

@@ -1,4 +1,5 @@
 Changes
+CONTRIBUTING.md
 docs/Installation.md
 inc/Module/Install.pm
 inc/Module/Install/Base.pm
@@ -22,8 +23,9 @@ script/zonemaster-info
 share/GNUmakefile
 share/Makefile
 share/locale/da/LC_MESSAGES/Zonemaster-CLI.mo
+share/locale/fi/LC_MESSAGES/Zonemaster-CLI.mo
 share/locale/fr/LC_MESSAGES/Zonemaster-CLI.mo
-share/locale/sv/LC_MESSAGES/Zonemaster-CLI.mo
 share/locale/nb/LC_MESSAGES/Zonemaster-CLI.mo
+share/locale/sv/LC_MESSAGES/Zonemaster-CLI.mo
 t/00-load.t
 USING.md

MANIFEST.SKIP

@@ -10,6 +10,9 @@
 ^share/[^/]*\.mo$
 ^share/Zonemaster-CLI.pot$
 
+# Exclude Github control files
+^\.github/
+
 #!start included /usr/share/perl/5.20/ExtUtils/MANIFEST.SKIP
 # Avoid version control files.
 \bRCS\b

Makefile.PL

@@ -23,8 +23,8 @@ requires(
     'Net::Interface'     => 0,
     'MooseX::Getopt'     => 0,
     'Text::Reflow'       => 0,
-    'Zonemaster::Engine' => 4.001,
-    'Zonemaster::LDNS'   => 2.001,
+    'Zonemaster::Engine' => 4.002,
+    'Zonemaster::LDNS'   => 2.002,
 );
 
 # Make all platforms include inc/Module/Install/External.pm

docs/Installation.md

@@ -76,14 +76,15 @@ This instruction covers the following operating systems:
 1) Update configuration of "locale"
 
    ```sh
-   sudo perl -pi -e 's/^# (da_DK\.UTF-8.*|en_US\.UTF-8.*|fr_FR\.UTF-8.*|nb_NO\.UTF-8.*|sv_SE\.UTF-8.*)/$1/' /etc/locale.gen
+   sudo perl -pi -e 's/^# (da_DK\.UTF-8.*|en_US\.UTF-8.*|fi_FI\.UTF-8.*|fr_FR\.UTF-8.*|nb_NO\.UTF-8.*|sv_SE\.UTF-8.*)/$1/' /etc/locale.gen
    sudo locale-gen
    ```
 
    After the update, `locale -a` should at least list the following locales:
    ```
    da_DK.utf8
    en_US.utf8
+   fi_FI.utf8
    fr_FR.utf8
    nb_NO.utf8
    sv_SE.utf8

lib/Zonemaster/CLI.pm

@@ -11,7 +11,7 @@ use 5.014002;
 use strict;
 use warnings;
 
-use version; our $VERSION = version->declare( "v3.0.4" );
+use version; our $VERSION = version->declare( "v3.1.0" );
 
 use Locale::TextDomain 'Zonemaster-CLI';
 use Moose;

share/da.po

@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.0.5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-10-28 19:25+0100\n"
+"POT-Creation-Date: 2021-05-28 08:45+0000\n"
 "PO-Revision-Date: 2019-07-08\n"
 "Last-Translator: [email protected]\n"
 "Language-Team: Zonemaster Team\n"
@@ -14,37 +14,54 @@ msgstr ""
 msgid "Print version information and exit."
 msgstr "Udskriv version og afbryd."
 
-msgid "The minimum severity level to display"
-msgstr "Det mindste alvorlighedsniveau som skal udskrives."
+msgid ""
+"The minimum severity level to display. Must be one of CRITICAL, ERROR, "
+"WARNING, NOTICE, INFO or DEBUG."
+msgstr ""
+"Det mindste alvorlighedsniveau skal være enten CRITICAL, ERROR, "
+"WARNING, NOTICE, INFO eller DEBUG."
 
 msgid "The locale to use for messages translation."
 msgstr "Det 'locale' som skal bruges ved oversættelse af beskeder."
 
 msgid "Flag indicating if output should be in JSON or not."
-msgstr "Flag der beskriver om format er JSON eller ej."
+msgstr "Flag angiver om output-format skal være JSON eller ej."
+
+msgid "Flag indicating if output should be streaming JSON or not."
+msgstr "Flag angiver om output-format skal være streaming JSON eller ej."
+
+msgid ""
+"Flag indicating if streaming JSON output should include the translated "
+"message of the tag or not."
+msgstr ""
+"Flag angiver om streaming JSON-output skal inkludere den oversatte "
+"besked af tag'et eller ej."
 
 msgid ""
 "Flag indicating if output should be translated to human language or dumped "
 "raw."
 msgstr ""
-"Flag der beskriver om resultatet skal oversættes til menneskesprog eller "
+"Flag angiver om output'et skal oversættes til menneskesprog eller "
 "vises i råt format."
 
 msgid "Print timestamp on entries."
-msgstr "Udskriv tidsstempler."
+msgstr "Udskriv tidsstempler på poster."
 
 msgid "Print level on entries."
-msgstr "Udskriv alvorlighedsniveauer."
+msgstr "Udskriv alvorlighedsniveauer på poster."
 
 msgid "Print the name of the module on entries."
-msgstr "Udskriv modulets navn."
+msgstr "Udskriv modulets navn på poster."
+
+msgid "Print the name of the test case on entries."
+msgstr "Udskriv navnet på testcasen på poster."
 
 msgid ""
-"A name/ip string giving a nameserver for undelegated tests. Can be given "
-"multiple times."
+"A name/ip string giving a nameserver for undelegated tests, or just a name "
+"which will be looked up for IP addresses. Can be given multiple times."
 msgstr ""
-"Et navn/ip-adresse som angiver navneserveren til prædelegerede test. Kan "
-"anføres flere gange."
+"Et navn/IP-adresse som angiver navneserveren til prædelegerede test eller "
+"blot et navn, som vil blive oversat til IP-adresser. Kan anføres flere gange."
 
 msgid "Name of a file to save DNS data to after running tests."
 msgstr "Filnavn indeholdende DNS-data efter udførte test."
@@ -73,29 +90,27 @@ msgid ""
 "Specify test to run. Should be either the name of a module, or the name of a "
 "module and the name of a method in that module separated by a \"/\" "
 "character (Example: \"Basic/basic1\"). The method specified must be one that "
-"takes a zone object as its single argument. This switch can be repeated"
+"takes a zone object as its single argument. This switch can be repeated."
 msgstr ""
-"Angiv test som skal afvikles. Skal være enten et modulnavn, et modulnavn og "
-"navnet op en metode i modulet adskilt af en skråstreg (Eksempel: \"Basic/"
+"Angiver test som skal afvikles. Skal enten være et modulnavn eller et modulnavn "
+"og navnet på en metode i modulet adskilt af en skråstreg (Eksempel: \"Basic/"
 "basic1\"). Den valgte metode skal tage en enkelt zone som argument. Dette "
 "flag kan gentages."
 
 msgid ""
-"As soon as a message at this level or higher is logged, execution will stop"
+"As soon as a message at this level or higher is logged, execution will stop. "
+"Must be one of CRITICAL, ERROR, WARNING, NOTICE, INFO or DEBUG."
 msgstr ""
-"Afbryd testkørslen, så snart en hændelse med dette niveau eller højere er "
-"logget."
-
-msgid "DEPRECATED, use profile instead."
-msgstr "FORÆLDET, brug profil i stedet for."
+"Så snart en hændelse med dette niveau eller højere logges, vil kørslen "
+"afbrydes. Skal være enten CRITICAL, ERROR, WARNING, NOTICE, INFO eller DEBUG."
 
 msgid "Name of profile file to load. (DEFAULT)"
 msgstr "Navn på profil-fil, der skal indlæses. (STANDARD)"
 
-msgid "Name of configuration file to load. (DEPRECATED)"
+msgid "Name of configuration file to load. (TERMINATED)"
 msgstr "Navn på konfigurations-fil, der skal indlæses. (FORÆLDET)"
 
-msgid "Name of policy file to load. (DEPRECATED)"
+msgid "Name of policy file to load. (TERMINATED)"
 msgstr "Navn på policy-fil, der skal indlæses. (FORÆLDET)"
 
 msgid "Strings with DS data on the form \"keytag,algorithm,type,digest\""
@@ -104,6 +119,13 @@ msgstr "En streng med DS-data i formatet \"keytag,algorithm,type,digest\""
 msgid "Print a count of the number of messages at each level"
 msgstr "Udskriv antallet af registrerede beskeder på hvert niveau."
 
+msgid ""
+"Boolean flag for activity indicator. Defaults to on if STDOUT is a tty, off "
+"if it is not. Disable with --noprogress."
+msgstr ""
+"Boolsk flag til aktivitetsindikator. Aktiveret hvis STDOUT er en tty, "
+"ellers deaktiveret. Deaktiver med --noprogress."
+
 msgid "Name of the character encoding used for command line arguments"
 msgstr "Navn på tegnkodningen, der skal anvendes for kommandolinje-argumenter."
 
@@ -118,36 +140,74 @@ msgid "Print the effective profile used in JSON format, then exit."
 msgstr "Udskriv den effektive profil benyttet i JSON-format, og afslut."
 
 msgid ""
-"Boolean flag for activity indicator. Defaults to on if STDOUT is a tty, off "
-"if it is not."
+"Print the effective configuration used in JSON format, then exit. "
+"(TERMINATED)"
 msgstr ""
-"Flag der fortæller, om en aktivitetsindikator skal anvendes. Udskrives, hvis "
-"STDOUT er en tty, ellers ikke."
+"Udskriv den effektive konfiguration benyttet i JSON-format, og afslut. "
+"(FORÆLDET)"
 
-msgid "Must give the name of a domain to test.\n"
-msgstr "Domænenavn, der skal testes, skal angives.\n"
+msgid "Print the effective policy used in JSON format, then exit. (TERMINATED)"
+msgstr ""
+"Udskriv den effektive policy benyttet i JSON-format, og afslut. (FORÆLDET)"
 
 msgid ""
 "Local IP address that the test engine should try to send its requests from."
-msgstr "Lokal IP-adresse som test-motoren skal sende sin foresgpørgsler fra."
+msgstr ""
+"Lokal IP-adresse som test-motoren skal sende sin foresgpørgsler fra."
+
+#, perl-format
+msgid ""
+"Warning: setting locale category LC_MESSAGES to %s failed (is it installed "
+"on this system?).\n"
+"\n"
+msgstr ""
+"Advarsel: Kunne ikke sætte locale kategori LC_MESSAGES til %s "
+"(er det installeret på dette system?).\n"
+
+#, perl-format
+msgid ""
+"Warning: setting locale category LC_CTYPE to %s failed (is it installed on "
+"this system?).\n"
+"\n"
+msgstr ""
+"Advarsel: Kunne ikke sætte locale kategori LC_CTYPE til %s "
+"(er det installeret på dette system?).\n"
+
+#, perl-brace-format
+msgid "Address {address} cannot be used as source address for DNS queries.\n"
+msgstr "Adressen {address} kan ikke bruges som source adresse for "
+"DNS-forespørgsler.\n"
+
+#, perl-brace-format
+msgid "Loading profile from {path}."
+msgstr "Indlæser policy fra {path}."
 
 #, perl-brace-format
 msgid "Loading policy from {path}."
 msgstr "Indlæser policy fra {path}."
 
+msgid "Use of config and policy have been TERMINATED, use profile instead."
+msgstr "Brug af config og policy er blevet UDFASET, brug profile i stedet."
+
 #, perl-brace-format
 msgid "Loading configuration from {path}."
 msgstr "Indlæser konfiguration fra {path}."
 
+msgid "TERMINATED, use dump_profile instead."
+msgstr "FORÆLDET, brug dump_profile i stedet for."
+
 msgid "Failed to recognize stop level '"
 msgstr "Ukendt afslutningsniveau '"
 
 msgid ""
 "--level must be one of CRITICAL, ERROR, WARNING, NOTICE, INFO, DEBUG, DEBUG2 "
 "or DEBUG3.\n"
 msgstr ""
-"--level skal være et af CRITICAL, ERROR, WARNING, NOTICE, INFO, DEBUG, "
-"DEBUG2 or DEBUG3.\n"
+"--level skal være enten CRITICAL, ERROR, WARNING, NOTICE, INFO, DEBUG, "
+"DEBUG2 eller DEBUG3.\n"
+
+msgid "Must give the name of a domain to test.\n"
+msgstr "Domænenavn, der skal testes, skal angives.\n"
 
 msgid "Seconds "
 msgstr "Sekunder "
@@ -158,6 +218,9 @@ msgstr "Niveau    "
 msgid "Module       "
 msgstr "Modul        "
 
+msgid "Testcase       "
+msgstr "Testcase       "
+
 msgid "Message"
 msgstr "Besked"
 
@@ -170,6 +233,9 @@ msgstr "========= "
 msgid "============ "
 msgstr "============ "
 
+msgid "============== "
+msgstr "============== "
+
 msgid "======="
 msgstr "======="
 
@@ -196,24 +262,6 @@ msgstr ""
 "Advarser: Zonemaster::LDNS er ikke kompileret med libidn, kan derfor ikke "
 "benytte ikke-ASCII navne."
 
-msgid ""
-"Warning: setting locale %s failed (is it installed on this system?).\n"
-"\n"
-msgstr ""
-"Advarsel: Kunne ikke sætte locale %s (er det installeret på systemet?).\n"
-"\n"
-
-msgid ""
-"Print the effective configuration used in JSON format, then exit. "
-"(DEPRECATED)"
-msgstr ""
-"Udskriv den effektive konfiguration benyttet i JSON-format, og afslut. "
-"(FORÆLDET)"
-
-msgid "Print the effective policy used in JSON format, then exit. (DEPRECATED)"
-msgstr ""
-"Udskriv den effektive policy benyttet i JSON-format, og afslut. (FORÆLDET)"
-
 msgid "DEBUG"
 msgstr "FEJLSØG"