- Pacman-dev - lists.archlinux.org

[pacman-dev] warning: current locale is invalid...
by Andrew Fyfe 31 Mar '07

31 Mar '07

src/pacman/pacman.c line 448 Any chance this error can be sent to stderr rather than stdout, it's screwing up scripts that read in pacman output. And more to the point is it just me or does this error always come up if LC_ALL|LANG!=C|POSIX Andrew

2 1

[pacman-dev] spanish translation
by Juan Pablo González T. 31 Mar '07

31 Mar '07

Hi. I'm working in a translation of pacman to my native language, the spanish. i already done and corrected the pacman.po, and right now i'm working on libalpm.po. both for the "es" locale the reason of this mail is the next question: how can i send you my work? thank you for your patience. greetings!! __________________________________________________ Correo Yahoo! Espacio para todos tus mensajes, antivirus y antispam ¡gratis! Regístrate ya - http://correo.espanol.yahoo.com/

3 3

[pacman-dev] some notes for -h and getopt
by Nagy Gabor 31 Mar '07

31 Mar '07

Hi! Some things I noticed after my previous buggy patch: 1. After -h there are [package], <package> and <file> in many places, however [packages], <packages> and <files> would be better in most cases, so you should check and correct these. 2. I misled you by suggesting "-s <regex>" to -h. This very informative; however to be more precise, [package] (which should be [packages], see 1.; or [packages|regexes], huh ?:-) {which is in the first line (after -Sh or -Qh)} is treated as regex and this should be somehow described in the description of -s. Sorry for misleading :-( 3. Only "op" parameters are mutual now. Of course in many cases the "sub" parameters of the "op" parameters are not mutual; but after "pacman -Qls foo" not defined what will happen. I don't really care about this (I don't really like getopt either; and users are expected to use switches after thinking .-), I just warn you, that this command line is accepted now: "pacman -y foo -l -Q -s foo2" and not defined what will happen (<-Note: -y is not allowed after -Q, but accepted because allowed after -S) Bye, Nagy Gabor

1 0

[pacman-dev] [patch] Very small bug(?)fix
by Nagy Gabor 31 Mar '07

31 Mar '07

