From 1df3b91931ea28fa6b279a976339f099a111238d Mon Sep 17 00:00:00 2001 From: Xavier Chantry Date: Thu, 17 Sep 2009 02:03:23 +0200 Subject: [PATCH] String improvements Add more untranslated strings, improve consistency, etc. Signed-off-by: Xavier Chantry Signed-off-by: Dan McGee --- lib/libalpm/add.c | 4 ++-- lib/libalpm/be_files.c | 2 +- lib/libalpm/remove.c | 10 +++++----- scripts/makepkg.sh.in | 2 +- src/pacman/pacman.c | 6 +++--- src/pacman/query.c | 4 ++-- src/pacman/sync.c | 2 +- 7 files changed, 15 insertions(+), 15 deletions(-) diff --git a/lib/libalpm/add.c b/lib/libalpm/add.c index 1b228b2d..1d143c6f 100644 --- a/lib/libalpm/add.c +++ b/lib/libalpm/add.c @@ -81,7 +81,7 @@ int _alpm_add_loadtarget(pmtrans_t *trans, pmdb_t *db, char *name) _alpm_pkg_free(i->data); i->data = pkg; } else { - _alpm_log(PM_LOG_WARNING, _("skipping %s-%s because newer version %s is in the target list\n"), + _alpm_log(PM_LOG_WARNING, _("skipping %s-%s because newer version %s is in target list\n"), pkgname, pkgver, transpkg->version); _alpm_pkg_free(pkg); } @@ -142,7 +142,7 @@ int _alpm_add_prepare(pmtrans_t *trans, pmdb_t *db, alpm_list_t **data) alpm_list_free(lp); } if(inner) { - _alpm_log(PM_LOG_ERROR, _("conflicting packages were found in the target list\n")); + _alpm_log(PM_LOG_ERROR, _("conflicting packages were found in target list\n")); _alpm_log(PM_LOG_ERROR, _("you cannot install two conflicting packages at the same time\n")); } if(outer) { diff --git a/lib/libalpm/be_files.c b/lib/libalpm/be_files.c index 9bb7b3dc..bfe10867 100644 --- a/lib/libalpm/be_files.c +++ b/lib/libalpm/be_files.c @@ -125,7 +125,7 @@ static int checkdbdir(pmdb_t *db) RET_ERR(PM_ERR_SYSTEM, -1); } } else if(!S_ISDIR(buf.st_mode)) { - _alpm_log(PM_LOG_WARNING, "removing bogus database: %s\n", path); + _alpm_log(PM_LOG_WARNING, _("removing invalid database: %s\n"), path); if(unlink(path) != 0 || _alpm_makepath(path) != 0) { RET_ERR(PM_ERR_SYSTEM, -1); } diff --git a/lib/libalpm/remove.c b/lib/libalpm/remove.c index 0eaa8363..1e8f9156 100644 --- a/lib/libalpm/remove.c +++ b/lib/libalpm/remove.c @@ -74,7 +74,7 @@ int _alpm_remove_loadtarget(pmtrans_t *trans, pmdb_t *db, char *name) RET_ERR(PM_ERR_PKG_NOT_FOUND, -1); } - _alpm_log(PM_LOG_DEBUG, "adding %s in the targets list\n", info->name); + _alpm_log(PM_LOG_DEBUG, "adding %s in target list\n", info->name); trans->packages = alpm_list_add(trans->packages, _alpm_pkg_dup(info)); return(0); @@ -92,7 +92,7 @@ static void remove_prepare_cascade(pmtrans_t *trans, pmdb_t *db, pmpkg_t *info = _alpm_db_get_pkgfromcache(db, miss->target); if(info) { if(!_alpm_pkg_find(trans->packages, alpm_pkg_get_name(info))) { - _alpm_log(PM_LOG_DEBUG, "pulling %s in the targets list\n", + _alpm_log(PM_LOG_DEBUG, "pulling %s in target list\n", alpm_pkg_get_name(info)); trans->packages = alpm_list_add(trans->packages, _alpm_pkg_dup(info)); } @@ -112,7 +112,7 @@ static void remove_prepare_keep_needed(pmtrans_t *trans, pmdb_t *db, { ALPM_LOG_FUNC; - /* Remove needed packages (which break dependencies) from the target list */ + /* Remove needed packages (which break dependencies) from target list */ while(lp != NULL) { alpm_list_t *i; for(i = lp; i; i = i->next) { @@ -126,7 +126,7 @@ static void remove_prepare_keep_needed(pmtrans_t *trans, pmdb_t *db, &vpkg); pkg = vpkg; if(pkg) { - _alpm_log(PM_LOG_WARNING, _("removing %s from the target-list\n"), + _alpm_log(PM_LOG_WARNING, _("removing %s from target list\n"), alpm_pkg_get_name(pkg)); _alpm_pkg_free(pkg); } @@ -167,7 +167,7 @@ int _alpm_remove_prepare(pmtrans_t *trans, pmdb_t *db, alpm_list_t **data) remove_prepare_cascade(trans, db, lp); } else if (trans->flags & PM_TRANS_FLAG_UNNEEDED) { /* Remove needed packages (which would break dependencies) - * from the target list */ + * from target list */ remove_prepare_keep_needed(trans, db, lp); } else { if(data) { diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 99e19b4f..3662228c 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -673,7 +673,7 @@ extract_sources() { esac local ret=0 - msg2 "$(gettext "extracting %s with %s")" "$file" "$cmd" + msg2 "$(gettext "Extracting %s with %s")" "$file" "$cmd" if [ "$cmd" = "bsdtar" ]; then $cmd -xf "$file" || ret=? else diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index 77c558d1..5298d662 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -130,7 +130,7 @@ static void usage(int op, const char * const myname) printf(_(" -l, --list view a list of packages in a repo\n")); printf(_(" -p, --print-uris print out URIs for given packages and their dependencies\n")); printf(_(" -s, --search search remote repositories for matching strings\n")); - printf(_(" -u, --sysupgrade upgrade all outdated packages (-uu enables downgrade)\n")); + printf(_(" -u, --sysupgrade upgrade installed packages (-uu allows downgrade)\n")); printf(_(" -w, --downloadonly download packages but do not install/upgrade anything\n")); printf(_(" -y, --refresh download fresh package databases from the server\n")); printf(_(" --needed don't reinstall up to date packages\n")); @@ -657,7 +657,7 @@ int download_with_xfercommand(const char *url, const char *localpath, /* cwd to the download directory */ getcwd(cwd, PATH_MAX); if(chdir(localpath)) { - pm_printf(PM_LOG_WARNING, "could not chdir to %s\n", localpath); + pm_printf(PM_LOG_WARNING, _("could not chdir to download directory %s\n"), localpath); ret = -1; goto cleanup; } @@ -666,7 +666,7 @@ int download_with_xfercommand(const char *url, const char *localpath, retval = system(parsedCmd); if(retval == -1) { - pm_printf(PM_LOG_WARNING, "running XferCommand: fork failed!\n"); + pm_printf(PM_LOG_WARNING, _("running XferCommand: fork failed!\n")); ret = -1; } else if(retval != 0) { /* download failed */ diff --git a/src/pacman/query.c b/src/pacman/query.c index a9717074..6b6a25db 100644 --- a/src/pacman/query.c +++ b/src/pacman/query.c @@ -344,7 +344,7 @@ static int check(pmpkg_t *pkg) if(config->quiet) { printf("%s %s\n", pkgname, f); } else { - pm_printf(PM_LOG_WARNING, "%s: missing %s (%s)\n", + pm_printf(PM_LOG_WARNING, "%s: %s (%s)\n", pkgname, f, strerror(errno)); } errors++; @@ -352,7 +352,7 @@ static int check(pmpkg_t *pkg) } if(!config->quiet) { - printf("%s: %d total, %d missing file(s)\n", + printf(_("%s: %d total files, %d missing file(s)\n"), pkgname, allfiles, errors); } diff --git a/src/pacman/sync.c b/src/pacman/sync.c index dc936219..12f67df2 100644 --- a/src/pacman/sync.c +++ b/src/pacman/sync.c @@ -682,7 +682,7 @@ static int sync_trans(alpm_list_t *targets) printf("%s/%s\n", dburl, alpm_pkg_get_filename(pkg)); } else { /* can't use WARNING here, we don't show warnings in -Sp... */ - pm_fprintf(stderr, PM_LOG_ERROR, _("no database for package: %s\n"), + pm_fprintf(stderr, PM_LOG_ERROR, _("no URL for package: %s\n"), alpm_pkg_get_name(pkg)); }