- Pacman-dev - lists.archlinux.org

[pacman-dev] CVS update of pacman-lib (6 files)
by Dan McGee 07 Mar '07

07 Mar '07

Date: Wednesday, March 7, 2007 @ 11:36:43 Author: dan Path: /home/cvs-pacman/pacman-lib Added: lib/libalpm/po/en_GB.po (1.1) src/pacman/po/en_GB.po (1.1) Modified: lib/libalpm/po/LINGUAS (1.3 -> 1.4) lib/libalpm/po/de.po (1.12 -> 1.13) src/pacman/po/LINGUAS (1.3 -> 1.4) src/pacman/po/de.po (1.13 -> 1.14) * Updated German translation Pierre Schmitz <pierre(a)archlinux.de> * Added en_GB translation, thanks! Keep it 'synchronised'! Sorry, awful joke. Jeff Bailes <thepizzaking(a)gmail.com> -------------------------+ lib/libalpm/po/LINGUAS | 1 lib/libalpm/po/de.po | 675 ++++++++++---------- lib/libalpm/po/en_GB.po | 1497 ++++++++++++++++++++++++++++++++++++++++++++++ src/pacman/po/LINGUAS | 1 src/pacman/po/de.po | 409 ++++++------ src/pacman/po/en_GB.po | 1075 +++++++++++++++++++++++++++++++++ 6 files changed, 3105 insertions(+), 553 deletions(-) The diff is longer than the limit of 39KB.

1 0

[pacman-dev] Update for German translation
by Pierre Schmitz 07 Mar '07

07 Mar '07

Hi, here is a patch for the German translation. (did cvs diff -u in cvs root) Pierre -- http://www.archlinux.de

1 0

[pacman-dev] CVS update of pacman-lib (9 files)
by Aaron Griffin 07 Mar '07

07 Mar '07

