Dear Niels, I uploaded. I attach the final debdiff.
thanks. a.
diff -Nru --exclude debpatch-url --exclude debpatch --exclude debdeltas --exclude debdelta-upgrade debdelta-0.56/debdelta debdelta-0.59/debdelta --- debdelta-0.56/debdelta 2017-01-01 23:59:34.000000000 +0100 +++ debdelta-0.59/debdelta 2017-02-08 11:28:50.000000000 +0100 @@ -181,7 +181,7 @@ OLD = [] ACT = True DO_MD5 = True -DEB_POLICY = ['b','s','e'] +DEB_POLICY = ['b','s','e','t','f'] DO_PROGRESS = terminalcolumns != None #where/how debpatch/debdelta-upgrade will send forensic data, when patching fails @@ -912,9 +912,9 @@ os.close(temp_fd) - if VERBOSE > 1 or p.returncode: + if VERBOSE > 2 or p.returncode: for j in open(temp_name): - print ' GPG> ',j, + print ' GPG> ',j, os.unlink(temp_name) @@ -2901,6 +2901,10 @@ PARS=['-6e','-9','-9e'] if par: PARS.append(par) + if par == '--lzma2=dict=1MiB': + # dbgsym deb files are compressed with -1e + PARS.append('-1') + PARS.append('-1e') if check: redo=True while redo and PARS: @@ -3975,8 +3979,11 @@ except DebDeltaError,s: if not VERBOSE : print _('Creating:'),delta print ' Creation of delta failed, reason: ',str(s) - if os.path.exists(deltatmp) and DEBUG == 0: - os.unlink(deltatmp) + if os.path.exists(deltatmp): + if KEEP: + print(' '+_('You may want to examine:')+' '+str(deltatmp)) + else: + os.unlink(deltatmp) if not s.retriable : open(delta+'-fails','w').close() exitstatus=max(exitstatus, s.exitcode) @@ -4011,8 +4018,11 @@ pret=do_patch(deltatmp,old_File,None , info=info_delta, do_gpg=None) except DebDeltaError,s: print ' '+_('Error: testing of delta failed:')+' '+str(s) - if os.path.exists(deltatmp) and DEBUG==0: - os.unlink(deltatmp) + if os.path.exists(deltatmp): + if KEEP: + print(' '+_('You may want to examine:')+' '+str(deltatmp)) + else: + os.unlink(deltatmp) if not s.retriable : open(delta+'-fails','w').close() except KeyboardInterrupt: @@ -4022,8 +4032,11 @@ except Exception,s: exitstatus=max(exitstatus,4) puke(" *** Error while testing delta "+delta,s) - if os.path.exists(deltatmp) and DEBUG==0: - os.unlink(deltatmp) + if os.path.exists(deltatmp): + if KEEP: + print ' '+_('You may want to examine:')+' '+str(deltatmp) + else: + os.unlink(deltatmp) open(delta+'-fails','w').close() if pret == None: return max(exitstatus, 4) @@ -4607,8 +4620,8 @@ if uri_p.scheme == 'http': a=[copy(z) for z in uri_p] a[2]=urllib2.quote(uri_p[2]) - url=urlunparse(a) - req = urllib2.Request(url, headers=headers) + uri=urlunparse(a) + req = urllib2.Request(uri, headers=headers) r = urllib2.urlopen(req) #print r.info(),dir(r),r.code return r, getattr(r,'code',None), getattr(r,'msg','(no message)'), r.info() @@ -4659,7 +4672,11 @@ r, status, msg, responseheaders=_connect(uri, re) if not hasattr(r,'read') and responseheaders==None: return r, None, None, None - if status == 206: + if status == 301 and 'location' in responseheaders: + r.read() + r.close() + return download_10k_uri(responseheaders['location'], outname) + elif status == 206: outnametemp=os.path.join(os.path.dirname(outname),'partial',os.path.basename(outname)) try: l = _parse_ContentRange(responseheaders['Content-Range'])[2] @@ -4713,7 +4730,12 @@ start_time=time.time() r, status, message, responseheaders = _connect(uri, re) if not hasattr(r,'read') and responseheaders==None: - return + return + if status == 301 and 'location' in responseheaders: + r.read() + r.close() + if VERBOSE > 1 : print(_(' Redirect to:')+' '+repr(responseheaders['location'])) + return download_uri(responseheaders['location'], outname, conn_time, len_downloaded, statusdb) if not ( status == None or status == 200 or ( status == 206 and l != None ) ): if VERBOSE : print 'Connection problem, status:'+str(status)+' msg:'+str(message)+' uri:'+str(uri) @@ -4840,6 +4862,7 @@ deb_uri=candidate.uri installed_version=p.installed.version candidate_version=p.candidate.version + newsize=p.candidate.size deb_path=string.split(deb_uri,'/') try: thepoolindex=deb_path.index('pool') @@ -4925,23 +4948,39 @@ if status == 404: not_available_deltas.append(p.name) - if uri[:7] == 'http://' and not proxies: # FIXME support ftp or proxies - bigrstatus = test_uri(uri+'-too-big') - else: - bigrstatus = None - if bigrstatus == 200 : + # check if delta is too big + if uri[:7] == 'http://' and not proxies and 200 == test_uri(uri+'-too-big'): # FIXME support ftp or proxies print _('Delta is too big:')+' '+delta_name if 'b' in DEB_POLICY: no_delta.append( (deb_uri, newdeb) ) elif VERBOSE > 1 : print ' No deb-policy "b", no download of ',deb_uri - else: - if DEBUG and VERBOSE: - print _('Delta is not present:')+' '+uri - else: - print _('Delta is not present:')+' '+delta_name - if 'u' in DEB_POLICY: + continue + #check if delta failed upstream + if uri[:7] == 'http://' and not proxies and 200 == test_uri(uri+'-fails'): # FIXME support ftp or proxies + print _('Delta missing, server failed to create it:')+' '+uri + if 'f' in DEB_POLICY: no_delta.append( (deb_uri, newdeb) ) - elif VERBOSE > 1 : print ' No deb-policy "u", no download of ',deb_uri + elif VERBOSE > 1 : print ' No deb-policy "f", no download of ',deb_uri + continue + ### FIXME the server is not generating these stamps ! + #if uri[:7] == 'http://' and not proxies and newsize <= 2 * MIN_DEB_SIZE : # check only on small packages + # smallstatus = test_uri(uri+'-smalldeb') + # if smallstatus == 200: ETC ETC + ### + # packages smaller than MIN_DEB_SIZE are ignored by the server. + if newsize <= MIN_DEB_SIZE : # check only on small packages + print(_('Delta was not created since new package is too small:')+' '+delta_name) + if 't' in DEB_POLICY: + no_delta.append( (deb_uri, newdeb) ) + elif VERBOSE > 1 : print ' No deb-policy "t", no download of ',deb_uri + continue + if DEBUG and VERBOSE: + print _('Delta is not present:')+' '+uri + else: + print _('Delta is not present:')+' '+delta_name + if 'u' in DEB_POLICY: + no_delta.append( (deb_uri, newdeb) ) + elif VERBOSE > 1 : print ' No deb-policy "u", no download of ',deb_uri continue if VERBOSE > 1: diff -Nru --exclude debpatch-url --exclude debpatch --exclude debdeltas --exclude debdelta-upgrade debdelta-0.56/debdeltas_server debdelta-0.59/debdeltas_server --- debdelta-0.56/debdeltas_server 2017-01-01 23:59:34.000000000 +0100 +++ debdelta-0.59/debdeltas_server 2017-02-08 11:28:50.000000000 +0100 @@ -458,7 +458,7 @@ distrib={} #iterate to list mirrors for m in os.listdir(mirrorsdir): - if os.path.isdir(join(mirrorsdir,m)): + if os.path.isdir(join(mirrorsdir,m)) and m not in mirrors_exclude: distrib[m]={} # iterate to find distributions in mirrors for m in distrib: diff -Nru --exclude debpatch-url --exclude debpatch --exclude debdeltas --exclude debdelta-upgrade debdelta-0.56/debdeltas_server.conf debdelta-0.59/debdeltas_server.conf --- debdelta-0.56/debdeltas_server.conf 2017-01-01 23:59:34.000000000 +0100 +++ debdelta-0.59/debdeltas_server.conf 2017-02-08 11:28:50.000000000 +0100 @@ -6,6 +6,8 @@ mirrorsdir = '/srv/mirrors' +mirrors_exclude = ('debian-buildd','debian-ports') + home='/srv/debdelta.debian.org/' backup_Packages_dir=home+'/var/past_mirror_states' diff -Nru --exclude debpatch-url --exclude debpatch --exclude debdeltas --exclude debdelta-upgrade debdelta-0.56/debdelta-upgrade.1 debdelta-0.59/debdelta-upgrade.1 --- debdelta-0.56/debdelta-upgrade.1 2017-01-01 23:59:34.000000000 +0100 +++ debdelta-0.59/debdelta-upgrade.1 2017-02-08 11:28:50.000000000 +0100 @@ -37,10 +37,12 @@ it is a comma separated list of (abbreviations of) source = there is no /etc/debdelta/sources.conf line big = the delta is too big - error = the delta fails to apply + error = the delta fails to apply in the client + tiny = the new package is small (the server ignores such packages) + fail = the server failed to create the delta unavailable = all other cases after = continue downloading debs after patching has ended - default is s,b,e + default is s,b,e,t,f .TP \fB\-v verbose (can be added multiple times). diff -Nru --exclude debpatch-url --exclude debpatch --exclude debdeltas --exclude debdelta-upgrade debdelta-0.56/debian/changelog debdelta-0.59/debian/changelog --- debdelta-0.56/debian/changelog 2017-01-01 23:59:34.000000000 +0100 +++ debdelta-0.59/debian/changelog 2017-02-08 11:28:50.000000000 +0100 @@ -1,3 +1,45 @@ +debdelta (0.59) unstable; urgency=medium + + * really bump standards version to 3.9.8 + * correct typo in copyright + * fix code for small debs, do not check for stamps + * Bug fix: "local variable 'url' referenced before assignment", + thanks to Steffen Weinhart, (Closes: #708022). + * Add 'set -e' in debian/rules. Thanks Niels Thykier + * correct wrong message 'No deb-policy "u" ....' Thanks Niels Thykier + + -- A Mennucc1 <mennu...@debian.org> Wed, 08 Feb 2017 11:28:50 +0100 + +debdelta (0.58exp) experimental; urgency=medium + + * Bug fix: "cannot handle redirects", + thanks to Paul Wise (Closes: #835655). + * Bug fix: "Portuguese translation not packaged", + thanks to Carlos Maddela (Closes: #849908). + * Bug fix: "[INTL:pt] Updated Portuguese translation for program", + thanks to Miguel Figueiredo (Closes: #852087). + * Installation leaves gpg-agent process running + Thanks Andreas Beckmann (Closes: #85135). + * Various code fixes. + * Lintian fixes: + - rewrite copyright using copyright-format/1.0/ + - bump standards version to 3.9.8 + + -- A Mennucc1 <mennu...@debian.org> Mon, 06 Feb 2017 12:49:20 +0100 + +debdelta (0.57) unreleased; urgency=medium + + * Autodetect and install all available translations. + Thanks Carlos Maddela. Closes: #849908 + * Update Italian translation. + * Fix guessing of xz parameters for dbgsym files. + * debdelta-upgrade: explain why the delta is not available; and also add + corresponding --deb-policies. + Thanks shirish शिरà¥à¤· . Closes: #779897 + * debdelta-upgrade handles redirects. Thanks Paul Wise. Closes: #835655 + + -- A Mennucc1 <mennu...@debian.org> Sat, 07 Jan 2017 18:16:32 +0100 + debdelta (0.56) unstable; urgency=medium * sets the mtimes of built files, for reproducible metadata, diff -Nru --exclude debpatch-url --exclude debpatch --exclude debdeltas --exclude debdelta-upgrade debdelta-0.56/debian/control debdelta-0.59/debian/control --- debdelta-0.56/debian/control 2017-01-01 23:59:34.000000000 +0100 +++ debdelta-0.59/debian/control 2017-02-08 11:28:50.000000000 +0100 @@ -3,7 +3,7 @@ Priority: optional Build-Depends: zlib1g-dev, libbz2-dev Maintainer: A Mennucc1 <mennu...@debian.org> -Standards-Version: 3.9.6.0 +Standards-Version: 3.9.8 Homepage: http://debdelta.debian.net Vcs-git: git://anonscm.debian.org/collab-maint/debdelta.git diff -Nru --exclude debpatch-url --exclude debpatch --exclude debdeltas --exclude debdelta-upgrade debdelta-0.56/debian/copyright debdelta-0.59/debian/copyright --- debdelta-0.56/debian/copyright 2017-01-01 23:59:34.000000000 +0100 +++ debdelta-0.59/debian/copyright 2017-02-08 11:28:50.000000000 +0100 @@ -1,33 +1,24 @@ -This package was put together by Andrea Mennucci. - -debdelta - Program Copyright (C) 2006-2011 Andrea Mennucci. - - This program is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301 USA - -minigzip - Copyright (C) 1995-1998 Jean-loup Gailly and Mark Adler - +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: debdelta +Source: git://anonscm.debian.org/collab-maint/debdelta.git + +Files: * +Copyright: 2006-2017 Andrea Mennucci. +License: GPL-2 + On Debian systems, the complete text of the GNU General Public License + version 2 can be found in /usr/share/common-licenses/GPL-2 + +Files: minigzip.c +Copyright: 1995-1998 Jean-loup Gailly and Mark Adler +License: This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software. - + . Permission is granted to anyone to use this software for any purpose, including commercial applications, and to alter it and redistribute it freely, subject to the following restrictions: - + . 1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be @@ -36,21 +27,14 @@ misrepresented as being the original software. 3. This notice may not be removed or altered from any source distribution. -contrib/debmarshal_list_useless_debs - Downloaded from - http://debmarshal.googlecode.com/svn/trunk/repository2/pooldebclean/pooldebclean.pl - and then slighlty patched. - - Copyright 2010 Google Inc. , 2011 A. Mennucci - - Author: Drake Diedrich <d...@google.com>, A. Mennucci - +Files: contrib/debmarshal_list_useless_debs +Source: https://code.google.com/archive/p/debmarshal/ +Comment: slighlty patched. +Copyright: 2010 Google Inc. + 2011 A. Mennucci +Author: Drake Diedrich <d...@google.com>, A. Mennucci +License: Apache-2.0 Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. - You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. + You may read a copy of the license in + /usr/share/common-licenses/Apache-2.0 diff -Nru --exclude debpatch-url --exclude debpatch --exclude debdeltas --exclude debdelta-upgrade debdelta-0.56/debian/postinst debdelta-0.59/debian/postinst --- debdelta-0.56/debian/postinst 2017-01-01 23:59:34.000000000 +0100 +++ debdelta-0.59/debian/postinst 2017-02-08 11:28:50.000000000 +0100 @@ -41,6 +41,7 @@ c=0 ; if check1it ; then c=1 ; fi gpg --no-tty --batch --no-options --no-auto-check-trustdb --homedir ${GPG_HOME} --import ${GPG_MASTER_PUB_KEYRING} || true + gpgconf --homedir ${GPG_HOME} --kill gpg-agent || true if test $c = 1 ; then sha1it ; fi ;; diff -Nru --exclude debpatch-url --exclude debpatch --exclude debdeltas --exclude debdelta-upgrade debdelta-0.56/debian/rules debdelta-0.59/debian/rules --- debdelta-0.56/debian/rules 2017-01-01 23:59:34.000000000 +0100 +++ debdelta-0.59/debian/rules 2017-02-08 11:28:50.000000000 +0100 @@ -15,6 +15,10 @@ docdir2 = $(D2)/usr/share/doc/$(package) docdir2doc = $(D2)/usr/share/doc/$(package)-doc +PO_FILES := $(wildcard po/*.po) +MO_FILES := $(patsubst %.po,%.mo,$(PO_FILES)) +LANGS := $(patsubst po/%.po,%,$(PO_FILES)) + CC = gcc INSTALL_PROGRAM = install @@ -68,13 +72,13 @@ $(checkdir) rm -rf $(D) # dirs - install -d $(D)/DEBIAN $(D)/usr/bin $(docdir) $(mandir) $(D)/usr/lib/debdelta $(D)/usr/share/debdelta $(D)/usr/share/keyrings $(D)/usr/share/locale/it/LC_MESSAGES $(D)/usr/share/locale/fr/LC_MESSAGES + install -d $(D)/DEBIAN $(D)/usr/bin $(docdir) $(mandir) $(D)/usr/lib/debdelta $(D)/usr/share/debdelta $(D)/usr/share/keyrings + set -e ; for L in $(LANGS) ; do install -d $(D)/usr/share/locale/$${L}/LC_MESSAGES ; done # control install -m 755 debian/postrm $(D)/DEBIAN/ install -m 755 debian/postinst $(D)/DEBIAN/ # /usr/share - cp po/it.mo $(D)/usr/share/locale/it/LC_MESSAGES/debdelta.mo - cp po/fr.mo $(D)/usr/share/locale/fr/LC_MESSAGES/debdelta.mo + set -e ; for L in $(LANGS) ; do cp po/$${L}.mo $(D)/usr/share/locale/$${L}/LC_MESSAGES/debdelta.mo ; done install debpatch.sh $(D)/usr/share/debdelta install contrib/debmirror-delta-security $(D)/usr/share/debdelta/ install contrib/debmirror-marshal-deltas $(D)/usr/share/debdelta/ I file binari /tmp/9GNBa0z6Kb/debdelta-0.56/po/fr.mo e /tmp/V_FBpnCKo7/debdelta-0.59/po/fr.mo sono diversi diff -Nru --exclude debpatch-url --exclude debpatch --exclude debdeltas --exclude debdelta-upgrade debdelta-0.56/po/fr.po debdelta-0.59/po/fr.po --- debdelta-0.56/po/fr.po 2017-01-01 23:59:34.000000000 +0100 +++ debdelta-0.59/po/fr.po 2017-02-08 11:28:50.000000000 +0100 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: debdelta\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-08-02 15:28+0200\n" +"POT-Creation-Date: 2017-01-07 18:04+0100\n" "PO-Revision-Date: 2012-08-02 23:25+0200\n" "Last-Translator: Thomas Blein <tbl...@tblein.eu>\n" "Language-Team: French <debian-l10n-fre...@lists.debian.org>\n" @@ -50,6 +50,29 @@ " binaires\n" #: ../debdelta:45 +#, fuzzy +#| msgid "" +#| "Usage: debdeltas [ option... ] [deb files and dirs, or 'Packages' " +#| "files]\n" +#| " Computes all missing deltas for deb files.\n" +#| " It orders by version number and produce deltas to the newest version\n" +#| "\n" +#| "Options:\n" +#| "--signing-key KEY\n" +#| " key used to sign the deltas (using GnuPG)\n" +#| "--dir DIR force saving of deltas in this DIR\n" +#| " (otherwise they go in the dir of the newer deb_file)\n" +#| "--old ARGS 'Packages' files containing list of old versions of debs\n" +#| "--alt ARGS for any cmdline argument, search for debs also in this place\n" +#| " -n N how many deltas to produce for each deb (default unlimited)\n" +#| "--no-md5 do not include MD5 info in delta\n" +#| "--needsold create a delta that can only be used if the old .deb is " +#| "available\n" +#| "--delta-algo ALGO\n" +#| " use a specific backend for computing binary diffs;\n" +#| " possible values are: xdelta xdelta-bzip xdelta3 bsdiff\n" +#| " -M Mb maximum memory to use (for 'bsdiff' or 'xdelta')\n" +#| "--clean-deltas delete deltas if newer deb is not in archive\n" msgid "" "Usage: debdeltas [ option... ] [deb files and dirs, or 'Packages' files]\n" " Computes all missing deltas for deb files.\n" @@ -71,6 +94,7 @@ " possible values are: xdelta xdelta-bzip xdelta3 bsdiff\n" " -M Mb maximum memory to use (for 'bsdiff' or 'xdelta')\n" "--clean-deltas delete deltas if newer deb is not in archive\n" +"--cache cache parsed version of Packages.bz2 as Packages.debdelta_cache\n" msgstr "" "Usage : debdeltas [OPTION] [fichiers et dossiers deb, ou fichiers " "'Packages']\n" @@ -102,7 +126,8 @@ " supprimer les deltas si le deb plus récent n'est pas dans\n" " l'archive\n" -#: ../debdelta:69 +#: ../debdelta:70 +#, fuzzy #| msgid "" #| "Usage: debpatch [ option... ] delta fromfile tofile \n" #| " Applies delta to fromfile and produces a reconstructed version of " @@ -117,13 +142,15 @@ #| "Options:\n" #| "--no-md5 do not verify MD5 (if found in info in delta)\n" #| " -A accept unsigned deltas\n" +#| "--format FORMAT\n" +#| " format of created deb\n" msgid "" "Usage: debpatch [ option... ] delta fromfile tofile \n" " Applies delta to fromfile and produces a reconstructed version of " "tofile.\n" "\n" "(When using 'debpatch' and the old .deb is not available,\n" -" use '/' for the fromfile.)\n" +" use the unpack directory, usually '/', for the fromfile.)\n" "\n" "Usage: debpatch --info delta\n" " Write info on delta.\n" @@ -150,7 +177,8 @@ "--format FORMAT\n" " format du deb créé\n" -#: ../debdelta:86 +#: ../debdelta:87 +#, fuzzy #| msgid "" #| "Usage: debdelta-upgrade [package names]\n" #| " Downloads all deltas and apply them to create the debs\n" @@ -161,6 +189,8 @@ #| "--deb-policy POLICY\n" #| " policy to decide which debs to download,\n" #| " -A accept unsigned deltas\n" +#| "--format FORMAT\n" +#| " format of created debs\n" msgid "" "Usage: debdelta-upgrade [package names]\n" " Downloads all deltas and apply them to create the debs\n" @@ -173,6 +203,9 @@ " -A accept unsigned deltas\n" "--format FORMAT\n" " format of created debs\n" +"--timeout SECONDS\n" +" adjust timeout for connections, default is\n" +" 15 seconds\n" msgstr "" "Usage : debdelta-upgrade [NOMS_DE_PAQUET]\n" " Télécharger tous les deltas et les appliquer pour créer les debs\n" @@ -186,7 +219,7 @@ "--format FORMAT\n" " format du deb créé\n" -#: ../debdelta:100 +#: ../debdelta:104 msgid "" "Usage: debpatch-url [package names]\n" " Show URL wherefrom to downloads all deltas that may be used to upgrade the " @@ -196,7 +229,7 @@ " Afficher l'URL utilisée pour le téléchargement de tous les deltas qui " "peuvent être utilisés pour mettre à jour les paquets précisés.\n" -#: ../debdelta:105 +#: ../debdelta:109 msgid "" " -v verbose (can be added multiple times)\n" "--no-act do not do that (whatever it is!)\n" @@ -217,69 +250,67 @@ "\n" "Consultez la page de manuel pour plus d'option et de détails.\n" -#: ../debdelta:279 +#: ../debdelta:304 msgid "Error: argument of --dir is not a directory:" msgstr "Erreur : le paramètre de --dir n'est pas un répertoire :" -#: ../debdelta:287 -#| msgid "Error: argument of --dir is not a directory:" +#: ../debdelta:312 msgid "Error: argument of --forensicdir is not a directory:" msgstr "Erreur : le paramètre de --forensicdir n'est pas un répertoire :" -#: ../debdelta:303 +#: ../debdelta:328 msgid "Error: argument of --alt is not a directory or a regular file:" msgstr "" "Erreur : le paramètre de --alt n'est pas un répertoire ou un fichier " "classique :" -#: ../debdelta:308 +#: ../debdelta:333 msgid "Error: argument of --old is not a directory or a regular file:" msgstr "" "Erreur : le paramètre de --old n'est pas un répertoire ou un fichier " "classique :" -#: ../debdelta:324 +#: ../debdelta:349 #, python-format msgid "Error: --gpg-home `%s' does not exist." msgstr "Erreur : --gpg-home « %s » n'existe pas." -#: ../debdelta:328 +#: ../debdelta:353 #, python-format -#| msgid "Error: option `%s' is unknown, try --help" msgid "Error: output format `%s' is unknown." msgstr "Erreur : le format de sortie « %s » n'est pas connu." -#: ../debdelta:332 +#: ../debdelta:358 #, python-format msgid "Error: option `%s' is unknown, try --help" msgstr "Erreur : l'option « %s » n'est pas connue. Essayez --help." -#: ../debdelta:337 +#: ../debdelta:363 #, python-format msgid "Error: feature `%s' cannot be disabled." msgstr "Erreur : la fonctionnalité « %s » ne peut pas être désactivée." -#: ../debdelta:672 ../debdelta:682 +#: ../debdelta:802 ../debdelta:812 #, python-format msgid "Error: the file `%s' does not exist." msgstr "Erreur : le fichier « %s » n'existe pas." -#: ../debdelta:674 ../debdelta:684 +#: ../debdelta:804 ../debdelta:814 #, python-format msgid "Error: `%s' is not a regular file." msgstr "Erreur : le fichier « %s » n'est pas un fichier classique." -#: ../debdelta:677 +#: ../debdelta:807 #, python-format msgid "Error: `%s' does not seem to be a Debian package." msgstr "Erreur : « %s » ne semble pas être un paquet Debian." -#: ../debdelta:687 +#: ../debdelta:817 #, python-format msgid "Error: `%s' does not seem to be a Debian delta." msgstr "Erreur : « %s » ne semble pas être un delta Debian." -#: ../debdelta:984 +#: ../debdelta:1133 #, python-format msgid "" "not enough disk space (%(free)dkB) in directory %(dir)s for applying delta " @@ -288,71 +319,69 @@ "pas assez d'espace disque (%(free)d kB) dans le répertoire %(dir)s pour " "appliquer les deltas (besoin de %(size)d kB)." -#: ../debdelta:1246 ../debdelta:1303 -#| msgid "(Faulty delta. Please consider retrying with the option \"-d\" )." +#: ../debdelta:1395 ../debdelta:1452 msgid "" "(Faulty delta. Please consider retrying with the option \"--forensic=http" "\" )." msgstr "" "(Delta défectueux. Veuillez réessayer avec l'option « --forensic=http »)." -#: ../debdelta:1259 ../debdelta:1280 +#: ../debdelta:1408 ../debdelta:1429 msgid "There were faulty deltas." msgstr "Il y a des deltas défectueux." -#: ../debdelta:1259 +#: ../debdelta:1408 msgid "Now invoking the mail sender to send the logs." msgstr "Invocation de l'envoyeur de mail pour envoyer les journaux." -#: ../debdelta:1261 +#: ../debdelta:1410 msgid "(hit any key)" msgstr "(Pressez n'importe quelle touche)" -#: ../debdelta:1280 +#: ../debdelta:1429 msgid "Sending logs to server." msgstr "Envoi des journaux sur le serveur." -#: ../debdelta:1295 +#: ../debdelta:1444 msgid "Server answers:" msgstr "Réponses du serveur :" -#: ../debdelta:1298 +#: ../debdelta:1447 #, python-format -#| msgid "Faulty delta. Please send by email to %s the following files:" msgid "Faulty delta. Please send by email to %s the following files:\n" msgstr "" "Delta défectueux. Veuillez envoyer par courrier électronique à %s les " "fichiers suivants :\n" -#: ../debdelta:1431 +#: ../debdelta:1580 msgid "Delta is not signed:" msgstr "Le delta n'est pas signé :" -#: ../debdelta:1433 +#: ../debdelta:1582 msgid "WARNING, delta is not signed:" msgstr "ATTENTION, le delta n'est pas signé :" -#: ../debdelta:2018 +#: ../debdelta:2172 #, python-format msgid "Patching done, time %(time).2fsec, speed %(speed)dk/sec" msgstr "Correction effectuée, temps %(time).2f sec, vitesse %(speed)d k/sec." -#: ../debdelta:2020 +#: ../debdelta:2174 #, python-format msgid "(script %(time).2fsec %(speed)dk/sec)" msgstr "(script %(time).2f sec %(speed)d k/sec)" -#: ../debdelta:2024 +#: ../debdelta:2178 #, python-format msgid "(prelink %(time).2fsec, %(size)dk, %(speed)dk/s)" msgstr "(prelink %(time).2f sec, %(size)d k, %(speed)d k/s)" -#: ../debdelta:2026 ../debdelta:2028 +#: ../debdelta:2180 ../debdelta:2182 #, python-format msgid "(unaccounted %.2fsec)" msgstr "(inexpliqué %.2f sec)" -#: ../debdelta:3290 +#: ../debdelta:3591 #, python-format msgid "" "delta is %(perc)3.1f%% of deb; that is, %(save)dkB are saved, on a total of " @@ -361,7 +390,7 @@ "Le delta a une taille de %(perc)3.1f %% du deb ; c'est-à -dire que " "%(save)d kB ont été économisés sur un total de %(tot)d kB." -#: ../debdelta:3292 +#: ../debdelta:3593 #, python-format msgid "" "delta time %(time).2f sec, speed %(speed)dkB /sec, (%(algo)s time " @@ -370,38 +399,48 @@ "delta temps %(time).2f sec, vitesse %(speed)d kB/sec, (%(algo)s temps " "%(algotime).2f sec vitesse %(algospeed)d kB/sec) (corr %(corrtime).2f sec)" -#: ../debdelta:3305 -msgid "Warning, no non-option arguments, debdeltas does nothing." -msgstr "Attention, aucun paramètre non-option, aucune action de debdeltas." - -#: ../debdelta:3309 -msgid "Warning, no --old arguments, debdeltas will not generate any deltas." -msgstr "Attention, aucun paramètre --old, debdeltas ne générera aucun delta." - -#: ../debdelta:3714 +#: ../debdelta:3966 #, python-format msgid "Not enough disk space for storing `%s'." msgstr "Pas assez d'espace disque pour enregistrer « %s »" -#: ../debdelta:3771 +#: ../debdelta:3986 msgid "Creating:" msgstr "Création :" -#: ../debdelta:3808 +#: ../debdelta:3987 +#, fuzzy +#| msgid "Error: testing of delta failed:" +msgid "Creation of delta failed, reason:" +msgstr "Erreur : les tests de delta ont échoué :" + +#: ../debdelta:3990 ../debdelta:4029 ../debdelta:4043 +msgid "You may want to examine:" +msgstr "" + +#: ../debdelta:4026 msgid "Error: testing of delta failed:" msgstr "Erreur : les tests de delta ont échoué :" -#: ../debdelta:3855 +#: ../debdelta:4100 +msgid "Warning, no non-option arguments, debdeltas does nothing." +msgstr "Attention, aucun paramètre non-option, aucune action de debdeltas." + +#: ../debdelta:4104 +msgid "Warning, no --old arguments, debdeltas will not generate any deltas." +msgstr "Attention, aucun paramètre --old, debdeltas ne générera aucun delta." + +#: ../debdelta:4228 #, python-format msgid "Total running time: %.1f" msgstr "Temps d'exécution total : %.1f" -#: ../debdelta:3970 +#: ../debdelta:4343 #, python-format msgid "(sources.conf does not provide a server for `%s')" msgstr "(sources.conf ne fournit aucun serveur pour « %s »)" -#: ../debdelta:3985 +#: ../debdelta:4358 msgid "" " Proxy settings detected in the environment; using \"urllib2\" for " "downloading; but\n" @@ -413,115 +452,126 @@ "caractéristiques et c'est généralement plus lent. Consultez la page de " "manuel." -#: ../debdelta:3997 ../debdelta:3999 +#: ../debdelta:4370 ../debdelta:4372 msgid "Initializing APT cache..." msgstr "Initialisation du cache APTâ¦" -#: ../debdelta:4027 +#: ../debdelta:4400 msgid "Upgrading APT cache..." msgstr "Mise à niveau du cache APTâ¦" -#: ../debdelta:4029 +#: ../debdelta:4402 msgid "upgrading..." msgstr "mise à niveauâ¦" -#: ../debdelta:4036 -#| msgid "Upgrading APT cache..." +#: ../debdelta:4409 msgid "Failed! Safe upgrading APT cache..." msgstr "Ãchec ! Mise à niveau conservative du cache APTâ¦" -#: ../debdelta:4038 +#: ../debdelta:4411 msgid "failed! trying safe-upgrade..." msgstr "Ãchec ! Essai d'une mise à niveau conservative (« safe-upgrade »)" -#: ../debdelta:4042 +#: ../debdelta:4415 msgid "Upgraded APT cache." msgstr "Le cache APT a été mis à niveau." -#: ../debdelta:4044 +#: ../debdelta:4417 msgid "done." msgstr "Effectué." -#: ../debdelta:4081 +#: ../debdelta:4454 #, python-format msgid "Recreated debs are saved in the directory %s" msgstr "Les debs recréés sont sauvés dans le répertoire %s." -#: ../debdelta:4124 +#: ../debdelta:4497 #, python-format msgid "Created, time %(time)5.2fsec, speed %(speed)4s/sec, %(name)s" msgstr "Créé, temps %(time)5.2f sec, vitesse %(speed)4s/sec, %(name)s" -#: ../debdelta:4395 +#: ../debdelta:4743 +msgid " Redirect to:" +msgstr "" + +#: ../debdelta:4781 msgid "Not enough disk space to download:" msgstr "Pas assez d'espace disque pour télécharger :" -#: ../debdelta:4420 +#: ../debdelta:4806 #, python-format msgid "Downloaded, time %(time)5.2fsec, speed %(speed)4s/sec, %(name)s" msgstr "Téléchargé, temps %(time)5.2f sec, vitesse %(speed)4s/sec, %(name)s" -#: ../debdelta:4556 +#: ../debdelta:4942 #, python-format msgid "Downloading head of %s..." msgstr "Téléchargement de l'entête de %sâ¦" -#: ../debdelta:4576 +#: ../debdelta:4961 +msgid "Delta was not created since new package is too small:" +msgstr "" + +#: ../debdelta:4968 msgid "Delta is too big:" msgstr "Le delta est trop important :" -#: ../debdelta:4582 ../debdelta:4584 +#: ../debdelta:4975 +msgid "Delta missing, server failed to create it:" +msgstr "" + +#: ../debdelta:4981 ../debdelta:4983 msgid "Delta is not present:" msgstr "Le delta est absent :" -#: ../debdelta:4594 +#: ../debdelta:4993 #, python-format msgid "Downloaded head of %s." msgstr "En-tête du fichier %s téléchargé." -#: ../debdelta:4632 +#: ../debdelta:5031 #, python-format msgid "Deltas: %(present)d present and %(absent)d not," msgstr "Deltas : %(present)d présent et %(absent)d absent," -#: ../debdelta:4634 +#: ../debdelta:5033 #, python-format msgid "" "downloaded so far: time %(time).2fsec, size %(size)s, speed %(speed)4s/sec." msgstr "" "déjà téléchargé : %(time).2f sec, taille %(size)s, vitesse de %(speed)4s/sec." -#: ../debdelta:4637 +#: ../debdelta:5036 #, python-format msgid "Need to get %s of deltas." msgstr "Besoin de récupérer %s des deltas." -#: ../debdelta:4673 +#: ../debdelta:5072 msgid "You may wish to rerun, to get also:" msgstr "Vous pourriez relancer, pour obtenir également :" -#: ../debdelta:4728 +#: ../debdelta:5127 msgid "Delta-upgrade statistics:" msgstr "Statistiques de delta-upgrade :" -#: ../debdelta:4729 +#: ../debdelta:5128 #, python-format msgid "size %(size)s time %(time)dsec speed %(speed)s/sec" msgstr "taille %(size)s temps %(time)d sec vitesse %(speed)s/sec" -#: ../debdelta:4734 +#: ../debdelta:5133 msgid "downloaded deltas, " msgstr "deltas téléchargés, " -#: ../debdelta:4739 +#: ../debdelta:5138 msgid "patching to debs, " msgstr "correction des debs, " -#: ../debdelta:4744 +#: ../debdelta:5143 msgid "downloaded debs, " msgstr "debs téléchargé, " -#: ../debdelta:4749 +#: ../debdelta:5148 #, python-format msgid "" "total resulting debs, size %(size)s time %(time)dsec virtual speed %(speed)s/" @@ -530,37 +580,37 @@ "debs résultant totaux, taille %(size)s temps %(time)d sec vitesse virtuelle " "%(speed)s/sec" -#: ../debdelta:4767 +#: ../debdelta:5166 msgid "Need a filename; try --help." msgstr "Besoin d'un nom de fichier ; essayez --help." -#: ../debdelta:4788 ../debdelta:4812 +#: ../debdelta:5187 ../debdelta:5211 msgid "Need 3 filenames; try --help." msgstr "Besoin de trois noms de fichier ; essayez --help." -#: ../debdelta:4832 +#: ../debdelta:5231 msgid "Error: argument is not a directory or a regular file:" msgstr "" "Erreur : le paramètre n'est pas un répertoire ou un fichier classique :" -#: ../debdelta:4885 +#: ../debdelta:5284 #, python-format msgid "Lookup %s" msgstr "Recherche %s" -#: ../debdelta:4891 +#: ../debdelta:5290 #, python-format msgid "Sorry, cannot find an URI to download the debian package of `%s'." msgstr "" "Désolé, impossible de trouver une URI pour télécharger le paquet debian " "« %s »." -#: ../debdelta:4907 +#: ../debdelta:5306 #, python-format msgid "Sorry, no source is available to upgrade `%s'." msgstr "Désolé, aucune source disponible pour la mise à niveau de « %s »." -#: ../debdelta:4911 +#: ../debdelta:5310 #, python-format msgid "Sorry, the package `%s' is already at its newest version." msgstr "Désolé, le paquet « %s » est déjà à la version la plus récente." I file binari /tmp/9GNBa0z6Kb/debdelta-0.56/po/it.mo e /tmp/V_FBpnCKo7/debdelta-0.59/po/it.mo sono diversi diff -Nru --exclude debpatch-url --exclude debpatch --exclude debdeltas --exclude debdelta-upgrade debdelta-0.56/po/it.po debdelta-0.59/po/it.po --- debdelta-0.56/po/it.po 2017-01-01 23:59:34.000000000 +0100 +++ debdelta-0.59/po/it.po 2017-02-08 11:28:50.000000000 +0100 @@ -7,8 +7,8 @@ msgstr "" "Project-Id-Version: debdelta\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-08-26 22:24+0200\n" -"PO-Revision-Date: 2012-08-26 22:17+0200\n" +"POT-Creation-Date: 2017-01-07 18:04+0100\n" +"PO-Revision-Date: 2017-01-07 18:05+0100\n" "Last-Translator: A Mennucc <mennu...@debian.org>\n" "Language-Team: italian <debian-ital...@lists.debian.org>\n" "Language: it\n" @@ -68,6 +68,7 @@ " possible values are: xdelta xdelta-bzip xdelta3 bsdiff\n" " -M Mb maximum memory to use (for 'bsdiff' or 'xdelta')\n" "--clean-deltas delete deltas if newer deb is not in archive\n" +"--cache cache parsed version of Packages.bz2 as Packages.debdelta_cache\n" msgstr "" "Uso: debdeltas [ opzioni... ] [deb e directory, o file \"Packages\"]\n" " Calcola i delta per i pacchetti Debian.\n" @@ -93,15 +94,16 @@ " -M Mb massima memoria da usare (per \"bsdiff\" o \"xdelta\")\n" "--clean-deltas\n" " elimina i delta se il deb più nuovo non è presente in archivio\n" +"--cache tiene una cache dei Packages.bz2 in Packages.debdelta_cache\n" -#: ../debdelta:69 +#: ../debdelta:70 msgid "" "Usage: debpatch [ option... ] delta fromfile tofile \n" " Applies delta to fromfile and produces a reconstructed version of " "tofile.\n" "\n" "(When using 'debpatch' and the old .deb is not available,\n" -" use '/' for the fromfile.)\n" +" use the unpack directory, usually '/', for the fromfile.)\n" "\n" "Usage: debpatch --info delta\n" " Write info on delta.\n" @@ -115,7 +117,10 @@ "Uso: debpatch [ opzioni... ] DELTA DAFILE AFILE \n" " Applica DELTA a DAFILE e produce una versione ricostruita di AFILE.\n" "\n" -"(Se il vecchio deb non è disponibile, usa \"/\" come fromfile)\n" +"(Se il vecchio deb non è disponibile, ma avete lo avete spacchettato\n" +"in una directory, allora potete indicare la directory come DAFILE;\n" +"in particolare se avete installato il vecchio deb, allora usate \"/\" come " +"DAFILE)\n" "\n" "Uso: debpatch --info DELTA\n" " Scrive informazioni sul DELTA.\n" @@ -126,7 +131,7 @@ "--format FORMATO\n" " formato del deb ricostruito\n" -#: ../debdelta:86 +#: ../debdelta:87 msgid "" "Usage: debdelta-upgrade [package names]\n" " Downloads all deltas and apply them to create the debs\n" @@ -139,6 +144,9 @@ " -A accept unsigned deltas\n" "--format FORMAT\n" " format of created debs\n" +"--timeout SECONDS\n" +" adjust timeout for connections, default is\n" +" 15 seconds\n" msgstr "" "Uso: debdelta-upgrade [nomi pacchetti]\n" " Scarica i delta e li applica per creare i deb che servono\n" @@ -151,8 +159,10 @@ " -A accetta delta non firmati\n" "--format FORMATO\n" " formato del deb ricostruito\n" +"--timeout SECONDS timeout per le connessione di rete,\n" +" il default è di 15 secondi\n" -#: ../debdelta:100 +#: ../debdelta:104 msgid "" "Usage: debpatch-url [package names]\n" " Show URL wherefrom to downloads all deltas that may be used to upgrade the " @@ -162,7 +172,7 @@ " Mostra lo URL da cui scaricare i delta che possono aggiornare i\n" " pacchetti indicati.\n" -#: ../debdelta:105 +#: ../debdelta:109 msgid "" " -v verbose (can be added multiple times)\n" "--no-act do not do that (whatever it is!)\n" @@ -182,63 +192,63 @@ "\n" "Si veda la pagina di manuale per ulteriori opzioni e dettagli.\n" -#: ../debdelta:279 +#: ../debdelta:304 msgid "Error: argument of --dir is not a directory:" msgstr "Errore: l'argomento di --dir non è una directory:" -#: ../debdelta:287 +#: ../debdelta:312 msgid "Error: argument of --forensicdir is not a directory:" msgstr "Errore: l'argomento di --forensicdir non è una directory:" -#: ../debdelta:303 +#: ../debdelta:328 msgid "Error: argument of --alt is not a directory or a regular file:" msgstr "Errore: l'argomento di --alt non è una directory o un file regolare:" -#: ../debdelta:308 +#: ../debdelta:333 msgid "Error: argument of --old is not a directory or a regular file:" msgstr "Errore: l'argomento di --old non è una directory o un file regolare:" -#: ../debdelta:324 +#: ../debdelta:349 #, python-format msgid "Error: --gpg-home `%s' does not exist." msgstr "Errore: --gpg-home '%s' non esiste." -#: ../debdelta:328 +#: ../debdelta:353 #, python-format msgid "Error: output format `%s' is unknown." msgstr "Errore: il formato di uscita '%s' è sconosciuto." -#: ../debdelta:332 +#: ../debdelta:358 #, python-format msgid "Error: option `%s' is unknown, try --help" msgstr "Errore: l'opzione '%s' è sconosciuta, vedere --help" -#: ../debdelta:337 +#: ../debdelta:363 #, python-format msgid "Error: feature `%s' cannot be disabled." msgstr "Errore: la caratteristica '%s' non può essere disabilitata." -#: ../debdelta:672 ../debdelta:682 +#: ../debdelta:802 ../debdelta:812 #, python-format msgid "Error: the file `%s' does not exist." msgstr "Errore: il file '%s' non esiste." -#: ../debdelta:674 ../debdelta:684 +#: ../debdelta:804 ../debdelta:814 #, python-format msgid "Error: `%s' is not a regular file." msgstr "Errore: '%s' non è un file regolare." -#: ../debdelta:677 +#: ../debdelta:807 #, python-format msgid "Error: `%s' does not seem to be a Debian package." msgstr "Errore: '%s' non sembra essere un pacchetto Debian." -#: ../debdelta:687 +#: ../debdelta:817 #, python-format msgid "Error: `%s' does not seem to be a Debian delta." msgstr "Errore: '%s' non sembra essere un delta Debian." -#: ../debdelta:984 +#: ../debdelta:1133 #, python-format msgid "" "not enough disk space (%(free)dkB) in directory %(dir)s for applying delta " @@ -247,7 +257,7 @@ "non c'è abbastanza spazio su disco (%(free)dkB) nella directory\n" "%(dir)s per applicare il delta (servono %(size)dkB)" -#: ../debdelta:1246 ../debdelta:1303 +#: ../debdelta:1395 ../debdelta:1452 msgid "" "(Faulty delta. Please consider retrying with the option \"--forensic=http" "\" )." @@ -255,64 +265,64 @@ "(Questo delta è difettoso. Potreste riprovare con l'opzione \"--forensic=http" "\")." -#: ../debdelta:1259 ../debdelta:1280 +#: ../debdelta:1408 ../debdelta:1429 msgid "There were faulty deltas." msgstr "Alcuni delta erano difettosi." -#: ../debdelta:1259 +#: ../debdelta:1408 msgid "Now invoking the mail sender to send the logs." msgstr "" "Ora verrà avviato il programma di invio posta elettronica per mandare\n" "i registri." -#: ../debdelta:1261 +#: ../debdelta:1410 msgid "(hit any key)" msgstr "(premere un qualunque tasto)" -#: ../debdelta:1280 +#: ../debdelta:1429 msgid "Sending logs to server." msgstr "Sto mandando i registri al server." -#: ../debdelta:1295 +#: ../debdelta:1444 msgid "Server answers:" msgstr "Il server risponde:" -#: ../debdelta:1298 +#: ../debdelta:1447 #, python-format msgid "Faulty delta. Please send by email to %s the following files:\n" msgstr "" "Questo delta è difettoso. Si prega di inviare per e-mail a %s i\n" "seguenti file:\n" -#: ../debdelta:1431 +#: ../debdelta:1580 msgid "Delta is not signed:" msgstr "Il delta non è firmato:" -#: ../debdelta:1433 +#: ../debdelta:1582 msgid "WARNING, delta is not signed:" msgstr "ATTENZIONE: il delta non è firmato:" -#: ../debdelta:2018 +#: ../debdelta:2172 #, python-format msgid "Patching done, time %(time).2fsec, speed %(speed)dk/sec" msgstr "Creato il deb, tempo: %(time).2fsec, velocità : %(speed)dk/sec" -#: ../debdelta:2020 +#: ../debdelta:2174 #, python-format msgid "(script %(time).2fsec %(speed)dk/sec)" msgstr "(script %(time).2fsec %(speed)dk/sec)" -#: ../debdelta:2024 +#: ../debdelta:2178 #, python-format msgid "(prelink %(time).2fsec, %(size)dk, %(speed)dk/s)" msgstr "(prelink %(time).2fsec, %(size)dk, %(speed)dk/s)" -#: ../debdelta:2026 ../debdelta:2028 +#: ../debdelta:2180 ../debdelta:2182 #, python-format msgid "(unaccounted %.2fsec)" msgstr "(altro %.2fsec)" -#: ../debdelta:3290 +#: ../debdelta:3591 #, python-format msgid "" "delta is %(perc)3.1f%% of deb; that is, %(save)dkB are saved, on a total of " @@ -321,7 +331,7 @@ "il delta è %(perc)3.1f%% del deb; cioè, sono stati risparmiati %(save)dkB su " "un totale di %(tot)dkB." -#: ../debdelta:3292 +#: ../debdelta:3593 #, python-format msgid "" "delta time %(time).2f sec, speed %(speed)dkB /sec, (%(algo)s time " @@ -330,38 +340,46 @@ "delta tempo %(time).2f sec, velocità %(speed)dkB /sec, (%(algo)s tempo " "%(algotime).2fsec velocità %(algospeed)dkB /sec) (corr %(corrtime).2f sec)" -#: ../debdelta:3305 -msgid "Warning, no non-option arguments, debdeltas does nothing." -msgstr "Attenzione, non ci sono argomenti non-opzioni, debdeltas non fa nulla." - -#: ../debdelta:3309 -msgid "Warning, no --old arguments, debdeltas will not generate any deltas." -msgstr "Attenzione, manca l'opzione --old, debdeltas non genererà alcun delta." - -#: ../debdelta:3714 +#: ../debdelta:3966 #, python-format msgid "Not enough disk space for storing `%s'." msgstr "Non c'è abbastanza spazio nel disco per salvare '%s'." -#: ../debdelta:3771 +#: ../debdelta:3986 msgid "Creating:" msgstr "Creazione di:" -#: ../debdelta:3808 +#: ../debdelta:3987 +msgid "Creation of delta failed, reason:" +msgstr "La creazione del delta è fallita:" + +#: ../debdelta:3990 ../debdelta:4029 ../debdelta:4043 +msgid "You may want to examine:" +msgstr "Potresti voler esaminare:" + +#: ../debdelta:4026 msgid "Error: testing of delta failed:" msgstr "Errore: il test del delta è fallito:" -#: ../debdelta:3855 +#: ../debdelta:4100 +msgid "Warning, no non-option arguments, debdeltas does nothing." +msgstr "Attenzione, non ci sono argomenti non-opzioni, debdeltas non fa nulla." + +#: ../debdelta:4104 +msgid "Warning, no --old arguments, debdeltas will not generate any deltas." +msgstr "Attenzione, manca l'opzione --old, debdeltas non genererà alcun delta." + +#: ../debdelta:4228 #, python-format msgid "Total running time: %.1f" msgstr "Tempo totale: %.1f" -#: ../debdelta:3970 +#: ../debdelta:4343 #, python-format msgid "(sources.conf does not provide a server for `%s')" msgstr "(il 'sources.conf' non specifica un server per '%s')" -#: ../debdelta:3985 +#: ../debdelta:4358 msgid "" " Proxy settings detected in the environment; using \"urllib2\" for " "downloading; but\n" @@ -372,77 +390,89 @@ "scaricare; ma questo disabilita alcune caratteristiche e sarà \n" "più lento e malfunzionante. Vedere la pagina di manuale." -#: ../debdelta:3997 ../debdelta:3999 +#: ../debdelta:4370 ../debdelta:4372 msgid "Initializing APT cache..." msgstr "Inizializzazione della cache di APT..." -#: ../debdelta:4027 +#: ../debdelta:4400 msgid "Upgrading APT cache..." msgstr "Aggiornamento della cache di APT..." -#: ../debdelta:4029 +#: ../debdelta:4402 msgid "upgrading..." msgstr "aggiornamento..." -#: ../debdelta:4036 +#: ../debdelta:4409 msgid "Failed! Safe upgrading APT cache..." msgstr "Fallito! Aggiornamento sicuro della cache di APT..." -#: ../debdelta:4038 +#: ../debdelta:4411 msgid "failed! trying safe-upgrade..." msgstr "fallito! provo l'aggiornamento sicuro..." -#: ../debdelta:4042 +#: ../debdelta:4415 msgid "Upgraded APT cache." msgstr "La cache di APT è stata aggiornata." -#: ../debdelta:4044 +#: ../debdelta:4417 msgid "done." msgstr "fatto." -#: ../debdelta:4081 +#: ../debdelta:4454 #, python-format msgid "Recreated debs are saved in the directory %s" msgstr "I pacchetti deb ricreati saranno salvati nella directory %s" -#: ../debdelta:4124 +#: ../debdelta:4497 #, python-format msgid "Created, time %(time)5.2fsec, speed %(speed)4s/sec, %(name)s" msgstr "Creato, tempo %(time)5.2fsec, velocità %(speed)4s/sec, %(name)s" -#: ../debdelta:4395 +#: ../debdelta:4743 +msgid " Redirect to:" +msgstr " Rediretto a:" + +#: ../debdelta:4781 msgid "Not enough disk space to download:" msgstr "Non vi è abbastanza spazio disco per scaricare:" -#: ../debdelta:4420 +#: ../debdelta:4806 #, python-format msgid "Downloaded, time %(time)5.2fsec, speed %(speed)4s/sec, %(name)s" msgstr "Scaricato, tempo %(time)5.2fsec, velocità %(speed)4s/sec, %(name)s" -#: ../debdelta:4556 +#: ../debdelta:4942 #, python-format msgid "Downloading head of %s..." msgstr "Scaricamento dell'inizio di %s..." -#: ../debdelta:4576 +#: ../debdelta:4961 +msgid "Delta was not created since new package is too small:" +msgstr "Il delta non è stato creato perché il pacchetto nuovo è troppo piccolo:" + +#: ../debdelta:4968 msgid "Delta is too big:" msgstr "Il delta è troppo grande:" -#: ../debdelta:4582 ../debdelta:4584 +#: ../debdelta:4975 +msgid "Delta missing, server failed to create it:" +msgstr "Il delta è assente perché il server non è riuscito a crearlo:" + +#: ../debdelta:4981 ../debdelta:4983 msgid "Delta is not present:" msgstr "Il delta non è presente:" -#: ../debdelta:4594 +#: ../debdelta:4993 #, python-format msgid "Downloaded head of %s." msgstr "Scaricato l'inizio di %s." -#: ../debdelta:4632 +#: ../debdelta:5031 #, python-format msgid "Deltas: %(present)d present and %(absent)d not," msgstr "Delta: %(present)d presenti e %(absent)d non presenti," -#: ../debdelta:4634 +#: ../debdelta:5033 #, python-format msgid "" "downloaded so far: time %(time).2fsec, size %(size)s, speed %(speed)4s/sec." @@ -450,37 +480,37 @@ "scaricato finora: tempo %(time).2fsec, dimensione %(size)s, velocità " "%(speed)4s/sec." -#: ../debdelta:4637 +#: ../debdelta:5036 #, python-format msgid "Need to get %s of deltas." msgstr "Bisogna ancora scaricare %s di delta." -#: ../debdelta:4673 +#: ../debdelta:5072 msgid "You may wish to rerun, to get also:" msgstr "Si può riprovare più tardi per scaricare anche:" -#: ../debdelta:4728 +#: ../debdelta:5127 msgid "Delta-upgrade statistics:" msgstr "Statistiche di debdelta-upgrade:" -#: ../debdelta:4729 +#: ../debdelta:5128 #, python-format msgid "size %(size)s time %(time)dsec speed %(speed)s/sec" msgstr "dimensione %(size)s tempo %(time)dsec velocità %(speed)s/sec" -#: ../debdelta:4734 +#: ../debdelta:5133 msgid "downloaded deltas, " msgstr "delta scaricati, " -#: ../debdelta:4739 +#: ../debdelta:5138 msgid "patching to debs, " msgstr "deb creati, " -#: ../debdelta:4744 +#: ../debdelta:5143 msgid "downloaded debs, " msgstr "deb scaricati, " -#: ../debdelta:4749 +#: ../debdelta:5148 #, python-format msgid "" "total resulting debs, size %(size)s time %(time)dsec virtual speed %(speed)s/" @@ -489,36 +519,36 @@ "totale deb risultanti, dimensione %(size)s tempo %(time)dsec velocità " "virtuale %(speed)s/sec" -#: ../debdelta:4767 +#: ../debdelta:5166 msgid "Need a filename; try --help." msgstr "à necessario un nome di file; si veda --help." -#: ../debdelta:4788 ../debdelta:4812 +#: ../debdelta:5187 ../debdelta:5211 msgid "Need 3 filenames; try --help." msgstr "Sono necessari tre nomi di file; si veda --help." -#: ../debdelta:4832 +#: ../debdelta:5231 msgid "Error: argument is not a directory or a regular file:" msgstr "Errore: l'argomento non è una directory o un file regolare:" -#: ../debdelta:4885 +#: ../debdelta:5284 #, python-format msgid "Lookup %s" msgstr "Cerco %s" -#: ../debdelta:4891 +#: ../debdelta:5290 #, python-format msgid "Sorry, cannot find an URI to download the debian package of `%s'." msgstr "" "Non è possibile trovare un URI per scaricare il pacchetto\n" "Debian di '%s'." -#: ../debdelta:4907 +#: ../debdelta:5306 #, python-format msgid "Sorry, no source is available to upgrade `%s'." msgstr "Non è disponibile alcuna sorgente per l'aggiornamento di '%s'." -#: ../debdelta:4911 +#: ../debdelta:5310 #, python-format msgid "Sorry, the package `%s' is already at its newest version." msgstr "Il pacchetto '%s' è già alla versione più recente." diff -Nru --exclude debpatch-url --exclude debpatch --exclude debdeltas --exclude debdelta-upgrade debdelta-0.56/po/messages.pot debdelta-0.59/po/messages.pot --- debdelta-0.56/po/messages.pot 2017-01-01 23:59:34.000000000 +0100 +++ debdelta-0.59/po/messages.pot 2017-02-08 11:28:50.000000000 +0100 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-08-26 22:24+0200\n" +"POT-Creation-Date: 2017-01-07 18:04+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <l...@li.org>\n" @@ -56,16 +56,17 @@ " possible values are: xdelta xdelta-bzip xdelta3 bsdiff\n" " -M Mb maximum memory to use (for 'bsdiff' or 'xdelta')\n" "--clean-deltas delete deltas if newer deb is not in archive\n" +"--cache cache parsed version of Packages.bz2 as Packages.debdelta_cache\n" msgstr "" -#: ../debdelta:69 +#: ../debdelta:70 msgid "" "Usage: debpatch [ option... ] delta fromfile tofile \n" " Applies delta to fromfile and produces a reconstructed version of " "tofile.\n" "\n" "(When using 'debpatch' and the old .deb is not available,\n" -" use '/' for the fromfile.)\n" +" use the unpack directory, usually '/', for the fromfile.)\n" "\n" "Usage: debpatch --info delta\n" " Write info on delta.\n" @@ -77,7 +78,7 @@ " format of created deb\n" msgstr "" -#: ../debdelta:86 +#: ../debdelta:87 msgid "" "Usage: debdelta-upgrade [package names]\n" " Downloads all deltas and apply them to create the debs\n" @@ -90,16 +91,19 @@ " -A accept unsigned deltas\n" "--format FORMAT\n" " format of created debs\n" +"--timeout SECONDS\n" +" adjust timeout for connections, default is\n" +" 15 seconds\n" msgstr "" -#: ../debdelta:100 +#: ../debdelta:104 msgid "" "Usage: debpatch-url [package names]\n" " Show URL wherefrom to downloads all deltas that may be used to upgrade the " "given package names\n" msgstr "" -#: ../debdelta:105 +#: ../debdelta:109 msgid "" " -v verbose (can be added multiple times)\n" "--no-act do not do that (whatever it is!)\n" @@ -111,174 +115,182 @@ "See man page for more options and details.\n" msgstr "" -#: ../debdelta:279 +#: ../debdelta:304 msgid "Error: argument of --dir is not a directory:" msgstr "" -#: ../debdelta:287 +#: ../debdelta:312 msgid "Error: argument of --forensicdir is not a directory:" msgstr "" -#: ../debdelta:303 +#: ../debdelta:328 msgid "Error: argument of --alt is not a directory or a regular file:" msgstr "" -#: ../debdelta:308 +#: ../debdelta:333 msgid "Error: argument of --old is not a directory or a regular file:" msgstr "" -#: ../debdelta:324 +#: ../debdelta:349 #, python-format msgid "Error: --gpg-home `%s' does not exist." msgstr "" -#: ../debdelta:328 +#: ../debdelta:353 #, python-format msgid "Error: output format `%s' is unknown." msgstr "" -#: ../debdelta:332 +#: ../debdelta:358 #, python-format msgid "Error: option `%s' is unknown, try --help" msgstr "" -#: ../debdelta:337 +#: ../debdelta:363 #, python-format msgid "Error: feature `%s' cannot be disabled." msgstr "" -#: ../debdelta:672 ../debdelta:682 +#: ../debdelta:802 ../debdelta:812 #, python-format msgid "Error: the file `%s' does not exist." msgstr "" -#: ../debdelta:674 ../debdelta:684 +#: ../debdelta:804 ../debdelta:814 #, python-format msgid "Error: `%s' is not a regular file." msgstr "" -#: ../debdelta:677 +#: ../debdelta:807 #, python-format msgid "Error: `%s' does not seem to be a Debian package." msgstr "" -#: ../debdelta:687 +#: ../debdelta:817 #, python-format msgid "Error: `%s' does not seem to be a Debian delta." msgstr "" -#: ../debdelta:984 +#: ../debdelta:1133 #, python-format msgid "" "not enough disk space (%(free)dkB) in directory %(dir)s for applying delta " "(needs %(size)dkB)" msgstr "" -#: ../debdelta:1246 ../debdelta:1303 +#: ../debdelta:1395 ../debdelta:1452 msgid "" "(Faulty delta. Please consider retrying with the option \"--forensic=http" "\" )." msgstr "" -#: ../debdelta:1259 ../debdelta:1280 +#: ../debdelta:1408 ../debdelta:1429 msgid "There were faulty deltas." msgstr "" -#: ../debdelta:1259 +#: ../debdelta:1408 msgid "Now invoking the mail sender to send the logs." msgstr "" -#: ../debdelta:1261 +#: ../debdelta:1410 msgid "(hit any key)" msgstr "" -#: ../debdelta:1280 +#: ../debdelta:1429 msgid "Sending logs to server." msgstr "" -#: ../debdelta:1295 +#: ../debdelta:1444 msgid "Server answers:" msgstr "" -#: ../debdelta:1298 +#: ../debdelta:1447 #, python-format msgid "Faulty delta. Please send by email to %s the following files:\n" msgstr "" -#: ../debdelta:1431 +#: ../debdelta:1580 msgid "Delta is not signed:" msgstr "" -#: ../debdelta:1433 +#: ../debdelta:1582 msgid "WARNING, delta is not signed:" msgstr "" -#: ../debdelta:2018 +#: ../debdelta:2172 #, python-format msgid "Patching done, time %(time).2fsec, speed %(speed)dk/sec" msgstr "" -#: ../debdelta:2020 +#: ../debdelta:2174 #, python-format msgid "(script %(time).2fsec %(speed)dk/sec)" msgstr "" -#: ../debdelta:2024 +#: ../debdelta:2178 #, python-format msgid "(prelink %(time).2fsec, %(size)dk, %(speed)dk/s)" msgstr "" -#: ../debdelta:2026 ../debdelta:2028 +#: ../debdelta:2180 ../debdelta:2182 #, python-format msgid "(unaccounted %.2fsec)" msgstr "" -#: ../debdelta:3290 +#: ../debdelta:3591 #, python-format msgid "" "delta is %(perc)3.1f%% of deb; that is, %(save)dkB are saved, on a total of " "%(tot)dkB." msgstr "" -#: ../debdelta:3292 +#: ../debdelta:3593 #, python-format msgid "" "delta time %(time).2f sec, speed %(speed)dkB /sec, (%(algo)s time " "%(algotime).2fsec speed %(algospeed)dkB /sec) (corr %(corrtime).2f sec)" msgstr "" -#: ../debdelta:3305 -msgid "Warning, no non-option arguments, debdeltas does nothing." +#: ../debdelta:3966 +#, python-format +msgid "Not enough disk space for storing `%s'." msgstr "" -#: ../debdelta:3309 -msgid "Warning, no --old arguments, debdeltas will not generate any deltas." +#: ../debdelta:3986 +msgid "Creating:" msgstr "" -#: ../debdelta:3714 -#, python-format -msgid "Not enough disk space for storing `%s'." +#: ../debdelta:3987 +msgid "Creation of delta failed, reason:" msgstr "" -#: ../debdelta:3771 -msgid "Creating:" +#: ../debdelta:3990 ../debdelta:4029 ../debdelta:4043 +msgid "You may want to examine:" msgstr "" -#: ../debdelta:3808 +#: ../debdelta:4026 msgid "Error: testing of delta failed:" msgstr "" -#: ../debdelta:3855 +#: ../debdelta:4100 +msgid "Warning, no non-option arguments, debdeltas does nothing." +msgstr "" + +#: ../debdelta:4104 +msgid "Warning, no --old arguments, debdeltas will not generate any deltas." +msgstr "" + +#: ../debdelta:4228 #, python-format msgid "Total running time: %.1f" msgstr "" -#: ../debdelta:3970 +#: ../debdelta:4343 #, python-format msgid "(sources.conf does not provide a server for `%s')" msgstr "" -#: ../debdelta:3985 +#: ../debdelta:4358 msgid "" " Proxy settings detected in the environment; using \"urllib2\" for " "downloading; but\n" @@ -286,147 +298,159 @@ "page." msgstr "" -#: ../debdelta:3997 ../debdelta:3999 +#: ../debdelta:4370 ../debdelta:4372 msgid "Initializing APT cache..." msgstr "" -#: ../debdelta:4027 +#: ../debdelta:4400 msgid "Upgrading APT cache..." msgstr "" -#: ../debdelta:4029 +#: ../debdelta:4402 msgid "upgrading..." msgstr "" -#: ../debdelta:4036 +#: ../debdelta:4409 msgid "Failed! Safe upgrading APT cache..." msgstr "" -#: ../debdelta:4038 +#: ../debdelta:4411 msgid "failed! trying safe-upgrade..." msgstr "" -#: ../debdelta:4042 +#: ../debdelta:4415 msgid "Upgraded APT cache." msgstr "" -#: ../debdelta:4044 +#: ../debdelta:4417 msgid "done." msgstr "" -#: ../debdelta:4081 +#: ../debdelta:4454 #, python-format msgid "Recreated debs are saved in the directory %s" msgstr "" -#: ../debdelta:4124 +#: ../debdelta:4497 #, python-format msgid "Created, time %(time)5.2fsec, speed %(speed)4s/sec, %(name)s" msgstr "" -#: ../debdelta:4395 +#: ../debdelta:4743 +msgid " Redirect to:" +msgstr "" + +#: ../debdelta:4781 msgid "Not enough disk space to download:" msgstr "" -#: ../debdelta:4420 +#: ../debdelta:4806 #, python-format msgid "Downloaded, time %(time)5.2fsec, speed %(speed)4s/sec, %(name)s" msgstr "" -#: ../debdelta:4556 +#: ../debdelta:4942 #, python-format msgid "Downloading head of %s..." msgstr "" -#: ../debdelta:4576 +#: ../debdelta:4961 +msgid "Delta was not created since new package is too small:" +msgstr "" + +#: ../debdelta:4968 msgid "Delta is too big:" msgstr "" -#: ../debdelta:4582 ../debdelta:4584 +#: ../debdelta:4975 +msgid "Delta missing, server failed to create it:" +msgstr "" + +#: ../debdelta:4981 ../debdelta:4983 msgid "Delta is not present:" msgstr "" -#: ../debdelta:4594 +#: ../debdelta:4993 #, python-format msgid "Downloaded head of %s." msgstr "" -#: ../debdelta:4632 +#: ../debdelta:5031 #, python-format msgid "Deltas: %(present)d present and %(absent)d not," msgstr "" -#: ../debdelta:4634 +#: ../debdelta:5033 #, python-format msgid "" "downloaded so far: time %(time).2fsec, size %(size)s, speed %(speed)4s/sec." msgstr "" -#: ../debdelta:4637 +#: ../debdelta:5036 #, python-format msgid "Need to get %s of deltas." msgstr "" -#: ../debdelta:4673 +#: ../debdelta:5072 msgid "You may wish to rerun, to get also:" msgstr "" -#: ../debdelta:4728 +#: ../debdelta:5127 msgid "Delta-upgrade statistics:" msgstr "" -#: ../debdelta:4729 +#: ../debdelta:5128 #, python-format msgid "size %(size)s time %(time)dsec speed %(speed)s/sec" msgstr "" -#: ../debdelta:4734 +#: ../debdelta:5133 msgid "downloaded deltas, " msgstr "" -#: ../debdelta:4739 +#: ../debdelta:5138 msgid "patching to debs, " msgstr "" -#: ../debdelta:4744 +#: ../debdelta:5143 msgid "downloaded debs, " msgstr "" -#: ../debdelta:4749 +#: ../debdelta:5148 #, python-format msgid "" "total resulting debs, size %(size)s time %(time)dsec virtual speed %(speed)s/" "sec" msgstr "" -#: ../debdelta:4767 +#: ../debdelta:5166 msgid "Need a filename; try --help." msgstr "" -#: ../debdelta:4788 ../debdelta:4812 +#: ../debdelta:5187 ../debdelta:5211 msgid "Need 3 filenames; try --help." msgstr "" -#: ../debdelta:4832 +#: ../debdelta:5231 msgid "Error: argument is not a directory or a regular file:" msgstr "" -#: ../debdelta:4885 +#: ../debdelta:5284 #, python-format msgid "Lookup %s" msgstr "" -#: ../debdelta:4891 +#: ../debdelta:5290 #, python-format msgid "Sorry, cannot find an URI to download the debian package of `%s'." msgstr "" -#: ../debdelta:4907 +#: ../debdelta:5306 #, python-format msgid "Sorry, no source is available to upgrade `%s'." msgstr "" -#: ../debdelta:4911 +#: ../debdelta:5310 #, python-format msgid "Sorry, the package `%s' is already at its newest version." msgstr "" I file binari /tmp/9GNBa0z6Kb/debdelta-0.56/po/pt.mo e /tmp/V_FBpnCKo7/debdelta-0.59/po/pt.mo sono diversi diff -Nru --exclude debpatch-url --exclude debpatch --exclude debdeltas --exclude debdelta-upgrade debdelta-0.56/po/pt.po debdelta-0.59/po/pt.po --- debdelta-0.56/po/pt.po 2017-01-01 23:59:34.000000000 +0100 +++ debdelta-0.59/po/pt.po 2017-02-08 11:28:50.000000000 +0100 @@ -3,13 +3,14 @@ # This file is distributed under the same license as the debdelta package. # # Américo Monteiro <a_monte...@gmx.com>, 2014. +# Miguel Figueiredo <el...@debianpt.org>, 2017. msgid "" msgstr "" "Project-Id-Version: debdelta 0.50+2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-08-26 22:24+0200\n" -"PO-Revision-Date: 2014-09-07 12:04+0100\n" -"Last-Translator: Américo Monteiro <a_monte...@gmx.com>\n" +"POT-Creation-Date: 2017-01-03 22:12+0100\n" +"PO-Revision-Date: 2017-01-21 15:23+0000\n" +"Last-Translator: Miguel Figueiredo <el...@debianpt.org>\n" "Language-Team: Portuguese <tra...@debianpt.org>\n" "Language: pt\n" "MIME-Version: 1.0\n" @@ -43,12 +44,33 @@ " chave gnupg usada para assinar o delta\n" "--no-md5 não inclui informação MD5 no delta\n" "--needsold cria um delta que só pode ser usado se o deb antigo estiver " -"disponÃvel" -" -M Mb máximo de memória a usar (para 'bsdiff' ou 'xdelta')\n" +"disponÃvel -M Mb máximo de memória a usar (para 'bsdiff' ou 'xdelta')\n" "--delta-algo ALGO\n" " usa um backend especÃfico para computar diferenças de binários\n" #: ../debdelta:45 +#| msgid "" +#| "Usage: debdeltas [ option... ] [deb files and dirs, or 'Packages' " +#| "files]\n" +#| " Computes all missing deltas for deb files.\n" +#| " It orders by version number and produce deltas to the newest version\n" +#| "\n" +#| "Options:\n" +#| "--signing-key KEY\n" +#| " key used to sign the deltas (using GnuPG)\n" +#| "--dir DIR force saving of deltas in this DIR\n" +#| " (otherwise they go in the dir of the newer deb_file)\n" +#| "--old ARGS 'Packages' files containing list of old versions of debs\n" +#| "--alt ARGS for any cmdline argument, search for debs also in this place\n" +#| " -n N how many deltas to produce for each deb (default unlimited)\n" +#| "--no-md5 do not include MD5 info in delta\n" +#| "--needsold create a delta that can only be used if the old .deb is " +#| "available\n" +#| "--delta-algo ALGO\n" +#| " use a specific backend for computing binary diffs;\n" +#| " possible values are: xdelta xdelta-bzip xdelta3 bsdiff\n" +#| " -M Mb maximum memory to use (for 'bsdiff' or 'xdelta')\n" +#| "--clean-deltas delete deltas if newer deb is not in archive\n" msgid "" "Usage: debdeltas [ option... ] [deb files and dirs, or 'Packages' files]\n" " Computes all missing deltas for deb files.\n" @@ -70,6 +92,7 @@ " possible values are: xdelta xdelta-bzip xdelta3 bsdiff\n" " -M Mb maximum memory to use (for 'bsdiff' or 'xdelta')\n" "--clean-deltas delete deltas if newer deb is not in archive\n" +"--cache cache parsed version of Packages.bz2 as Packages.debdelta_cache\n" msgstr "" "Utilização: debdeltas [ opção... ] [ficheiros deb e directórios, ou " "ficheiros 'Packages']\n" @@ -79,32 +102,49 @@ "Opções:\n" "--signing-key CHAVE\n" " chave usada para assinar os deltas (usando GnuPG)\n" -"--dir DIRECTÃRIO força a gravação dos deltas neste DIRECTÃRIO\n" -" (de outro modo eles irão para o directório do ficheiro deb " -"mais recente)\n" -"--old ARGUMENTOS ficheiros 'Packages' que contém uma lista de versões " +"--dir DIR força a gravação dos deltas neste DIRECTÃRIO\n" +" (de outro modo eles irão para o directório do ficheiro deb mais " +"recente)\n" +"--old ARGUMENTOS ficheiros 'Packages' que contêm uma lista de versões " "antigas de debs\n" "--alt ARGUMENTOS para qualquer argumento de linha de comandos, procure " "também por debs aqui\n" " -n N quantos deltas produzir para cada deb (predefinição ilimitado)\n" "--no-md5 não inclui informação MD5 no delta\n" -"--needsold cria um delta que apenas pode ser usado se o antigo .deb " -"estiver disponÃvel\n" +"--needsold cria um delta que apenas pode ser usado se o antigo .deb estiver " +"disponÃvel\n" "--delta-algo ALGO\n" " usa um backend especÃfico para computar diferenças de binários;\n" " os valores possÃveis são: xdelta xdelta-bzip xdelta3 bsdiff\n" " -M Mb máximo de memória a usar (para 'bsdiff' ou 'xdelta')\n" "--clean-deltas apaga os deltas se o deb mais recente não estiver no " "arquivo\n" +"--cache cache da versão interpretada de Packages.bz2 como Packages.debdelta_cache\n" -#: ../debdelta:69 +#: ../debdelta:70 +#| msgid "" +#| "Usage: debpatch [ option... ] delta fromfile tofile \n" +#| " Applies delta to fromfile and produces a reconstructed version of " +#| "tofile.\n" +#| "\n" +#| "(When using 'debpatch' and the old .deb is not available,\n" +#| " use '/' for the fromfile.)\n" +#| "\n" +#| "Usage: debpatch --info delta\n" +#| " Write info on delta.\n" +#| "\n" +#| "Options:\n" +#| "--no-md5 do not verify MD5 (if found in info in delta)\n" +#| " -A accept unsigned deltas\n" +#| "--format FORMAT\n" +#| " format of created deb\n" msgid "" "Usage: debpatch [ option... ] delta fromfile tofile \n" " Applies delta to fromfile and produces a reconstructed version of " "tofile.\n" "\n" "(When using 'debpatch' and the old .deb is not available,\n" -" use '/' for the fromfile.)\n" +" use the unpack directory, usually '/', for the fromfile.)\n" "\n" "Usage: debpatch --info delta\n" " Write info on delta.\n" @@ -116,22 +156,34 @@ " format of created deb\n" msgstr "" "Utilização: debpatch [ opção... ] delta de-ficheiro para-ficheiro \n" -" Aplica o delta ao de-ficheiro e produz uma versão reconstruÃda de " -"para-ficheiro.\n" +" Aplica o delta ao de-ficheiro e produz uma versão reconstruÃda de para-" +"ficheiro.\n" "\n" "(Quando se usa 'debpatch' e o .deb antigo não está disponÃvel,\n" -" use '/' para o de-ficheiro.)\n" +" use o directório para desempacotar, geralmente '/' para o de-ficheiro.)\n" "\n" "Utilização: debpatch --info delta\n" " Escreve informação no delta.\n" "\n" "Opções:\n" -"--no-md5 não verifica o MD5 (se encontrado em informações no delta)\n" -" -A aceita deltas não assinados\n" +"--no-md5 não verificar o MD5 (se encontrado em informações no delta)\n" +" -A aceitar deltas não assinados\n" "--format FORMATO\n" " formato do deb criado\n" -#: ../debdelta:86 +#: ../debdelta:87 +#| msgid "" +#| "Usage: debdelta-upgrade [package names]\n" +#| " Downloads all deltas and apply them to create the debs\n" +#| " that are needed by 'apt-get upgrade'.\n" +#| "\n" +#| "Options:\n" +#| "--dir DIR directory where to save results\n" +#| "--deb-policy POLICY\n" +#| " policy to decide which debs to download,\n" +#| " -A accept unsigned deltas\n" +#| "--format FORMAT\n" +#| " format of created debs\n" msgid "" "Usage: debdelta-upgrade [package names]\n" " Downloads all deltas and apply them to create the debs\n" @@ -144,20 +196,26 @@ " -A accept unsigned deltas\n" "--format FORMAT\n" " format of created debs\n" +"--timeout SECONDS\n" +" adjust timeout for connections, default is\n" +" 15 seconds\n" msgstr "" "Utilização: debdelta-upgrade [nomes de pacotes]\n" " Descarrega todos os deltas e aplica-os para criar os debs que são\n" " necessários pelo 'apt-get upgrade'.\n" "\n" "Opções:\n" -"--dir DIRECTÃRIO directório onde guardar os resultados\n" +"--dir DIR directório onde guardar os resultados\n" "--deb-policy POLITICA\n" -" politica para decidir quais debs descarregar,\n" -" -A aceita deltas não assinados\n" +" politica para decidir quais debs descarregar,\n" +" -A aceita deltas não assinados\n" "--format FORMATO\n" -" formato dos debs criados\n" +" formato dos debs criados\n" +"--timeout SEGUNDOS\n" +" ajusta o timeout das ligações, o predefinido é\n" +" 15 segundos\n" -#: ../debdelta:100 +#: ../debdelta:104 msgid "" "Usage: debpatch-url [package names]\n" " Show URL wherefrom to downloads all deltas that may be used to upgrade the " @@ -167,7 +225,7 @@ " Mostra o URL de onde descarregar todos os deltas que possam ser usados " "para actualizar os nomes de pacotes fornecidos\n" -#: ../debdelta:105 +#: ../debdelta:109 msgid "" " -v verbose (can be added multiple times)\n" "--no-act do not do that (whatever it is!)\n" @@ -187,63 +245,63 @@ "\n" "Veja o manual para mais opções e detalhes.\n" -#: ../debdelta:279 +#: ../debdelta:304 msgid "Error: argument of --dir is not a directory:" msgstr "Erro: argumento de --dir não é um directório:" -#: ../debdelta:287 +#: ../debdelta:312 msgid "Error: argument of --forensicdir is not a directory:" msgstr "Erro: argumento de -forensicdir não é um directório:" -#: ../debdelta:303 +#: ../debdelta:328 msgid "Error: argument of --alt is not a directory or a regular file:" msgstr "Erro: argumento de --alt não é um directório nem um ficheiro regular:" -#: ../debdelta:308 +#: ../debdelta:333 msgid "Error: argument of --old is not a directory or a regular file:" msgstr "Erro: argumento de --old não é um directório nem um ficheiro regular:" -#: ../debdelta:324 +#: ../debdelta:349 #, python-format msgid "Error: --gpg-home `%s' does not exist." msgstr "Erro: --gpg-home `%s' não existe." -#: ../debdelta:328 +#: ../debdelta:353 #, python-format msgid "Error: output format `%s' is unknown." msgstr "Erro: formato de saÃda `%s' é desconhecido." -#: ../debdelta:332 +#: ../debdelta:358 #, python-format msgid "Error: option `%s' is unknown, try --help" msgstr "Erro: a opção `%s' é desconhecida, tente --help" -#: ../debdelta:337 +#: ../debdelta:363 #, python-format msgid "Error: feature `%s' cannot be disabled." msgstr "Erro: a funcionalidade `%s' não pode ser desactivada." -#: ../debdelta:672 ../debdelta:682 +#: ../debdelta:802 ../debdelta:812 #, python-format msgid "Error: the file `%s' does not exist." msgstr "Erro: o ficheiro `%s' não existe." -#: ../debdelta:674 ../debdelta:684 +#: ../debdelta:804 ../debdelta:814 #, python-format msgid "Error: `%s' is not a regular file." msgstr "Erro: `%s' não é um ficheiro regular." -#: ../debdelta:677 +#: ../debdelta:807 #, python-format msgid "Error: `%s' does not seem to be a Debian package." msgstr "Erro: `%s' não parece ser um pacote Debian." -#: ../debdelta:687 +#: ../debdelta:817 #, python-format msgid "Error: `%s' does not seem to be a Debian delta." msgstr "Erro: `%s' não parece ser um delta Debian." -#: ../debdelta:984 +#: ../debdelta:1133 #, python-format msgid "" "not enough disk space (%(free)dkB) in directory %(dir)s for applying delta " @@ -252,122 +310,130 @@ "não há espaço de disco suficiente (%(free)dkB) no directório %(dir)s para " "aplicar o delta (precisa de %(size)dkB)" -#: ../debdelta:1246 ../debdelta:1303 +#: ../debdelta:1395 ../debdelta:1452 msgid "" "(Faulty delta. Please consider retrying with the option \"--forensic=http" "\" )." msgstr "" -"(Delta com defeito. Por favor considere tentar de novo com o opção " -"\"--forensic=http\" )." +"(Delta com defeito. Por favor considere tentar de novo com o opção \"--" +"forensic=http\" )." -#: ../debdelta:1259 ../debdelta:1280 +#: ../debdelta:1408 ../debdelta:1429 msgid "There were faulty deltas." msgstr "Existiram deltas com defeito." -#: ../debdelta:1259 +#: ../debdelta:1408 msgid "Now invoking the mail sender to send the logs." msgstr "Agora a invocar o transporte de mail para enviar os relatórios." -#: ../debdelta:1261 +#: ../debdelta:1410 msgid "(hit any key)" msgstr "(carregue em qualquer tecla)" -#: ../debdelta:1280 +#: ../debdelta:1429 msgid "Sending logs to server." msgstr "A enviar relatórios para o servidor." -#: ../debdelta:1295 +#: ../debdelta:1444 msgid "Server answers:" msgstr "Resposta do servidor:" -#: ../debdelta:1298 +#: ../debdelta:1447 #, python-format msgid "Faulty delta. Please send by email to %s the following files:\n" msgstr "" "Delta com defeito. Por favor envie os seguintes ficheiros por email para " "%s:\n" -#: ../debdelta:1431 +#: ../debdelta:1580 msgid "Delta is not signed:" msgstr "Delta não está assinado:" -#: ../debdelta:1433 +#: ../debdelta:1582 msgid "WARNING, delta is not signed:" msgstr "AVISO, delta não está assinado:" -#: ../debdelta:2018 +#: ../debdelta:2172 #, python-format msgid "Patching done, time %(time).2fsec, speed %(speed)dk/sec" msgstr "" "Aplicação de patch pronta, tempo %(time).2fsec, velocidade %(speed)dk/sec" -#: ../debdelta:2020 +#: ../debdelta:2174 #, python-format msgid "(script %(time).2fsec %(speed)dk/sec)" msgstr "(script %(time).2fsec %(speed)dk/sec)" -#: ../debdelta:2024 +#: ../debdelta:2178 #, python-format msgid "(prelink %(time).2fsec, %(size)dk, %(speed)dk/s)" msgstr "(pré-link %(time).2fsec, %(size)dk, %(speed)dk/s)" -#: ../debdelta:2026 ../debdelta:2028 +#: ../debdelta:2180 ../debdelta:2182 #, python-format msgid "(unaccounted %.2fsec)" msgstr "(não contado %.2fsec)" -#: ../debdelta:3290 +#: ../debdelta:3587 #, python-format msgid "" "delta is %(perc)3.1f%% of deb; that is, %(save)dkB are saved, on a total of " "%(tot)dkB." msgstr "" -"delta é %(perc)3.1f%% de deb; isto é, %(save)dkB são salvados, num total " -"de %(tot)dkB." +"delta é %(perc)3.1f%% de deb; isto é, %(save)dkB são salvados, num total de " +"%(tot)dkB." -#: ../debdelta:3292 +#: ../debdelta:3589 #, python-format msgid "" "delta time %(time).2f sec, speed %(speed)dkB /sec, (%(algo)s time " "%(algotime).2fsec speed %(algospeed)dkB /sec) (corr %(corrtime).2f sec)" msgstr "" -"tempo de delta %(time).2f sec, velocidade %(speed)dkB /sec, (%(algo)s " -"tempo %(algotime).2fsec velocidade %(algospeed)dkB /sec) " -"(corr %(corrtime).2f sec)" +"tempo de delta %(time).2f sec, velocidade %(speed)dkB /sec, (%(algo)s tempo " +"%(algotime).2fsec velocidade %(algospeed)dkB /sec) (corr %(corrtime).2f sec)" -#: ../debdelta:3305 -msgid "Warning, no non-option arguments, debdeltas does nothing." -msgstr "Aviso, nenhum argumento não-opção, o debdeltas não faz nada." - -#: ../debdelta:3309 -msgid "Warning, no --old arguments, debdeltas will not generate any deltas." -msgstr "" -"Aviso, nenhum argumento --old, o debdeltas não irá gerar nenhuns deltas." - -#: ../debdelta:3714 +#: ../debdelta:3960 #, python-format msgid "Not enough disk space for storing `%s'." msgstr "Não há espaço de disco suficiente para armazenar `%s'." -#: ../debdelta:3771 +#: ../debdelta:3980 msgid "Creating:" msgstr "A criar:" -#: ../debdelta:3808 +#: ../debdelta:3981 +#| msgid "Error: testing of delta failed:" +msgid "Creation of delta failed, reason:" +msgstr "Falhou a criação do delta, razão:" + +#: ../debdelta:3984 ../debdelta:4023 ../debdelta:4037 +msgid "You may want to examine:" +msgstr "Pode querer examinar:" + +#: ../debdelta:4020 msgid "Error: testing of delta failed:" msgstr "Erro: testes do delta falhados:" -#: ../debdelta:3855 +#: ../debdelta:4094 +msgid "Warning, no non-option arguments, debdeltas does nothing." +msgstr "Aviso, nenhum argumento não-opção, o debdeltas não faz nada." + +#: ../debdelta:4098 +msgid "Warning, no --old arguments, debdeltas will not generate any deltas." +msgstr "" +"Aviso, nenhum argumento --old, o debdeltas não irá gerar nenhuns deltas." + +#: ../debdelta:4222 #, python-format msgid "Total running time: %.1f" msgstr "Tempo total de execução: %.1f" -#: ../debdelta:3970 +#: ../debdelta:4337 #, python-format msgid "(sources.conf does not provide a server for `%s')" msgstr "(sources.conf não fornece um servidor para `%s')" -#: ../debdelta:3985 +#: ../debdelta:4352 msgid "" " Proxy settings detected in the environment; using \"urllib2\" for " "downloading; but\n" @@ -379,78 +445,78 @@ " isto desactiva algumas funcionalidades e é em geral mais lento e " "problemático. Veja o manual." -#: ../debdelta:3997 ../debdelta:3999 +#: ../debdelta:4364 ../debdelta:4366 msgid "Initializing APT cache..." msgstr "a inicializar a cache do APT..." -#: ../debdelta:4027 +#: ../debdelta:4394 msgid "Upgrading APT cache..." msgstr "a actualizar a cache do APT..." -#: ../debdelta:4029 +#: ../debdelta:4396 msgid "upgrading..." msgstr "a actualizar..." -#: ../debdelta:4036 +#: ../debdelta:4403 msgid "Failed! Safe upgrading APT cache..." msgstr "Falhado! A fazer actualização segura da cache de APT..." -#: ../debdelta:4038 +#: ../debdelta:4405 msgid "failed! trying safe-upgrade..." msgstr "falhado! a tentar actualização segura..." -#: ../debdelta:4042 +#: ../debdelta:4409 msgid "Upgraded APT cache." msgstr "Cache de APT actualizada." -#: ../debdelta:4044 +#: ../debdelta:4411 msgid "done." msgstr "feito." -#: ../debdelta:4081 +#: ../debdelta:4448 #, python-format msgid "Recreated debs are saved in the directory %s" msgstr "Os debs recriados são guardados no directório %s" -#: ../debdelta:4124 +#: ../debdelta:4491 #, python-format msgid "Created, time %(time)5.2fsec, speed %(speed)4s/sec, %(name)s" msgstr "Criado, tempo %(time)5.2fsec, velocidade %(speed)4s/sec, %(name)s" -#: ../debdelta:4395 +#: ../debdelta:4766 msgid "Not enough disk space to download:" msgstr "Não há espaço de disco suficiente para descarregar." -#: ../debdelta:4420 +#: ../debdelta:4791 #, python-format msgid "Downloaded, time %(time)5.2fsec, speed %(speed)4s/sec, %(name)s" msgstr "" "Descarregado, tempo %(time)5.2fsec, velocidade %(speed)4s/sec, %(name)s" -#: ../debdelta:4556 +#: ../debdelta:4926 #, python-format msgid "Downloading head of %s..." msgstr "A descarregar cabeça de %s..." -#: ../debdelta:4576 +#: ../debdelta:4946 msgid "Delta is too big:" msgstr "Delta é demasiado grande:" -#: ../debdelta:4582 ../debdelta:4584 +#: ../debdelta:4952 ../debdelta:4954 msgid "Delta is not present:" msgstr "Delta não está presente:" -#: ../debdelta:4594 +#: ../debdelta:4964 #, python-format msgid "Downloaded head of %s." msgstr "Descarregada cabeça de %s." -#: ../debdelta:4632 +#: ../debdelta:5002 #, python-format msgid "Deltas: %(present)d present and %(absent)d not," msgstr "Deltas: %(present)d presentes e %(absent)d não presentes," -#: ../debdelta:4634 +#: ../debdelta:5004 #, python-format msgid "" "downloaded so far: time %(time).2fsec, size %(size)s, speed %(speed)4s/sec." @@ -458,37 +524,37 @@ "descarregado até agora: tempo %(time).2fsec, tamanho %(size)s, velocidade " "%(speed)4s/sec." -#: ../debdelta:4637 +#: ../debdelta:5007 #, python-format msgid "Need to get %s of deltas." msgstr "Preciso de obter %s de deltas." -#: ../debdelta:4673 +#: ../debdelta:5043 msgid "You may wish to rerun, to get also:" msgstr "Você pode desejar voltar a executar, para também obter:" -#: ../debdelta:4728 +#: ../debdelta:5098 msgid "Delta-upgrade statistics:" msgstr "EstatÃsticas de actualização de delta:" -#: ../debdelta:4729 +#: ../debdelta:5099 #, python-format msgid "size %(size)s time %(time)dsec speed %(speed)s/sec" msgstr "tamanho %(size)s tempo %(time)dsec velocidade %(speed)s/sec" -#: ../debdelta:4734 +#: ../debdelta:5104 msgid "downloaded deltas, " msgstr "deltas descarregados, " -#: ../debdelta:4739 +#: ../debdelta:5109 msgid "patching to debs, " msgstr "a aplicar patches aos debs, " -#: ../debdelta:4744 +#: ../debdelta:5114 msgid "downloaded debs, " msgstr "debs descarregados, " -#: ../debdelta:4749 +#: ../debdelta:5119 #, python-format msgid "" "total resulting debs, size %(size)s time %(time)dsec virtual speed %(speed)s/" @@ -497,38 +563,36 @@ "total de debs resultantes, tamanho %(size)s tempo %(time)dsec velocidade " "virtual %(speed)s/sec" -#: ../debdelta:4767 +#: ../debdelta:5137 msgid "Need a filename; try --help." msgstr "Preciso de um nome de ficheiro; tente --help." -#: ../debdelta:4788 ../debdelta:4812 +#: ../debdelta:5158 ../debdelta:5182 msgid "Need 3 filenames; try --help." msgstr "Preciso de 3 nomes de ficheiros; tente --help." -#: ../debdelta:4832 +#: ../debdelta:5202 msgid "Error: argument is not a directory or a regular file:" msgstr "Erro: argumento não é um directório nem um ficheiro regular:" -#: ../debdelta:4885 +#: ../debdelta:5255 #, python-format msgid "Lookup %s" msgstr "Procurar %s" -#: ../debdelta:4891 +#: ../debdelta:5261 #, python-format msgid "Sorry, cannot find an URI to download the debian package of `%s'." msgstr "" -"Desculpe, não consigo encontrar um URL para descarregar o pacote debian " -"de `%s'." +"Desculpe, não consigo encontrar um URL para descarregar o pacote debian de `" +"%s'." -#: ../debdelta:4907 +#: ../debdelta:5277 #, python-format msgid "Sorry, no source is available to upgrade `%s'." msgstr "Desculpe, não há fontes disponÃveis para actualizar `%s'." -#: ../debdelta:4911 +#: ../debdelta:5281 #, python-format msgid "Sorry, the package `%s' is already at its newest version." msgstr "Desculpe, o pacote `%s' já está na sua versão mais recente." - -
signature.asc
Description: OpenPGP digital signature