March 2013 - Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] contrib: adding checkupdates
by keenerd 22 Mar '13

22 Mar '13

Signed-off-by: Kyle Keen <keenerd(a)gmail.com> --- contrib/Makefile.am | 3 +++ contrib/checkupdates.sh.in | 44 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 47 insertions(+) create mode 100644 contrib/checkupdates.sh.in diff --git a/contrib/Makefile.am b/contrib/Makefile.am index 64f476c..99baf95 100644 --- a/contrib/Makefile.am +++ b/contrib/Makefile.am @@ -6,6 +6,7 @@ bin_SCRIPTS = \ BASHSCRIPTS = \ bacman \ + checkupdates \ paccache \ pacdiff \ paclist \ @@ -30,6 +31,7 @@ EXTRA_DIST = \ PKGBUILD.vim \ bacman.sh.in \ bash_completion.in \ + checkupdates.sh.in \ paccache.sh.in \ paclog-pkglist.sh.in \ pacdiff.sh.in \ @@ -93,6 +95,7 @@ uninstall-local: bacman: $(srcdir)/bacman.sh.in bash_completion: $(srcdir)/bash_completion.in +checkupdates: $(srcdir)/checkupdates.sh.in paccache: $(srcdir)/paccache.sh.in$(top_srcdir)/scripts/library/parseopts.sh $(top_srcdir)/scripts/library/size_to_human.sh pacdiff: $(srcdir)/pacdiff.sh.in paclist: $(srcdir)/paclist.sh.in diff --git a/contrib/checkupdates.sh.in b/contrib/checkupdates.sh.in new file mode 100644 index 0000000..b71bfdb --- /dev/null +++ b/contrib/checkupdates.sh.in @@ -0,0 +1,44 @@ +#!/bin/bash +# +# checkupdates: Safely print a list of pending updates. +# +# Copyright (c) 2011 Kyle Keen <keenerd(a)gmail.com> +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. +# + +if (( $# > 0 )); then + echo "checkupdate: Safely print a list of pending updates." + echo "Use: checkupdates" + echo "Export the 'CHECKUPDATE_DB' variable to change the path of the temporary database." + exit 0 +fi + +if [[ -z $CHECKUPDATE_DB ]]; then + CHECKUPDATE_DB="${TMPDIR:-/tmp}/checkup-db-${USER}/" +fi + +trap 'rm -f $CHECKUPDATE_DB/db.lck' INT TERM EXIT + +eval $(awk '/DBPath/ {print $1$2$3}' /etc/pacman.conf) +DBPath="${DBPath:-@localstatedir@/lib/pacman/}" + +mkdir -p "$CHECKUPDATE_DB" +ln -s "${DBPath}/local" "$CHECKUPDATE_DB" &> /dev/null +fakeroot pacman -Sqy --dbpath "$CHECKUPDATE_DB" &> /dev/null +pacman -Qqu --dbpath "$CHECKUPDATE_DB" 2> /dev/null + +exit 0 + +# vim: set ts=2 sw=2 noet: -- 1.8.1.5

4 6

[pacman-dev] [RFC] Move pacman configuration to /usr/lib/pacman
by Daniel Wallace 21 Mar '13

21 Mar '13

