From e248c740eca9e0cc04c706580694c7b1b04d909f Mon Sep 17 00:00:00 2001 From: Robin Candau Date: Mon, 20 May 2024 00:03:58 +0200 Subject: [PATCH 1/4] Make Arch-Update also look in XDG_DATA_HOME/XDG_DATA_DIRS for translation files and example config This commit aims to make Arch-Update also look in XDG_DATA_HOME/XDG_DATA_DIRS for translation files and example config (instead of assuming the `/usr` or the `/usr/local` prefix during install). Fixes https://github.com/Antiz96/arch-update/issues/166 --- src/script/arch-update.sh | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/script/arch-update.sh b/src/script/arch-update.sh index c86fd32..49b2343 100755 --- a/src/script/arch-update.sh +++ b/src/script/arch-update.sh @@ -30,7 +30,13 @@ esac # shellcheck disable=SC1091 . gettext.sh export TEXTDOMAIN="${_name}" # Using "Arch-Update" as TEXTDOMAIN to avoid conflicting with the "arch-update" TEXTDOMAIN used by the arch-update Gnome extension (https://extensions.gnome.org/extension/1010/archlinux-updates-indicator/) -if find /usr/local/share/locale/*/LC_MESSAGES/"${_name}".mo &> /dev/null; then +if [ -f "${XDG_DATA_HOME}/locale/fr/LC_MESSAGES/${_name}.mo" ]; then + export TEXTDOMAINDIR="${XDG_DATA_HOME}/locale" +elif [ -f "${HOME}/.local/share/locale/fr/LC_MESSAGES/${_name}.mo" ]; then + export TEXTDOMAINDIR="${HOME}/.local/share/locale" +elif [ -f "${XDG_DATA_DIRS}/locale/fr/LC_MESSAGES/${_name}.mo" ]; then + export TEXTDOMAINDIR="${XDG_DATA_DIRS}/locale" +elif [ -f "/usr/local/share/locale/fr/LC_MESSAGES/${_name}.mo" ]; then export TEXTDOMAINDIR="/usr/local/share/locale" fi @@ -676,8 +682,7 @@ case "${option}" in list_news ;; --gen-config) - example_config_file="/usr/share/doc/${name}/${name}.conf.example" - [ -f "/usr/local/share/doc/${name}/${name}.conf.example" ] && example_config_file="/usr/local/share/doc/${name}/${name}.conf.example" + example_config_file="${XDG_DATA_HOME:-${HOME}/.local/share:-${XDG_DATA_DIRS}:-/usr/local/share:-/usr/share}/doc/${name}/${name}.conf.example" if [ -f "${config_file}" ]; then error_msg "$(eval_gettext "The '\${config_file}' configuration file already exists\nPlease, remove it before generating a new one")" From 8a4c5a28a9a329f1798545319e9c26a249a47b5f Mon Sep 17 00:00:00 2001 From: Robin Candau Date: Mon, 20 May 2024 00:20:57 +0200 Subject: [PATCH 2/4] Adapt gen-config function --- src/script/arch-update.sh | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/src/script/arch-update.sh b/src/script/arch-update.sh index 49b2343..452c81d 100755 --- a/src/script/arch-update.sh +++ b/src/script/arch-update.sh @@ -682,7 +682,20 @@ case "${option}" in list_news ;; --gen-config) - example_config_file="${XDG_DATA_HOME:-${HOME}/.local/share:-${XDG_DATA_DIRS}:-/usr/local/share:-/usr/share}/doc/${name}/${name}.conf.example" + if [ -f "${XDG_DATA_HOME}/doc/${name}/${name}.conf" ]; then + example_config_file="${XDG_DATA_HOME}/doc/${name}/${name}.conf" + elif [ -f "${HOME}/.local/share/doc/${name}/${name}.conf" ]; then + example_config_file="${HOME}/.local/share/doc/${name}/${name}.conf" + elif [ -f "${XDG_DATA_DIRS}/doc/${name}/${name}.conf" ]; then + example_config_file="${XDG_DATA_DIRS}/doc/${name}/${name}.conf" + elif [ -f "/usr/local/share/doc/${name}/${name}.conf" ]; then + example_config_file="/usr/local/share/doc/${name}/${name}.conf" + elif [ -f "/usr/share/doc/${name}/${name}.conf" ]; then + example_config_file="/usr/share/doc/${name}/${name}.conf" + else + error_msg "$(eval_gettext "Example configuration file not found")" + exit 8 + fi if [ -f "${config_file}" ]; then error_msg "$(eval_gettext "The '\${config_file}' configuration file already exists\nPlease, remove it before generating a new one")" From e4cbf911926a93f2a80718145c57d5e70c3158fe Mon Sep 17 00:00:00 2001 From: Robin Candau Date: Mon, 20 May 2024 00:25:30 +0200 Subject: [PATCH 3/4] Fix typo --- src/script/arch-update.sh | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/script/arch-update.sh b/src/script/arch-update.sh index 452c81d..05d0083 100755 --- a/src/script/arch-update.sh +++ b/src/script/arch-update.sh @@ -682,16 +682,16 @@ case "${option}" in list_news ;; --gen-config) - if [ -f "${XDG_DATA_HOME}/doc/${name}/${name}.conf" ]; then - example_config_file="${XDG_DATA_HOME}/doc/${name}/${name}.conf" - elif [ -f "${HOME}/.local/share/doc/${name}/${name}.conf" ]; then - example_config_file="${HOME}/.local/share/doc/${name}/${name}.conf" - elif [ -f "${XDG_DATA_DIRS}/doc/${name}/${name}.conf" ]; then - example_config_file="${XDG_DATA_DIRS}/doc/${name}/${name}.conf" - elif [ -f "/usr/local/share/doc/${name}/${name}.conf" ]; then - example_config_file="/usr/local/share/doc/${name}/${name}.conf" - elif [ -f "/usr/share/doc/${name}/${name}.conf" ]; then - example_config_file="/usr/share/doc/${name}/${name}.conf" + if [ -f "${XDG_DATA_HOME}/doc/${name}/${name}.conf.example" ]; then + example_config_file="${XDG_DATA_HOME}/doc/${name}/${name}.conf.example" + elif [ -f "${HOME}/.local/share/doc/${name}/${name}.conf.example" ]; then + example_config_file="${HOME}/.local/share/doc/${name}/${name}.conf.example" + elif [ -f "${XDG_DATA_DIRS}/doc/${name}/${name}.conf.example" ]; then + example_config_file="${XDG_DATA_DIRS}/doc/${name}/${name}.conf.example" + elif [ -f "/usr/local/share/doc/${name}/${name}.conf.example" ]; then + example_config_file="/usr/local/share/doc/${name}/${name}.conf.example" + elif [ -f "/usr/share/doc/${name}/${name}.conf.example" ]; then + example_config_file="/usr/share/doc/${name}/${name}.conf.example" else error_msg "$(eval_gettext "Example configuration file not found")" exit 8 From 4af7fa216eb575ff6167c1df0dc2752c9d54c3cb Mon Sep 17 00:00:00 2001 From: Robin Candau Date: Mon, 20 May 2024 00:40:58 +0200 Subject: [PATCH 4/4] Update translation files --- po/arch-update.pot | 181 +++++++++++++++++++++++---------------------- po/fr.po | 181 +++++++++++++++++++++++---------------------- 2 files changed, 186 insertions(+), 176 deletions(-) diff --git a/po/arch-update.pot b/po/arch-update.pot index 70362d4..88ae2fe 100644 --- a/po/arch-update.pot +++ b/po/arch-update.pot @@ -16,48 +16,48 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: src/script/arch-update.sh:121 +#: src/script/arch-update.sh:127 #, sh-format msgid "Press \"enter\" to continue " msgstr "" -#: src/script/arch-update.sh:127 +#: src/script/arch-update.sh:133 #, sh-format msgid "Press \"enter\" to quit " msgstr "" -#: src/script/arch-update.sh:137 +#: src/script/arch-update.sh:143 #, sh-format msgid "" "A privilege elevation method is required\\nPlease, install sudo or doas\\n" msgstr "" -#: src/script/arch-update.sh:159 +#: src/script/arch-update.sh:165 #, sh-format msgid "" "An update notifier/applier for Arch Linux that assists you with important " "pre/post update tasks." msgstr "" -#: src/script/arch-update.sh:161 +#: src/script/arch-update.sh:167 #, sh-format msgid "Run ${name} to perform the main 'update' function:" msgstr "" -#: src/script/arch-update.sh:162 +#: src/script/arch-update.sh:168 #, sh-format msgid "" "Display the list of packages available for update, then ask for the user's " "confirmation to proceed with the installation." msgstr "" -#: src/script/arch-update.sh:163 +#: src/script/arch-update.sh:169 #, sh-format msgid "" "Before performing the update, offer to display the latest Arch Linux news." msgstr "" -#: src/script/arch-update.sh:164 +#: src/script/arch-update.sh:170 #, sh-format msgid "" "Post update, check for orphan/unused packages, old cached packages, pacnew/" @@ -65,12 +65,12 @@ msgid "" "them." msgstr "" -#: src/script/arch-update.sh:166 +#: src/script/arch-update.sh:172 #, sh-format msgid "Options:" msgstr "" -#: src/script/arch-update.sh:167 +#: src/script/arch-update.sh:173 #, sh-format msgid "" " -c, --check Check for available updates, change the systray icon and " @@ -78,383 +78,388 @@ msgid "" "there are new available updates compared to the last check)" msgstr "" -#: src/script/arch-update.sh:168 +#: src/script/arch-update.sh:174 #, sh-format msgid " -l, --list Display the list of pending updates" msgstr "" -#: src/script/arch-update.sh:169 +#: src/script/arch-update.sh:175 #, sh-format msgid " -d, --devel Include AUR development packages updates" msgstr "" -#: src/script/arch-update.sh:170 +#: src/script/arch-update.sh:176 #, sh-format msgid "" " -n, --news [Num] Display latest Arch news, you can optionally specify the " "number of Arch news to display with '--news [Num]' (e.g. '--news 10')" msgstr "" -#: src/script/arch-update.sh:171 +#: src/script/arch-update.sh:177 #, sh-format msgid " -D, --debug Display debug traces" msgstr "" -#: src/script/arch-update.sh:172 +#: src/script/arch-update.sh:178 #, sh-format msgid " --gen-config Generate a default/example configuration file" msgstr "" -#: src/script/arch-update.sh:173 +#: src/script/arch-update.sh:179 #, sh-format msgid " --tray Launch the Arch-Update systray applet" msgstr "" -#: src/script/arch-update.sh:174 +#: src/script/arch-update.sh:180 #, sh-format msgid " -h, --help Display this help message and exit" msgstr "" -#: src/script/arch-update.sh:175 +#: src/script/arch-update.sh:181 #, sh-format msgid " -V, --version Display version information and exit" msgstr "" -#: src/script/arch-update.sh:177 +#: src/script/arch-update.sh:183 #, sh-format msgid "For more information, see the ${name}(1) man page." msgstr "" -#: src/script/arch-update.sh:178 +#: src/script/arch-update.sh:184 #, sh-format msgid "" "Certain options can be enabled/disabled or modified via the ${name}.conf " "configuration file, see the ${name}.conf(5) man page." msgstr "" -#: src/script/arch-update.sh:189 +#: src/script/arch-update.sh:195 #, sh-format msgid "" "${name}: invalid option -- '${option}'\\nTry '${name} --help' for more " "information." msgstr "" -#: src/script/arch-update.sh:229 src/script/arch-update.sh:231 +#: src/script/arch-update.sh:235 src/script/arch-update.sh:237 #, sh-format msgid "${update_number} update available" msgstr "" -#: src/script/arch-update.sh:236 src/script/arch-update.sh:238 +#: src/script/arch-update.sh:242 src/script/arch-update.sh:244 #, sh-format msgid "${update_number} updates available" msgstr "" -#: src/script/arch-update.sh:254 +#: src/script/arch-update.sh:260 #, sh-format msgid "Looking for updates...\\n" msgstr "" -#: src/script/arch-update.sh:275 +#: src/script/arch-update.sh:281 #, sh-format msgid "Packages:" msgstr "" -#: src/script/arch-update.sh:280 +#: src/script/arch-update.sh:286 #, sh-format msgid "AUR Packages:" msgstr "" -#: src/script/arch-update.sh:285 +#: src/script/arch-update.sh:291 #, sh-format msgid "Flatpak Packages:" msgstr "" -#: src/script/arch-update.sh:292 +#: src/script/arch-update.sh:298 #, sh-format msgid "No update available\\n" msgstr "" -#: src/script/arch-update.sh:299 +#: src/script/arch-update.sh:305 #, sh-format msgid "Proceed with update? [Y/n]" msgstr "" -#: src/script/arch-update.sh:302 src/script/arch-update.sh:439 -#: src/script/arch-update.sh:472 src/script/arch-update.sh:514 -#: src/script/arch-update.sh:581 src/script/arch-update.sh:607 +#: src/script/arch-update.sh:308 src/script/arch-update.sh:445 +#: src/script/arch-update.sh:478 src/script/arch-update.sh:520 +#: src/script/arch-update.sh:587 src/script/arch-update.sh:613 #, sh-format msgid "Y" msgstr "" -#: src/script/arch-update.sh:302 src/script/arch-update.sh:439 -#: src/script/arch-update.sh:472 src/script/arch-update.sh:514 -#: src/script/arch-update.sh:581 src/script/arch-update.sh:607 +#: src/script/arch-update.sh:308 src/script/arch-update.sh:445 +#: src/script/arch-update.sh:478 src/script/arch-update.sh:520 +#: src/script/arch-update.sh:587 src/script/arch-update.sh:613 #, sh-format msgid "y" msgstr "" -#: src/script/arch-update.sh:306 +#: src/script/arch-update.sh:312 #, sh-format msgid "The update has been aborted\\n" msgstr "" -#: src/script/arch-update.sh:337 +#: src/script/arch-update.sh:343 #, sh-format msgid "Arch News:" msgstr "" -#: src/script/arch-update.sh:342 +#: src/script/arch-update.sh:348 #, sh-format msgid "[NEW]" msgstr "" -#: src/script/arch-update.sh:353 +#: src/script/arch-update.sh:359 #, sh-format msgid "Select the news to read (or just press \"enter\" to quit):" msgstr "" -#: src/script/arch-update.sh:355 +#: src/script/arch-update.sh:361 #, sh-format msgid "" "Select the news to read (or just press \"enter\" to proceed with update):" msgstr "" -#: src/script/arch-update.sh:366 +#: src/script/arch-update.sh:372 #, sh-format msgid "Title:" msgstr "" -#: src/script/arch-update.sh:367 +#: src/script/arch-update.sh:373 #, sh-format msgid "Author:" msgstr "" -#: src/script/arch-update.sh:368 +#: src/script/arch-update.sh:374 #, sh-format msgid "Publication date:" msgstr "" -#: src/script/arch-update.sh:369 +#: src/script/arch-update.sh:375 #, sh-format msgid "URL:" msgstr "" -#: src/script/arch-update.sh:382 +#: src/script/arch-update.sh:388 #, sh-format msgid "Updating Packages...\\n" msgstr "" -#: src/script/arch-update.sh:387 src/script/arch-update.sh:399 -#: src/script/arch-update.sh:410 +#: src/script/arch-update.sh:393 src/script/arch-update.sh:405 +#: src/script/arch-update.sh:416 #, sh-format msgid "" "An error has occurred during the update process\\nThe update has been " "aborted\\n" msgstr "" -#: src/script/arch-update.sh:394 +#: src/script/arch-update.sh:400 #, sh-format msgid "Updating AUR Packages...\\n" msgstr "" -#: src/script/arch-update.sh:406 +#: src/script/arch-update.sh:412 #, sh-format msgid "Updating Flatpak Packages...\\n" msgstr "" -#: src/script/arch-update.sh:417 +#: src/script/arch-update.sh:423 #, sh-format msgid "The update has been applied\\n" msgstr "" -#: src/script/arch-update.sh:429 +#: src/script/arch-update.sh:435 #, sh-format msgid "Orphan Packages:" msgstr "" -#: src/script/arch-update.sh:433 +#: src/script/arch-update.sh:439 #, sh-format msgid "" "Would you like to remove this orphan package (and its potential " "dependencies) now? [y/N]" msgstr "" -#: src/script/arch-update.sh:435 +#: src/script/arch-update.sh:441 #, sh-format msgid "" "Would you like to remove these orphan packages (and their potential " "dependencies) now? [y/N]" msgstr "" -#: src/script/arch-update.sh:441 +#: src/script/arch-update.sh:447 #, sh-format msgid "Removing Orphan Packages...\\n" msgstr "" -#: src/script/arch-update.sh:445 src/script/arch-update.sh:478 -#: src/script/arch-update.sh:521 src/script/arch-update.sh:531 -#: src/script/arch-update.sh:541 src/script/arch-update.sh:550 +#: src/script/arch-update.sh:451 src/script/arch-update.sh:484 +#: src/script/arch-update.sh:527 src/script/arch-update.sh:537 +#: src/script/arch-update.sh:547 src/script/arch-update.sh:556 #, sh-format msgid "" "An error has occurred during the removal process\\nThe removal has been " "aborted\\n" msgstr "" -#: src/script/arch-update.sh:448 src/script/arch-update.sh:481 +#: src/script/arch-update.sh:454 src/script/arch-update.sh:487 #, sh-format msgid "The removal has been applied\\n" msgstr "" -#: src/script/arch-update.sh:453 src/script/arch-update.sh:485 -#: src/script/arch-update.sh:558 +#: src/script/arch-update.sh:459 src/script/arch-update.sh:491 +#: src/script/arch-update.sh:564 #, sh-format msgid "The removal hasn't been applied\\n" msgstr "" -#: src/script/arch-update.sh:457 +#: src/script/arch-update.sh:463 #, sh-format msgid "No orphan package found\\n" msgstr "" -#: src/script/arch-update.sh:462 +#: src/script/arch-update.sh:468 #, sh-format msgid "Flatpak Unused Packages:" msgstr "" -#: src/script/arch-update.sh:466 +#: src/script/arch-update.sh:472 #, sh-format msgid "Would you like to remove this Flatpak unused package now? [y/N]" msgstr "" -#: src/script/arch-update.sh:468 +#: src/script/arch-update.sh:474 #, sh-format msgid "Would you like to remove these Flatpak unused packages now? [y/N]" msgstr "" -#: src/script/arch-update.sh:474 +#: src/script/arch-update.sh:480 #, sh-format msgid "Removing Flatpak Unused Packages..." msgstr "" -#: src/script/arch-update.sh:489 +#: src/script/arch-update.sh:495 #, sh-format msgid "No Flatpak unused package found\\n" msgstr "" -#: src/script/arch-update.sh:506 +#: src/script/arch-update.sh:512 #, sh-format msgid "Cached Packages:\\nThere's an old or uninstalled cached package\\n" msgstr "" -#: src/script/arch-update.sh:507 +#: src/script/arch-update.sh:513 #, sh-format msgid "Would you like to remove it from the cache now? [Y/n]" msgstr "" -#: src/script/arch-update.sh:509 +#: src/script/arch-update.sh:515 #, sh-format msgid "Cached Packages:\\nThere are old and/or uninstalled cached packages\\n" msgstr "" -#: src/script/arch-update.sh:510 +#: src/script/arch-update.sh:516 #, sh-format msgid "Would you like to remove them from the cache now? [Y/n]" msgstr "" -#: src/script/arch-update.sh:517 src/script/arch-update.sh:537 +#: src/script/arch-update.sh:523 src/script/arch-update.sh:543 #, sh-format msgid "Removing old cached packages..." msgstr "" -#: src/script/arch-update.sh:527 src/script/arch-update.sh:546 +#: src/script/arch-update.sh:533 src/script/arch-update.sh:552 #, sh-format msgid "Removing uninstalled cached packages..." msgstr "" -#: src/script/arch-update.sh:562 +#: src/script/arch-update.sh:568 #, sh-format msgid "No old or uninstalled cached package found\\n" msgstr "" -#: src/script/arch-update.sh:571 +#: src/script/arch-update.sh:577 #, sh-format msgid "Pacnew Files:" msgstr "" -#: src/script/arch-update.sh:575 +#: src/script/arch-update.sh:581 #, sh-format msgid "Would you like to process this file now? [Y/n]" msgstr "" -#: src/script/arch-update.sh:577 +#: src/script/arch-update.sh:583 #, sh-format msgid "Would you like to process these files now? [Y/n]" msgstr "" -#: src/script/arch-update.sh:583 +#: src/script/arch-update.sh:589 #, sh-format msgid "Processing Pacnew Files...\\n" msgstr "" -#: src/script/arch-update.sh:587 +#: src/script/arch-update.sh:593 #, sh-format msgid "The pacnew file(s) processing has been applied\\n" msgstr "" -#: src/script/arch-update.sh:590 +#: src/script/arch-update.sh:596 #, sh-format msgid "The pacnew file(s) processing hasn't been applied\\n" msgstr "" -#: src/script/arch-update.sh:594 +#: src/script/arch-update.sh:600 #, sh-format msgid "No pacnew file found\\n" msgstr "" -#: src/script/arch-update.sh:603 +#: src/script/arch-update.sh:609 #, sh-format msgid "" "Reboot required:\\nThere's a pending kernel update on your system requiring " "a reboot to be applied\\n" msgstr "" -#: src/script/arch-update.sh:604 +#: src/script/arch-update.sh:610 #, sh-format msgid "Would you like to reboot now? [y/N]" msgstr "" -#: src/script/arch-update.sh:616 +#: src/script/arch-update.sh:623 #, sh-format msgid "Rebooting in ${sec}...\\r" msgstr "" -#: src/script/arch-update.sh:622 +#: src/script/arch-update.sh:629 #, sh-format msgid "" "An error has occurred during the reboot process\\nThe reboot has been " "aborted\\n" msgstr "" -#: src/script/arch-update.sh:630 +#: src/script/arch-update.sh:637 #, sh-format msgid "" "The reboot hasn't been performed\\nPlease, consider rebooting to finalize " "the pending kernel update\\n" msgstr "" -#: src/script/arch-update.sh:634 +#: src/script/arch-update.sh:641 #, sh-format msgid "No pending kernel update found\\n" msgstr "" -#: src/script/arch-update.sh:682 +#: src/script/arch-update.sh:696 +#, sh-format +msgid "Example configuration file not found" +msgstr "" + +#: src/script/arch-update.sh:701 #, sh-format msgid "" "The '${config_file}' configuration file already exists\\nPlease, remove it " "before generating a new one" msgstr "" -#: src/script/arch-update.sh:687 +#: src/script/arch-update.sh:706 #, sh-format msgid "The '${config_file}' configuration file has been generated" msgstr "" diff --git a/po/fr.po b/po/fr.po index a4a4cf6..d1f267f 100644 --- a/po/fr.po +++ b/po/fr.po @@ -16,24 +16,24 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: src/script/arch-update.sh:121 +#: src/script/arch-update.sh:127 #, sh-format msgid "Press \"enter\" to continue " msgstr "Appuyez sur \"entrée\" pour continuer " -#: src/script/arch-update.sh:127 +#: src/script/arch-update.sh:133 #, sh-format msgid "Press \"enter\" to quit " msgstr "Appuyez sur \"entrée\" pour quitter " -#: src/script/arch-update.sh:137 +#: src/script/arch-update.sh:143 #, sh-format msgid "" "A privilege elevation method is required\\nPlease, install sudo or doas\\n" msgstr "" "Une méthode d'élévation de privilège est requise\\nVeuillez installer sudo ou doas\\n" -#: src/script/arch-update.sh:159 +#: src/script/arch-update.sh:165 #, sh-format msgid "" "An update notifier/applier for Arch Linux that assists you with important " @@ -42,12 +42,12 @@ msgstr "" "Un notificateur/applicateur de mises à jour pour Arch Linux qui vous assiste dans les " "tâches importantes d'avant/après mise à jour." -#: src/script/arch-update.sh:161 +#: src/script/arch-update.sh:167 #, sh-format msgid "Run ${name} to perform the main 'update' function:" msgstr "Lancez ${name} pour exécuter la fonction principale 'update' :" -#: src/script/arch-update.sh:162 +#: src/script/arch-update.sh:168 #, sh-format msgid "" "Display the list of packages available for update, then ask for the user's " @@ -56,14 +56,14 @@ msgstr "" "Afficher la liste des paquets disponibles pour mise à jour, puis demander la confirmation de l'utilisateur " "pour procéder à l'installation." -#: src/script/arch-update.sh:163 +#: src/script/arch-update.sh:169 #, sh-format msgid "" "Before performing the update, offer to display the latest Arch Linux news." msgstr "" "Avant d'effectuer la mise à jour, propose d'afficher les dernières news d'Arch Linux." -#: src/script/arch-update.sh:164 +#: src/script/arch-update.sh:170 #, sh-format msgid "" "Post update, check for orphan/unused packages, old cached packages, pacnew/" @@ -74,12 +74,12 @@ msgstr "" "pacsave et de mise à jour du noyau en attente et, s'il y en a, " "propose de les traiter." -#: src/script/arch-update.sh:166 +#: src/script/arch-update.sh:172 #, sh-format msgid "Options:" msgstr "Options :" -#: src/script/arch-update.sh:167 +#: src/script/arch-update.sh:173 #, sh-format msgid "" " -c, --check Check for available updates, change the systray icon and " @@ -90,17 +90,17 @@ msgstr "" "envoie une notification de bureau contenant le nombre de mises à jour disponibles (s'" "il y a des nouvelles mises à jour depuis le dernier check)" -#: src/script/arch-update.sh:168 +#: src/script/arch-update.sh:174 #, sh-format msgid " -l, --list Display the list of pending updates" msgstr " -l, --list Afficher les mises à jours en attente" -#: src/script/arch-update.sh:169 +#: src/script/arch-update.sh:175 #, sh-format msgid " -d, --devel Include AUR development packages updates" msgstr " -d, --devel Inclure les mises à jour des paquets de développement AUR" -#: src/script/arch-update.sh:170 +#: src/script/arch-update.sh:176 #, sh-format msgid "" " -n, --news [Num] Display latest Arch news, you can optionally specify the " @@ -109,37 +109,37 @@ msgstr "" " -n, --news [Num] Afficher les dernières Arch news, vous pouvez optionellement spécifier le " "nombre de Arch news à afficher avec '--news [Num]' (e.g. '--news 10')" -#: src/script/arch-update.sh:171 +#: src/script/arch-update.sh:177 #, sh-format msgid " -D, --debug Display debug traces" msgstr " -D, --debug Afficher les traces de débogage" -#: src/script/arch-update.sh:172 +#: src/script/arch-update.sh:178 #, sh-format msgid " --gen-config Generate a default/example configuration file" msgstr " --gen-config Générer un fichier de configuration par défaut/exemple" -#: src/script/arch-update.sh:173 +#: src/script/arch-update.sh:179 #, sh-format msgid " --tray Launch the Arch-Update systray applet" msgstr " --tray Lancer l'applet systray d'Arch-Update" -#: src/script/arch-update.sh:174 +#: src/script/arch-update.sh:180 #, sh-format msgid " -h, --help Display this help message and exit" msgstr " -h, --help Afficher ce message d'aide et quitter" -#: src/script/arch-update.sh:175 +#: src/script/arch-update.sh:181 #, sh-format msgid " -V, --version Display version information and exit" msgstr " -V, --version Afficher les informations de version et quitter" -#: src/script/arch-update.sh:177 +#: src/script/arch-update.sh:183 #, sh-format msgid "For more information, see the ${name}(1) man page." msgstr "Pour plus d'informations, consultez la page de manuel ${name}(1)." -#: src/script/arch-update.sh:178 +#: src/script/arch-update.sh:184 #, sh-format msgid "" "Certain options can be enabled/disabled or modified via the ${name}.conf " @@ -148,7 +148,7 @@ msgstr "" "Certaines options peuvent être activées/désactivées ou modifiées via le fichier de configuration ${name}.conf, " "voir la page de manuel ${name}.conf(5)." -#: src/script/arch-update.sh:189 +#: src/script/arch-update.sh:195 #, sh-format msgid "" "${name}: invalid option -- '${option}'\\nTry '${name} --help' for more " @@ -157,114 +157,114 @@ msgstr "" "${name}: option invalide -- '${option}'\\nEssayez '${name} --help' pour plus " "d'informations." -#: src/script/arch-update.sh:229 src/script/arch-update.sh:231 +#: src/script/arch-update.sh:235 src/script/arch-update.sh:237 #, sh-format msgid "${update_number} update available" msgstr "${update_number} mise à jour disponible" -#: src/script/arch-update.sh:236 src/script/arch-update.sh:238 +#: src/script/arch-update.sh:242 src/script/arch-update.sh:244 #, sh-format msgid "${update_number} updates available" msgstr "${update_number} mises à jour disponibles" -#: src/script/arch-update.sh:254 +#: src/script/arch-update.sh:260 #, sh-format msgid "Looking for updates...\\n" msgstr "Recherche de mises à jour...\\n" -#: src/script/arch-update.sh:275 +#: src/script/arch-update.sh:281 #, sh-format msgid "Packages:" msgstr "Paquets :" -#: src/script/arch-update.sh:280 +#: src/script/arch-update.sh:286 #, sh-format msgid "AUR Packages:" msgstr "Paquets AUR :" -#: src/script/arch-update.sh:285 +#: src/script/arch-update.sh:291 #, sh-format msgid "Flatpak Packages:" msgstr "Paquets Flatpak :" -#: src/script/arch-update.sh:292 +#: src/script/arch-update.sh:298 #, sh-format msgid "No update available\\n" msgstr "Aucune mise à jour disponible\\n" -#: src/script/arch-update.sh:299 +#: src/script/arch-update.sh:305 #, sh-format msgid "Proceed with update? [Y/n]" msgstr "Procéder à la mise à jour ? [O/n]" -#: src/script/arch-update.sh:302 src/script/arch-update.sh:439 -#: src/script/arch-update.sh:472 src/script/arch-update.sh:514 -#: src/script/arch-update.sh:581 src/script/arch-update.sh:607 +#: src/script/arch-update.sh:308 src/script/arch-update.sh:445 +#: src/script/arch-update.sh:478 src/script/arch-update.sh:520 +#: src/script/arch-update.sh:587 src/script/arch-update.sh:613 #, sh-format msgid "Y" msgstr "O" -#: src/script/arch-update.sh:302 src/script/arch-update.sh:439 -#: src/script/arch-update.sh:472 src/script/arch-update.sh:514 -#: src/script/arch-update.sh:581 src/script/arch-update.sh:607 +#: src/script/arch-update.sh:308 src/script/arch-update.sh:445 +#: src/script/arch-update.sh:478 src/script/arch-update.sh:520 +#: src/script/arch-update.sh:587 src/script/arch-update.sh:613 #, sh-format msgid "y" msgstr "o" -#: src/script/arch-update.sh:306 +#: src/script/arch-update.sh:312 #, sh-format msgid "The update has been aborted\\n" msgstr "La mise à jour a été abandonnée\\n" -#: src/script/arch-update.sh:337 +#: src/script/arch-update.sh:343 #, sh-format msgid "Arch News:" msgstr "Arch News :" -#: src/script/arch-update.sh:342 +#: src/script/arch-update.sh:348 #, sh-format msgid "[NEW]" msgstr "[NOUVEAU]" -#: src/script/arch-update.sh:353 +#: src/script/arch-update.sh:359 #, sh-format msgid "Select the news to read (or just press \"enter\" to quit):" msgstr "Sélectionnez la news à lire (ou appuyez simplement sur \"entrée\" pour quitter) :" -#: src/script/arch-update.sh:355 +#: src/script/arch-update.sh:361 #, sh-format msgid "" "Select the news to read (or just press \"enter\" to proceed with update):" msgstr "" "Sélectionnez la news à lire (ou appuyez simplement sur \"entrée\" pour procéder à la mise à jour) :" -#: src/script/arch-update.sh:366 +#: src/script/arch-update.sh:372 #, sh-format msgid "Title:" msgstr "Titre :" -#: src/script/arch-update.sh:367 +#: src/script/arch-update.sh:373 #, sh-format msgid "Author:" msgstr "Auteur :" -#: src/script/arch-update.sh:368 +#: src/script/arch-update.sh:374 #, sh-format msgid "Publication date:" msgstr "Date de publication :" -#: src/script/arch-update.sh:369 +#: src/script/arch-update.sh:375 #, sh-format msgid "URL:" msgstr "URL :" -#: src/script/arch-update.sh:382 +#: src/script/arch-update.sh:388 #, sh-format msgid "Updating Packages...\\n" msgstr "Mise à jour des paquets...\\n" -#: src/script/arch-update.sh:387 src/script/arch-update.sh:399 -#: src/script/arch-update.sh:410 +#: src/script/arch-update.sh:393 src/script/arch-update.sh:405 +#: src/script/arch-update.sh:416 #, sh-format msgid "" "An error has occurred during the update process\\nThe update has been " @@ -273,27 +273,27 @@ msgstr "" "Une erreur est survenue pendant le processus de mise à jour\\nLa mise à jour a été " "abandonnée\\n" -#: src/script/arch-update.sh:394 +#: src/script/arch-update.sh:400 #, sh-format msgid "Updating AUR Packages...\\n" msgstr "Mise à jour des paquets AUR...\\n" -#: src/script/arch-update.sh:406 +#: src/script/arch-update.sh:412 #, sh-format msgid "Updating Flatpak Packages...\\n" msgstr "Mise à jour des paquets Flatpak...\\n" -#: src/script/arch-update.sh:417 +#: src/script/arch-update.sh:423 #, sh-format msgid "The update has been applied\\n" msgstr "La mise à jour a été appliquée\\n" -#: src/script/arch-update.sh:429 +#: src/script/arch-update.sh:435 #, sh-format msgid "Orphan Packages:" msgstr "Paquets orphelins :" -#: src/script/arch-update.sh:433 +#: src/script/arch-update.sh:439 #, sh-format msgid "" "Would you like to remove this orphan package (and its potential " @@ -302,7 +302,7 @@ msgstr "" "Voulez-vous supprimer ce paquet orphelin (et ses potentielles " "dépendances) maintenant ? [o/N]" -#: src/script/arch-update.sh:435 +#: src/script/arch-update.sh:441 #, sh-format msgid "" "Would you like to remove these orphan packages (and their potential " @@ -311,14 +311,14 @@ msgstr "" "Voulez-vous supprimer ces paquets orphelins (et leurs potentielles " "dépendances) maintenant ? [o/N]" -#: src/script/arch-update.sh:441 +#: src/script/arch-update.sh:447 #, sh-format msgid "Removing Orphan Packages...\\n" msgstr "Suppression des paquets orphelins...\\n" -#: src/script/arch-update.sh:445 src/script/arch-update.sh:478 -#: src/script/arch-update.sh:521 src/script/arch-update.sh:531 -#: src/script/arch-update.sh:541 src/script/arch-update.sh:550 +#: src/script/arch-update.sh:451 src/script/arch-update.sh:484 +#: src/script/arch-update.sh:527 src/script/arch-update.sh:537 +#: src/script/arch-update.sh:547 src/script/arch-update.sh:556 #, sh-format msgid "" "An error has occurred during the removal process\\nThe removal has been " @@ -327,118 +327,118 @@ msgstr "" "Une erreur est survenue pendant le processus de suppression\\nLa suppression a été " "abandonnée\\n" -#: src/script/arch-update.sh:448 src/script/arch-update.sh:481 +#: src/script/arch-update.sh:454 src/script/arch-update.sh:487 #, sh-format msgid "The removal has been applied\\n" msgstr "La suppression a été appliquée\\n" -#: src/script/arch-update.sh:453 src/script/arch-update.sh:485 -#: src/script/arch-update.sh:558 +#: src/script/arch-update.sh:459 src/script/arch-update.sh:491 +#: src/script/arch-update.sh:564 #, sh-format msgid "The removal hasn't been applied\\n" msgstr "La suppression n'a pas été appliquée\\n" -#: src/script/arch-update.sh:457 +#: src/script/arch-update.sh:463 #, sh-format msgid "No orphan package found\\n" msgstr "Aucun paquet orphelin n'a été trouvé\\n" -#: src/script/arch-update.sh:462 +#: src/script/arch-update.sh:468 #, sh-format msgid "Flatpak Unused Packages:" msgstr "Paquets Flatpak inutilisés :" -#: src/script/arch-update.sh:466 +#: src/script/arch-update.sh:472 #, sh-format msgid "Would you like to remove this Flatpak unused package now? [y/N]" msgstr "Voulez-vous supprimer ce paquet Flatpak inutilisé maintenant ? [o/N]" -#: src/script/arch-update.sh:468 +#: src/script/arch-update.sh:474 #, sh-format msgid "Would you like to remove these Flatpak unused packages now? [y/N]" msgstr "Voulez-vous supprimer ces paquets Flatpak inutilisés maintenant ? [o/N]" -#: src/script/arch-update.sh:474 +#: src/script/arch-update.sh:480 #, sh-format msgid "Removing Flatpak Unused Packages..." msgstr "Suppression des paquets Flatpak inutilisés..." -#: src/script/arch-update.sh:489 +#: src/script/arch-update.sh:495 #, sh-format msgid "No Flatpak unused package found\\n" msgstr "Aucun paquet Flatpak inutilisé n'a été trouvé\\n" -#: src/script/arch-update.sh:506 +#: src/script/arch-update.sh:512 #, sh-format msgid "Cached Packages:\\nThere's an old or uninstalled cached package\\n" msgstr "Paquets mis en cache :\\nIl y a un paquet ancien ou désinstallé mis en cache\\n" -#: src/script/arch-update.sh:507 +#: src/script/arch-update.sh:513 #, sh-format msgid "Would you like to remove it from the cache now? [Y/n]" msgstr "Voulez-vous le supprimer du cache maintenant ? [O/n]" -#: src/script/arch-update.sh:509 +#: src/script/arch-update.sh:515 #, sh-format msgid "Cached Packages:\\nThere are old and/or uninstalled cached packages\\n" msgstr "Paquets mis en cache :\\nIl y a plusieurs paquets anciens ou désinstallés mis en cache\\n" -#: src/script/arch-update.sh:510 +#: src/script/arch-update.sh:516 #, sh-format msgid "Would you like to remove them from the cache now? [Y/n]" msgstr "Voulez-vous les supprimer du cache maintenant ? [O/n]" -#: src/script/arch-update.sh:517 src/script/arch-update.sh:537 +#: src/script/arch-update.sh:523 src/script/arch-update.sh:543 #, sh-format msgid "Removing old cached packages..." msgstr "Suppression des anciens paquets mis en cache..." -#: src/script/arch-update.sh:527 src/script/arch-update.sh:546 +#: src/script/arch-update.sh:533 src/script/arch-update.sh:552 #, sh-format msgid "Removing uninstalled cached packages..." msgstr "Suppression des paquets désinstallés mis en cache..." -#: src/script/arch-update.sh:562 +#: src/script/arch-update.sh:568 #, sh-format msgid "No old or uninstalled cached package found\\n" msgstr "Aucun paquet ancien ou désinstallé mis en cache n'a été trouvé\\n" -#: src/script/arch-update.sh:571 +#: src/script/arch-update.sh:577 #, sh-format msgid "Pacnew Files:" msgstr "Fichiers Pacnew :" -#: src/script/arch-update.sh:575 +#: src/script/arch-update.sh:581 #, sh-format msgid "Would you like to process this file now? [Y/n]" msgstr "Voulez-vous traiter ce fichier maintenant ? [O/n]" -#: src/script/arch-update.sh:577 +#: src/script/arch-update.sh:583 #, sh-format msgid "Would you like to process these files now? [Y/n]" msgstr "Voulez-vous traiter ces fichiers maintenant ? [O/n]" -#: src/script/arch-update.sh:583 +#: src/script/arch-update.sh:589 #, sh-format msgid "Processing Pacnew Files...\\n" msgstr "Traitement des fichiers pacnew...\\n" -#: src/script/arch-update.sh:587 +#: src/script/arch-update.sh:593 #, sh-format msgid "The pacnew file(s) processing has been applied\\n" msgstr "Le traitement des fichiers pacnew a été appliqué\\n" -#: src/script/arch-update.sh:590 +#: src/script/arch-update.sh:596 #, sh-format msgid "The pacnew file(s) processing hasn't been applied\\n" msgstr "Le traitement des fichiers pacnew n'a pas été appliqué\\n" -#: src/script/arch-update.sh:594 +#: src/script/arch-update.sh:600 #, sh-format msgid "No pacnew file found\\n" msgstr "Aucun fichier pacnew n'a été trouvé\\n" -#: src/script/arch-update.sh:603 +#: src/script/arch-update.sh:609 #, sh-format msgid "" "Reboot required:\\nThere's a pending kernel update on your system requiring " @@ -447,17 +447,17 @@ msgstr "" "Redémarrage nécessaire :\\nIl y a une mise à jour du noyau en attente sur votre système qui nécessite " "un redémarrage pour être appliquée\\n" -#: src/script/arch-update.sh:604 +#: src/script/arch-update.sh:610 #, sh-format msgid "Would you like to reboot now? [y/N]" msgstr "Voulez-vous redémarrer votre système maintenant ? [o/N]" -#: src/script/arch-update.sh:616 +#: src/script/arch-update.sh:623 #, sh-format msgid "Rebooting in ${sec}...\\r" msgstr "Redémarrage dans ${sec}...\\r" -#: src/script/arch-update.sh:622 +#: src/script/arch-update.sh:629 #, sh-format msgid "" "An error has occurred during the reboot process\\nThe reboot has been " @@ -466,7 +466,7 @@ msgstr "" "Une erreur est survenue pendant le processus de redémarrage\\nLe redémarrage a été " "abandonné\\n" -#: src/script/arch-update.sh:630 +#: src/script/arch-update.sh:637 #, sh-format msgid "" "The reboot hasn't been performed\\nPlease, consider rebooting to finalize " @@ -475,12 +475,17 @@ msgstr "" "Le redémarrage n'a pas été effectué\\nVeuillez considérer redémarrer votre système pour finaliser " "la mise à jour du noyau en attente\\n" -#: src/script/arch-update.sh:634 +#: src/script/arch-update.sh:641 #, sh-format msgid "No pending kernel update found\\n" msgstr "Aucune mise à jour du noyau en attente n'a été trouvée\\n" -#: src/script/arch-update.sh:682 +#: src/script/arch-update.sh:696 +#, sh-format +msgid "Example configuration file not found" +msgstr "Fichier de configuration exemple non trouvé" + +#: src/script/arch-update.sh:701 #, sh-format msgid "" "The '${config_file}' configuration file already exists\\nPlease, remove it " @@ -489,7 +494,7 @@ msgstr "" "Le fichier de configuration '${config_file}' existe déjà.\\nVeuillez le supprimer " "avant d'en générer un nouveau" -#: src/script/arch-update.sh:687 +#: src/script/arch-update.sh:706 #, sh-format msgid "The '${config_file}' configuration file has been generated" msgstr "Le fichier de configuration '${config_file}' a été généré"