Hi! I wanted to search packages with "-Ss -hu" and I found that -hu is treated as a new switch. So here is my little patch to set that --search requires an argument. (Anyway, I could search with .*-hu :-) -------------------- --- pacman-lib/src/pacman/pacman.c.old 2007-03-31 09:26:09.000000000 +0200 +++ pacman-lib/src/pacman/pacman.c 2007-03-31 09:33:39.000000000 +0200 @@ -247,7 +247,7 @@ {"print-uris", no_argument, 0, 'p'}, {"root", required_argument, 0, 'r'}, {"recursive", no_argument, 0, 's'}, - {"search", no_argument, 0, 's'}, + {"search", required_argument, 0, 's'}, {"upgrades", no_argument, 0, 'u'}, {"sysupgrade", no_argument, 0, 'u'}, {"verbose", no_argument, 0, 'v'}, @@ -266,7 +266,7 @@ struct stat st; unsigned short logmask; - while((opt = getopt_long(argc, argv, "ARUFQSTr:b:vkhscVfmnoldepiuwyg", opts, &option_index))) { + while((opt = getopt_long(argc, argv, "ARUFQSTr:b:vkhs:cVfmnoldepiuwyg", opts, &option_index))) { if(opt < 0) { break; } ----------------------- Bye, Nagy Gabor

1 1

[pacman-dev] 20070331 Italian Translation
by Giovanni Scafora 31 Mar '07

31 Mar '07

Hi guys, there is a patch for italian translation. Thanks. -- Giovanni Scafora Arch Linux Trusted User (voidnull) http://www.archlinux.org linuxmania(a)gmail.com

1 0

[pacman-dev] [patch] FS#4404 - rsync protocol support for makepkg.
by Andrew Fyfe 30 Mar '07

30 Mar '07

A set of patches to add support for downloading from rsync in makepkg. Andrew >From 5248d7bfd1e37b1c332c77537d08cb1a1d58f628 Mon Sep 17 00:00:00 2001 From: Andrew Fyfe <andrew(a)neptune-one.net> Date: Thu, 29 Mar 2007 10:58:16 +0100 Subject: [PATCH 1/3] Moved check for download client into getDownloadClient(). Signed-off-by: Andrew Fyfe <andrew(a)neptune-one.net> --- scripts/makepkg | 91 +++++++++++++++++++++++++++++++++---------------------- 1 files changed, 55 insertions(+), 36 deletions(-) diff --git a/scripts/makepkg b/scripts/makepkg index 5afb285..0e5c5ec 100755 --- a/scripts/makepkg +++ b/scripts/makepkg @@ -190,6 +190,26 @@ checkdeps() { fi } +getDownloadClient () { + # $1 = Config variable name. + + local agent=$(eval echo \$$1) + if [ -z "$agent" ]; then + error "$1 is not configured. Check the /etc/makepkg.conf file." + error "Aborting..." + exit 1 # $E_CONFIG_ERROR # TODO: error code + fi + + local program="$(echo $agent | awk '{print $1 }')" + if [ ! -x "$program" ]; then + error "The download program $(basename $program) is not installed." + error "Aborting..." + exit 1 # $E_MISSING_PROGRAM # TODO: error code + fi + + echo $agent +} + handledeps() { local missingdeps=0 local deplist="$*" @@ -659,58 +679,57 @@ fi cd "$startdir" -# retrieve sources -msg "Retrieving Sources..." mkdir -p src cd "$startdir/src" + + +msg "Retrieving Sources..." for netfile in ${source[@]}; do file=$(strip_url "$netfile") if [ -f "../$file" ]; then msg2 "Found $file in build dir" cp "../$file" . + continue elif [ -f "$SRCDEST/$file" ]; then msg2 "Using cached copy of $file" cp "$SRCDEST/$file" . - else - # check for a download utility - if [ -z "$FTPAGENT" ]; then - error "FTPAGENT is not configured. Check the /etc/makepkg.conf file." - msg "Aborting..." - exit 1 - fi - ftpclient=$(echo $FTPAGENT | awk {'print $1'}) - if [ ! -x "$ftpclient" ]; then - error "ftpclient $(basename $ftpclient) is not installed." - msg "Aborting..." - exit 1 - fi - proto=$(echo "$netfile" | sed 's|://.*||') - if [ "$proto" != "ftp" -a "$proto" != "http" -a "$proto" != "https" ]; then + continue + fi + + proto=$(echo $netfile | sed 's|://.*||') + case "$proto" in + ftp|http|https) + FTPAGENT_PROGRAM=$FTPAGENT_PROGRAM # HACK ALERT! + dlclient=$(getDownloadClient FTPAGENT) || exit $?;; + + *) error "$netfile was not found in the build directory and is not a proper URL." msg "Aborting..." - exit 1 - fi - msg2 "Downloading $file" - $FTPAGENT "$netfile" - # fix flyspray bug #3289 - ftpret=$? - if [ $ftpret -gt 0 ]; then - error "Failure while downloading $file" - msg "Aborting..." - #rm "$file" - exit 1 - fi - if [ -n "$SRCDEST" ]; then - mkdir -p $SRCDEST && cp "$file" $SRCDEST - if [ $? -ne 0 ]; then - warning "You do not have correct permissions to cache source in $SRCDEST" - cp "$file" .. - fi - else + exit 1 # $E_BAD_PKGBUILD # TODO: error code + ;; + esac + + msg2 "Downloading $file" + # fix flyspray bug #3289 + ret=0 + $dlclient "$netfile" || ret=$? + if [ $ret -gt 0 ]; then + error "Failure while downloading $file" + msg "Aborting..." + exit 1 + fi + + if [ -n "$SRCDEST" ]; then + mkdir -p "$SRCDEST" && cp "$file" "$SRCDEST" || ret=$? + if [ $ret -gt 0 ]; then + warning "You do not have correct permissions to cache source in $SRCDEST" cp "$file" .. fi + else + cp "$file" .. fi done +unset netfile file dlclient proto ret if [ "$NOEXTRACT" = "1" -o "$REPKG" = "1" ]; then warning "Skipping source integrity checks -- using existing src/ tree" -- 1.5.0.5 >From 46cf6179ae0c0f4afb7c0382be82cf777cd0b6ff Mon Sep 17 00:00:00 2001 From: Andrew Fyfe <andrew(a)neptune-one.net> Date: Thu, 29 Mar 2007 11:02:09 +0100 Subject: [PATCH 2/3] Fixed FS#4404 - rsync protocol support for makepkg. Added support for rsync to getDownloadClient(). Signed-off-by: Andrew Fyfe <andrew(a)neptune-one.net> --- scripts/makepkg | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/scripts/makepkg b/scripts/makepkg index 0e5c5ec..87fd384 100755 --- a/scripts/makepkg +++ b/scripts/makepkg @@ -702,6 +702,9 @@ for netfile in ${source[@]}; do FTPAGENT_PROGRAM=$FTPAGENT_PROGRAM # HACK ALERT! dlclient=$(getDownloadClient FTPAGENT) || exit $?;; + rsync) + dlclient=$(getDownloadClient RSYNCAGENT);; + *) error "$netfile was not found in the build directory and is not a proper URL." msg "Aborting..." -- 1.5.0.5 >From 8c4c9ee8b2678fb8a63b2c1b4fa61d41bb83c686 Mon Sep 17 00:00:00 2001 From: Andrew Fyfe <andrew(a)neptune-one.net> Date: Thu, 29 Mar 2007 11:03:11 +0100 Subject: [PATCH 3/3] Added RSYNCAGENT to makepkg.conf.in Signed-off-by: Andrew Fyfe <andrew(a)neptune-one.net> --- etc/makepkg.conf.in | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/etc/makepkg.conf.in b/etc/makepkg.conf.in index 9ac0ef2..3c0fdf8 100644 --- a/etc/makepkg.conf.in +++ b/etc/makepkg.conf.in @@ -10,6 +10,8 @@ FTPAGENT="/usr/bin/wget --continue --passive-ftp --tries=3 --waitretry=3 --no-check-certificate" #FTPAGENT="/usr/bin/snarf" #FTPAGENT="/usr/bin/lftpget -c" +#-- The rsync program that makepkg should use to acquire sources +RSYNCAGENT="/usr/bin/rsync" ######################################################################### # ARCHITECTURE, COMPILE FLAGS -- 1.5.0.5

2 2

[pacman-dev] CVS update of pacman-lib/src/pacman/po (hu.po)
by Dan McGee 30 Mar '07

30 Mar '07

Date: Friday, March 30, 2007 @ 15:55:08 Author: dan Path: /home/cvs-pacman/pacman-lib/src/pacman/po Modified: hu.po (1.16 -> 1.17) * Updated Hungarian translation Nagy Gabor <ngaba(a)petra.hos.u-szeged.hu> -------+ hu.po | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) Index: pacman-lib/src/pacman/po/hu.po diff -u pacman-lib/src/pacman/po/hu.po:1.16 pacman-lib/src/pacman/po/hu.po:1.17 --- pacman-lib/src/pacman/po/hu.po:1.16 Sat Mar 24 00:18:18 2007 +++ pacman-lib/src/pacman/po/hu.po Fri Mar 30 15:55:05 2007 @@ -129,7 +129,7 @@ #: src/pacman/log.h:34 msgid "warning: " -msgstr "figyelmeztetés" +msgstr "figyelmeztetés: " #: src/pacman/package.c:60 msgid "Explicitly installed" @@ -270,7 +270,7 @@ #: src/pacman/package.c:180 #, c-format msgid "error calculating checksums for %s\n" -msgstr "hiba a %s ellenõrzõ összegének számítása közben\n" +msgstr "hiba a(z) %s ellenõrzõ összegének számítása közben\n" #: src/pacman/package.c:193 #, c-format @@ -615,7 +615,7 @@ #: src/pacman/pacman.c:300 #, c-format msgid "'%s' is not a valid debug level" -msgstr "a '%s' nem érvényes hibakeresési szint" +msgstr "a(z) '%s' nem érvényes hibakeresési szint" #: src/pacman/pacman.c:315 #, c-format @@ -687,7 +687,7 @@ #: src/pacman/query.c:105 #, c-format msgid "cannot determine real path for '%s': %s" -msgstr "nem állapítható meg a valódi útvonal a '%s' számára: %s" +msgstr "nem állapítható meg a valódi útvonal a(z) '%s' számára: %s" #: src/pacman/query.c:119 #, c-format @@ -714,7 +714,7 @@ #: src/pacman/query.c:221 #, c-format msgid "group \"%s\" was not found\n" -msgstr "a \"%s\" csoport nem található\n" +msgstr "a(z) \"%s\" csoport nem található\n" #: src/pacman/query.c:232 msgid "no package file was specified for --file\n" @@ -752,7 +752,7 @@ #: src/pacman/remove.c:92 #, c-format msgid "failed to add target '%s' (%s)\n" -msgstr "nem sikerült a '%s' célt hozzáadni a tranzakcióhoz (%s)\n" +msgstr "nem sikerült a(z) '%s' célt hozzáadni a tranzakcióhoz (%s)\n" #: src/pacman/remove.c:106 #, c-format @@ -812,7 +812,7 @@ #: src/pacman/sync.c:223 #, c-format msgid " %s is up to date\n" -msgstr " a %s naprakész\n" +msgstr " a(z) %s naprakész\n" #: src/pacman/sync.c:345 #, c-format

1 0

[pacman-dev] Some pacman/hu.po bugfixes
by Nagy Gabor 30 Mar '07

30 Mar '07

Hi! Here is the patch: ------------------ --- pacman-lib/src/pacman/po/hu.po.old 2007-03-29 15:27:46.000000000 +0200 +++ pacman-lib/src/pacman/po/hu.po 2007-03-29 15:59:43.000000000 +0200 @@ -129,7 +129,7 @@ #: src/pacman/log.h:34 msgid "warning: " -msgstr "figyelmeztetés" +msgstr "figyelmeztetés: " #: src/pacman/package.c:60 msgid "Explicitly installed" @@ -270,7 +270,7 @@ #: src/pacman/package.c:180 #, c-format msgid "error calculating checksums for %s\n" -msgstr "hiba a %s ellenőrző összegének számítása közben\n" +msgstr "hiba a(z) %s ellenőrző összegének számítása közben\n" #: src/pacman/package.c:193 #, c-format @@ -615,7 +615,7 @@ #: src/pacman/pacman.c:300 #, c-format msgid "'%s' is not a valid debug level" -msgstr "a '%s' nem érvényes hibakeresési szint" +msgstr "a(z) '%s' nem érvényes hibakeresési szint" #: src/pacman/pacman.c:315 #, c-format @@ -687,7 +687,7 @@ #: src/pacman/query.c:105 #, c-format msgid "cannot determine real path for '%s': %s" -msgstr "nem állapítható meg a valódi útvonal a '%s' számára: %s" +msgstr "nem állapítható meg a valódi útvonal a(z) '%s' számára: %s" #: src/pacman/query.c:119 #, c-format @@ -714,7 +714,7 @@ #: src/pacman/query.c:221 #, c-format msgid "group \"%s\" was not found\n" -msgstr "a \"%s\" csoport nem található\n" +msgstr "a(z) \"%s\" csoport nem található\n" #: src/pacman/query.c:232 msgid "no package file was specified for --file\n" @@ -752,7 +752,7 @@ #: src/pacman/remove.c:92 #, c-format msgid "failed to add target '%s' (%s)\n" -msgstr "nem sikerült a '%s' célt hozzáadni a tranzakcióhoz (%s)\n" +msgstr "nem sikerült a(z) '%s' célt hozzáadni a tranzakcióhoz (%s)\n" #: src/pacman/remove.c:106 #, c-format @@ -812,7 +812,7 @@ #: src/pacman/sync.c:223 #, c-format msgid " %s is up to date\n" -msgstr " a %s naprakész\n" +msgstr " a(z) %s naprakész\n" #: src/pacman/sync.c:345 #, c-format --------------------

2 2

[pacman-dev] Git guide for pacman
by Dan McGee 30 Mar '07

30 Mar '07

I put this together last night and today to help everyone out with GIT usage. It is meant to be a overview, not a "step-by-step type exactly what I say" type of thing. Let me know if it is helpful, unhelpful, and what needs to be made more clear. I don't want to make it much more complex then this- once you understand the basics, you should start picking up the power of git on your own. -Dan ================= Super quick GIT guide This isn't meant to be an all-encompassing guide by any means- it is meant to be a really quick walk-through on how to do some basic operations on the pacman codebase in git, such as submitting a patch. For more extensive tutorials, check out the following: http://www.kernel.org/pub/software/scm/git/docs/tutorial.html www.kernel.org/pub/software/scm/git/docs/everyday.html http://wiki.winehq.org/GitWine (talks a lot about maintaining patches) In addition, all git commands have decent manpages to refer to. They can be reached one of two ways- for the git-add command, type 'man git-add' or 'git help add'. =Getting Started= The first step with git is cloning a remote repository. This is known in the CVS and SVN camps as checking out. GIT checkout has a different purpose, but that will be covered later. To grab the pacman source, run the following: git clone http://code.toofishes.net/gitprojects/pacman.git This will check out a local copy of the repository for you. This means you have the FULL history of the project on your computer, not just the most recent revision. This allows you to get work done even when offline, for example. The first steps after cloning may be just to look around. If you have read the tutorials mentioned above, even if you do not understand everything in them, you will be much better off. You will probably want to set up your name and email address for use in commit logs: git repo-config user.name "Your Name" git repo-config user.email "me(a)example.com" If you pass the '--global' flag to the above commands, the name and email will be stored in ~/.gitconfig, so will be used for all git projects unless overridden by a setting in the individual project. To update your local repository with any new branches, run 'git pull'. =Next Steps= 'git branch' will show you a list of branches. Initially, master is the only branch. However, if you pulled from a remote repo, you may have grabbed other branches- these can be seen with 'git branch -r'. Read the manpage for details. When working with git, it is good practice to never do your work on the master branch. This should stay clean to allow you to run 'git pull' and ensure that conflicts do not happen on the update. To create your own working branch, do the following (naming it whatever your heart desires): git branch working git checkout working Or compress the above into one command: git checkout -b working I highly recommend you read the man page for both of these commands. 'git-status' is highly helpful, read up on that too. =Making a patch= Woo! You found a bug in pacman (what a surprise) and know how to fix it. Ensure you have your working branch checked out ('git checkout working'). Then edit the file(s) you need in order to make your changes. Compiling is a good idea to ensure your patch didn't break anything, and if it is a big change, running 'make check' is highly recommended. So what do you do now? First, run 'git status'. You should see a list or even a few lists of files. The descriptions by each are a bit confusing, but you should be able to figure it out. GIT takes a different approach than CVS or SVN to committing changes- it doesn't commit a thing by default. You have to tell it what to commit, usually by running 'git add <filename>'. At this point, the file in its current state will be sent to a staging area for the commit. If you go back and change something in the file, you will have to git-add it again if you want the changes to be reflected in the commit. To commit your patch to your branch: git add <all edited files> git commit -s When writing a commit message, keep the following in mind. The first line is used as a patch summary- keep it short and concise. Next, skip a line and type out a full description of what your patch does. By full, I don't mean long- if you described everything in the summary line, then don't even bother with a message. Finally, skip one more line and you will have your Signed-off-by. This should have been automatically added by passing the '-s' parameter to 'git commit'. There is one more important step before submission. Because git is distributed, you don't have the most current version of the repository unless you go out and get it. In the easiest case, this is just running 'git pull'. You also want to make sure your patches are based off the most recent revision, known as the 'head'. To do this, checkout your branch with your patches, and use the following command: git rebase master To visualize what the above command did, qgit can be very helpful. To format a patch for email submission and review: git format-patch master This command will format all patches that make up the difference between your working branch and the master branch. They will be saved in the local directory; to store them elsewhere read up on the '-o' option. =Fixing your patch= So you sent off your patch to the ML and you got a few suggestions back. How does one fix it? Hopefully you did it on a branch and not the master branch, otherwise you are going to have a much tougher time. :) If it was the last patch on a branch: (edit the required files) git add <edited files> git commit --append -s If it was deeper in your patch tree: (ensure you are in the branch you wish to edit) git checkout -b tmp HEAD~<number> (where number is how far back you want to go, use 'git log' to determine) git reset HEAD^ (edit the required files) git commit -s -c ORIG_HEAD git rebase --onto tmp working~<number> working (replace working with your current working branch) git branch -D tmp http://wiki.winehq.org/GitWine has good information on the above, that is where most of this came from. After fixing your patch, you will probably want to rebase it as described above, and then use format-patch to submit it again. =Further reading= Commands you will definitely want to be knowledgeable on: clone (only once!), branch, checkout, status, pull, fetch, diff, add, commit, rebase, format-patch =Helpful Hints= 'git' itself is a wrapper script that calls the other commands. Thus, git-add can be called with either 'git add' or 'git-add'. qgit in extra is a great GUI viewer for git repositories. In addition, read up on 'git-instaweb'. Keep typing 'git co' instead of 'git checkout'? Try this: git config --global alias.co checkout

5 6

[pacman-dev] CVS update of pacman-lib/src/pacman/po (ru_RU.po)
by Dan McGee 30 Mar '07

30 Mar '07

Date: Friday, March 30, 2007 @ 14:06:04 Author: dan Path: /home/cvs-pacman/pacman-lib/src/pacman/po Modified: ru_RU.po (1.7 -> 1.8) * Updated Russian translation Владимир Байраковский <4rayven(a)gmail.com> ----------+ ru_RU.po | 58 +++++++++++++++++++++++++++++----------------------------- 1 file changed, 29 insertions(+), 29 deletions(-) Index: pacman-lib/src/pacman/po/ru_RU.po diff -u pacman-lib/src/pacman/po/ru_RU.po:1.7 pacman-lib/src/pacman/po/ru_RU.po:1.8 --- pacman-lib/src/pacman/po/ru_RU.po:1.7 Mon Mar 26 18:47:57 2007 +++ pacman-lib/src/pacman/po/ru_RU.po Fri Mar 30 14:06:04 2007 @@ -134,7 +134,7 @@ #: src/pacman/package.c:60 msgid "Explicitly installed" -msgstr "Неявно установлен" +msgstr "Явно установлен" #: src/pacman/package.c:63 msgid "Installed as a dependency for another package" @@ -173,7 +173,7 @@ #: src/pacman/package.c:78 src/pacman/package.c:130 msgid "Provides :" -msgstr "Обеспечивает :" +msgstr "Предоставляет :" #: src/pacman/package.c:79 src/pacman/package.c:131 msgid "Depends On :" @@ -311,32 +311,32 @@ #: src/pacman/pacman.c:92 #, c-format msgid " %s {-A --add} [options] <file>\n" -msgstr " %s {-A --add} [опции] <файл>\n" +msgstr " %s {-A --add} [параметры] <файл>\n" #: src/pacman/pacman.c:93 #, c-format msgid " %s {-F --freshen} [options] <file>\n" -msgstr " %s {-F --freshen} [опции] <файл>\n" +msgstr " %s {-F --freshen} [параметры] <файл>\n" #: src/pacman/pacman.c:94 #, c-format msgid " %s {-Q --query} [options] [package]\n" -msgstr " %s {-Q --query} [опции] [пакет]\n" +msgstr " %s {-Q --query} [параметры] [пакет]\n" #: src/pacman/pacman.c:95 #, c-format msgid " %s {-R --remove} [options] <package>\n" -msgstr " %s {-R --remove} [опции] <пакет>\n" +msgstr " %s {-R --remove} [параметры] <пакет>\n" #: src/pacman/pacman.c:96 #, c-format msgid " %s {-S --sync} [options] [package]\n" -msgstr " %s {-S --sync} [опции] [пакет]\n" +msgstr " %s {-S --sync} [параметры] [пакет]\n" #: src/pacman/pacman.c:97 #, c-format msgid " %s {-U --upgrade} [options] <file>\n" -msgstr " %s {-U --upgrade} [опции] <файл>\n" +msgstr " %s {-U --upgrade} [параметры] <файл>\n" #: src/pacman/pacman.c:98 #, c-format @@ -351,13 +351,13 @@ #: src/pacman/pacman.c:101 #, c-format msgid "usage: %s {-A --add} [options] <file>\n" -msgstr "использование: %s {-A --add} [опции] <файл>\n" +msgstr "использование: %s {-A --add} [параметры] <файл>\n" #: src/pacman/pacman.c:102 src/pacman/pacman.c:107 src/pacman/pacman.c:119 #: src/pacman/pacman.c:124 src/pacman/pacman.c:138 #, c-format msgid "options:\n" -msgstr "опции:\n" +msgstr "параметры:\n" #: src/pacman/pacman.c:103 src/pacman/pacman.c:109 src/pacman/pacman.c:120 #: src/pacman/pacman.c:140 @@ -375,7 +375,7 @@ #: src/pacman/pacman.c:106 #, c-format msgid "usage: %s {-R --remove} [options] <package>\n" -msgstr "использование: %s {-R --remove} [опции] <пакет>\n" +msgstr "использование: %s {-R --remove} [параметры] <пакет>\n" #: src/pacman/pacman.c:108 #, c-format @@ -407,17 +407,17 @@ #: src/pacman/pacman.c:115 #, c-format msgid "usage: %s {-F --freshen} [options] <file>\n" -msgstr "использование: %s {-F --freshen} [опции] <файл>\n" +msgstr "использование: %s {-F --freshen} [параметры] <файл>\n" #: src/pacman/pacman.c:117 #, c-format msgid "usage: %s {-U --upgrade} [options] <file>\n" -msgstr "использование: %s {-U --upgrade} [опции] <файл>\n" +msgstr "использование: %s {-U --upgrade} [параметры] <файл>\n" #: src/pacman/pacman.c:123 #, c-format msgid "usage: %s {-Q --query} [options] [package]\n" -msgstr "использование: %s {-Q --query} [опции] [пакет]\n" +msgstr "использование: %s {-Q --query} [параметры] [пакет]\n" #: src/pacman/pacman.c:125 #, c-format @@ -468,7 +468,7 @@ #, c-format msgid " -p, --file <package> query a package file instead of the database\n" msgstr "" -" -p, --file <пакет> извлечь информацию из файла пакета <пакет>, а не из " +" -p, --file <пакет> извлечь информацию из файла пакета <пакет>, а не из " "базы данных\n" #: src/pacman/pacman.c:134 @@ -477,7 +477,7 @@ " -s, --search <regex> search locally-installed packages for matching " "strings\n" msgstr "" -" -s, --search <regex> искать указанную строку в локально установленных " +" -s, --search <regex> искать указанную строку в локально установленных " "пакетах\n" #: src/pacman/pacman.c:135 @@ -490,7 +490,7 @@ #: src/pacman/pacman.c:137 #, c-format msgid "usage: %s {-S --sync} [options] [package]\n" -msgstr "использование: %s {-S --sync} [опции] [пакет]\n" +msgstr "использование: %s {-S --sync} [параметры] [пакет]\n" #: src/pacman/pacman.c:139 #, c-format @@ -539,8 +539,7 @@ " -w, --downloadonly download packages but do not install/upgrade " "anything\n" msgstr "" -" -w, --downloadonly загрузить пакеты с сервера, но ничего не " -"устанавливать и не обновлять\n" +" -w, --downloadonly загрузить пакеты с сервера, но не устанавливать\n" #: src/pacman/pacman.c:150 #, c-format @@ -642,7 +641,7 @@ #: src/pacman/pacman.c:363 #, c-format msgid "'%s' is not a valid root path\n" -msgstr "'%s' не является верным корневым каталогом\n" +msgstr "некорректный корневой каталог: '%s'\n" #: src/pacman/pacman.c:390 msgid "only one operation may be used at a time\n" @@ -659,12 +658,13 @@ #: src/pacman/pacman.c:489 msgid "you cannot perform this operation unless you are root.\n" -msgstr "Вы не можете выполнить эту операцию если вы не root.\n" +msgstr "" +"Вы не можете выполнить эту операцию не являясь суперпользователем (root).\n" #: src/pacman/pacman.c:505 #, c-format msgid "failed to parse config (%s)\n" -msgstr "не удалось разобрать конфигурационный файл (%s)\n" +msgstr "не удалось обработать конфигурационный файл (%s)\n" #: src/pacman/pacman.c:516 msgid "Targets :" @@ -673,15 +673,15 @@ #: src/pacman/pacman.c:522 #, c-format msgid "could not register 'local' database (%s)\n" -msgstr "не могу зарегистрировать 'локальную' базу данных (%s)\n" +msgstr "не могу зарегистрировать локальную базу данных (%s)\n" #: src/pacman/pacman.c:529 msgid "no targets specified (use -h for help)\n" -msgstr "не задано целей (для помощи используйте -h)\n" +msgstr "не задано целей (для справки используйте -h)\n" #: src/pacman/pacman.c:542 msgid "no operation specified (use -h for help)\n" -msgstr "не указаны конкретные операции (для помощи используйте -h)\n" +msgstr "не задана операция (для справки используйте -h)\n" #: src/pacman/query.c:90 msgid "no file was specified for --owns\n" @@ -730,7 +730,7 @@ #: src/pacman/query.c:232 msgid "no package file was specified for --file\n" -msgstr "не указан файл пакета для опции --file\n" +msgstr "не указан файл пакета для параметра --file\n" #: src/pacman/query.c:236 #, c-format @@ -852,7 +852,7 @@ #: src/pacman/sync.c:491 msgid "synchronizing package lists" -msgstr "синхронизирую список пакетов" +msgstr "синхронизирую списки пакетов" #: src/pacman/sync.c:493 msgid "failed to synchronize any databases" @@ -884,7 +884,7 @@ #: src/pacman/sync.c:522 msgid ":: Upgrade pacman first? [Y/n] " -msgstr ":: Сначала обновить pacman? [Y/n] " +msgstr ":: Обновить pacman в первую очередь? [Y/n] " #: src/pacman/sync.c:537 #, c-format @@ -908,7 +908,7 @@ #: src/pacman/sync.c:603 #, c-format msgid "'%s': not found in sync db\n" -msgstr "'%s': не найдено в базе данных\n" +msgstr "'%s': не найдено в базе пакетов\n" #: src/pacman/sync.c:621 msgid "requires"

1 0