moparisthebest
/
pacman
mirror of https://github.com/moparisthebest/pacman
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'maint'

This commit is contained in:
Dan McGee 2011-04-22 17:08:12 -05:00
parent e39c104d13 e3268d5e88
commit 934e8c79af
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
doc/pacman.8.txt
View File

@ -373,12 +373,14 @@ linkman:pacman.conf[5].
report of all packages to upgrade will be presented and the operation report of all packages to upgrade will be presented and the operation
will not proceed without user confirmation. Dependencies are will not proceed without user confirmation. Dependencies are
automatically resolved at this level and will be installed/upgraded if automatically resolved at this level and will be installed/upgraded if
necessary. Pass this option twice to enable package downgrade; in this necessary.
case pacman will select sync packages whose version does not match with +
the local version. This can be useful when the user switches from a testing Pass this option twice to enable package downgrade; in this case pacman will
repo to a stable one. Additional targets can also be specified manually, so select sync packages whose version does not match with the local version. This
that '-Su foo' will do a system upgrade and install/upgrade the foo package in can be useful when the user switches from a testing repo to a stable one.
the same operation. +
Additional targets can also be specified manually, so that '-Su foo' will do a
system upgrade and install/upgrade the foo package in the same operation.
*-w, \--downloadonly*:: *-w, \--downloadonly*::
Retrieve all packages from the server, but do not install/upgrade anything. Retrieve all packages from the server, but do not install/upgrade anything.

4
po/sk.po
View File

@ -8,7 +8,7 @@ msgstr ""
"Project-Id-Version: Arch Linux Pacman package manager\n" "Project-Id-Version: Arch Linux Pacman package manager\n"
"Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n" "Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n"
"POT-Creation-Date: 2011-04-18 11:23-0500\n" "POT-Creation-Date: 2011-04-18 11:23-0500\n"
"PO-Revision-Date: 2011-04-17 10:21+0000\n" "PO-Revision-Date: 2011-04-22 15:26+0000\n"
"Last-Translator: jose1711 <jose1711@gmail.com>\n" "Last-Translator: jose1711 <jose1711@gmail.com>\n"
"Language-Team: Slovak <None>\n" "Language-Team: Slovak <None>\n"
"Language: sk\n" "Language: sk\n"
@ -1699,7 +1699,7 @@ msgid "Finished. Your pacman database has been optimized."
msgstr "Hotovo. Databáza pacmana bola optimalizovaná." msgstr "Hotovo. Databáza pacmana bola optimalizovaná."
msgid "Usage: pkgdelta [-q] <package1> <package2>\\n" msgid "Usage: pkgdelta [-q] <package1> <package2>\\n"
msgstr "Použitie: pkgdelta [q] <balíček1> <balíček2>\\n" msgstr "Použitie: pkgdelta [-q] <balíček1> <balíček2>\\n"
msgid "" msgid ""
"\tpkgdelta will create a delta file between two packages.\\nThis delta file " "\tpkgdelta will create a delta file between two packages.\\nThis delta file "