diff options
| author | Xavier Chantry <shiningxc@gmail.com> | 2009-09-17 02:03:23 +0200 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2009-09-16 19:36:49 -0500 |
| commit | 1df3b91931ea28fa6b279a976339f099a111238d (patch) | |
| tree | 54f6289f235ed164dc699c5174c8b95688d1c1d6 /lib/libalpm | |
| parent | 08ee4059b5935ab0b378a40dcfb127f169e96f83 (diff) | |
| download | pacman-1df3b91931ea28fa6b279a976339f099a111238d.tar.xz | |
String improvements
Add more untranslated strings, improve consistency, etc.
Signed-off-by: Xavier Chantry <shiningxc@gmail.com>
Signed-off-by: Dan McGee <dan@archlinux.org>
Diffstat (limited to 'lib/libalpm')
| -rw-r--r-- | lib/libalpm/add.c | 4 | ||||
| -rw-r--r-- | lib/libalpm/be_files.c | 2 | ||||
| -rw-r--r-- | lib/libalpm/remove.c | 10 |
3 files changed, 8 insertions, 8 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) { |