fix some .po msgid errors, add chk-po script

8 files changed, 58 insertions, 36 deletions

diff --git a/chk-po b/chk-po
new file mode 100755
index 0000000..63341fe
--- /dev/null
+++ b/chk-po
@@ -0,0 +1,22 @@
+#!/usr/bin/bash
+
+# Checks that all msgid strings in .po files are identical in the remove-old-kernels script.
+# On error, the string in the offending .po file is printed out.
+
+clear
+for pofile in po/*; do
+	echo "Checking - ${pofile}"
+	while read line ; do
+	    #echo $line
+		findstr="$(echo "$line" | grep 'msgid'|cut -d'"' -f2)"
+		# Skip these two strings as they include a variable in the script.
+		if echo "$findstr"|grep -q "that would be used"; then
+			continue
+		fi
+		if ! fgrep -q "$findstr" remove-old-kernels; then
+			echo "${pofile} - ${findstr}"
+		fi
+	done < "${pofile}"
+#	echo ""
+done
+	
diff --git a/po/de_DE.UTF-8.po b/po/de_DE.UTF-8.po
index f68f661..13cb741 100644
--- a/po/de_DE.UTF-8.po
+++ b/po/de_DE.UTF-8.po
@@ -116,14 +116,14 @@ msgstr ", durch die dnf 'installonly_limit' Einstellung in /etc/dnf/dnf.conf"
 msgid  "FATAL: Has the running kernel been uninstalled since last boot? - Aborting."
 msgstr "FATAL: Wurde der laufende Kernel seit dem letzten Start deinstalliert? - Abbruch."
 
-msgid  "Usage: <remove-old kernels|rok> [-a] [-A <1|0>] [-c] [-t] [-f 0-9] [-F 0-9] [-n number] [-N number] [-p] [-q] [-Q 0|1][-l] [-m] [-v] [-h|-?]"
+msgid  "Usage: <remove-old kernels|rok> [-a] [-A 0|1] [-c] [-t] [-f 0-9] [-F 0-9] [-n number] [-N number] [-p] [-q] [-Q 0|1][-l] [-m] [-v] [-h|-?]"
 msgstr "Verwendung: <remove-old kernels|rok> [-a] [-A <1|0>] [-c] [-t] [-f 0-9] [-F 0-9] [-n Anzahl] [-N Anzahl] [-p] [-q] [-Q 0|1][-l] [-m] [-v] [-h|-?]"
 
 msgid  "    -a = automatic, no questions. Interactive if not specified. (must be root)"
 msgstr "    -a = Automatisch, keine Fragen. Interaktiv, falls nicht angegeben. (muss root sein)"
 
-msgid  "    -A value = y or n to turn ON or OFF automatic weekly removal of kernels. (e.g. -A1)"
-msgstr "    -A Wert = y oder n, um die automatische wöchentliche Entfernung von Kerneln ein- oder auszuschalten. (zB -A1)"
+msgid  "    -A value = 1 or 0 to turn ON or OFF automatic weekly removal of kernels. (e.g. -A1"
+msgstr "    -A Wert = 1 oder 0, um die automatische wöchentliche Entfernung von Kerneln ein- oder auszuschalten. (zB -A1)"
 
 msgid  "    -c = as automatic but also checks for CRON=1 in the cfg file or exits. (must be root)"
 msgstr "    -c = wie automatisch, prüft aber auch auf CRON=1 in der cfg-Datei oder beendet sich. (muss root sein)"
@@ -149,7 +149,7 @@ msgstr "    -p = Vorschau der urpme-Befehle, die verwendet werden würden."
 msgid  "    -q = advanced mode, this time only - see man page."
 msgstr "    -q = Erweiterter Modus, diesmal nur - siehe Manpage."
 
-msgid  "    -Q value = 1 or 0 (1 = ON) advanced mode, persistent. (e.g. -Q 1)"
+msgid  "    -Q value = 1 or 0 (1 = ON) advanced mode, persistent. (e.g. -Q1)"
 msgstr "    -Q Wert = 1 oder 0 (1 = EIN) erweiterter Modus, dauerhaft. (zB -Q 1)"
 
 msgid  "    -l = list the last 1000 lines of the log."
diff --git a/po/en_GB.UTF-8.po b/po/en_GB.UTF-8.po
index 9ad80d1..b5c1557 100644
--- a/po/en_GB.UTF-8.po
+++ b/po/en_GB.UTF-8.po
@@ -47,8 +47,8 @@ msgid  "y/N/i (i=confirm for each)"
 msgstr "y/N/i (y=yes N=no i=confirm for each)"
 
 # Only translate "yes", "no" and "quit"
-msgid  "y/N/q  (q=quit)"
-msgstr "y/N/q  (y=yes N=no q=quit)"
+msgid  "y/N/q (q=quit)"
+msgstr "y/N/q (y=yes N=no q=quit)"
 
 msgid  "interactive"
 msgstr "interactive"
@@ -116,8 +116,8 @@ msgstr ", by the dnf 'installonly_limit' set in /etc/dnf/dnf.conf"
 msgid  "FATAL: Has the running kernel been uninstalled since last boot? - Aborting."
 msgstr "FATAL: Has the running kernel been uninstalled since last boot? - Aborting."
 
-msgid  "Usage: <remove-old kernels|rok> [-a] [-A <1|0>] [-c] [-t] [-f 0-9] [-F 0-9] [-n number] [-N number] [-p] [-q] [-Q 0|1][-l] [-m] [-v] [-h|-?]"
-msgstr "Usage: <remove-old kernels|rok> [-a] [-A <1|0>] [-c] [-t] [-f 0-9] [-F 0-9] [-n number] [-N number] [-p] [-q] [-Q 0|1][-l] [-m] [-v] [-h|-?]"
+msgid  "Usage: <remove-old kernels|rok> [-a] [-A 0|1] [-c] [-t] [-f 0-9] [-F 0-9] [-n number] [-N number] [-p] [-q] [-Q 0|1][-l] [-m] [-v] [-h|-?]"
+msgstr "Usage: <remove-old kernels|rok> [-a] [-A 0|1] [-c] [-t] [-f 0-9] [-F 0-9] [-n number] [-N number] [-p] [-q] [-Q 0|1][-l] [-m] [-v] [-h|-?]"
 
 msgid  "    -a = automatic, no questions. Interactive if not specified. (must be root)"
 msgstr "    -a = automatic, no questions. Interactive if not specified. (must be root)"
@@ -149,8 +149,8 @@ msgstr "    -p = preview the urpme commands which would be used."
 msgid  "    -q = advanced mode, this time only - see man page."
 msgstr "    -q = advanced mode, this time only - see man page."
 
-msgid  "    -Q value = 1 or 0 (1 = ON) advanced mode, persistent. (e.g. -Q 1)"
-msgstr "    -Q value = 1 or 0 (1 = ON) advanced mode, persistent. (e.g. -Q 1)"
+msgid  "    -Q value = 1 or 0 (1 = ON) advanced mode, persistent. (e.g. -Q1)"
+msgstr "    -Q value = 1 or 0 (1 = ON) advanced mode, persistent. (e.g. -Q1))"
 
 msgid  "    -l = list the last 1000 lines of the log."
 msgstr "    -l = list the last 1000 lines of the log."
diff --git a/po/en_US.UTF-8.po b/po/en_US.UTF-8.po
index 7c91251..a934c71 100644
--- a/po/en_US.UTF-8.po
+++ b/po/en_US.UTF-8.po
@@ -47,8 +47,8 @@ msgid  "y/N/i (i=confirm for each)"
 msgstr "y/N/i (y=yes N=no i=confirm for each)"
 
 # Only translate "yes", "no" and "quit"
-msgid  "y/N/q  (q=quit)"
-msgstr "y/N/q  (q=quit)"
+msgid  "y/N/q (q=quit)"
+msgstr "y/N/q (q=quit)"
 
 msgid  "interactive"
 msgstr "interactive"
@@ -116,8 +116,8 @@ msgstr ", by the dnf 'installonly_limit' set in /etc/dnf/dnf.conf"
 msgid  "FATAL: Has the running kernel been uninstalled since last boot? - Aborting."
 msgstr "FATAL: Has the running kernel been uninstalled since last boot? - Aborting."
 
-msgid  "Usage: <remove-old kernels|rok> [-a] [-A <1|0>] [-c] [-t] [-f 0-9] [-F 0-9] [-n number] [-N number] [-p] [-q] [-Q 0|1][-l] [-m] [-v] [-h|-?]"
-msgstr "Usage: <remove-old kernels|rok> [-a] [-A <1|0>] [-c] [-t] [-f 0-9] [-F 0-9] [-n number] [-N number] [-p] [-q] [-Q 0|1][-l] [-m] [-v] [-h|-?]"
+msgid  "Usage: <remove-old kernels|rok> [-a] [-A 0|1] [-c] [-t] [-f 0-9] [-F 0-9] [-n number] [-N number] [-p] [-q] [-Q 0|1][-l] [-m] [-v] [-h|-?]"
+msgstr "Usage: <remove-old kernels|rok> [-a] [-A 0|1] [-c] [-t] [-f 0-9] [-F 0-9] [-n number] [-N number] [-p] [-q] [-Q 0|1][-l] [-m] [-v] [-h|-?]"
 
 msgid  "    -a = automatic, no questions. Interactive if not specified. (must be root)"
 msgstr "    -a = automatic, no questions. Interactive if not specified. (must be root)"
@@ -149,8 +149,8 @@ msgstr "    -p = preview the urpme commands which would be used."
 msgid  "    -q = advanced mode, this time only - see man page."
 msgstr "    -q = advanced mode, this time only - see man page."
 
-msgid  "    -Q value = 1 or 0 (1 = ON) advanced mode, persistent. (e.g. -Q 1)"
-msgstr "    -Q value = 1 or 0 (1 = ON) advanced mode, persistent. (e.g. -Q 1)"
+msgid  "    -Q value = 1 or 0 (1 = ON) advanced mode, persistent. (e.g. -Q1)"
+msgstr "    -Q value = 1 or 0 (1 = ON) advanced mode, persistent. (e.g. -Q1)"
 
 msgid  "    -l = list the last 1000 lines of the log."
 msgstr "    -l = list the last 1000 lines of the log."
diff --git a/po/fr_FR.UTF-8.po b/po/fr_FR.UTF-8.po
index 05e083f..43aee1d 100644
--- a/po/fr_FR.UTF-8.po
+++ b/po/fr_FR.UTF-8.po
@@ -116,8 +116,8 @@ msgstr ", par le dnf 'installonly_limit' défini dans /etc/dnf/dnf.conf"
 msgid  "FATAL: Has the running kernel been uninstalled since last boot? - Aborting."
 msgstr "FATAL : le noyau en cours d'exécution a-t-il été désinstallé depuis le dernier démarrage ? - Abandonner."
 
-msgid  "Usage: <remove-old kernels|rok> [-a] [-A <1|0>] [-c] [-t] [-f 0-9] [-F 0-9] [-n number] [-N number] [-p] [-q] [-Q 0|1][-l] [-m] [-v] [-h|-?]"
-msgstr "Usage: <remove-old kernels|rok> [-a] [-A <1|0>] [-c] [-t] [-f 0-9] [-F 0-9] [-n numéro] [-N numéro] [-p] [-q] [-Q 0|1][-l] [-m] [-v] [-h|-?]"
+msgid  "Usage: <remove-old kernels|rok> [-a] [-A 0|1] [-c] [-t] [-f 0-9] [-F 0-9] [-n number] [-N number] [-p] [-q] [-Q 0|1][-l] [-m] [-v] [-h|-?]"
+msgstr "Usage: <remove-old kernels|rok> [-a] [-A 0|1] [-c] [-t] [-f 0-9] [-F 0-9] [-n numéro] [-N numéro] [-p] [-q] [-Q 0|1][-l] [-m] [-v] [-h|-?]"
 
 msgid  "    -a = automatic, no questions. Interactive if not specified. (must be root)"
 msgstr "    -a = automatique, pas de questions. Interactif si non spécifié. (doit être root)"
diff --git a/po/nl_NL.UTF-8.po b/po/nl_NL.UTF-8.po
index b9e5f8e..b0f982a 100644
--- a/po/nl_NL.UTF-8.po
+++ b/po/nl_NL.UTF-8.po
@@ -116,16 +116,16 @@ msgstr ", door de dnf 'installonly_limit' ingesteld in /etc/dnf/dnf.conf"
 msgid  "FATAL: Has the running kernel been uninstalled since last boot? - Aborting."
 msgstr "FATAL: Is de draaiende kernel verwijderd sinds de laatste keer opstarten? - Afbreken."
 
-msgid  "Usage: <remove-old kernels|rok> [-a] [-A <1|0>] [-c] [-t] [-f 0-9] [-F 0-9] [-n number] [-N number] [-p] [-q] [-Q 0|1][-l] [-m] [-v] [-h|-?]"
-msgstr "Gebruik: <remove-old kernels|rok> [-a] [-A <1|0>] [-c] [-t] [-f 0-9] [-F 0-9] [-n nummer] [-N nummer] [-p] [-q] [-Q 0|1][-l] [-m] [-v] [-h|-?]"
+msgid  "Usage: <remove-old kernels|rok> [-a] [-A 0|1] [-c] [-t] [-f 0-9] [-F 0-9] [-n number] [-N number] [-p] [-q] [-Q 0|1][-l] [-m] [-v] [-h|-?]"
+msgstr "Gebruik: <remove-old kernels|rok> [-a] [-A 0|1] [-c] [-t] [-f 0-9] [-F 0-9] [-n nummer] [-N nummer] [-p] [-q] [-Q 0|1][-l] [-m] [-v] [-h|-?]"
 
 msgid  "    -a = automatic, no questions. Interactive if not specified. (must be root)"
 msgstr "    -a = automatisch, geen vragen. Interactief indien niet gespecificeerd. (moet root zijn)"
 
-msgid  "    -A value = 1 or 0 to turn ON or OFF automatic weekly removal of kernels. (e.g. -Ay)"
+msgid  "    -A value = 1 or 0 to turn ON or OFF automatic weekly removal of kernels. (e.g. -A1)"
 msgstr "    -A waarde = 1 of 0 om automatische wekelijkse verwijdering van kernels AAN of UIT te zetten. (bijv. -A1)"
 
-msgid  "    -c = as automatic but also checks for CRON=y in the cfg file or exits. (must be root)"
+msgid  "    -c = as automatic but also checks for CRON=1 in the cfg file or exits. (must be root)"
 msgstr "    -c = als automatisch maar controleert ook op CRON=1 in het cfg-bestand of sluit af. (moet root zijn)"
 
 msgid  "    -t = Test mode, nothing is removed, urpme is simulated."
@@ -149,8 +149,8 @@ msgstr "    -p = bekijk een voorbeeld van de urpme-commando's die zouden worden
 msgid  "    -q = advanced mode, this time only - see man page."
 msgstr "    -q = geavanceerde modus, alleen deze keer - zie man-pagina."
 
-msgid  "    -Q value = 1 or 0 (1 = ON) advanced mode, persistent. (e.g. -Q 1)"
-msgstr "    -Q waarde = 1 of 0 (1 = AAN) geavanceerde modus, permanent. (bijv. -Q 1)"
+msgid  "    -Q value = 1 or 0 (1 = ON) advanced mode, persistent. (e.g. -Q1)"
+msgstr "    -Q waarde = 1 of 0 (1 = AAN) geavanceerde modus, permanent. (bijv. -Q1)"
 
 msgid  "    -l = list the last 1000 lines of the log."
 msgstr "    -l = maak een lijst van de laatste 1000 regels van het logboek."
diff --git a/po/pt_BR.UTF-8.po b/po/pt_BR.UTF-8.po
index ae1e667..0826181 100644
--- a/po/pt_BR.UTF-8.po
+++ b/po/pt_BR.UTF-8.po
@@ -15,7 +15,7 @@ msgstr ""
 "X-Poedit-KeywordsList: \n"
 
 msgid  "Welcome to 'remove-old-kernels' Interactive"
-msgstr "Bem-vindo ao 'rok' Interativo"
+msgstr "Bem-vindo ao 'remove-old-kernels' Interativo"
 
 msgid  "Keep"
 msgstr "Manter"
@@ -47,8 +47,8 @@ msgid  "y/N/i (i=confirm for each)"
 msgstr "y/N/i (y=ja N=não i=confirmar cada um)"
 
 # Only translate "yes", "no" and "quit"
-msgid  "y/N/q  (q=quit)"
-msgstr "y/N/q  (y=ja N=não q=sair)"
+msgid  "y/N/q (q=quit)"
+msgstr "y/N/q (y=ja N=não q=sair)"
 
 msgid  "interactive"
 msgstr "interativo"
@@ -116,17 +116,17 @@ msgstr ", pelo dnf 'installonly_limit' definido em /etc/dnf/dnf.conf"
 msgid  "FATAL: Has the running kernel been uninstalled since last boot? - Aborting."
 msgstr "FATAL: O kernel em execução foi desinstalado desde a última inicialização? - Abortando."
 
-msgid  "Usage: <remove-old kernels|rok> [-a] [-A <y/n>] [-c] [-t] [-f 0-9] [-F 0-9] [-n number] [-N number] [-p] [-q] [-Q 0|1][-l] [-m] [-v] [-h|-?]"
-msgstr "Uso: <remove-old kernels|rok> [-a] [-A <y/n>] [-c] [-t] [-f 0-9] [-F 0-9] [-n número] [-N número] [-p] [-q] [-Q 0|1][-l] [-m] [-v] [-h|-?]"
+msgid  "Usage: <remove-old kernels|rok> [-a] [-A 0|1] [-c] [-t] [-f 0-9] [-F 0-9] [-n number] [-N number] [-p] [-q] [-Q 0|1][-l] [-m] [-v] [-h|-?]"
+msgstr "Uso: <remove-old kernels|rok> [-a] [-A 0|1] [-c] [-t] [-f 0-9] [-F 0-9] [-n número] [-N número] [-p] [-q] [-Q 0|1][-l] [-m] [-v] [-h|-?]"
 
 msgid  "    -a = automatic, no questions. Interactive if not specified. (must be root)"
 msgstr "    -a = automático, sem perguntas. Interativo se não especificado. (deve ser root)"
 
-msgid  "    -A value = y or n to turn ON or OFF automatic weekly removal of kernels. (e.g. -Ay)"
-msgstr "    -A valor = y ou n para ligar (ON) ou desligar (OFF) a remoção semanal automática de kernels. (ex. -Ay)"
+msgid  "    -A value = 1 or 0 to turn ON or OFF automatic weekly removal of kernels. (e.g. -A1)"
+msgstr "    -A valor = 1 ou 0 para ligar (ON) ou desligar (OFF) a remoção semanal automática de kernels. (ex. -A1)"
 
-msgid  "    -c = as automatic but also checks for CRON=y in the cfg file or exits. (must be root)"
-msgstr "    -c = como automático mas checando também por CRON=y no arquivo de config ou finaliza. (deve ser root)"
+msgid  "    -c = as automatic but also checks for CRON=1 in the cfg file or exits. (must be root)"
+msgstr "    -c = como automático mas checando também por CRON=1 no arquivo de config ou finaliza. (deve ser root)"
 
 msgid  "    -t = Test mode, nothing is removed, urpme is simulated."
 msgstr "    -t = Modo de teste, nada é removido, urpme é simulado."
@@ -149,8 +149,8 @@ msgstr "    -p = visualize os comandos urpme que seriam usados."
 msgid  "    -q = advanced mode, this time only - see man page."
 msgstr "    -q = modo avançado, apenas esta vez - veja o manual."
 
-msgid  "    -Q value = 1 or 0 (1 = ON) advanced mode, persistent. (e.g. -Q 1)"
-msgstr "    -Q valor = 1 ou 0 (1 = Ligado) modo avançado, persistente. (ex. -Q 1)"
+msgid  "    -Q value = 1 or 0 (1 = ON) advanced mode, persistent. (e.g. -Q1)"
+msgstr "    -Q valor = 1 ou 0 (1 = Ligado) modo avançado, persistente. (ex. -Q1)"
 
 msgid  "    -l = list the last 1000 lines of the log."
 msgstr "    -l = lista as últimas 1000 linhas do log."
diff --git a/remove-old-kernels b/remove-old-kernels
index bfc16b6..88fc68a 100755
--- a/remove-old-kernels
+++ b/remove-old-kernels
@@ -471,7 +471,7 @@ if [[ ${nbt} -ne 0 ]] ; then
 
     for installedKernelPackage in $(tac ${TMPKTR}) ; do
         if [[ ${MODE} = "I" ]] ; then    # --- interactive mode ---
-            read -p "$(i18n "Remove") ${installedKernelPackage} ? $(i18n "y/N/q  (q=quit)") " -n 1 response
+            read -p "$(i18n "Remove") ${installedKernelPackage} ? $(i18n "y/N/q (q=quit)") " -n 1 response
             echo -e " \n"
             if [[ -z ${response} ]]; then
                 response="N"