After watching Allan's talk at SINFO, I remembered one big thing, when he mentioned certain projects moving away of shipping configuration files and preinstalling them directly to /etc and instead install the defaults to /usr/ and overriding them in a similar fashion to how systemd does it. So I asked about this in #archlinux-pacman and this bug report was pointed out to me [1]. Here are 2 ideas, tell me what you think. 1) Move everything to /usr/lib/pacman/ /usr/lib/pacman/gnupg/ /usr/lib/pacman/hooks/ (for later) /usr/lib/pacman/repos.d I am not sure how to order repos with this way, possibly with a priority directive or with just a ##-testing or whatever like modular directories. Or possibly use something like Before=community in community-testing so that it is checked before community... etc Leave pacman.conf and makepkg.conf in /etc but move them to /etc/pacman/ and remove repos from pacman.conf . Basically making it similar to how systemd's config files are setup 2) Move everything to /usr/lib/pacman , and make EVERYTHING possible to be split out. /usr/lib/pacman conf1.conf options stuff ... and config2.conf more options stuff ... community.repo ... this would depend on . Also, using the Before=community whenever a [repo] is defined 3) Some middle ground. In the end, I like seeing up with repo stuff looking like this whether you choose to put them in seperate files or not, making it so that repos can be organized besides just straight down the file. [Repo] Name=core Before=extra community SigLevel=PackageRequired Include=/etc/pacman.d/mirrorlist [Repo] Name=testing Before=core Requires=core SigLevel=PackageRequired Include=/etc/pacman.d/mirrorlist [Repo] Name=allanbrokeit Before=core SigLevel = Never Server = http://allanmcrae.com/$repo/$arch etc [1] https://bugs.archlinux.org/task/17690 Thanks, -- Daniel Wallace Archlinux Trusted User (gtmanfred) Georgia Institute of Technology

3 3

[pacman-dev] [PATCH] contrib: Update bash_completion
by Allan McRae 20 Mar '13

20 Mar '13

