Merge branch 'testing'

4 files changed, 11 insertions, 17 deletions

diff --git a/mk-pot b/mk-pot
index eee8417..7ce93f3 100755
--- a/mk-pot
+++ b/mk-pot
@@ -8,13 +8,6 @@ grep -o '(i18n ".*)' remove-old-kernels|sed "s/(i18n/msgid /"|sed "s/.$//" > pot
 rm -f pot-temp1
 while read line; do
     ((linesin++))
-	if echo "$line" | grep -q "\${plural}"; then
-		echo "$line" |sed 's/\${plural}/s/' >> pot-temp1
-		((linesout++))
-		echo "$line" |sed 's/\${plural}//' >> pot-temp1
-		((linesout++))
-		continue
-	fi
 	echo "$line" >> pot-temp1
 	((linesout++))
 done < pot-temp
diff --git a/po/fr_FR.UTF-8.po b/po/fr_FR.UTF-8.po
index d837497..c1a4ec8 100644
--- a/po/fr_FR.UTF-8.po
+++ b/po/fr_FR.UTF-8.po
@@ -19,13 +19,13 @@ msgid "Usage: <remove-old kernels|rok> [-a] [-A 0|1] [-c] [-t] [-f 0-9] [-F 0-9]
 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)"
+msgstr "    -a = automatique, pas de questions. Interactif si non spécifié. (il faut être root)"
 
 msgid "    -A value = 1 or 0 to turn ON or OFF automatic weekly removal of kernels. (e.g. -A1)"
 msgstr "    -A valeur = 1 ou 0 pour activer ou désactiver la suppression automatique des noyaux. (e.g. -A1)"
 
 msgid "    -c = as automatic but also checks for CRON=1 in the cfg file or exits. (must be root)"
-msgstr "    -c = comme automatique mais vérifie également CRON=1 dans le fichier cfg ou quitte. (doit être root)"
+msgstr "    -c = comme automatique mais vérifie également CRON=1 dans le fichier cfg ou quitte. (il faut être root)"
 
 msgid "    -t = Test mode, nothing is removed, urpme is simulated."
 msgstr "    -t = Mode test, rien n'est supprimé, urpme est simulé."
@@ -88,7 +88,7 @@ msgid "Either replace it or set ALTCFG=0 in"
 msgstr "Remplacez-le ou définissez ALTCFG=0 dans"
 
 msgid "Must be root to edit configuration"
-msgstr "Doit être root pour modifier la configuration"
+msgstr "Il faut être root pour modifier la configuration"
 
 msgid "No such alternative configuration file:"
 msgstr "Aucun fichier de configuration alternatif de ce type :"
@@ -130,7 +130,7 @@ msgid "In use now"
 msgstr "En usage maintenant"
 
 msgid "Must be root to allow removal"
-msgstr "Doit être root pour permettre enlever"
+msgstr "Il faut être root pour pouvoir enlever"
 
 msgid "Commands that would be used"
 msgstr "Commandes qui seraient utilisées"
diff --git a/po/remove-old-kernels.pot b/po/remove-old-kernels.pot
index cbfb737..5120eac 100644
--- a/po/remove-old-kernels.pot
+++ b/po/remove-old-kernels.pot
@@ -7,7 +7,7 @@
 msgid   ""
 msgstr  "Project-Id-Version: remove-old-kernels\n"
         "Report-Msgid-Bugs-To: \n"
-        "POT-Creation-Date: 2023-01-15 13:05+0000\n"
+        "POT-Creation-Date: 2023-01-18 22:36+0000\n"
         "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
         "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
         "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -91,6 +91,9 @@ msgstr ""
 msgid  "Must be root to edit configuration"
 msgstr ""
 
+msgid  "Tap spacebar"
+msgstr ""
+
 msgid  "No such alternative configuration file:"
 msgstr ""
 
@@ -100,7 +103,7 @@ msgstr ""
 msgid  "Bad input value"
 msgstr ""
 
-msgid  "Tap spacebar"
+msgid  "Tap spacebar to exit"
 msgstr ""
 
 msgid  "Welcome to 'remove-old-kernels' Interactive"
@@ -139,9 +142,6 @@ msgstr ""
 msgid  "Command that would be used"
 msgstr ""
 
-msgid  "Tap spacebar to exit"
-msgstr ""
-
 msgid  "Test mode is on - kernels will not be removed"
 msgstr ""
 
diff --git a/remove-old-kernels b/remove-old-kernels
index f78a4a7..ab64f01 100755
--- a/remove-old-kernels
+++ b/remove-old-kernels
@@ -524,7 +524,8 @@ $(i18n "y/N/q (q=quit)") " -n 1 response
     done
         NK=$(ls /boot/vmlinuz*.mga[0-9] | wc -l)
         OCCDISK2=$(df -B 1M -l --output=used / | tail -n1 | awk '{ print $1 }')
-        echo -e "${HdBgCol} $(i18n "Gain"): $((OCCDISK1 - OCCDISK2)) MB - \
+        echo -e "${HdBgCol} $(i18n "Gain"):\
+$((OCCDISK1 - OCCDISK2)) MB - \
 $(i18n "Kernels in") /boot/: ${NK} ${Normal}"
 fi