From cee314fc5e93e20392072c0182781b59d3fdbb5e Mon Sep 17 00:00:00 2001 From: Chantry Xavier Date: Sat, 19 Jan 2008 11:49:19 +0100 Subject: Update TRANSLATORS file. Signed-off-by: Chantry Xavier --- TRANSLATORS | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/TRANSLATORS b/TRANSLATORS index 914ebc2a..d9dea891 100644 --- a/TRANSLATORS +++ b/TRANSLATORS @@ -10,23 +10,30 @@ If your language is not listed here and you wish it was, let the pacman mailing list know you are interested in making a translation. We will be happy to add your language to the mix. +* indicates the last active translator. + +Czech (cs_CZ): + * Vojtěch Gondžala German (de): + * Matthias Gorissen Pierre Schmitz British English (en_GB): - Jeff Bailes + * Jeff Bailes Spanish (es): - Juan Pablo González Tognarelli + * Juan Pablo González Tognarelli French (fr): + * Chantry Xavier solsTiCe d'Hiver Hungarian (hu): - Nagy Gabor + * Nagy Gabor Italian (it): - Giovanni 'voidnull' Scafora + * Giovanni 'voidnull' Scafora Alessio 'mOLOk' Bolognino Lorenzo '^zanDarK' Masini Polish (pl_PL): - Mateusz Jędrasik + * Mateusz Jędrasik Brazilian Portuguese (pt_BR): + * João Felipe Santos Douglas Soares de Andrade Hugo Doria Lincoln de Sousa -- cgit v1.2.3-70-g09d2 From 3b464dc89774ea83d4fe4c837b751d4ecc637e43 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Sat, 19 Jan 2008 14:50:15 -0600 Subject: Final changes before 3.1.1 release Signed-off-by: Dan McGee --- configure.ac | 9 +++++---- po/de.po | 4 ++-- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/configure.ac b/configure.ac index 67633067..d2edd0fc 100644 --- a/configure.ac +++ b/configure.ac @@ -46,14 +46,14 @@ AC_PREREQ(2.60) # For code under development: [devel] # For production releases: [] -m4_define([lib_current], [2]) +m4_define([lib_current], [3]) m4_define([lib_revision], [0]) -m4_define([lib_age], [0]) +m4_define([lib_age], [1]) m4_define([pacman_version_major], [3]) m4_define([pacman_version_minor], [1]) m4_define([pacman_version_micro], [1]) -m4_define([pacman_version_suffix], [devel]) +m4_define([pacman_version_suffix], []) m4_define([pacman_version], [pacman_version_major.pacman_version_minor.pacman_version_micro]) m4_define([pacman_display_version], @@ -69,7 +69,7 @@ AC_CONFIG_HEADERS([config.h]) AC_CANONICAL_HOST AM_INIT_AUTOMAKE -LIB_VERSION=`expr lib_current.lib_age`.lib_revision +LIB_VERSION=`expr lib_current - lib_age`.lib_age.lib_revision LIB_VERSION_INFO="lib_current:lib_revision:lib_age" # Set subsitution values for version stuff in Makefiles and anywhere else, @@ -342,6 +342,7 @@ pacman_display_version: Host Type : ${CHOST} libalpm version : ${LIB_VERSION} + libalpm version info : ${LIB_VERSION_INFO} pacman version : ${PACKAGE_VERSION} Directory and file information: diff --git a/po/de.po b/po/de.po index b0ff6b3b..4b667075 100644 --- a/po/de.po +++ b/po/de.po @@ -263,7 +263,7 @@ msgstr "Beschreibung : " #: src/pacman/package.c:93 msgid "Filename :" -msgstr "Dateiname :" +msgstr "Dateiname :" #: src/pacman/package.c:95 msgid "Name :" @@ -279,7 +279,7 @@ msgstr "URL :" #: src/pacman/package.c:98 msgid "Licenses :" -msgstr "Lizenzen :" +msgstr "Lizenzen :" #: src/pacman/package.c:99 msgid "Groups :" -- cgit v1.2.3-70-g09d2 From 003adb7646c6e7d00b6cac26586aa3678ade660b Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Tue, 15 Jan 2008 23:03:51 -0600 Subject: makepkg: add check to ensure we have non-URL files in build dir Pacman 3.0 printed the following message if a file could not be found: ERROR: xxx was not found in the build directory and is not a proper URL. We lost this logic in 3.1 when moving to the DLAGENT type stuff, so a not-found file got passed all the way to the download logic where it failed with a odd error message. Bring back some logic to ensure only files with URLs get past a certain point, and fail if the file is not available. Fixes FS#9208. Signed-off-by: Dan McGee --- scripts/makepkg.sh.in | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 219e2d17..ad95356c 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -464,6 +464,12 @@ download_sources() { continue fi + # if we get here, check to make sure it was a URL, else fail + if [ "$file" = "$netfile" ]; then + error "$(gettext "%s was not found in the build directory and is not a URL.")" "$netfile" + exit 1 # $E_MISSING_FILE + fi + # find the client we should use for this URL local dlclient=$(get_downloadclient $netfile) || exit $? -- cgit v1.2.3-70-g09d2 From ba7687f58eab73627ba9325ad117ef2fbbeebb12 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Thu, 17 Jan 2008 19:04:15 -0600 Subject: Remove frontend translation of "debug:" message Signed-off-by: Dan McGee --- src/pacman/util.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pacman/util.c b/src/pacman/util.c index 1806ee52..678445d3 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -540,7 +540,7 @@ int pm_vasprintf(char **string, pmloglevel_t level, const char *format, va_list /* print a prefix to the message */ switch(level) { case PM_LOG_DEBUG: - asprintf(string, _("debug: %s"), msg); + asprintf(string, "debug: %s", msg); break; case PM_LOG_ERROR: asprintf(string, _("error: %s"), msg); @@ -587,7 +587,7 @@ int pm_vfprintf(FILE *stream, pmloglevel_t level, const char *format, va_list ar /* print a prefix to the message */ switch(level) { case PM_LOG_DEBUG: - fprintf(stream, _("debug: ")); + fprintf(stream, "debug: "); break; case PM_LOG_ERROR: fprintf(stream, _("error: ")); -- cgit v1.2.3-70-g09d2 From 73ee64d49f8703e2b732ae03771a63ef56208601 Mon Sep 17 00:00:00 2001 From: Chantry Xavier Date: Sun, 20 Jan 2008 14:08:55 +0100 Subject: workaround for a gettext string starting with --. Workaround found in Advanced Bash-Scripting Guide, localization section. "added a \0 (NULL) at the beginning of the sentence." Signed-off-by: Chantry Xavier --- scripts/makepkg.sh.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index ad95356c..998e240c 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1187,7 +1187,7 @@ done if [ "$HOLDVER" = "1" -a "$FORCE_VER" != "" ]; then # The extra '--' is here to prevent gettext from thinking --holdver is # an option - error "$(gettext -- "--holdver and --forcever cannot both be specified")" + error "$(gettext "\\0--holdver and --forcever cannot both be specified" )" exit 1 fi -- cgit v1.2.3-70-g09d2 From bba62655fe06989e89576e66a97607da88aa9916 Mon Sep 17 00:00:00 2001 From: Chantry Xavier Date: Sun, 20 Jan 2008 14:11:25 +0100 Subject: two string fixes. * added a newline to a conflict message in add.c * removed the trailing dot in a replace message in callback.c. Signed-off-by: Chantry Xavier --- src/pacman/add.c | 2 +- src/pacman/callback.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pacman/add.c b/src/pacman/add.c index 80366de1..975d26be 100644 --- a/src/pacman/add.c +++ b/src/pacman/add.c @@ -146,7 +146,7 @@ int pacman_add(alpm_list_t *targets) case PM_ERR_CONFLICTING_DEPS: for(i = data; i; i = alpm_list_next(i)) { pmconflict_t *conflict = alpm_list_getdata(i); - printf(_(":: %s: conflicts with %s"), + printf(_(":: %s: conflicts with %s\n"), alpm_conflict_get_package1(conflict), alpm_conflict_get_package2(conflict)); } break; diff --git a/src/pacman/callback.c b/src/pacman/callback.c index 9742d7f0..268a8a7f 100644 --- a/src/pacman/callback.c +++ b/src/pacman/callback.c @@ -285,7 +285,7 @@ void cb_trans_conv(pmtransconv_t event, void *data1, void *data2, alpm_pkg_get_name(data2)); *response = yesno(str); } else { - printf(_("Replacing %s with %s/%s\n."), + printf(_("Replacing %s with %s/%s\n"), alpm_pkg_get_name(data1), (char *)data3, alpm_pkg_get_name(data2)); -- cgit v1.2.3-70-g09d2