Check all options are included in bash-completion. Alphabetize the pacman_key options for easier maintenance. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- contrib/bash_completion.in | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/contrib/bash_completion.in b/contrib/bash_completion.in index 6ab264d..28981ae 100644 --- a/contrib/bash_completion.in +++ b/contrib/bash_completion.in @@ -44,14 +44,15 @@ _pacman_key() { local o cur opts prev wantfiles COMPREPLY=() _get_comp_words_by_ref cur prev - opts=('add delete export finger help list-keys recv-keys updatedb verify - version config edit-key gpgdir import import-trustdb init keyserver - list-sigs lsign-key populate refresh-keys nocolor' + opts=('add config delete edit-key export finger gpgdir + help import import-trustdb init keyserver list-keys list-sigs + lsign-key nocolor populate recv-keys refresh-keys updatedb + verify version' 'a d e f h l r u v V') # operations for which we want to complete keyids for o in 'd delete' 'e export' 'f finger' 'l list-keys' 'r recv-keys' \ - 'edit-key' 'list-sigs' 'refresh-keys'; do + 'edit-key' 'list-sigs' 'lsign-key' 'refresh-keys'; do _arch_incomp "$o" && break unset o done @@ -75,8 +76,9 @@ _makepkg() { _get_comp_words_by_ref cur prev if [[ $cur = -* && ! $prev =~ ^-(-(config|help)$|\w*[Chp]) ]]; then opts=('allsource asdeps asroot check clean config force geninteg help holdver ignorearch - install log nobuild nocheck nocolor noconfirm nodeps noextract - noprogressbar nosign pkg repackage rmdeps sign skipinteg source syncdeps' + install key log needed nobuild nocheck nocolor noconfirm nodeps noextract + noprogressbar nosign pkg repackage rmdeps sign skipchecksums skipinteg + skippgpcheck source syncdeps verifysource version' 'A L R S c d e f g h i m o p r s') _arch_ptr2comp opts fi -- 1.8.2

1 0

[pacman-dev] [PATCH] Remove duplicate option
by Allan McRae 20 Mar '13

20 Mar '13

The "skippgpcheck" option was specified twice. Also, fix alphabetical ordering. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- scripts/makepkg.sh.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 73f45d4..f9e0f95 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -2526,8 +2526,8 @@ OPT_SHORT="AcdefFghiLmop:rRsSV" OPT_LONG=('allsource' 'asroot' 'check' 'clean' 'config:' 'force' 'geninteg' 'help' 'holdver' 'ignorearch' 'install' 'key:' 'log' 'nobuild' 'nocolor' 'nocheck' 'nodeps' 'noextract' 'nosign' 'pkg:' 'repackage' 'rmdeps' - 'skipchecksums' 'skipinteg' 'skippgpcheck' 'skippgpcheck' 'sign' - 'source' 'syncdeps' 'verifysource' 'version') + 'sign' 'skipchecksums' 'skipinteg' 'skippgpcheck' 'source' 'syncdeps' + 'verifysource' 'version') # Pacman Options OPT_LONG+=('asdeps' 'noconfirm' 'needed' 'noprogressbar') -- 1.8.2

1 0

[pacman-dev] [PATCH v2] Give the frontend control over responses for print
by Connor Behan 19 Mar '13

19 Mar '13

There are currently 8 questions that libalpm may ask the user. Each of them has a "pacman default" and a "libalpm default". The pacman default is the response that gets used if the user presses enter without typing anything. Equivalently it is the response when --noconfirm is passed. The libalpm default is what happens when --print is passed and the question callback never even executes. This commit forces pacman to specify responses for --print and therefore never rely on the libalpm default. The following states how each question is handled: ALPM_QUESTION_INSTALL_IGNOREPKG: The pacman default is 1 and the libalpm default is 0. The latter was agreed to be a bug so we return 1 on print. ALPM_QUESTION_REPLACE_PKG: The pacman default is 1 and the libalpm default is 0. We return 0 on print. ALPM_QUESTION_CONFLICT_PKG: The pacman default is 0 and the libalpm default is 0. We return 0 on print even though print should not encounter this. ALPM_QUESTION_REMOVE_PKGS: The pacman default is 0 and the libalpm default is 0. We return 0 on print. ALPM_QUESTION_SELECT_PROVIDER: The pacman default is 0 and the libalpm default is 0. We return 0 on print. ALPM_QUESTION_LOCAL_NEWER: The pacman default is 1 and this is dead code so there is no libalpm default. We return 1 on print. ALPM_QUESTION_CORRUPTED_PKG: The pacman default is 1 and the libalpm default is 0. We return 0 on print even though print should not encounter this. ALPM_QUESTION_IMPORT_KEY: The pacman default is 1 and this is dead code so there is no libalpm default. We return 1 on print. Signed-off-by: Connor Behan <connor.behan(a)gmail.com> --- src/pacman/callback.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/pacman/callback.c b/src/pacman/callback.c index 71d9d04..66721f5 100644 --- a/src/pacman/callback.c +++ b/src/pacman/callback.c @@ -309,6 +309,15 @@ void cb_question(alpm_question_t event, void *data1, void *data2, void *data3, int *response) { if(config->print) { + switch(event) { + case ALPM_QUESTION_INSTALL_IGNOREPKG: + case ALPM_QUESTION_LOCAL_NEWER: + case ALPM_QUESTION_IMPORT_KEY: + *response = 1; + break; + default: + *response = 0; + } return; } switch(event) { -- 1.8.1.5

1 0

[pacman-dev] [PATCH] Give the frontend control over responses for print
by Connor Behan 19 Mar '13

19 Mar '13

There are currently 8 questions that libalpm may ask the user. Each of them has a "pacman default" and a "libalpm default". The pacman default is the response that gets used if the user presses enter without typing anything. Equivalently it is the response when --noconfirm is passed. The libalpm default is what happens when --print is passed and the question callback never even executes. This commit forces pacman to specify responses for --print and therefore never rely on the libalpm default. The following states how each question is handled: ALPM_QUESTION_INSTALL_IGNOREPKG: The pacman default is 1 and the libalpm default is 0. The latter was agreed to be a bug so we return 1 on print. ALPM_QUESTION_REPLACE_PKG: The pacman default is 1 and the libalpm default is 0. We return 0 on print. ALPM_QUESTION_CONFLICT_PKG: The pacman default is 0 and the libalpm default is 0. We return 0 on print even though print should not encounter this. ALPM_QUESTION_REMOVE_PKGS: The pacman default is 0 and the libalpm default is 0. We return 0 on print. ALPM_QUESTION_SELECT_PROVIDER: The pacman default is 0 and the libalpm default is 0. We return 0 on print. ALPM_QUESTION_LOCAL_NEWER: The pacman default is 1 and this is dead code so there is no libalpm default. We return 1 on print. ALPM_QUESTION_CORRUPTED_PKG: The pacman default is 1 and the libalpm default is 0. We return 0 on print even though print should not encounter this. ALPM_QUESTION_IMPORT_KEY: The pacman default is 1 and this is dead code so there is no libalpm default. We return 1 on print. Signed-off-by: Connor Behan <connor.behan(a)gmail.com> --- src/pacman/callback.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/pacman/callback.c b/src/pacman/callback.c index 71d9d04..d46cdbd 100644 --- a/src/pacman/callback.c +++ b/src/pacman/callback.c @@ -308,7 +308,16 @@ void cb_event(alpm_event_t event, void *data1, void *data2) void cb_question(alpm_question_t event, void *data1, void *data2, void *data3, int *response) { - if(config->print) { + if (config->print) { + switch(event) { + case ALPM_QUESTION_INSTALL_IGNOREPKG: + case ALPM_QUESTION_LOCAL_NEWER: + case ALPM_QUESTION_IMPORT_KEY: + *response = 1; + break; + default: + *response = 0; + } return; } switch(event) { -- 1.8.1.5

1 0

[pacman-dev] [PATCH] zsh completion: make $tmp local
by Daniel Wallace 18 Mar '13

18 Mar '13

The tmp variable is conflicting with the $tmp variable in ${^fpath}/_main_complete(N) and which is used to complete all the functions, and causing an error: command not found: for whatever was in $tmp (which in this case is the last value in $words[@]) making it local fixes this. Signed-off-by: Daniel Wallace <danielwallace(a)gtmanfred.com> --- contrib/zsh_completion.in | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/contrib/zsh_completion.in b/contrib/zsh_completion.in index 8ad4a63..5096b8f 100644 --- a/contrib/zsh_completion.in +++ b/contrib/zsh_completion.in @@ -118,7 +118,6 @@ _pacman_action_help() { _pacman_action_none() { _arguments -s : \ "$_pacman_opts_commands[@]" - return 0 } # handles --query subcommand @@ -320,6 +319,7 @@ _pacman_get_command() { # main dispatcher _pacman_zsh_comp() { local -a args cmds; + local tmp args=( ${${${(M)words:#-*}#-}:#-*} ) for tmp in $words; do cmds+=("${${_pacman_opts_commands[(r)*$tmp\[*]%%\[*}#*\)}") @@ -434,7 +434,6 @@ _pacman_zsh_comp() { esac ;; esac - return 0 } _key_shortopts=( -- 1.8.2

1 2

[pacman-dev] [PATCH v3] Treat packages to be printed as non-ignored
by Connor Behan 18 Mar '13

18 Mar '13

Calling pacman -Sp and pacman -Sup are guaranteed not to install a package. So the user's IgnorePkg pref is respected regardless of whether or not we print the mirror location. Therefore we do so in the case of -Sp as this gives the full information requested by the user. We avoid doing so in the case of -Sup as this would mislead the user into thinking that the upgrade is bigger than it really is. This fixes an edge case with devtools. Signed-off-by: Connor Behan <connor.behan(a)gmail.com> --- src/pacman/conf.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/pacman/conf.c b/src/pacman/conf.c index 3f1b1c3..99e6af1 100644 --- a/src/pacman/conf.c +++ b/src/pacman/conf.c @@ -1010,6 +1010,13 @@ int parseconfig(const char *file) if((ret = _parseconfig(file, &section, 1, 0))) { return ret; } + + /* #FS#34066 - Querying URLs for packages specified on the command line (even ignored ones) should succeed */ + if(config->print && !config->op_s_upgrade) { + config->ignorepkg = NULL; + config->ignoregrp = NULL; + } + if((ret = setup_libalpm())) { return ret; } -- 1.8.1.5

5 15

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v4.1.0rc1-29-g3eee3d6
by allan＠archlinux.org 17 Mar '13

17 Mar '13

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "The official pacman repository". The branch, master has been updated via 3eee3d67af2cb9b4375285c50faa344954223cdc (commit) via 47a7ea8c86d414acd0ad3be7861dd16a0b15b3db (commit) from 66fe80f39bdd30273336d1b9f0ab401d9e49bd25 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 3eee3d67af2cb9b4375285c50faa344954223cdc Author: Allan McRae <allan(a)archlinux.org> Date: Sun Mar 17 13:45:49 2013 +1000 More translation updating Pull updates from transifex. Add new "id" translation. Regerate po files with updated filelists... Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 47a7ea8c86d414acd0ad3be7861dd16a0b15b3db Author: Allan McRae <allan(a)archlinux.org> Date: Fri Mar 15 22:10:01 2013 +1000 Update POTFILES.in for libalpm and pacman Be complete with files listed. Comment out files where code is used or heavily based on other projects so will never have translatable strings. Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: lib/libalpm/po/LINGUAS | 1 + lib/libalpm/po/POTFILES.in | 5 + lib/libalpm/po/ar.po | 4 +- lib/libalpm/po/ca.po | 49 ++- lib/libalpm/po/cs.po | 44 +-- lib/libalpm/po/da.po | 42 +- lib/libalpm/po/de.po | 47 +-- lib/libalpm/po/el.po | 10 +- lib/libalpm/po/en_GB.po | 42 +- lib/libalpm/po/eo.po | 4 +- lib/libalpm/po/es.po | 48 +-- lib/libalpm/po/fa.po | 4 +- lib/libalpm/po/fi.po | 42 +- lib/libalpm/po/fr.po | 44 +-- lib/libalpm/po/gl.po | 42 +- lib/libalpm/po/hu.po | 48 ++- lib/libalpm/po/{fa.po => id.po} | 305 ++++++++------- lib/libalpm/po/it.po | 50 ++- lib/libalpm/po/ja.po | 61 ++- lib/libalpm/po/kk.po | 42 +- lib/libalpm/po/ko.po | 68 ++-- lib/libalpm/po/lt.po | 44 +-- lib/libalpm/po/nb.po | 50 ++- lib/libalpm/po/nl.po | 42 +- lib/libalpm/po/pl.po | 42 +- lib/libalpm/po/pt.po | 42 +- lib/libalpm/po/pt_BR.po | 48 +-- lib/libalpm/po/ro.po | 47 +-- lib/libalpm/po/ru.po | 42 +- lib/libalpm/po/sl.po | 30 +- lib/libalpm/po/sv.po | 42 +- lib/libalpm/po/tr.po | 52 ++- lib/libalpm/po/zh_CN.po | 51 ++- lib/libalpm/po/zh_TW.po | 44 +-- scripts/po/LINGUAS | 1 + scripts/po/ar.po | 6 +- scripts/po/ca.po | 287 +++++--------- scripts/po/cs.po | 212 +++------- scripts/po/da.po | 210 +++------- scripts/po/de.po | 12 +- scripts/po/el.po | 19 +- scripts/po/en_GB.po | 215 +++------- scripts/po/eo.po | 6 +- scripts/po/es.po | 5 +- scripts/po/fa.po | 6 +- scripts/po/fi.po | 223 +++-------- scripts/po/fr.po | 229 ++--------- scripts/po/gl.po | 6 +- scripts/po/hr.po | 2 +- scripts/po/hu.po | 217 ++--------- scripts/po/{kk.po => id.po} | 843 ++++++++++++++++++++-------------------- scripts/po/it.po | 279 +++++-------- scripts/po/ja.po | 279 +++++-------- scripts/po/kk.po | 116 ++---- scripts/po/ko.po | 42 +- scripts/po/lt.po | 280 +++++-------- scripts/po/nb.po | 274 +++++-------- scripts/po/nl.po | 6 +- scripts/po/pacman-scripts.pot | 4 +- scripts/po/pl.po | 156 ++------ scripts/po/pt.po | 225 ++--------- scripts/po/pt_BR.po | 339 ++++++---------- scripts/po/ro.po | 287 +++++--------- scripts/po/ru.po | 229 +++-------- scripts/po/sk.po | 5 +- scripts/po/sl.po | 64 +-- scripts/po/sr.po | 214 +++------- scripts/po/sr(a)latin.po | 213 +++------- scripts/po/sv.po | 113 ++---- scripts/po/tr.po | 281 +++++--------- scripts/po/uk.po | 268 ++++--------- scripts/po/zh_CN.po | 255 ++++-------- scripts/po/zh_TW.po | 6 +- src/pacman/po/LINGUAS | 1 + src/pacman/po/POTFILES.in | 4 + src/pacman/po/ar.po | 205 ++++++---- src/pacman/po/ca.po | 234 ++++++----- src/pacman/po/cs.po | 225 ++++++----- src/pacman/po/da.po | 226 ++++++----- src/pacman/po/de.po | 231 ++++++----- src/pacman/po/el.po | 84 +++- src/pacman/po/en_GB.po | 220 ++++++----- src/pacman/po/eo.po | 152 +++++--- src/pacman/po/es.po | 234 ++++++----- src/pacman/po/fa.po | 141 +++++-- src/pacman/po/fi.po | 223 ++++++----- src/pacman/po/fr.po | 222 ++++++----- src/pacman/po/gl.po | 187 +++++---- src/pacman/po/hr.po | 85 +++- src/pacman/po/hu.po | 77 +++- src/pacman/po/{hr.po => id.po} | 806 ++++++++++++++++++-------------------- src/pacman/po/it.po | 235 ++++++----- src/pacman/po/ja.po | 102 +++-- src/pacman/po/kk.po | 164 +++++--- src/pacman/po/ko.po | 97 ++++- src/pacman/po/lt.po | 239 +++++++----- src/pacman/po/nb.po | 240 +++++++----- src/pacman/po/nl.po | 72 +++- src/pacman/po/pacman.pot | 70 +++- src/pacman/po/pl.po | 224 ++++++----- src/pacman/po/pt.po | 246 ++++++------ src/pacman/po/pt_BR.po | 234 ++++++----- src/pacman/po/ro.po | 83 +++- src/pacman/po/ru.po | 226 ++++++----- src/pacman/po/sk.po | 81 +++- src/pacman/po/sl.po | 207 ++++++---- src/pacman/po/sr.po | 224 ++++++----- src/pacman/po/sr(a)latin.po | 224 ++++++----- src/pacman/po/sv.po | 221 ++++++----- src/pacman/po/tr.po | 237 ++++++----- src/pacman/po/uk.po | 77 +++- src/pacman/po/zh_CN.po | 225 ++++++----- src/pacman/po/zh_TW.po | 218 ++++++----- 113 files changed, 7148 insertions(+), 8367 deletions(-) copy lib/libalpm/po/{fa.po => id.po} (54%) copy scripts/po/{kk.po => id.po} (50%) copy src/pacman/po/{hr.po => id.po} (55%) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] Another oddity in translation files
by Dan McGee 16 Mar '13

16 Mar '13

991dfca9 po/pacman.pot (Xavier Chantry 2008-07-19 17:12:23 +0200 760) #, c-format 1e21aa58 src/pacman/po/pacman.pot (Allan McRae 2013-03-10 13:07:16 +1000 761) msgid "invalid agument '%s' for %s\n" 1e21aa58 src/pacman/po/pacman.pot (Allan McRae 2013-03-10 13:07:16 +1000 762) msgstr "" 1e21aa58 src/pacman/po/pacman.pot (Allan McRae 2013-03-10 13:07:16 +1000 763) s/agument/argument/, how'd this one slip back in? The actual code doesn't contain this string anywhere anymore, and the correct version is already in all the PO files. -Dan

2 1