From 1b25cb80ba5881bf8f01a32991764b26a7de6548 Mon Sep 17 00:00:00 2001 From: Matt Mooney Date: Thu, 28 Apr 2011 22:05:20 -0700 Subject: pacman(8): change "options" to "operation" when referring to -D -D is an operation not an option. Signed-off-by: Matt Mooney Signed-off-by: Allan McRae --- doc/pacman.8.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/pacman.8.txt b/doc/pacman.8.txt index a9abb3f4..07d8f0d2 100644 --- a/doc/pacman.8.txt +++ b/doc/pacman.8.txt @@ -35,7 +35,7 @@ read from stdin. Operations ---------- *-D, \--database*:: - Modify the package database. This options allows you to modify certain + Modify the package database. This operation allows you to modify certain attributes of the installed packages in pacman's database. At the moment, you can only change the install reason using '\--asdeps' and '\--asexplicit' options. -- cgit v1.2.3-70-g09d2 From 3ec723ddc75f04e9a3255cf0c4ac75cfe4210528 Mon Sep 17 00:00:00 2001 From: Matt Mooney Date: Thu, 28 Apr 2011 22:05:21 -0700 Subject: pacman(8): grammar correction for relative clauses Change "which" to "that" when used in a restrictive clause. Replace usage of the relative prounoun "those" with a common noun for added clarity. Signed-off-by: Matt Mooney Signed-off-by: Allan McRae Signed-off-by: Dan McGee --- doc/pacman.8.txt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/doc/pacman.8.txt b/doc/pacman.8.txt index 07d8f0d2..a66bd4a9 100644 --- a/doc/pacman.8.txt +++ b/doc/pacman.8.txt @@ -72,8 +72,8 @@ In addition to packages, groups can be specified as well. For example, if gnome is a defined package group, then `pacman -S gnome` will install every package in the gnome group, as well as the dependencies of those packages. + -Packages which provide other packages are also handled. For example, `pacman -S -foo` will first look for a foo package. If foo is not found, packages which +Packages that provide other packages are also handled. For example, `pacman -S +foo` will first look for a foo package. If foo is not found, packages that provide the same functionality as foo will be searched for. If any package is found, it will be installed. + @@ -94,7 +94,7 @@ greater than `1:3.6-1`. *-T, \--deptest*:: Check dependencies; this is useful in scripts such as makepkg to check installed packages. This operation will check each dependency specified and - return a list of those which are not currently satisfied on the system. + return a list of dependencies that are not currently satisfied on the system. This operation accepts no other options. Example usage: `pacman -T qt "bash>=3.2"`. @@ -125,7 +125,7 @@ Options Specify an alternative installation root (default is `/`). This should not be used as a way to install software into `/usr/local` instead of `/usr`. This option is used if you want to install a package on a - temporary mounted partition which is "owned" by another system. + temporary mounted partition that is "owned" by another system. *NOTE*: if database path or logfile are not specified on either the command line or in linkman:pacman.conf[5], their default location will be inside this root path. @@ -230,7 +230,7 @@ Query Options[[QO]] *-e, \--explicit*:: Restrict or filter output to explicitly installed packages. This option - can be combined with '-t' to list explicitly installed packages which + can be combined with '-t' to list explicitly installed packages that are not required by any other package. *-g, \--groups*:: -- cgit v1.2.3-70-g09d2 From da24324e2dad434bc6d868d9815efc9c2517a769 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Fri, 29 Apr 2011 16:04:13 -0500 Subject: Transifex updates Signed-off-by: Dan McGee --- po/de.po | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/po/de.po b/po/de.po index 0530f6cd..bc00b7b4 100644 --- a/po/de.po +++ b/po/de.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-12 12:00+0000\n" +"PO-Revision-Date: 2011-04-28 09:05+0000\n" "Last-Translator: Mineo \n" "Language-Team: German \n" "Language: de\n" @@ -31,7 +31,7 @@ msgstr "Löse Abhängigkeiten auf...\n" #, c-format msgid "looking for inter-conflicts...\n" -msgstr "Suche nach Zwischen-Konflikten...\n" +msgstr "Suche nach Zwischenkonflikten...\n" #, c-format msgid "installing %s...\n" @@ -790,7 +790,7 @@ msgstr[1] "%s: %d gesamte Dateien," msgid "%d missing file\n" msgid_plural "%d missing files\n" msgstr[0] "%d fehlende Datei\n" -msgstr[1] "%d fehlende Datein\n" +msgstr[1] "%d fehlende Dateien\n" #, c-format msgid "no usable package repositories configured.\n" @@ -1208,7 +1208,7 @@ msgid "Failed to extract %s" msgstr "Konnte %s nicht entpacken" msgid "A failure occurred in %s()." -msgstr "Ein Unfall geschah in %s()." +msgstr "Ein Fehler geschah in %s()." msgid "Starting %s()..." msgstr "Beginne %s()..." @@ -1328,7 +1328,7 @@ msgstr "so wie arch=('%s')" msgid "Provides array cannot contain comparison (< or >) operators." msgstr "" -"Der Array 'Provides' darf keine Vergleichs-Operatoren wie (< oder >) " +"Der Array 'provides' darf keine Vergleichs-Operatoren wie (< oder >) " "enthalten." msgid "Backup entry should not contain leading slash : %s" @@ -1360,7 +1360,7 @@ msgid "requires an argument" msgstr "erfordert ein Argument" msgid "unrecognized option" -msgstr "nicht-erkannte Option" +msgstr "nicht erkannte Option" msgid "invalid option" msgstr "ungültige Option" @@ -1587,7 +1587,7 @@ msgid "A package has already been built, installing existing package..." msgstr "Es wurde bereits ein Paket gebaut, installiere existierendes Paket..." msgid "A package has already been built. (use -f to overwrite)" -msgstr "Es wurde bereits ein Paket gebaut. (Benutzen Sie -f zum überschreiben)" +msgstr "Es wurde bereits ein Paket gebaut. (Benutzen Sie -f zum Überschreiben)" msgid "" "The package group has already been built, installing existing packages..." @@ -1619,7 +1619,7 @@ msgstr "Erstelle Paket: %s" msgid "A source package has already been built. (use -f to overwrite)" msgstr "" -"Es wurde bereits ein Quell-Paket gebaut. (Benutzen Sie -f zum überschreiben)" +"Es wurde bereits ein Quell-Paket gebaut. (Benutzen Sie -f zum Überschreiben)" msgid "Source package created: %s" msgstr "Quell-Paket erstellt: %s" @@ -1693,8 +1693,7 @@ msgstr "" "aktualisieren." msgid "Pacman lock file was found. Cannot run while pacman is running." -msgstr "" -"Pacman Sperr-Datei gefunden. Kann nicht arbeiten, während Pacman läuft." +msgstr "Pacman Lock-Datei gefunden. Kann nicht arbeiten, während Pacman läuft." msgid "Pre-3.5 database format detected - upgrading..." msgstr "Prä-3.5 Datenbankformat entdeckt - aktualisiere..." @@ -1896,13 +1895,13 @@ msgid "Creating '%s' db entry..." msgstr "Erstelle '%s' Datenbank-Eintrag" msgid "Computing md5 checksums..." -msgstr "Errechne md5-Prüfsummen..." +msgstr "Errechne MD5-Prüfsummen..." msgid "Old package file not found: %s" msgstr "Alte Paket-Datei nicht gefunden: %s" msgid "Failed to acquire lockfile: %s." -msgstr "Konnte die Lock-Datei nicht erreichen: %s." +msgstr "Konnte die Lock-Datei nicht beanspruchen: %s." msgid "Held by process %s" msgstr "Gehalten vom Prozess %s" @@ -1911,7 +1910,7 @@ msgid "Repository file '%s' is not a proper pacman database." msgstr "Repositorien-Datei '%s' ist keine korrekte pacman-Datenbank." msgid "Extracting database to a temporary location..." -msgstr "Entpacke Datenbasis an einen temporären Ort..." +msgstr "Entpacke Datenbank an einen temporären Ort..." msgid "Repository file '%s' was not found." msgstr "Repositorium \"%s\" wurde nicht gefunden." -- cgit v1.2.3-70-g09d2