[pacman-dev] [PATCH 0/3] Fix translation issues reported on Transifex
Thanks to the translators who pointed these out. I will deal with removing the spaces before the ellipses in the translation files before pushing this to Transifex with the next release. Allan McRae (3): Pluralize malloc failure string Remove space before ellipses makepkg: separate "sourcefile" into two words scripts/libmakepkg/source/bzr.sh.in | 4 ++-- scripts/makepkg.sh.in | 2 +- scripts/pacman-key.sh.in | 2 +- scripts/repo-add.sh.in | 2 +- src/pacman/conf.c | 4 +++- 5 files changed, 8 insertions(+), 6 deletions(-) -- 2.6.1
Not particularly useful in English (will always be plural), but useful in languages that have multiple plural forms. Signed-off-by: Allan McRae <allan@archlinux.org> --- src/pacman/conf.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/pacman/conf.c b/src/pacman/conf.c index 6a2b206..f02e361 100644 --- a/src/pacman/conf.c +++ b/src/pacman/conf.c @@ -95,7 +95,9 @@ config_t *config_new(void) config_t *newconfig = calloc(1, sizeof(config_t)); if(!newconfig) { pm_printf(ALPM_LOG_ERROR, - _("malloc failure: could not allocate %zd bytes\n"), sizeof(config_t)); + _n("malloc failure: could not allocate %zd byte\n", + "malloc failure: could not allocate %zd bytes\n", sizeof(config_t)), + sizeof(config_t)); return NULL; } /* defaults which may get overridden later */ -- 2.6.1
Makes all use of ellipses consistent... Signed-off-by: Allan McRae <allan@archlinux.org> --- scripts/libmakepkg/source/bzr.sh.in | 4 ++-- scripts/pacman-key.sh.in | 2 +- scripts/repo-add.sh.in | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/libmakepkg/source/bzr.sh.in b/scripts/libmakepkg/source/bzr.sh.in index e8da28b..19e7313 100644 --- a/scripts/libmakepkg/source/bzr.sh.in +++ b/scripts/libmakepkg/source/bzr.sh.in @@ -44,14 +44,14 @@ download_bzr() { [[ -z "$dir" ]] && dir="$SRCDEST/$(get_filename "$netfile")" if [[ ! -d "$dir" ]] || dir_is_empty "$dir" ; then - msg2 "$(gettext "Branching %s ...")" "${displaylocation}" + msg2 "$(gettext "Branching %s...")" "${displaylocation}" if ! bzr branch "$url" "$dir" --no-tree --use-existing-dir; then error "$(gettext "Failure while branching %s")" "${displaylocation}" plain "$(gettext "Aborting...")" exit 1 fi elif (( ! HOLDVER )); then - msg2 "$(gettext "Pulling %s ...")" "${displaylocation}" + msg2 "$(gettext "Pulling %s...")" "${displaylocation}" cd_safe "$dir" if ! bzr pull "$url"; then # only warn on failure to allow offline builds diff --git a/scripts/pacman-key.sh.in b/scripts/pacman-key.sh.in index 8232851..9f7b523 100644 --- a/scripts/pacman-key.sh.in +++ b/scripts/pacman-key.sh.in @@ -482,7 +482,7 @@ refresh_keys() { verify_sig() { local ret=0 for sig; do - msg "Checking %s ..." "$sig" + msg "Checking %s..." "$sig" if ! "${GPG_PACMAN[@]}" --status-fd 1 --verify "$sig" | grep -qE '^\[GNUPG:\] TRUST_(FULLY|ULTIMATE)$'; then error "$(gettext "The signature identified by %s could not be verified.")" "$sig" ret=1 diff --git a/scripts/repo-add.sh.in b/scripts/repo-add.sh.in index 69993a9..78218f1 100644 --- a/scripts/repo-add.sh.in +++ b/scripts/repo-add.sh.in @@ -192,7 +192,7 @@ db_remove_delta() { msg2 "$(gettext "Removing existing entry '%s'...")" "$filename" # empty deltas file contains only "%DELTAS%" if (( $(wc -l < "$deltas") == 1 )); then - msg2 "$(gettext "Removing empty deltas file ...")" + msg2 "$(gettext "Removing empty deltas file...")" rm "$deltas" fi -- 2.6.1
Signed-off-by: Allan McRae <allan@archlinux.org> --- 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 6ededa3..8757698 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1535,7 +1535,7 @@ check_software() { # openssl - checksum operations if (( ! SKIPCHECKSUMS )); then if ! type -p openssl >/dev/null; then - error "$(gettext "Cannot find the %s binary required for validating sourcefile checksums.")" "openssl" + error "$(gettext "Cannot find the %s binary required for validating source file checksums.")" "openssl" ret=1 fi fi -- 2.6.1
participants (1)
-
Allan McRae