# HG changeset patch # User Aleksej Bobylev # Date 1417486503 -7200 # Node ID 608981c962f8366438612540b7b36e97f195f038 # Parent 52d1418d89d7b3b7c1496f3d2ea1605d41e2554e Use other confirm() (see slitaz-base-files package). diff -r 52d1418d89d7 -r 608981c962f8 Makefile --- a/Makefile Tue Dec 02 02:22:09 2014 +0200 +++ b/Makefile Tue Dec 02 04:15:03 2014 +0200 @@ -20,7 +20,8 @@ xgettext -o po/tazpkg.pot -L Shell \ --package-name=TazPkg \ --package-version="$(VERSION)" -kaction -ktitle -k_ -k_n \ - ./tazpkg ./tazpkg-box ./pkgs ./pkgs.cgi ./tazpkg-notify + ./tazpkg ./tazpkg-convert ./tazpkg-find-depends ./tazpkg-box \ + ./pkgs ./pkgs.cgi ./tazpkg-notify msgmerge: @for l in $(LINGUAS); do \ diff -r 52d1418d89d7 -r 608981c962f8 po/el.po --- a/po/el.po Tue Dec 02 02:22:09 2014 +0200 +++ b/po/el.po Tue Dec 02 04:15:03 2014 +0200 @@ -488,8 +488,8 @@ msgstr[1] "$num λείπουν πακέτα για εγκατάσταση" #: tazpkg:858 -msgid "Install all missing dependencies" -msgstr "Να εγκατασταθούν όλες οι εξαρτήσεις που λείπουν" +msgid "Install all missing dependencies? (y/N)" +msgstr "Να εγκατασταθούν όλες οι εξαρτήσεις που λείπουν? (y/N)" #: tazpkg:874 #, sh-format @@ -880,8 +880,8 @@ #: tazpkg:2046 #, sh-format -msgid "Remove $PACKAGE ($VERSION$EXTRAVERSION)" -msgstr "Να γίνει απομάκρυνση του $PACKAGE ($VERSION$EXTRAVERSION)" +msgid "Remove $PACKAGE ($VERSION$EXTRAVERSION)? (y/N)" +msgstr "Να γίνει απομάκρυνση του $PACKAGE ($VERSION$EXTRAVERSION)? (y/N)" #: tazpkg:2050 #, sh-format @@ -898,13 +898,13 @@ #: tazpkg:2087 #, sh-format -msgid "Remove packages depending on $PACKAGE" -msgstr "Να γίνει απομάκρυνση των πακέτων που εξαρτώνται από το $PACKAGE" +msgid "Remove packages depending on $PACKAGE? (y/N)" +msgstr "Να γίνει απομάκρυνση των πακέτων που εξαρτώνται από το $PACKAGE? (y/N)" #: tazpkg:2102 #, sh-format -msgid "Reinstall packages modified by $PACKAGE" -msgstr "Να επανεγκατασταθούν τα πακέτα που εξαρτώνται από το $PACKAGE" +msgid "Reinstall packages modified by $PACKAGE? (y/N)" +msgstr "Να επανεγκατασταθούν τα πακέτα που εξαρτώνται από το $PACKAGE? (y/N)" #: tazpkg:2108 #, sh-format @@ -1274,8 +1274,8 @@ #: tazpkg:2880 #, sh-format -msgid "Remove $undigest undigest" -msgstr "Απομάκρυνση $undigest πειραματικού (undigest)" +msgid "Remove $undigest undigest? (y/N)" +msgstr "Απομάκρυνση $undigest πειραματικού (undigest)? (y/N)" #: tazpkg:2882 #, sh-format @@ -1356,8 +1356,8 @@ msgstr "Λείπουν: $i" #: tazpkg:3044 -msgid "Link all missing dependencies" -msgstr "Σύνδεση όλων των εξαρτήσεων που λείπουν" +msgid "Link all missing dependencies? (y/N)" +msgstr "Σύνδεση όλων των εξαρτήσεων που λείπουν? (y/N)" #: tazpkg:3053 #, sh-format diff -r 52d1418d89d7 -r 608981c962f8 po/es.po --- a/po/es.po Tue Dec 02 02:22:09 2014 +0200 +++ b/po/es.po Tue Dec 02 04:15:03 2014 +0200 @@ -459,8 +459,8 @@ msgstr[1] "Paquetes $num faltantes para instalar." #: tazpkg:858 -msgid "Install all missing dependencies" -msgstr "Instalando todas las dependencias faltantes" +msgid "Install all missing dependencies? (y/N)" +msgstr "Instalando todas las dependencias faltantes? (y/N)" #: tazpkg:874 #, sh-format @@ -846,8 +846,8 @@ #: tazpkg:2046 #, sh-format -msgid "Remove $PACKAGE ($VERSION$EXTRAVERSION)" -msgstr "Removiendo $PACKAGE ($VERSION$EXTRAVERSION)" +msgid "Remove $PACKAGE ($VERSION$EXTRAVERSION)? (y/N)" +msgstr "Removiendo $PACKAGE ($VERSION$EXTRAVERSION)? (y/N)" #: tazpkg:2050 #, sh-format @@ -864,13 +864,13 @@ #: tazpkg:2087 #, sh-format -msgid "Remove packages depending on $PACKAGE" -msgstr "Removiendo los paquetes dependientes en $PACKAGE" +msgid "Remove packages depending on $PACKAGE? (y/N)" +msgstr "Removiendo los paquetes dependientes en $PACKAGE? (y/N)" #: tazpkg:2102 #, sh-format -msgid "Reinstall packages modified by $PACKAGE" -msgstr "Reinstala paquetes modificados por $PACKAGE" +msgid "Reinstall packages modified by $PACKAGE? (y/N)" +msgstr "Reinstala paquetes modificados por $PACKAGE? (y/N)" #: tazpkg:2108 #, sh-format @@ -1235,7 +1235,7 @@ #: tazpkg:2880 #, sh-format -msgid "Remove $undigest undigest" +msgid "Remove $undigest undigest? (y/N)" msgstr "" #: tazpkg:2882 @@ -1311,8 +1311,8 @@ msgstr "Faltante : $i" #: tazpkg:3044 -msgid "Link all missing dependencies" -msgstr "Enlazando todas las dependencias faltantes" +msgid "Link all missing dependencies? (y/N)" +msgstr "Enlazando todas las dependencias faltantes? (y/N)" #: tazpkg:3053 #, fuzzy, sh-format diff -r 52d1418d89d7 -r 608981c962f8 po/fr.po --- a/po/fr.po Tue Dec 02 02:22:09 2014 +0200 +++ b/po/fr.po Tue Dec 02 04:15:03 2014 +0200 @@ -429,8 +429,8 @@ msgstr[1] "$num paquets manquants à installer." #: tazpkg:858 -msgid "Install all missing dependencies" -msgstr "Installer toutes les dépendances manquantes" +msgid "Install all missing dependencies? (y/N)" +msgstr "Installer toutes les dépendances manquantes ? (o/N)" #: tazpkg:874 #, sh-format @@ -811,8 +811,8 @@ #: tazpkg:2046 #, sh-format -msgid "Remove $PACKAGE ($VERSION$EXTRAVERSION)" -msgstr "Supprimer $PACKAGE ($VERSION$EXTRAVERSION)" +msgid "Remove $PACKAGE ($VERSION$EXTRAVERSION)? (y/N)" +msgstr "Supprimer $PACKAGE ($VERSION$EXTRAVERSION) ? (o/N)" #: tazpkg:2050 #, sh-format @@ -829,13 +829,13 @@ #: tazpkg:2087 #, sh-format -msgid "Remove packages depending on $PACKAGE" -msgstr "Suppression des paquets dépendant de $PACKAGE" +msgid "Remove packages depending on $PACKAGE? (y/N)" +msgstr "Suppression des paquets dépendant de $PACKAGE ? (o/N)" #: tazpkg:2102 #, sh-format -msgid "Reinstall packages modified by $PACKAGE" -msgstr "Réinstaller les paquets modifiés par $PACKAGE" +msgid "Reinstall packages modified by $PACKAGE? (y/N)" +msgstr "Réinstaller les paquets modifiés par $PACKAGE ? (o/N)" #: tazpkg:2108 #, sh-format @@ -1209,8 +1209,8 @@ #: tazpkg:2880 #, sh-format -msgid "Remove $undigest undigest" -msgstr "Supprimer le miroir $undigest" +msgid "Remove $undigest undigest? (y/N)" +msgstr "Supprimer le miroir $undigest ? (o/N)" #: tazpkg:2882 #, sh-format @@ -1286,8 +1286,8 @@ msgstr "Manque: $i" #: tazpkg:3044 -msgid "Link all missing dependencies" -msgstr "Lier toutes les dépendance manquantes" +msgid "Link all missing dependencies? (y/N)" +msgstr "Lier toutes les dépendance manquantes ? (o/N)" #: tazpkg:3053 #, fuzzy, sh-format diff -r 52d1418d89d7 -r 608981c962f8 po/pl.po --- a/po/pl.po Tue Dec 02 02:22:09 2014 +0200 +++ b/po/pl.po Tue Dec 02 04:15:03 2014 +0200 @@ -480,8 +480,8 @@ msgstr[2] "$num brakujących pakietów do instalacji." #: tazpkg:858 -msgid "Install all missing dependencies" -msgstr "Zainstaluj wszystkie brakujące zalezności" +msgid "Install all missing dependencies? (y/N)" +msgstr "Zainstaluj wszystkie brakujące zalezności? (t/N)" #: tazpkg:874 #, sh-format @@ -874,8 +874,8 @@ #: tazpkg:2046 #, sh-format -msgid "Remove $PACKAGE ($VERSION$EXTRAVERSION)" -msgstr "Usuwa $PACKAGE ($VERSION$EXTRAVERSION)" +msgid "Remove $PACKAGE ($VERSION$EXTRAVERSION)? (y/N)" +msgstr "Usuwa $PACKAGE ($VERSION$EXTRAVERSION)? (t/N)" #: tazpkg:2050 #, sh-format @@ -892,13 +892,13 @@ #: tazpkg:2087 #, sh-format -msgid "Remove packages depending on $PACKAGE" -msgstr "Usunąć pakiety zależne od $PACKAGE" +msgid "Remove packages depending on $PACKAGE? (y/N)" +msgstr "Usunąć pakiety zależne od $PACKAGE? (t/N)" #: tazpkg:2102 #, sh-format -msgid "Reinstall packages modified by $PACKAGE" -msgstr "Zainstalować ponownie pakiety zmodyfikowane przez $PACKAGE" +msgid "Reinstall packages modified by $PACKAGE? (y/N)" +msgstr "Zainstalować ponownie pakiety zmodyfikowane przez $PACKAGE? (t/N)" #: tazpkg:2108 #, sh-format @@ -1268,8 +1268,8 @@ #: tazpkg:2880 #, sh-format -msgid "Remove $undigest undigest" -msgstr "Usuwa prywatne repozytorium $undigest" +msgid "Remove $undigest undigest? (y/N)" +msgstr "Usuwa prywatne repozytorium $undigest? (t/N)" #: tazpkg:2882 #, sh-format @@ -1350,8 +1350,8 @@ msgstr "Brakujące: $i" #: tazpkg:3044 -msgid "Link all missing dependencies" -msgstr "Tworzy dowiązanie wszystkich brakujących zależnośći" +msgid "Link all missing dependencies? (y/N)" +msgstr "Tworzy dowiązanie wszystkich brakujących zależnośći? (t/N)" #: tazpkg:3053 #, sh-format diff -r 52d1418d89d7 -r 608981c962f8 po/pt_BR.po --- a/po/pt_BR.po Tue Dec 02 02:22:09 2014 +0200 +++ b/po/pt_BR.po Tue Dec 02 04:15:03 2014 +0200 @@ -407,8 +407,8 @@ msgstr[1] "$num faltantes para instalar." #: tazpkg:858 -msgid "Install all missing dependencies" -msgstr "Instalando todas as dependências faltantes" +msgid "Install all missing dependencies? (y/N)" +msgstr "Instalando todas as dependências faltantes? (y/N)" #: tazpkg:874 #, sh-format @@ -787,8 +787,8 @@ #: tazpkg:2046 #, sh-format -msgid "Remove $PACKAGE ($VERSION$EXTRAVERSION)" -msgstr "Remover $PACKAGE ($VERSION$EXTRAVERSION)" +msgid "Remove $PACKAGE ($VERSION$EXTRAVERSION)? (y/N)" +msgstr "Remover $PACKAGE ($VERSION$EXTRAVERSION)? (y/N)" #: tazpkg:2050 #, sh-format @@ -805,13 +805,13 @@ #: tazpkg:2087 #, sh-format -msgid "Remove packages depending on $PACKAGE" -msgstr "Removendo pacotes que dependem de $PACKAGE" +msgid "Remove packages depending on $PACKAGE? (y/N)" +msgstr "Removendo pacotes que dependem de $PACKAGE? (y/N)" #: tazpkg:2102 #, sh-format -msgid "Reinstall packages modified by $PACKAGE" -msgstr "Reinstala pacotes modificados por $PACKAGE" +msgid "Reinstall packages modified by $PACKAGE? (y/N)" +msgstr "Reinstala pacotes modificados por $PACKAGE? (y/N)" #: tazpkg:2108 #, sh-format @@ -1175,8 +1175,8 @@ #: tazpkg:2880 #, sh-format -msgid "Remove $undigest undigest" -msgstr "Remove undigest $undigest" +msgid "Remove $undigest undigest? (y/N)" +msgstr "Remove undigest $undigest? (y/N)" #: tazpkg:2882 #, sh-format @@ -1251,8 +1251,8 @@ msgstr "Falta: $i" #: tazpkg:3044 -msgid "Link all missing dependencies" -msgstr "Liga todas as dependências perdidas" +msgid "Link all missing dependencies? (y/N)" +msgstr "Liga todas as dependências perdidas? (y/N)" #: tazpkg:3053 #, sh-format diff -r 52d1418d89d7 -r 608981c962f8 po/ru.po --- a/po/ru.po Tue Dec 02 02:22:09 2014 +0200 +++ b/po/ru.po Tue Dec 02 04:15:03 2014 +0200 @@ -459,8 +459,8 @@ msgstr[2] "Отсутствуют $num пакетов для установки." #: tazpkg:858 -msgid "Install all missing dependencies" -msgstr "Установить все отсутствующие зависимости" +msgid "Install all missing dependencies? (y/N)" +msgstr "Установить все отсутствующие зависимости? (y/N)" #: tazpkg:874 #, sh-format @@ -852,8 +852,8 @@ #: tazpkg:2046 #, sh-format -msgid "Remove $PACKAGE ($VERSION$EXTRAVERSION)" -msgstr "Удалить пакет $PACKAGE ($VERSION$EXTRAVERSION)" +msgid "Remove $PACKAGE ($VERSION$EXTRAVERSION)? (y/N)" +msgstr "Удалить пакет $PACKAGE ($VERSION$EXTRAVERSION)? (y/N)" #: tazpkg:2050 #, sh-format @@ -870,13 +870,13 @@ #: tazpkg:2087 #, sh-format -msgid "Remove packages depending on $PACKAGE" -msgstr "Удаление пакетов, зависящих от $PACKAGE" +msgid "Remove packages depending on $PACKAGE? (y/N)" +msgstr "Удалить пакеты, зависящие от $PACKAGE? (y/N)" #: tazpkg:2102 #, sh-format -msgid "Reinstall packages modified by $PACKAGE" -msgstr "Переустановка пакетов, измененных $PACKAGE" +msgid "Reinstall packages modified by $PACKAGE? (y/N)" +msgstr "Переустановить пакеты, измененные $PACKAGE? (y/N)" #: tazpkg:2108 #, sh-format @@ -1246,8 +1246,8 @@ #: tazpkg:2880 #, sh-format -msgid "Remove $undigest undigest" -msgstr "Удалить неофициальное зеркало $undigest" +msgid "Remove $undigest undigest? (y/N)" +msgstr "Удалить неофициальное зеркало $undigest? (y/N)" #: tazpkg:2882 #, sh-format @@ -1326,8 +1326,8 @@ msgstr "Отсутствует: $i" #: tazpkg:3044 -msgid "Link all missing dependencies" -msgstr "Создать ссылки на все отсутствующие зависимости" +msgid "Link all missing dependencies? (y/N)" +msgstr "Создать ссылки на все отсутствующие зависимости? (y/N)" #: tazpkg:3053 #, sh-format diff -r 52d1418d89d7 -r 608981c962f8 po/sv.po --- a/po/sv.po Tue Dec 02 02:22:09 2014 +0200 +++ b/po/sv.po Tue Dec 02 04:15:03 2014 +0200 @@ -411,7 +411,7 @@ msgstr[1] "" #: tazpkg:858 -msgid "Install all missing dependencies" +msgid "Install all missing dependencies? (y/N)" msgstr "" #: tazpkg:874 @@ -787,7 +787,7 @@ #: tazpkg:2046 #, sh-format -msgid "Remove $PACKAGE ($VERSION$EXTRAVERSION)" +msgid "Remove $PACKAGE ($VERSION$EXTRAVERSION)? (y/N)" msgstr "" #: tazpkg:2050 @@ -806,12 +806,12 @@ #: tazpkg:2087 #, sh-format -msgid "Remove packages depending on $PACKAGE" +msgid "Remove packages depending on $PACKAGE? (y/N)" msgstr "" #: tazpkg:2102 #, sh-format -msgid "Reinstall packages modified by $PACKAGE" +msgid "Reinstall packages modified by $PACKAGE? (y/N)" msgstr "" #: tazpkg:2108 @@ -1186,7 +1186,7 @@ #: tazpkg:2880 #, sh-format -msgid "Remove $undigest undigest" +msgid "Remove $undigest undigest? (y/N)" msgstr "" #: tazpkg:2882 @@ -1258,7 +1258,7 @@ msgstr "" #: tazpkg:3044 -msgid "Link all missing dependencies" +msgid "Link all missing dependencies? (y/N)" msgstr "" #: tazpkg:3053 diff -r 52d1418d89d7 -r 608981c962f8 po/tazpkg.pot --- a/po/tazpkg.pot Tue Dec 02 02:22:09 2014 +0200 +++ b/po/tazpkg.pot Tue Dec 02 04:15:03 2014 +0200 @@ -404,7 +404,7 @@ msgstr[1] "" #: tazpkg:858 -msgid "Install all missing dependencies" +msgid "Install all missing dependencies? (y/N)" msgstr "" #: tazpkg:874 @@ -772,7 +772,7 @@ #: tazpkg:2046 #, sh-format -msgid "Remove $PACKAGE ($VERSION$EXTRAVERSION)" +msgid "Remove $PACKAGE ($VERSION$EXTRAVERSION)? (y/N)" msgstr "" #: tazpkg:2050 @@ -790,12 +790,12 @@ #: tazpkg:2087 #, sh-format -msgid "Remove packages depending on $PACKAGE" +msgid "Remove packages depending on $PACKAGE? (y/N)" msgstr "" #: tazpkg:2102 #, sh-format -msgid "Reinstall packages modified by $PACKAGE" +msgid "Reinstall packages modified by $PACKAGE? (y/N)" msgstr "" #: tazpkg:2108 @@ -1157,7 +1157,7 @@ #: tazpkg:2880 #, sh-format -msgid "Remove $undigest undigest" +msgid "Remove $undigest undigest? (y/N)" msgstr "" #: tazpkg:2882 @@ -1229,7 +1229,7 @@ msgstr "" #: tazpkg:3044 -msgid "Link all missing dependencies" +msgid "Link all missing dependencies? (y/N)" msgstr "" #: tazpkg:3053 diff -r 52d1418d89d7 -r 608981c962f8 po/zh_CN.po --- a/po/zh_CN.po Tue Dec 02 02:22:09 2014 +0200 +++ b/po/zh_CN.po Tue Dec 02 04:15:03 2014 +0200 @@ -403,8 +403,8 @@ msgstr[0] "有 $num 个缺少的包需要安装。" #: tazpkg:858 -msgid "Install all missing dependencies" -msgstr "安装所有欠缺依赖" +msgid "Install all missing dependencies? (y/N)" +msgstr "安装所有欠缺依赖？ （是/否）" #: tazpkg:874 #, sh-format @@ -777,8 +777,8 @@ #: tazpkg:2046 #, sh-format -msgid "Remove $PACKAGE ($VERSION$EXTRAVERSION)" -msgstr "移除 $PACKAGE ($VERSION$EXTRAVERSION)" +msgid "Remove $PACKAGE ($VERSION$EXTRAVERSION)? (y/N)" +msgstr "移除 $PACKAGE ($VERSION$EXTRAVERSION)？ （是/否）" #: tazpkg:2050 #, sh-format @@ -795,13 +795,13 @@ #: tazpkg:2087 #, sh-format -msgid "Remove packages depending on $PACKAGE" -msgstr "移除依赖 $PACKAGE 的包" +msgid "Remove packages depending on $PACKAGE? (y/N)" +msgstr "移除依赖 $PACKAGE 的包？ （是/否）" #: tazpkg:2102 #, sh-format -msgid "Reinstall packages modified by $PACKAGE" -msgstr "重新安装被 $PACKAGE 更改过的包" +msgid "Reinstall packages modified by $PACKAGE? (y/N)" +msgstr "重新安装被 $PACKAGE 更改过的包？ （是/否）" #: tazpkg:2108 #, sh-format @@ -1165,8 +1165,8 @@ #: tazpkg:2880 #, sh-format -msgid "Remove $undigest undigest" -msgstr "移除 $undigest 未整理包" +msgid "Remove $undigest undigest? (y/N)" +msgstr "移除 $undigest 未整理包？ （是/否）" #: tazpkg:2882 #, sh-format @@ -1241,8 +1241,8 @@ msgstr "欠缺: $i" #: tazpkg:3044 -msgid "Link all missing dependencies" -msgstr "链接所有欠缺的依赖" +msgid "Link all missing dependencies? (y/N)" +msgstr "链接所有欠缺的依赖？ （是/否）" #: tazpkg:3053 #, sh-format diff -r 52d1418d89d7 -r 608981c962f8 po/zh_TW.po --- a/po/zh_TW.po Tue Dec 02 02:22:09 2014 +0200 +++ b/po/zh_TW.po Tue Dec 02 04:15:03 2014 +0200 @@ -407,8 +407,8 @@ msgstr[1] "有 $num 個缺少的包需要安裝" #: tazpkg:858 -msgid "Install all missing dependencies" -msgstr "安裝所有欠缺依賴" +msgid "Install all missing dependencies? (y/N)" +msgstr "安裝所有欠缺依賴？ （是/否）" #: tazpkg:874 #, sh-format @@ -786,8 +786,8 @@ #: tazpkg:2046 #, sh-format -msgid "Remove $PACKAGE ($VERSION$EXTRAVERSION)" -msgstr "移除 $PACKAGE ($VERSION$EXTRAVERSION)" +msgid "Remove $PACKAGE ($VERSION$EXTRAVERSION)? (y/N)" +msgstr "移除 $PACKAGE ($VERSION$EXTRAVERSION)？ （是/否）" #: tazpkg:2050 #, sh-format @@ -804,13 +804,13 @@ #: tazpkg:2087 #, sh-format -msgid "Remove packages depending on $PACKAGE" -msgstr "移除依賴 $PACKAGE 的包" +msgid "Remove packages depending on $PACKAGE? (y/N)" +msgstr "移除依賴 $PACKAGE 的包？ （是/否）" #: tazpkg:2102 #, sh-format -msgid "Reinstall packages modified by $PACKAGE" -msgstr "重新安裝被 $PACKAGE 更改過的包" +msgid "Reinstall packages modified by $PACKAGE? (y/N)" +msgstr "重新安裝被 $PACKAGE 更改過的包？ （是/否）" #: tazpkg:2108 #, sh-format @@ -1174,7 +1174,7 @@ #: tazpkg:2880 #, sh-format -msgid "Remove $undigest undigest" +msgid "Remove $undigest undigest? (y/N)" msgstr "" #: tazpkg:2882 @@ -1251,8 +1251,8 @@ msgstr "欠缺: $i" #: tazpkg:3044 -msgid "Link all missing dependencies" -msgstr "鏈接所有欠缺的依賴" +msgid "Link all missing dependencies? (y/N)" +msgstr "鏈接所有欠缺的依賴？ （是/否）" #: tazpkg:3053 #, sh-format diff -r 52d1418d89d7 -r 608981c962f8 tazpkg --- a/tazpkg Tue Dec 02 02:22:09 2014 +0200 +++ b/tazpkg Tue Dec 02 04:15:03 2014 +0200 @@ -968,7 +968,7 @@ answer=0 else newline - _n 'Install all missing dependencies'; confirm + confirm "$(_ 'Install all missing dependencies? (y/N)')" answer=$? newline fi @@ -1745,7 +1745,7 @@ if [ "$auto" ]; then answer=0 else - _n 'Remove $PACKAGE ($VERSION$EXTRAVERSION)'; confirm + confirm "$(_ 'Remove $PACKAGE ($VERSION$EXTRAVERSION)? (y/N)')" answer=$? fi if [ $answer = 0 ]; then @@ -1786,7 +1786,7 @@ if [ "$auto" ]; then answer=0 else - _n 'Remove packages depending on $PACKAGE'; confirm + confirm "$(_ 'Remove packages depending on $PACKAGE? (y/N)')" answer=$? fi if [ $answer = 0 ]; then @@ -1801,7 +1801,7 @@ if [ "$auto" ]; then answer=0 else - _n 'Reinstall packages modified by $PACKAGE'; confirm + confirm "$(_ 'Reinstall packages modified by $PACKAGE? (y/N)')" answer=$? fi if [ $answer = 0 ]; then @@ -2614,7 +2614,7 @@ check_root $@ undigest="$2" if [ -d $LOCALSTATE/undigest/$2 ]; then - _n 'Remove $undigest undigest'; confirm + confirm "$(_ 'Remove $undigest undigest? (y/N)')" if [ $? = 0 ]; then action 'Removing $undigest undigest...' rm -rf $LOCALSTATE/undigest/$2 @@ -2770,7 +2770,7 @@ done if [ -n "$MISSING" ]; then newline - _n 'Link all missing dependencies'; confirm + confirm "$(_ 'Link all missing dependencies? (y/N)')" answer=$? newline if [ $answer = 0 ]; then