diff options
| -rw-r--r-- | po/urpmi.pot | 60 | ||||
| -rw-r--r-- | urpme | 5 | ||||
| -rwxr-xr-x | urpmi | 11 | ||||
| -rw-r--r-- | urpmi.recover | 3 |
4 files changed, 45 insertions, 34 deletions
diff --git a/po/urpmi.pot b/po/urpmi.pot index 2bf64732..80791236 100644 --- a/po/urpmi.pot +++ b/po/urpmi.pot @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2007-02-21 13:05+0100\n" +"POT-Creation-Date: 2007-02-23 19:44+0100\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" @@ -209,7 +209,7 @@ msgid "" "You may want to update your urpmi database" msgstr "" -#: ../gurpmi2:292 ../urpme:138 ../urpmi:741 +#: ../gurpmi2:292 ../urpme:141 ../urpmi:741 #, c-format msgid "removing %s" msgstr "" @@ -1301,25 +1301,32 @@ msgstr "" msgid "Checking to remove the following packages" msgstr "" -#: ../urpme:132 +#: ../urpme:133 #, c-format -msgid "" -"To satisfy dependencies, the following %d packages will be removed (%d MB)" +msgid "To satisfy dependencies, the following package will be removed" +msgid_plural "" +"To satisfy dependencies, the following %d packages will be removed" +msgstr[0] "" +msgstr[1] "" + +#: ../urpme:135 ../urpmi:600 +#, c-format +msgid " (%d MB)" msgstr "" -#: ../urpme:134 +#: ../urpme:137 #, c-format msgid "Remove %d package?" msgid_plural "Remove %d packages?" msgstr[0] "" msgstr[1] "" -#: ../urpme:134 ../urpmi:553 ../urpmi:682 ../urpmi.addmedia:137 +#: ../urpme:137 ../urpmi:553 ../urpmi:682 ../urpmi.addmedia:137 #, c-format msgid " (y/N) " msgstr "" -#: ../urpme:156 +#: ../urpme:159 #, c-format msgid "Removal failed" msgstr "" @@ -2033,15 +2040,10 @@ msgstr "" msgid "(test only, installation will not be actually done)" msgstr "" -#: ../urpmi:598 +#: ../urpmi:597 #, c-format -msgid "Proceed with the installation of 1 package? (%d MB)" -msgstr "" - -#: ../urpmi:599 -#, c-format -msgid "Proceed with the installation of the %d package? (%d MB)" -msgid_plural "Proceed with the installation of the %d packages? (%d MB)" +msgid "Proceed with the installation of one package?" +msgid_plural "Proceed with the installation of the %d packages?" msgstr[0] "" msgstr[1] "" @@ -2102,40 +2104,42 @@ msgstr "" #: ../urpmi:825 #, c-format -msgid "%d installation transactions failed" -msgstr "" +msgid "%d installation transaction failed" +msgid_plural "%d installation transactions failed" +msgstr[0] "" +msgstr[1] "" -#: ../urpmi:834 +#: ../urpmi:835 #, c-format msgid "Installation is possible" msgstr "" -#: ../urpmi:839 +#: ../urpmi:840 #, c-format msgid "Packages are up to date" msgstr "" -#: ../urpmi:847 +#: ../urpmi:848 #, c-format msgid "Package %s is already installed" msgstr "" -#: ../urpmi:848 +#: ../urpmi:849 #, c-format msgid "Packages %s are already installed" msgstr "" -#: ../urpmi:851 +#: ../urpmi:852 #, c-format msgid "Package %s can not be installed" msgstr "" -#: ../urpmi:852 +#: ../urpmi:853 #, c-format msgid "Packages %s can not be installed" msgstr "" -#: ../urpmi:871 +#: ../urpmi:872 #, c-format msgid "restarting urpmi" msgstr "" @@ -2363,8 +2367,10 @@ msgstr "" #: ../urpmi.recover:72 #, c-format -msgid "%d files removed\n" -msgstr "" +msgid "%d file removed\n" +msgid_plural "%d files removed\n" +msgstr[0] "" +msgstr[1] "" #: ../urpmi.recover:82 #, c-format @@ -129,7 +129,10 @@ if ($test && $auto) { foreach (@toremove) { $sum += $state->{rejected}{$_}{size}; } - my $msg = N("To satisfy dependencies, the following %d packages will be removed (%d MB)", scalar(@toremove), toMb($sum)); + my $msg = + P("To satisfy dependencies, the following package will be removed", + "To satisfy dependencies, the following %d packages will be removed", + scalar(@toremove), scalar(@toremove)) . N(" (%d MB)", toMb($sum)); print STDOUT "$msg:\n$list\n"; message_input(P("Remove %d package?", "Remove %d packages?", scalar(@toremove), scalar(@toremove)) . N(" (y/N) "), $force && $yesexpr, boolean => 1) =~ /[$yesexpr]/ or exit 0; } @@ -594,10 +594,10 @@ if (@root_only) { if ($test) { $msg = "$msg\n" . N("(test only, installation will not be actually done)"); } - my $msg2 = ($urpm->{nb_install} == 1) ? - N("Proceed with the installation of 1 package? (%d MB)",toMb($sum)) - : P("Proceed with the installation of the %d package? (%d MB)", - "Proceed with the installation of the %d packages? (%d MB)", $urpm->{nb_install}, $urpm->{nb_install}, toMb($sum)); + my $msg2 = P("Proceed with the installation of one package?", + "Proceed with the installation of the %d packages?", + $urpm->{nb_install}, $urpm->{nb_install}) + . N(" (%d MB)", toMb($sum)); my $p = join "\n", @to_install; my $noexpr = N("Nn"); my $yesexpr = N("Yy"); @@ -822,7 +822,8 @@ if (values %error_sources) { $exit_code = 10; } if ($nok) { - $nok > 1 and print N("%d installation transactions failed", $nok) . (@errors && ":\n" . join("\n", map { "\t$_" } @errors)), "\n"; + $nok > 1 and print P("%d installation transaction failed", + "%d installation transactions failed", $nok, $nok) . (@errors && ":\n" . join("\n", map { "\t$_" } @errors)), "\n"; if ($exit_code) { $exit_code = $ok ? 13 : 14; } else { diff --git a/urpmi.recover b/urpmi.recover index fc8024a4..3e9cd0af 100644 --- a/urpmi.recover +++ b/urpmi.recover @@ -33,6 +33,7 @@ usage: ", $urpm::VERSION) . N(" --help - print this help message. ") . N(" --checkpoint - set repackaging start now ") . N(" --noclean - don't clean repackage directory on checkpoint +") . N(" --urpmi-root - use another root for urpmi db & rpm installation. ") . N(" --list - list transactions since provided date/duration argument ") . N(" --list-all - list all transactions in rpmdb (long) ") . N(" --list-safe - list transactions since checkpoint @@ -68,7 +69,7 @@ sub clean_repackage_dir { unless ($noclean) { print N("Cleaning up repackage directory [%s]...\n", $repackage_dir); my $nb = unlink grep { ! -d $_ } glob("$repackage_dir/*"); - print N("%d files removed\n", $nb); + print P("%d file removed\n", "%d files removed\n", $nb, $nb); } } |