summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2007-02-14 19:35:41 +0000
committerDan McGee <dan@archlinux.org>2007-02-14 19:35:41 +0000
commitc557fa589d2b796ae5bede6eda812995d91d8040 (patch)
tree6c9b52e18c41b8c8e6f0237676709f4946af41fe
parent3a2d87d61df40ddcb716538950d2db7f048483dd (diff)
downloadpacman-c557fa589d2b796ae5bede6eda812995d91d8040.tar.xz
* Updated Italian translation
* Updated pot translation templates * Located culprit of progress bar moving when unicode characters are used, added a TODO note about it * Removed '(target)' string from the sync.c error message, just like we did from add.c yesterday * Updated my TODO
Diffstat
-rw-r--r--TODO.dan18
-rw-r--r--lib/libalpm/po/it.po337
-rw-r--r--lib/libalpm/po/libalpm.pot325
-rw-r--r--src/pacman/po/it.po15
-rw-r--r--src/pacman/po/pacman.pot99
-rw-r--r--src/pacman/sync.c2
-rw-r--r--src/pacman/trans.c18
7 files changed, 408 insertions, 406 deletions
diff --git a/TODO.dan b/TODO.dan
index 61f0cc62..57e59baa 100644
--- a/TODO.dan
+++ b/TODO.dan
@@ -4,13 +4,9 @@ TODO.dan
This is my personal TODO list. No guarantees if it is out of date and things no
longer apply. If you want to help out with any of it, send me an email.
-Go through all makepkg bugs in Flyspray and see if they are rectified:
-http://bugs.archlinux.org/index.php?tasks=&project=1&string=makepkg
-
-Documentation- no one likes to write it, but everyone reads it. Work on the man
-pages and make sure they are up to date. Perhaps move man page format to a more
-portable source format to make translation easier to keep up-to-date (something
-like txt2tags, docbook?) This will need some research.
+Documentation- look into moving man page format to a more portable source
+format to make translation easier to keep up-to-date (something like txt2tags,
+docbook, asciidoc) This will need some research.
Port the libdownload (libfetch) manpage from BSD style to Linux style, or at
very least change references to BSD.
@@ -66,7 +62,13 @@ are hard coded into the sources. (from TODO.autoconf)
Profile the code. Find the functions that are being called a lot, and see what
can be done about it. Find out if all these calls are necessary (e.g. excessive
alpm_list_count calls), and maybe think about changing data structures to speed
-operations up (e.g. a 'count' field).
+operations up (e.g. a 'count' field). NOTE: already found two huge issues with
+quick profiling- excessive setlocale calls, and extremely excessive strcmp
+calls.
+
+Localize the date display done in --info output. Also, fix other localized
+issues- use non-printf when necessary, make sure all two line printed messages
+(especially usage instructions) are printed using one print statement.
Other ideas:
============
diff --git a/lib/libalpm/po/it.po b/lib/libalpm/po/it.po
index d6faf4ad..544821dc 100644
--- a/lib/libalpm/po/it.po
+++ b/lib/libalpm/po/it.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: libalpm VERSION\n"
"Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
-"POT-Creation-Date: 2007-02-12 23:20+0100\n"
-"PO-Revision-Date: 2007-02-13 16:10+0100\n"
+"POT-Creation-Date: 2007-02-14 18:30+0100\n"
+"PO-Revision-Date: 2007-02-14 19:00+0100\n"
"Last-Translator: Giovanni Scafora <linuxmania@gmail.com>\n"
"Language-Team: Arch Linux Italian Team <linuxmania@gmail.com>\n"
"MIME-Version: 1.0\n"
@@ -46,7 +46,7 @@ msgstr "lettura dei metadate di '%s' in corso"
msgid "looking for unsatisfied dependencies"
msgstr "ricerca delle dipendenze non soddisfatte"
-#: lib/libalpm/add.c:256 lib/libalpm/sync.c:475
+#: lib/libalpm/add.c:256 lib/libalpm/sync.c:473
msgid "looking for conflicts"
msgstr "ricerca dei conflitti in corso"
@@ -67,219 +67,214 @@ msgstr "ricerca dei conflitti tra file in corso"
msgid "upgrading package %s-%s"
msgstr "aggiornamento del pacchetto %s-%s in corso"
-#: lib/libalpm/add.c:404 lib/libalpm/conflict.c:288 lib/libalpm/conflict.c:318
-#, c-format
-msgid "loading FILES info for '%s'"
-msgstr "caricamento delle informazioni dei FILE di '%s' in corso"
-
-#: lib/libalpm/add.c:426
+#: lib/libalpm/add.c:419
#, c-format
msgid "removing old package first (%s-%s)"
msgstr "rimozione del vecchio pacchetto (%s-%s) in corso"
-#: lib/libalpm/add.c:456
+#: lib/libalpm/add.c:449
#, c-format
msgid "adding package %s-%s"
msgstr "inclusione del pacchetto %s-%s in corso"
-#: lib/libalpm/add.c:467
+#: lib/libalpm/add.c:460
#, c-format
msgid "adding new package %s-%s"
msgstr "inclusione del nuovo pacchetto %s-%s in corso"
-#: lib/libalpm/add.c:471
+#: lib/libalpm/add.c:464
msgid "extracting files"
msgstr "estrazione dei file in corso"
-#: lib/libalpm/add.c:487 lib/libalpm/util.c:461
+#: lib/libalpm/add.c:480 lib/libalpm/util.c:461
msgid "could not get current working directory"
msgstr "impossibile utilizzare la directory corrente"
-#: lib/libalpm/add.c:545
+#: lib/libalpm/add.c:538
#, c-format
msgid "notice: %s is in NoExtract -- skipping extraction"
msgstr "avviso: %s è in NoExtract -- estrazione ignorata"
-#: lib/libalpm/add.c:581 lib/libalpm/add.c:734
+#: lib/libalpm/add.c:574 lib/libalpm/add.c:727
#, c-format
msgid "could not extract %s (%s)"
msgstr "impossibile estrarre %s (%s)"
-#: lib/libalpm/add.c:624
+#: lib/libalpm/add.c:617
#, c-format
msgid "checking md5 hashes for %s"
msgstr "controllo dell'hash md5 di %s"
-#: lib/libalpm/add.c:625 lib/libalpm/add.c:632
+#: lib/libalpm/add.c:618 lib/libalpm/add.c:625
#, c-format
msgid "current: %s"
msgstr "attuale: %s"
-#: lib/libalpm/add.c:626 lib/libalpm/add.c:633
+#: lib/libalpm/add.c:619 lib/libalpm/add.c:626
#, c-format
msgid "new: %s"
msgstr "nuovo: %s"
-#: lib/libalpm/add.c:628 lib/libalpm/add.c:635
+#: lib/libalpm/add.c:621 lib/libalpm/add.c:628
#, c-format
msgid "original: %s"
msgstr "originale: %s"
-#: lib/libalpm/add.c:631
+#: lib/libalpm/add.c:624
#, c-format
msgid "checking sha1 hashes for %s"
msgstr "controllo degli hash sha1 di %s"
-#: lib/libalpm/add.c:649
+#: lib/libalpm/add.c:642
#, c-format
msgid "could not rename %s (%s)"
msgstr "impossibile rinominare %s (%s)"
-#: lib/libalpm/add.c:650
+#: lib/libalpm/add.c:643
#, c-format
msgid "error: could not rename %s (%s)"
msgstr "errore: impossibile rinominare %s (%s)"
-#: lib/libalpm/add.c:654 lib/libalpm/add.c:698
+#: lib/libalpm/add.c:647 lib/libalpm/add.c:691
#, c-format
msgid "could not copy %s to %s (%s)"
msgstr "impossibile copiare %s in %s (%s)"
-#: lib/libalpm/add.c:655
+#: lib/libalpm/add.c:648
#, c-format
msgid "error: could not copy %s to %s (%s)"
msgstr "errore: impossibile copiare %s in %s (%s)"
-#: lib/libalpm/add.c:659
+#: lib/libalpm/add.c:652
#, c-format
msgid "%s saved as %s.pacorig"
msgstr "%s salvato come %s.pacorig"
-#: lib/libalpm/add.c:660
+#: lib/libalpm/add.c:653
#, c-format
msgid "warning: %s saved as %s"
msgstr "attenzione: %s salvato come %s"
-#: lib/libalpm/add.c:670 lib/libalpm/add.c:673 lib/libalpm/add.c:679
+#: lib/libalpm/add.c:663 lib/libalpm/add.c:666 lib/libalpm/add.c:672
msgid "action: installing new file"
msgstr "azione: installazione del nuovo file in corso"
-#: lib/libalpm/add.c:677
+#: lib/libalpm/add.c:670
msgid "action: leaving existing file in place"
msgstr "azione: il file non è stato spostato"
-#: lib/libalpm/add.c:683
+#: lib/libalpm/add.c:676
msgid "action: keeping current file and installing new one with .pacnew ending"
msgstr ""
"azione: il file attuale non è stato spostato e sarà installato un nuovo file "
"con il suffisso .pacnew"
-#: lib/libalpm/add.c:687
+#: lib/libalpm/add.c:680
#, c-format
msgid "could not install %s as %s: %s"
msgstr "impossibile installare %s come %s: %s"
-#: lib/libalpm/add.c:688
+#: lib/libalpm/add.c:681
#, c-format
msgid "error: could not install %s as %s: %s"
msgstr "errore: impossibile installare %s come %s: %s"
-#: lib/libalpm/add.c:690
+#: lib/libalpm/add.c:683
#, c-format
msgid "%s installed as %s"
msgstr "%s installato come %s"
-#: lib/libalpm/add.c:691
+#: lib/libalpm/add.c:684
#, c-format
msgid "warning: %s installed as %s"
msgstr "attenzione: %s installato come %s"
-#: lib/libalpm/add.c:696 lib/libalpm/add.c:716
+#: lib/libalpm/add.c:689 lib/libalpm/add.c:709
#, c-format
msgid "extracting %s"
msgstr "estrazione di %s in corso"
-#: lib/libalpm/add.c:718
+#: lib/libalpm/add.c:711
#, c-format
msgid "%s is in NoUpgrade -- skipping"
msgstr "%s è in NoUpgrade -- verrà ignorato"
-#: lib/libalpm/add.c:720
+#: lib/libalpm/add.c:713
#, c-format
msgid "extracting %s as %s.pacnew"
msgstr "estrazione di %s come %s.pacnew"
-#: lib/libalpm/add.c:721
+#: lib/libalpm/add.c:714
#, c-format
msgid "warning: extracting %s%s as %s"
msgstr "attenzione: estrazione di %s%s come %s"
-#: lib/libalpm/add.c:735
+#: lib/libalpm/add.c:728
#, c-format
msgid "error: could not extract %s (%s)"
msgstr "errore: impossibile estrarre %s (%s)"
-#: lib/libalpm/add.c:745
+#: lib/libalpm/add.c:738
msgid "appending backup entry"
msgstr "aggiungo la voce di backup"
-#: lib/libalpm/add.c:776 lib/libalpm/add.c:778
+#: lib/libalpm/add.c:769 lib/libalpm/add.c:771
#, c-format
msgid "errors occurred while %s %s"
msgstr "errori verificati in %s %s"
-#: lib/libalpm/add.c:777 lib/libalpm/add.c:779
+#: lib/libalpm/add.c:770 lib/libalpm/add.c:772
msgid "upgrading"
msgstr "aggiornamento in corso"
-#: lib/libalpm/add.c:777 lib/libalpm/add.c:779
+#: lib/libalpm/add.c:770 lib/libalpm/add.c:772
msgid "installing"
msgstr "installazione in corso"
-#: lib/libalpm/add.c:800 lib/libalpm/add.c:856
+#: lib/libalpm/add.c:793 lib/libalpm/add.c:849
#, c-format
msgid "adding '%s' in requiredby field for '%s'"
msgstr "inclusione di '%s' nel campo 'richiesto da' per '%s'"
-#: lib/libalpm/add.c:811 lib/libalpm/remove.c:334
+#: lib/libalpm/add.c:804 lib/libalpm/remove.c:326
msgid "updating database"
msgstr "aggiornamento del database in corso"
-#: lib/libalpm/add.c:812
+#: lib/libalpm/add.c:805
#, c-format
msgid "adding database entry '%s'"
msgstr "inclusione della voce '%s' nel database"
-#: lib/libalpm/add.c:814
+#: lib/libalpm/add.c:807
#, c-format
msgid "could not update database entry %s-%s"
msgstr "impossibile aggiornare la voce %s-%s nel database"
-#: lib/libalpm/add.c:816
+#: lib/libalpm/add.c:809
#, c-format
msgid "error updating database for %s-%s!"
msgstr "errore durante l'aggiornamento del database per %s-%s!"
-#: lib/libalpm/add.c:820
+#: lib/libalpm/add.c:813
#, c-format
msgid "could not add entry '%s' in cache"
msgstr "impossible includere la voce '%s' nella cache"
-#: lib/libalpm/add.c:826 lib/libalpm/remove.c:344
+#: lib/libalpm/add.c:819 lib/libalpm/remove.c:336
msgid "updating dependency packages 'requiredby' fields"
msgstr "aggiornamento dei campi 'richiesto da' delle dipendenze"
-#: lib/libalpm/add.c:848
+#: lib/libalpm/add.c:841
#, c-format
msgid "could not find dependency '%s'"
msgstr "impossibile trovare la dipendenza '%s'"
-#: lib/libalpm/add.c:859 lib/libalpm/remove.c:386
+#: lib/libalpm/add.c:852 lib/libalpm/remove.c:378
#, c-format
msgid "could not update 'requiredby' database entry %s-%s"
msgstr "impossibile aggiornare la voce 'richiesto da' del database %s-%s"
-#: lib/libalpm/add.c:885 lib/libalpm/remove.c:399 lib/libalpm/sync.c:1045
+#: lib/libalpm/add.c:878 lib/libalpm/remove.c:391 lib/libalpm/sync.c:1043
#, c-format
msgid "running \"ldconfig -r %s\""
msgstr "esecuzione in corso di \"ldconfig -r %s\""
@@ -339,147 +334,147 @@ msgstr "impossibile rimuovere la voce %s/%s dal database"
#: lib/libalpm/alpm.c:479
#, c-format
-msgid "could not get sha1 checksum for package %s-%s"
-msgstr "impossibile recuperare il checksum del pacchetto %s-%s"
+msgid "could not get sha1sum for package %s-%s"
+msgstr "impossibile recuperare la somma sha1 del pacchetto %s-%s"
-#: lib/libalpm/alpm.c:485 lib/libalpm/alpm.c:534
+#: lib/libalpm/alpm.c:485
#, c-format
-msgid "loading DESC info for '%s'"
-msgstr "caricamento delle informazioni DESC di '%s'"
+msgid "sha1sums for package %s-%s match"
+msgstr "la somma sha1 del pacchetto %s-%s corrisponde"
-#: lib/libalpm/alpm.c:490 lib/libalpm/alpm.c:539
-#, c-format
-msgid "checksums for package %s-%s are matching"
-msgstr "i checksum del pacchetto %s-%s corrispondono"
-
-#: lib/libalpm/alpm.c:493
+#: lib/libalpm/alpm.c:488
#, c-format
msgid "sha1sums do not match for package %s-%s"
msgstr "la somma sha1 del pacchetto %s-%s non corrisponde"
-#: lib/libalpm/alpm.c:528
+#: lib/libalpm/alpm.c:523
#, c-format
-msgid "could not get md5 checksum for package %s-%s"
-msgstr "impossibile recuperare il checksum md5 del pacchetto %s-%s"
+msgid "could not get md5sum for package %s-%s"
+msgstr "impossibile recuperare la somma md5 del pacchetto %s-%s"
-#: lib/libalpm/alpm.c:542
+#: lib/libalpm/alpm.c:529
+#, c-format
+msgid "md5sums for package %s-%s match"
+msgstr "la somma md5 del pacchetto %s-%s corrisponde"
+
+#: lib/libalpm/alpm.c:532
#, c-format
msgid "md5sums do not match for package %s-%s"
msgstr "la somma md5 del pacchetto %s-%s non corrisponde"
-#: lib/libalpm/alpm.c:790
+#: lib/libalpm/alpm.c:781
#, c-format
msgid "could not remove lock file %s"
msgstr "impossibile rimuovere il file lock di %s"
-#: lib/libalpm/alpm.c:791
+#: lib/libalpm/alpm.c:782
#, c-format
msgid "warning: could not remove lock file %s"
msgstr "attenzione: impossibile rimuovere il file lock di %s"
-#: lib/libalpm/alpm.c:926
+#: lib/libalpm/alpm.c:917
#, c-format
msgid "config: new section '%s'"
msgstr "config: nuova sezione '%s'"
-#: lib/libalpm/alpm.c:955
+#: lib/libalpm/alpm.c:946
msgid "config: nopassiveftp"
msgstr "config: nopassiveftp"
-#: lib/libalpm/alpm.c:958
+#: lib/libalpm/alpm.c:949
msgid "config: usesyslog"
msgstr "config: usesyslog"
-#: lib/libalpm/alpm.c:961
+#: lib/libalpm/alpm.c:952
msgid "config: chomp"
msgstr "config: chomp"
-#: lib/libalpm/alpm.c:964
+#: lib/libalpm/alpm.c:955
msgid "config: usecolor"
msgstr "config: usecolor"
-#: lib/libalpm/alpm.c:973
+#: lib/libalpm/alpm.c:964
#, c-format
msgid "config: including %s"
msgstr "config: including %s"
-#: lib/libalpm/alpm.c:983 lib/libalpm/alpm.c:988
+#: lib/libalpm/alpm.c:974 lib/libalpm/alpm.c:979
#, c-format
msgid "config: noupgrade: %s"
msgstr "config: noupgrade: %s"
-#: lib/libalpm/alpm.c:996 lib/libalpm/alpm.c:1001
+#: lib/libalpm/alpm.c:987 lib/libalpm/alpm.c:992
#, c-format
msgid "config: noextract: %s"
msgstr "config: noextract:·%s"
-#: lib/libalpm/alpm.c:1009 lib/libalpm/alpm.c:1014
+#: lib/libalpm/alpm.c:1000 lib/libalpm/alpm.c:1005
#, c-format
msgid "config: ignorepkg: %s"
msgstr "config: ignorepkg: %s"
-#: lib/libalpm/alpm.c:1022 lib/libalpm/alpm.c:1027
+#: lib/libalpm/alpm.c:1013 lib/libalpm/alpm.c:1018
#, c-format
msgid "config: holdpkg: %s"
msgstr "config: holdpkg: %s"
-#: lib/libalpm/alpm.c:1034
+#: lib/libalpm/alpm.c:1025
#, c-format
msgid "config: dbpath: %s"
msgstr "config: dbpath: %s"
-#: lib/libalpm/alpm.c:1041
+#: lib/libalpm/alpm.c:1032
#, c-format
msgid "config: cachedir: %s"
msgstr "config: cachedir: %s"
-#: lib/libalpm/alpm.c:1044
+#: lib/libalpm/alpm.c:1035
#, c-format
msgid "config: logfile: %s"
msgstr "config: logfile: %s"
-#: lib/libalpm/alpm.c:1047
+#: lib/libalpm/alpm.c:1038
#, c-format
msgid "config: xfercommand: %s"
msgstr "config: xfercommand: %s"
-#: lib/libalpm/alpm.c:1052
+#: lib/libalpm/alpm.c:1043
#, c-format
msgid "config: upgradedelay: %d"
msgstr "config: upgradedelay: %d"
-#: lib/libalpm/alpm.c:1091 lib/libalpm/sync.c:129 lib/libalpm/sync.c:197
+#: lib/libalpm/alpm.c:1082 lib/libalpm/sync.c:129 lib/libalpm/sync.c:197
msgid "checking for package replacements"
msgstr "controllo delle sostituzioni dei pacchetti in corso"
-#: lib/libalpm/alpm.c:1100 lib/libalpm/sync.c:138
+#: lib/libalpm/alpm.c:1091 lib/libalpm/sync.c:138
#, c-format
msgid "checking replacement '%s' for package '%s'"
msgstr "controllo in corso della sostituzione di '%s' con il pacchetto '%s'"
-#: lib/libalpm/alpm.c:1102 lib/libalpm/sync.c:140
+#: lib/libalpm/alpm.c:1093 lib/libalpm/sync.c:140
#, c-format
msgid "%s-%s: ignoring package upgrade (to be replaced by %s-%s)"
msgstr ""
"%s-%s: aggiornamento del pacchetto ignorato (per essere sostituito con %s-%s)"
-#: lib/libalpm/alpm.c:1136 lib/libalpm/sync.c:174
+#: lib/libalpm/alpm.c:1127 lib/libalpm/sync.c:174
#, c-format
msgid "%s-%s elected for upgrade (to be replaced by %s-%s)"
msgstr ""
"%s-%s selezionato per l'aggiornamento (per essere sostituito con %s-%s)"
-#: lib/libalpm/alpm.c:1157 lib/libalpm/sync.c:211
+#: lib/libalpm/alpm.c:1148 lib/libalpm/sync.c:211
#, c-format
msgid "'%s' not found in sync db -- skipping"
msgstr "'%s' non trovato nel database -- ignorato"
-#: lib/libalpm/alpm.c:1171 lib/libalpm/sync.c:225 lib/libalpm/sync.c:501
+#: lib/libalpm/alpm.c:1162 lib/libalpm/sync.c:225 lib/libalpm/sync.c:499
#, c-format
msgid "'%s' is already elected for removal -- skipping"
msgstr "'%s' è già selezionato per la rimozione -- ignorato"
-#: lib/libalpm/alpm.c:1177 lib/libalpm/sync.c:232
+#: lib/libalpm/alpm.c:1168 lib/libalpm/sync.c:232
#, c-format
msgid "%s-%s elected for upgrade (%s => %s)"
msgstr "%s-%s selezionato per l'aggiornamento (%s => %s)"
@@ -494,12 +489,12 @@ msgstr "estrazione del database '%s' in corso"
msgid "invalid name for dabatase entry '%s'"
msgstr "nome non valido per la voce del database '%s'"
-#: lib/libalpm/be_files.c:210
+#: lib/libalpm/be_files.c:212
msgid "invalid package entry provided to _alpm_db_read, skipping"
msgstr ""
"nome non valido per il pacchetto fornito a _alpm_db_read, verrà ignorato"
-#: lib/libalpm/be_files.c:215
+#: lib/libalpm/be_files.c:217
#, c-format
msgid ""
"request to read database info for a file-based package '%s', skipping..."
@@ -507,35 +502,35 @@ msgstr ""
"richiesta di lettura del database per un pacchetto file-based '%s', verrà "
"ignorato..."
-#: lib/libalpm/be_files.c:223
+#: lib/libalpm/be_files.c:225
#, c-format
msgid "loading package data for %s : level=%d"
msgstr "caricamento in corso dei dati del pacchetto %s : livello=%d"
-#: lib/libalpm/be_files.c:231
+#: lib/libalpm/be_files.c:233
#, c-format
msgid "cannot find '%s-%s' in db '%s'"
msgstr "impossibile trovare '%s-%s' nel database '%s'"
-#: lib/libalpm/be_files.c:239 lib/libalpm/be_files.c:383
-#: lib/libalpm/be_files.c:406 lib/libalpm/be_files.c:494
-#: lib/libalpm/be_files.c:580 lib/libalpm/be_files.c:607
-#: lib/libalpm/package.c:194
+#: lib/libalpm/be_files.c:241 lib/libalpm/be_files.c:391
+#: lib/libalpm/be_files.c:414 lib/libalpm/be_files.c:502
+#: lib/libalpm/be_files.c:591 lib/libalpm/be_files.c:618
+#: lib/libalpm/package.c:197
#, c-format
msgid "could not open file %s: %s"
msgstr "impossibile aprire il file %s: %s"
-#: lib/libalpm/be_files.c:491
+#: lib/libalpm/be_files.c:499
#, c-format
msgid "writing %s-%s DESC information back to db"
msgstr "scrittura in corso di %s-%s"
-#: lib/libalpm/be_files.c:577
+#: lib/libalpm/be_files.c:588
#, c-format
msgid "writing %s-%s FILES information back to db"
msgstr "scrittura in corso di %s-%s"
-#: lib/libalpm/be_files.c:604
+#: lib/libalpm/be_files.c:615
#, c-format
msgid "writing %s-%s DEPENDS information back to db"
msgstr "scrittura in corso di %s-%s"
@@ -603,11 +598,11 @@ msgstr "checkconflicts: db vs targ '%s'"
msgid "db vs targs: found %s as a conflict for %s"
msgstr "db vs targs: trovato %s come conflitto per %s"
-#: lib/libalpm/conflict.c:250 lib/libalpm/conflict.c:350 lib/libalpm/deps.c:57
+#: lib/libalpm/conflict.c:297 lib/libalpm/conflict.c:346 lib/libalpm/deps.c:57
#: lib/libalpm/deps.c:593 lib/libalpm/deps.c:633 lib/libalpm/group.c:43
#: lib/libalpm/handle.c:49 lib/libalpm/package.c:78 lib/libalpm/sync.c:65
-#: lib/libalpm/sync.c:606 lib/libalpm/sync.c:622 lib/libalpm/sync.c:718
-#: lib/libalpm/trans.c:49 lib/libalpm/util.c:599 lib/libalpm/util.c:606
+#: lib/libalpm/sync.c:604 lib/libalpm/sync.c:620 lib/libalpm/sync.c:716
+#: lib/libalpm/trans.c:49 lib/libalpm/util.c:607 lib/libalpm/util.c:614
#, c-format
msgid "malloc failure: could not allocate %d bytes"
msgstr "malloc failure: impossibile allocare %d byte"
@@ -838,7 +833,7 @@ msgstr "operazione annullata"
msgid "operation not compatible with the transaction type"
msgstr "operazione non possibile"
-#: lib/libalpm/error.c:91 lib/libalpm/sync.c:984
+#: lib/libalpm/error.c:91 lib/libalpm/sync.c:982
msgid "could not commit transaction"
msgstr "impossibile eseguire l'operazione"
@@ -965,55 +960,55 @@ msgstr "%s: aggiornamento forzato alla versione %s"
msgid "%s: local (%s) is newer than %s (%s)"
msgstr "%s: la versione installata (%s) è più recente di %s (%s)"
-#: lib/libalpm/package.c:155
+#: lib/libalpm/package.c:157
#, c-format
msgid "%s-%s: ignoring package upgrade (%s)"
msgstr "%s-%s: aggiornamento del pacchetto (%s) ignorato"
-#: lib/libalpm/package.c:160
+#: lib/libalpm/package.c:162
#, c-format
msgid "%s-%s: delaying upgrade of package (%s)"
msgstr "%s-%s: ritardo durante l'aggiornamento del pacchetto (%s)"
-#: lib/libalpm/package.c:165
+#: lib/libalpm/package.c:168
#, c-format
msgid "compare versions for %s: %s vs %s, result=%d"
msgstr "confronto delle versioni di %s: %s vs %s, risultato=%d"
-#: lib/libalpm/package.c:208 lib/libalpm/package.c:263
+#: lib/libalpm/package.c:211 lib/libalpm/package.c:270
#, c-format
msgid "%s: syntax error in description file line %d"
msgstr "%s: errore di sintassi nel file di descrizione alla linea %d"
-#: lib/libalpm/package.c:337
+#: lib/libalpm/package.c:344
msgid "could not parse the package description file"
msgstr "impossibile analizzare il file di descrizione del pacchetto"
-#: lib/libalpm/package.c:341
+#: lib/libalpm/package.c:348
#, c-format
msgid "missing package name in %s"
msgstr "manca il nome del pacchetto in %s"
-#: lib/libalpm/package.c:345
+#: lib/libalpm/package.c:352
#, c-format
msgid "missing package version in %s"
msgstr "manca la versione del pacchetto in %s"
-#: lib/libalpm/package.c:380
+#: lib/libalpm/package.c:387
#, c-format
msgid "could not remove tempfile %s"
msgstr "impossibile rimuovere il file temporaneo %s"
-#: lib/libalpm/package.c:393 lib/libalpm/package.c:400
+#: lib/libalpm/package.c:400 lib/libalpm/package.c:407
#, c-format
msgid "error while reading package: %s"
msgstr "si è verificato un errore durante la lettura del pacchetto: %s"
-#: lib/libalpm/package.c:406
+#: lib/libalpm/package.c:413
msgid "missing package metadata"
msgstr "metadata mancante del pacchetto"
-#: lib/libalpm/package.c:413
+#: lib/libalpm/package.c:420
#, c-format
msgid "missing package filelist in %s, generating one"
msgstr "filelist del pacchetto mancante in %s, creazione in corso"
@@ -1042,81 +1037,81 @@ msgstr "impossibile trovare %s nel database -- verrà ignorato"
msgid "finding removable dependencies"
msgstr "ricerca delle dipendenze eliminabili"
-#: lib/libalpm/remove.c:186
+#: lib/libalpm/remove.c:178
#, c-format
msgid "cannot remove file '%s': %s"
msgstr "impossibile rimuovere il file '%s': %s"
-#: lib/libalpm/remove.c:226
+#: lib/libalpm/remove.c:218
#, c-format
msgid "file %s does not exist"
msgstr "il file %s non esiste"
-#: lib/libalpm/remove.c:232
+#: lib/libalpm/remove.c:224
#, c-format
msgid "keeping directory %s"
msgstr "conservazione in corso della directory %s"
-#: lib/libalpm/remove.c:234
+#: lib/libalpm/remove.c:226
#, c-format
msgid "removing directory %s"
msgstr "rimozione in corso della directory %s"
-#: lib/libalpm/remove.c:248
+#: lib/libalpm/remove.c:240
#, c-format
msgid "skipping removal of %s as it has moved to another package"
msgstr "rimozione di %s ignorata poichè è stato spostato in un altro pacchetto"
-#: lib/libalpm/remove.c:260
+#: lib/libalpm/remove.c:252
#, c-format
msgid "%s saved as %s"
msgstr "%s salvato come %s"
-#: lib/libalpm/remove.c:264
+#: lib/libalpm/remove.c:256
#, c-format
msgid "unlinking %s"
msgstr "scollegamento in corso di %s"
-#: lib/libalpm/remove.c:271
+#: lib/libalpm/remove.c:263
#, c-format
msgid "cannot remove file %s: %s"
msgstr "impossibile rimuovere il file %s: %s"
-#: lib/libalpm/remove.c:299
+#: lib/libalpm/remove.c:291
#, c-format
msgid "removing package %s-%s"
msgstr "rimozione in corso del pacchetto %s-%s"
-#: lib/libalpm/remove.c:311
+#: lib/libalpm/remove.c:303
#, c-format
msgid "not removing package '%s', can't remove all files"
msgstr "impossibile rimuovere il pacchetto '%s' e tutti i file"
-#: lib/libalpm/remove.c:317
+#: lib/libalpm/remove.c:309
msgid "removing files"
msgstr "rimozione dei file in corso"
-#: lib/libalpm/remove.c:335
+#: lib/libalpm/remove.c:327
#, c-format
msgid "removing database entry '%s'"
msgstr "rimozione in corso della voce del database '%s'"
-#: lib/libalpm/remove.c:337
+#: lib/libalpm/remove.c:329
#, c-format
msgid "could not remove database entry %s-%s"
msgstr "impossibile rimuovere la voce del database %s-%s"
-#: lib/libalpm/remove.c:340
+#: lib/libalpm/remove.c:332
#, c-format
msgid "could not remove entry '%s' from cache"
msgstr "impossibile rimuovere la voce '%s' dalla cache"
-#: lib/libalpm/remove.c:374
+#: lib/libalpm/remove.c:366
#, c-format
msgid "could not find dependency '%s' for removal"
msgstr "impossibile trovare la dipendenza '%s' per rimuoverla"
-#: lib/libalpm/remove.c:384
+#: lib/libalpm/remove.c:376
#, c-format
msgid "updating 'requiredby' field for package '%s'"
msgstr "aggiornamento in corso del campo 'richiesto da' del pacchetto '%s'"
@@ -1155,167 +1150,167 @@ msgstr "%s-%s è aggiornato -- verrà ignorato"
msgid "adding target '%s' to the transaction set"
msgstr "aggiunta in corso di '%s'"
-#: lib/libalpm/sync.c:400
+#: lib/libalpm/sync.c:398
msgid "resolving target's dependencies"
msgstr "risoluzione in corso delle dipendenze dei pacchetti"
-#: lib/libalpm/sync.c:420
+#: lib/libalpm/sync.c:418
#, c-format
msgid "adding package %s-%s to the transaction targets"
msgstr "aggiunta in corso del pacchetto %s-%s"
-#: lib/libalpm/sync.c:455
+#: lib/libalpm/sync.c:453
msgid "looking for unresolvable dependencies"
msgstr "ricerca in corso delle dipendenze irrisolvibili"
-#: lib/libalpm/sync.c:486
+#: lib/libalpm/sync.c:484
#, c-format
msgid "package '%s' is conflicting with '%s'"
msgstr "il pacchetto '%s' va in conflitto con '%s'"
-#: lib/libalpm/sync.c:508
+#: lib/libalpm/sync.c:506
#, c-format
msgid "'%s' not found in transaction set -- skipping"
msgstr "'%s' non trovato -- verrà ignorato"
-#: lib/libalpm/sync.c:519
+#: lib/libalpm/sync.c:517
#, c-format
msgid "package '%s' provides its own conflict"
msgstr "il pacchetto '%s' fornisce il suo stesso conflitto"
-#: lib/libalpm/sync.c:542 lib/libalpm/sync.c:547
+#: lib/libalpm/sync.c:540 lib/libalpm/sync.c:545
#, c-format
msgid "'%s' is in the target list -- keeping it"
msgstr "'%s' è nella lista dei pacchetti -- verrà conservato"
-#: lib/libalpm/sync.c:559 lib/libalpm/sync.c:596
+#: lib/libalpm/sync.c:557 lib/libalpm/sync.c:594
#, c-format
msgid "removing '%s' from target list"
msgstr "rimozione in corso di '%s' dalla lista dei pacchetti"
-#: lib/libalpm/sync.c:568
+#: lib/libalpm/sync.c:566
#, c-format
msgid "resolving package '%s' conflict"
msgstr "risoluzione in corso del conflitto del pacchetto '%s'"
-#: lib/libalpm/sync.c:591
+#: lib/libalpm/sync.c:589
#, c-format
msgid "electing '%s' for removal"
msgstr "selezionato '%s' per la rimozione"
-#: lib/libalpm/sync.c:602 lib/libalpm/sync.c:618
+#: lib/libalpm/sync.c:600 lib/libalpm/sync.c:616
msgid "unresolvable package conflicts detected"
msgstr "sono stati rilevati dei conflitti irrisolvibili"
-#: lib/libalpm/sync.c:670
+#: lib/libalpm/sync.c:668
msgid "checking dependencies of packages designated for removal"
msgstr ""
"controllo in corso delle dipendenze dei pacchetti designati per la rimozione"
-#: lib/libalpm/sync.c:684
+#: lib/libalpm/sync.c:682
msgid "something has gone horribly wrong"
msgstr "qualcosa è andato orribilmente storto"
-#: lib/libalpm/sync.c:703
+#: lib/libalpm/sync.c:701
#, c-format
msgid "found '%s' as a provision for '%s' -- conflict aborted"
msgstr "trovato '%s' come alternativa a '%s' -- conflitto annullato"
-#: lib/libalpm/sync.c:799
+#: lib/libalpm/sync.c:797
#, c-format
msgid "%s is already in the cache\n"
msgstr "%s è già presente nella cache\n"
-#: lib/libalpm/sync.c:810
+#: lib/libalpm/sync.c:808
#, c-format
msgid "no %s cache exists. creating...\n"
msgstr "non esiste la cache %s. creazione in corso...\n"
-#: lib/libalpm/sync.c:811
+#: lib/libalpm/sync.c:809
#, c-format
msgid "warning: no %s cache exists. creating..."
msgstr "attenzione: non esiste la cache %s. creazione in corso..."
-#: lib/libalpm/sync.c:816
+#: lib/libalpm/sync.c:814
msgid "couldn't create package cache, using /tmp instead\n"
msgstr ""
"impossibile creare la cache del pacchetto, al suo posto verrà usata /tmp\n"
-#: lib/libalpm/sync.c:817
+#: lib/libalpm/sync.c:815
msgid "warning: couldn't create package cache, using /tmp instead"
msgstr ""
"attenzione: impossibile creare la cache del pacchetto, al suo posto verrà "
"usata /tmp"
-#: lib/libalpm/sync.c:824
+#: lib/libalpm/sync.c:822
#, c-format
msgid "failed to retrieve some files from %s\n"
msgstr "impossibile recuperare alcuni file da %s\n"
-#: lib/libalpm/sync.c:853 lib/libalpm/sync.c:865
+#: lib/libalpm/sync.c:851 lib/libalpm/sync.c:863
#, c-format
msgid "can't get md5 or sha1 checksum for package %s\n"
msgstr "impossibile recuperare il checksum md5 o sha1 del pacchetto %s\n"
-#: lib/libalpm/sync.c:884
+#: lib/libalpm/sync.c:882
#, c-format
msgid "archive %s was corrupted (bad MD5 or SHA1 checksum)\n"
msgstr "archivio %s era corrotto (MD5 o SHA1 checksum errato)\n"
-#: lib/libalpm/sync.c:886
+#: lib/libalpm/sync.c:884
#, c-format
msgid "archive %s is corrupted (bad MD5 or SHA1 checksum)\n"
msgstr "archivio %s è corrotto (MD5 o SHA1 checksum errato)\n"
-#: lib/libalpm/sync.c:907
+#: lib/libalpm/sync.c:905
msgid "could not create removal transaction"
msgstr "impossibile avviare l'operazione di rimozione"
-#: lib/libalpm/sync.c:913
+#: lib/libalpm/sync.c:911
msgid "could not initialize the removal transaction"
msgstr "impossibile inizializzare l'operazione di rimozione"
-#: lib/libalpm/sync.c:933
+#: lib/libalpm/sync.c:931
msgid "removing conflicting and to-be-replaced packages"
msgstr "rimozione in corso dei pacchetti in conflitto e da sostituire"
-#: lib/libalpm/sync.c:935
+#: lib/libalpm/sync.c:933
msgid "could not prepare removal transaction"
msgstr "impossibile preparare l'operazione di rimozione"
-#: lib/libalpm/sync.c:941
+#: lib/libalpm/sync.c:939
msgid "could not commit removal transaction"
msgstr "impossibile eseguire l'operazione di rimozione"
-#: lib/libalpm/sync.c:948
+#: lib/libalpm/sync.c:946
msgid "installing packages"
msgstr "installazione dei pacchetti in corso"
-#: lib/libalpm/sync.c:951
+#: lib/libalpm/sync.c:949
msgid "could not create transaction"
msgstr "impossibile avviare l'operazione"
-#: lib/libalpm/sync.c:956
+#: lib/libalpm/sync.c:954
msgid "could not initialize transaction"
msgstr "impossibile inizializzare l'operazione"
-#: lib/libalpm/sync.c:979
+#: lib/libalpm/sync.c:977
msgid "could not prepare transaction"
msgstr "impossibile preparare l'operazione"
-#: lib/libalpm/sync.c:991
+#: lib/libalpm/sync.c:989
msgid "updating database for replaced packages' dependencies"
msgstr ""
"aggiornamento in corso del database per le dipendenze dei pacchetti "
"sostituiti"
-#: lib/libalpm/sync.c:1020
+#: lib/libalpm/sync.c:1018
#, c-format
msgid "could not update requiredby for database entry %s-%s"
msgstr ""
"impossibile aggiornare il campo 'richiesto da' per la voce del database %s-%s"
-#: lib/libalpm/sync.c:1029
+#: lib/libalpm/sync.c:1027
#, c-format
msgid "could not update new database entry %s-%s"
msgstr "impossibile aggiornare la nuova voce del database %s-%s"
@@ -1379,17 +1374,17 @@ msgstr "esecuzione in corso di \"%s\""
msgid "call to popen failed (%s)"
msgstr "chiamata a popen non riuscita (%s)"
-#: lib/libalpm/util.c:529
+#: lib/libalpm/util.c:536
#, c-format
msgid "call to waitpid failed (%s)"
msgstr "chiamata a waitpid non riuscita (%s)"
-#: lib/libalpm/util.c:537
+#: lib/libalpm/util.c:545
#, c-format
msgid "could not remove tmpdir %s"
msgstr "impossibile rimuovere la directory temporanea %s"
-#: lib/libalpm/util.c:594
+#: lib/libalpm/util.c:602
#, c-format
msgid "check_freespace: total pkg size: %lld, disk space: %lld"
msgstr ""
diff --git a/lib/libalpm/po/libalpm.pot b/lib/libalpm/po/libalpm.pot
index 2ffa3c15..6839bc65 100644
--- a/lib/libalpm/po/libalpm.pot
+++ b/lib/libalpm/po/libalpm.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
-"POT-Creation-Date: 2007-02-12 10:35-0500\n"
+"POT-Creation-Date: 2007-02-14 14:32-0500\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -45,7 +45,7 @@ msgstr ""
msgid "looking for unsatisfied dependencies"
msgstr ""
-#: lib/libalpm/add.c:256 lib/libalpm/sync.c:475
+#: lib/libalpm/add.c:256 lib/libalpm/sync.c:473
msgid "looking for conflicts"
msgstr ""
@@ -66,217 +66,212 @@ msgstr ""
msgid "upgrading package %s-%s"
msgstr ""
-#: lib/libalpm/add.c:404 lib/libalpm/conflict.c:288 lib/libalpm/conflict.c:318
-#, c-format
-msgid "loading FILES info for '%s'"
-msgstr ""
-
-#: lib/libalpm/add.c:426
+#: lib/libalpm/add.c:419
#, c-format
msgid "removing old package first (%s-%s)"
msgstr ""
-#: lib/libalpm/add.c:456
+#: lib/libalpm/add.c:449
#, c-format
msgid "adding package %s-%s"
msgstr ""
-#: lib/libalpm/add.c:467
+#: lib/libalpm/add.c:460
#, c-format
msgid "adding new package %s-%s"
msgstr ""
-#: lib/libalpm/add.c:471
+#: lib/libalpm/add.c:464
msgid "extracting files"
msgstr ""
-#: lib/libalpm/add.c:487 lib/libalpm/util.c:461
+#: lib/libalpm/add.c:480 lib/libalpm/util.c:461
msgid "could not get current working directory"
msgstr ""
-#: lib/libalpm/add.c:545
+#: lib/libalpm/add.c:538
#, c-format
msgid "notice: %s is in NoExtract -- skipping extraction"
msgstr ""
-#: lib/libalpm/add.c:581 lib/libalpm/add.c:734
+#: lib/libalpm/add.c:574 lib/libalpm/add.c:727
#, c-format
msgid "could not extract %s (%s)"
msgstr ""
-#: lib/libalpm/add.c:624
+#: lib/libalpm/add.c:617
#, c-format
msgid "checking md5 hashes for %s"
msgstr ""
-#: lib/libalpm/add.c:625 lib/libalpm/add.c:632
+#: lib/libalpm/add.c:618 lib/libalpm/add.c:625
#, c-format
msgid "current: %s"
msgstr ""
-#: lib/libalpm/add.c:626 lib/libalpm/add.c:633
+#: lib/libalpm/add.c:619 lib/libalpm/add.c:626
#, c-format
msgid "new: %s"
msgstr ""
-#: lib/libalpm/add.c:628 lib/libalpm/add.c:635
+#: lib/libalpm/add.c:621 lib/libalpm/add.c:628
#, c-format
msgid "original: %s"
msgstr ""
-#: lib/libalpm/add.c:631
+#: lib/libalpm/add.c:624
#, c-format
msgid "checking sha1 hashes for %s"
msgstr ""
-#: lib/libalpm/add.c:649
+#: lib/libalpm/add.c:642
#, c-format
msgid "could not rename %s (%s)"
msgstr ""
-#: lib/libalpm/add.c:650
+#: lib/libalpm/add.c:643
#, c-format
msgid "error: could not rename %s (%s)"
msgstr ""
-#: lib/libalpm/add.c:654 lib/libalpm/add.c:698
+#: lib/libalpm/add.c:647 lib/libalpm/add.c:691
#, c-format
msgid "could not copy %s to %s (%s)"
msgstr ""
-#: lib/libalpm/add.c:655
+#: lib/libalpm/add.c:648
#, c-format
msgid "error: could not copy %s to %s (%s)"
msgstr ""
-#: lib/libalpm/add.c:659
+#: lib/libalpm/add.c:652
#, c-format
msgid "%s saved as %s.pacorig"
msgstr ""
-#: lib/libalpm/add.c:660
+#: lib/libalpm/add.c:653
#, c-format
msgid "warning: %s saved as %s"
msgstr ""
-#: lib/libalpm/add.c:670 lib/libalpm/add.c:673 lib/libalpm/add.c:679
+#: lib/libalpm/add.c:663 lib/libalpm/add.c:666 lib/libalpm/add.c:672
msgid "action: installing new file"
msgstr ""
-#: lib/libalpm/add.c:677
+#: lib/libalpm/add.c:670
msgid "action: leaving existing file in place"
msgstr ""
-#: lib/libalpm/add.c:683
+#: lib/libalpm/add.c:676
msgid "action: keeping current file and installing new one with .pacnew ending"
msgstr ""
-#: lib/libalpm/add.c:687
+#: lib/libalpm/add.c:680
#, c-format
msgid "could not install %s as %s: %s"
msgstr ""
-#: lib/libalpm/add.c:688
+#: lib/libalpm/add.c:681
#, c-format
msgid "error: could not install %s as %s: %s"
msgstr ""
-#: lib/libalpm/add.c:690
+#: lib/libalpm/add.c:683
#, c-format
msgid "%s installed as %s"
msgstr ""
-#: lib/libalpm/add.c:691
+#: lib/libalpm/add.c:684
#, c-format
msgid "warning: %s installed as %s"
msgstr ""
-#: lib/libalpm/add.c:696 lib/libalpm/add.c:716
+#: lib/libalpm/add.c:689 lib/libalpm/add.c:709
#, c-format
msgid "extracting %s"
msgstr ""
-#: lib/libalpm/add.c:718
+#: lib/libalpm/add.c:711
#, c-format
msgid "%s is in NoUpgrade -- skipping"
msgstr ""
-#: lib/libalpm/add.c:720
+#: lib/libalpm/add.c:713
#, c-format
msgid "extracting %s as %s.pacnew"
msgstr ""
-#: lib/libalpm/add.c:721
+#: lib/libalpm/add.c:714
#, c-format
msgid "warning: extracting %s%s as %s"
msgstr ""
-#: lib/libalpm/add.c:735
+#: lib/libalpm/add.c:728
#, c-format
msgid "error: could not extract %s (%s)"
msgstr ""
-#: lib/libalpm/add.c:745
+#: lib/libalpm/add.c:738
msgid "appending backup entry"
msgstr ""
-#: lib/libalpm/add.c:776 lib/libalpm/add.c:778
+#: lib/libalpm/add.c:769 lib/libalpm/add.c:771
#, c-format
msgid "errors occurred while %s %s"
msgstr ""
-#: lib/libalpm/add.c:777 lib/libalpm/add.c:779
+#: lib/libalpm/add.c:770 lib/libalpm/add.c:772
msgid "upgrading"
msgstr ""
-#: lib/libalpm/add.c:777 lib/libalpm/add.c:779
+#: lib/libalpm/add.c:770 lib/libalpm/add.c:772
msgid "installing"
msgstr ""
-#: lib/libalpm/add.c:800 lib/libalpm/add.c:856
+#: lib/libalpm/add.c:793 lib/libalpm/add.c:849
#, c-format
msgid "adding '%s' in requiredby field for '%s'"
msgstr ""
-#: lib/libalpm/add.c:811 lib/libalpm/remove.c:334
+#: lib/libalpm/add.c:804 lib/libalpm/remove.c:326
msgid "updating database"
msgstr ""
-#: lib/libalpm/add.c:812
+#: lib/libalpm/add.c:805
#, c-format
msgid "adding database entry '%s'"
msgstr ""
-#: lib/libalpm/add.c:814
+#: lib/libalpm/add.c:807
#, c-format
msgid "could not update database entry %s-%s"
msgstr ""
-#: lib/libalpm/add.c:816
+#: lib/libalpm/add.c:809
#, c-format
msgid "error updating database for %s-%s!"
msgstr ""
-#: lib/libalpm/add.c:820
+#: lib/libalpm/add.c:813
#, c-format
msgid "could not add entry '%s' in cache"
msgstr ""
-#: lib/libalpm/add.c:826 lib/libalpm/remove.c:344
+#: lib/libalpm/add.c:819 lib/libalpm/remove.c:336
msgid "updating dependency packages 'requiredby' fields"
msgstr ""
-#: lib/libalpm/add.c:848
+#: lib/libalpm/add.c:841
#, c-format
msgid "could not find dependency '%s'"
msgstr ""
-#: lib/libalpm/add.c:859 lib/libalpm/remove.c:386
+#: lib/libalpm/add.c:852 lib/libalpm/remove.c:378
#, c-format
msgid "could not update 'requiredby' database entry %s-%s"
msgstr ""
-#: lib/libalpm/add.c:885 lib/libalpm/remove.c:399 lib/libalpm/sync.c:1045
+#: lib/libalpm/add.c:878 lib/libalpm/remove.c:391 lib/libalpm/sync.c:1043
#, c-format
msgid "running \"ldconfig -r %s\""
msgstr ""
@@ -334,145 +329,145 @@ msgstr ""
#: lib/libalpm/alpm.c:479
#, c-format
-msgid "could not get sha1 checksum for package %s-%s"
+msgid "could not get sha1sum for package %s-%s"
msgstr ""
-#: lib/libalpm/alpm.c:485 lib/libalpm/alpm.c:534
+#: lib/libalpm/alpm.c:485
#, c-format
-msgid "loading DESC info for '%s'"
+msgid "sha1sums for package %s-%s match"
msgstr ""
-#: lib/libalpm/alpm.c:490 lib/libalpm/alpm.c:539
+#: lib/libalpm/alpm.c:488
#, c-format
-msgid "checksums for package %s-%s are matching"
+msgid "sha1sums do not match for package %s-%s"
msgstr ""
-#: lib/libalpm/alpm.c:493
+#: lib/libalpm/alpm.c:523
#, c-format
-msgid "sha1sums do not match for package %s-%s"
+msgid "could not get md5sum for package %s-%s"
msgstr ""
-#: lib/libalpm/alpm.c:528
+#: lib/libalpm/alpm.c:529
#, c-format
-msgid "could not get md5 checksum for package %s-%s"
+msgid "md5sums for package %s-%s match"
msgstr ""
-#: lib/libalpm/alpm.c:542
+#: lib/libalpm/alpm.c:532
#, c-format
msgid "md5sums do not match for package %s-%s"
msgstr ""
-#: lib/libalpm/alpm.c:790
+#: lib/libalpm/alpm.c:781
#, c-format
msgid "could not remove lock file %s"
msgstr ""
-#: lib/libalpm/alpm.c:791
+#: lib/libalpm/alpm.c:782
#, c-format
msgid "warning: could not remove lock file %s"
msgstr ""
-#: lib/libalpm/alpm.c:926
+#: lib/libalpm/alpm.c:917
#, c-format
msgid "config: new section '%s'"
msgstr ""
-#: lib/libalpm/alpm.c:955
+#: lib/libalpm/alpm.c:946
msgid "config: nopassiveftp"
msgstr ""
-#: lib/libalpm/alpm.c:958
+#: lib/libalpm/alpm.c:949
msgid "config: usesyslog"
msgstr ""
-#: lib/libalpm/alpm.c:961
+#: lib/libalpm/alpm.c:952
msgid "config: chomp"
msgstr ""
-#: lib/libalpm/alpm.c:964
+#: lib/libalpm/alpm.c:955
msgid "config: usecolor"
msgstr ""
-#: lib/libalpm/alpm.c:973
+#: lib/libalpm/alpm.c:964
#, c-format
msgid "config: including %s"
msgstr ""
-#: lib/libalpm/alpm.c:983 lib/libalpm/alpm.c:988
+#: lib/libalpm/alpm.c:974 lib/libalpm/alpm.c:979
#, c-format
msgid "config: noupgrade: %s"
msgstr ""
-#: lib/libalpm/alpm.c:996 lib/libalpm/alpm.c:1001
+#: lib/libalpm/alpm.c:987 lib/libalpm/alpm.c:992
#, c-format
msgid "config: noextract: %s"
msgstr ""
-#: lib/libalpm/alpm.c:1009 lib/libalpm/alpm.c:1014
+#: lib/libalpm/alpm.c:1000 lib/libalpm/alpm.c:1005
#, c-format
msgid "config: ignorepkg: %s"
msgstr ""
-#: lib/libalpm/alpm.c:1022 lib/libalpm/alpm.c:1027
+#: lib/libalpm/alpm.c:1013 lib/libalpm/alpm.c:1018
#, c-format
msgid "config: holdpkg: %s"
msgstr ""
-#: lib/libalpm/alpm.c:1034
+#: lib/libalpm/alpm.c:1025
#, c-format
msgid "config: dbpath: %s"
msgstr ""
-#: lib/libalpm/alpm.c:1041
+#: lib/libalpm/alpm.c:1032
#, c-format
msgid "config: cachedir: %s"
msgstr ""
-#: lib/libalpm/alpm.c:1044
+#: lib/libalpm/alpm.c:1035
#, c-format
msgid "config: logfile: %s"
msgstr ""
-#: lib/libalpm/alpm.c:1047
+#: lib/libalpm/alpm.c:1038
#, c-format
msgid "config: xfercommand: %s"
msgstr ""
-#: lib/libalpm/alpm.c:1052
+#: lib/libalpm/alpm.c:1043
#, c-format
msgid "config: upgradedelay: %d"
msgstr ""
-#: lib/libalpm/alpm.c:1091 lib/libalpm/sync.c:129 lib/libalpm/sync.c:197
+#: lib/libalpm/alpm.c:1082 lib/libalpm/sync.c:129 lib/libalpm/sync.c:197
msgid "checking for package replacements"
msgstr ""
-#: lib/libalpm/alpm.c:1100 lib/libalpm/sync.c:138
+#: lib/libalpm/alpm.c:1091 lib/libalpm/sync.c:138
#, c-format
msgid "checking replacement '%s' for package '%s'"
msgstr ""
-#: lib/libalpm/alpm.c:1102 lib/libalpm/sync.c:140
+#: lib/libalpm/alpm.c:1093 lib/libalpm/sync.c:140
#, c-format
msgid "%s-%s: ignoring package upgrade (to be replaced by %s-%s)"
msgstr ""
-#: lib/libalpm/alpm.c:1136 lib/libalpm/sync.c:174
+#: lib/libalpm/alpm.c:1127 lib/libalpm/sync.c:174
#, c-format
msgid "%s-%s elected for upgrade (to be replaced by %s-%s)"
msgstr ""
-#: lib/libalpm/alpm.c:1157 lib/libalpm/sync.c:211
+#: lib/libalpm/alpm.c:1148 lib/libalpm/sync.c:211
#, c-format
msgid "'%s' not found in sync db -- skipping"
msgstr ""
-#: lib/libalpm/alpm.c:1171 lib/libalpm/sync.c:225 lib/libalpm/sync.c:501
+#: lib/libalpm/alpm.c:1162 lib/libalpm/sync.c:225 lib/libalpm/sync.c:499
#, c-format
msgid "'%s' is already elected for removal -- skipping"
msgstr ""
-#: lib/libalpm/alpm.c:1177 lib/libalpm/sync.c:232
+#: lib/libalpm/alpm.c:1168 lib/libalpm/sync.c:232
#, c-format
msgid "%s-%s elected for upgrade (%s => %s)"
msgstr ""
@@ -487,45 +482,45 @@ msgstr ""
msgid "invalid name for dabatase entry '%s'"
msgstr ""
-#: lib/libalpm/be_files.c:210
+#: lib/libalpm/be_files.c:212
msgid "invalid package entry provided to _alpm_db_read, skipping"
msgstr ""
-#: lib/libalpm/be_files.c:215
+#: lib/libalpm/be_files.c:217
#, c-format
msgid ""
"request to read database info for a file-based package '%s', skipping..."
msgstr ""
-#: lib/libalpm/be_files.c:223
+#: lib/libalpm/be_files.c:225
#, c-format
msgid "loading package data for %s : level=%d"
msgstr ""
-#: lib/libalpm/be_files.c:231
+#: lib/libalpm/be_files.c:233
#, c-format
msgid "cannot find '%s-%s' in db '%s'"
msgstr ""
-#: lib/libalpm/be_files.c:239 lib/libalpm/be_files.c:383
-#: lib/libalpm/be_files.c:406 lib/libalpm/be_files.c:494
-#: lib/libalpm/be_files.c:580 lib/libalpm/be_files.c:607
-#: lib/libalpm/package.c:194
+#: lib/libalpm/be_files.c:241 lib/libalpm/be_files.c:391
+#: lib/libalpm/be_files.c:414 lib/libalpm/be_files.c:502
+#: lib/libalpm/be_files.c:591 lib/libalpm/be_files.c:618
+#: lib/libalpm/package.c:197
#, c-format
msgid "could not open file %s: %s"
msgstr ""
-#: lib/libalpm/be_files.c:491
+#: lib/libalpm/be_files.c:499
#, c-format
msgid "writing %s-%s DESC information back to db"
msgstr ""
-#: lib/libalpm/be_files.c:577
+#: lib/libalpm/be_files.c:588
#, c-format
msgid "writing %s-%s FILES information back to db"
msgstr ""
-#: lib/libalpm/be_files.c:604
+#: lib/libalpm/be_files.c:615
#, c-format
msgid "writing %s-%s DEPENDS information back to db"
msgstr ""
@@ -590,11 +585,11 @@ msgstr ""
msgid "db vs targs: found %s as a conflict for %s"
msgstr ""
-#: lib/libalpm/conflict.c:250 lib/libalpm/conflict.c:350 lib/libalpm/deps.c:57
+#: lib/libalpm/conflict.c:297 lib/libalpm/conflict.c:346 lib/libalpm/deps.c:57
#: lib/libalpm/deps.c:593 lib/libalpm/deps.c:633 lib/libalpm/group.c:43
#: lib/libalpm/handle.c:49 lib/libalpm/package.c:78 lib/libalpm/sync.c:65
-#: lib/libalpm/sync.c:606 lib/libalpm/sync.c:622 lib/libalpm/sync.c:718
-#: lib/libalpm/trans.c:49 lib/libalpm/util.c:599 lib/libalpm/util.c:606
+#: lib/libalpm/sync.c:604 lib/libalpm/sync.c:620 lib/libalpm/sync.c:716
+#: lib/libalpm/trans.c:49 lib/libalpm/util.c:607 lib/libalpm/util.c:614
#, c-format
msgid "malloc failure: could not allocate %d bytes"
msgstr ""
@@ -819,7 +814,7 @@ msgstr ""
msgid "operation not compatible with the transaction type"
msgstr ""
-#: lib/libalpm/error.c:91 lib/libalpm/sync.c:984
+#: lib/libalpm/error.c:91 lib/libalpm/sync.c:982
msgid "could not commit transaction"
msgstr ""
@@ -946,55 +941,55 @@ msgstr ""
msgid "%s: local (%s) is newer than %s (%s)"
msgstr ""
-#: lib/libalpm/package.c:155
+#: lib/libalpm/package.c:157
#, c-format
msgid "%s-%s: ignoring package upgrade (%s)"
msgstr ""
-#: lib/libalpm/package.c:160
+#: lib/libalpm/package.c:162
#, c-format
msgid "%s-%s: delaying upgrade of package (%s)"
msgstr ""
-#: lib/libalpm/package.c:165
+#: lib/libalpm/package.c:168
#, c-format
msgid "compare versions for %s: %s vs %s, result=%d"
msgstr ""
-#: lib/libalpm/package.c:208 lib/libalpm/package.c:263
+#: lib/libalpm/package.c:211 lib/libalpm/package.c:270
#, c-format
msgid "%s: syntax error in description file line %d"
msgstr ""
-#: lib/libalpm/package.c:337
+#: lib/libalpm/package.c:344
msgid "could not parse the package description file"
msgstr ""
-#: lib/libalpm/package.c:341
+#: lib/libalpm/package.c:348
#, c-format
msgid "missing package name in %s"
msgstr ""
-#: lib/libalpm/package.c:345
+#: lib/libalpm/package.c:352
#, c-format
msgid "missing package version in %s"
msgstr ""
-#: lib/libalpm/package.c:380
+#: lib/libalpm/package.c:387
#, c-format
msgid "could not remove tempfile %s"
msgstr ""
-#: lib/libalpm/package.c:393 lib/libalpm/package.c:400
+#: lib/libalpm/package.c:400 lib/libalpm/package.c:407
#, c-format
msgid "error while reading package: %s"
msgstr ""
-#: lib/libalpm/package.c:406
+#: lib/libalpm/package.c:413
msgid "missing package metadata"
msgstr ""
-#: lib/libalpm/package.c:413
+#: lib/libalpm/package.c:420
#, c-format
msgid "missing package filelist in %s, generating one"
msgstr ""
@@ -1023,81 +1018,81 @@ msgstr ""
msgid "finding removable dependencies"
msgstr ""
-#: lib/libalpm/remove.c:186
+#: lib/libalpm/remove.c:178
#, c-format
msgid "cannot remove file '%s': %s"
msgstr ""
-#: lib/libalpm/remove.c:226
+#: lib/libalpm/remove.c:218
#, c-format
msgid "file %s does not exist"
msgstr ""
-#: lib/libalpm/remove.c:232
+#: lib/libalpm/remove.c:224
#, c-format
msgid "keeping directory %s"
msgstr ""
-#: lib/libalpm/remove.c:234
+#: lib/libalpm/remove.c:226
#, c-format
msgid "removing directory %s"
msgstr ""
-#: lib/libalpm/remove.c:248
+#: lib/libalpm/remove.c:240
#, c-format
msgid "skipping removal of %s as it has moved to another package"
msgstr ""
-#: lib/libalpm/remove.c:260
+#: lib/libalpm/remove.c:252
#, c-format
msgid "%s saved as %s"
msgstr ""
-#: lib/libalpm/remove.c:264
+#: lib/libalpm/remove.c:256
#, c-format
msgid "unlinking %s"
msgstr ""
-#: lib/libalpm/remove.c:271
+#: lib/libalpm/remove.c:263
#, c-format
msgid "cannot remove file %s: %s"
msgstr ""
-#: lib/libalpm/remove.c:299
+#: lib/libalpm/remove.c:291
#, c-format
msgid "removing package %s-%s"
msgstr ""
-#: lib/libalpm/remove.c:311
+#: lib/libalpm/remove.c:303
#, c-format
msgid "not removing package '%s', can't remove all files"
msgstr ""
-#: lib/libalpm/remove.c:317
+#: lib/libalpm/remove.c:309
msgid "removing files"
msgstr ""
-#: lib/libalpm/remove.c:335
+#: lib/libalpm/remove.c:327
#, c-format
msgid "removing database entry '%s'"
msgstr ""
-#: lib/libalpm/remove.c:337
+#: lib/libalpm/remove.c:329
#, c-format
msgid "could not remove database entry %s-%s"
msgstr ""
-#: lib/libalpm/remove.c:340
+#: lib/libalpm/remove.c:332
#, c-format
msgid "could not remove entry '%s' from cache"
msgstr ""
-#: lib/libalpm/remove.c:374
+#: lib/libalpm/remove.c:366
#, c-format
msgid "could not find dependency '%s' for removal"
msgstr ""
-#: lib/libalpm/remove.c:384
+#: lib/libalpm/remove.c:376
#, c-format
msgid "updating 'requiredby' field for package '%s'"
msgstr ""
@@ -1136,160 +1131,160 @@ msgstr ""
msgid "adding target '%s' to the transaction set"
msgstr ""
-#: lib/libalpm/sync.c:400
+#: lib/libalpm/sync.c:398
msgid "resolving target's dependencies"
msgstr ""
-#: lib/libalpm/sync.c:420
+#: lib/libalpm/sync.c:418
#, c-format
msgid "adding package %s-%s to the transaction targets"
msgstr ""
-#: lib/libalpm/sync.c:455
+#: lib/libalpm/sync.c:453
msgid "looking for unresolvable dependencies"
msgstr ""
-#: lib/libalpm/sync.c:486
+#: lib/libalpm/sync.c:484
#, c-format
msgid "package '%s' is conflicting with '%s'"
msgstr ""
-#: lib/libalpm/sync.c:508
+#: lib/libalpm/sync.c:506
#, c-format
msgid "'%s' not found in transaction set -- skipping"
msgstr ""
-#: lib/libalpm/sync.c:519
+#: lib/libalpm/sync.c:517
#, c-format
msgid "package '%s' provides its own conflict"
msgstr ""
-#: lib/libalpm/sync.c:542 lib/libalpm/sync.c:547
+#: lib/libalpm/sync.c:540 lib/libalpm/sync.c:545
#, c-format
msgid "'%s' is in the target list -- keeping it"
msgstr ""
-#: lib/libalpm/sync.c:559 lib/libalpm/sync.c:596
+#: lib/libalpm/sync.c:557 lib/libalpm/sync.c:594
#, c-format
msgid "removing '%s' from target list"
msgstr ""
-#: lib/libalpm/sync.c:568
+#: lib/libalpm/sync.c:566
#, c-format
msgid "resolving package '%s' conflict"
msgstr ""
-#: lib/libalpm/sync.c:591
+#: lib/libalpm/sync.c:589
#, c-format
msgid "electing '%s' for removal"
msgstr ""
-#: lib/libalpm/sync.c:602 lib/libalpm/sync.c:618
+#: lib/libalpm/sync.c:600 lib/libalpm/sync.c:616
msgid "unresolvable package conflicts detected"
msgstr ""
-#: lib/libalpm/sync.c:670
+#: lib/libalpm/sync.c:668
msgid "checking dependencies of packages designated for removal"
msgstr ""
-#: lib/libalpm/sync.c:684
+#: lib/libalpm/sync.c:682
msgid "something has gone horribly wrong"
msgstr ""
-#: lib/libalpm/sync.c:703
+#: lib/libalpm/sync.c:701
#, c-format
msgid "found '%s' as a provision for '%s' -- conflict aborted"
msgstr ""
-#: lib/libalpm/sync.c:799
+#: lib/libalpm/sync.c:797
#, c-format
msgid "%s is already in the cache\n"
msgstr ""
-#: lib/libalpm/sync.c:810
+#: lib/libalpm/sync.c:808
#, c-format
msgid "no %s cache exists. creating...\n"
msgstr ""
-#: lib/libalpm/sync.c:811
+#: lib/libalpm/sync.c:809
#, c-format
msgid "warning: no %s cache exists. creating..."
msgstr ""
-#: lib/libalpm/sync.c:816
+#: lib/libalpm/sync.c:814
msgid "couldn't create package cache, using /tmp instead\n"
msgstr ""
-#: lib/libalpm/sync.c:817
+#: lib/libalpm/sync.c:815
msgid "warning: couldn't create package cache, using /tmp instead"
msgstr ""
-#: lib/libalpm/sync.c:824
+#: lib/libalpm/sync.c:822
#, c-format
msgid "failed to retrieve some files from %s\n"
msgstr ""
-#: lib/libalpm/sync.c:853 lib/libalpm/sync.c:865
+#: lib/libalpm/sync.c:851 lib/libalpm/sync.c:863
#, c-format
msgid "can't get md5 or sha1 checksum for package %s\n"
msgstr ""
-#: lib/libalpm/sync.c:884
+#: lib/libalpm/sync.c:882
#, c-format
msgid "archive %s was corrupted (bad MD5 or SHA1 checksum)\n"
msgstr ""
-#: lib/libalpm/sync.c:886
+#: lib/libalpm/sync.c:884
#, c-format
msgid "archive %s is corrupted (bad MD5 or SHA1 checksum)\n"
msgstr ""
-#: lib/libalpm/sync.c:907
+#: lib/libalpm/sync.c:905
msgid "could not create removal transaction"
msgstr ""
-#: lib/libalpm/sync.c:913
+#: lib/libalpm/sync.c:911
msgid "could not initialize the removal transaction"
msgstr ""
-#: lib/libalpm/sync.c:933
+#: lib/libalpm/sync.c:931
msgid "removing conflicting and to-be-replaced packages"
msgstr ""
-#: lib/libalpm/sync.c:935
+#: lib/libalpm/sync.c:933
msgid "could not prepare removal transaction"
msgstr ""
-#: lib/libalpm/sync.c:941
+#: lib/libalpm/sync.c:939
msgid "could not commit removal transaction"
msgstr ""
-#: lib/libalpm/sync.c:948
+#: lib/libalpm/sync.c:946
msgid "installing packages"
msgstr ""
-#: lib/libalpm/sync.c:951
+#: lib/libalpm/sync.c:949
msgid "could not create transaction"
msgstr ""
-#: lib/libalpm/sync.c:956
+#: lib/libalpm/sync.c:954
msgid "could not initialize transaction"
msgstr ""
-#: lib/libalpm/sync.c:979
+#: lib/libalpm/sync.c:977
msgid "could not prepare transaction"
msgstr ""
-#: lib/libalpm/sync.c:991
+#: lib/libalpm/sync.c:989
msgid "updating database for replaced packages' dependencies"
msgstr ""
-#: lib/libalpm/sync.c:1020
+#: lib/libalpm/sync.c:1018
#, c-format
msgid "could not update requiredby for database entry %s-%s"
msgstr ""
-#: lib/libalpm/sync.c:1029
+#: lib/libalpm/sync.c:1027
#, c-format
msgid "could not update new database entry %s-%s"
msgstr ""
@@ -1353,17 +1348,17 @@ msgstr ""
msgid "call to popen failed (%s)"
msgstr ""
-#: lib/libalpm/util.c:529
+#: lib/libalpm/util.c:536
#, c-format
msgid "call to waitpid failed (%s)"
msgstr ""
-#: lib/libalpm/util.c:537
+#: lib/libalpm/util.c:545
#, c-format
msgid "could not remove tmpdir %s"
msgstr ""
-#: lib/libalpm/util.c:594
+#: lib/libalpm/util.c:602
#, c-format
msgid "check_freespace: total pkg size: %lld, disk space: %lld"
msgstr ""
diff --git a/src/pacman/po/it.po b/src/pacman/po/it.po
index 6866e003..40960479 100644
--- a/src/pacman/po/it.po
+++ b/src/pacman/po/it.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Pacman package manager 3.0.0\n"
"Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
-"POT-Creation-Date: 2007-02-13 15:47+0100\n"
-"PO-Revision-Date: 2007-02-13 16:10+0100\n"
+"POT-Creation-Date: 2007-02-14 18:25+0100\n"
+"PO-Revision-Date: 2007-02-14 18:30+0100\n"
"Last-Translator: Giovanni Scafora <linuxmania@gmail.com>\n"
"Language-Team: Arch Linux Italian Team <linuxmania@gmail.com>\n"
"MIME-Version: 1.0\n"
@@ -59,10 +59,10 @@ msgstr ":: %s: richiede %s"
msgid ":: %s: conflicts with %s"
msgstr ":: %s: va in conflitto con %s"
-#: src/pacman/add.c:127 src/pacman/sync.c:665
+#: src/pacman/add.c:127
#, c-format
-msgid "%s%s exists in \"%s\" (target) and \"%s\" (target)\n"
-msgstr "%s%s è presente in \"%s\" e in \"%s\"\n"
+msgid "%s%s exists in both '%s' and '%s'\n"
+msgstr "%s%s è presente in '%s' e in '%s'\n"
#: src/pacman/add.c:134 src/pacman/sync.c:672
#, c-format
@@ -937,6 +937,11 @@ msgstr ""
msgid "Proceed with installation? [Y/n] "
msgstr "Procedere con l'installazione? [Y/n] "
+#: src/pacman/sync.c:665
+#, c-format
+msgid "%s%s exists in \"%s\" (target) and \"%s\" (target)\n"
+msgstr "%s%s è presente in \"%s\" e in \"%s\"\n"
+
#: src/pacman/trans.c:52
msgid "checking dependencies... "
msgstr "controllo delle dipendenze in corso... "
diff --git a/src/pacman/po/pacman.pot b/src/pacman/po/pacman.pot
index 105e68dc..5358ef1b 100644
--- a/src/pacman/po/pacman.pot
+++ b/src/pacman/po/pacman.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
-"POT-Creation-Date: 2007-02-12 10:17-0500\n"
+"POT-Creation-Date: 2007-02-14 14:33-0500\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -57,7 +57,7 @@ msgstr ""
#: src/pacman/add.c:127 src/pacman/sync.c:665
#, c-format
-msgid "%s%s exists in \"%s\" (target) and \"%s\" (target)\n"
+msgid "%s%s exists in both '%s' and '%s'\n"
msgstr ""
#: src/pacman/add.c:134 src/pacman/sync.c:672
@@ -160,161 +160,160 @@ msgstr ""
msgid "Installed as a dependency for another package"
msgstr ""
-#: src/pacman/package.c:63 src/pacman/package.c:85
+#: src/pacman/package.c:63 src/pacman/package.c:87
msgid "Unknown"
msgstr ""
-#: src/pacman/package.c:68 src/pacman/package.c:119
+#: src/pacman/package.c:67 src/pacman/package.c:118
+msgid "Description : "
+msgstr ""
+
+#: src/pacman/package.c:70 src/pacman/package.c:124
#, c-format
msgid "Name : %s\n"
msgstr ""
-#: src/pacman/package.c:69 src/pacman/package.c:120
+#: src/pacman/package.c:71 src/pacman/package.c:125
#, c-format
msgid "Version : %s\n"
msgstr ""
-#: src/pacman/package.c:70
+#: src/pacman/package.c:72
#, c-format
msgid "URL : %s\n"
msgstr ""
-#: src/pacman/package.c:71
+#: src/pacman/package.c:73
msgid "License :"
msgstr ""
-#: src/pacman/package.c:72 src/pacman/package.c:121
+#: src/pacman/package.c:74 src/pacman/package.c:126
msgid "Groups :"
msgstr ""
-#: src/pacman/package.c:73 src/pacman/package.c:122
+#: src/pacman/package.c:75 src/pacman/package.c:127
msgid "Provides :"
msgstr ""
-#: src/pacman/package.c:74 src/pacman/package.c:123
+#: src/pacman/package.c:76 src/pacman/package.c:128
msgid "Depends On :"
msgstr ""
-#: src/pacman/package.c:75 src/pacman/package.c:124
+#: src/pacman/package.c:77 src/pacman/package.c:129
msgid "Removes :"
msgstr ""
-#: src/pacman/package.c:78
+#: src/pacman/package.c:80
msgid "Required By :"
msgstr ""
-#: src/pacman/package.c:80 src/pacman/package.c:125
+#: src/pacman/package.c:82 src/pacman/package.c:130
msgid "Conflicts With :"
msgstr ""
-#: src/pacman/package.c:81
+#: src/pacman/package.c:83
#, c-format
msgid "Installed Size : %ld K\n"
msgstr ""
-#: src/pacman/package.c:82
+#: src/pacman/package.c:84
#, c-format
msgid "Packager : %s\n"
msgstr ""
-#: src/pacman/package.c:83
+#: src/pacman/package.c:85
#, c-format
msgid "Architecture : %s\n"
msgstr ""
-#: src/pacman/package.c:84
+#: src/pacman/package.c:86
#, c-format
msgid "Build Date : %s %s\n"
msgstr ""
-#: src/pacman/package.c:85
+#: src/pacman/package.c:87
#, c-format
msgid "Build Type : %s\n"
msgstr ""
-#: src/pacman/package.c:87
+#: src/pacman/package.c:89
#, c-format
msgid "Install Date : %s %s\n"
msgstr ""
-#: src/pacman/package.c:88
+#: src/pacman/package.c:90
#, c-format
msgid "Install Reason : %s\n"
msgstr ""
-#: src/pacman/package.c:90
+#: src/pacman/package.c:92
#, c-format
msgid "Install Script : %s\n"
msgstr ""
-#: src/pacman/package.c:91
+#: src/pacman/package.c:93
msgid "Yes"
msgstr ""
-#: src/pacman/package.c:91
+#: src/pacman/package.c:93
msgid "No"
msgstr ""
-#: src/pacman/package.c:93 src/pacman/package.c:130
-#, c-format
-msgid "Description : "
-msgstr ""
-
-#: src/pacman/package.c:118
+#: src/pacman/package.c:123
#, c-format
msgid "Repository : %s\n"
msgstr ""
-#: src/pacman/package.c:126
+#: src/pacman/package.c:131
msgid "Replaces :"
msgstr ""
-#: src/pacman/package.c:127
+#: src/pacman/package.c:132
#, c-format
msgid "Download Size : %6.2f K\n"
msgstr ""
-#: src/pacman/package.c:128
+#: src/pacman/package.c:133
#, c-format
msgid "Installed Size : %6.2f K\n"
msgstr ""
-#: src/pacman/package.c:135
+#: src/pacman/package.c:141
#, c-format
msgid "MD5 Sum : %s"
msgstr ""
-#: src/pacman/package.c:138
+#: src/pacman/package.c:144
#, c-format
msgid "SHA1 Sum : %s"
msgstr ""
-#: src/pacman/package.c:149
+#: src/pacman/package.c:155
#, c-format
msgid "Backup Files :\n"
msgstr ""
-#: src/pacman/package.c:169
+#: src/pacman/package.c:175
#, c-format
msgid "error calculating checksums for %s\n"
msgstr ""
-#: src/pacman/package.c:182
+#: src/pacman/package.c:188
#, c-format
msgid "MODIFIED\t%s\n"
msgstr ""
-#: src/pacman/package.c:184
+#: src/pacman/package.c:190
#, c-format
msgid "Not Modified\t%s\n"
msgstr ""
-#: src/pacman/package.c:189
+#: src/pacman/package.c:195
#, c-format
msgid "MISSING\t\t%s\n"
msgstr ""
-#: src/pacman/package.c:222
+#: src/pacman/package.c:228
#, c-format
msgid "No changelog available for '%s'.\n"
msgstr ""
@@ -594,7 +593,7 @@ msgstr ""
#: src/pacman/pacman.c:158
#, c-format
-msgid " --cachedir <dir> set an alternate database location\n"
+msgid " --cachedir <dir> set an alternate package cache location\n"
msgstr ""
#: src/pacman/pacman.c:171
@@ -631,34 +630,38 @@ msgstr ""
msgid "only one operation may be used at a time\n"
msgstr ""
-#: src/pacman/pacman.c:461
+#: src/pacman/pacman.c:444
+msgid "warning: default locale is invalid; using default \"C\" locale"
+msgstr ""
+
+#: src/pacman/pacman.c:463
#, c-format
msgid "failed to initilize alpm library (%s)\n"
msgstr ""
-#: src/pacman/pacman.c:494
+#: src/pacman/pacman.c:496
msgid "you cannot perform this operation unless you are root.\n"
msgstr ""
-#: src/pacman/pacman.c:510
+#: src/pacman/pacman.c:512
#, c-format
msgid "failed to parse config (%s)\n"
msgstr ""
-#: src/pacman/pacman.c:520 src/pacman/remove.c:125 src/pacman/util.c:323
+#: src/pacman/pacman.c:522 src/pacman/remove.c:125 src/pacman/util.c:323
msgid "Targets:"
msgstr ""
-#: src/pacman/pacman.c:526
+#: src/pacman/pacman.c:528
#, c-format
msgid "could not register 'local' database (%s)\n"
msgstr ""
-#: src/pacman/pacman.c:533
+#: src/pacman/pacman.c:535
msgid "no targets specified (use -h for help)\n"
msgstr ""
-#: src/pacman/pacman.c:546
+#: src/pacman/pacman.c:548
msgid "no operation specified (use -h for help)\n"
msgstr ""
diff --git a/src/pacman/sync.c b/src/pacman/sync.c
index 54ef205f..654c4613 100644
--- a/src/pacman/sync.c
+++ b/src/pacman/sync.c
@@ -662,7 +662,7 @@ int pacman_sync(alpm_list_t *targets)
pmconflict_t *conflict = alpm_list_getdata(i);
switch(alpm_conflict_get_type(conflict)) {
case PM_CONFLICT_TYPE_TARGET:
- MSG(NL, _("%s%s exists in \"%s\" (target) and \"%s\" (target)\n"),
+ MSG(NL, _("%s%s exists in both '%s' and '%s'\n"),
alpm_option_get_root(),
alpm_conflict_get_file(conflict),
alpm_conflict_get_target(conflict),
diff --git a/src/pacman/trans.c b/src/pacman/trans.c
index a354955f..22443216 100644
--- a/src/pacman/trans.c
+++ b/src/pacman/trans.c
@@ -281,7 +281,7 @@ void cb_trans_progress(pmtransprog_t event, char *pkgname, const int percent,
/* size of line to allocate for text printing (e.g. not progressbar) */
const int infolen = 50;
int i, digits, textlen, pkglen;
- char *ptr = NULL;
+ char *opr = NULL;
if(config->noprogressbar) {
return;
@@ -311,16 +311,16 @@ void cb_trans_progress(pmtransprog_t event, char *pkgname, const int percent,
prevpercent=percent;
switch (event) {
case PM_TRANS_PROGRESS_ADD_START:
- ptr = _("installing");
+ opr = _("installing");
break;
case PM_TRANS_PROGRESS_UPGRADE_START:
- ptr = _("upgrading");
+ opr = _("upgrading");
break;
case PM_TRANS_PROGRESS_REMOVE_START:
- ptr = _("removing");
+ opr = _("removing");
break;
case PM_TRANS_PROGRESS_CONFLICTS_START:
- ptr = _("checking for file conflicts");
+ opr = _("checking for file conflicts");
break;
}
@@ -334,19 +334,21 @@ void cb_trans_progress(pmtransprog_t event, char *pkgname, const int percent,
/* determine room left for non-digits text [not ( 1/12) part] */
textlen = infolen - 3 - (2 * digits);
/* room left for package name */
- pkglen = textlen - mbstowcs(NULL, ptr, 0) - 1;
+ pkglen = textlen - mbstowcs(NULL, opr, 0) - 1;
switch (event) {
case PM_TRANS_PROGRESS_ADD_START:
case PM_TRANS_PROGRESS_UPGRADE_START:
case PM_TRANS_PROGRESS_REMOVE_START:
/* TODO clean up so digits and pkglen aren't passed twice */
+ /* TODO we may need some sort of wchar_t wprintf output here in order
+ * to get the lengths right, prinf works on bytes and not chars */
printf("(%*d/%*d) %s %-*.*s", digits, remain, digits, howmany,
- ptr, pkglen, pkglen, pkgname);
+ opr, pkglen, pkglen, pkgname);
break;
case PM_TRANS_PROGRESS_CONFLICTS_START:
printf("(%*d/%*d) %-*s", digits, remain, digits, howmany,
- textlen, ptr);
+ textlen, opr);
break;
}
generated by cgit v1.2.3-70-g09d2 (git 2.47.0) at 2024-11-23 05:09:57 +0000