Date: Wednesday, March 7, 2007 @ 02:45:31 Author: aaron Path: /home/cvs-pacman/pacman-lib Modified: lib/libalpm/alpm.h (1.80 -> 1.81) lib/libalpm/deps.c (1.76 -> 1.77) lib/libalpm/deps.h (1.19 -> 1.20) lib/libalpm/package.c (1.84 -> 1.85) lib/libalpm/trans.c (1.43 -> 1.44) lib/libalpm/versioncmp.c (1.17 -> 1.18) lib/libalpm/versioncmp.h (1.9 -> 1.10) src/pacman/deptest.c (1.16 -> 1.17) src/pacman/log.c (1.32 -> 1.33) * Bug fix for makepkg dependency testing. This requires that we expose alpm_splitdep and alpm_depcmp as public symbols * Removed a duplicate strtrim for question responses --------------------------+ lib/libalpm/alpm.h | 3 ++ lib/libalpm/deps.c | 22 +++++++++---------- lib/libalpm/deps.h | 1 lib/libalpm/package.c | 2 - lib/libalpm/trans.c | 2 - lib/libalpm/versioncmp.c | 2 - lib/libalpm/versioncmp.h | 2 - src/pacman/deptest.c | 51 ++++++++++++++++++++++++++++++--------------- src/pacman/log.c | 13 ----------- 9 files changed, 52 insertions(+), 46 deletions(-) Index: pacman-lib/lib/libalpm/alpm.h diff -u pacman-lib/lib/libalpm/alpm.h:1.80 pacman-lib/lib/libalpm/alpm.h:1.81 --- pacman-lib/lib/libalpm/alpm.h:1.80 Mon Mar 5 20:21:41 2007 +++ pacman-lib/lib/libalpm/alpm.h Wed Mar 7 02:45:30 2007 @@ -375,6 +375,9 @@ PM_DEP_TYPE_CONFLICT } pmdeptype_t; +pmdepend_t *alpm_splitdep(const char *depstring); +int alpm_depcmp(pmpkg_t *pkg, pmdepend_t *dep); + const char *alpm_dep_get_target(pmdepmissing_t *miss); pmdeptype_t alpm_dep_get_type(pmdepmissing_t *miss); pmdepmod_t alpm_dep_get_mod(pmdepmissing_t *miss); Index: pacman-lib/lib/libalpm/deps.c diff -u pacman-lib/lib/libalpm/deps.c:1.76 pacman-lib/lib/libalpm/deps.c:1.77 --- pacman-lib/lib/libalpm/deps.c:1.76 Mon Mar 5 17:13:34 2007 +++ pacman-lib/lib/libalpm/deps.c Wed Mar 7 02:45:30 2007 @@ -142,7 +142,7 @@ pmpkg_t *p = i->data; _alpm_log(PM_LOG_DEBUG, " sorting %s", alpm_pkg_get_name(p)); for(j = alpm_pkg_get_depends(p); j; j = j->next) { - pmdepend_t *depend = _alpm_splitdep(j->data); + pmdepend_t *depend = alpm_splitdep(j->data); pmpkg_t *q = NULL; if(depend == NULL) { continue; @@ -244,20 +244,20 @@ } for(k = alpm_pkg_get_depends(p); k; k = k->next) { /* don't break any existing dependencies (possible provides) */ - pmdepend_t *depend = _alpm_splitdep(k->data); + pmdepend_t *depend = alpm_splitdep(k->data); if(depend == NULL) { continue; } /* if oldpkg satisfied this dep, and newpkg doesn't */ - if(_alpm_depcmp(oldpkg, depend) && !_alpm_depcmp(newpkg, depend)) { + if(alpm_depcmp(oldpkg, depend) && !alpm_depcmp(newpkg, depend)) { /* we've found a dep that was removed... see if any other package * still contains/provides the dep */ int satisfied = 0; for(l = packages; l; l = l->next) { pmpkg_t *pkg = l->data; - if(_alpm_depcmp(pkg, depend)) { + if(alpm_depcmp(pkg, depend)) { _alpm_log(PM_LOG_DEBUG, _("checkdeps: dependency '%s' has moved from '%s' to '%s'"), depend->name, alpm_pkg_get_name(oldpkg), alpm_pkg_get_name(pkg)); satisfied = 1; @@ -276,7 +276,7 @@ continue; } - if(_alpm_depcmp(pkg, depend)) { + if(alpm_depcmp(pkg, depend)) { _alpm_log(PM_LOG_DEBUG, _("checkdeps: dependency '%s' satisfied by installed package '%s'"), depend->name, alpm_pkg_get_name(pkg)); satisfied = 1; @@ -313,7 +313,7 @@ for(j = alpm_pkg_get_depends(tp); j; j = j->next) { /* split into name/version pairs */ - pmdepend_t *depend = _alpm_splitdep((char*)j->data); + pmdepend_t *depend = alpm_splitdep((char*)j->data); if(depend == NULL) { continue; } @@ -322,7 +322,7 @@ /* check database for literal packages */ for(k = _alpm_db_get_pkgcache(db); k && !found; k = k->next) { pmpkg_t *p = (pmpkg_t *)k->data; - found = _alpm_depcmp(p, depend); + found = alpm_depcmp(p, depend); } /* check database for provides matches */ if(!found) { @@ -345,14 +345,14 @@ continue; } - found = _alpm_depcmp(p, depend); + found = alpm_depcmp(p, depend); } FREELISTPTR(k); } /* check other targets */ for(k = packages; k && !found; k = k->next) { pmpkg_t *p = k->data; - found = _alpm_depcmp(p, depend); + found = alpm_depcmp(p, depend); } /* else if still not found... */ if(!found) { @@ -424,7 +424,7 @@ return(baddeps); } -pmdepend_t *_alpm_splitdep(const char *depstring) +pmdepend_t *alpm_splitdep(const char *depstring) { pmdepend_t *depend; char *ptr = NULL; @@ -517,7 +517,7 @@ for(i = targs; i; i = i->next) { pmpkg_t *pkg = i->data; for(j = alpm_pkg_get_depends(pkg); j; j = j->next) { - pmdepend_t *depend = _alpm_splitdep(j->data); + pmdepend_t *depend = alpm_splitdep(j->data); pmpkg_t *deppkg; if(depend == NULL) { continue; Index: pacman-lib/lib/libalpm/deps.h diff -u pacman-lib/lib/libalpm/deps.h:1.19 pacman-lib/lib/libalpm/deps.h:1.20 --- pacman-lib/lib/libalpm/deps.h:1.19 Sat Mar 3 04:43:16 2007 +++ pacman-lib/lib/libalpm/deps.h Wed Mar 7 02:45:30 2007 @@ -49,7 +49,6 @@ alpm_list_t *_alpm_sortbydeps(alpm_list_t *targets, pmtranstype_t mode); alpm_list_t *_alpm_checkdeps(pmtrans_t *trans, pmdb_t *db, pmtranstype_t op, alpm_list_t *packages); -pmdepend_t *_alpm_splitdep(const char *depstring); alpm_list_t *_alpm_removedeps(pmdb_t *db, alpm_list_t *targs); int _alpm_resolvedeps(pmdb_t *local, alpm_list_t *dbs_sync, pmpkg_t *syncpkg, alpm_list_t *list, alpm_list_t *trail, pmtrans_t *trans, Index: pacman-lib/lib/libalpm/package.c diff -u pacman-lib/lib/libalpm/package.c:1.84 pacman-lib/lib/libalpm/package.c:1.85 --- pacman-lib/lib/libalpm/package.c:1.84 Mon Mar 5 17:13:34 2007 +++ pacman-lib/lib/libalpm/package.c Wed Mar 7 02:45:30 2007 @@ -552,7 +552,7 @@ if(!j->data) { continue; } - dep = _alpm_splitdep(j->data); + dep = alpm_splitdep(j->data); if(dep == NULL) { continue; } Index: pacman-lib/lib/libalpm/trans.c diff -u pacman-lib/lib/libalpm/trans.c:1.43 pacman-lib/lib/libalpm/trans.c:1.44 --- pacman-lib/lib/libalpm/trans.c:1.43 Mon Mar 5 20:21:42 2007 +++ pacman-lib/lib/libalpm/trans.c Wed Mar 7 02:45:30 2007 @@ -272,7 +272,7 @@ localdb = alpm_option_get_localdb(); for(i = depends; i; i = i->next) { - pmdepend_t* dep = _alpm_splitdep(i->data); + pmdepend_t* dep = alpm_splitdep(i->data); if(dep == NULL) { continue; } Index: pacman-lib/lib/libalpm/versioncmp.c diff -u pacman-lib/lib/libalpm/versioncmp.c:1.17 pacman-lib/lib/libalpm/versioncmp.c:1.18 --- pacman-lib/lib/libalpm/versioncmp.c:1.17 Mon Mar 5 17:13:34 2007 +++ pacman-lib/lib/libalpm/versioncmp.c Wed Mar 7 02:45:30 2007 @@ -247,7 +247,7 @@ return(*one ? 1 : -1); } -int _alpm_depcmp(pmpkg_t *pkg, pmdepend_t *dep) +int alpm_depcmp(pmpkg_t *pkg, pmdepend_t *dep) { int equal = 0; Index: pacman-lib/lib/libalpm/versioncmp.h diff -u pacman-lib/lib/libalpm/versioncmp.h:1.9 pacman-lib/lib/libalpm/versioncmp.h:1.10 --- pacman-lib/lib/libalpm/versioncmp.h:1.9 Mon Mar 5 20:21:42 2007 +++ pacman-lib/lib/libalpm/versioncmp.h Wed Mar 7 02:45:30 2007 @@ -26,10 +26,8 @@ #include "deps.h" #include "package.h" -int _alpm_depcmp(pmpkg_t *pkg, pmdepend_t *dep); int _alpm_versioncmp(const char *a, const char *b); - #endif /* _ALPM_VERSIONCMP_H */ /* vim: set ts=2 sw=2 noet: */ Index: pacman-lib/src/pacman/deptest.c diff -u pacman-lib/src/pacman/deptest.c:1.16 pacman-lib/src/pacman/deptest.c:1.17 --- pacman-lib/src/pacman/deptest.c:1.16 Mon Mar 5 17:13:35 2007 +++ pacman-lib/src/pacman/deptest.c Wed Mar 7 02:45:31 2007 @@ -38,35 +38,54 @@ extern config_t *config; +int chk_package(const char *pkgname, pmdepend_t *dep) +{ + pmpkg_t *pkg; + pkg = alpm_db_get_pkg(alpm_option_get_localdb(), pkgname); + + if(!pkg || !alpm_depcmp(pkg, dep)) { + return(1); + } + return(0); +} + int pacman_deptest(alpm_list_t *targets) { int retval = 0; - pmdb_t *local; - pmpkg_t *pkg; - alpm_list_t *i, *provides; + alpm_list_t *i; if(targets == NULL) { return(0); } - local = alpm_option_get_localdb(); - for(i = targets; i; i = alpm_list_next(i)) { - const char *pkgname; - - pkgname = alpm_list_getdata(i); - /* find this package in the local DB */ - pkg = alpm_db_get_pkg(local, pkgname); + int found = 0; + pmdepend_t *dep; + const char *target; + alpm_list_t *j, *provides; + + target = alpm_list_getdata(i); + dep = alpm_splitdep(target); - if(!pkg) { + if(chk_package(target, dep) == 0) { + found = 1; + } else { /* not found, can we find anything that provides this in the local DB? */ - provides = alpm_db_whatprovides(local, pkgname); - if(!provides) { - /* nope, must be missing */ - MSG(NL, _("requires: %s"), pkgname); - retval = 1; + provides = alpm_db_whatprovides(alpm_option_get_localdb(), target); + for(j = provides; j; j = alpm_list_next(j)) { + const char *provide; + provide = alpm_list_getdata(j); + + if(chk_package(provide, dep) == 0) { + found = 1; + } } } + + if(!found) { + MSG(NL, _("requires: %s"), target); + retval = 1; + } } return(retval); } Index: pacman-lib/src/pacman/log.c diff -u pacman-lib/src/pacman/log.c:1.32 pacman-lib/src/pacman/log.c:1.33 --- pacman-lib/src/pacman/log.c:1.32 Mon Mar 5 17:13:35 2007 +++ pacman-lib/src/pacman/log.c Wed Mar 7 02:45:31 2007 @@ -184,19 +184,6 @@ pm_fprintf(stderr, NL, str); \ if(fgets(response, 32, stdin)) { - /* trim whitespace and newlines */ - char *pch = response; - while(isspace(*pch)) { - pch++; - } - if(pch != response) { - memmove(response, pch, strlen(pch) + 1); - } - pch = response + strlen(response) - 1; - while(isspace(*pch)) { - pch--; - } - *++pch = 0; if(strlen(response) != 0) { strtrim(response); }

1 0

[pacman-dev] 20070307 Brazilian portuguese patch for pacman3
by Douglas Soares de Andrade 07 Mar '07

07 Mar '07

Hi guys, Here is a update of the pacman3 pt_BR.po. I generated the patch with: cvs diff -u Hope it is the right way :) -- Douglas Soares de Andrade Archlinux Brasil - http://archlinux-br.org Paradigma Internet - http://www.paradigma.com.br

2 1

[pacman-dev] CVS update of pacman-lib (2 files)
by Dan McGee 07 Mar '07

07 Mar '07

Date: Wednesday, March 7, 2007 @ 01:57:44 Author: dan Path: /home/cvs-pacman/pacman-lib Modified: lib/libalpm/po/pt_BR.po (1.6 -> 1.7) src/pacman/po/pt_BR.po (1.8 -> 1.9) * Updated Brazilian Portuguese translation Douglas Soares de Andrade <dsandrade(a)gmail.com> -------------------------+ lib/libalpm/po/pt_BR.po | 289 +++++++++++++++++++++++----------------------- src/pacman/po/pt_BR.po | 123 +++++++------------ 2 files changed, 192 insertions(+), 220 deletions(-) Index: pacman-lib/lib/libalpm/po/pt_BR.po diff -u pacman-lib/lib/libalpm/po/pt_BR.po:1.6 pacman-lib/lib/libalpm/po/pt_BR.po:1.7 --- pacman-lib/lib/libalpm/po/pt_BR.po:1.6 Sun Mar 4 12:16:51 2007 +++ pacman-lib/lib/libalpm/po/pt_BR.po Wed Mar 7 01:57:44 2007 @@ -1,452 +1,458 @@ +# translation of pt_BR.po to Português do Brasil # Portuguese translations for Pacman package manager package. # Copyright (C) 2002-2007 Judd Vinet <jvinet(a)zeroflux.org> # This file is distributed under the same license as the Pacman package manager package. -# (First author here) <(email here)>, 2007. # +# +# (First author here) <(email here)>, 2007. +# Lincoln de Sousa <lincoln(a)archlinux-br.org>, 2007. +# Hugo Doria <hugodoria(a)archlinux-br.org>, 2007. +# Douglas Soares de Andrade <dsandrade(a)gmail.com>, 2007. msgid "" msgstr "" -"Project-Id-Version: Pacman package manager 3.0.0\n" +"Project-Id-Version: pt_BR\n" "Report-Msgid-Bugs-To: pacman-dev(a)archlinux.org\n" "POT-Creation-Date: 2007-03-04 12:01-0500\n" -"PO-Revision-Date: 2007-02-06 20:16-0500\n" -"Last-Translator: Dan McGee <pacman-dev(a)archlinux.org>\n" +"PO-Revision-Date: 2007-03-07 01:18-0300\n" +"Last-Translator: Douglas Soares de Andrade <dsandrade(a)gmail.com>\n" +"Language-Team: Português do Brasil <pt(a)li.org>\n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=utf-8\n" +"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n > 1);\n" +"Plural-Forms: nplurals=2; plural=(n > 1);\n" +"X-Generator: KBabel 1.11.4\n" #: lib/libalpm/add.c:75 #, c-format msgid "loading target '%s'" -msgstr "" +msgstr "carregando pacotes '%s'" #: lib/libalpm/add.c:120 #, c-format msgid "replacing older version %s-%s by %s in target list" -msgstr "" +msgstr "substituindo a versão antiga %s-%s por '%s' na lista de pacotes" #: lib/libalpm/add.c:129 #, c-format msgid "newer version %s-%s is in the target list -- skipping" -msgstr "" +msgstr "versão atualizada %s-%s está na lista de pacotes -- pulando" #: lib/libalpm/add.c:136 #, c-format msgid "reading '%s' metadata" -msgstr "" +msgstr "lendo os metadados de '%s'" #: lib/libalpm/add.c:189 lib/libalpm/remove.c:110 msgid "looking for unsatisfied dependencies" -msgstr "" +msgstr "procurando por dependências não satisfeitas" #: lib/libalpm/add.c:201 lib/libalpm/sync.c:467 msgid "looking for conflicts" -msgstr "" +msgstr "procurando por conflitos" #: lib/libalpm/add.c:206 msgid "replacing packages with -A and -U is not supported yet" -msgstr "" +msgstr "substituir pacotes com -A e -U ainda não é suportado" #: lib/libalpm/add.c:207 #, c-format msgid "please remove '%s' first, using -Rd" -msgstr "" +msgstr "por favor, remova '%s' primeiro usando -Rd" #: lib/libalpm/add.c:248 lib/libalpm/remove.c:146 msgid "sorting by dependencies" -msgstr "" +msgstr "ordenando por dependências" #: lib/libalpm/add.c:260 msgid "cleaning up" -msgstr "" +msgstr "finalizando" #: lib/libalpm/add.c:275 msgid "looking for file conflicts" -msgstr "" +msgstr "procurando por conflitos de arquivos" #: lib/libalpm/add.c:340 #, c-format msgid "upgrading package %s-%s" -msgstr "" +msgstr "atualizando pacote %s-%s" #: lib/libalpm/add.c:364 #, c-format msgid "adding package %s-%s" -msgstr "" +msgstr "adicionando pacote %s-%s" #: lib/libalpm/add.c:377 #, c-format msgid "removing old package first (%s-%s)" -msgstr "" +msgstr "removendo pacotes antigos primeiro (%s-%s)" #: lib/libalpm/add.c:405 #, c-format msgid "adding %s to the NoUpgrade array temporarily" -msgstr "" +msgstr "adicionando %s para NoUpgrade temporariamente" #: lib/libalpm/add.c:423 msgid "extracting files" -msgstr "" +msgstr "extraindo arquivos" #: lib/libalpm/add.c:438 lib/libalpm/util.c:465 msgid "could not get current working directory" -msgstr "" +msgstr "não foi possível obter o diretório de trabalho atual" #: lib/libalpm/add.c:494 lib/libalpm/add.c:495 #, c-format msgid "%s is in NoExtract, skipping extraction" -msgstr "" +msgstr "%s está incluso em NoExtract -- não descompactando" #: lib/libalpm/add.c:502 #, c-format msgid "%s is in trans->skip_add, skipping extraction" -msgstr "" +msgstr "o pacote %s está incluso em trans->skip_add, não descompactando" #: lib/libalpm/add.c:548 lib/libalpm/add.c:549 lib/libalpm/add.c:698 #, c-format msgid "could not extract %s (%s)" -msgstr "" +msgstr "não foi possível extrair %s (%s)" #: lib/libalpm/add.c:592 #, c-format msgid "checking md5 hashes for %s" -msgstr "" +msgstr "verificando hashes md5 para %s" #: lib/libalpm/add.c:594 #, c-format msgid "checking sha1 hashes for %s" -msgstr "" +msgstr "verificando hashes sha1 para %s" #: lib/libalpm/add.c:596 #, c-format msgid "current: %s" -msgstr "" +msgstr "atual: %s" #: lib/libalpm/add.c:597 #, c-format msgid "new: %s" -msgstr "" +msgstr "novo: %s" #: lib/libalpm/add.c:598 #, c-format msgid "original: %s" -msgstr "" +msgstr "original: %s" #: lib/libalpm/add.c:610 #, c-format msgid "could not rename %s (%s)" -msgstr "" +msgstr "não foi possível renomear %s (%s)" #: lib/libalpm/add.c:611 #, c-format msgid "error: could not rename %s (%s)" -msgstr "" +msgstr "erro: não foi possível renomear %s (%s)" #: lib/libalpm/add.c:617 lib/libalpm/add.c:636 #, c-format msgid "could not copy tempfile to %s (%s)" -msgstr "" +msgstr "não foi possível copiar arquivo temporário para %s (%s)" #: lib/libalpm/add.c:618 #, c-format msgid "error: could not copy tempfile to %s (%s)" -msgstr "" +msgstr "erro: não foi possível copiar arquivo temporário para %s (%s)" #: lib/libalpm/add.c:622 #, c-format msgid "%s saved as %s.pacorig" -msgstr "" +msgstr "%s salvo como %s.pacorig" #: lib/libalpm/add.c:623 #, c-format msgid "warning: %s saved as %s" -msgstr "" +msgstr "aviso: %s salvo como %s" #: lib/libalpm/add.c:633 #, c-format msgid "action: installing new file: %s" -msgstr "" +msgstr "ação: instalando novo arquivo: %s" #: lib/libalpm/add.c:643 lib/libalpm/add.c:649 lib/libalpm/add.c:654 msgid "action: leaving existing file in place" -msgstr "" +msgstr "ação: preservando o arquivo existente" #: lib/libalpm/add.c:657 msgid "action: keeping current file and installing new one with .pacnew ending" -msgstr "" +msgstr "ação: preservando o arquivo existente e instalando o novo com um final .pacnew" #: lib/libalpm/add.c:660 #, c-format msgid "could not install %s as %s: %s" -msgstr "" +msgstr "não foi possível instalar %s como %s: %s" #: lib/libalpm/add.c:661 #, c-format msgid "error: could not install %s as %s: %s" -msgstr "" +msgstr "erro: não foi possível instalar %s como %s: %s" #: lib/libalpm/add.c:663 #, c-format msgid "%s installed as %s" -msgstr "" +msgstr "%s instalado como %s" #: lib/libalpm/add.c:664 #, c-format msgid "warning: %s installed as %s" -msgstr "" +msgstr "atenção: %s instalado como %s" #: lib/libalpm/add.c:678 #, c-format msgid "%s is in NoUpgrade -- skipping" -msgstr "" +msgstr "%s está como NoUpgrade -- pulando" #: lib/libalpm/add.c:679 #, c-format msgid "extracting %s as %s.pacnew" -msgstr "" +msgstr "extraindo %s como %s.pacnew" #: lib/libalpm/add.c:680 #, c-format msgid "warning: extracting %s as %s.pacnew" -msgstr "" +msgstr "aviso: extraindo %s como %s.pacnew" #: lib/libalpm/add.c:683 #, c-format msgid "extracting %s" -msgstr "" +msgstr "extraindo %s" #: lib/libalpm/add.c:699 #, c-format msgid "error: could not extract %s (%s)" -msgstr "" +msgstr "erro: não foi possível descompactar %s (%s)" #: lib/libalpm/add.c:711 #, c-format msgid "appending backup entry for %s" -msgstr "" +msgstr "adicionando entrada de backup para %s" #: lib/libalpm/add.c:743 lib/libalpm/add.c:745 #, c-format msgid "errors occurred while %s %s" -msgstr "" +msgstr "erros ocorreram durante %s %s" #: lib/libalpm/add.c:744 lib/libalpm/add.c:746 msgid "upgrading" -msgstr "" +msgstr "atualizando" #: lib/libalpm/add.c:744 lib/libalpm/add.c:746 msgid "installing" -msgstr "" +msgstr "instalando" #: lib/libalpm/add.c:763 #, c-format msgid "provision '%s' has been removed from package %s (%s => %s)" -msgstr "" +msgstr "a provisão '%s' foi removida do pacote %s (%s => %s)" #: lib/libalpm/add.c:775 #, c-format msgid "updating '%s' due to provision change (%s)" -msgstr "" +msgstr "atualizando '%s' devido a uma mudança de provisão (%s)" #: lib/libalpm/add.c:779 lib/libalpm/add.c:780 #, c-format msgid "could not update provision '%s' from '%s'" -msgstr "" +msgstr "não foi possível atualizar a provisão '%s' para '%s'" #: lib/libalpm/add.c:793 lib/libalpm/remove.c:337 msgid "updating database" -msgstr "" +msgstr "atualizando base de dados" #: lib/libalpm/add.c:794 #, c-format msgid "adding database entry '%s'" -msgstr "" +msgstr "adicionando a entrada de base de dados '%s'" #: lib/libalpm/add.c:797 lib/libalpm/add.c:799 #, c-format msgid "could not update database entry %s-%s" -msgstr "" +msgstr "não foi possível atualizar a entrada na base de dados %s-%s" #: lib/libalpm/add.c:805 #, c-format msgid "could not add entry '%s' in cache" -msgstr "" +msgstr "não foi possível adicionar a entrada '%s' ao cache" #: lib/libalpm/add.c:838 lib/libalpm/remove.c:364 lib/libalpm/sync.c:1039 #, c-format msgid "running \"ldconfig -r %s\"" -msgstr "" +msgstr "executando \"ldconfig -r %s\"" #: lib/libalpm/alpm.c:113 #, c-format msgid "removing DB %s, %d remaining..." -msgstr "" +msgstr "removendo DB %s, %d continua existindo..." #: lib/libalpm/alpm.c:178 #, c-format msgid "unregistering database '%s'" -msgstr "" +msgstr "desregistrando a base de dados '%s'" #: lib/libalpm/alpm.c:183 #, c-format msgid "closing database '%s'" -msgstr "" +msgstr "fechando a base de dados '%s'" #: lib/libalpm/alpm.c:229 #, c-format -msgid "" -"adding new server to database '%s': protocol '%s', server '%s', path '%s'" -msgstr "" +msgid "adding new server to database '%s': protocol '%s', server '%s', path '%s'" +msgstr "adicionando novo servidor à base de dados '%s': protocolo '%s', servidor '%s', caminho '%s'" #: lib/libalpm/alpm.c:233 #, c-format msgid "serverlist flushed for '%s'" -msgstr "" +msgstr "lista de servidores nivelada para '%s'" #: lib/libalpm/alpm.c:276 #, c-format msgid "failed to get lastupdate time for %s (no big deal)" -msgstr "" +msgstr "falha para conseguir o horário da última atualização de %s (no big deal)" #: lib/libalpm/alpm.c:295 #, c-format msgid "failed to sync db: %s [%d]" -msgstr "" +msgstr "falha ao sincronizar base de dados: %s [%d]" #: lib/libalpm/alpm.c:299 #, c-format msgid "sync: new mtime for %s: %s" -msgstr "" +msgstr "sincronizar: novo mtime para %s: %s" #: lib/libalpm/alpm.c:305 #, c-format msgid "flushing database %s%s" -msgstr "" +msgstr "nivelando a base de dados %s%s" #: lib/libalpm/alpm.c:309 #, c-format msgid "could not remove database entry %s%s" -msgstr "" +msgstr "não foi possível remover a entrada da base de dados %s%s" #: lib/libalpm/alpm.c:478 #, c-format msgid "could not get sha1sum for package %s-%s" -msgstr "" +msgstr "não foi possível conseguir a soma sha1 para o pacote %s-%s" #: lib/libalpm/alpm.c:484 #, c-format msgid "sha1sums for package %s-%s match" -msgstr "" +msgstr "somas sha1 para o pacote %s - %s coincidem" #: lib/libalpm/alpm.c:487 #, c-format msgid "sha1sums do not match for package %s-%s" -msgstr "" +msgstr "somas sha1 não coincidem para o pacote %s-%s" #: lib/libalpm/alpm.c:522 #, c-format msgid "could not get md5sum for package %s-%s" -msgstr "" +msgstr "não foi possível conseguir a soma md5 para o pacote %s-%s" #: lib/libalpm/alpm.c:528 #, c-format msgid "md5sums for package %s-%s match" -msgstr "" +msgstr "somas md5 para o pacote %s - %s coincidem" #: lib/libalpm/alpm.c:531 #, c-format msgid "md5sums do not match for package %s-%s" -msgstr "" +msgstr "somas md5 não coincidem para o pacote %s-%s" #: lib/libalpm/alpm.c:780 #, c-format msgid "could not remove lock file %s" -msgstr "" +msgstr "não foi possível remover o arquivo de lock %s" #: lib/libalpm/alpm.c:781 #, c-format msgid "warning: could not remove lock file %s" -msgstr "" +msgstr "aviso: não foi possível remover o arquivo de lock %s" #: lib/libalpm/alpm.c:916 #, c-format msgid "config: new section '%s'" -msgstr "" +msgstr "configuração: nova seção '%s'" #: lib/libalpm/alpm.c:945 msgid "config: nopassiveftp" -msgstr "" +msgstr "configuração: nopassiveftp" #: lib/libalpm/alpm.c:948 msgid "config: usesyslog" -msgstr "" +msgstr "configuração: usesyslog" #: lib/libalpm/alpm.c:951 msgid "config: chomp" -msgstr "" +msgstr "configuração: chomp" #: lib/libalpm/alpm.c:954 msgid "config: usecolor" -msgstr "" +msgstr "configuração: usecolor" #: lib/libalpm/alpm.c:963 #, c-format msgid "config: including %s" -msgstr "" +msgstr "configuração: including %s" #: lib/libalpm/alpm.c:973 lib/libalpm/alpm.c:978 #, c-format msgid "config: noupgrade: %s" -msgstr "" +msgstr "configuração: noupgrade: %s" #: lib/libalpm/alpm.c:986 lib/libalpm/alpm.c:991 #, c-format msgid "config: noextract: %s" -msgstr "" +msgstr "configuração: noextract: %s" #: lib/libalpm/alpm.c:999 lib/libalpm/alpm.c:1004 #, c-format msgid "config: ignorepkg: %s" -msgstr "" +msgstr "configuração: ignorepkg: %s" #: lib/libalpm/alpm.c:1012 lib/libalpm/alpm.c:1017 #, c-format msgid "config: holdpkg: %s" -msgstr "" +msgstr "configuração: holdpkg: %s" #: lib/libalpm/alpm.c:1024 #, c-format msgid "config: dbpath: %s" -msgstr "" +msgstr "configuração: dbpath: %s" #: lib/libalpm/alpm.c:1031 #, c-format msgid "config: cachedir: %s" -msgstr "" +msgstr "configuração: cachedir: %s" #: lib/libalpm/alpm.c:1034 #, c-format msgid "config: logfile: %s" -msgstr "" +msgstr "configuração: logfile: %s" #: lib/libalpm/alpm.c:1037 #, c-format msgid "config: xfercommand: %s" -msgstr "" +msgstr "configuração: xfercommand: %s" #: lib/libalpm/alpm.c:1042 #, c-format msgid "config: upgradedelay: %d" -msgstr "" +msgstr "configuração: upgradedelay: %d" #: lib/libalpm/alpm.c:1080 lib/libalpm/sync.c:105 msgid "checking for package replacements" -msgstr "" +msgstr "verificando por substitutos do pacote" #: lib/libalpm/alpm.c:1091 lib/libalpm/sync.c:121 #, c-format msgid "checking replacement '%s' for package '%s'" -msgstr "" +msgstr "verificando substituto '%s' para o pacote '%s'" #: lib/libalpm/alpm.c:1094 lib/libalpm/sync.c:123 #, c-format @@ -476,22 +482,22 @@ #: lib/libalpm/be_files.c:58 #, c-format msgid "unpacking database '%s'" -msgstr "" +msgstr "descompactando base de dados '%s'" #: lib/libalpm/be_files.c:75 -#, c-format +#, fuzzy, c-format msgid "opening database from path '%s'" -msgstr "" +msgstr "abrindo base de dados '%s'" #: lib/libalpm/be_files.c:179 -#, c-format +#, fuzzy, c-format msgid "db scan could not find package: %s" -msgstr "" +msgstr "não foi possível encontrar a base de dados" #: lib/libalpm/be_files.c:183 #, c-format msgid "invalid name for dabatase entry '%s'" -msgstr "" +msgstr "nome inválido para a entrada na base de dados '%s'" #: lib/libalpm/be_files.c:218 msgid "invalid package entry provided to _alpm_db_read, skipping" @@ -499,8 +505,7 @@ #: lib/libalpm/be_files.c:223 #, c-format -msgid "" -"request to read database info for a file-based package '%s', skipping..." +msgid "request to read database info for a file-based package '%s', skipping..." msgstr "" #: lib/libalpm/be_files.c:231 @@ -519,7 +524,7 @@ #: lib/libalpm/package.c:204 #, c-format msgid "could not open file %s: %s" -msgstr "" +msgstr "não foi possível abrir o arquivo %s: %s" #: lib/libalpm/be_files.c:504 #, c-format @@ -592,9 +597,9 @@ msgstr "" #: lib/libalpm/conflict.c:100 lib/libalpm/conflict.c:142 -#, c-format +#, fuzzy, c-format msgid "package '%s' conflicts with itself - packaging error" -msgstr "" +msgstr "pacote '%s' conflita com '%s'" #: lib/libalpm/conflict.c:106 #, c-format @@ -657,7 +662,7 @@ #: lib/libalpm/db.c:195 #, c-format msgid "opening database '%s'" -msgstr "" +msgstr "abrindo base de dados '%s'" #: lib/libalpm/deps.c:128 msgid "started sorting dependencies" @@ -731,8 +736,7 @@ #: lib/libalpm/deps.c:627 #, c-format -msgid "" -"cannot resolve dependencies for \"%s\" (\"%s\" is not in the package set)" +msgid "cannot resolve dependencies for \"%s\" (\"%s\" is not in the package set)" msgstr "" #: lib/libalpm/deps.c:644 @@ -781,11 +785,11 @@ #: lib/libalpm/error.c:45 msgid "library not initialized" -msgstr "" +msgstr "biblioteca não inicializada" #: lib/libalpm/error.c:47 msgid "library already initialized" -msgstr "" +msgstr "biblioteca já inicializada" #: lib/libalpm/error.c:49 msgid "unable to lock database" @@ -793,31 +797,31 @@ #: lib/libalpm/error.c:52 msgid "could not open database" -msgstr "" +msgstr "não foi possível abrir a base de dados" #: lib/libalpm/error.c:54 msgid "could not create database" -msgstr "" +msgstr "não foi possível criar a base de dados" #: lib/libalpm/error.c:56 msgid "database not initialized" -msgstr "" +msgstr "base de dados não inicializada" #: lib/libalpm/error.c:58 msgid "database already registered" -msgstr "" +msgstr "base de dados já registrada" #: lib/libalpm/error.c:60 msgid "could not find database" -msgstr "" +msgstr "não foi possível encontrar a base de dados" #: lib/libalpm/error.c:62 msgid "could not update database" -msgstr "" +msgstr "não foi possível atualizar a base de dados" #: lib/libalpm/error.c:64 msgid "could not remove database entry" -msgstr "" +msgstr "não foi possível remover a entrada da base de dados" #: lib/libalpm/error.c:67 msgid "invalid url for server" @@ -837,7 +841,7 @@ #: lib/libalpm/error.c:81 msgid "duplicate target" -msgstr "" +msgstr "alvo duplicado" #: lib/libalpm/error.c:85 msgid "transaction not prepared" @@ -889,11 +893,11 @@ #: lib/libalpm/error.c:110 msgid "package name is not valid" -msgstr "" +msgstr "o nome do pacote não é valido" #: lib/libalpm/error.c:112 msgid "corrupted package" -msgstr "" +msgstr "pacote corrompido" #: lib/libalpm/error.c:114 msgid "no such repository" @@ -901,7 +905,7 @@ #: lib/libalpm/error.c:117 msgid "group not found" -msgstr "" +msgstr "grupo não encontrado" #: lib/libalpm/error.c:120 msgid "could not satisfy dependencies" @@ -921,7 +925,7 @@ #: lib/libalpm/error.c:129 msgid "internal error" -msgstr "" +msgstr "erro interno" #: lib/libalpm/error.c:131 msgid "libarchive error" @@ -929,7 +933,7 @@ #: lib/libalpm/error.c:133 msgid "not enough space on disk" -msgstr "" +msgstr "espaço insuficiente em disco" #: lib/libalpm/error.c:136 msgid "not confirmed" @@ -953,7 +957,7 @@ #: lib/libalpm/error.c:147 msgid "invalid regular expression" -msgstr "" +msgstr "expressão regular inválida" #: lib/libalpm/error.c:150 msgid "connection to remote host failed" @@ -961,7 +965,7 @@ #: lib/libalpm/error.c:153 msgid "unexpected error" -msgstr "" +msgstr "erro inesperado" #: lib/libalpm/handle.c:161 #, c-format @@ -1098,17 +1102,17 @@ #: lib/libalpm/remove.c:219 #, c-format msgid "file %s does not exist" -msgstr "" +msgstr "o arquivo %s não existe" #: lib/libalpm/remove.c:226 #, c-format msgid "keeping directory %s" -msgstr "" +msgstr "mantendo diretório %s" #: lib/libalpm/remove.c:228 #, c-format msgid "removing directory %s" -msgstr "" +msgstr "removendo diretório %s" #: lib/libalpm/remove.c:235 #, c-format @@ -1118,7 +1122,7 @@ #: lib/libalpm/remove.c:246 #, c-format msgid "%s saved as %s" -msgstr "" +msgstr "%s salvo como %s" #: lib/libalpm/remove.c:249 #, c-format @@ -1146,9 +1150,9 @@ msgstr "" #: lib/libalpm/remove.c:315 -#, c-format +#, fuzzy, c-format msgid "removing %d files" -msgstr "" +msgstr "removendo diretório %s" #: lib/libalpm/remove.c:338 #, c-format @@ -1223,9 +1227,9 @@ msgstr "" #: lib/libalpm/sync.c:478 -#, c-format +#, fuzzy, c-format msgid "package '%s' conflicts with '%s'" -msgstr "" +msgstr "pacote '%s' conflita com '%s'" #: lib/libalpm/sync.c:500 #, c-format @@ -1245,7 +1249,7 @@ #: lib/libalpm/sync.c:551 lib/libalpm/sync.c:588 #, c-format msgid "removing '%s' from target list" -msgstr "" +msgstr "removendo '%s' da lista de alvos" #: lib/libalpm/sync.c:560 #, c-format @@ -1368,9 +1372,9 @@ msgstr "" #: lib/libalpm/sync.c:1063 -#, c-format +#, fuzzy, c-format msgid "found package '%s-%s' in sync" -msgstr "" +msgstr "atualizando pacote %s-%s" #: lib/libalpm/sync.c:1069 #, c-format @@ -1399,7 +1403,7 @@ #: lib/libalpm/trans.c:322 #, c-format msgid "could not find dependency '%s'" -msgstr "" +msgstr "não foi possível encontrar a dependência '%s'" #: lib/libalpm/util.c:142 #, c-format @@ -1458,7 +1462,7 @@ #: lib/libalpm/util.c:505 #, c-format msgid "executing \"%s\"" -msgstr "" +msgstr "executando \"%s\"" #: lib/libalpm/util.c:508 #, c-format @@ -1489,3 +1493,4 @@ #, c-format msgid "depcmp: %s-%s %s %s => %s" msgstr "" + Index: pacman-lib/src/pacman/po/pt_BR.po diff -u pacman-lib/src/pacman/po/pt_BR.po:1.8 pacman-lib/src/pacman/po/pt_BR.po:1.9 --- pacman-lib/src/pacman/po/pt_BR.po:1.8 Sun Mar 4 12:16:52 2007 +++ pacman-lib/src/pacman/po/pt_BR.po Wed Mar 7 01:57:44 2007 @@ -2,24 +2,24 @@ # Brazilian Portuguese translations for Pacman package manager package. # Copyright (C) 2002-2007 Judd Vinet <jvinet(a)zeroflux.org> # This file is distributed under the same license as the Pacman package manager package. +# # Douglas Soares de Andrade <douglas(a)archlinux-br.org>, 2007. # Hugo Doria <hugodoria(a)archlinux-br.org>, 2007. # Lincoln de Sousa <lincoln(a)archlinux-br.org>, 2007. # Leandro Inácio <leandro(a)archlinux-br.org>, 2007. -# Douglas Soares de Andrade <dsandrade(a)gmail.com>, 2007. -# msgid "" msgstr "" "Project-Id-Version: pt_BR\n" "Report-Msgid-Bugs-To: pacman-dev(a)archlinux.org\n" "POT-Creation-Date: 2007-03-04 12:01-0500\n" -"PO-Revision-Date: 2007-02-15 08:55-0200\n" -"Last-Translator: Lincoln de Sousa <lincoln(a)archlinux-br.org>\n" -"Language-Team: Português do Brasil <pt(a)li.org>\n" +"PO-Revision-Date: 2007-03-07 00:17-0300\n" +"Last-Translator: Douglas Soares de Andrade <dsandrade(a)gmail.com>\n" +"Language-Team: Archlinux-br <contato(a)archlinux-br.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" +"X-Generator: KBabel 1.11.4\n" #: src/pacman/add.c:69 src/pacman/remove.c:79 src/pacman/sync.c:482 #: src/pacman/sync.c:531 @@ -63,14 +63,14 @@ msgstr ":: %s: conflita com %s" #: src/pacman/add.c:131 src/pacman/sync.c:709 -#, fuzzy, c-format +#, c-format msgid "%s exists in both '%s' and '%s'\n" -msgstr "%s%s existe em \"%s\" (pacote) e em \"%s\" (pacote)\n" +msgstr "%s existe em '%s' e em '%s'\n" #: src/pacman/add.c:137 src/pacman/sync.c:715 -#, fuzzy, c-format +#, c-format msgid "%s: %s exists in filesystem\n" -msgstr "%s: %s%s existe no sistema de arquivos\n" +msgstr "%s: %s existe no sistema de arquivos\n" #: src/pacman/add.c:143 src/pacman/sync.c:721 src/pacman/sync.c:727 msgid "" @@ -247,26 +247,26 @@ #: src/pacman/package.c:123 #, c-format msgid "Repository : %s\n" -msgstr "Repositório : %s\n" +msgstr "Repositório : %s\n" #: src/pacman/package.c:131 msgid "Replaces :" -msgstr "Substitui :" +msgstr "Substitui :" #: src/pacman/package.c:132 #, c-format msgid "Download Size : %6.2f K\n" -msgstr "Tamanho do Download : %6.2f K\n" +msgstr "Tamanho do Download : %6.2f K\n" #: src/pacman/package.c:133 #, c-format msgid "Installed Size : %6.2f K\n" -msgstr "Tamanho Instalado: %6.2f K\n" +msgstr "Tamanho Instalado : %6.2f K\n" #: src/pacman/package.c:141 #, c-format msgid "MD5 Sum : %s" -msgstr "Soma MD5 : %s" +msgstr "Soma MD5 : %s" #: src/pacman/package.c:144 #, c-format @@ -274,9 +274,9 @@ msgstr "Soma SHA1 : %s" #: src/pacman/package.c:155 -#, fuzzy, c-format +#, c-format msgid "Backup Files:\n" -msgstr "Arquivos de Backup :\n" +msgstr "Arquivos de Backup:\n" #: src/pacman/package.c:177 #, c-format @@ -299,9 +299,9 @@ msgstr "NÃO ENCONTRADO\t\t%s\n" #: src/pacman/package.c:203 -#, fuzzy, c-format +#, c-format msgid "(none)\n" -msgstr "Nenhum\n" +msgstr "(Nenhum)\n" #: src/pacman/package.c:243 #, c-format @@ -388,14 +388,12 @@ #: src/pacman/pacman.c:106 #, c-format -msgid "" -" -c, --cascade remove packages and all packages that depend on them\n" +msgid " -c, --cascade remove packages and all packages that depend on them\n" msgstr " -c, --cascade remove pacotes e suas dependências\n" #: src/pacman/pacman.c:108 #, c-format -msgid "" -" -k, --dbonly only remove database entry, do not remove files\n" +msgid " -k, --dbonly only remove database entry, do not remove files\n" msgstr "" " -k, --dbonly remove apenas a entrada na base de dados, mas não " "remove os arquivos\n" @@ -407,8 +405,7 @@ #: src/pacman/pacman.c:110 #, c-format -msgid "" -" -s, --recursive remove dependencies also (that won't break packages)\n" +msgid " -s, --recursive remove dependencies also (that won't break packages)\n" msgstr "" " -s, --recursive remove também as dependências (aquelas que não vão " "quebrar outros pacotes)\n" @@ -450,8 +447,7 @@ #: src/pacman/pacman.c:126 src/pacman/pacman.c:141 #, c-format msgid " -g, --groups view all members of a package group\n" -msgstr "" -" -g, --groups visualiza todos os membros de um grupos de pacotes\n" +msgstr " -g, --groups visualiza todos os membros de um grupos de pacotes\n" #: src/pacman/pacman.c:127 src/pacman/pacman.c:142 #, c-format @@ -498,8 +494,7 @@ #: src/pacman/pacman.c:133 #, c-format msgid " -u, --upgrades list all packages that can be upgraded\n" -msgstr "" -" -u, --upgrades lista todos os pacotes que podem ser atualizados\n" +msgstr " -u, --upgrades lista todos os pacotes que podem ser atualizados\n" #: src/pacman/pacman.c:135 #, c-format @@ -507,7 +502,7 @@ msgstr "uso: %s {-S --sync} [opções] [pacote]\n" #: src/pacman/pacman.c:137 -#, fuzzy, c-format +#, c-format msgid "" " -c, --clean remove old packages from cache directory (-cc for " "all)\n" @@ -525,13 +520,11 @@ msgid "" " -p, --print-uris print out URIs for given packages and their " "dependencies\n" -msgstr "" -" -p, --print-uris imprime as URIs dos pacotes e suas dependências\n" +msgstr " -p, --print-uris imprime as URIs dos pacotes e suas dependências\n" #: src/pacman/pacman.c:144 #, c-format -msgid "" -" -s, --search search remote repositories for matching strings\n" +msgid " -s, --search search remote repositories for matching strings\n" msgstr "" " -s, --search procura em repositórios remotos por textos " "coincidentes\n" @@ -554,8 +547,7 @@ #: src/pacman/pacman.c:147 #, c-format -msgid "" -" -y, --refresh download fresh package databases from the server\n" +msgid " -y, --refresh download fresh package databases from the server\n" msgstr " -y, --refresh atualizar a base de dados de pacotes\n" #: src/pacman/pacman.c:148 @@ -570,8 +562,7 @@ #: src/pacman/pacman.c:150 #, c-format msgid " --config <path> set an alternate configuration file\n" -msgstr "" -" --config <caminho> define um arquivo de configuração alternativo\n" +msgstr " --config <caminho> define um arquivo de configuração alternativo\n" #: src/pacman/pacman.c:151 #, c-format @@ -580,24 +571,21 @@ #: src/pacman/pacman.c:152 #, c-format -msgid "" -" --ask <number> pre-specify answers for questions (see manpage)\n" +msgid " --ask <number> pre-specify answers for questions (see manpage)\n" msgstr "" " --ask <número> pré-especificar respostas para as perguntas (veja a " "manpage)\n" #: src/pacman/pacman.c:153 #, c-format -msgid "" -" --noprogressbar do not show a progress bar when downloading files\n" +msgid " --noprogressbar do not show a progress bar when downloading files\n" msgstr "" " --noprogressbar não mostra a barra de progresso enquanto baixa os " "arquivos\n" #: src/pacman/pacman.c:154 #, c-format -msgid "" -" --noscriptlet do not execute the install scriptlet if there is any\n" +msgid " --noscriptlet do not execute the install scriptlet if there is any\n" msgstr "" " --noscriptlet não executar o scriptlet de instalação se o mesmo " "existir\n" @@ -610,8 +598,7 @@ #: src/pacman/pacman.c:156 #, c-format msgid " -r, --root <path> set an alternate installation root\n" -msgstr "" -" -r, --root <caminho> define um diretório de instalação alternativo\n" +msgstr " -r, --root <caminho> define um diretório de instalação alternativo\n" #: src/pacman/pacman.c:157 #, c-format @@ -628,14 +615,12 @@ #: src/pacman/pacman.c:171 #, c-format msgid " This program may be freely redistributed under\n" -msgstr "" -" Este programa pode ser distribuído livremente sob\n" +msgstr " Este programa pode ser distribuído livremente sob\n" #: src/pacman/pacman.c:172 #, c-format msgid " the terms of the GNU General Public License\n" -msgstr "" -" os termos da Licença GPL - General Public License\n" +msgstr " os termos da Licença GPL - General Public License\n" #: src/pacman/pacman.c:297 #, c-format @@ -663,7 +648,7 @@ #: src/pacman/pacman.c:433 msgid "warning: current locale is invalid; using default \"C\" locale" -msgstr "" +msgstr "aviso: o locale atual é inválido; usando o locale padrão \"C\"" #: src/pacman/pacman.c:453 #, c-format @@ -822,19 +807,19 @@ msgstr " %s está atualizado\n" #: src/pacman/sync.c:345 -#, fuzzy, c-format +#, c-format msgid "repository '%s' does not exist\n" -msgstr "repositório \"%s\" não foi encontrado.\n" +msgstr "repositório '%s' não existe\n" #: src/pacman/sync.c:361 -#, fuzzy, c-format +#, c-format msgid "package '%s' was not found in repository '%s'\n" -msgstr "pacote \"%s\" não encontrado.\n" +msgstr "pacote '%s' não foi encontrado no repositório '%s'\n" #: src/pacman/sync.c:381 -#, fuzzy, c-format +#, c-format msgid "package '%s' was not found\n" -msgstr "pacote \"%s\" não encontrado.\n" +msgstr "pacote '%s' não foi encontrado.\n" #: src/pacman/sync.c:418 #, c-format @@ -916,7 +901,6 @@ msgstr "é requerido por" #: src/pacman/sync.c:665 -#, fuzzy msgid " local database is up to date\n" msgstr "Base de dados de pacotes está atualizada.\n" @@ -1010,14 +994,12 @@ #: src/pacman/trans.c:172 #, c-format msgid ":: %s requires %s, but it is in IgnorePkg. Install anyway? [Y/n] " -msgstr "" -":: %s requer %s, mas ele está em IgnorePkg. Instalar assim mesmo? [S/n] " +msgstr ":: %s requer %s, mas ele está em IgnorePkg. Instalar assim mesmo? [S/n] " #: src/pacman/trans.c:177 -#, fuzzy, c-format +#, c-format msgid ":: %s is in IgnorePkg. Install anyway? [Y/n] " -msgstr "" -":: %s requer %s, mas ele está em IgnorePkg. Instalar assim mesmo? [S/n] " +msgstr "::O pacote %s está na lista de pacotes ignorados (IgnorePkg). Instalar assim mesmo? [S/n] " #: src/pacman/trans.c:190 #, c-format @@ -1037,8 +1019,7 @@ #: src/pacman/trans.c:234 #, c-format msgid ":: %s-%s: local version is newer. Upgrade anyway? [Y/n] " -msgstr "" -":: %s-%s: a versão local é mais recente. Deseja atualizar mesmo assim? [S/n] " +msgstr ":: %s-%s: a versão local é mais recente. Deseja atualizar mesmo assim? [S/n] " #: src/pacman/trans.c:252 #, c-format @@ -1100,17 +1081,3 @@ msgid "Total Installed Size: %.2f MB\n" msgstr "Tamanho total da instalação: %.2f MB\n" -#~ msgid "memory allocation failure\n" -#~ msgstr "falha de alocação de memória\n" - -#~ msgid "add target %s\n" -#~ msgstr "adicionar pacote %s\n" - -#~ msgid "could not add target (%s)\n" -#~ msgstr "não foi possível adicionar o pacote (%s)\n" - -#~ msgid "conflict: %s" -#~ msgstr "conflita: %s" - -#~ msgid "could not release transaction (%s)" -#~ msgstr "não foi possível liberar a transação (%s)"

1 0

[pacman-dev] Brazilian Translation update to libalpm
by Douglas Soares de Andrade 07 Mar '07

07 Mar '07

Hi guys, Follows the patch attached. Thanks -- Douglas Soares de Andrade Archlinux Brasil - http://archlinux-br.org Paradigma Internet - http://www.paradigma.com.br

1 0

[pacman-dev] CVS update of pacman-lib/contrib (Makefile.am README)
by Dan McGee 07 Mar '07

07 Mar '07

Date: Tuesday, March 6, 2007 @ 19:07:57 Author: dan Path: /home/cvs-pacman/pacman-lib/contrib Added: README (1.1) Modified: Makefile.am (1.3 -> 1.4) * Added a readme file to the contrib/ directory. -------------+ Makefile.am | 3 ++- README | 16 ++++++++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) Index: pacman-lib/contrib/Makefile.am diff -u pacman-lib/contrib/Makefile.am:1.3 pacman-lib/contrib/Makefile.am:1.4 --- pacman-lib/contrib/Makefile.am:1.3 Mon Feb 26 10:10:53 2007 +++ pacman-lib/contrib/Makefile.am Tue Mar 6 19:07:57 2007 @@ -3,5 +3,6 @@ pacsearch \ pacdiff \ re-pacman \ - zsh_completion + zsh_completion \ + README Index: pacman-lib/contrib/README diff -u /dev/null pacman-lib/contrib/README:1.1 --- /dev/null Tue Mar 6 19:07:57 2007 +++ pacman-lib/contrib/README Tue Mar 6 19:07:57 2007 @@ -0,0 +1,16 @@ +Here is a brief description of the files included in this directory: + +bash_completion - a bash completion script for pacman, install in +/etc/bash_completion.d/ for use (but rename to something descriptive!). + +zsh_completion - a zsh completion script, install (with a rename) to +/usr/share/zsh/site-functions/. + +pacsearch - a colorized search combining both -Ss and -Qs output. Installed +packages are easily identified with a *** and local-only packages are also +listed. + +pacdiff - a simple pacnew/pacorig/pacsave updater for /etc/. + +re-pacman - regenerate a pacman package based on installed files and the pacman +database entries. Useful for reuse, or possible config file extension.

1 0

[pacman-dev] CVS update of pacman-lib (contrib/pacsearch src/pacman/query.c)
by Dan McGee 06 Mar '07

06 Mar '07

Date: Tuesday, March 6, 2007 @ 17:06:28 Author: dan Path: /home/cvs-pacman/pacman-lib Modified: contrib/pacsearch (1.1 -> 1.2) src/pacman/query.c (1.27 -> 1.28) * -Qs was returning an error if no package found, which is not the same behavior as -Ss. --------------------+ contrib/pacsearch | 20 +++++++++++++++++++- src/pacman/query.c | 2 +- 2 files changed, 20 insertions(+), 2 deletions(-) Index: pacman-lib/contrib/pacsearch diff -u pacman-lib/contrib/pacsearch:1.1 pacman-lib/contrib/pacsearch:1.2 --- pacman-lib/contrib/pacsearch:1.1 Fri Feb 16 23:39:59 2007 +++ pacman-lib/contrib/pacsearch Tue Mar 6 17:06:28 2007 @@ -20,6 +20,7 @@ #TODO: colors flag on commandline readonly progname="pacsearch" +readonly version="1.0" readonly CLR1='\\\e[0;34m' readonly CLR2='\\\e[0;32m' @@ -31,21 +32,36 @@ readonly INST='\\\e[1;31m' readonly BASE='\\\e[0m' -if [ -z "$1" ]; then +if [ "$1" = "--help" -o "$1" = "-h" ]; then echo "Usage: $progname <pattern>" echo "Ex: $progname ^gnome" exit 0 fi +if [ "$1" = "--version" -o "$1" = "-v" ]; then + echo "$progname version $version" + echo "Copyright (C) 2006-2007 Dan McGee" + exit 0 +fi + +if [ -z "$1" -o "${1:0:1}" = "-" ]; then + echo "Usage: $progname <pattern>" + echo "Ex: $progname ^gnome" + exit 1 +fi + +echo "debug 1" # Make two temp files and send output of commands to these files querydump=$(mktemp) pacman -Qs $1 > $querydump syncdump=$(mktemp) pacman -Ss $1 > $syncdump +echo "debug 2" # Strip descriptions and 'local/' from -Qs query instpkg=$(mktemp) egrep '^[^ ]' $querydump | sed -e 's@^local/@@' > $instpkg +echo "debug 3" # Add pkgs not in sync db, mark pkgs that are installed cat $instpkg | while read -r pkg; do @@ -57,6 +73,7 @@ sed -i "s@^$.\+/$pkg$@\***\1@" $syncdump done +echo "debug 4" # Print colorized package list and descriptions to screen echo -e "$(sed -r \ -e "s@current/.*@$CLR1&$BASE@" \ @@ -71,6 +88,7 @@ < $syncdump )" echo -en "\e[0m" +echo "debug 5" rm $querydump rm $syncdump rm $instpkg Index: pacman-lib/src/pacman/query.c diff -u pacman-lib/src/pacman/query.c:1.27 pacman-lib/src/pacman/query.c:1.28 --- pacman-lib/src/pacman/query.c:1.27 Mon Mar 5 17:13:35 2007 +++ pacman-lib/src/pacman/query.c Tue Mar 6 17:06:28 2007 @@ -92,7 +92,7 @@ if(config->op_q_search) { alpm_list_t *ret = alpm_db_search(db_local, targets); if(ret == NULL) { - return(1); + return(0); } for(i = ret; i; i = alpm_list_next(i)) { char *group = NULL;

2 1

[pacman-dev] CVS update of pacman-lib/src/pacman/po (it.po)
by Dan McGee 06 Mar '07

06 Mar '07

Date: Tuesday, March 6, 2007 @ 17:12:51 Author: dan Path: /home/cvs-pacman/pacman-lib/src/pacman/po Modified: it.po (1.12 -> 1.13) * Updated Italian translation Giovanni Scafora <linuxmania(a)gmail.com> -------+ it.po | 362 ++++++++++++++++++++++++++++++++-------------------------------- 1 file changed, 181 insertions(+), 181 deletions(-) Index: pacman-lib/src/pacman/po/it.po diff -u pacman-lib/src/pacman/po/it.po:1.12 pacman-lib/src/pacman/po/it.po:1.13 --- pacman-lib/src/pacman/po/it.po:1.12 Sun Mar 4 12:16:52 2007 +++ pacman-lib/src/pacman/po/it.po Tue Mar 6 17:12:51 2007 @@ -9,8 +9,8 @@ msgstr "" "Project-Id-Version: Pacman package manager 3.0.0\n" "Report-Msgid-Bugs-To: pacman-dev(a)archlinux.org\n" -"POT-Creation-Date: 2007-03-04 12:01-0500\n" -"PO-Revision-Date: 2007-02-23 12:00+0100\n" +"POT-Creation-Date: 2007-03-06 22:49+0100\n" +"PO-Revision-Date: 2007-03-06 23:00+0100\n" "Last-Translator: Giovanni Scafora <linuxmania(a)gmail.com>\n" "Language-Team: Arch Linux Italian Team <linuxmania(a)gmail.com>\n" "MIME-Version: 1.0\n" @@ -18,7 +18,7 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: src/pacman/add.c:69 src/pacman/remove.c:79 src/pacman/sync.c:482 +#: src/pacman/add.c:72 src/pacman/remove.c:82 src/pacman/sync.c:482 #: src/pacman/sync.c:531 #, c-format msgid "" @@ -28,48 +28,48 @@ " Se il gestore dei pacchetti non è già in funzione,\n" " è possibile rimuovere %s%s\n" -#: src/pacman/add.c:76 +#: src/pacman/add.c:79 msgid "loading package data... " msgstr "caricamento dei dati in corso... " -#: src/pacman/add.c:80 +#: src/pacman/add.c:83 #, c-format msgid "failed to add target '%s' (%s)" msgstr "impossibile aggiungere il pacchetto '%s' (%s)" -#: src/pacman/add.c:85 src/pacman/sync.c:196 src/pacman/trans.c:71 -#: src/pacman/trans.c:78 src/pacman/trans.c:82 src/pacman/trans.c:92 -#: src/pacman/trans.c:106 src/pacman/trans.c:120 src/pacman/trans.c:132 -#: src/pacman/trans.c:143 +#: src/pacman/add.c:88 src/pacman/sync.c:196 src/pacman/trans.c:73 +#: src/pacman/trans.c:80 src/pacman/trans.c:84 src/pacman/trans.c:94 +#: src/pacman/trans.c:108 src/pacman/trans.c:122 src/pacman/trans.c:134 +#: src/pacman/trans.c:145 msgid "done.\n" msgstr "fatto.\n" -#: src/pacman/add.c:92 src/pacman/remove.c:98 src/pacman/sync.c:616 +#: src/pacman/add.c:95 src/pacman/remove.c:101 src/pacman/sync.c:616 #, c-format msgid "failed to prepare transaction (%s)\n" msgstr "preparazione non riuscita (%s)\n" -#: src/pacman/add.c:101 +#: src/pacman/add.c:104 #, c-format msgid ":: %s: requires %s" msgstr ":: %s: richiede %s" -#: src/pacman/add.c:122 src/pacman/sync.c:645 +#: src/pacman/add.c:125 src/pacman/sync.c:645 #, c-format msgid ":: %s: conflicts with %s" msgstr ":: %s: va in conflitto con %s" -#: src/pacman/add.c:131 src/pacman/sync.c:709 +#: src/pacman/add.c:134 src/pacman/sync.c:709 #, c-format msgid "%s exists in both '%s' and '%s'\n" msgstr "%s è già presente in '%s' e in '%s'\n" -#: src/pacman/add.c:137 src/pacman/sync.c:715 +#: src/pacman/add.c:140 src/pacman/sync.c:715 #, c-format msgid "%s: %s exists in filesystem\n" msgstr "%s: %s è già presente nel filesystem\n" -#: src/pacman/add.c:143 src/pacman/sync.c:721 src/pacman/sync.c:727 +#: src/pacman/add.c:146 src/pacman/sync.c:721 src/pacman/sync.c:727 msgid "" "\n" "errors occurred, no packages were upgraded.\n" @@ -77,275 +77,275 @@ "\n" "si sono verificati degli errori, nessun pacchetto è stato aggiornato.\n" -#: src/pacman/add.c:153 src/pacman/sync.c:652 +#: src/pacman/add.c:156 src/pacman/sync.c:652 #, c-format msgid ":: %.1f MB required, have %.1f MB" msgstr ":: %.1f MB richiesti, spazio a disposizione %.1f MB" -#: src/pacman/add.c:166 src/pacman/remove.c:138 src/pacman/sync.c:702 +#: src/pacman/add.c:169 src/pacman/remove.c:141 src/pacman/sync.c:702 #, c-format msgid "failed to commit transaction (%s)\n" msgstr "impossibile eseguire l'operazione richiesta (%s)\n" -#: src/pacman/add.c:176 src/pacman/remove.c:148 src/pacman/sync.c:524 +#: src/pacman/add.c:179 src/pacman/remove.c:151 src/pacman/sync.c:524 #: src/pacman/sync.c:743 #, c-format msgid "failed to release transaction (%s)\n" msgstr "impossibile annullare l'operazione richiesta (%s)\n" -#: src/pacman/deptest.c:64 +#: src/pacman/deptest.c:66 #, c-format msgid "requires: %s" msgstr "richiede: %s" -#: src/pacman/log.c:61 +#: src/pacman/log.c:63 #, c-format msgid "debug" msgstr "debug" -#: src/pacman/log.c:64 +#: src/pacman/log.c:66 #, c-format msgid "error" msgstr "errore" -#: src/pacman/log.c:67 +#: src/pacman/log.c:69 #, c-format msgid "warning" msgstr "attenzione" -#: src/pacman/log.c:73 +#: src/pacman/log.c:75 #, c-format msgid "function" msgstr "funzione" -#: src/pacman/log.c:205 +#: src/pacman/log.c:207 msgid "Y" msgstr "Y" -#: src/pacman/log.c:205 +#: src/pacman/log.c:207 msgid "YES" msgstr "SI" -#: src/pacman/log.h:28 +#: src/pacman/log.h:30 msgid "error: " msgstr "errore: " -#: src/pacman/log.h:32 +#: src/pacman/log.h:34 msgid "warning: " msgstr "attenzione: " -#: src/pacman/package.c:57 +#: src/pacman/package.c:60 msgid "Explicitly installed" msgstr "Installato esplicitamente" -#: src/pacman/package.c:60 +#: src/pacman/package.c:63 msgid "Installed as a dependency for another package" msgstr "Installato come dipendenza di un altro pacchetto" -#: src/pacman/package.c:63 src/pacman/package.c:87 +#: src/pacman/package.c:66 src/pacman/package.c:90 msgid "Unknown" msgstr "Sconosciuto" -#: src/pacman/package.c:67 src/pacman/package.c:118 +#: src/pacman/package.c:70 src/pacman/package.c:121 msgid "Description : " msgstr "Descrizione : " -#: src/pacman/package.c:70 src/pacman/package.c:124 +#: src/pacman/package.c:73 src/pacman/package.c:127 #, c-format msgid "Name : %s\n" msgstr "Nome : %s\n" -#: src/pacman/package.c:71 src/pacman/package.c:125 +#: src/pacman/package.c:74 src/pacman/package.c:128 #, c-format msgid "Version : %s\n" msgstr "Versione : %s\n" -#: src/pacman/package.c:72 +#: src/pacman/package.c:75 #, c-format msgid "URL : %s\n" msgstr "URL : %s\n" -#: src/pacman/package.c:73 +#: src/pacman/package.c:76 msgid "License :" msgstr "Licenza :" -#: src/pacman/package.c:74 src/pacman/package.c:126 +#: src/pacman/package.c:77 src/pacman/package.c:129 msgid "Groups :" msgstr "Gruppi :" -#: src/pacman/package.c:75 src/pacman/package.c:127 +#: src/pacman/package.c:78 src/pacman/package.c:130 msgid "Provides :" msgstr "Fornisce :" -#: src/pacman/package.c:76 src/pacman/package.c:128 +#: src/pacman/package.c:79 src/pacman/package.c:131 msgid "Depends On :" msgstr "Dipende da :" -#: src/pacman/package.c:77 src/pacman/package.c:129 +#: src/pacman/package.c:80 src/pacman/package.c:132 msgid "Removes :" msgstr "Rimuove :" -#: src/pacman/package.c:80 +#: src/pacman/package.c:83 msgid "Required By :" msgstr "Richiesto da :" -#: src/pacman/package.c:82 src/pacman/package.c:130 +#: src/pacman/package.c:85 src/pacman/package.c:133 msgid "Conflicts With :" msgstr "Conflitto con :" -#: src/pacman/package.c:83 +#: src/pacman/package.c:86 #, c-format msgid "Installed Size : %ld K\n" msgstr "Dimensione : %ld K\n" -#: src/pacman/package.c:84 +#: src/pacman/package.c:87 #, c-format msgid "Packager : %s\n" msgstr "Autore : %s\n" -#: src/pacman/package.c:85 +#: src/pacman/package.c:88 #, c-format msgid "Architecture : %s\n" msgstr "Architettura : %s\n" -#: src/pacman/package.c:86 +#: src/pacman/package.c:89 #, c-format msgid "Build Date : %s %s\n" msgstr "Creato in data : %s %s\n" -#: src/pacman/package.c:87 +#: src/pacman/package.c:90 #, c-format msgid "Build Type : %s\n" msgstr "Tipo : %s\n" -#: src/pacman/package.c:89 +#: src/pacman/package.c:92 #, c-format msgid "Install Date : %s %s\n" msgstr "Installato il : %s %s\n" -#: src/pacman/package.c:90 +#: src/pacman/package.c:93 #, c-format msgid "Install Reason : %s\n" msgstr "Motivo : %s\n" -#: src/pacman/package.c:92 +#: src/pacman/package.c:95 #, c-format msgid "Install Script : %s\n" msgstr "Script install : %s\n" -#: src/pacman/package.c:93 +#: src/pacman/package.c:96 msgid "Yes" msgstr "Si" -#: src/pacman/package.c:93 +#: src/pacman/package.c:96 msgid "No" msgstr "No" -#: src/pacman/package.c:123 +#: src/pacman/package.c:126 #, c-format msgid "Repository : %s\n" msgstr "Repository : %s\n" -#: src/pacman/package.c:131 +#: src/pacman/package.c:134 msgid "Replaces :" msgstr "Sostituisce :" -#: src/pacman/package.c:132 +#: src/pacman/package.c:135 #, c-format msgid "Download Size : %6.2f K\n" msgstr "Dimensione pkg : %6.2f K\n" -#: src/pacman/package.c:133 +#: src/pacman/package.c:136 #, c-format msgid "Installed Size : %6.2f K\n" msgstr "Kb richiesti : %6.2f K\n" -#: src/pacman/package.c:141 +#: src/pacman/package.c:144 #, c-format msgid "MD5 Sum : %s" msgstr "Somma MD5 : %s" -#: src/pacman/package.c:144 +#: src/pacman/package.c:147 #, c-format msgid "SHA1 Sum : %s" msgstr "Somma SHA1 : %s" -#: src/pacman/package.c:155 +#: src/pacman/package.c:158 #, c-format msgid "Backup Files:\n" msgstr "File di backup:\n" -#: src/pacman/package.c:177 +#: src/pacman/package.c:180 #, c-format msgid "error calculating checksums for %s\n" msgstr "si è verificato un errore durante il calcolo del checksum di %s\n" -#: src/pacman/package.c:190 +#: src/pacman/package.c:193 #, c-format msgid "MODIFIED\t%s\n" msgstr "MODIFICATO\t%s\n" -#: src/pacman/package.c:192 +#: src/pacman/package.c:195 #, c-format msgid "Not Modified\t%s\n" msgstr "Non modificato\t%s\n" -#: src/pacman/package.c:197 +#: src/pacman/package.c:200 #, c-format msgid "MISSING\t\t%s\n" msgstr "MANCANTE\t\t%s\n" -#: src/pacman/package.c:203 +#: src/pacman/package.c:206 #, c-format msgid "(none)\n" msgstr "(nessuno)\n" -#: src/pacman/package.c:243 +#: src/pacman/package.c:246 #, c-format msgid "No changelog available for '%s'.\n" msgstr "Nessun changelog disponibile per '%s'.\n" -#: src/pacman/pacman.c:88 +#: src/pacman/pacman.c:90 #, c-format msgid "usage: %s {-h --help}\n" msgstr "uso: %s {-h --help}\n" -#: src/pacman/pacman.c:89 +#: src/pacman/pacman.c:91 #, c-format msgid " %s {-V --version}\n" msgstr " %s {-V --version}\n" -#: src/pacman/pacman.c:90 +#: src/pacman/pacman.c:92 #, c-format msgid " %s {-A --add} [options] <file>\n" msgstr " %s {-A --add} [opzioni] <file>\n" -#: src/pacman/pacman.c:91 +#: src/pacman/pacman.c:93 #, c-format msgid " %s {-F --freshen} [options] <file>\n" msgstr " %s {-F --freshen} [opzioni] <file>\n" -#: src/pacman/pacman.c:92 +#: src/pacman/pacman.c:94 #, c-format msgid " %s {-Q --query} [options] [package]\n" msgstr " %s {-Q --query} [opzioni] [pacchetto]\n" -#: src/pacman/pacman.c:93 +#: src/pacman/pacman.c:95 #, c-format msgid " %s {-R --remove} [options] <package>\n" msgstr " %s {-R --remove} [opzioni] <pacchetto>\n" -#: src/pacman/pacman.c:94 +#: src/pacman/pacman.c:96 #, c-format msgid " %s {-S --sync} [options] [package]\n" msgstr " %s {-S --sync} [opzioni] [pacchetto]\n" -#: src/pacman/pacman.c:95 +#: src/pacman/pacman.c:97 #, c-format msgid " %s {-U --upgrade} [options] <file>\n" msgstr " %s {-U --upgrade} [opzioni] <file>\n" -#: src/pacman/pacman.c:96 +#: src/pacman/pacman.c:98 #, c-format msgid "" "\n" @@ -354,43 +354,43 @@ "\n" "usare '%s --help' con le altre opzioni per ottenere maggiori informazioni\n" -#: src/pacman/pacman.c:99 +#: src/pacman/pacman.c:101 #, c-format msgid "usage: %s {-A --add} [options] <file>\n" msgstr "uso: %s {-A --add} [opzioni] <file>\n" -#: src/pacman/pacman.c:100 src/pacman/pacman.c:105 src/pacman/pacman.c:117 -#: src/pacman/pacman.c:122 src/pacman/pacman.c:136 +#: src/pacman/pacman.c:102 src/pacman/pacman.c:107 src/pacman/pacman.c:119 +#: src/pacman/pacman.c:124 src/pacman/pacman.c:138 #, c-format msgid "options:\n" msgstr "opzioni:\n" -#: src/pacman/pacman.c:101 src/pacman/pacman.c:107 src/pacman/pacman.c:118 -#: src/pacman/pacman.c:138 +#: src/pacman/pacman.c:103 src/pacman/pacman.c:109 src/pacman/pacman.c:120 +#: src/pacman/pacman.c:140 #, c-format msgid " -d, --nodeps skip dependency checks\n" msgstr " -d, --nodeps ignora le dipendenze richieste\n" -#: src/pacman/pacman.c:102 src/pacman/pacman.c:119 src/pacman/pacman.c:140 +#: src/pacman/pacman.c:104 src/pacman/pacman.c:121 src/pacman/pacman.c:142 #, c-format msgid " -f, --force force install, overwrite conflicting files\n" msgstr "" " -f, --force forza l'installazione e sovrascrive i file in " "conflitto\n" -#: src/pacman/pacman.c:104 +#: src/pacman/pacman.c:106 #, c-format msgid "usage: %s {-R --remove} [options] <package>\n" msgstr "uso: %s {-R --remove} [opzioni] <pacchetto>\n" -#: src/pacman/pacman.c:106 +#: src/pacman/pacman.c:108 #, c-format msgid "" " -c, --cascade remove packages and all packages that depend on them\n" msgstr "" " -c, --cascade rimuove i pacchetti e quelli che dipendono da questi\n" -#: src/pacman/pacman.c:108 +#: src/pacman/pacman.c:110 #, c-format msgid "" " -k, --dbonly only remove database entry, do not remove files\n" @@ -398,38 +398,38 @@ " -k, --dbonly rimuove solo la voce nel database, non rimuove i " "file\n" -#: src/pacman/pacman.c:109 +#: src/pacman/pacman.c:111 #, c-format msgid " -n, --nosave remove configuration files as well\n" msgstr " -n, --nosave rimuove anche i file di configurazione\n" -#: src/pacman/pacman.c:110 +#: src/pacman/pacman.c:112 #, c-format msgid "" " -s, --recursive remove dependencies also (that won't break packages)\n" msgstr " -s, --recursive rimuove anche le dipendenze (non richieste)\n" -#: src/pacman/pacman.c:113 +#: src/pacman/pacman.c:115 #, c-format msgid "usage: %s {-F --freshen} [options] <file>\n" msgstr "uso: %s {-F --freshen} [opzioni] <file>\n" -#: src/pacman/pacman.c:115 +#: src/pacman/pacman.c:117 #, c-format msgid "usage: %s {-U --upgrade} [options] <file>\n" msgstr "uso: %s {-U --upgrade} [opzioni] <file>\n" -#: src/pacman/pacman.c:121 +#: src/pacman/pacman.c:123 #, c-format msgid "usage: %s {-Q --query} [options] [package]\n" msgstr "uso: %s {-Q --query} [opzioni] [pacchetto]\n" -#: src/pacman/pacman.c:123 +#: src/pacman/pacman.c:125 #, c-format msgid " -c, --changelog view the changelog of a package\n" msgstr " -c, --changelog visualizza il changelog di un pacchetto\n" -#: src/pacman/pacman.c:124 +#: src/pacman/pacman.c:126 #, c-format msgid "" " -e, --orphans list all packages installed as dependencies but no " @@ -438,28 +438,28 @@ " -e, --orphans elenca tutti i pacchetti installati come dipendenze e " "non\n" -#: src/pacman/pacman.c:125 +#: src/pacman/pacman.c:127 #, c-format msgid " required by any package\n" msgstr " più richiesti da nessun pacchetto\n" -#: src/pacman/pacman.c:126 src/pacman/pacman.c:141 +#: src/pacman/pacman.c:128 src/pacman/pacman.c:143 #, c-format msgid " -g, --groups view all members of a package group\n" msgstr "" " -g, --groups visualizza tutti i membri di un gruppo di pacchetti\n" -#: src/pacman/pacman.c:127 src/pacman/pacman.c:142 +#: src/pacman/pacman.c:129 src/pacman/pacman.c:144 #, c-format msgid " -i, --info view package information\n" msgstr " -i, --info visualizza le informazioni sul pacchetto\n" -#: src/pacman/pacman.c:128 +#: src/pacman/pacman.c:130 #, c-format msgid " -l, --list list the contents of the queried package\n" msgstr " -l, --list elenca i file contenuti nel pacchetto\n" -#: src/pacman/pacman.c:129 +#: src/pacman/pacman.c:131 #, c-format msgid "" " -m, --foreign list all packages that were not found in the sync db" @@ -467,13 +467,13 @@ msgstr "" " -m, --foreign elenca tutti i pacchetti non trovati nei database\n" -#: src/pacman/pacman.c:130 +#: src/pacman/pacman.c:132 #, c-format msgid " -o, --owns <file> query the package that owns <file>\n" msgstr "" " -o, --owns <file> visualizza il pacchetto che contiene il <file>\n" -#: src/pacman/pacman.c:131 +#: src/pacman/pacman.c:133 #, c-format msgid "" " -p, --file query the package file [package] instead of the " @@ -481,7 +481,7 @@ msgstr "" " -p, --file interroga il file del pacchetto invece del database\n" -#: src/pacman/pacman.c:132 +#: src/pacman/pacman.c:134 #, c-format msgid "" " -s, --search search locally-installed packages for matching " @@ -490,19 +490,19 @@ " -s, --search cerca nei pacchetti installati le corrispondenti " "stringhe\n" -#: src/pacman/pacman.c:133 +#: src/pacman/pacman.c:135 #, c-format msgid " -u, --upgrades list all packages that can be upgraded\n" msgstr "" " -u, --upgrades elenca tutti i pacchetti che possono essere " "aggiornati\n" -#: src/pacman/pacman.c:135 +#: src/pacman/pacman.c:137 #, c-format msgid "usage: %s {-S --sync} [options] [package]\n" msgstr "uso: %s {-S --sync} [opzioni] [pacchetto]\n" -#: src/pacman/pacman.c:137 +#: src/pacman/pacman.c:139 #, c-format msgid "" " -c, --clean remove old packages from cache directory (-cc for " @@ -512,12 +512,12 @@ "per\n" " rimuoverli tutti)\n" -#: src/pacman/pacman.c:139 +#: src/pacman/pacman.c:141 #, c-format msgid " -e, --dependsonly install dependencies only\n" msgstr " -e, --dependsonly installa solo le dipendenze\n" -#: src/pacman/pacman.c:143 +#: src/pacman/pacman.c:145 #, c-format msgid "" " -p, --print-uris print out URIs for given packages and their " @@ -525,7 +525,7 @@ msgstr "" " -p, --print-uris stampa gli URI dei pacchetti e le loro dipendenze\n" -#: src/pacman/pacman.c:144 +#: src/pacman/pacman.c:146 #, c-format msgid "" " -s, --search search remote repositories for matching strings\n" @@ -533,13 +533,13 @@ " -s, --search cerca le stringhe corrispondenti nei repository " "remoti\n" -#: src/pacman/pacman.c:145 +#: src/pacman/pacman.c:147 #, c-format msgid " -u, --sysupgrade upgrade all packages that are out of date\n" msgstr "" " -u, --sysupgrade aggiorna tutti i pacchetti installati nel sistema\n" -#: src/pacman/pacman.c:146 +#: src/pacman/pacman.c:148 #, c-format msgid "" " -w, --downloadonly download packages but do not install/upgrade " @@ -547,7 +547,7 @@ msgstr "" " -w, --downloadonly scarica i pacchetti senza installarli/aggiornarli\n" -#: src/pacman/pacman.c:147 +#: src/pacman/pacman.c:149 #, c-format msgid "" " -y, --refresh download fresh package databases from the server\n" @@ -555,209 +555,209 @@ " -y, --refresh scarica dal server i database aggiornati dei " "pacchetti\n" -#: src/pacman/pacman.c:148 +#: src/pacman/pacman.c:150 #, c-format msgid "" " --ignore <pkg> ignore a package upgrade (can be used more than " "once)\n" msgstr " --ignore <pkg> ignora l'aggiornamento di un pacchetto\n" -#: src/pacman/pacman.c:150 +#: src/pacman/pacman.c:152 #, c-format msgid " --config <path> set an alternate configuration file\n" msgstr " --config <path> imposta un file di configurazione alternativo\n" -#: src/pacman/pacman.c:151 +#: src/pacman/pacman.c:153 #, c-format msgid " --noconfirm do not ask for anything confirmation\n" msgstr " --noconfirm non chiede alcuna conferma\n" -#: src/pacman/pacman.c:152 +#: src/pacman/pacman.c:154 #, c-format msgid "" " --ask <number> pre-specify answers for questions (see manpage)\n" msgstr " --ask <numero> pre-specifica delle risposte alle domande\n" -#: src/pacman/pacman.c:153 +#: src/pacman/pacman.c:155 #, c-format msgid "" " --noprogressbar do not show a progress bar when downloading files\n" msgstr " --noprogressbar non visualizza la barra di progresso\n" -#: src/pacman/pacman.c:154 +#: src/pacman/pacman.c:156 #, c-format msgid "" " --noscriptlet do not execute the install scriptlet if there is any\n" msgstr " --noscriptlet non esegue lo script install\n" -#: src/pacman/pacman.c:155 +#: src/pacman/pacman.c:157 #, c-format msgid " -v, --verbose be verbose\n" msgstr " -v, --verbose mostra maggiori informazioni\n" -#: src/pacman/pacman.c:156 +#: src/pacman/pacman.c:158 #, c-format msgid " -r, --root <path> set an alternate installation root\n" msgstr "" " -r, --root <path> imposta una root alternativa per l'installazione\n" -#: src/pacman/pacman.c:157 +#: src/pacman/pacman.c:159 #, c-format msgid " -b, --dbpath <path> set an alternate database location\n" msgstr "" " -b, --dbpath <path> imposta una posizione alternativa per il database\n" -#: src/pacman/pacman.c:158 +#: src/pacman/pacman.c:160 #, c-format msgid " --cachedir <dir> set an alternate package cache location\n" msgstr "" " --cachedir <dir> imposta una posizione alternativa per la cache\n" -#: src/pacman/pacman.c:171 +#: src/pacman/pacman.c:173 #, c-format msgid " This program may be freely redistributed under\n" msgstr "" " This program may be freely redistributed under\n" -#: src/pacman/pacman.c:172 +#: src/pacman/pacman.c:174 #, c-format msgid " the terms of the GNU General Public License\n" msgstr " the terms of the GNU General Public License\n" -#: src/pacman/pacman.c:297 +#: src/pacman/pacman.c:299 #, c-format msgid "'%s' is not a valid debug level" msgstr "'%s' livello di debug non valido" -#: src/pacman/pacman.c:312 +#: src/pacman/pacman.c:314 #, c-format msgid "'%s' is not a valid cache directory\n" msgstr "'%s' non è una directory di cache valida\n" -#: src/pacman/pacman.c:330 +#: src/pacman/pacman.c:332 #, c-format msgid "'%s' is not a valid db path\n" msgstr "'%s' non è un path del database valido\n" -#: src/pacman/pacman.c:360 +#: src/pacman/pacman.c:362 #, c-format msgid "'%s' is not a valid root path\n" msgstr "'%s' path di root non valido\n" -#: src/pacman/pacman.c:387 +#: src/pacman/pacman.c:389 msgid "only one operation may be used at a time\n" msgstr "è consentito eseguire solo un'operazione per volta\n" -#: src/pacman/pacman.c:433 +#: src/pacman/pacman.c:435 msgid "warning: current locale is invalid; using default \"C\" locale" msgstr "attenzione: locale non valido, verrà utilizzato il locale \"C\"" -#: src/pacman/pacman.c:453 +#: src/pacman/pacman.c:455 #, c-format msgid "failed to initilize alpm library (%s)\n" msgstr "impossibile inizializzare la libreria alpm (%s)\n" -#: src/pacman/pacman.c:486 +#: src/pacman/pacman.c:488 msgid "you cannot perform this operation unless you are root.\n" msgstr "operazione possibile solo da root.\n" -#: src/pacman/pacman.c:502 +#: src/pacman/pacman.c:504 #, c-format msgid "failed to parse config (%s)\n" msgstr "impossibile analizzare la configurazione (%s)\n" -#: src/pacman/pacman.c:512 src/pacman/remove.c:125 src/pacman/util.c:323 +#: src/pacman/pacman.c:514 src/pacman/remove.c:128 src/pacman/util.c:324 msgid "Targets:" msgstr "Pacchetti:" -#: src/pacman/pacman.c:518 +#: src/pacman/pacman.c:520 #, c-format msgid "could not register 'local' database (%s)\n" msgstr "impossibile registrare il database 'locale' (%s)\n" -#: src/pacman/pacman.c:525 +#: src/pacman/pacman.c:527 msgid "no targets specified (use -h for help)\n" msgstr "nessun pacchetto specificato (usare -h per un aiuto)\n" -#: src/pacman/pacman.c:538 +#: src/pacman/pacman.c:540 msgid "no operation specified (use -h for help)\n" msgstr "nessuna operazione specificata (usare -h per un aiuto)\n" -#: src/pacman/query.c:53 +#: src/pacman/query.c:56 msgid "no file was specified for --owns\n" msgstr "nessun file specificato per --owns\n" -#: src/pacman/query.c:71 +#: src/pacman/query.c:74 #, c-format msgid "%s is owned by %s %s\n" msgstr "%s è contenuto in %s %s\n" -#: src/pacman/query.c:78 +#: src/pacman/query.c:81 #, c-format msgid "No package owns %s\n" msgstr "Nessun pacchetto contiene %s\n" -#: src/pacman/query.c:119 src/pacman/sync.c:453 +#: src/pacman/query.c:122 src/pacman/sync.c:453 msgid "no usable package repositories configured.\n" msgstr "nessun repository configurato.\n" -#: src/pacman/query.c:125 +#: src/pacman/query.c:128 msgid "Checking for package upgrades..." msgstr "Controllo dei pacchetti da aggiornare in corso..." -#: src/pacman/query.c:132 +#: src/pacman/query.c:135 msgid "no upgrades found" msgstr "nessun aggiornamento trovato" -#: src/pacman/query.c:170 +#: src/pacman/query.c:173 #, c-format msgid "group \"%s\" was not found\n" msgstr "gruppo \"%s\" non trovato\n" -#: src/pacman/query.c:181 +#: src/pacman/query.c:184 msgid "no package file was specified for --file\n" msgstr "nessun file del pacchetto specificato per --file\n" -#: src/pacman/query.c:185 +#: src/pacman/query.c:188 #, c-format msgid "failed to load package '%s' (%s)\n" msgstr "impossibile caricare il pacchetto '%s' (%s)\n" -#: src/pacman/query.c:223 src/pacman/query.c:255 +#: src/pacman/query.c:226 src/pacman/query.c:258 #, c-format msgid "package \"%s\" not found\n" msgstr "pacchetto \"%s\" non trovato\n" -#: src/pacman/remove.c:58 src/pacman/sync.c:568 +#: src/pacman/remove.c:61 src/pacman/sync.c:568 #, c-format msgid ":: group %s:\n" msgstr ":: gruppo %s:\n" -#: src/pacman/remove.c:60 +#: src/pacman/remove.c:63 msgid " Remove whole content? [Y/n] " msgstr " Rimuovere tutto il contenuto? [Y/n] " -#: src/pacman/remove.c:64 +#: src/pacman/remove.c:67 #, c-format msgid ":: Remove %s from group %s? [Y/n] " msgstr ":: Rimuovere %s dal gruppo %s? [Y/n] " -#: src/pacman/remove.c:77 src/pacman/sync.c:480 src/pacman/sync.c:529 +#: src/pacman/remove.c:80 src/pacman/sync.c:480 src/pacman/sync.c:529 #, c-format msgid "failed to init transaction (%s)\n" msgstr "inizializzazione non riuscita (%s)\n" -#: src/pacman/remove.c:89 +#: src/pacman/remove.c:92 #, c-format msgid "failed to add target '%s' (%s)\n" msgstr "impossibile aggiungere il pacchetto '%s' (%s)\n" -#: src/pacman/remove.c:103 +#: src/pacman/remove.c:106 #, c-format msgid ":: %s is required by %s\n" msgstr ":: %s è richiesto da %s\n" -#: src/pacman/remove.c:128 +#: src/pacman/remove.c:131 msgid "" "\n" "Do you want to remove these packages? [Y/n] " @@ -928,137 +928,137 @@ msgid "Proceed with installation? [Y/n] " msgstr "Procedere con l'installazione? [Y/n] " -#: src/pacman/trans.c:53 +#: src/pacman/trans.c:55 msgid "checking dependencies... " msgstr "controllo delle dipendenze in corso... " -#: src/pacman/trans.c:57 +#: src/pacman/trans.c:59 msgid "checking for file conflicts... " msgstr "controllo dei conflitti in corso... " -#: src/pacman/trans.c:61 +#: src/pacman/trans.c:63 msgid "cleaning up... " msgstr "pulizia in corso... " -#: src/pacman/trans.c:64 +#: src/pacman/trans.c:66 msgid "resolving dependencies... " msgstr "risoluzione delle dipendenze in corso... " -#: src/pacman/trans.c:67 +#: src/pacman/trans.c:69 msgid "looking for inter-conflicts... " msgstr "ricerca dei conflitti in corso... " -#: src/pacman/trans.c:87 +#: src/pacman/trans.c:89 #, c-format msgid "installing %s... " msgstr "installazione di %s in corso... " -#: src/pacman/trans.c:94 +#: src/pacman/trans.c:96 #, c-format msgid "installed %s (%s)" msgstr "installato %s (%s)" -#: src/pacman/trans.c:101 +#: src/pacman/trans.c:103 #, c-format msgid "removing %s... " msgstr "rimozione in corso di %s... " -#: src/pacman/trans.c:108 +#: src/pacman/trans.c:110 #, c-format msgid "removed %s (%s)" msgstr "rimosso %s (%s)" -#: src/pacman/trans.c:115 +#: src/pacman/trans.c:117 #, c-format msgid "upgrading %s... " msgstr "aggiornamento in corso di %s... " -#: src/pacman/trans.c:122 +#: src/pacman/trans.c:124 #, c-format msgid "upgraded %s (%s -> %s)" msgstr "aggiornato %s (%s -> %s)" -#: src/pacman/trans.c:129 +#: src/pacman/trans.c:131 msgid "checking package integrity... " msgstr "controllo dell'integrità dei pacchetti in corso... " -#: src/pacman/trans.c:145 +#: src/pacman/trans.c:147 msgid "failed.\n" msgstr "non riuscito.\n" -#: src/pacman/trans.c:152 +#: src/pacman/trans.c:154 #, c-format msgid ":: Retrieving packages from %s...\n" msgstr ":: Recupero dei pacchetti da %s...\n" -#: src/pacman/trans.c:172 +#: src/pacman/trans.c:175 #, c-format -msgid ":: %s requires %s, but it is in IgnorePkg. Install anyway? [Y/n] " -msgstr ":: %s richiede %s, ma è in IgnorePkg. Installare ugualmente? [Y/n] " +msgid ":: %1$s requires %2$s from IgnorePkg. Install %2$s? [Y/n] " +msgstr ":: %1$s richiede %2$s da IgnorePkg. Installare %2$s? [Y/n] " -#: src/pacman/trans.c:177 +#: src/pacman/trans.c:180 #, c-format msgid ":: %s is in IgnorePkg. Install anyway? [Y/n] " msgstr ":: %s è in IgnorePkg. Installare ugualmente? [Y/n] " -#: src/pacman/trans.c:190 +#: src/pacman/trans.c:193 #, c-format msgid ":: %s is designated as a HoldPkg. Remove anyway? [Y/n] " msgstr ":: %s è in HoldPkg. Rimuovere ugualmente? [Y/n] " -#: src/pacman/trans.c:203 +#: src/pacman/trans.c:206 #, c-format msgid ":: Replace %s with %s/%s? [Y/n] " msgstr ":: Sostituire %s con %s/%s? [Y/n] " -#: src/pacman/trans.c:218 +#: src/pacman/trans.c:221 #, c-format msgid ":: %s conflicts with %s. Remove %s? [Y/n] " msgstr ":: %s va in conflitto con %s. Rimuovere %s? [Y/n] " -#: src/pacman/trans.c:234 +#: src/pacman/trans.c:237 #, c-format msgid ":: %s-%s: local version is newer. Upgrade anyway? [Y/n] " msgstr "" ":: %s-%s: la versione installata è più recente. Aggiornare ugualmente? [Y/n] " -#: src/pacman/trans.c:252 +#: src/pacman/trans.c:255 #, c-format msgid ":: %s-%s: local version is up to date. Upgrade anyway? [Y/n] " msgstr "" ":: %s-%s: la versione installata è aggiornata. Aggiornare ugualmente? [Y/n] " -#: src/pacman/trans.c:270 +#: src/pacman/trans.c:273 #, c-format msgid ":: Archive %s is corrupted. Do you want to delete it? [Y/n] " msgstr ":: L'archivio %s è corrotto. Eliminarlo? [Y/n] " -#: src/pacman/trans.c:326 +#: src/pacman/trans.c:329 msgid "installing" msgstr "installazione in corso di " -#: src/pacman/trans.c:329 +#: src/pacman/trans.c:332 msgid "upgrading" msgstr "aggiornamento in corso di" -#: src/pacman/trans.c:332 +#: src/pacman/trans.c:335 msgid "removing" msgstr "rimozione in corso di" -#: src/pacman/trans.c:335 +#: src/pacman/trans.c:338 msgid "checking for file conflicts" msgstr "controllo dei conflitti in corso" -#: src/pacman/util.c:258 +#: src/pacman/util.c:259 #, c-format msgid "None\n" msgstr "Nessuno\n" -#: src/pacman/util.c:310 +#: src/pacman/util.c:311 msgid "Remove:" msgstr "Rimuovere:" -#: src/pacman/util.c:318 +#: src/pacman/util.c:319 #, c-format msgid "" "\n" @@ -1067,7 +1067,7 @@ "\n" "Dimensione totale dei pacchetti rimossi: %.2f MB\n" -#: src/pacman/util.c:329 +#: src/pacman/util.c:330 #, c-format msgid "" "\n" @@ -1076,7 +1076,7 @@ "\n" "Dimensione totale dei pacchetti: %.2f MB\n" -#: src/pacman/util.c:336 +#: src/pacman/util.c:337 #, c-format msgid "Total Installed Size: %.2f MB\n" msgstr "Dimensione totale dei pacchetti installati: %.2f MB\n"

1 0

[pacman-dev] CVS update of pacman-lib/contrib (pacsearch)
by Dan McGee 06 Mar '07

06 Mar '07

Date: Tuesday, March 6, 2007 @ 17:08:12 Author: dan Path: /home/cvs-pacman/pacman-lib/contrib Modified: pacsearch (1.2 -> 1.3) * Oops, that last commit had some debug stuff in it. Removed it and added --help and --version command line flags to contrib/pacsearch. -----------+ pacsearch | 5 ----- 1 file changed, 5 deletions(-) Index: pacman-lib/contrib/pacsearch diff -u pacman-lib/contrib/pacsearch:1.2 pacman-lib/contrib/pacsearch:1.3 --- pacman-lib/contrib/pacsearch:1.2 Tue Mar 6 17:06:28 2007 +++ pacman-lib/contrib/pacsearch Tue Mar 6 17:08:12 2007 @@ -50,18 +50,15 @@ exit 1 fi -echo "debug 1" # Make two temp files and send output of commands to these files querydump=$(mktemp) pacman -Qs $1 > $querydump syncdump=$(mktemp) pacman -Ss $1 > $syncdump -echo "debug 2" # Strip descriptions and 'local/' from -Qs query instpkg=$(mktemp) egrep '^[^ ]' $querydump | sed -e 's@^local/@@' > $instpkg -echo "debug 3" # Add pkgs not in sync db, mark pkgs that are installed cat $instpkg | while read -r pkg; do @@ -73,7 +70,6 @@ sed -i "s@^$.\+/$pkg$@\***\1@" $syncdump done -echo "debug 4" # Print colorized package list and descriptions to screen echo -e "$(sed -r \ -e "s@current/.*@$CLR1&$BASE@" \ @@ -88,7 +84,6 @@ < $syncdump )" echo -en "\e[0m" -echo "debug 5" rm $querydump rm $syncdump rm $instpkg

1 0