diff options
| -rw-r--r-- | TRANSLATORS | 17 | ||||
| -rw-r--r-- | configure.ac | 9 | ||||
| -rw-r--r-- | po/de.po | 4 | ||||
| -rw-r--r-- | scripts/makepkg.sh.in | 8 | ||||
| -rw-r--r-- | src/pacman/add.c | 2 | ||||
| -rw-r--r-- | src/pacman/callback.c | 2 | ||||
| -rw-r--r-- | src/pacman/util.c | 4 |
7 files changed, 30 insertions, 16 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 <vogo@seznam.cz> German (de): + * Matthias Gorissen <matthias@archlinux.de> Pierre Schmitz <pierre@archlinux.de> British English (en_GB): - Jeff Bailes <thepizzaking@gmail.com> + * Jeff Bailes <thepizzaking@gmail.com> Spanish (es): - Juan Pablo González Tognarelli <jotapesan@gmail.com> + * Juan Pablo González Tognarelli <lord_jotape@yahoo.com.ar> French (fr): + * Chantry Xavier <shiningxc@gmail.com> solsTiCe d'Hiver <solstice.dhiver@laposte.net> Hungarian (hu): - Nagy Gabor <ngaba@petra.hos.u-szeged.hu> + * Nagy Gabor <ngaba@bibl.u-szeged.hu> Italian (it): - Giovanni 'voidnull' Scafora <linuxmania@gmail.com> + * Giovanni 'voidnull' Scafora <linuxmania@gmail.com> Alessio 'mOLOk' Bolognino <themolok@gmail.com> Lorenzo '^zanDarK' Masini <lorenxo86@gmail.com> Polish (pl_PL): - Mateusz Jędrasik <m.jedrasik@gmail.com> + * Mateusz Jędrasik <m.jedrasik@gmail.com> Brazilian Portuguese (pt_BR): + * João Felipe Santos <joao.eel@gmail.com> Douglas Soares de Andrade <douglas@archlinux-br.org> Hugo Doria <hugodoria@archlinux-br.org> Lincoln de Sousa <lincoln@archlinux-br.org> 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: @@ -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 :" diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 219e2d17..998e240c 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 $? @@ -1181,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 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)); diff --git a/src/pacman/util.c b/src/pacman/util.c index a3ac66a7..19e64442 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -544,7 +544,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); @@ -591,7 +591,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: ")); |