summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2011-04-22 17:08:12 -0500
committerDan McGee <dan@archlinux.org>2011-04-22 17:08:12 -0500
commit934e8c79afcb0df8b750322c5e87d77203d9f1fe (patch)
tree9ab04ab8133d95dde49160b0750d556c95417207
parente39c104d13bfb6e2c055c2af3eee41bfa603b13b (diff)
parente3268d5e88308b1b854f5f256cb5fa40ac16ea5b (diff)
downloadpacman-934e8c79afcb0df8b750322c5e87d77203d9f1fe.tar.xz
Merge branch 'maint'
-rw-r--r--doc/pacman.8.txt14
-rw-r--r--po/sk.po4
2 files changed, 10 insertions, 8 deletions
diff --git a/doc/pacman.8.txt b/doc/pacman.8.txt
index f638123d..d1b8a731 100644
--- a/doc/pacman.8.txt
+++ b/doc/pacman.8.txt
@@ -373,12 +373,14 @@ linkman:pacman.conf[5].
report of all packages to upgrade will be presented and the operation
will not proceed without user confirmation. Dependencies are
automatically resolved at this level and will be installed/upgraded if
- necessary. Pass this option twice to enable package downgrade; in this
- 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
- repo to a stable one. 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.
+ necessary.
++
+Pass this option twice to enable package downgrade; in this 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 repo to a stable one.
++
+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*::
Retrieve all packages from the server, but do not install/upgrade anything.
diff --git a/po/sk.po b/po/sk.po
index 1d105637..8d5a2dbf 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -8,7 +8,7 @@ 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-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"
"Language-Team: Slovak <None>\n"
"Language: sk\n"
@@ -1699,7 +1699,7 @@ msgid "Finished. Your pacman database has been optimized."
msgstr "Hotovo. Databáza pacmana bola optimalizovaná."
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 ""
"\tpkgdelta will create a delta file between two packages.\\nThis delta file "