diff options
| -rw-r--r-- | debian/apt.cron.daily | 440 | ||||
| -rw-r--r-- | debian/changelog | 24 | ||||
| -rw-r--r-- | doc/examples/configure-index | 52 | ||||
| -rwxr-xr-x | dselect/install | 3 | ||||
| -rw-r--r-- | po/ChangeLog | 20 | ||||
| -rw-r--r-- | po/apt-all.pot | 18 | ||||
| -rw-r--r-- | po/ar.po | 18 | ||||
| -rw-r--r-- | po/bg.po | 18 | ||||
| -rw-r--r-- | po/bs.po | 18 | ||||
| -rw-r--r-- | po/ca.po | 59 | ||||
| -rw-r--r-- | po/cs.po | 18 | ||||
| -rw-r--r-- | po/cy.po | 18 | ||||
| -rw-r--r-- | po/da.po | 18 | ||||
| -rw-r--r-- | po/de.po | 18 | ||||
| -rw-r--r-- | po/dz.po | 18 | ||||
| -rw-r--r-- | po/el.po | 18 | ||||
| -rw-r--r-- | po/en_GB.po | 18 | ||||
| -rw-r--r-- | po/es.po | 18 | ||||
| -rw-r--r-- | po/eu.po | 18 | ||||
| -rw-r--r-- | po/fi.po | 18 | ||||
| -rw-r--r-- | po/fr.po | 91 | ||||
| -rw-r--r-- | po/gl.po | 18 | ||||
| -rw-r--r-- | po/he.po | 18 | ||||
| -rw-r--r-- | po/hu.po | 18 | ||||
| -rw-r--r-- | po/it.po | 18 | ||||
| -rw-r--r-- | po/ja.po | 18 | ||||
| -rw-r--r-- | po/km.po | 18 | ||||
| -rw-r--r-- | po/ko.po | 18 | ||||
| -rw-r--r-- | po/ku.po | 18 | ||||
| -rw-r--r-- | po/mr.po | 18 | ||||
| -rw-r--r-- | po/nb.po | 18 | ||||
| -rw-r--r-- | po/ne.po | 18 | ||||
| -rw-r--r-- | po/nl.po | 18 | ||||
| -rw-r--r-- | po/nn.po | 18 | ||||
| -rw-r--r-- | po/pl.po | 18 | ||||
| -rw-r--r-- | po/pt.po | 18 | ||||
| -rw-r--r-- | po/pt_BR.po | 18 | ||||
| -rw-r--r-- | po/ro.po | 18 | ||||
| -rw-r--r-- | po/ru.po | 18 | ||||
| -rw-r--r-- | po/sk.po | 18 | ||||
| -rw-r--r-- | po/sl.po | 18 | ||||
| -rw-r--r-- | po/sv.po | 18 | ||||
| -rw-r--r-- | po/th.po | 18 | ||||
| -rw-r--r-- | po/tl.po | 18 | ||||
| -rw-r--r-- | po/uk.po | 18 | ||||
| -rw-r--r-- | po/vi.po | 18 | ||||
| -rw-r--r-- | po/zh_CN.po | 35 | ||||
| -rw-r--r-- | po/zh_TW.po | 18 |
48 files changed, 909 insertions, 535 deletions
diff --git a/debian/apt.cron.daily b/debian/apt.cron.daily index 1ca830c93..d89d9b2c0 100644 --- a/debian/apt.cron.daily +++ b/debian/apt.cron.daily @@ -1,40 +1,67 @@ #!/bin/sh -# - #set -e # # This file understands the following apt configuration variables: +# Values here are the default. +# Create /etc/apt/apt.conf.d/02periodic file to set your preference. # -# "APT::Periodic::Update-Package-Lists=1" -# - Do "apt-get update" automatically every n-days (0=disable) -# -# "APT::Periodic::Download-Upgradeable-Packages=0", -# - Do "apt-get upgrade --download-only" every n-days (0=disable) -# -# "APT::Periodic::AutocleanInterval" -# - Do "apt-get autoclean" every n-days (0=disable) +# Dir "/"; +# - RootDir for all configuration files # -# "APT::Periodic::Unattended-Upgrade" -# - Run the "unattended-upgrade" security upgrade script -# every n-days (0=disabled) -# Requires the package "unattended-upgrades" and will write -# a log in /var/log/unattended-upgrades -# -# "APT::Archives::MaxAge", +# Dir::Cache "var/apt/cache/"; +# - Set apt package cache directory +# +# Dir::Cache::Archive "archives/"; +# - Set package archive directory +# +# APT::Periodic::BackupArchiveInterval "0"; +# - Backup after n-days if archive contents changed.(0=disable) +# +# APT::Periodic::BackupLevel "3"; +# - Backup level.(0=disable), 1 is invalid. +# +# Dir::Cache::Backup "backup/"; +# - Set periodic package backup directory +# +# APT::Archives::MaxAge "0"; (old, deprecated) +# APT::Periodic::MaxAge "0"; (new) # - Set maximum allowed age of a cache package file. If a cache # package file is older it is deleted (0=disable) # -# "APT::Archives::MaxSize", +# APT::Archives::MinAge "2"; (old, deprecated) +# APT::Periodic::MinAge "2"; (new) +# - Set minimum age of a package file. If a file is younger it +# will not be deleted (0=disable). Usefull to prevent races +# and to keep backups of the packages for emergency. +# +# APT::Archives::MaxSize "0"; (old, deprecated) +# APT::Periodic::MaxSize "0"; (new) # - Set maximum size of the cache in MB (0=disable). If the cache # is bigger, cached package files are deleted until the size # requirement is met (the biggest packages will be deleted # first). # -# "APT::Archives::MinAge" -# - Set minimum age of a package file. If a file is younger it -# will not be deleted (0=disable). Usefull to prevent races -# and to keep backups of the packages for emergency. +# APT::Periodic::Update-Package-Lists "0"; +# - Do "apt-get update" automatically every n-days (0=disable) +# +# APT::Periodic::Download-Upgradeable-Packages "0"; +# - Do "apt-get upgrade --download-only" every n-days (0=disable) +# +# APT::Periodic::Unattended-Upgrade "0"; +# - Run the "unattended-upgrade" security upgrade script +# every n-days (0=disabled) +# Requires the package "unattended-upgrades" and will write +# a log in /var/log/unattended-upgrades # +# APT::Periodic::AutocleanInterval "0"; +# - Do "apt-get autoclean" every n-days (0=disable) +# +# APT::Periodic::Verbose "0"; +# - Send report mail to root +# 0: no report (or null string) +# 1: progress report (actually any string) +# 2: + command outputs (remove -qq, remove 2>/dev/null, add -d) +# 3: + trace on check_stamp() { @@ -42,22 +69,25 @@ check_stamp() interval="$2" if [ $interval -eq 0 ]; then + debug_echo "check_stamp: interval=0." + # treat as no time has passed return 1 fi if [ ! -f $stamp ]; then + update_stamp $stamp + debug_echo "check_stamp: missing time stamp file: $stamp." + # treat as enough time has passed return 0 fi # compare midnight today to midnight the day the stamp was updated - stamp=$(date --date=$(date -r $stamp --iso-8601) +%s) - now=$(date --date=$(date --iso-8601) +%s) + stamp=$(date -r $stamp '+%s') delta=$(($now-$stamp)) - # intervall is in days, + # intervall is in days, convert to sec. interval=$(($interval*60*60*24)) - #echo "stampfile: $1" - #echo "interval=$interval, now=$now, stamp=$stamp, delta=$delta" + debug_echo "check_stamp: interval=$interval, now=$now, stamp=$stamp, delta=$delta (sec)" if [ $delta -ge $interval ]; then return 0 @@ -69,171 +99,271 @@ check_stamp() update_stamp() { stamp="$1" - touch $stamp } - - -# we check here if autoclean was enough sizewise -check_size_constraints() +debug_echo() { - # min-age in days - MaxAge=0 - MinAge=2 - MaxSize=0 - CacheDir="var/cache/apt" - CacheArchive="archives/" - eval $(apt-config shell MaxAge APT::Archives::MaxAge) - eval $(apt-config shell MinAge APT::Archives::MinAge) - eval $(apt-config shell MaxSize APT::Archives::MaxSize) - eval $(apt-config shell Dir Dir) - eval $(apt-config shell CacheDir Dir::Cache) - eval $(apt-config shell CacheArchive Dir::Cache::archives) - - # sanity check - if [ -z "$CacheDir" -o -z "$CacheArchive" ]; then - echo "empty Dir::Cache or Dir::Cache::archives, exiting" - exit + # Display message if $VERBOSE >= 1 + if [ "$VERBOSE" -ge 1 ]; then + echo $1 1>&2 fi - - Cache="${Dir%/}/${CacheDir%/}/${CacheArchive%/}/" +} + +# check apt-config exstance +if ! which apt-config >/dev/null ; then + exit 0 +fi - # check age - if [ ! $MaxAge -eq 0 ] && [ ! $MinAge -eq 0 ]; then - find $Cache -name "*.deb" \( -mtime +$MaxAge -and -ctime +$MaxAge \) -and -not \( -mtime -$MinAge -or -ctime -$MinAge \) -print0 | xargs -r -0 rm -f - elif [ ! $MaxAge -eq 0 ]; then - find $Cache -name "*.deb" -ctime +$MaxAge -and -mtime +$MaxAge -print0 | xargs -r -0 rm -f +# Set VERBOSE mode from apt-config (or inherit from environment) +eval $(apt-config shell VERBOSE APT::Periodic::Verbose) +if [ -z "$VERBOSE" ]; then + VERBOSE="0" +fi +if [ "$VERBOSE" -le 2 ]; then + # quiet for 0,1,2 + XSTDOUT=">/dev/null" + XSTDERR="2>/dev/null" + XAPTOPT="-qq" + XUUPOPT="" +else + XSTDOUT="" + XSTDERR="" + XAPTOPT="" + XUUPOPT="-d" +fi +if [ "$VERBOSE" -ge 3 ]; then + # trace output + set -x +fi +# laptop check, on_ac_power returns: +# 0 (true) System is on main power +# 1 (false) System is not on main power +# 255 (false) Power status could not be determined +# Desktop systems always return 255 it seems +if which on_ac_power >/dev/null; then + on_ac_power + POWER=$? + if [ $POWER -eq 1 ]; then + debug_echo "exit: system on main power." + exit 0 + elif [ $POWER -ne 0 ]; then + debug_echo "exit: power status ($POWER) undetermined." + exit 0 fi - - # check size - if [ ! $MaxSize -eq 0 ]; then - # maxSize is in MB - MaxSize=$(($MaxSize*1024)) - - #get current time - now=$(date --date=$(date --iso-8601) +%s) - MinAge=$(($MinAge*24*60*60)) - - # reverse-sort by mtime - for file in $(ls -rt $Cache/*.deb 2>/dev/null); do - du=$(du -s $Cache) - size=${du%%/*} - # check if the cache is small enough - if [ $size -lt $MaxSize ]; then - break - fi + debug_echo "system is on main power." +fi - # check for MinAge of the file - if [ ! $MinAge -eq 0 ]; then - # check both ctime and mtime - mtime=$(stat -c %Y $file) - ctime=$(stat -c %Z $file) - if [ $mtime -gt $ctime ]; then - delta=$(($now-$mtime)) - else - delta=$(($now-$ctime)) - fi - #echo "$file ($delta), $MinAge" - if [ $delta -le $MinAge ]; then - #echo "Skiping $file (delta=$delta)" - break - fi - fi +# check if we can lock the cache and if the cache is clean +if which apt-get >/dev/null && ! eval apt-get check $XAPTOPT $XSTDERR ; then + debug_echo "error encountered in cron job with \"apt-get check\"." + exit 0 +fi +# No need to check for apt-get below - # delete oldest file - rm -f $file - done - fi -} +# Global current time in seconds since 1970-01-01 00:00:00 UTC +now=$(date +%s) -# sleep for a random intervall of time (default 30min) -# (some code taken from cron-apt, thanks) -random_sleep() -{ - RandomSleep=1800 - eval $(apt-config shell RandomSleep APT::Periodic::RandomSleep) - if [ $RandomSleep -eq 0 ]; then - return - fi - if [ -z "$RANDOM" ] ; then - # A fix for shells that do not have this bash feature. - RANDOM=$(dd if=/dev/urandom count=1 2> /dev/null | cksum | cut -c"1-5") - fi - TIME=$(($RANDOM % $RandomSleep)) - sleep $TIME -} +# Set default values and normalize +Dir="/" +eval $(apt-config shell Dir Dir) +Dir=${Dir%/} + +CacheDir="var/cache/apt/" +eval $(apt-config shell CacheDir Dir::Cache) +CacheDir=${CacheDir%/} +if [ -z "$CacheDir" ]; then + debug_echo "practically empty Dir::Cache, exiting" + exit 0 +fi -# main +CacheArchive="archives/" +eval $(apt-config shell CacheArchive Dir::Cache::Archives) +CacheArchive=${CacheArchive%/} +if [ -z "$CacheArchive" ]; then + debug_echo "practically empty Dir::Cache::archives, exiting" + exit 0 +fi -if ! which apt-config >/dev/null; then - exit 0 +BackupArchiveInterval=0 +eval $(apt-config shell BackupArchiveInterval APT::Periodic::BackupArchiveInterval) + +BackupArchiveLevel=3 +eval $(apt-config shell BackupArchiveLevel APT::Periodic::BackupArchiveLevel) +if [ $BackupArchiveLevel -le 1 ]; then BackupArchiveLevel=2 ; fi + +CacheBackup="backup/" +eval $(apt-config shell CacheBackup Dir::Cache::Backup) +CacheBackup=${CacheBackup%/} +if [ -z "$CacheBackup" ]; then + echo "practically empty Dir::Cache::Backup, exiting" 1>&2 + exit 0 fi +# Support old Archive for compatibility. +# Document only Periodic for all controling parameters of this script. +MaxAge=0 +eval $(apt-config shell MaxAge APT::Archives::MaxAge) +eval $(apt-config shell MaxAge APT::Periodic::MaxAge) + +MinAge=2 +eval $(apt-config shell MinAge APT::Archives::MinAge) +eval $(apt-config shell MinAge APT::Periodic::MinAge) + +MaxSize=0 +eval $(apt-config shell MaxSize APT::Archives::MaxSize) +eval $(apt-config shell MaxSize APT::Periodic::MaxSize) + UpdateInterval=0 +eval $(apt-config shell UpdateInterval APT::Periodic::Update-Package-Lists) + DownloadUpgradeableInterval=0 -eval $(apt-config shell UpdateInterval APT::Periodic::Update-Package-Lists DownloadUpgradeableInterval APT::Periodic::Download-Upgradeable-Packages) -AutocleanInterval=$DownloadUpgradeableInterval -eval $(apt-config shell AutocleanInterval APT::Periodic::AutocleanInterval) +eval $(apt-config shell DownloadUpgradeableInterval APT::Periodic::Download-Upgradeable-Packages) UnattendedUpgradeInterval=0 eval $(apt-config shell UnattendedUpgradeInterval APT::Periodic::Unattended-Upgrade) +AutocleanInterval=0 +eval $(apt-config shell AutocleanInterval APT::Periodic::AutocleanInterval) + +Cache="${Dir}/${CacheDir}/${CacheArchive}/" +Back="${Dir}/${CacheDir}/${CacheBackup}/" +BackX="${Back}${CacheArchive}/" +for x in $(seq 0 1 $((${BackupLevel}-1))); do + eval "Back${x}=${Back}${x}/" +done + +# backup after n-days if archive contents changed. +# (This uses hardlink to save disk space) +BACKUP_ARCHIVE_STAMP=/var/lib/apt/periodic/backup-archive-stamp +if check_stamp $BACKUP_ARCHIVE_STAMP $BackupArchiveInterval; then + if [ $({(cd $Cache 2>/dev/null; find . -name "*.deb"); (cd $Back0 2>/dev/null;find . -name "*.deb") ;}| sort|uniq -u|wc -l) -ne 0 ]; then + mkdir -p $Back + rm -rf $Back$((${BackupLevel}-1)) + for y in $(seq $((${BackupLevel}-1)) -1 1); do + eval BackY=${Back}$y + eval BackZ=${Back}$(($y-1)) + if [ -e $BackZ ]; then mv -f $BackZ $BackY ; fi + done + cp -la $Cache $Back ; mv -f $BackX $Back0 + update_stamp $BACKUP_ARCHIVE_STAMP + debug_echo "backup with hardlinks. (success)" + else -# laptop check, on_ac_power returns: -# 0 (true) System is on mains power -# 1 (false) System is not on mains power -# 255 (false) Power status could not be determined -# Desktop systems always return 255 it seems -if which on_ac_power >/dev/null; then - on_ac_power - if [ $? -eq 1 ]; then - exit 0 + debug_echo "skip backup since same content." fi +else + debug_echo "skip backup since too new." fi -# check if we can lock the cache and if the cache is clean -# There's a reasonable chance that someone is already running an apt -# frontend that has locked the cache, so exit quietly if it is locked. -if ! apt-get check -q -q 2>/dev/null; then - exit 0 +# package archive contnts removal by package age +if [ $MaxAge -ne 0 ] && [ $MinAge -ne 0 ]; then + find $Cache -name "*.deb" \( -mtime +$MaxAge -and -ctime +$MaxAge \) -and -not \( -mtime -$MinAge -or -ctime -$MinAge \) -print0 | xargs -r -0 rm -f + debug_echo "aged: ctime <$MaxAge and mtime <$MaxAge and ctime>$MinAge and mtime>$MinAge" +elif [ $MaxAge -ne 0 ]; then + find $Cache -name "*.deb" -ctime +$MaxAge -and -mtime +$MaxAge -print0 | xargs -r -0 rm -f + debug_echo "aged: ctime <$MaxAge and mtime <$MaxAge only" +else + debug_echo "skip aging since MaxAge is 0" fi + +# package archive contnts removal down to $MaxSize +if [ $MaxSize -ne 0 ]; then + + MinAgeSec=$(($MinAge*24*60*60)) + + # reverse-sort by mtime + for file in $(ls -rt $Cache/*.deb 2>/dev/null); do + du=$(du -m -s $Cache) + size=${du%%/*} + # check if the cache is small enough + if [ $size -lt $MaxSize ]; then + debug_echo "end remove by archive size: size=$size < $MaxSize" + break + fi -# sleep random amount of time -random_sleep + # check for MinAge in second of the file + if [ $MinAgeSec -ne 0 ]; then + # check both ctime and mtime + mtime=$(stat -c %Y $file) + ctime=$(stat -c %Z $file) + if [ $mtime -gt $ctime ]; then + delta=$(($now-$mtime)) + else + delta=$(($now-$ctime)) + fi + if [ $delta -le $MinAgeSec ]; then + debug_echo "skip remove by archive size: $file, delta=$delta < $MinAgeSec" + else + # delete oldest file + debug_echo "remove by archive size: $file, delta=$delta >= $MinAgeSec (sec), size=$size >= $MaxSize" + rm -f $file + fi + fi -# check again if we can access the cache -if ! apt-get check -q -q 2>/dev/null; then - exit 1 + done fi +# update package lists UPDATE_STAMP=/var/lib/apt/periodic/update-stamp if check_stamp $UPDATE_STAMP $UpdateInterval; then - if apt-get -qq update 2>/dev/null; then + if eval apt-get $XAPTOPT -y update $XSTDERR; then + debug_echo "download updated metadata (success)." if which dbus-send >/dev/null; then - dbus-send --system / app.apt.dbus.updated boolean:true + if dbus-send --system / app.apt.dbus.updated boolean:true ; then + debug_echo "send dbus signal (success)" + else + debug_echo "send dbus signal (error)" + fi + else + debug_echo "dbus signal not send (command not available)" fi - update_stamp $UPDATE_STAMP + update_stamp $UPDATE_STAMP + # download all upgradeable packages if it is requested + DOWNLOAD_UPGRADEABLE_STAMP=/var/lib/apt/periodic/download-upgradeable-stamp + if check_stamp $DOWNLOAD_UPGRADEABLE_STAMP $DownloadUpgradeableInterval; then + if eval apt-get $XAPTOPT -y -d dist-upgrade $XSTDERR; then + update_stamp $DOWNLOAD_UPGRADEABLE_STAMP + debug_echo "download upgradable (success)." + # auto upgrade all upgradeable packages + UPGRADE_STAMP=/var/lib/apt/periodic/upgrade-stamp + if which unattended-upgrade >/dev/null && check_stamp $UPGRADE_STAMP $UnattendedUpgradeInterval; then + if unattended-upgrade $XUUPOPT; then + update_stamp $UPGRADE_STAMP + debug_echo "unattended-upgrade (success)." + else + debug_echo "unattended-upgrade (error)." + fi + else + debug_echo "unattended-upgrade (not run)." + fi + else + debug_echo "download upgradable (error)." + fi + else + debug_echo "download upgradable (not run)." + fi + else + debug_echo "download updated metadata (error)." fi +else + debug_echo "download updated metadata (not run)." fi -DOWNLOAD_UPGRADEABLE_STAMP=/var/lib/apt/periodic/download-upgradeable-stamp -if check_stamp $DOWNLOAD_UPGRADEABLE_STAMP $DownloadUpgradeableInterval; then - apt-get -qq -d dist-upgrade 2>/dev/null - update_stamp $DOWNLOAD_UPGRADEABLE_STAMP -fi - -UPGRADE_STAMP=/var/lib/apt/periodic/upgrade-stamp -if check_stamp $UPGRADE_STAMP $UnattendedUpgradeInterval; then - unattended-upgrade - update_stamp $UPGRADE_STAMP -fi - +# autoclean package archive AUTOCLEAN_STAMP=/var/lib/apt/periodic/autoclean-stamp if check_stamp $AUTOCLEAN_STAMP $AutocleanInterval; then - apt-get -qq autoclean - update_stamp $AUTOCLEAN_STAMP + if apt-get $XAPTOPT -y autoclean $XSTDERR; then + debug_echo "autoclean (success)." + update_stamp $AUTOCLEAN_STAMP + else + debug_echo "autoclean (error)." + fi +else + debug_echo "autoclean (not run)." fi -# check cache size -check_size_constraints +# +# vim: set sts=4 ai : +# + diff --git a/debian/changelog b/debian/changelog index 3ec7e739a..1fe58b3b9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,27 @@ +apt (0.7.14) UNRELEASED; urgency=low + + [ Christian Perrier ] + * Mark a message from dselect backend as translatable + Thanks to Frédéric Bothamy for the patch + Closes: #322470 + + [ Osamu Aoki ] + * Updated cron script to support backups by hardlinks and + verbose levels. All features turned off by default. + * Added more error handlings. Closes: #438803, #462734, #454989, + * Refactored condition structure to make download and upgrade performed + if only previous steps succeeded. Closes: #341970 + * Documented all cron script related configuration items in + configure-index. + + [ Program translations ] + - Simplified Chinese updated. Closes: #473360 + - Catalan fixes. Closes: #387141 + - Typo fix in Greek translation. Closes: #479122 + - French updated. + + -- Christian Perrier <bubulle@debian.org> Sun, 04 May 2008 08:31:06 +0200 + apt (0.7.13) unstable; urgency=low [ Otavio Salvador ] diff --git a/doc/examples/configure-index b/doc/examples/configure-index index c20011c9c..9c53154da 100644 --- a/doc/examples/configure-index +++ b/doc/examples/configure-index @@ -114,6 +114,56 @@ APT // Keep the list of FDs open (normally apt closes all fds when it // does a ExecFork) Keep-Fds {}; + + // control parameters for cron jobs by /etc/cron.daily/apt + Periodic + { + BackupArchiveInterval "0"; + // - Backup after n-days if archive contents changed.(0=disable) + + BackupLevel "3"; + // - Backup level.(0=disable), 1 is invalid. + + // APT::Archives::MaxAge "0"; (old, deprecated) + MaxAge "0"; // (new) + // - Set maximum allowed age of a cache package file. If a cache + // package file is older it is deleted (0=disable) + + // APT::Archives::MinAge "2"; (old, deprecated) + MinAge "2"; // (new) + // - Set minimum age of a package file. If a file is younger it + // will not be deleted (0=disable). Usefull to prevent races + // and to keep backups of the packages for emergency. + + // APT::Archives::MaxSize "0"; (old, deprecated) + MaxSize "0"; // (new) + // - Set maximum size of the cache in MB (0=disable). If the cache + // is bigger, cached package files are deleted until the size + // requirement is met (the biggest packages will be deleted + // first). + + Update-Package-Lists "0"; + // - Do "apt-get update" automatically every n-days (0=disable) + // + Download-Upgradeable-Packages "0"; + // - Do "apt-get upgrade --download-only" every n-days (0=disable) + // + Unattended-Upgrade "0"; + // - Run the "unattended-upgrade" security upgrade script + // every n-days (0=disabled) + // Requires the package "unattended-upgrades" and will write + // a log in /var/log/unattended-upgrades + // + AutocleanInterval "0"; + // - Do "apt-get autoclean" every n-days (0=disable) + + Verbose "0"; + // - Send report mail to root + // 0: no report (or null string) + // 1: progress report (actually any string) + // 2: + command outputs (remove -qq, remove 2>/dev/null, add -d) + // 3: + trace on + }; }; // Options for the downloading routines @@ -210,6 +260,8 @@ Dir "/" // Location of the cache dir Cache "var/cache/apt/" { Archives "archives/"; + // backup directory created by /etc/cron.daily/apt + Backup "backup/"; srcpkgcache "srcpkgcache.bin"; pkgcache "pkgcache.bin"; }; diff --git a/dselect/install b/dselect/install index d9d665192..61d13208e 100755 --- a/dselect/install +++ b/dselect/install @@ -88,7 +88,8 @@ if [ $RES -eq 0 ]; then ;; prompt) exec 3>&1 - if [ `yesno $"Do you want to erase any previously downloaded .deb files?" y` = y ]; then + echo -n $"Do you want to erase any previously downloaded .deb files?" + if [ `yesno "" y` = y ]; then $APTGET "$APT_OPT0" "$APT_OPT1" clean && echo $"Press enter to continue." && read RES && exit 0; fi diff --git a/po/ChangeLog b/po/ChangeLog index 0285e00e7..78e856e40 100644 --- a/po/ChangeLog +++ b/po/ChangeLog @@ -1,4 +1,22 @@ -2008-04-19 acobo Tarrío <jtarrio@debian.org> +2008-05-04 Christian Perrier <bubulle@debian.org> + + * fr.po: updated to 536t. + +2008-05-04 Christian Perrier <bubulle@debian.org> + + * Update all PO files and apt-all.pot. 536 strings. + Formerly complete PO files are now 535t1u (new string + from dselect/install. See #322470 + +2008-05-04 Deng Xiyue <manphiz-guest@users.alioth.debian.org> + + * zh_CN.po: updated to 535t. Closes: #473360 + +2008-05-03 Clytie Siddall <clytie@riverland.net.au> + + * vi.po: updated to 535t. Closes: #479008 + +2008-04-19 Jacobo Tarrío <jtarrio@debian.org> * gl.po: updated to 536t. diff --git a/po/apt-all.pot b/po/apt-all.pot index 3a9aa4679..6319e740f 100644 --- a/po/apt-all.pot +++ b/po/apt-all.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-05-02 13:59-0300\n" +"POT-Creation-Date: 2008-05-04 09:50+0200\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" @@ -1211,24 +1211,28 @@ msgstr "" msgid "Bad default setting!" msgstr "" -#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:93 -#: dselect/install:104 dselect/update:45 +#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:94 +#: dselect/install:105 dselect/update:45 msgid "Press enter to continue." msgstr "" -#: dselect/install:100 -msgid "Some errors occurred while unpacking. I'm going to configure the" +#: dselect/install:91 +msgid "Do you want to erase any previously downloaded .deb files?" msgstr "" #: dselect/install:101 -msgid "packages that were installed. This may result in duplicate errors" +msgid "Some errors occurred while unpacking. I'm going to configure the" msgstr "" #: dselect/install:102 -msgid "or errors caused by missing dependencies. This is OK, only the errors" +msgid "packages that were installed. This may result in duplicate errors" msgstr "" #: dselect/install:103 +msgid "or errors caused by missing dependencies. This is OK, only the errors" +msgstr "" + +#: dselect/install:104 msgid "" "above this message are important. Please fix them and run [I]nstall again" msgstr "" @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: apt_po\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-05-02 13:59-0300\n" +"POT-Creation-Date: 2008-05-04 09:18+0200\n" "PO-Revision-Date: 2006-10-20 21:28+0300\n" "Last-Translator: Ossama M. Khayat <okhayat@yahoo.com>\n" "Language-Team: Arabic <support@arabeyes.org>\n" @@ -1229,24 +1229,28 @@ msgstr "" msgid "Bad default setting!" msgstr "إعداد افتراضيّ سيّء!" -#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:93 -#: dselect/install:104 dselect/update:45 +#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:94 +#: dselect/install:105 dselect/update:45 msgid "Press enter to continue." msgstr "اضغط مفتاح الإدخال للاستمرار." -#: dselect/install:100 +#: dselect/install:91 +msgid "Do you want to erase any previously downloaded .deb files?" +msgstr "" + +#: dselect/install:101 msgid "Some errors occurred while unpacking. I'm going to configure the" msgstr "حدثت بعض الأخطاء أثناء فك الحزمة. سأقوم بتهيئة " -#: dselect/install:101 +#: dselect/install:102 msgid "packages that were installed. This may result in duplicate errors" msgstr "الحزم التي تم تثبيتها. قد يتسبب هذا بظهر أخطاء متكررة" -#: dselect/install:102 +#: dselect/install:103 msgid "or errors caused by missing dependencies. This is OK, only the errors" msgstr "أو أخطاء سبّبتها المُعتمدات المفقودة. لا بأس بهذا، فقط الأخطاء" -#: dselect/install:103 +#: dselect/install:104 msgid "" "above this message are important. Please fix them and run [I]nstall again" msgstr "أعلى هذه الرسالة مهمّة. الرجاء تصحيحها وتشغيل التثبيت مجدداً" @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.6\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-05-02 13:59-0300\n" +"POT-Creation-Date: 2008-05-04 09:18+0200\n" "PO-Revision-Date: 2008-04-16 09:37+0300\n" "Last-Translator: Damyan Ivanov <dam@modsoftsys.com>\n" "Language-Team: Bulgarian <dict@fsa-bg.org>\n" @@ -1417,24 +1417,28 @@ msgstr "" msgid "Bad default setting!" msgstr "Лоша стандартна настройка!" -#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:93 -#: dselect/install:104 dselect/update:45 +#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:94 +#: dselect/install:105 dselect/update:45 msgid "Press enter to continue." msgstr "Натиснете „Enter“, за да продължите." -#: dselect/install:100 +#: dselect/install:91 +msgid "Do you want to erase any previously downloaded .deb files?" +msgstr "" + +#: dselect/install:101 msgid "Some errors occurred while unpacking. I'm going to configure the" msgstr "Възникнаха някои грешки при разпакетирането. Ще се конфигурират" -#: dselect/install:101 +#: dselect/install:102 msgid "packages that were installed. This may result in duplicate errors" msgstr "инсталираните пакети. Това може да доведе до дублирани грешки или" -#: dselect/install:102 +#: dselect/install:103 msgid "or errors caused by missing dependencies. This is OK, only the errors" msgstr "грешки, причинени от липсващи зависимости. Това е наред, само грешките" -#: dselect/install:103 +#: dselect/install:104 msgid "" "above this message are important. Please fix them and run [I]nstall again" msgstr "" @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.5.26\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-05-02 13:59-0300\n" +"POT-Creation-Date: 2008-05-04 09:18+0200\n" "PO-Revision-Date: 2004-05-06 15:25+0100\n" "Last-Translator: Safir Šećerović <sapphire@linux.org.ba>\n" "Language-Team: Bosnian <lokal@lugbih.org>\n" @@ -1229,24 +1229,28 @@ msgstr "" msgid "Bad default setting!" msgstr "Loša podrazumjevana postavka!" -#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:93 -#: dselect/install:104 dselect/update:45 +#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:94 +#: dselect/install:105 dselect/update:45 msgid "Press enter to continue." msgstr "Pritisnite enter za nastavak." -#: dselect/install:100 -msgid "Some errors occurred while unpacking. I'm going to configure the" +#: dselect/install:91 +msgid "Do you want to erase any previously downloaded .deb files?" msgstr "" #: dselect/install:101 -msgid "packages that were installed. This may result in duplicate errors" +msgid "Some errors occurred while unpacking. I'm going to configure the" msgstr "" #: dselect/install:102 -msgid "or errors caused by missing dependencies. This is OK, only the errors" +msgid "packages that were installed. This may result in duplicate errors" msgstr "" #: dselect/install:103 +msgid "or errors caused by missing dependencies. This is OK, only the errors" +msgstr "" + +#: dselect/install:104 msgid "" "above this message are important. Please fix them and run [I]nstall again" msgstr "" @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.6\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-05-02 13:59-0300\n" +"POT-Creation-Date: 2008-05-04 09:18+0200\n" "PO-Revision-Date: 2006-02-05 22:00+0100\n" "Last-Translator: Jordi Mallach <jordi@debian.org>\n" "Language-Team: Catalan <debian-l10n-catalan@lists.debian.org>\n" @@ -234,7 +234,7 @@ msgstr "" " -p=? La memòria cau de paquets.\n" " -s=? La memòria cau de la font.\n" " -q Inhabilita l'indicatiu de progres.\n" -" -i Sols mostra dependències importants d'una ordre inadequada.\n" +" -i Només mostra dependències importants d'una ordre inadequada.\n" " -c=? Llegeix aquest fitxer de configuració\n" " -o=? Estableix una opció de conf arbitrària, p.ex. -o dir::cache=/tmp\n" "Consulteu les pàgines del manual apt-cache(8) i apt.conf(5) per a més " @@ -784,7 +784,7 @@ msgstr "Potser voldreu executar `apt-get -f install' per a corregir-ho." #: cmdline/apt-get.cc:685 msgid "Unmet dependencies. Try using -f." -msgstr "Dependències sense satisfer. Proveu-ho usant -f." +msgstr "Dependències sense satisfer. Proveu-ho emprant -f." #: cmdline/apt-get.cc:707 msgid "WARNING: The following packages cannot be authenticated!" @@ -804,7 +804,7 @@ msgstr "No s'ha pogut autenticar alguns paquets" #: cmdline/apt-get.cc:729 cmdline/apt-get.cc:881 msgid "There are problems and -y was used without --force-yes" -msgstr "Hi ha problemes i s'ha usat -y sense --force-yes" +msgstr "Hi ha problemes i s'ha emprat -y sense --force-yes" #: cmdline/apt-get.cc:773 msgid "Internal error, InstallPackages was called with broken packages!" @@ -847,7 +847,7 @@ msgstr "Es necessita obtenir %sB d'arxius.\n" #: cmdline/apt-get.cc:847 #, fuzzy, c-format msgid "After this operation, %sB of additional disk space will be used.\n" -msgstr "Després de desempaquetar s'usaran %sB d'espai en disc addicional.\n" +msgstr "Després de desempaquetar s'empraran %sB d'espai en disc addicional.\n" #: cmdline/apt-get.cc:850 #, fuzzy, c-format @@ -938,7 +938,7 @@ msgstr "" #: cmdline/apt-get.cc:1081 #, c-format msgid "Package %s is not installed, so not removed\n" -msgstr "El paquet %s no està instal·lat, així que no s'eliminarà\n" +msgstr "El paquet %s no està instal·lat, així doncs no s'eliminarà\n" #: cmdline/apt-get.cc:1092 #, c-format @@ -1082,7 +1082,7 @@ msgid "" "or been moved out of Incoming." msgstr "" "No s'han pogut instal·lar alguns paquets. Això pot ser degut a que vàreu\n" -"requerir una situació imposible o a que esteu usant la distribució\n" +"requerir una situació imposible o a que esteu emprant la distribució\n" "unstable i alguns paquets requerits encara no han estat creats o bé\n" "encara no els hi han afegit." @@ -1092,7 +1092,7 @@ msgid "" "the package is simply not installable and a bug report against\n" "that package should be filed." msgstr "" -"Degut a que sols heu requerit una única operació, serà molt\n" +"Degut a que només heu requerit una única operació, serà molt\n" "probable que el paquet no sigui instal·lable i que s'hagi d'emetre\n" "un informe d'error en contra d'aquest per a arxivar-lo." @@ -1321,7 +1321,7 @@ msgstr "" " -h Aquest text d'ajuda.\n" " -q Eixida a la bitàcola - sense indicatiu de progrés\n" " -qq Sense eixida, excepte els errors\n" -" -d Sols descarrega - NO instal·la o desempaqueta arxius\n" +" -d Només descarrega - NO instal·la o desempaqueta arxius\n" " -s No actua. Realitza les ordres en mode de simulació\n" " -y Assumeix que Sí per a totes les preguntes, fa que no es pregunti\n" " -f Intenta seguir si la comprovació d'integritat falla\n" @@ -1397,7 +1397,7 @@ msgstr "" "\n" "Opcions:\n" " -h Aquest text d'ajuda.\n" -" -s Usar l'ordenació de fitxers font\n" +" -s Emprar l'ordenació de fitxers font\n" " -c=? Llegeix aquest fitxer de configuració\n" " -o=? Estableix una opció de configuració, p.ex: -o dir::cache=/tmp\n" @@ -1405,27 +1405,31 @@ msgstr "" msgid "Bad default setting!" msgstr "Paràmetre establert incorrecte!" -#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:93 -#: dselect/install:104 dselect/update:45 +#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:94 +#: dselect/install:105 dselect/update:45 msgid "Press enter to continue." msgstr "Premeu Intro per a continuar." -#: dselect/install:100 +#: dselect/install:91 +msgid "Do you want to erase any previously downloaded .deb files?" +msgstr "" + +#: dselect/install:101 msgid "Some errors occurred while unpacking. I'm going to configure the" msgstr "Alguns errors al desempaquetar. Puc configurar" -#: dselect/install:101 +#: dselect/install:102 msgid "packages that were installed. This may result in duplicate errors" msgstr "" "els paquets que estan instal·lats. Això pot resultar en errors duplicacats" -#: dselect/install:102 +#: dselect/install:103 msgid "or errors caused by missing dependencies. This is OK, only the errors" msgstr "" -"o errors causats per dependències sense satisfer. Aquest està bé, sols els " +"o errors causats per dependències sense satisfer. Aquest està bé, només els " "errors" -#: dselect/install:103 +#: dselect/install:104 msgid "" "above this message are important. Please fix them and run [I]nstall again" msgstr "" @@ -1652,7 +1656,7 @@ msgstr "El fitxer de desviació està corrupte" #: apt-inst/deb/dpkgdb.cc:337 #, c-format msgid "Invalid line in the diversion file: %s" -msgstr "Línia no vàlida en el fitxer de desviació: %s" +msgstr "Línia no vàlida al fitxer de desviació: %s" #: apt-inst/deb/dpkgdb.cc:358 msgid "Internal error adding a diversion" @@ -1670,7 +1674,7 @@ msgstr "No s'ha trobat una capçalera Package:, desplaçament %lu" #: apt-inst/deb/dpkgdb.cc:461 #, c-format msgid "Bad ConfFile section in the status file. Offset %lu" -msgstr "Secció ConfFile dolenta en el fitxer d'estat. Desplaçament %lu" +msgstr "Secció ConfFile dolenta al fitxer d'estat. Desplaçament %lu" #: apt-inst/deb/dpkgdb.cc:466 #, c-format @@ -1715,7 +1719,7 @@ msgid "" "cannot be used to add new CD-ROMs" msgstr "" "Si us plau, useu apt-cdrom per a que aquest CD sigui reconegut per APT. No " -"pot usar-se apt-get update per afegir-ne de nous" +"pot emprar-se apt-get update per afegir-ne de nous" #: methods/cdrom.cc:131 msgid "Wrong CD-ROM" @@ -2050,15 +2054,15 @@ msgstr "Connexió finalitzada" #: methods/http.cc:802 msgid "Error writing to output file" -msgstr "Error escrivint en el fitxer d'eixida" +msgstr "Error escrivint al fitxer d'eixida" #: methods/http.cc:833 msgid "Error writing to file" -msgstr "Error escrivint en el fitxer" +msgstr "Error escrivint al fitxer" #: methods/http.cc:861 msgid "Error writing to the file" -msgstr "Error escrivint en el fitxer" +msgstr "Error escrivint al fitxer" #: methods/http.cc:875 msgid "Error reading from server. Remote end closed connection" @@ -2217,7 +2221,8 @@ msgstr "No s'ha pogut fer «stat» del cdrom" #: apt-pkg/contrib/fileutl.cc:147 #, c-format msgid "Not using locking for read only lock file %s" -msgstr "No s'usen blocats per a llegir el fitxer de blocat de sols lectura %s" +msgstr "" +"No s'empren blocats per a llegir el fitxer de blocat de sols lectura %s" #: apt-pkg/contrib/fileutl.cc:152 #, c-format @@ -2227,7 +2232,7 @@ msgstr "No es pot resoldre el fixter de blocat %s" #: apt-pkg/contrib/fileutl.cc:170 #, c-format msgid "Not using locking for nfs mounted lock file %s" -msgstr "No s'usen blocats per al fitxer de blocat %s de muntar nfs" +msgstr "No s'empren blocats per al fitxer de blocat %s de muntar nfs" #: apt-pkg/contrib/fileutl.cc:174 #, c-format @@ -2485,7 +2490,7 @@ msgid "" "used instead." msgstr "" "No es poden descarregar alguns fitxers índex, s'han ignorat o en el seu lloc " -"s'han usat els antics." +"s'han emprat els antics." #: apt-pkg/acquire.cc:59 #, c-format @@ -2554,7 +2559,7 @@ msgstr "" #: apt-pkg/policy.cc:267 msgid "Invalid record in the preferences file, no Package header" -msgstr "Registre no vàlid en el fitxer de preferències, paquet sense capçalera" +msgstr "Registre no vàlid al fitxer de preferències, paquet sense capçalera" #: apt-pkg/policy.cc:289 #, c-format @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-05-02 13:59-0300\n" +"POT-Creation-Date: 2008-05-04 09:18+0200\n" "PO-Revision-Date: 2006-10-04 18:53+0200\n" "Last-Translator: Miroslav Kure <kurem@debian.cz>\n" "Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n" @@ -1386,24 +1386,28 @@ msgstr "" msgid "Bad default setting!" msgstr "Chybné standardní nastavení!" -#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:93 -#: dselect/install:104 dselect/update:45 +#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:94 +#: dselect/install:105 dselect/update:45 msgid "Press enter to continue." msgstr "Pro pokračování stiskněte enter." -#: dselect/install:100 +#: dselect/install:91 +msgid "Do you want to erase any previously downloaded .deb files?" +msgstr "" + +#: dselect/install:101 msgid "Some errors occurred while unpacking. I'm going to configure the" msgstr "Během rozbalování se vyskytly chyby. Zkusím teď nakonfigurovat" -#: dselect/install:101 +#: dselect/install:102 msgid "packages that were installed. This may result in duplicate errors" msgstr "balíky, které se nainstalovaly. To může způsobit chybové hlášky" -#: dselect/install:102 +#: dselect/install:103 msgid "or errors caused by missing dependencies. This is OK, only the errors" msgstr "o nesplněných závislostech. To je v pořádku, důležité jsou pouze" -#: dselect/install:103 +#: dselect/install:104 msgid "" "above this message are important. Please fix them and run [I]nstall again" msgstr "chyby nad touto hláškou. Opravte je a poté znovu spusťte [I]nstalovat" @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: APT\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-05-02 13:59-0300\n" +"POT-Creation-Date: 2008-05-04 09:18+0200\n" "PO-Revision-Date: 2005-06-06 13:46+0100\n" "Last-Translator: Dafydd Harries <daf@muse.19inch.net>\n" "Language-Team: Welsh <cy@pengwyn.linux.org.uk>\n" @@ -1440,24 +1440,28 @@ msgstr "" msgid "Bad default setting!" msgstr "Rhagosodiad gwael!" -#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:93 -#: dselect/install:104 dselect/update:45 +#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:94 +#: dselect/install:105 dselect/update:45 msgid "Press enter to continue." msgstr "Gwasgwch Enter er mwyn mynd ymlaen." -#: dselect/install:100 +#: dselect/install:91 +msgid "Do you want to erase any previously downloaded .deb files?" +msgstr "" + +#: dselect/install:101 msgid "Some errors occurred while unpacking. I'm going to configure the" msgstr "Digwyddod rhau gwallau wrth dadbacio. Rydw i'n mynd i gyflunio'r" -#: dselect/install:101 +#: dselect/install:102 msgid "packages that were installed. This may result in duplicate errors" msgstr "pecynnau a gafwyd eu sefydlu. Gall hyn achosi gwallau dyblyg neu" -#: dselect/install:102 +#: dselect/install:103 msgid "or errors caused by missing dependencies. This is OK, only the errors" msgstr "wallau a achosir gan ddibyniaethau coll. Mae hyn yn iawn, dim ond y" -#: dselect/install:103 +#: dselect/install:104 msgid "" "above this message are important. Please fix them and run [I]nstall again" msgstr "" @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: apt-da\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-05-02 13:59-0300\n" +"POT-Creation-Date: 2008-05-04 09:18+0200\n" "PO-Revision-Date: 2007-09-06 21:40+0200\n" "Last-Translator: Claus Hindsgaul <claus.hindsgaul@gmail.com>\n" "Language-Team: Danish\n" @@ -1396,28 +1396,32 @@ msgstr "" msgid "Bad default setting!" msgstr "Ugyldig standardindstilling!" -#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:93 -#: dselect/install:104 dselect/update:45 +#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:94 +#: dselect/install:105 dselect/update:45 msgid "Press enter to continue." msgstr "Tryk retur for at fortstte." +#: dselect/install:91 +msgid "Do you want to erase any previously downloaded .deb files?" +msgstr "" + # Note to translators: The following four messages belong together. It doesn't # matter where sentences start, but it has to fit in just these four lines, and # at only 80 characters per line, if possible. -#: dselect/install:100 +#: dselect/install:101 msgid "Some errors occurred while unpacking. I'm going to configure the" msgstr "Der opstod fejl under udpakningen. Jeg vil opstte de" -#: dselect/install:101 +#: dselect/install:102 msgid "packages that were installed. This may result in duplicate errors" msgstr "pakker, der blev installeret. Det kan give gentagne fejl" -#: dselect/install:102 +#: dselect/install:103 msgid "or errors caused by missing dependencies. This is OK, only the errors" msgstr "" "eller fejl, der skyldes manglende afhngigheder. Dette er o.k. Det er kun" -#: dselect/install:103 +#: dselect/install:104 msgid "" "above this message are important. Please fix them and run [I]nstall again" msgstr "" @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.6.46.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-05-02 13:59-0300\n" +"POT-Creation-Date: 2008-05-04 09:18+0200\n" "PO-Revision-Date: 2008-02-21 12:38+0100\n" "Last-Translator: Jens Seidel <jensseidel@users.sf.net>\n" "Language-Team: <de@li.org>\n" @@ -1425,29 +1425,33 @@ msgstr "" msgid "Bad default setting!" msgstr "Fehlerhafte Voreinstellung" -#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:93 -#: dselect/install:104 dselect/update:45 +#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:94 +#: dselect/install:105 dselect/update:45 msgid "Press enter to continue." msgstr "Zum Fortfahren Enter drücken." -#: dselect/install:100 +#: dselect/install:91 +msgid "Do you want to erase any previously downloaded .deb files?" +msgstr "" + +#: dselect/install:101 msgid "Some errors occurred while unpacking. I'm going to configure the" msgstr "" "Einige Fehler traten während des Entpackens auf. Ich werde die installierten" -#: dselect/install:101 +#: dselect/install:102 msgid "packages that were installed. This may result in duplicate errors" msgstr "" "Pakete konfigurieren. Dies kann zu doppelten Fehlermeldungen oder Fehlern " "durch" -#: dselect/install:102 +#: dselect/install:103 msgid "or errors caused by missing dependencies. This is OK, only the errors" msgstr "" "fehlende Abhängigkeiten führen. Das ist in Ordnung, nur die Fehler über " "dieser" -#: dselect/install:103 +#: dselect/install:104 msgid "" "above this message are important. Please fix them and run [I]nstall again" msgstr "" @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: apt_po.pot\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-05-02 13:59-0300\n" +"POT-Creation-Date: 2008-05-04 09:18+0200\n" "PO-Revision-Date: 2006-09-19 09:49+0530\n" "Last-Translator: Kinley Tshering <gasepkuenden2k3@hotmail.com>\n" "Language-Team: Dzongkha <pgeyleg@dit.gov.bt>\n" @@ -1407,26 +1407,30 @@ msgstr "" msgid "Bad default setting!" msgstr "སྔོན་སྒྲིག་བྱང་ཉེས་གཞི་སྒྲིག་འབད་དོ་!" -#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:93 -#: dselect/install:104 dselect/update:45 +#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:94 +#: dselect/install:105 dselect/update:45 msgid "Press enter to continue." msgstr "འཕྲོ་མཐུད་འབད་ནིའི་དོན་ལུ་ལོག་ལྡེ་འདི་ཨེབ།" -#: dselect/install:100 +#: dselect/install:91 +msgid "Do you want to erase any previously downloaded .deb files?" +msgstr "" + +#: dselect/install:101 msgid "Some errors occurred while unpacking. I'm going to configure the" msgstr "སྦུང་ཚན་བཟོ་བཤོལ་འབད་བའི་བར་ན་ འཛོལ་བ་དག་པ་ཅིག་བྱུང་ནུག་ ང་གི་" -#: dselect/install:101 +#: dselect/install:102 msgid "packages that were installed. This may result in duplicate errors" msgstr "གཞི་བཙུགས་འབད་ཡོད་པའི་ཐུམ་སྒྲིལ་ཚུ་རིམ་སྒྲིག་འབད་ནི་ཨིན།་འ་ནི་འདི་གིས་ ངོ་བཤུས་རྫུན་མ་" -#: dselect/install:102 +#: dselect/install:103 msgid "or errors caused by missing dependencies. This is OK, only the errors" msgstr "" "ཡང་ན་བརླག་སྟོར་ཞུགས་ཡོད་པའི་རྟེན་འབྲེལ་གི་རྒྱུ་རྐྱེན་ལས་བརྟེན་པའི་འཛོལ་བ་ཚུ་ནང་ལུ་གྲུབ་འབྲས་འཐོན་འོང་། " "འདི་དེ་བཏུབ་པས་" -#: dselect/install:103 +#: dselect/install:104 msgid "" "above this message are important. Please fix them and run [I]nstall again" msgstr "" @@ -18,7 +18,7 @@ msgid "" msgstr "" "Project-Id-Version: apt_po_el_new\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-05-02 13:59-0300\n" +"POT-Creation-Date: 2008-05-04 09:18+0200\n" "PO-Revision-Date: 2006-01-18 15:16+0200\n" "Last-Translator: Konstantinos Margaritis <markos@debian.org>\n" "Language-Team: Greek <debian-l10n-greek@lists.debian.org>\n" @@ -1426,26 +1426,30 @@ msgstr "" msgid "Bad default setting!" msgstr "Κακή προκαθορισμένη ρύθμιση!" -#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:93 -#: dselect/install:104 dselect/update:45 +#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:94 +#: dselect/install:105 dselect/update:45 msgid "Press enter to continue." msgstr "Πιέστε enter για συνέχεια." -#: dselect/install:100 +#: dselect/install:91 +msgid "Do you want to erase any previously downloaded .deb files?" +msgstr "" + +#: dselect/install:101 msgid "Some errors occurred while unpacking. I'm going to configure the" msgstr "Προέκυψανσφάλματα κατά την αποσυμπίεση. Θα ρυθμίσω τα " -#: dselect/install:101 +#: dselect/install:102 msgid "packages that were installed. This may result in duplicate errors" msgstr "πακέτα που εγκαταστάθηκαν. Αυτό μπορεί να παράγει διπλά λάθη" -#: dselect/install:102 +#: dselect/install:103 msgid "or errors caused by missing dependencies. This is OK, only the errors" msgstr "" "ή σφάλματα που προκύπτουν από χαλασμένες εξαρτήσεις. Αυτό είναι εντάξει, " "μόνο τα λάθη" -#: dselect/install:103 +#: dselect/install:104 msgid "" "above this message are important. Please fix them and run [I]nstall again" msgstr "" diff --git a/po/en_GB.po b/po/en_GB.po index de6cc3a12..a40000dbb 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.6.46.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-05-02 13:59-0300\n" +"POT-Creation-Date: 2008-05-04 09:18+0200\n" "PO-Revision-Date: 2006-10-12 11:07+0100\n" "Last-Translator: Neil Williams <linux@codehelp.co.uk>\n" "Language-Team: en_GB <en_gb@li.org>\n" @@ -1388,24 +1388,28 @@ msgstr "" msgid "Bad default setting!" msgstr "Bad default setting!" -#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:93 -#: dselect/install:104 dselect/update:45 +#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:94 +#: dselect/install:105 dselect/update:45 msgid "Press enter to continue." msgstr "Press enter to continue." -#: dselect/install:100 +#: dselect/install:91 +msgid "Do you want to erase any previously downloaded .deb files?" +msgstr "" + +#: dselect/install:101 msgid "Some errors occurred while unpacking. I'm going to configure the" msgstr "Some errors occurred while unpacking. I'm going to configure the" -#: dselect/install:101 +#: dselect/install:102 msgid "packages that were installed. This may result in duplicate errors" msgstr "packages that were installed. This may result in duplicate errors" -#: dselect/install:102 +#: dselect/install:103 msgid "or errors caused by missing dependencies. This is OK, only the errors" msgstr "or errors caused by missing dependencies. This is OK, only the errors" -#: dselect/install:103 +#: dselect/install:104 msgid "" "above this message are important. Please fix them and run [I]nstall again" msgstr "" @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.6.42.3exp1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-05-02 13:59-0300\n" +"POT-Creation-Date: 2008-05-04 09:18+0200\n" "PO-Revision-Date: 2007-06-21 13:06+0200\n" "Last-Translator: Javier Fernandez-Sanguino <jfs@debian.org>\n" "Language-Team: Debian Spanish <debian-l10n-spanish@lists.debian.org>\n" @@ -1416,28 +1416,32 @@ msgstr "" msgid "Bad default setting!" msgstr "Parmetro por omisin incorrecto!" -#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:93 -#: dselect/install:104 dselect/update:45 +#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:94 +#: dselect/install:105 dselect/update:45 msgid "Press enter to continue." msgstr "Presione Intro para continuar." -#: dselect/install:100 +#: dselect/install:91 +msgid "Do you want to erase any previously downloaded .deb files?" +msgstr "" + +#: dselect/install:101 msgid "Some errors occurred while unpacking. I'm going to configure the" msgstr "" "Ocurrieron algunos errores mientras se desempaquetaba. Se va a configurar el" -#: dselect/install:101 +#: dselect/install:102 msgid "packages that were installed. This may result in duplicate errors" msgstr "" "paquetes que fueron instalados. Esto puede dar lugar a errores duplicados" -#: dselect/install:102 +#: dselect/install:103 msgid "or errors caused by missing dependencies. This is OK, only the errors" msgstr "" "o errores causados por dependencias no presentes. Esto est BIEN, slo los\n" "errores" -#: dselect/install:103 +#: dselect/install:104 msgid "" "above this message are important. Please fix them and run [I]nstall again" msgstr "" @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt_po_eu\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-05-02 13:59-0300\n" +"POT-Creation-Date: 2008-05-04 09:18+0200\n" "PO-Revision-Date: 2008-01-17 02:05+0100\n" "Last-Translator: Piarres Beobide <pi@beobide.net>\n" "Language-Team: Euskara <Librezale@librezale.org>\n" @@ -1396,24 +1396,28 @@ msgstr "" msgid "Bad default setting!" msgstr "Okerreko ezarpen lehenetsia!" -#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:93 -#: dselect/install:104 dselect/update:45 +#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:94 +#: dselect/install:105 dselect/update:45 msgid "Press enter to continue." msgstr "Jarraitzeko, sakatu Sartu." -#: dselect/install:100 +#: dselect/install:91 +msgid "Do you want to erase any previously downloaded .deb files?" +msgstr "" + +#: dselect/install:101 msgid "Some errors occurred while unpacking. I'm going to configure the" msgstr "Errore batzuk gertatu dira deskonprimitzean. Konfiguratu egingo ditut" -#: dselect/install:101 +#: dselect/install:102 msgid "packages that were installed. This may result in duplicate errors" msgstr "instalatutako paketeak. Horrek errore bikoiztuak eragin ditzake" -#: dselect/install:102 +#: dselect/install:103 msgid "or errors caused by missing dependencies. This is OK, only the errors" msgstr "edo falta diren mendekotasunen erroreak. Hori ondo dago; mezu honen" -#: dselect/install:103 +#: dselect/install:104 msgid "" "above this message are important. Please fix them and run [I]nstall again" msgstr "" @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.5.26\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-05-02 13:59-0300\n" +"POT-Creation-Date: 2008-05-04 09:18+0200\n" "PO-Revision-Date: 2006-09-29 16:06+0300\n" "Last-Translator: Tapio Lehtonen <tale@debian.org>\n" "Language-Team: Finnish <debian-l10n-finnish@lists.debian.org>\n" @@ -1393,25 +1393,29 @@ msgstr "" msgid "Bad default setting!" msgstr "Oletusasetus ei kelpaa!" -#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:93 -#: dselect/install:104 dselect/update:45 +#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:94 +#: dselect/install:105 dselect/update:45 msgid "Press enter to continue." msgstr "Jatka painamalla Enter." -#: dselect/install:100 +#: dselect/install:91 +msgid "Do you want to erase any previously downloaded .deb files?" +msgstr "" + +#: dselect/install:101 msgid "Some errors occurred while unpacking. I'm going to configure the" msgstr "Tapahtui virheitä purettaessa. Tehdään asennettujen" -#: dselect/install:101 +#: dselect/install:102 msgid "packages that were installed. This may result in duplicate errors" msgstr "pakettien asetukset. Samat virheet voivat tulla toiseen kertaan" -#: dselect/install:102 +#: dselect/install:103 msgid "or errors caused by missing dependencies. This is OK, only the errors" msgstr "" "tai tyydyttämättömät riippuvuudet aiheuttavat virheitä. Tämä ei haittaa" -#: dselect/install:103 +#: dselect/install:104 msgid "" "above this message are important. Please fix them and run [I]nstall again" msgstr "" @@ -1,4 +1,3 @@ -# translation of fr.po to French # Advanced Package Transfer - APT message translation catalog # French messages # @@ -8,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-05-02 13:59-0300\n" -"PO-Revision-Date: 2008-04-16 09:17+0200\n" +"POT-Creation-Date: 2008-05-04 09:18+0200\n" +"PO-Revision-Date: 2008-05-04 10:15+0200\n" "Last-Translator: Christian Perrier <bubulle@debian.org>\n" "Language-Team: French <debian-l10n-french@lists.debian.org>\n" "MIME-Version: 1.0\n" @@ -243,13 +242,11 @@ msgstr "" #: cmdline/apt-cdrom.cc:78 msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'" -msgstr "" -"Veuillez indiquer le nom de ce disque, par exemple « Debian 2.1r1 Disk 1 »" +msgstr "Veuillez indiquer le nom de ce disque, par exemple « Debian 2.1r1 Disk 1 »" #: cmdline/apt-cdrom.cc:93 msgid "Please insert a Disc in the drive and press enter" -msgstr "" -"Veuillez insérer un disque dans le lecteur et appuyez sur la touche Entrée" +msgstr "Veuillez insérer un disque dans le lecteur et appuyez sur la touche Entrée" #: cmdline/apt-cdrom.cc:117 msgid "Repeat this process for the rest of the CDs in your set." @@ -325,8 +322,7 @@ msgstr "Impossible d'écrire sur %s" #: cmdline/apt-extracttemplates.cc:310 msgid "Cannot get debconf version. Is debconf installed?" -msgstr "" -"Impossible d'obtenir la version de debconf. Est-ce que debconf est installé ?" +msgstr "Impossible d'obtenir la version de debconf. Est-ce que debconf est installé ?" #: ftparchive/apt-ftparchive.cc:164 ftparchive/apt-ftparchive.cc:338 msgid "Package extension list is too long" @@ -441,8 +437,7 @@ msgstr "Aucune sélection ne correspond" #: ftparchive/apt-ftparchive.cc:832 #, c-format msgid "Some files are missing in the package file group `%s'" -msgstr "" -"Quelques fichiers sont manquants dans le groupe de fichiers de paquets « %s »" +msgstr "Quelques fichiers sont manquants dans le groupe de fichiers de paquets « %s »" #: ftparchive/cachedb.cc:43 #, c-format @@ -821,8 +816,7 @@ msgstr "Erreur interne, « InstallPackages » appelé avec des paquets cassés #: cmdline/apt-get.cc:782 msgid "Packages need to be removed but remove is disabled." -msgstr "" -"Les paquets doivent être enlevés mais la désinstallation est désactivée." +msgstr "Les paquets doivent être enlevés mais la désinstallation est désactivée." #: cmdline/apt-get.cc:793 msgid "Internal error, Ordering didn't finish" @@ -856,8 +850,7 @@ msgstr "Il est nécessaire de prendre %so dans les archives.\n" #: cmdline/apt-get.cc:847 #, c-format msgid "After this operation, %sB of additional disk space will be used.\n" -msgstr "" -"Après cette opération, %so d'espace disque supplémentaires seront utilisés.\n" +msgstr "Après cette opération, %so d'espace disque supplémentaires seront utilisés.\n" #: cmdline/apt-get.cc:850 #, c-format @@ -928,8 +921,7 @@ msgstr "" #: cmdline/apt-get.cc:1013 msgid "--fix-missing and media swapping is not currently supported" -msgstr "" -"l'option --fix-missing et l'échange de support ne sont pas encore reconnus." +msgstr "l'option --fix-missing et l'échange de support ne sont pas encore reconnus." #: cmdline/apt-get.cc:1018 msgid "Unable to correct missing packages." @@ -991,8 +983,7 @@ msgstr "Aucun paquet ne correspond au paquet %s" #: cmdline/apt-get.cc:1156 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" -msgstr "" -"La réinstallation de %s est impossible, il ne peut pas être téléchargé.\n" +msgstr "La réinstallation de %s est impossible, il ne peut pas être téléchargé.\n" #: cmdline/apt-get.cc:1164 #, c-format @@ -1055,8 +1046,7 @@ msgstr "L'information suivante devrait vous aider à résoudre la situation : " #: cmdline/apt-get.cc:1449 msgid "Internal Error, AutoRemover broke stuff" -msgstr "" -"Erreur interne, l'outil de suppression automatique a cassé quelque chose." +msgstr "Erreur interne, l'outil de suppression automatique a cassé quelque chose." #: cmdline/apt-get.cc:1468 msgid "Internal error, AllUpgrade broke stuff" @@ -1260,8 +1250,7 @@ msgstr "Impossible de satisfaire les dépendances %s pour %s : %s" #: cmdline/apt-get.cc:2540 #, c-format msgid "Build-dependencies for %s could not be satisfied." -msgstr "" -"Les dépendances de compilation pour %s ne peuvent pas être satisfaites." +msgstr "Les dépendances de compilation pour %s ne peuvent pas être satisfaites." #: cmdline/apt-get.cc:2544 msgid "Failed to process build dependencies" @@ -1426,30 +1415,33 @@ msgstr "" msgid "Bad default setting!" msgstr "Mauvais paramètre par défaut !" -#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:93 -#: dselect/install:104 dselect/update:45 +#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:94 +#: dselect/install:105 dselect/update:45 msgid "Press enter to continue." msgstr "Veuillez appuyer sur Entrée pour continuer." -#: dselect/install:100 +#: dselect/install:91 +msgid "Do you want to erase any previously downloaded .deb files?" +msgstr "Voulez-vous effacer les fichiers .deb précédemment téléchargés ?" + +#: dselect/install:101 msgid "Some errors occurred while unpacking. I'm going to configure the" msgstr "" "Quelques erreurs sont apparues lors du décompactage. Nous allons configurer " "les" -#: dselect/install:101 +#: dselect/install:102 msgid "packages that were installed. This may result in duplicate errors" msgstr "paquets qui ont été installés. Il peut en résulter d'autres erreurs" -#: dselect/install:102 +#: dselect/install:103 msgid "or errors caused by missing dependencies. This is OK, only the errors" msgstr "" "ou des erreurs provoquées par les dépendances manquantes. C'est bénin, " "seules les erreurs" -#: dselect/install:103 -msgid "" -"above this message are important. Please fix them and run [I]nstall again" +#: dselect/install:104 +msgid "above this message are important. Please fix them and run [I]nstall again" msgstr "" "précédant ce message sont importantes. Veuillez les corriger et\n" "démarrer l'[I]nstallation une nouvelle fois." @@ -1812,8 +1804,7 @@ msgstr "" #: methods/ftp.cc:265 #, c-format msgid "Login script command '%s' failed, server said: %s" -msgstr "" -"La commande « %s » du script de connexion a échoué, le serveur a répondu : %s" +msgstr "La commande « %s » du script de connexion a échoué, le serveur a répondu : %s" #: methods/ftp.cc:291 #, c-format @@ -1850,8 +1841,7 @@ msgstr "Impossible de créer un connecteur" #: methods/ftp.cc:698 msgid "Could not connect data socket, connection timed out" -msgstr "" -"Impossible de se connecter sur le port de données, délai de connexion dépassé" +msgstr "Impossible de se connecter sur le port de données, délai de connexion dépassé" #: methods/ftp.cc:704 msgid "Could not connect passive socket." @@ -1988,12 +1978,10 @@ msgstr "Impossible d'accéder au porte-clés : « %s »" #: methods/gpgv.cc:101 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." -msgstr "" -"E: liste de paramètres trop longue pour Acquire::gpgv::Options. Abandon." +msgstr "E: liste de paramètres trop longue pour Acquire::gpgv::Options. Abandon." #: methods/gpgv.cc:205 -msgid "" -"Internal error: Good signature, but could not determine key fingerprint?!" +msgid "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" "Erreur interne : signature correcte, mais il est impossible de déterminer " "l'empreinte de la clé." @@ -2438,14 +2426,12 @@ msgstr "Ligne %lu mal formée dans la liste des sources %s (analyse de l'URI)" #: apt-pkg/sourcelist.cc:101 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" -msgstr "" -"Ligne %lu mal formée dans la liste des sources %s (distribution absolue)" +msgstr "Ligne %lu mal formée dans la liste des sources %s (distribution absolue)" #: apt-pkg/sourcelist.cc:108 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" -msgstr "" -"Ligne %lu mal formée dans la liste des sources %s (analyse de distribution)" +msgstr "Ligne %lu mal formée dans la liste des sources %s (analyse de distribution)" #: apt-pkg/sourcelist.cc:199 #, c-format @@ -2470,8 +2456,7 @@ msgstr "Le type « %s » est inconnu sur la ligne %u dans la liste des sources #: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251 #, c-format msgid "Malformed line %u in source list %s (vendor id)" -msgstr "" -"Ligne %u mal formée dans la liste des sources %s (identifiant du fournisseur)" +msgstr "Ligne %u mal formée dans la liste des sources %s (identifiant du fournisseur)" #: apt-pkg/packagemanager.cc:428 #, c-format @@ -2492,8 +2477,7 @@ msgstr "Le type de fichier d'index « %s » n'est pas accepté" #: apt-pkg/algorithms.cc:247 #, c-format -msgid "" -"The package %s needs to be reinstalled, but I can't find an archive for it." +msgid "The package %s needs to be reinstalled, but I can't find an archive for it." msgstr "" "Le paquet %s doit être réinstallé, mais je ne parviens pas à trouver son " "archive." @@ -2575,8 +2559,7 @@ msgstr "Impossible de localiser %s." #: apt-pkg/srcrecords.cc:44 msgid "You must put some 'source' URIs in your sources.list" -msgstr "" -"Vous devez insérer quelques adresses « sources » dans votre sources.list" +msgstr "Vous devez insérer quelques adresses « sources » dans votre sources.list" #: apt-pkg/cachefile.cc:71 msgid "The package lists or status file could not be parsed or opened." @@ -2704,8 +2687,7 @@ msgstr "Assemblage des fichiers listés dans les champs Provides" #: apt-pkg/pkgcachegen.cc:890 apt-pkg/pkgcachegen.cc:897 msgid "IO Error saving source cache" -msgstr "" -"Erreur d'entrée/sortie lors de la sauvegarde du fichier de cache des sources" +msgstr "Erreur d'entrée/sortie lors de la sauvegarde du fichier de cache des sources" #: apt-pkg/acquire-item.cc:127 #, c-format @@ -2722,8 +2704,7 @@ msgstr "Somme de contrôle de hachage incohérente" #: apt-pkg/acquire-item.cc:1100 msgid "There is no public key available for the following key IDs:\n" -msgstr "" -"Aucune clé publique n'est disponible pour la/les clé(s) suivante(s) :\n" +msgstr "Aucune clé publique n'est disponible pour la/les clé(s) suivante(s) :\n" #: apt-pkg/acquire-item.cc:1213 #, c-format @@ -2746,8 +2727,7 @@ msgstr "" #: apt-pkg/acquire-item.cc:1313 #, c-format -msgid "" -"The package index files are corrupted. No Filename: field for package %s." +msgid "The package index files are corrupted. No Filename: field for package %s." msgstr "" "Les fichiers d'index des paquets sont corrompus. Aucun champ « Filename: » " "pour le paquet %s." @@ -2940,3 +2920,4 @@ msgstr "Impossible de corriger le fichier" #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "Connexion fermée prématurément" + @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-05-02 13:59-0300\n" +"POT-Creation-Date: 2008-05-04 09:18+0200\n" "PO-Revision-Date: 2008-04-19 14:42+0100\n" "Last-Translator: Jacobo Tarrío <jtarrio@debian.org>\n" "Language-Team: Galician <proxecto@trasno.net>\n" @@ -1410,24 +1410,28 @@ msgstr "" msgid "Bad default setting!" msgstr "¡Configuración por defecto incorrecta!" -#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:93 -#: dselect/install:104 dselect/update:45 +#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:94 +#: dselect/install:105 dselect/update:45 msgid "Press enter to continue." msgstr "Prema Intro para continuar." -#: dselect/install:100 +#: dselect/install:91 +msgid "Do you want to erase any previously downloaded .deb files?" +msgstr "" + +#: dselect/install:101 msgid "Some errors occurred while unpacking. I'm going to configure the" msgstr "Houbo algúns erros ao desempaquetar. Vanse configurar os paquetes" -#: dselect/install:101 +#: dselect/install:102 msgid "packages that were installed. This may result in duplicate errors" msgstr "que se instalaron. Isto pode producir erros duplicados ou erros" -#: dselect/install:102 +#: dselect/install:103 msgid "or errors caused by missing dependencies. This is OK, only the errors" msgstr "causados por dependencias incumpridas. Isto é normal, só os erros" -#: dselect/install:103 +#: dselect/install:104 msgid "" "above this message are important. Please fix them and run [I]nstall again" msgstr "" @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.5.25\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-05-02 13:59-0300\n" +"POT-Creation-Date: 2008-05-04 09:18+0200\n" "PO-Revision-Date: 2004-06-10 19:58+0300\n" "Last-Translator: Lior Kaplan <webmaster@guides.co.il>\n" "Language-Team: Hebrew\n" @@ -1219,24 +1219,28 @@ msgstr "" msgid "Bad default setting!" msgstr "" -#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:93 -#: dselect/install:104 dselect/update:45 +#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:94 +#: dselect/install:105 dselect/update:45 msgid "Press enter to continue." msgstr "" -#: dselect/install:100 -msgid "Some errors occurred while unpacking. I'm going to configure the" +#: dselect/install:91 +msgid "Do you want to erase any previously downloaded .deb files?" msgstr "" #: dselect/install:101 -msgid "packages that were installed. This may result in duplicate errors" +msgid "Some errors occurred while unpacking. I'm going to configure the" msgstr "" #: dselect/install:102 -msgid "or errors caused by missing dependencies. This is OK, only the errors" +msgid "packages that were installed. This may result in duplicate errors" msgstr "" #: dselect/install:103 +msgid "or errors caused by missing dependencies. This is OK, only the errors" +msgstr "" + +#: dselect/install:104 msgid "" "above this message are important. Please fix them and run [I]nstall again" msgstr "" @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: hu\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-05-02 13:59-0300\n" +"POT-Creation-Date: 2008-05-04 09:18+0200\n" "PO-Revision-Date: 2006-10-21 11:04+0100\n" "Last-Translator: SZERVÁC Attila <sas@321.hu>\n" "Language-Team: Hungarian <debian-l10n-hungarian>\n" @@ -1395,24 +1395,28 @@ msgstr "" msgid "Bad default setting!" msgstr "Hibás alapértelmezett beállítás!" -#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:93 -#: dselect/install:104 dselect/update:45 +#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:94 +#: dselect/install:105 dselect/update:45 msgid "Press enter to continue." msgstr "Üss entert a folytatáshoz." -#: dselect/install:100 +#: dselect/install:91 +msgid "Do you want to erase any previously downloaded .deb files?" +msgstr "" + +#: dselect/install:101 msgid "Some errors occurred while unpacking. I'm going to configure the" msgstr "Néhány hiba adódott kibontás közben. Nekilátok konfigurálni a" -#: dselect/install:101 +#: dselect/install:102 msgid "packages that were installed. This may result in duplicate errors" msgstr "már telepített csomagokat. Ez a hibák duplázódását eredményezheti" -#: dselect/install:102 +#: dselect/install:103 msgid "or errors caused by missing dependencies. This is OK, only the errors" msgstr "vagy hiányzó függőségek miatti hibákat. Ez így OK, csak az ezen üzenet" -#: dselect/install:103 +#: dselect/install:104 msgid "" "above this message are important. Please fix them and run [I]nstall again" msgstr "előtti hibák fontosak. Javítsd azokat és futtasd az [I]nstallt újra" @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.5.5\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-05-02 13:59-0300\n" +"POT-Creation-Date: 2008-05-04 09:18+0200\n" "PO-Revision-Date: 2006-10-12 09:27+0200\n" "Last-Translator: Samuele Giovanni Tonon <samu@debian.org>\n" "Language-Team: Italian <it@li.org>\n" @@ -1407,29 +1407,33 @@ msgstr "" msgid "Bad default setting!" msgstr "Opzione predefinita errata!" -#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:93 -#: dselect/install:104 dselect/update:45 +#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:94 +#: dselect/install:105 dselect/update:45 msgid "Press enter to continue." msgstr "Premere invio per continuare." +#: dselect/install:91 +msgid "Do you want to erase any previously downloaded .deb files?" +msgstr "" + # Note to translators: The following four messages belong together. It doesn't # matter where sentences start, but it has to fit in just these four lines, and # at only 80 characters per line, if possible. -#: dselect/install:100 +#: dselect/install:101 msgid "Some errors occurred while unpacking. I'm going to configure the" msgstr "Si sono verificati alcuni errori nella scompattazione. Si cercher di " -#: dselect/install:101 +#: dselect/install:102 msgid "packages that were installed. This may result in duplicate errors" msgstr "" "configurare i pacchetti che sono stati installati. Questo potrebbe generare " -#: dselect/install:102 +#: dselect/install:103 msgid "or errors caused by missing dependencies. This is OK, only the errors" msgstr "" "errori duplicati o errori causati da dipendenze non soddisfatte. Questo va " -#: dselect/install:103 +#: dselect/install:104 msgid "" "above this message are important. Please fix them and run [I]nstall again" msgstr "" @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.6\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-05-02 13:59-0300\n" +"POT-Creation-Date: 2008-05-04 09:18+0200\n" "PO-Revision-Date: 2007-12-18 21:13+0900\n" "Last-Translator: Kenshi Muto <kmuto@debian.org>\n" "Language-Team: Debian Japanese List <debian-japanese@lists.debian.org>\n" @@ -1408,24 +1408,28 @@ msgstr "" msgid "Bad default setting!" msgstr "不正なデフォルト設定です!" -#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:93 -#: dselect/install:104 dselect/update:45 +#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:94 +#: dselect/install:105 dselect/update:45 msgid "Press enter to continue." msgstr "enter を押すと続行します。" -#: dselect/install:100 +#: dselect/install:91 +msgid "Do you want to erase any previously downloaded .deb files?" +msgstr "" + +#: dselect/install:101 msgid "Some errors occurred while unpacking. I'm going to configure the" msgstr "展開中にエラーが発生しました。インストールされたパッケージを" -#: dselect/install:101 +#: dselect/install:102 msgid "packages that were installed. This may result in duplicate errors" msgstr "設定します。これにより、エラーが複数出るか、依存関係の欠如に" -#: dselect/install:102 +#: dselect/install:103 msgid "or errors caused by missing dependencies. This is OK, only the errors" msgstr "よるエラーが出るかもしれません。これには問題はなく、上記のメッセージ" -#: dselect/install:103 +#: dselect/install:104 msgid "" "above this message are important. Please fix them and run [I]nstall again" msgstr "が重要です。これを修正して「導入」を再度実行してください" @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: apt_po_km\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-05-02 13:59-0300\n" +"POT-Creation-Date: 2008-05-04 09:18+0200\n" "PO-Revision-Date: 2006-10-10 09:48+0700\n" "Last-Translator: Khoem Sokhem <khoemsokhem@khmeros.info>\n" "Language-Team: Khmer <support@khmeros.info>\n" @@ -1389,24 +1389,28 @@ msgstr "" msgid "Bad default setting!" msgstr "ការកំណត់លំនាំដើមមិនល្អ !" -#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:93 -#: dselect/install:104 dselect/update:45 +#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:94 +#: dselect/install:105 dselect/update:45 msgid "Press enter to continue." msgstr "សង្កត់ បញ្ចូល ដើម្បីបន្ត ។" -#: dselect/install:100 +#: dselect/install:91 +msgid "Do you want to erase any previously downloaded .deb files?" +msgstr "" + +#: dselect/install:101 msgid "Some errors occurred while unpacking. I'm going to configure the" msgstr "កំហុសមួយចំនួនបានកើតឡើងខណៈពេលពន្លាកញ្ចប់ ។ ខ្ញុំនឹងកំណត់រចនាសម្ប័ន្ធ" -#: dselect/install:101 +#: dselect/install:102 msgid "packages that were installed. This may result in duplicate errors" msgstr "កញ្ចប់ដែលបានដំឡើង ។ នេះប្រហែលជាលទ្ធផលកំហុសស្ទួន" -#: dselect/install:102 +#: dselect/install:103 msgid "or errors caused by missing dependencies. This is OK, only the errors" msgstr "ឬ កំហុសដែលបង្កដោយការបាត់បង់ភាពអាស្រ័យ ។ មិនអីទេ គ្រាន់តែជាកំហុស " -#: dselect/install:103 +#: dselect/install:104 msgid "" "above this message are important. Please fix them and run [I]nstall again" msgstr "នៅខាងលើសារនេះគឺសំខាន់ណាស់ ។ សូមជួសជុលពួកវា ហើយរត់ការដំឡើងម្តងទៀត" @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-05-02 13:59-0300\n" +"POT-Creation-Date: 2008-05-04 09:18+0200\n" "PO-Revision-Date: 2007-10-29 13:10-0400\n" "Last-Translator: Sunjae Park <darehanl@gmail.com>\n" "Language-Team: Korean <debian-l10n-korean@lists.debian.org>\n" @@ -1398,25 +1398,29 @@ msgstr "" msgid "Bad default setting!" msgstr "기본 설정이 잘못되었습니다!" -#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:93 -#: dselect/install:104 dselect/update:45 +#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:94 +#: dselect/install:105 dselect/update:45 msgid "Press enter to continue." msgstr "계속 하시려면 enter를 누르십시오." -#: dselect/install:100 +#: dselect/install:91 +msgid "Do you want to erase any previously downloaded .deb files?" +msgstr "" + +#: dselect/install:101 msgid "Some errors occurred while unpacking. I'm going to configure the" msgstr "압축을 푸는 데 몇몇 오류가 발생했습니다. 이미 설치된 꾸러미를" -#: dselect/install:101 +#: dselect/install:102 msgid "packages that were installed. This may result in duplicate errors" msgstr "설정할 것입니다. 오류때문에 의존성을 만족하지 못해 설정하는 과정에서" -#: dselect/install:102 +#: dselect/install:103 msgid "or errors caused by missing dependencies. This is OK, only the errors" msgstr "" "오류가 중복되어 나타날 수 있습니다. 하지만 상관없고, 이 메세지 위에 나온" -#: dselect/install:103 +#: dselect/install:104 msgid "" "above this message are important. Please fix them and run [I]nstall again" msgstr "오류만 중요합니다. 이 오류를 고친 다음에 설치(I)를 다시 시도하십시오" @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-05-02 13:59-0300\n" +"POT-Creation-Date: 2008-05-04 09:18+0200\n" "PO-Revision-Date: 2006-09-16 17:51+0100\n" "Last-Translator: Erdal Ronahi <erdal.ronahi@gmail.com>\n" "Language-Team: Kurdish <ku@li.org>\n" @@ -1226,24 +1226,28 @@ msgstr "" msgid "Bad default setting!" msgstr "" -#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:93 -#: dselect/install:104 dselect/update:45 +#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:94 +#: dselect/install:105 dselect/update:45 msgid "Press enter to continue." msgstr "" -#: dselect/install:100 -msgid "Some errors occurred while unpacking. I'm going to configure the" +#: dselect/install:91 +msgid "Do you want to erase any previously downloaded .deb files?" msgstr "" #: dselect/install:101 -msgid "packages that were installed. This may result in duplicate errors" +msgid "Some errors occurred while unpacking. I'm going to configure the" msgstr "" #: dselect/install:102 -msgid "or errors caused by missing dependencies. This is OK, only the errors" +msgid "packages that were installed. This may result in duplicate errors" msgstr "" #: dselect/install:103 +msgid "or errors caused by missing dependencies. This is OK, only the errors" +msgstr "" + +#: dselect/install:104 msgid "" "above this message are important. Please fix them and run [I]nstall again" msgstr "" @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-05-02 13:59-0300\n" +"POT-Creation-Date: 2008-05-04 09:18+0200\n" "PO-Revision-Date: 2006-08-09 16:17+0200\n" "Last-Translator: Priti Patil <prithisd@gmail.com>\n" "Language-Team: Marathi, janabhaaratii, C-DAC, Mumbai, India " @@ -1390,24 +1390,28 @@ msgstr "" msgid "Bad default setting!" msgstr "चूकीचे मूलभूत निश्चितीकरण!" -#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:93 -#: dselect/install:104 dselect/update:45 +#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:94 +#: dselect/install:105 dselect/update:45 msgid "Press enter to continue." msgstr "पुढे जाण्यासाठी एंटर दाबा." -#: dselect/install:100 +#: dselect/install:91 +msgid "Do you want to erase any previously downloaded .deb files?" +msgstr "" + +#: dselect/install:101 msgid "Some errors occurred while unpacking. I'm going to configure the" msgstr "काही त्रुटी ह्या उघडत असताना घडल्या.मी संरचित करणार आहे" -#: dselect/install:101 +#: dselect/install:102 msgid "packages that were installed. This may result in duplicate errors" msgstr "पॅकेजेस जी संस्थापित झाली आहे.याचा निकाल दुप्पट त्रुटी म्हणून होऊ शकतो" -#: dselect/install:102 +#: dselect/install:103 msgid "or errors caused by missing dependencies. This is OK, only the errors" msgstr "किंवा डिपेंडन्सीज नसल्यामुळे त्रुटी झाल्या. हे ठीक आहे, फक्त त्रुटी" -#: dselect/install:103 +#: dselect/install:104 msgid "" "above this message are important. Please fix them and run [I]nstall again" msgstr "" @@ -15,7 +15,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-05-02 13:59-0300\n" +"POT-Creation-Date: 2008-05-04 09:18+0200\n" "PO-Revision-Date: 2008-01-02 14:40+0100\n" "Last-Translator: Hans Fredrik Nordhaug <hans@nordhaug.priv.no>\n" "Language-Team: Norwegian Bokmal <i18n-nb@lister.ping.ui.no>\n" @@ -1404,27 +1404,31 @@ msgstr "" msgid "Bad default setting!" msgstr "Feil standardinnstilling!" -#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:93 -#: dselect/install:104 dselect/update:45 +#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:94 +#: dselect/install:105 dselect/update:45 msgid "Press enter to continue." msgstr "Trykk Enter og fortsett" +#: dselect/install:91 +msgid "Do you want to erase any previously downloaded .deb files?" +msgstr "" + # Note to translators: The following four messages belong together. It doesn't # matter where sentences start, but it has to fit in just these four lines, and # at only 80 characters per line, if possible. -#: dselect/install:100 +#: dselect/install:101 msgid "Some errors occurred while unpacking. I'm going to configure the" msgstr "Feil oppsto ved utpakkinga. Setter n opp de installerte pakkene." -#: dselect/install:101 +#: dselect/install:102 msgid "packages that were installed. This may result in duplicate errors" msgstr "Det kan lede til fordobling av feil eller feil forrsaket av " -#: dselect/install:102 +#: dselect/install:103 msgid "or errors caused by missing dependencies. This is OK, only the errors" msgstr "manglende forutsetninger. Det er greit, bare de nevnte feilene er" -#: dselect/install:103 +#: dselect/install:104 msgid "" "above this message are important. Please fix them and run [I]nstall again" msgstr "av betydning. Sett dem i stand dem og kjr [I]nstall igjen." @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: apt_po\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-05-02 13:59-0300\n" +"POT-Creation-Date: 2008-05-04 09:18+0200\n" "PO-Revision-Date: 2006-06-12 14:35+0545\n" "Last-Translator: Shiva Pokharel <pokharelshiva@hotmail.com>\n" "Language-Team: Nepali <info@mpp.org.np>\n" @@ -1389,24 +1389,28 @@ msgstr "" msgid "Bad default setting!" msgstr "खराब पूर्वनिर्धारण सेटिङ्ग!" -#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:93 -#: dselect/install:104 dselect/update:45 +#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:94 +#: dselect/install:105 dselect/update:45 msgid "Press enter to continue." msgstr "निरन्तरता दिन इन्टर थिच्नुहोस् ।" -#: dselect/install:100 +#: dselect/install:91 +msgid "Do you want to erase any previously downloaded .deb files?" +msgstr "" + +#: dselect/install:101 msgid "Some errors occurred while unpacking. I'm going to configure the" msgstr "अनप्याक गर्दा केही त्रुटिहरू देखा पर्यो । म कनफिगर गर्न गइरहेको छु" -#: dselect/install:101 +#: dselect/install:102 msgid "packages that were installed. This may result in duplicate errors" msgstr "स्थापना भएको प्याकेजहरू । यसले नक्कली त्रुटिहरुमा नतिजा गर्न सक्छ" -#: dselect/install:102 +#: dselect/install:103 msgid "or errors caused by missing dependencies. This is OK, only the errors" msgstr "वा त्रुटि हरटाइरहेको निर्भरताहरुले गरेको हो । यो ठीक छ, मात्र त्रुटिहरू" -#: dselect/install:103 +#: dselect/install:104 msgid "" "above this message are important. Please fix them and run [I]nstall again" msgstr "" @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-05-02 13:59-0300\n" +"POT-Creation-Date: 2008-05-04 09:18+0200\n" "PO-Revision-Date: 2006-10-17 22:35+0100\n" "Last-Translator: Bart Cornelis <cobaco@linux.be>\n" "Language-Team: debian-l10n-dutch <debian-l10n-dutch@lists.debian.org>\n" @@ -1413,30 +1413,34 @@ msgstr "" msgid "Bad default setting!" msgstr "Foute standaardinstelling!" -#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:93 -#: dselect/install:104 dselect/update:45 +#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:94 +#: dselect/install:105 dselect/update:45 msgid "Press enter to continue." msgstr "Druk 'enter' om door te gaan." +#: dselect/install:91 +msgid "Do you want to erase any previously downloaded .deb files?" +msgstr "" + # Note to translators: The following four messages belong together. It doesn't # matter where sentences start, but it has to fit in just these four lines, and # at only 80 characters per line, if possible. -#: dselect/install:100 +#: dselect/install:101 msgid "Some errors occurred while unpacking. I'm going to configure the" msgstr "Er zijn fouten opgetreden tijdens het uitpakken. De genstalleerde" -#: dselect/install:101 +#: dselect/install:102 msgid "packages that were installed. This may result in duplicate errors" msgstr "" "pakketten worden geconfigureerd. Hierbij kunnen fouten meerdere malen " "optreden" -#: dselect/install:102 +#: dselect/install:103 msgid "or errors caused by missing dependencies. This is OK, only the errors" msgstr "" "of veroorzaakt worden door niet-voldane vereisten. Dit is Ok, enkel de fouten" -#: dselect/install:103 +#: dselect/install:104 msgid "" "above this message are important. Please fix them and run [I]nstall again" msgstr "" @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: apt_nn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-05-02 13:59-0300\n" +"POT-Creation-Date: 2008-05-04 09:18+0200\n" "PO-Revision-Date: 2005-02-14 23:30+0100\n" "Last-Translator: Havard Korsvoll <korsvoll@skulelinux.no>\n" "Language-Team: Norwegian nynorsk <i18n-nn@lister.ping.uio.no>\n" @@ -1398,24 +1398,28 @@ msgstr "" msgid "Bad default setting!" msgstr "Drleg standardinnstilling" -#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:93 -#: dselect/install:104 dselect/update:45 +#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:94 +#: dselect/install:105 dselect/update:45 msgid "Press enter to continue." msgstr "Trykk Enter for halda fram." -#: dselect/install:100 +#: dselect/install:91 +msgid "Do you want to erase any previously downloaded .deb files?" +msgstr "" + +#: dselect/install:101 msgid "Some errors occurred while unpacking. I'm going to configure the" msgstr "Nokre feil oppstod ved utpakking. Dei installerte pakkane vert no" -#: dselect/install:101 +#: dselect/install:102 msgid "packages that were installed. This may result in duplicate errors" msgstr "sette opp. Dette kan fra til flgjefeil eller feil p grunn av" -#: dselect/install:102 +#: dselect/install:103 msgid "or errors caused by missing dependencies. This is OK, only the errors" msgstr "krav som ikkje er oppfylte. Det gjer ikkje noko, berre feila ovanfor" -#: dselect/install:103 +#: dselect/install:104 msgid "" "above this message are important. Please fix them and run [I]nstall again" msgstr "er viktige. Rett opp dei feila og [i]nstaller p nytt." @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.7.11\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-05-02 13:59-0300\n" +"POT-Creation-Date: 2008-05-04 09:18+0200\n" "PO-Revision-Date: 2008-03-04 12:58+0100\n" "Last-Translator: Wiktor Wandachowicz <siryes@gmail.com>\n" "Language-Team: Polish <debian-l10n-polish@lists.debian.org>\n" @@ -1408,28 +1408,32 @@ msgstr "" msgid "Bad default setting!" msgstr "Nieprawidłowe ustawienie domyślne!" -#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:93 -#: dselect/install:104 dselect/update:45 +#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:94 +#: dselect/install:105 dselect/update:45 msgid "Press enter to continue." msgstr "Proszę nacisnąć enter, aby kontynuować." +#: dselect/install:91 +msgid "Do you want to erase any previously downloaded .deb files?" +msgstr "" + # Note to translators: The following four messages belong together. It doesn't # matter where sentences start, but it has to fit in just these four lines, and # at only 80 characters per line, if possible. -#: dselect/install:100 +#: dselect/install:101 msgid "Some errors occurred while unpacking. I'm going to configure the" msgstr "Wystąpiły problemy przy rozpakowywaniu. Zainstalowane pakiety zostaną" -#: dselect/install:101 +#: dselect/install:102 msgid "packages that were installed. This may result in duplicate errors" msgstr "skonfigurowane. Może to spowodować podwójne błędy lub błędy" -#: dselect/install:102 +#: dselect/install:103 msgid "or errors caused by missing dependencies. This is OK, only the errors" msgstr "" "spowodowane brakującymi zależnościami. To jest normalne. Tylko powyższe" -#: dselect/install:103 +#: dselect/install:104 msgid "" "above this message are important. Please fix them and run [I]nstall again" msgstr "błędy są istotne. Proszę je poprawić i ponownie wybrać [I]nstalację." @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-05-02 13:59-0300\n" +"POT-Creation-Date: 2008-05-04 09:18+0200\n" "PO-Revision-Date: 2008-02-07 17:40+0000\n" "Last-Translator: Miguel Figueiredo <elmig@debianpt.org>\n" "Language-Team: Portuguese <traduz@debianpt.org>\n" @@ -1408,27 +1408,31 @@ msgstr "" msgid "Bad default setting!" msgstr "Configuração pré-definida errada!" -#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:93 -#: dselect/install:104 dselect/update:45 +#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:94 +#: dselect/install:105 dselect/update:45 msgid "Press enter to continue." msgstr "Carrgue em enter para continuar." +#: dselect/install:91 +msgid "Do you want to erase any previously downloaded .deb files?" +msgstr "" + # Note to translators: The following four messages belong together. It doesn't # matter where sentences start, but it has to fit in just these four lines, and # at only 80 characters per line, if possible. -#: dselect/install:100 +#: dselect/install:101 msgid "Some errors occurred while unpacking. I'm going to configure the" msgstr "Ocorreram alguns erros ao descompactar. Vou configurar os pacotes" -#: dselect/install:101 +#: dselect/install:102 msgid "packages that were installed. This may result in duplicate errors" msgstr "que foram instalados. Isto pode resultar em erros duplicados" -#: dselect/install:102 +#: dselect/install:103 msgid "or errors caused by missing dependencies. This is OK, only the errors" msgstr "causados por dependências em falta. Isto está OK, somente os erros" -#: dselect/install:103 +#: dselect/install:104 msgid "" "above this message are important. Please fix them and run [I]nstall again" msgstr "" diff --git a/po/pt_BR.po b/po/pt_BR.po index a040903fa..833cbe412 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-05-02 13:59-0300\n" +"POT-Creation-Date: 2008-05-04 09:18+0200\n" "PO-Revision-Date: 2006-08-21 00:40-0300\n" "Last-Translator: Felipe Augusto van de Wiel (faw) <faw@cathedrallabs.org>\n" "Language-Team: l10n portuguese <debian-l10n-portuguese@lists.debian.org>\n" @@ -1399,31 +1399,35 @@ msgstr "" msgid "Bad default setting!" msgstr "Configuração padrão ruim!" -#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:93 -#: dselect/install:104 dselect/update:45 +#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:94 +#: dselect/install:105 dselect/update:45 msgid "Press enter to continue." msgstr "Pressione enter para continuar." +#: dselect/install:91 +msgid "Do you want to erase any previously downloaded .deb files?" +msgstr "" + # Note to translators: The following four messages belong together. It doesn't # matter where sentences start, but it has to fit in just these four lines, and # at only 80 characters per line, if possible. -#: dselect/install:100 +#: dselect/install:101 msgid "Some errors occurred while unpacking. I'm going to configure the" msgstr "" "Alguns erros ocorreram ao desempacotar. Eu vou configurar os pacotes que " "foram" -#: dselect/install:101 +#: dselect/install:102 msgid "packages that were installed. This may result in duplicate errors" msgstr "" "instalados. Isto pode resultar em erros duplicados ou erros causados por" -#: dselect/install:102 +#: dselect/install:103 msgid "or errors caused by missing dependencies. This is OK, only the errors" msgstr "" "dependências faltantes. Isto está OK, somente os erros acima desta mensagem" -#: dselect/install:103 +#: dselect/install:104 msgid "" "above this message are important. Please fix them and run [I]nstall again" msgstr "são importantes. Por favor, conserte-os e execute [I]nstalar novamente" @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: apt_po_ro\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-05-02 13:59-0300\n" +"POT-Creation-Date: 2008-05-04 09:18+0200\n" "PO-Revision-Date: 2006-09-19 01:35+0300\n" "Last-Translator: Sorin Batariuc <sorin@bonbon.net>\n" "Language-Team: Romanian <debian-l10n-romanian@lists.debian.org>\n" @@ -1410,26 +1410,30 @@ msgstr "" msgid "Bad default setting!" msgstr "Ajustări implicite necorespunzătoare!" -#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:93 -#: dselect/install:104 dselect/update:45 +#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:94 +#: dselect/install:105 dselect/update:45 msgid "Press enter to continue." msgstr "Apăsaţi Enter pentru a continua." -#: dselect/install:100 +#: dselect/install:91 +msgid "Do you want to erase any previously downloaded .deb files?" +msgstr "" + +#: dselect/install:101 msgid "Some errors occurred while unpacking. I'm going to configure the" msgstr "S-au produs unele erori în timpul despachetării. Voi configura" -#: dselect/install:101 +#: dselect/install:102 msgid "packages that were installed. This may result in duplicate errors" msgstr "" "pachetele care au fost instalate. Aceasta ar putea rezulta erori dublate" -#: dselect/install:102 +#: dselect/install:103 msgid "or errors caused by missing dependencies. This is OK, only the errors" msgstr "" "sau erori cauzate de dependenţe lipsă. Aceasta este normal, doar erorile" -#: dselect/install:103 +#: dselect/install:104 msgid "" "above this message are important. Please fix them and run [I]nstall again" msgstr "" @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: 0.6.46.4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-05-02 13:59-0300\n" +"POT-Creation-Date: 2008-05-04 09:18+0200\n" "PO-Revision-Date: 2007-01-03 23:33+0300\n" "Last-Translator: Yuri Kozlov <kozlov.y@gmail.com>\n" "Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n" @@ -1426,25 +1426,29 @@ msgstr "" msgid "Bad default setting!" msgstr "Неправильное значение по умолчанию!" -#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:93 -#: dselect/install:104 dselect/update:45 +#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:94 +#: dselect/install:105 dselect/update:45 msgid "Press enter to continue." msgstr "Для продолжения нажмите ввод." -#: dselect/install:100 +#: dselect/install:91 +msgid "Do you want to erase any previously downloaded .deb files?" +msgstr "" + +#: dselect/install:101 msgid "Some errors occurred while unpacking. I'm going to configure the" msgstr "Во время распаковки возникли ошибки. Будет продолжен процесс настройки" -#: dselect/install:101 +#: dselect/install:102 msgid "packages that were installed. This may result in duplicate errors" msgstr "установленных пакетов. Это может привести к повторению ошибок или" -#: dselect/install:102 +#: dselect/install:103 msgid "or errors caused by missing dependencies. This is OK, only the errors" msgstr "" "возникновению новых из-за неудовлетворённых зависимостей. Это нормально," -#: dselect/install:103 +#: dselect/install:104 msgid "" "above this message are important. Please fix them and run [I]nstall again" msgstr "" @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-05-02 13:59-0300\n" +"POT-Creation-Date: 2008-05-04 09:18+0200\n" "PO-Revision-Date: 2008-03-17 13:45+0100\n" "Last-Translator: Ivan Masár <helix84@centrum.sk>\n" "Language-Team: Slovak <sk-i18n@lists.linux.sk>\n" @@ -1394,24 +1394,28 @@ msgstr "" msgid "Bad default setting!" msgstr "Chybné predvolené nastavenie!" -#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:93 -#: dselect/install:104 dselect/update:45 +#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:94 +#: dselect/install:105 dselect/update:45 msgid "Press enter to continue." msgstr "Stlačte Enter, ak chcete pokračovať." -#: dselect/install:100 +#: dselect/install:91 +msgid "Do you want to erase any previously downloaded .deb files?" +msgstr "" + +#: dselect/install:101 msgid "Some errors occurred while unpacking. I'm going to configure the" msgstr "Pri rozbaľovaní došlo k nejakým chybám. Teraz sa nastavia" -#: dselect/install:101 +#: dselect/install:102 msgid "packages that were installed. This may result in duplicate errors" msgstr "balíky, ktoré sa nainštalovali. Môže to spôsobiť chybové správy" -#: dselect/install:102 +#: dselect/install:103 msgid "or errors caused by missing dependencies. This is OK, only the errors" msgstr "o nesplnených závislostiach. Je to v poriadku, dôležité sú iba" -#: dselect/install:103 +#: dselect/install:104 msgid "" "above this message are important. Please fix them and run [I]nstall again" msgstr "" @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.5.5\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-05-02 13:59-0300\n" +"POT-Creation-Date: 2008-05-04 09:18+0200\n" "PO-Revision-Date: 2005-02-16 22:18+0100\n" "Last-Translator: Jure Cuhalev <gandalf@owca.info>\n" "Language-Team: Slovenian <sl@li.org>\n" @@ -1392,26 +1392,30 @@ msgstr "" msgid "Bad default setting!" msgstr "Napana privzeta nastavitev!" -#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:93 -#: dselect/install:104 dselect/update:45 +#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:94 +#: dselect/install:105 dselect/update:45 msgid "Press enter to continue." msgstr "Za nadaljevanje pritisnite enter." -#: dselect/install:100 +#: dselect/install:91 +msgid "Do you want to erase any previously downloaded .deb files?" +msgstr "" + +#: dselect/install:101 msgid "Some errors occurred while unpacking. I'm going to configure the" msgstr "Med odpakiranjem je prilo do napak. Nastavil bom" -#: dselect/install:101 +#: dselect/install:102 msgid "packages that were installed. This may result in duplicate errors" msgstr "pakete, ki so bili nameeni. To lahko privede do dvojnih napak" -#: dselect/install:102 +#: dselect/install:103 msgid "or errors caused by missing dependencies. This is OK, only the errors" msgstr "" "ali do napak zaradi manjkajoih odvisnosti. To je v redu, pomembne so samo " "napake" -#: dselect/install:103 +#: dselect/install:104 msgid "" "above this message are important. Please fix them and run [I]nstall again" msgstr "nad tem sporoilom. Popravite jih in poenite Namest[I]tev e enkrat" @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-05-02 13:59-0300\n" +"POT-Creation-Date: 2008-05-04 09:18+0200\n" "PO-Revision-Date: 2008-02-28 06:56+0100\n" "Last-Translator: Peter Karlsson <peterk@debian.org>\n" "Language-Team: Swedish <debian-l10n-swedish@debian.org>\n" @@ -1410,27 +1410,31 @@ msgstr "" msgid "Bad default setting!" msgstr "Felaktig standardinställning!" -#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:93 -#: dselect/install:104 dselect/update:45 +#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:94 +#: dselect/install:105 dselect/update:45 msgid "Press enter to continue." msgstr "Tryck på Enter för att fortsätta." +#: dselect/install:91 +msgid "Do you want to erase any previously downloaded .deb files?" +msgstr "" + # Note to translators: The following four messages belong together. It doesn't # matter where sentences start, but it has to fit in just these four lines, and # at only 80 characters per line, if possible. -#: dselect/install:100 +#: dselect/install:101 msgid "Some errors occurred while unpacking. I'm going to configure the" msgstr "Det uppstod fel vid uppackning. Jag kommer konfigurera de paket" -#: dselect/install:101 +#: dselect/install:102 msgid "packages that were installed. This may result in duplicate errors" msgstr "som installerades. Detta kan ge dubbla fel eller fel orsakade av" -#: dselect/install:102 +#: dselect/install:103 msgid "or errors caused by missing dependencies. This is OK, only the errors" msgstr "saknade beroenden. Detta är okej, endast felen ovanför det här" -#: dselect/install:103 +#: dselect/install:104 msgid "" "above this message are important. Please fix them and run [I]nstall again" msgstr "meddelandet är viktiga. Försök korrigera dem och kör [I]nstallera igen" @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-05-02 13:59-0300\n" +"POT-Creation-Date: 2008-05-04 09:18+0200\n" "PO-Revision-Date: 2007-09-17 16:07+0700\n" "Last-Translator: Theppitak Karoonboonyanan <thep@linux.thai.net>\n" "Language-Team: Thai <thai-l10n@googlegroups.com>\n" @@ -1374,24 +1374,28 @@ msgstr "" msgid "Bad default setting!" msgstr "ค่าตั้งปริยายผิดพลาด!" -#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:93 -#: dselect/install:104 dselect/update:45 +#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:94 +#: dselect/install:105 dselect/update:45 msgid "Press enter to continue." msgstr "กด enter เพื่อดำเนินการต่อ" -#: dselect/install:100 +#: dselect/install:91 +msgid "Do you want to erase any previously downloaded .deb files?" +msgstr "" + +#: dselect/install:101 msgid "Some errors occurred while unpacking. I'm going to configure the" msgstr "เกิดข้อผิดพลาดขณะแตกแพกเกจ โปรแกรมจะตั้งค่าแพกเกจที่ติดตั้งแล้ว" -#: dselect/install:101 +#: dselect/install:102 msgid "packages that were installed. This may result in duplicate errors" msgstr "อาจทำให้เกิดข้อความแจ้งข้อผิดพลาดซ้ำ หรือข้อผิดพลาดเนื่องจากแพกเกจที่ต้องใช้ขาดหาย" -#: dselect/install:102 +#: dselect/install:103 msgid "or errors caused by missing dependencies. This is OK, only the errors" msgstr "ซึ่งไม่มีปัญหาอะไร มีเฉพาะข้อผิดพลาดก่อนหน้าข้อความนี้เท่านั้นที่สำคัญ" -#: dselect/install:103 +#: dselect/install:104 msgid "" "above this message are important. Please fix them and run [I]nstall again" msgstr "กรุณาแก้ปัญหาเหล่านั้น แล้วเรียกติดตั้งใหม่อีกครั้ง" @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-05-02 13:59-0300\n" +"POT-Creation-Date: 2008-05-04 09:18+0200\n" "PO-Revision-Date: 2007-03-29 21:36+0800\n" "Last-Translator: Eric Pareja <xenos@upm.edu.ph>\n" "Language-Team: Tagalog <debian-tl@banwa.upm.edu.ph>\n" @@ -1411,25 +1411,29 @@ msgstr "" msgid "Bad default setting!" msgstr "Maling nakatakda na default!" -#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:93 -#: dselect/install:104 dselect/update:45 +#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:94 +#: dselect/install:105 dselect/update:45 msgid "Press enter to continue." msgstr "Pindutin ang enter upang magpatuloy." -#: dselect/install:100 +#: dselect/install:91 +msgid "Do you want to erase any previously downloaded .deb files?" +msgstr "" + +#: dselect/install:101 msgid "Some errors occurred while unpacking. I'm going to configure the" msgstr "May mga error na naganap habang nagbubuklat. Isasaayos ko ang" -#: dselect/install:101 +#: dselect/install:102 msgid "packages that were installed. This may result in duplicate errors" msgstr "mga paketeng naluklok. Maaaring dumulot ito ng mga error na doble" -#: dselect/install:102 +#: dselect/install:103 msgid "or errors caused by missing dependencies. This is OK, only the errors" msgstr "" "o mga error na dulot ng kulang na dependensiya. Ito ay ayos lamang, yun lang" -#: dselect/install:103 +#: dselect/install:104 msgid "" "above this message are important. Please fix them and run [I]nstall again" msgstr "" @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: apt-all\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-05-02 13:59-0300\n" +"POT-Creation-Date: 2008-05-04 09:18+0200\n" "PO-Revision-Date: 2006-07-29 15:57+0300\n" "Last-Translator: Artem Bondarenko <artem.brz@gmail.com>\n" "Language-Team: Українська <uk@li.org>\n" @@ -1418,25 +1418,29 @@ msgstr "" msgid "Bad default setting!" msgstr "Неправильне значення по замовчуванню!" -#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:93 -#: dselect/install:104 dselect/update:45 +#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:94 +#: dselect/install:105 dselect/update:45 msgid "Press enter to continue." msgstr "Для продовження натисніть Ввід." -#: dselect/install:100 +#: dselect/install:91 +msgid "Do you want to erase any previously downloaded .deb files?" +msgstr "" + +#: dselect/install:101 msgid "Some errors occurred while unpacking. I'm going to configure the" msgstr "" "Під час розпакування виникли помилки. Буде продовжено процес налаштування" -#: dselect/install:101 +#: dselect/install:102 msgid "packages that were installed. This may result in duplicate errors" msgstr "встановлених пакунків. Це може призвести до повторення помилок або" -#: dselect/install:102 +#: dselect/install:103 msgid "or errors caused by missing dependencies. This is OK, only the errors" msgstr "виникненню нових через незадоволені залежності. Це нормально," -#: dselect/install:103 +#: dselect/install:104 msgid "" "above this message are important. Please fix them and run [I]nstall again" msgstr "" @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-05-02 13:59-0300\n" +"POT-Creation-Date: 2008-05-04 09:18+0200\n" "PO-Revision-Date: 2008-05-02 17:13+0930\n" "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n" "Language-Team: Vietnamese <vi-VN@googlegroups.com>\n" @@ -1435,26 +1435,30 @@ msgstr "" msgid "Bad default setting!" msgstr "Thiết lập mặc định sai." -#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:93 -#: dselect/install:104 dselect/update:45 +#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:94 +#: dselect/install:105 dselect/update:45 msgid "Press enter to continue." msgstr "Hãy bấm phím Enter để tiếp tục lại." -#: dselect/install:100 +#: dselect/install:91 +msgid "Do you want to erase any previously downloaded .deb files?" +msgstr "" + +#: dselect/install:101 msgid "Some errors occurred while unpacking. I'm going to configure the" msgstr "Gập một số lỗi khi giải nén. Sẽ cấu hình" -#: dselect/install:101 +#: dselect/install:102 msgid "packages that were installed. This may result in duplicate errors" msgstr "những gói đã đươc cài đặt. Có lẽ sẽ gây ra lỗi trùng" -#: dselect/install:102 +#: dselect/install:103 msgid "or errors caused by missing dependencies. This is OK, only the errors" msgstr "" "hoặc lỗi khi không có phần mềm mà gói khác phụ thuộc vào nó. Không có sao, " "chỉ những lỗi" -#: dselect/install:103 +#: dselect/install:104 msgid "" "above this message are important. Please fix them and run [I]nstall again" msgstr "" diff --git a/po/zh_CN.po b/po/zh_CN.po index f34e1b701..32235218b 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.5.23\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-05-02 13:59-0300\n" -"PO-Revision-Date: 2008-02-15 21:01+0800\n" +"POT-Creation-Date: 2008-05-04 09:18+0200\n" +"PO-Revision-Date: 2008-04-18 21:53+0800\n" "Last-Translator: Deng Xiyue <manphiz-guest@users.alioth.debian.org>\n" "Language-Team: Debian Chinese [GB] <debian-chinese-gb@lists.debian.org>\n" "MIME-Version: 1.0\n" @@ -30,7 +30,7 @@ msgstr "未发现软件包 %s" #: cmdline/apt-cache.cc:247 msgid "Total package names: " -msgstr "软件包总数(按名称计)：" +msgstr "软件包名称总数：" #: cmdline/apt-cache.cc:287 msgid " Normal packages: " @@ -58,7 +58,7 @@ msgstr "按版本共计：" #: cmdline/apt-cache.cc:295 msgid "Total distinct descriptions: " -msgstr "按说明共计：" +msgstr "按不同的说明共计：" #: cmdline/apt-cache.cc:297 msgid "Total dependencies: " @@ -1228,7 +1228,6 @@ msgid "Supported modules:" msgstr "被支持模块：" #: cmdline/apt-get.cc:2617 -#, fuzzy msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1288,7 +1287,7 @@ msgstr "" " source - 下载源码包文件\n" " build-dep - 为源码包配置所需的构建依赖关系\n" " dist-upgrade - 发布版升级，见 apt-get(8)\n" -" dselect-upgrade - 根据 dselect的选择来进行升级\n" +" dselect-upgrade - 根据 dselect 的选择来进行升级\n" " clean - 删除所有已下载的包文件\n" " autoclean - 删除老版本的已下载的包文件\n" " check - 核对以确认系统的依赖关系的完整性\n" @@ -1299,8 +1298,8 @@ msgstr "" " -qq 除了错误外，什么都不输出\n" " -d 仅仅下载 - 【不】安装或解开包文件\n" " -s 不作实际操作。只是依次模拟执行命令\n" -" -y 对所有询问都作肯定的回答，同时不作任何提示\n" -" -f 当没有通过完整性测试时，程序仍试图继续执行\n" +" -y 对所有询问都回答是(Yes)，同时不作任何提示\n" +" -f 当出现破损的依赖关系时，程序将试图修正系统\n" " -m 当有包文件无法找到时，程序仍试图继续执行\n" " -u 显示已升级的软件包列表\n" " -b 在下载完源码包后，编译生成相应的软件包\n" @@ -1380,24 +1379,28 @@ msgstr "" msgid "Bad default setting!" msgstr "错误的默认设置！" -#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:93 -#: dselect/install:104 dselect/update:45 +#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:94 +#: dselect/install:105 dselect/update:45 msgid "Press enter to continue." msgstr "按回车键继续。" -#: dselect/install:100 +#: dselect/install:91 +msgid "Do you want to erase any previously downloaded .deb files?" +msgstr "" + +#: dselect/install:101 msgid "Some errors occurred while unpacking. I'm going to configure the" msgstr "在解包时发生了一些错误。我正准备配置" -#: dselect/install:101 +#: dselect/install:102 msgid "packages that were installed. This may result in duplicate errors" msgstr "已经安装的软件包。这个操作可能会导致出现重复的错误" -#: dselect/install:102 +#: dselect/install:103 msgid "or errors caused by missing dependencies. This is OK, only the errors" msgstr "或一些由于依赖关系不能满足所产生的错误。这个问题不大，只有" -#: dselect/install:103 +#: dselect/install:104 msgid "" "above this message are important. Please fix them and run [I]nstall again" msgstr "这个提示之前的错误消息才值得您注意。请更正它们，然后再次执行 [I]nstall" @@ -2455,12 +2458,12 @@ msgstr "找不到“%spartial”这个目录。" #: apt-pkg/acquire.cc:827 #, c-format msgid "Retrieving file %li of %li (%s remaining)" -msgstr "正在下载 %li 个文件中的第 %li 个(还有 %s 个)" +msgstr "正在下载第 %li 个文件，共 %li 个(还剩 %s 个)" #: apt-pkg/acquire.cc:829 #, c-format msgid "Retrieving file %li of %li" -msgstr "正在下载 %2$li 个文件中的 %1$li 个" +msgstr "正在下载第 %li 个文件，共 %li 个" #: apt-pkg/acquire-worker.cc:110 #, c-format diff --git a/po/zh_TW.po b/po/zh_TW.po index c71bc28d1..bcada53c2 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: 0.5.4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-05-02 13:59-0300\n" +"POT-Creation-Date: 2008-05-04 09:18+0200\n" "PO-Revision-Date: 2006-10-21 16:58+0800\n" "Last-Translator: Asho Yeh <asho@debian.org.tw>\n" "Language-Team: Chinese/Traditional <zh-l10n@linux.org.tw>\n" @@ -1383,24 +1383,28 @@ msgstr "" msgid "Bad default setting!" msgstr "錯誤的預設設定!" -#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:93 -#: dselect/install:104 dselect/update:45 +#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:94 +#: dselect/install:105 dselect/update:45 msgid "Press enter to continue." msgstr "請按 [Enter] 鍵繼續。" -#: dselect/install:100 +#: dselect/install:91 +msgid "Do you want to erase any previously downloaded .deb files?" +msgstr "" + +#: dselect/install:101 msgid "Some errors occurred while unpacking. I'm going to configure the" msgstr "解開套件時發生錯誤。我要準備設定" -#: dselect/install:101 +#: dselect/install:102 msgid "packages that were installed. This may result in duplicate errors" msgstr "套件已安裝過。這將造成重複性的錯誤" -#: dselect/install:102 +#: dselect/install:103 msgid "or errors caused by missing dependencies. This is OK, only the errors" msgstr "或因為失去相依關係所造成的錯誤。只有該錯誤可被容忍" -#: dselect/install:103 +#: dselect/install:104 msgid "" "above this message are important. Please fix them and run [I]nstall again" msgstr "以上的訊息相當重要。請修正它們並重新執行安裝[I]" |