diff options
| author | Dan McGee <dan@archlinux.org> | 2011-11-21 04:40:50 +0100 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2011-11-21 04:40:50 +0100 |
| commit | 96b3ba3470f11842312e4fdb34b74b391842fc33 (patch) | |
| tree | 5c60dff639bfa7f8f674e995ecbab4f7fc07064a | |
| parent | 2141b7112d237221280781bed2b2bb6efadc963e (diff) | |
| parent | 507a2d15e65aba93a20ee99d90345917866407dc (diff) | |
| download | pacman-96b3ba3470f11842312e4fdb34b74b391842fc33.tar.gz pacman-96b3ba3470f11842312e4fdb34b74b391842fc33.tar.xz | |
Merge branch 'maint'
| -rw-r--r-- | NEWS | 10 | ||||
| -rw-r--r-- | scripts/makepkg.sh.in | 6 | ||||
| -rw-r--r-- | scripts/po/Makevars | 4 | ||||
| -rw-r--r-- | src/pacman/po/zh_TW.po | 3 |
4 files changed, 13 insertions, 10 deletions
@@ -6,13 +6,17 @@ VERSION DESCRIPTION - fix edge case in download progress bar rounding (FS#26853) - ensure downloads started as tempfiles have correct umask - ensure unowned symlinks are not overwritten incorrectly + - allow -U operation even without sync databases (FS#26899) - update libtool files and update fix for -Wl,-as-needed - fix build when using --disable-static (FS#26652) - pacman-key: add a keyserver timeout value in --init - repo-add: fix race condition around lock file removal - - makepkg: accept changelog= or install= without a value - - makepkg: handle PGP signatures with a .sign extension - - makepkg: delay attachment of signal traps (FS#26196) + - makepkg: + - accept changelog= or install= without a value + - trim trailing whitespace from sensitive variables + - handle PGP signatures with a .sign extension + - delay attachment of signal traps (FS#26196) + - translations: multiple updates and corrections 4.0.0 - well-integrated and powerful signed packages and databases support in pacman, the library, and scripts (FS#5331) - over 800 commits to pacman.git since 3.5.4 release diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 914cacbe..26a27899 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1441,7 +1441,7 @@ check_sanity() { awk -F'=' '$1 ~ /^[[:space:]]*pkgver$/' "$BUILDFILE" | sed "s/[[:space:]]*#.*//" | while IFS='=' read -r _ i; do - eval i=\"$(sed 's/^\(['\''"]\)\(.*\)\1$/\2/' <<< "$i")\" + eval i=\"$(sed 's/^\(['\''"]\)\(.*\)\1$/\2/' <<< "${i%%+([[:space:]])}")\" if [[ $i = *[[:space:]:-]* ]]; then error "$(gettext "%s is not allowed to contain colons, hyphens or whitespace.")" "pkgver" return 1 @@ -1450,7 +1450,7 @@ check_sanity() { awk -F'=' '$1 ~ /^[[:space:]]*pkgrel$/' "$BUILDFILE" | sed "s/[[:space:]]*#.*//" | while IFS='=' read -r _ i; do - eval i=\"$(sed 's/^\(['\''"]\)\(.*\)\1$/\2/' <<< "$i")\" + eval i=\"$(sed 's/^\(['\''"]\)\(.*\)\1$/\2/' <<< "${i%%+([[:space:]])}")\" if [[ $i = *[[:space:]-]* ]]; then error "$(gettext "%s is not allowed to contain hyphens or whitespace.")" "pkgrel" return 1 @@ -1459,7 +1459,7 @@ check_sanity() { awk -F'=' '$1 ~ /^[[:space:]]*epoch$/' "$BUILDFILE" | while IFS='=' read -r _ i; do - eval i=\"$(sed 's/^\(['\''"]\)\(.*\)\1$/\2/' <<< "$i")\" + eval i=\"$(sed 's/^\(['\''"]\)\(.*\)\1$/\2/' <<< "${i%%+([[:space:]])}")\" if [[ $i != *([[:digit:]]) ]]; then error "$(gettext "%s must be an integer.")" "epoch" return 1 diff --git a/scripts/po/Makevars b/scripts/po/Makevars index 178b4dc7..494da1d7 100644 --- a/scripts/po/Makevars +++ b/scripts/po/Makevars @@ -8,9 +8,7 @@ subdir = scripts/po top_builddir = ../../ # These options get passed to xgettext. -XGETTEXT_OPTIONS = --no-location \ - --keyword=_ --flag=_:1:c-format \ - --keyword=_n:1,2 --flag=_n:1:c-format --flag=_n:2:c-format +XGETTEXT_OPTIONS = --no-location # This is the copyright holder that gets inserted into the header of the # $(DOMAIN).pot file. Set this to the copyright holder of the surrounding diff --git a/src/pacman/po/zh_TW.po b/src/pacman/po/zh_TW.po index 9a9472a9..ccda12e7 100644 --- a/src/pacman/po/zh_TW.po +++ b/src/pacman/po/zh_TW.po @@ -3,13 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Dan McGee <dpmcgee@gmail.com>, 2011. # <dlin.tw@gmail.com>, 2011. msgid "" msgstr "" "Project-Id-Version: Arch Linux Pacman package manager\n" "Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n" "POT-Creation-Date: 2011-11-13 21:47-0600\n" -"PO-Revision-Date: 2011-11-14 03:57+0000\n" +"PO-Revision-Date: 2011-11-16 05:14+0000\n" "Last-Translator: toofishes <dpmcgee@gmail.com>\n" "Language-Team: Chinese (Taiwan) (http://www.transifex.net/projects/p/" "archlinux-pacman/team/zh_TW/)\n" |