From 09ce8b446c01e59a0eb0523846ce6f339ef25fa5 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Mon, 28 Feb 2011 17:50:23 -0600 Subject: Fix some easy to find double translations A lot of these were places that should have used the same message but didn't, or were very easy to convert to using the same message and letting some of the burden off of the translators. Signed-off-by: Dan McGee --- scripts/makepkg.sh.in | 12 ++++++------ scripts/pkgdelta.sh.in | 4 ++-- scripts/repo-add.sh.in | 6 +++--- 3 files changed, 11 insertions(+), 11 deletions(-) (limited to 'scripts') diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 16dc0b8f..23081fec 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1356,27 +1356,27 @@ devel_check() { oldpkgver=$pkgver if [[ -n ${_darcstrunk} && -n ${_darcsmod} ]] ; then type -p darcs >/dev/null || return 0 - msg "$(gettext "Determining latest darcs revision...")" + msg "$(gettext "Determining latest %s revision...")" 'darcs' newpkgver=$(date +%Y%m%d) elif [[ -n ${_cvsroot} && -n ${_cvsmod} ]] ; then type -p cvs >/dev/null || return 0 - msg "$(gettext "Determining latest cvs revision...")" + msg "$(gettext "Determining latest %s revision...")" 'cvs' newpkgver=$(date +%Y%m%d) elif [[ -n ${_gitroot} && -n ${_gitname} ]] ; then type -p git >/dev/null || return 0 - msg "$(gettext "Determining latest git revision...")" + msg "$(gettext "Determining latest %s revision...")" 'git' newpkgver=$(date +%Y%m%d) elif [[ -n ${_svntrunk} && -n ${_svnmod} ]] ; then type -p svn >/dev/null || return 0 - msg "$(gettext "Determining latest svn revision...")" + msg "$(gettext "Determining latest %s revision...")" 'svn' newpkgver=$(LC_ALL=C svn info $_svntrunk | sed -n 's/^Last Changed Rev: \([0-9]*\)$/\1/p') elif [[ -n ${_bzrtrunk} && -n ${_bzrmod} ]] ; then type -p bzr >/dev/null || return 0 - msg "$(gettext "Determining latest bzr revision...")" + msg "$(gettext "Determining latest %s revision...")" 'bzr' newpkgver=$(bzr revno ${_bzrtrunk}) elif [[ -n ${_hgroot} && -n ${_hgrepo} ]] ; then type -p hg >/dev/null || return 0 - msg "$(gettext "Determining latest hg revision...")" + msg "$(gettext "Determining latest %s revision...")" 'hg' if [[ -d ./src/$_hgrepo ]] ; then cd ./src/$_hgrepo hg pull diff --git a/scripts/pkgdelta.sh.in b/scripts/pkgdelta.sh.in index 6bc3f5da..ecca4277 100644 --- a/scripts/pkgdelta.sh.in +++ b/scripts/pkgdelta.sh.in @@ -55,7 +55,7 @@ usage() { printf "pkgdelta (pacman) %s\n\n" "$myver" printf "$(gettext "Usage: pkgdelta [-q] \n")" printf "$(gettext "\ - pkgdelta will create a delta file between two packages\n\ + pkgdelta will create a delta file between two packages.\n\ This delta file can then be added to a database using repo-add.\n\n")" echo "$(gettext "Example: pkgdelta pacman-3.0.0.pkg.tar.gz pacman-3.0.1.pkg.tar.gz")" } @@ -85,7 +85,7 @@ read_pkginfo() fi done IFS=$OLDIFS - error "$(gettext "Invalid package '%s'")" "$1" + error "$(gettext "Invalid package file '%s'.")" "$1" return 1 } diff --git a/scripts/repo-add.sh.in b/scripts/repo-add.sh.in index 9b79022a..dfc93974 100644 --- a/scripts/repo-add.sh.in +++ b/scripts/repo-add.sh.in @@ -254,7 +254,7 @@ db_write_entry() [[ -f ../$pkgname.deltas ]] && mv "../$pkgname.deltas" deltas # create desc entry - msg2 "$(gettext "Creating 'desc' db entry...")" + msg2 "$(gettext "Creating '%s' db entry...")" 'desc' echo -e "%FILENAME%\n$(basename "$1")\n" >>desc echo -e "%NAME%\n$pkgname\n" >>desc [[ -n $pkgbase ]] && echo -e "%BASE%\n$pkgbase\n" >>desc @@ -276,7 +276,7 @@ db_write_entry() write_list_entry "REPLACES" "$_replaces" "desc" # create depends entry - msg2 "$(gettext "Creating 'depends' db entry...")" + msg2 "$(gettext "Creating '%s' db entry...")" 'depends' # create the file even if it will remain empty touch "depends" write_list_entry "DEPENDS" "$_depends" "depends" @@ -289,7 +289,7 @@ db_write_entry() # create files file if wanted if (( WITHFILES )); then - msg2 "$(gettext "Creating 'files' db entry...")" + msg2 "$(gettext "Creating '%s' db entry...")" 'files' local files_path="$tmpdir/$pkgname-$pkgver/files" echo "%FILES%" >$files_path bsdtar --exclude='.*' -tf "$pkgfile" >>$files_path -- cgit v1.2.3-70-g09d2