- Pacman-dev - lists.archlinux.org

[pacman-dev] cvs sources does not compile
by Giovanni Scafora 14 Mar '07

14 Mar '07

Hi guys, I cannot compile cvs source since latest french .po update. I've got this error: fr.po:975: number of format specifications in 'msgid' and 'msgstr' does not match /usr/bin/msgfmt: found 1 fatal error Please, fix it. -- Giovanni Scafora Arch Linux Trusted User (voidnull) http://www.archlinux.org linuxmania(a)gmail.com

1 0

[pacman-dev] CVS update of pacman-lib (TODO.dan src/pacman/po/fr.po)
by Dan McGee 13 Mar '07

13 Mar '07

Date: Tuesday, March 13, 2007 @ 17:05:02 Author: dan Path: /home/cvs-pacman/pacman-lib Modified: TODO.dan (1.16 -> 1.17) src/pacman/po/fr.po (1.8 -> 1.9) * Small updates to my TODO file. * Updated fr.po courtesy of solsTiCe d'Hiver <solstice.dhiver(a)laposte.net>. ---------------------+ TODO.dan | 3 src/pacman/po/fr.po | 264 ++++++++++++++++++++++++-------------------------- 2 files changed, 130 insertions(+), 137 deletions(-) Index: pacman-lib/TODO.dan diff -u pacman-lib/TODO.dan:1.16 pacman-lib/TODO.dan:1.17 --- pacman-lib/TODO.dan:1.16 Mon Feb 26 10:10:53 2007 +++ pacman-lib/TODO.dan Tue Mar 13 17:05:01 2007 @@ -81,7 +81,8 @@ issues- use non-printf when necessary, make sure all two line printed messages (especially usage instructions) are printed using one print statement. We may need to use some wchar_t output on the progress bar as char/byte counts -differ here. +differ here. Sizes of packages (e.g. 10,400.23 MB) should all be localized with +correct seperators. Rewrite makepkg to use terminal-safe coloring/bolding. tput utility should allow us to do this. Make universal message functions for systemwide use, Index: pacman-lib/src/pacman/po/fr.po diff -u pacman-lib/src/pacman/po/fr.po:1.8 pacman-lib/src/pacman/po/fr.po:1.9 --- pacman-lib/src/pacman/po/fr.po:1.8 Wed Mar 7 11:57:23 2007 +++ pacman-lib/src/pacman/po/fr.po Tue Mar 13 17:05:02 2007 @@ -1,15 +1,15 @@ # French 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. +# Enda <enda(a)netou.com>, 2006 # msgid "" msgstr "" "Project-Id-Version: pacman\n" "Report-Msgid-Bugs-To: pacman-dev(a)archlinux.org\n" -"POT-Creation-Date: 2007-03-07 11:45-0500\n" -"PO-Revision-Date: 2006-06-05 22:46+0100\n" -"Last-Translator: Enda <enda(a)netou.com>\n" +"POT-Creation-Date: 2007-03-13 16:55-0400\n" +"PO-Revision-Date: 2007-03-08 04:46-0500\n" +"Last-Translator: solsTiCe d'hiver <solstice.dhiver(a)laposte.net>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=iso-8859-15\n" "Content-Transfer-Encoding: 8bit\n" @@ -23,13 +23,13 @@ " if you're sure a package manager is not already running,\n" " you can remove %s%s\n" msgstr "" -" Si vous êtes sur que le gestionnaire de paquet ne fonctionne pas " +" Si vous êtes sûr que le gestionnaire de paquet ne fonctionne pas " "déjà,\n" " vous pouvez retirer %s\n" #: src/pacman/add.c:79 msgid "loading package data... " -msgstr "chargement des données du paquet.." +msgstr "chargement des données du paquet... " #: src/pacman/add.c:83 #, fuzzy, c-format @@ -61,12 +61,12 @@ #: src/pacman/add.c:134 src/pacman/sync.c:709 #, fuzzy, c-format msgid "%s exists in both '%s' and '%s'\n" -msgstr "%s%s existe dans \"%s\" (cible) and \"%s\" (cible)" +msgstr "%s existe à la fois dans \"%s\" et \"%s\"\n" #: src/pacman/add.c:140 src/pacman/sync.c:715 #, fuzzy, c-format msgid "%s: %s exists in filesystem\n" -msgstr "%s: %s%s existe dans le système de fichiers" +msgstr "%s: %s existe dans le système de fichiers\n" #: src/pacman/add.c:146 src/pacman/sync.c:721 src/pacman/sync.c:727 msgid "" @@ -79,7 +79,7 @@ #: src/pacman/add.c:156 src/pacman/sync.c:652 #, c-format msgid ":: %.1f MB required, have %.1f MB" -msgstr "" +msgstr ":: %.1f Mo nécessaire, %.1f Mo disponible" #: src/pacman/add.c:169 src/pacman/remove.c:141 src/pacman/sync.c:702 #, c-format @@ -92,7 +92,7 @@ msgid "failed to release transaction (%s)\n" msgstr "échec de libération de la transaction (%s)\n" -#: src/pacman/deptest.c:86 +#: src/pacman/deptest.c:84 #, c-format msgid "requires: %s" msgstr "requiert: %s" @@ -100,7 +100,7 @@ #: src/pacman/log.c:63 #, c-format msgid "debug" -msgstr "" +msgstr "débogage" #: src/pacman/log.c:66 #, c-format @@ -128,31 +128,31 @@ #: src/pacman/log.h:30 #, fuzzy msgid "error: " -msgstr "erreur" +msgstr "erreur: " #: src/pacman/log.h:34 #, fuzzy msgid "warning: " -msgstr "avertissement" +msgstr "avertissement: " #: src/pacman/package.c:60 #, fuzzy msgid "Explicitly installed" -msgstr "Explicitement installé\n" +msgstr "Explicitement installé" #: src/pacman/package.c:63 #, fuzzy msgid "Installed as a dependency for another package" -msgstr "Installé comme dépendance un autre paquet\n" +msgstr "Installé comme dépendance un autre paquet" #: src/pacman/package.c:66 src/pacman/package.c:90 #, fuzzy msgid "Unknown" -msgstr "Inconnu\n" +msgstr "Inconnu" #: src/pacman/package.c:70 src/pacman/package.c:121 msgid "Description : " -msgstr "" +msgstr "Description : " #: src/pacman/package.c:73 src/pacman/package.c:127 #, c-format @@ -162,16 +162,16 @@ #: src/pacman/package.c:74 src/pacman/package.c:128 #, c-format msgid "Version : %s\n" -msgstr "" +msgstr "Version : %s\n" #: src/pacman/package.c:75 #, fuzzy, c-format msgid "URL : %s\n" -msgstr "Nom : %s\n" +msgstr "URL : %s\n" #: src/pacman/package.c:76 msgid "License :" -msgstr "" +msgstr "Licence :" #: src/pacman/package.c:77 src/pacman/package.c:129 msgid "Groups :" @@ -187,7 +187,7 @@ #: src/pacman/package.c:80 src/pacman/package.c:132 msgid "Removes :" -msgstr "Supprimer :" +msgstr "Supprime :" #: src/pacman/package.c:83 msgid "Required By :" @@ -197,20 +197,20 @@ msgid "Conflicts With :" msgstr "Conflit avec :" -#: src/pacman/package.c:86 +#: src/pacman/package.c:86 src/pacman/package.c:136 #, fuzzy, c-format -msgid "Installed Size : %ld K\n" -msgstr "Script d'installation : %s\n" +msgid "Installed Size : %6.2f K\n" +msgstr "Taile d'installation : %6.2f K\n" #: src/pacman/package.c:87 #, c-format msgid "Packager : %s\n" -msgstr "" +msgstr "Packageur : %s\n" #: src/pacman/package.c:88 #, c-format msgid "Architecture : %s\n" -msgstr "" +msgstr "Architecture : %s\n" #: src/pacman/package.c:89 #, c-format @@ -220,7 +220,7 @@ #: src/pacman/package.c:90 #, fuzzy, c-format msgid "Build Type : %s\n" -msgstr "Date de construction : %s %s\n" +msgstr "Type de construction : %s\n" #: src/pacman/package.c:92 #, c-format @@ -230,12 +230,12 @@ #: src/pacman/package.c:93 #, fuzzy, c-format msgid "Install Reason : %s\n" -msgstr "Script d'installation : %s\n" +msgstr "Raison d'installation : %s\n" #: src/pacman/package.c:95 #, c-format msgid "Install Script : %s\n" -msgstr "Script d'installation : %s\n" +msgstr "Script d'installation : %s\n" #: src/pacman/package.c:96 msgid "Yes" @@ -248,7 +248,7 @@ #: src/pacman/package.c:126 #, fuzzy, c-format msgid "Repository : %s\n" -msgstr "Dépot : %s\n" +msgstr "Dépôt : %s\n" #: src/pacman/package.c:134 #, fuzzy @@ -258,46 +258,37 @@ #: src/pacman/package.c:135 #, c-format msgid "Download Size : %6.2f K\n" -msgstr "" - -#: src/pacman/package.c:136 -#, fuzzy, c-format -msgid "Installed Size : %6.2f K\n" -msgstr "Script d'installation : %s\n" +msgstr "Taille de téléchargement : %6.2f K\n" #: src/pacman/package.c:144 #, fuzzy, c-format msgid "MD5 Sum : %s" -msgstr "" -"\n" -"somme MD5 : %s" +msgstr "somme MD5 : %s" #: src/pacman/package.c:147 #, fuzzy, c-format msgid "SHA1 Sum : %s" -msgstr "" -"\n" -"Somme SHA1 : %s" +msgstr "somme SHA1 : %s" #: src/pacman/package.c:158 #, c-format msgid "Backup Files:\n" -msgstr "" +msgstr "Fichier sauvegardés:\n" #: src/pacman/package.c:180 #, fuzzy, c-format msgid "error calculating checksums for %s\n" -msgstr "erreur lors du calcul des sommes md5 ou sha1 pour %s\n" +msgstr "erreur lors du calcul des sommes de contrôles pour %s\n" #: src/pacman/package.c:193 #, fuzzy, c-format msgid "MODIFIED\t%s\n" -msgstr "%sMODIFIE\t%s\n" +msgstr "MODIFIE\t%s\n" #: src/pacman/package.c:195 #, c-format msgid "Not Modified\t%s\n" -msgstr "" +msgstr "Non Modifié\t%s\n" #: src/pacman/package.c:200 #, c-format @@ -307,7 +298,7 @@ #: src/pacman/package.c:206 #, fuzzy, c-format msgid "(none)\n" -msgstr "Aucun\n" +msgstr "(Aucun)\n" #: src/pacman/package.c:246 #, c-format @@ -317,42 +308,42 @@ #: src/pacman/pacman.c:90 #, c-format msgid "usage: %s {-h --help}\n" -msgstr "" +msgstr "usage: %s {-h --help}\n" #: src/pacman/pacman.c:91 #, c-format msgid " %s {-V --version}\n" -msgstr "" +msgstr " %s {-V --version}\n" #: src/pacman/pacman.c:92 #, c-format msgid " %s {-A --add} [options] <file>\n" -msgstr "" +msgstr " %s {-A --add} [options] <fichier>\n" #: src/pacman/pacman.c:93 #, c-format msgid " %s {-F --freshen} [options] <file>\n" -msgstr "" +msgstr " %s {-F --freshen} [options] <fichier>\n" #: src/pacman/pacman.c:94 #, c-format msgid " %s {-Q --query} [options] [package]\n" -msgstr "" +msgstr " %s {-Q --query} [options] [package]\n" #: src/pacman/pacman.c:95 #, c-format msgid " %s {-R --remove} [options] <package>\n" -msgstr "" +msgstr " %s {-R --remove} [options] <package>\n" #: src/pacman/pacman.c:96 #, c-format msgid " %s {-S --sync} [options] [package]\n" -msgstr "" +msgstr " %s {-S --sync} [options] [package]\n" #: src/pacman/pacman.c:97 #, c-format msgid " %s {-U --upgrade} [options] <file>\n" -msgstr "" +msgstr " %s {-U --upgrade} [options] <fichier>\n" #: src/pacman/pacman.c:98 #, c-format @@ -366,13 +357,13 @@ #: src/pacman/pacman.c:101 #, c-format msgid "usage: %s {-A --add} [options] <file>\n" -msgstr "" +msgstr "usage: %s {-A --add} [options] <fichier>\n" #: 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 "" +msgstr "options:\n" #: src/pacman/pacman.c:103 src/pacman/pacman.c:109 src/pacman/pacman.c:120 #: src/pacman/pacman.c:140 @@ -384,13 +375,13 @@ #, fuzzy, c-format msgid " -f, --force force install, overwrite conflicting files\n" msgstr "" -" -f, --force force l'installation, malgré les éventuels fichiers en " +" -f, --force force l'installation, en écrasant les fichiers en " "conflit\n" #: src/pacman/pacman.c:106 #, c-format msgid "usage: %s {-R --remove} [options] <package>\n" -msgstr "" +msgstr "usage: %s {-R --remove} [options] <paquet>\n" #: src/pacman/pacman.c:108 #, fuzzy, c-format @@ -410,7 +401,7 @@ #: src/pacman/pacman.c:111 #, fuzzy, c-format msgid " -n, --nosave remove configuration files as well\n" -msgstr " -n, --nosave efface également les fichiers de config\n" +msgstr " -n, --nosave efface également les fichiers de configuration\n" #: src/pacman/pacman.c:112 #, fuzzy, c-format @@ -423,17 +414,17 @@ #: src/pacman/pacman.c:115 #, c-format msgid "usage: %s {-F --freshen} [options] <file>\n" -msgstr "" +msgstr "usage: %s {-F --freshen} [options] <fichier>\n" #: src/pacman/pacman.c:117 #, c-format msgid "usage: %s {-U --upgrade} [options] <file>\n" -msgstr "" +msgstr "usage: %s {-U --upgrade} [options] <fichier>\n" #: src/pacman/pacman.c:123 #, c-format msgid "usage: %s {-Q --query} [options] [package]\n" -msgstr "" +msgstr "usage: %s {-Q --query} [options] [package]\n" #: src/pacman/pacman.c:125 #, fuzzy, c-format @@ -452,13 +443,13 @@ #: src/pacman/pacman.c:127 #, fuzzy, c-format msgid " required by any package\n" -msgstr " et ne sont plus requis par aucun autre paquet\n" +msgstr " requis par aucun autre paquet\n" #: src/pacman/pacman.c:128 src/pacman/pacman.c:143 #, fuzzy, c-format msgid " -g, --groups view all members of a package group\n" msgstr "" -" -g, --groups afficher tous les éléments d'un group de paquet\n" +" -g, --groups afficher tous les éléments d'un groupe de paquet\n" #: src/pacman/pacman.c:129 src/pacman/pacman.c:144 #, fuzzy, c-format @@ -484,7 +475,7 @@ msgid " -o, --owns <file> query the package that owns <file>\n" msgstr "" " -o, --owns <fichier> recherche les paquets contenant le fichier " -"<fiichier>\n" +"<fichier>\n" #: src/pacman/pacman.c:133 #, fuzzy, c-format @@ -492,7 +483,8 @@ " -p, --file query the package file [package] instead of the " "database\n" msgstr "" -" -p, --file pacman va interroger le fichier [paquet] au lieu de\n" +" -p, --file utilise le fichier [paquet] au lieu de la base de " +"données\n" #: src/pacman/pacman.c:134 #, fuzzy, c-format @@ -506,12 +498,12 @@ #: src/pacman/pacman.c:135 #, fuzzy, c-format msgid " -u, --upgrades list all packages that can be upgraded\n" -msgstr " -u, --sysupgrade met à jour tous les paquets obsolètes\n" +msgstr " -u, --sysupgrade liste tous les paquets pouvant être mis à jour\n" #: src/pacman/pacman.c:137 #, c-format msgid "usage: %s {-S --sync} [options] [package]\n" -msgstr "" +msgstr "usage: %s {-S --sync} [options] [paquet]\n" #: src/pacman/pacman.c:139 #, fuzzy, c-format @@ -519,8 +511,8 @@ " -c, --clean remove old packages from cache directory (-cc for " "all)\n" msgstr "" -" -c, --clean remove old packages from cache directory (use -cc for " -"all)\n" +" -c, --clean supprime les paquets obsolètes du répertoire de cache " +"(-cc pour tous)\n" #: src/pacman/pacman.c:141 #, fuzzy, c-format @@ -540,7 +532,7 @@ #, fuzzy, c-format msgid "" " -s, --search search remote repositories for matching strings\n" -msgstr " -s, --search recherche la chaîne dans les dépots distants\n" +msgstr " -s, --search recherche la chaîne dans les dépôts distants\n" #: src/pacman/pacman.c:147 #, fuzzy, c-format @@ -588,6 +580,8 @@ msgid "" " --ask <number> pre-specify answers for questions (see manpage)\n" msgstr "" +" --ask <nombre> pré-spécifie des réponses aux questions (voir le " +"manpage\n" #: src/pacman/pacman.c:155 #, fuzzy, c-format @@ -612,21 +606,20 @@ #: src/pacman/pacman.c:158 #, fuzzy, c-format msgid " -r, --root <path> set an alternate installation root\n" -msgstr " -r, --root <path> défini un répertoire d'installation alternatif\n" +msgstr "" +" -r, --root <chemin> défini un répertoire d'installation alternatif\n" #: src/pacman/pacman.c:159 #, fuzzy, c-format msgid " -b, --dbpath <path> set an alternate database location\n" msgstr "" -" -b, --dbpath <path> défini un emplacement alternatif pour les bases de " +" -b, --dbpath <chemin> défini un emplacement alternatif pour les bases de " "données\n" #: src/pacman/pacman.c:160 #, fuzzy, c-format msgid " --cachedir <dir> set an alternate package cache location\n" -msgstr "" -" -b, --dbpath <path> défini un emplacement alternatif pour les bases de " -"données\n" +msgstr " --cachedir <dir> définit un répertoire cache alternatif\n" #: src/pacman/pacman.c:173 #, c-format @@ -642,22 +635,22 @@ #: src/pacman/pacman.c:299 #, fuzzy, c-format msgid "'%s' is not a valid debug level" -msgstr "%s nest pas une expression régulière valide.\n" +msgstr "'%s' n'est pas un niveau valide de débogage\n" #: src/pacman/pacman.c:314 #, fuzzy, c-format msgid "'%s' is not a valid cache directory\n" -msgstr "n'a pas pu acceder au répertoire de cache\n" +msgstr "'%s' n'est pas un repertoire de cache valide\n" #: src/pacman/pacman.c:332 #, fuzzy, c-format msgid "'%s' is not a valid db path\n" -msgstr "%s nest pas une expression régulière valide.\n" +msgstr "'%s' n'est pas un chemin valide vers la base de données\n" #: src/pacman/pacman.c:362 #, fuzzy, c-format msgid "'%s' is not a valid root path\n" -msgstr "%s nest pas une expression régulière valide.\n" +msgstr "'%s' n'est pas un chemin racine valide\n" #: src/pacman/pacman.c:389 msgid "only one operation may be used at a time\n" @@ -666,6 +659,7 @@ #: src/pacman/pacman.c:435 msgid "warning: current locale is invalid; using default \"C\" locale" msgstr "" +"Avertissement: la locale courante est invalide; la locale \"C\" sera utilisée" #: src/pacman/pacman.c:455 #, c-format @@ -679,7 +673,7 @@ #: src/pacman/pacman.c:504 #, fuzzy, c-format msgid "failed to parse config (%s)\n" -msgstr "échec de préparation de la transaction (%s)\n" +msgstr "échec de lecture de la configuration (%s)\n" #: src/pacman/pacman.c:514 src/pacman/remove.c:128 src/pacman/util.c:324 msgid "Targets:" @@ -688,7 +682,7 @@ #: src/pacman/pacman.c:520 #, c-format msgid "could not register 'local' database (%s)\n" -msgstr "n'a pas pu enregistrer la base de données 'locale' (%s)\n" +msgstr "n'a pas pu enregistrer la base de données 'local' (%s)\n" #: src/pacman/pacman.c:527 msgid "no targets specified (use -h for help)\n" @@ -714,16 +708,16 @@ #: src/pacman/query.c:122 src/pacman/sync.c:453 msgid "no usable package repositories configured.\n" -msgstr "aucun dépot de paquet utilisable n'est définit.\n" +msgstr "aucun dépôt de paquet utilisable n'est définie.\n" #: src/pacman/query.c:128 #, fuzzy msgid "Checking for package upgrades..." -msgstr "verification de l'intégrité des paquets" +msgstr "Vérification des mises à jour de paquets..." #: src/pacman/query.c:135 msgid "no upgrades found" -msgstr "" +msgstr "pas de mises à jour trouvées" #: src/pacman/query.c:173 #, c-format @@ -739,7 +733,7 @@ msgid "failed to load package '%s' (%s)\n" msgstr "échec de chargement du paquet '%s' (%s)\n" -#: src/pacman/query.c:226 src/pacman/query.c:258 +#: src/pacman/query.c:225 src/pacman/query.c:257 #, c-format msgid "package \"%s\" not found\n" msgstr "paquet \"%s\" non trouvé\n" @@ -756,7 +750,7 @@ #: src/pacman/remove.c:67 #, c-format msgid ":: Remove %s from group %s? [Y/n] " -msgstr ":: Retirer %s du groupe %s? [O/n] " +msgstr ":: Supprimer %s du groupe %s? [O/n] " #: src/pacman/remove.c:80 src/pacman/sync.c:480 src/pacman/sync.c:529 #, c-format @@ -771,7 +765,7 @@ #: src/pacman/remove.c:106 #, fuzzy, c-format msgid ":: %s is required by %s\n" -msgstr " %s: est requit par %s\n" +msgstr ":: %s est requit par %s\n" #: src/pacman/remove.c:131 msgid "" @@ -779,11 +773,11 @@ "Do you want to remove these packages? [Y/n] " msgstr "" "\n" -"Voules vous désinstaller ces paquets? [O/n] " +"Voulez vous désinstaller ces paquets? [O/n] " #: src/pacman/sync.c:115 msgid "Do you want to remove old packages from cache? [Y/n] " -msgstr "Voulez vous effacer les anciens paquets du cache? [Y/n] " +msgstr "Voulez vous effacer les anciens paquets du cache? [O/n] " #: src/pacman/sync.c:117 msgid "removing old packages from cache... " @@ -791,7 +785,7 @@ #: src/pacman/sync.c:120 msgid "could not access cache directory\n" -msgstr "n'a pas pu acceder au répertoire de cache\n" +msgstr "n'a pas pu accéder au répertoire de cache\n" #: src/pacman/sync.c:181 msgid "Do you want to remove all packages from cache? [Y/n] " @@ -812,12 +806,12 @@ #: src/pacman/sync.c:218 #, fuzzy, c-format msgid "failed to synchronize %s: %s\n" -msgstr "echec lors de la synchronisation %s\n" +msgstr "échec lors de la synchronisation %s\n" #: src/pacman/sync.c:220 #, c-format msgid "failed to update %s (%s)\n" -msgstr "echec de mise à jour %s (%s)\n" +msgstr "échec de la mise à jour %s (%s)\n" #: src/pacman/sync.c:223 #, c-format @@ -827,12 +821,12 @@ #: src/pacman/sync.c:345 #, fuzzy, c-format msgid "repository '%s' does not exist\n" -msgstr "le dépot \"%s\" n'a pas été trouvé.\n" +msgstr "le dépôt \"%s\" n'a pas été trouvé.\n" #: src/pacman/sync.c:361 #, fuzzy, c-format msgid "package '%s' was not found in repository '%s'\n" -msgstr "paquet \"%s\" non trouvé.\n" +msgstr "paquet '%s' non trouvé dans le dépôt '%s'\n" #: src/pacman/sync.c:381 #, fuzzy, c-format @@ -842,7 +836,7 @@ #: src/pacman/sync.c:418 #, c-format msgid "repository \"%s\" was not found.\n" -msgstr "le dépot \"%s\" n'a pas été trouvé.\n" +msgstr "le dépôt \"%s\" n'a pas été trouvé.\n" #: src/pacman/sync.c:490 msgid ":: Synchronizing package databases...\n" @@ -855,16 +849,16 @@ #: src/pacman/sync.c:493 #, fuzzy msgid "failed to synchronize any databases" -msgstr "echec lors de la synchronisation %s\n" +msgstr "échec lors de la synchronisation" #: src/pacman/sync.c:499 #, fuzzy msgid ":: Starting full system upgrade...\n" -msgstr "demarrage de la mise à jour pour le système complet" +msgstr ":: Démarrage de la mise à jour complète du système\n" #: src/pacman/sync.c:500 msgid "starting full system upgrade" -msgstr "demarrage de la mise à jour pour le système complet" +msgstr "démarrage de la mise à jour complète du système" #: src/pacman/sync.c:518 msgid "" @@ -890,12 +884,12 @@ #: src/pacman/sync.c:537 #, fuzzy, c-format msgid "pacman: %s\n" -msgstr "Aucun paquet ne contient %s\n" +msgstr "pacman: %s\n" #: src/pacman/sync.c:557 #, c-format msgid "'%s': %s\n" -msgstr "" +msgstr "'%s': %s\n" #: src/pacman/sync.c:572 msgid ":: Install whole content? [Y/n] " @@ -909,9 +903,7 @@ #: src/pacman/sync.c:603 #, fuzzy, c-format msgid "'%s': not found in sync db\n" -msgstr "" -"n'a pas pu ajouter la cible '%s': non trouvé dans la base de données de " -"synchronisation\n" +msgstr "%s': non trouvé dans la base de données de synchronisation\n" #: src/pacman/sync.c:623 msgid "requires" @@ -924,7 +916,7 @@ #: src/pacman/sync.c:665 #, fuzzy msgid " local database is up to date\n" -msgstr " %s est à jour\n" +msgstr " base de données local est à jour\n" #: src/pacman/sync.c:674 msgid "" @@ -962,11 +954,11 @@ #: src/pacman/trans.c:63 #, fuzzy msgid "cleaning up... " -msgstr "désinstallation de %s... " +msgstr "nettoyage... " #: src/pacman/trans.c:66 msgid "resolving dependencies... " -msgstr "résolution des dépendances..." +msgstr "résolution des dépendances... " #: src/pacman/trans.c:69 msgid "looking for inter-conflicts... " @@ -975,12 +967,12 @@ #: src/pacman/trans.c:89 #, c-format msgid "installing %s... " -msgstr "installation de %s ..." +msgstr "installation de %s... " #: src/pacman/trans.c:96 #, c-format msgid "installed %s (%s)" -msgstr "%s installé (%s)" +msgstr "%s installé %s (%s)" #: src/pacman/trans.c:103 #, c-format @@ -1000,41 +992,39 @@ #: src/pacman/trans.c:124 #, c-format msgid "upgraded %s (%s -> %s)" -msgstr "%s mit à jour (%s -> %s)" +msgstr "%s mis à jour (%s -> %s)" #: src/pacman/trans.c:131 msgid "checking package integrity... " -msgstr "verification de l'intégrité des paquets" +msgstr "vérification de l'intégrité des paquets..." #: src/pacman/trans.c:147 msgid "failed.\n" -msgstr "" +msgstr "échec.\n" #: src/pacman/trans.c:154 #, fuzzy, c-format msgid ":: Retrieving packages from %s...\n" -msgstr "" -"\n" -":: Récupération des paquets depuis %s...\n" +msgstr ":: Récupération des paquets depuis %s...\n" #: src/pacman/trans.c:175 #, fuzzy, c-format msgid ":: %1$s requires %2$s from IgnorePkg. Install %2$s? [Y/n] " msgstr "" -":: %s requiert %s, mais il est défini en IgnorePkg. Installer tout de même? " -"[Y/n] " +":: %s nécessite %s, mais il est défini en IgnorePkg. Installer tout de même? " +"[O/n] " #: src/pacman/trans.c:180 #, fuzzy, c-format msgid ":: %s is in IgnorePkg. Install anyway? [Y/n] " msgstr "" -":: %s requiert %s, mais il est défini en IgnorePkg. Installer tout de même? " -"[Y/n] " +":: %s nécessite %s, mais il est défini en IgnorePkg. Installer tout de même? " +"[O/n] " #: src/pacman/trans.c:193 #, fuzzy, c-format msgid ":: %s is designated as a HoldPkg. Remove anyway? [Y/n] " -msgstr ":: %s est indiqué comme \"HoldPkg\". Supprimer tout de même? [Y/n] " +msgstr ":: %s est indiqué comme \"HoldPkg\". Supprimer tout de même? [O/n] " #: src/pacman/trans.c:206 #, c-format @@ -1044,25 +1034,25 @@ #: src/pacman/trans.c:221 #, c-format msgid ":: %s conflicts with %s. Remove %s? [Y/n] " -msgstr ":: %s est en conflit avec with %s. Retirer %s? [O/n] " +msgstr ":: %s est en conflit avec %s. Retirer %s? [O/n] " #: src/pacman/trans.c:237 #, c-format msgid ":: %s-%s: local version is newer. Upgrade anyway? [Y/n] " msgstr "" -":: %s-%s: la version locale est plus récente. Mettre à jour tout de même? [Y/" +":: %s-%s: la version locale est plus récente. Mettre à jour tout de même? [O/" "n] " #: src/pacman/trans.c:255 #, c-format msgid ":: %s-%s: local version is up to date. Upgrade anyway? [Y/n] " msgstr "" -":: %s-%s: la version locale est à jour. Mettre à jour tout de même? [Y/n] " +":: %s-%s: la version locale est à jour. Mettre à jour tout de même? [O/n] " #: src/pacman/trans.c:273 #, c-format msgid ":: Archive %s is corrupted. Do you want to delete it? [Y/n] " -msgstr ":: L'archive %s est corrompue. Voulez vous l'effacer? [Y/n] " +msgstr ":: L'archive %s est corrompue. Voulez vous l'effacer? [O/n] " #: src/pacman/trans.c:329 msgid "installing" @@ -1075,12 +1065,12 @@ #: src/pacman/trans.c:335 #, fuzzy msgid "removing" -msgstr "désinstallation de %s... " +msgstr "désinstallation" #: src/pacman/trans.c:338 #, fuzzy msgid "checking for file conflicts" -msgstr "vérification des conflits de fichiers..." +msgstr "vérification des conflits de fichiers" #: src/pacman/util.c:259 #, c-format @@ -1090,9 +1080,7 @@ #: src/pacman/util.c:311 #, fuzzy msgid "Remove:" -msgstr "" -"\n" -"Retire: " +msgstr "Supression:" #: src/pacman/util.c:319 #, fuzzy, c-format @@ -1101,7 +1089,7 @@ "Total Removed Size: %.2f MB\n" msgstr "" "\n" -"Taille Totale du Paquet: %.1f MB\n" +"Taille totale du paquet: %.2f Mo\n" #: src/pacman/util.c:330 #, fuzzy, c-format @@ -1110,14 +1098,18 @@ "Total Package Size: %.2f MB\n" msgstr "" "\n" -"Taille Totale du Paquet: %.1f MB\n" +"Taille totale du paquet: %.2f Mo\n" #: src/pacman/util.c:337 #, fuzzy, c-format msgid "Total Installed Size: %.2f MB\n" msgstr "" "\n" -"Taille Totale du Paquet: %.1f MB\n" +"Taille totale du paquet: %.2f Mo\n" + +#, fuzzy +#~ msgid "Installed Size : %ld K\n" +#~ msgstr "Taille d'installation : %ld K\n" #~ msgid "memory allocation failure\n" #~ msgstr "erreur d'allocation mémoire\n" @@ -1266,7 +1258,7 @@ #~ msgstr "Procéder aux mises à jour? [O/n] " #~ msgid "failed to allocated %d bytes\n" -#~ msgstr "echec lors de l'allocation de %d bytes\n" +#~ msgstr "échec lors de l'allocation de %d bytes\n" #~ msgid "config: new section '%s'\n" #~ msgstr "config: nouvelle section '%s'\n" @@ -1401,7 +1393,7 @@ #~ msgid "failed to get lastupdate time for %s (no big deal)\n" #~ msgstr "" -#~ "echec d'obtention de la dernière mise à jour pour %s (ce n'est pas un " +#~ "échec d'obtention de la dernière mise à jour pour %s (ce n'est pas un " #~ "gros problème)\n" #~ msgid "sync: new mtime for %s: %s\n" @@ -1426,4 +1418,4 @@ #~ "à la place" #~ msgid "failed to retrieve some files from %s\n" -#~ msgstr "echec de récupération de certains fichiers depuis %s\n" +#~ msgstr "échec de récupération de certains fichiers depuis %s\n"

1 0

[pacman-dev] CVS update of pacman-lib/src/pacman (log.c util.c util.h)
by Dan McGee 13 Mar '07

13 Mar '07

Date: Tuesday, March 13, 2007 @ 12:15:38 Author: dan Path: /home/cvs-pacman/pacman-lib/src/pacman Modified: log.c (1.33 -> 1.34) util.c (1.31 -> 1.32) util.h (1.17 -> 1.18) * Resizing terminal while progress bars were displayed caused some weird issues, this should fix it. Progress bars now go from displaying, to showing percent only, to not displaying at all. Changed unsigned -> signed to prevent wraparound errors in integer comparison. --------+ log.c | 2 - util.c | 76 ++++++++++++++++++++++++++++++++++----------------------------- util.h | 4 +-- 3 files changed, 45 insertions(+), 37 deletions(-) Index: pacman-lib/src/pacman/log.c diff -u pacman-lib/src/pacman/log.c:1.33 pacman-lib/src/pacman/log.c:1.34 --- pacman-lib/src/pacman/log.c:1.33 Wed Mar 7 02:45:31 2007 +++ pacman-lib/src/pacman/log.c Tue Mar 13 12:15:38 2007 @@ -134,7 +134,7 @@ fprintf(file, str); if(needpad == 1) { - unsigned int i, cols = getcols(); + int i, cols = getcols(); for(i=len; i < cols; ++i) { fprintf(file, " "); } Index: pacman-lib/src/pacman/util.c diff -u pacman-lib/src/pacman/util.c:1.31 pacman-lib/src/pacman/util.c:1.32 --- pacman-lib/src/pacman/util.c:1.31 Mon Mar 5 17:13:35 2007 +++ pacman-lib/src/pacman/util.c Tue Mar 13 12:15:38 2007 @@ -53,7 +53,7 @@ extern config_t *config; /* gets the current screen column width */ -unsigned int getcols() +int getcols() { if(!isatty(1)) { /* We will default to 80 columns if we're not a tty @@ -161,10 +161,10 @@ /* output a string, but wrap words properly with a specified indentation */ -void indentprint(const char *str, unsigned int indent) +void indentprint(const char *str, int indent) { const char *p = str; - unsigned int cidx = indent; + int cidx = indent; while(*p) { if(*p == ' ') { @@ -177,9 +177,9 @@ next = p + strlen(p); } len = next - p; - if(len > (getcols()-cidx-1)) { + if(len > (getcols() - cidx - 1)) { /* newline */ - unsigned int i; + int i; fprintf(stdout, "\n"); for(i = 0; i < indent; i++) { fprintf(stdout, " "); @@ -242,7 +242,7 @@ for(i = list, cols = len; i; i = alpm_list_next(i)) { char *str = alpm_list_getdata(i); int s = strlen(str) + 2; - unsigned int maxcols = getcols(); + int maxcols = getcols(); if(s + cols >= maxcols) { int i; cols = len; @@ -385,46 +385,55 @@ static unsigned int lasthash = 0, mouth = 0; unsigned int i; + /* printf("\ndebug: proglen: %i\n", proglen); DEBUG*/ + if(percent == 0) { lasthash = 0; mouth = 0; } - printf(" ["); - for(i = hashlen; i > 1; --i) { - /* if special progress bar enabled */ - if(chomp) { - if(i > hashlen - hash) { - printf("-"); - } else if(i == hashlen - hash) { - if(lasthash == hash) { - if(mouth) { - printf("\033[1;33mC\033[m"); + /* magic numbers, how I loathe thee */ + if(proglen > 8) { + printf(" ["); + for(i = hashlen; i > 1; --i) { + /* if special progress bar enabled */ + if(chomp) { + if(i > hashlen - hash) { + printf("-"); + } else if(i == hashlen - hash) { + if(lasthash == hash) { + if(mouth) { + printf("\033[1;33mC\033[m"); + } else { + printf("\033[1;33mc\033[m"); + } } else { - printf("\033[1;33mc\033[m"); + lasthash = hash; + mouth = mouth == 1 ? 0 : 1; + if(mouth) { + printf("\033[1;33mC\033[m"); + } else { + printf("\033[1;33mc\033[m"); + } } + } else if(i%3 == 0) { + printf("\033[0;37mo\033[m"); } else { - lasthash = hash; - mouth = mouth == 1 ? 0 : 1; - if(mouth) { - printf("\033[1;33mC\033[m"); - } else { - printf("\033[1;33mc\033[m"); - } + printf("\033[0;37m \033[m"); } - } else if(i%3 == 0) { - printf("\033[0;37mo\033[m"); + } /* else regular progress bar */ + else if(i > hashlen - hash) { + printf("#"); } else { - printf("\033[0;37m \033[m"); + printf("-"); } - } /* else regular progress bar */ - else if(i > hashlen - hash) { - printf("#"); - } else { - printf("-"); } + printf("]"); + } + /* print percent after progress bar */ + if(proglen > 5) { + printf(" %3d%%", percent); } - printf("] %3d%%", percent); if(percent == 100) { printf("\n"); @@ -434,5 +443,4 @@ fflush(stdout); } - /* vim: set ts=2 sw=2 noet: */ Index: pacman-lib/src/pacman/util.h diff -u pacman-lib/src/pacman/util.h:1.17 pacman-lib/src/pacman/util.h:1.18 --- pacman-lib/src/pacman/util.h:1.17 Mon Mar 5 20:21:42 2007 +++ pacman-lib/src/pacman/util.h Tue Mar 13 12:15:38 2007 @@ -50,10 +50,10 @@ #define UPDATE_SPEED_SEC 0.2f #define _(str) gettext(str) -unsigned int getcols(); +int getcols(); int makepath(char *path); int rmrf(char *path); -void indentprint(const char *str, unsigned int indent); +void indentprint(const char *str, int indent); char *strtoupper(char *str); char *strtrim(char *str); int reg_match(char *string, char *pattern);

1 0

[pacman-dev] CVS update of pacman-lib/scripts (repo-add)
by Aaron Griffin 13 Mar '07

13 Mar '07

Date: Tuesday, March 13, 2007 @ 11:01:15 Author: aaron Path: /home/cvs-pacman/pacman-lib/scripts Modified: repo-add (1.5 -> 1.6) * Sebastian Sareyko Fix repo-add filename addition (use basename) ----------+ repo-add | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Index: pacman-lib/scripts/repo-add diff -u pacman-lib/scripts/repo-add:1.5 pacman-lib/scripts/repo-add:1.6 --- pacman-lib/scripts/repo-add:1.5 Thu Feb 22 20:29:14 2007 +++ pacman-lib/scripts/repo-add Tue Mar 13 11:01:15 2007 @@ -148,7 +148,7 @@ # create desc entry echo ":: creating 'desc' db entry" - echo -e "%FILENAME%\n$1\n" >> desc + echo -e "%FILENAME%\n$(basename $1)\n" >> desc echo -e "%NAME%\n$pkgname\n" >>desc echo -e "%VERSION%\n$pkgver\n" >>desc if [ -n "$pkgdesc" ]; then

3 2

[pacman-dev] CVS update of pacman-lib/lib/libalpm (server.c)
by Aaron Griffin 12 Mar '07

12 Mar '07

Date: Monday, March 12, 2007 @ 19:26:48 Author: aaron Path: /home/cvs-pacman/pacman-lib/lib/libalpm Modified: server.c (1.25 -> 1.26) * Missed a path when requiring that all paths end with / - this caused -U not to work (it was downloading files as .package-name) at all. ----------+ server.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Index: pacman-lib/lib/libalpm/server.c diff -u pacman-lib/lib/libalpm/server.c:1.25 pacman-lib/lib/libalpm/server.c:1.26 --- pacman-lib/lib/libalpm/server.c:1.25 Mon Mar 5 23:22:03 2007 +++ pacman-lib/lib/libalpm/server.c Mon Mar 12 19:26:47 2007 @@ -407,7 +407,7 @@ alpm_list_t *servers = alpm_list_add(NULL, server); alpm_list_t *files = alpm_list_add(NULL, filename); - if(_alpm_downloadfiles(servers, ".", files)) { + if(_alpm_downloadfiles(servers, "./", files)) { _alpm_log(PM_LOG_WARNING, _("failed to download %s"), target); return(NULL); }

1 0

[pacman-dev] pacman 3 RC1 bug roundup
by Aaron Griffin 12 Mar '07

12 Mar '07

This is just a note to everyone who reported issues with the pacman 3 RC. I believe Dan and I have killed everything reported, but, well, I get quite a bit of email so may have missed something. If you did not see your bug reported as "fixed" by Dan or myself, please reply and let us know, as we'd like to push out RC2 today/tomorrow (Monday) and we want to make sure we got it all. For future reference, the easiest way to make sure we cover all these bases is by adding a bug report at bugs.archlinux.org (Category: Pacman). Special thanks go out to all the testers! You guys make a huge difference. - phrak

2 1

Re: [pacman-dev] devtools and extrapkg
by Dan McGee 12 Mar '07

12 Mar '07

On 3/12/07, Jason Chu <jason(a)archlinux.org> wrote: > On Sun, 11 Mar 2007 23:21:48 -0400 > "Dan McGee" <dpmcgee(a)gmail.com> wrote: > > > On 3/9/07, Travis Willard <travisw(a)wmpub.ca> wrote: > > > On Thu, 8 Mar 2007 16:41:48 -0500 > > > "Dan McGee" <dpmcgee(a)gmail.com> wrote: > > > > > > > I didn't implement the above looping stuff, but I left a nice note > > > > right where it needs to be done. :) > > > > > > Here you go - incorporating Dan's cleanup patch as well. This is a > > > diff from the version of extrapkg patched with the minimal patch I > > > double-attached previously. > > > > > > In the (limited) tests I've done with this, it seems to do the job. > > > I've kept backward support for lack of -{$arch} suffix in for now, > > > but it's easily enough removed. > > > > > > I pulled msg(), warning(), and error() from makepkg for it too, for > > > consistency - I thought of this 'cause Dan's patch used 'error' in > > > one place (copy-pasta probably) and I thought to myself "Meh, why > > > not". If you'd rather the plain output I can put it back. :P > > > > I threw this patch up at the same place my old one was with all > > changes from the SVN copy (revision 223). Here it is: > > <http://www.archlinux.org/~dan/extrapkg.patch>. > > > > Xentac, I believe this is your SVN repo? I CC'ed you in on this if you > > want to check this in, correct me if I am wrong. > > > > -Dan > > Yeah, I have a copy of the patch. I'm waiting for pacman to become > official before applying it because the new -arch suffix isn't > supported on gerolde yet (or most users' pacmans). We should probably have a period where packages in the sync databases are still named in the old fashion (and the pacman package should probably always be named this way for the considerable future to not break that upgrade). Pacman 3 can deal with either naming scheme. This should not be a very hard change to make to the scripts on gerolde, which I know nothing about. :) -Dan

1 0

[pacman-dev] CVS update of pacman-lib/lib/libalpm (be_files.c)
by Dan McGee 12 Mar '07

12 Mar '07

Date: Monday, March 12, 2007 @ 11:41:33 Author: dan Path: /home/cvs-pacman/pacman-lib/lib/libalpm Modified: be_files.c (1.37 -> 1.38) * Fix wrong filesize being recorded to local DB. Reported by Andreas Radke. ------------+ be_files.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) Index: pacman-lib/lib/libalpm/be_files.c diff -u pacman-lib/lib/libalpm/be_files.c:1.37 pacman-lib/lib/libalpm/be_files.c:1.38 --- pacman-lib/lib/libalpm/be_files.c:1.37 Sun Mar 11 23:02:57 2007 +++ pacman-lib/lib/libalpm/be_files.c Mon Mar 12 11:41:33 2007 @@ -568,8 +568,9 @@ "%s\n\n", info->packager); } if(info->size) { + /* only write installed size, csize is irrelevant once installed */ fprintf(fp, "%%SIZE%%\n" - "%lu\n\n", info->size); + "%lu\n\n", info->isize); } if(info->reason) { fprintf(fp, "%%REASON%%\n"

1 0

[pacman-dev] Problems with pacman -Rs (pacman3)
by Jeff Bailes 12 Mar '07

12 Mar '07

I was just using pacman 3 (RC 1) and the -Rs option doesn't work as expected, the dependencies are not removed from the system, even though the pacman database believes they have. For example: I type 'pacman -S aalib' to install aalib Pacman informs me that both gpm-1.20.1-6 and aalib-1.4rc5-4 are to be installed I press enter to continue with the installation. I then type 'pacman -Rs aalib' to remove it and its dependency (gpm) Pacman informs me that both aalib and gpm are to be uninstalled I press enter to confirm and all I get is the following: (1/2) removing aalib [#####################] 100% jeff@jeff:~$ It does not mention removing gpm at all, apart from in the 'Targets' section This has removed aalib from the system and the database, but has not removed gpm from the system, only the database. To prove this I try to install gpm and it complains that all the files already exist in the filesystem and fails with errors. To remove the files I have to force-install, then remove each package manually, which is rather tedious when you do this for a package with many dependencies. Jeff

3 4

[pacman-dev] permission/location for var/abs and cache/src
by Andreas Radke 12 Mar '07

12 Mar '07

we still preset the values to /var/abs and /var/cache/pacman/{src,pkg} but recommend to use an unprivileged user for all that packaging stuff. this forces everybody to lower the directory permissions or raise the user up into a certain group or even give sudo permissions. i think adding a new group "packager" holding these directories could solve that. various options are possible. what's the best and most secure one? Andy

6 15