From 594524146906a2dfe1ea334a90f88aec24d8833a Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Mon, 6 Feb 2012 21:59:12 -0600 Subject: Translation updates from Transifex, mostly scripts This is after some manual massaging to fix issues with newlines in some translations of the script catalogs. Signed-off-by: Dan McGee --- lib/libalpm/po/fr.po | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) (limited to 'lib') diff --git a/lib/libalpm/po/fr.po b/lib/libalpm/po/fr.po index 520b7286..c8163366 100644 --- a/lib/libalpm/po/fr.po +++ b/lib/libalpm/po/fr.po @@ -4,7 +4,7 @@ # # Translators: # Dan McGee , 2011. -# , 2011. +# , 2011, 2012. # shining , 2011. # Xavier Devlamynck , 2011. msgid "" @@ -12,8 +12,8 @@ msgstr "" "Project-Id-Version: Arch Linux Pacman package manager\n" "Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n" "POT-Creation-Date: 2011-11-13 21:47-0600\n" -"PO-Revision-Date: 2011-10-06 12:57+0000\n" -"Last-Translator: magicrhesus \n" +"PO-Revision-Date: 2012-02-06 20:08+0000\n" +"Last-Translator: jiehong \n" "Language-Team: French (http://www.transifex.net/projects/p/archlinux-pacman/" "team/fr/)\n" "Language: fr\n" @@ -170,8 +170,8 @@ msgstr "la suppression du fichier de verrouillage %s a échoué\n" #, c-format msgid "could not parse package description file '%s' from db '%s'\n" msgstr "" -"impossible d'analyser le fichier '%s' de description du paquet depuis la " -"base de données '%s'\n" +"impossible d'analyser le fichier « %s » de description du paquet depuis la " +"base de données « %s »\n" #, c-format msgid "database path is undefined\n" @@ -195,7 +195,7 @@ msgstr "ignore le paquet %s-%s\n" #, c-format msgid "cannot resolve \"%s\", a dependency of \"%s\"\n" -msgstr "impossible de résoudre \"%s\", une dépendance de \"%s\"\n" +msgstr "impossible de résoudre « %s », une dépendance de « %s »\n" #, c-format msgid "could not get filesystem information\n" @@ -236,11 +236,11 @@ msgstr "échec de création d'un fichier temporaire pour le téléchargement\n" #, c-format msgid "url '%s' is invalid\n" -msgstr "l'url '%s' est invalide\n" +msgstr "l'url « %s » est invalide\n" #, c-format msgid "failed retrieving file '%s' from %s : %s\n" -msgstr "échec de récupération du fichier '%s' depuis %s : %s\n" +msgstr "échec de récupération du fichier « %s » depuis %s : %s\n" #, c-format msgid "%s appears to be truncated: %jd/%jd bytes\n" @@ -320,7 +320,7 @@ msgstr "base de données invalide ou corrompue (Signature PGP)" #, c-format msgid "database is incorrect version" -msgstr "la base de données n'est pas à la bonne version" +msgstr "la version de la base de donnée n'est pas la bonne" #, c-format msgid "could not update database" @@ -480,7 +480,7 @@ msgstr "supprime %s de la liste de cible\n" #, c-format msgid "cannot remove file '%s': %s\n" -msgstr "suppression du fichier '%s' impossible : %s\n" +msgstr "suppression du fichier « %s » impossible : %s\n" #, c-format msgid "cannot remove %s (%s)\n" @@ -492,7 +492,7 @@ msgstr "la suppression de l'entrée de base de données %s-%s a échoué\n" #, c-format msgid "could not remove entry '%s' from cache\n" -msgstr "la suppression du cache de l'entrée '%s' a échoué\n" +msgstr "la suppression du cache de l'entrée « %s » a échoué\n" #, c-format msgid "%s: ignoring package upgrade (%s => %s)\n" @@ -524,7 +524,8 @@ msgstr "un conflit de paquets impossible à résoudre a été détecté\n" #, c-format msgid "removing '%s' from target list because it conflicts with '%s'\n" -msgstr "supprime '%s' de la liste de cible car il est en conflit avec '%s'\n" +msgstr "" +"supprime « %s » de la liste de cible car il est en conflit avec « %s »\n" #, c-format msgid "failed to retrieve some files from %s\n" -- cgit v1.2.3-54-g00ecf From ea32924c626b828b3752c021362a6e0e7f79885c Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Mon, 6 Feb 2012 22:12:11 -0600 Subject: Fix a handful of comment typos or misspellings Signed-off-by: Dan McGee --- lib/libalpm/alpm.h | 6 +++--- src/pacman/pacman.c | 10 ++++++---- src/pacman/util.c | 2 +- 3 files changed, 10 insertions(+), 8 deletions(-) (limited to 'lib') diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index a93d4e3e..6df3e1f5 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -313,7 +313,7 @@ typedef enum _alpm_event_t { ALPM_EVENT_LOAD_START, /** Target package is finished loading. */ ALPM_EVENT_LOAD_DONE, - /** Target deltas's integrity will be checked. */ + /** Target delta's integrity will be checked. */ ALPM_EVENT_DELTA_INTEGRITY_START, /** Target delta's integrity was checked. */ ALPM_EVENT_DELTA_INTEGRITY_DONE, @@ -881,7 +881,7 @@ alpm_list_t *alpm_pkg_get_backup(alpm_pkg_t *pkg); */ alpm_db_t *alpm_pkg_get_db(alpm_pkg_t *pkg); -/** Retuns the base64 encoded package signature. +/** Returns the base64 encoded package signature. * @param pkg a pointer to package * @return a reference to an internal string */ @@ -1032,7 +1032,7 @@ int alpm_trans_prepare(alpm_handle_t *handle, alpm_list_t **data); /** Commit a transaction. * @param handle the context handle * @param data the address of an alpm_list where detailed description - * of an error can be dumped (ie. list of conflicting files) + * of an error can be dumped (i.e. list of conflicting files) * @return 0 on success, -1 on error (pm_errno is set accordingly) */ int alpm_trans_commit(alpm_handle_t *handle, alpm_list_t **data); diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index 4c0d69ed..381e0b71 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -726,7 +726,9 @@ static int parseargs(int argc, char *argv[]) return 0; } -/** print commandline to logfile +/** Print command line to logfile. + * @param argc + * @param argv */ static void cl_to_log(int argc, char* argv[]) { @@ -754,8 +756,8 @@ static void cl_to_log(int argc, char* argv[]) } /** Main function. - * @param argc argc - * @param argv argv + * @param argc + * @param argv * @return A return code indicating success, failure, etc. */ int main(int argc, char *argv[]) @@ -914,7 +916,7 @@ int main(int argc, char *argv[]) list_display("Targets :", pm_targets); } - /* Log commandline */ + /* Log command line */ if(needs_root()) { cl_to_log(argc, argv); } diff --git a/src/pacman/util.c b/src/pacman/util.c index 14e6f6b7..0b076d97 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -1005,7 +1005,7 @@ static double simple_pow(int base, int exp) * @param target_unit '\0' or a short label. If equal to one of the short unit * labels ('B', 'K', ...) bytes is converted to target_unit; if '\0', the first * unit which will bring the value to below a threshold of 2048 will be chosen. - * @param precision number of decimal places, ensures -0.0.0 gets rounded to + * @param precision number of decimal places, ensures -0.00 gets rounded to * 0.00; -1 if no rounding desired * @param label will be set to the appropriate unit label * -- cgit v1.2.3-54-g00ecf From b4f5a63e7fee5d04949e290bd63e5f0e94bd211e Mon Sep 17 00:00:00 2001 From: Dave Reisner Date: Mon, 13 Feb 2012 10:59:26 -0500 Subject: lib/sync: use full delta size as max download size The max filesize for a delta download must be the full size of the delta file, not just what's remaining. Fixes FS#28345 Signed-off-by: Dave Reisner Signed-off-by: Dan McGee --- lib/libalpm/sync.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index cf209717..a946a7df 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -845,7 +845,7 @@ static int download_files(alpm_handle_t *handle, alpm_list_t **deltas) CALLOC(dpayload, 1, sizeof(*dpayload), RET_ERR(handle, ALPM_ERR_MEMORY, -1)); STRDUP(dpayload->remote_name, delta->delta, RET_ERR(handle, ALPM_ERR_MEMORY, -1)); - dpayload->max_size = delta->download_size; + dpayload->max_size = delta->delta_size; files = alpm_list_add(files, dpayload); } -- cgit v1.2.3-54-g00ecf