From f1ea4c8d241f2242aeeaa264bc42806853b0802e Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Wed, 16 Mar 2011 19:32:01 -0500 Subject: Update index.txt with 3.5.0 release Signed-off-by: Dan McGee --- doc/index.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/index.txt b/doc/index.txt index 0e037ac6..0d855bdf 100644 --- a/doc/index.txt +++ b/doc/index.txt @@ -63,6 +63,7 @@ Releases `------------`------- Date Version --------------------- +2011-03-16 v3.5.0 2011-01-22 v3.4.3 2010-12-29 v3.4.2 2010-09-03 v3.4.1 -- cgit v1.2.3-70-g09d2 From 771c002c98292c6567d0f4985d296e152c35166c Mon Sep 17 00:00:00 2001 From: Allan McRae Date: Sat, 12 Mar 2011 10:32:20 +1000 Subject: Add missing newline to warning message Signed-off-by: Allan McRae Signed-off-by: Dan McGee --- lib/libalpm/diskspace.c | 4 ++-- lib/libalpm/po/libalpm.pot | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/libalpm/diskspace.c b/lib/libalpm/diskspace.c index bfc63e78..892b1aac 100644 --- a/lib/libalpm/diskspace.c +++ b/lib/libalpm/diskspace.c @@ -168,7 +168,7 @@ static int calculate_removed_size(const alpm_list_t *mount_points, mp = match_mount_point(mount_points, path); if(mp == NULL) { _alpm_log(PM_LOG_WARNING, - _("could not determine mount point for file %s"), filename); + _("could not determine mount point for file %s\n"), filename); continue; } @@ -230,7 +230,7 @@ static int calculate_installed_size(const alpm_list_t *mount_points, mp = match_mount_point(mount_points, path); if(mp == NULL) { _alpm_log(PM_LOG_WARNING, - _("could not determine mount point for file %s"), filename); + _("could not determine mount point for file %s\n"), filename); continue; } diff --git a/lib/libalpm/po/libalpm.pot b/lib/libalpm/po/libalpm.pot index eeb9f72e..ba88318b 100644 --- a/lib/libalpm/po/libalpm.pot +++ b/lib/libalpm/po/libalpm.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: pacman 3.5.0\n" "Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n" -"POT-Creation-Date: 2011-03-14 13:51-0500\n" +"POT-Creation-Date: 2011-03-16 19:34-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -184,7 +184,7 @@ msgid "could not get filesystem information for %s: %s\n" msgstr "" #, c-format -msgid "could not determine mount point for file %s" +msgid "could not determine mount point for file %s\n" msgstr "" #, c-format -- cgit v1.2.3-70-g09d2 From e28c47ade3253a4126b20f42a7715c69ec3555aa Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Wed, 16 Mar 2011 19:51:12 -0500 Subject: Update translations for message with added newline Signed-off-by: Dan McGee --- lib/libalpm/po/ca.po | 4 ++-- lib/libalpm/po/cs.po | 6 +++--- lib/libalpm/po/da.po | 4 ++-- lib/libalpm/po/de.po | 6 +++--- lib/libalpm/po/el.po | 6 +++--- lib/libalpm/po/en_GB.po | 6 +++--- lib/libalpm/po/es.po | 6 +++--- lib/libalpm/po/fi.po | 4 ++-- lib/libalpm/po/fr.po | 6 +++--- lib/libalpm/po/hu.po | 6 +++--- lib/libalpm/po/it.po | 6 +++--- lib/libalpm/po/kk.po | 6 +++--- lib/libalpm/po/ko.po | 4 ++-- lib/libalpm/po/nb.po | 4 ++-- lib/libalpm/po/pl.po | 4 ++-- lib/libalpm/po/pt.po | 4 ++-- lib/libalpm/po/pt_BR.po | 6 +++--- lib/libalpm/po/ro.po | 16 +++++++++------- lib/libalpm/po/ru.po | 6 +++--- lib/libalpm/po/sk.po | 4 ++-- lib/libalpm/po/sv.po | 4 ++-- lib/libalpm/po/tr.po | 6 +++--- lib/libalpm/po/uk.po | 4 ++-- lib/libalpm/po/zh_CN.po | 6 +++--- 24 files changed, 68 insertions(+), 66 deletions(-) diff --git a/lib/libalpm/po/ca.po b/lib/libalpm/po/ca.po index b599d038..3648215c 100644 --- a/lib/libalpm/po/ca.po +++ b/lib/libalpm/po/ca.po @@ -7,7 +7,7 @@ msgid "" 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-03-14 13:51-0500\n" +"POT-Creation-Date: 2011-03-16 19:34-0500\n" "PO-Revision-Date: 2011-03-04 18:24+0000\n" "Last-Translator: toofishes \n" "Language-Team: LANGUAGE \n" @@ -186,7 +186,7 @@ msgid "could not get filesystem information for %s: %s\n" msgstr "" #, c-format -msgid "could not determine mount point for file %s" +msgid "could not determine mount point for file %s\n" msgstr "" #, c-format diff --git a/lib/libalpm/po/cs.po b/lib/libalpm/po/cs.po index 5b71011d..cbd55939 100644 --- a/lib/libalpm/po/cs.po +++ b/lib/libalpm/po/cs.po @@ -7,7 +7,7 @@ msgid "" 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-03-14 13:51-0500\n" +"POT-Creation-Date: 2011-03-16 19:34-0500\n" "PO-Revision-Date: 2011-03-14 18:54+0000\n" "Last-Translator: toofishes \n" "Language-Team: Czech \n" @@ -186,8 +186,8 @@ msgid "could not get filesystem information for %s: %s\n" msgstr "nepodařilo se získat informace o souborovém systému %s: %s\n" #, c-format -msgid "could not determine mount point for file %s" -msgstr "nepodařilo se určit připojovací bod pro soubor %s" +msgid "could not determine mount point for file %s\n" +msgstr "nepodařilo se určit připojovací bod pro soubor %s\n" #, c-format msgid "could not determine filesystem mount points" diff --git a/lib/libalpm/po/da.po b/lib/libalpm/po/da.po index 19f86b92..b3d461e4 100644 --- a/lib/libalpm/po/da.po +++ b/lib/libalpm/po/da.po @@ -7,7 +7,7 @@ msgid "" 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-03-14 13:51-0500\n" +"POT-Creation-Date: 2011-03-16 19:34-0500\n" "PO-Revision-Date: 2011-03-04 18:24+0000\n" "Last-Translator: toofishes \n" "Language-Team: Danish \n" @@ -186,7 +186,7 @@ msgid "could not get filesystem information for %s: %s\n" msgstr "" #, c-format -msgid "could not determine mount point for file %s" +msgid "could not determine mount point for file %s\n" msgstr "" #, c-format diff --git a/lib/libalpm/po/de.po b/lib/libalpm/po/de.po index fc9dec75..1a64d812 100644 --- a/lib/libalpm/po/de.po +++ b/lib/libalpm/po/de.po @@ -7,7 +7,7 @@ msgid "" 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-03-14 13:51-0500\n" +"POT-Creation-Date: 2011-03-16 19:34-0500\n" "PO-Revision-Date: 2011-03-08 14:50+0000\n" "Last-Translator: tlaloc \n" "Language-Team: German \n" @@ -190,8 +190,8 @@ msgid "could not get filesystem information for %s: %s\n" msgstr "Konnte keine Dateisystem-Informationen für %s erhalten: %s\n" #, c-format -msgid "could not determine mount point for file %s" -msgstr "Konnte keinen Einhänge-Punkt für die Datei %s ermitteln" +msgid "could not determine mount point for file %s\n" +msgstr "Konnte keinen Einhänge-Punkt für die Datei %s ermitteln\n" #, c-format msgid "could not determine filesystem mount points" diff --git a/lib/libalpm/po/el.po b/lib/libalpm/po/el.po index b49f382f..861c1d90 100644 --- a/lib/libalpm/po/el.po +++ b/lib/libalpm/po/el.po @@ -7,7 +7,7 @@ msgid "" 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-03-14 13:51-0500\n" +"POT-Creation-Date: 2011-03-16 19:34-0500\n" "PO-Revision-Date: 2011-03-05 00:39+0000\n" "Last-Translator: nous \n" "Language-Team: Greek \n" @@ -186,8 +186,8 @@ msgid "could not get filesystem information for %s: %s\n" msgstr "αδυναμία λήψης πληροφοριών συστήματος αρχείων για το %s: %s\n" #, c-format -msgid "could not determine mount point for file %s" -msgstr "αδυναμία καθορισμού σημείου προσάρτησης αρχείου %s" +msgid "could not determine mount point for file %s\n" +msgstr "αδυναμία καθορισμού σημείου προσάρτησης αρχείου %s\n" #, c-format msgid "could not determine filesystem mount points" diff --git a/lib/libalpm/po/en_GB.po b/lib/libalpm/po/en_GB.po index 22f6bf02..e39b744c 100644 --- a/lib/libalpm/po/en_GB.po +++ b/lib/libalpm/po/en_GB.po @@ -7,7 +7,7 @@ msgid "" 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-03-14 13:51-0500\n" +"POT-Creation-Date: 2011-03-16 19:34-0500\n" "PO-Revision-Date: 2011-03-11 04:03+0000\n" "Last-Translator: toofishes \n" "Language-Team: LANGUAGE \n" @@ -186,8 +186,8 @@ msgid "could not get filesystem information for %s: %s\n" msgstr "could not get filesystem information for %s: %s\n" #, c-format -msgid "could not determine mount point for file %s" -msgstr "could not determine mount point for file %s" +msgid "could not determine mount point for file %s\n" +msgstr "could not determine mount point for file %s\n" #, c-format msgid "could not determine filesystem mount points" diff --git a/lib/libalpm/po/es.po b/lib/libalpm/po/es.po index 244d552b..3611ba79 100644 --- a/lib/libalpm/po/es.po +++ b/lib/libalpm/po/es.po @@ -7,7 +7,7 @@ msgid "" 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-03-14 13:51-0500\n" +"POT-Creation-Date: 2011-03-16 19:34-0500\n" "PO-Revision-Date: 2011-03-15 18:34+0000\n" "Last-Translator: Traumness \n" "Language-Team: Spanish (Castilian) <>\n" @@ -192,8 +192,8 @@ msgstr "" "\n" #, c-format -msgid "could not determine mount point for file %s" -msgstr "no se pudo determinar el punto de montaje para el archivo %s" +msgid "could not determine mount point for file %s\n" +msgstr "no se pudo determinar el punto de montaje para el archivo %s\n" #, c-format msgid "could not determine filesystem mount points" diff --git a/lib/libalpm/po/fi.po b/lib/libalpm/po/fi.po index 6dd784f4..c6eaf3ac 100644 --- a/lib/libalpm/po/fi.po +++ b/lib/libalpm/po/fi.po @@ -7,7 +7,7 @@ msgid "" 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-03-14 13:51-0500\n" +"POT-Creation-Date: 2011-03-16 19:34-0500\n" "PO-Revision-Date: 2011-03-12 18:34+0000\n" "Last-Translator: Huulivoide \n" "Language-Team: Finnish \n" @@ -186,7 +186,7 @@ msgid "could not get filesystem information for %s: %s\n" msgstr "" #, c-format -msgid "could not determine mount point for file %s" +msgid "could not determine mount point for file %s\n" msgstr "" #, c-format diff --git a/lib/libalpm/po/fr.po b/lib/libalpm/po/fr.po index e7b3a383..e77c00f0 100644 --- a/lib/libalpm/po/fr.po +++ b/lib/libalpm/po/fr.po @@ -7,7 +7,7 @@ msgid "" 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-03-14 13:51-0500\n" +"POT-Creation-Date: 2011-03-16 19:34-0500\n" "PO-Revision-Date: 2011-03-04 20:43+0000\n" "Last-Translator: shining \n" "Language-Team: French <>\n" @@ -187,8 +187,8 @@ msgstr "" "impossible de récupérer les informations du système de fichier pour %s: %s\n" #, c-format -msgid "could not determine mount point for file %s" -msgstr "impossible de déterminer le point de montage pour le fichier %s" +msgid "could not determine mount point for file %s\n" +msgstr "impossible de déterminer le point de montage pour le fichier %s\n" #, c-format msgid "could not determine filesystem mount points" diff --git a/lib/libalpm/po/hu.po b/lib/libalpm/po/hu.po index ca33a3b9..37f2a0fd 100644 --- a/lib/libalpm/po/hu.po +++ b/lib/libalpm/po/hu.po @@ -7,7 +7,7 @@ msgid "" 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-03-14 13:51-0500\n" +"POT-Creation-Date: 2011-03-16 19:34-0500\n" "PO-Revision-Date: 2011-03-07 12:32+0000\n" "Last-Translator: ngaba \n" "Language-Team: Hungarian \n" @@ -186,8 +186,8 @@ msgid "could not get filesystem information for %s: %s\n" msgstr "nem sikerült meghatározni a fájlrendszer-információt %s-hez: %s\n" #, c-format -msgid "could not determine mount point for file %s" -msgstr "nem sikerült meghározni a csatolási pontot a %s fájlhoz" +msgid "could not determine mount point for file %s\n" +msgstr "nem sikerült meghározni a csatolási pontot a %s fájlhoz\n" #, c-format msgid "could not determine filesystem mount points" diff --git a/lib/libalpm/po/it.po b/lib/libalpm/po/it.po index b36103f2..d6593ba9 100644 --- a/lib/libalpm/po/it.po +++ b/lib/libalpm/po/it.po @@ -7,7 +7,7 @@ msgid "" 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-03-14 13:51-0500\n" +"POT-Creation-Date: 2011-03-16 19:34-0500\n" "PO-Revision-Date: 2011-03-05 17:03+0000\n" "Last-Translator: giovanni \n" "Language-Team: Italian \n" @@ -192,8 +192,8 @@ msgstr "" "impossibile ottenere le informazione relative al filesystem per %s: %s\n" #, c-format -msgid "could not determine mount point for file %s" -msgstr "impossibile determinare il punto di montaggio del file %s" +msgid "could not determine mount point for file %s\n" +msgstr "impossibile determinare il punto di montaggio del file %s\n" #, c-format msgid "could not determine filesystem mount points" diff --git a/lib/libalpm/po/kk.po b/lib/libalpm/po/kk.po index 49b4d377..76c6a90c 100644 --- a/lib/libalpm/po/kk.po +++ b/lib/libalpm/po/kk.po @@ -7,7 +7,7 @@ msgid "" 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-03-14 13:51-0500\n" +"POT-Creation-Date: 2011-03-16 19:34-0500\n" "PO-Revision-Date: 2011-03-05 03:56+0000\n" "Last-Translator: sotrud_nik \n" "Language-Team: Kazakh \n" @@ -186,8 +186,8 @@ msgid "could not get filesystem information for %s: %s\n" msgstr "%s үшін файлдық жүйе ақпаратын алу мүмкін емес: %s\n" #, c-format -msgid "could not determine mount point for file %s" -msgstr "%s файлы үшін тіркеу нүктесін анықтау мүмкін емес" +msgid "could not determine mount point for file %s\n" +msgstr "%s файлы үшін тіркеу нүктесін анықтау мүмкін емес\n" #, c-format msgid "could not determine filesystem mount points" diff --git a/lib/libalpm/po/ko.po b/lib/libalpm/po/ko.po index 031e42bb..849ff8f9 100644 --- a/lib/libalpm/po/ko.po +++ b/lib/libalpm/po/ko.po @@ -7,7 +7,7 @@ msgid "" 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-03-14 13:51-0500\n" +"POT-Creation-Date: 2011-03-16 19:34-0500\n" "PO-Revision-Date: 2011-03-04 18:24+0000\n" "Last-Translator: toofishes \n" "Language-Team: Korean \n" @@ -184,7 +184,7 @@ msgid "could not get filesystem information for %s: %s\n" msgstr "" #, c-format -msgid "could not determine mount point for file %s" +msgid "could not determine mount point for file %s\n" msgstr "" #, c-format diff --git a/lib/libalpm/po/nb.po b/lib/libalpm/po/nb.po index 1fcc8ef8..18e3c643 100644 --- a/lib/libalpm/po/nb.po +++ b/lib/libalpm/po/nb.po @@ -7,7 +7,7 @@ msgid "" 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-03-14 13:51-0500\n" +"POT-Creation-Date: 2011-03-16 19:34-0500\n" "PO-Revision-Date: 2011-03-04 18:24+0000\n" "Last-Translator: toofishes \n" "Language-Team: LANGUAGE \n" @@ -186,7 +186,7 @@ msgid "could not get filesystem information for %s: %s\n" msgstr "" #, c-format -msgid "could not determine mount point for file %s" +msgid "could not determine mount point for file %s\n" msgstr "" #, c-format diff --git a/lib/libalpm/po/pl.po b/lib/libalpm/po/pl.po index dffaa4cf..ee796663 100644 --- a/lib/libalpm/po/pl.po +++ b/lib/libalpm/po/pl.po @@ -7,7 +7,7 @@ msgid "" 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-03-14 13:51-0500\n" +"POT-Creation-Date: 2011-03-16 19:34-0500\n" "PO-Revision-Date: 2011-03-04 18:24+0000\n" "Last-Translator: toofishes \n" "Language-Team: LANGUAGE \n" @@ -187,7 +187,7 @@ msgid "could not get filesystem information for %s: %s\n" msgstr "" #, c-format -msgid "could not determine mount point for file %s" +msgid "could not determine mount point for file %s\n" msgstr "" #, c-format diff --git a/lib/libalpm/po/pt.po b/lib/libalpm/po/pt.po index 5fc8f629..b63492fc 100644 --- a/lib/libalpm/po/pt.po +++ b/lib/libalpm/po/pt.po @@ -7,7 +7,7 @@ msgid "" 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-03-14 13:51-0500\n" +"POT-Creation-Date: 2011-03-16 19:34-0500\n" "PO-Revision-Date: 2011-03-04 18:24+0000\n" "Last-Translator: toofishes \n" "Language-Team: Portuguese <>\n" @@ -187,7 +187,7 @@ msgid "could not get filesystem information for %s: %s\n" msgstr "" #, c-format -msgid "could not determine mount point for file %s" +msgid "could not determine mount point for file %s\n" msgstr "" #, c-format diff --git a/lib/libalpm/po/pt_BR.po b/lib/libalpm/po/pt_BR.po index d212f8ff..5ee66123 100644 --- a/lib/libalpm/po/pt_BR.po +++ b/lib/libalpm/po/pt_BR.po @@ -7,7 +7,7 @@ msgid "" 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-03-14 13:51-0500\n" +"POT-Creation-Date: 2011-03-16 19:34-0500\n" "PO-Revision-Date: 2011-03-10 01:56+0000\n" "Last-Translator: ambaratti \n" "Language-Team: Portuguese (Brazilian) \n" @@ -189,8 +189,8 @@ msgstr "" "não foi possível obter informações do sistema de arquivos para %s: %s\n" #, c-format -msgid "could not determine mount point for file %s" -msgstr "não foi possível determinar o ponto de montagem para o arquivo %s" +msgid "could not determine mount point for file %s\n" +msgstr "não foi possível determinar o ponto de montagem para o arquivo %s\n" #, c-format msgid "could not determine filesystem mount points" diff --git a/lib/libalpm/po/ro.po b/lib/libalpm/po/ro.po index 22f99895..7d094f68 100644 --- a/lib/libalpm/po/ro.po +++ b/lib/libalpm/po/ro.po @@ -7,9 +7,9 @@ msgid "" 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-03-14 13:51-0500\n" -"PO-Revision-Date: 2011-03-11 19:06+0000\n" -"Last-Translator: z0id \n" +"POT-Creation-Date: 2011-03-16 19:34-0500\n" +"PO-Revision-Date: 2011-03-16 16:09+0000\n" +"Last-Translator: wonder \n" "Language-Team: Romanian <>\n" "Language: ro\n" "MIME-Version: 1.0\n" @@ -76,11 +76,13 @@ msgstr "se extrage %s ca %s.pacnew\n" #, c-format msgid "could not get current working directory\n" -msgstr "nu poate fi obținut directorul de lucru curent\n" +msgstr "nu s-a putut determina directorul de lucru curent\n" #, c-format msgid "could not change directory to %s (%s)\n" -msgstr "nu poate fi schimbat directorul la %s (%s)\n" +msgstr "" +"nu s-a putut intra în directorul %s (%s)\n" +"\n" #, c-format msgid "problem occurred while upgrading %s\n" @@ -191,8 +193,8 @@ msgstr "" "nu s-au putut obține informații despre sistemul de fișiere pentru %s: %s\n" #, c-format -msgid "could not determine mount point for file %s" -msgstr "nu s-a putut determina locul de montare al fișierului %s" +msgid "could not determine mount point for file %s\n" +msgstr "nu s-a putut determina locul de montare al fișierului %s\n" #, c-format msgid "could not determine filesystem mount points" diff --git a/lib/libalpm/po/ru.po b/lib/libalpm/po/ru.po index 9e0de7bc..cb814233 100644 --- a/lib/libalpm/po/ru.po +++ b/lib/libalpm/po/ru.po @@ -7,7 +7,7 @@ msgid "" 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-03-14 13:51-0500\n" +"POT-Creation-Date: 2011-03-16 19:34-0500\n" "PO-Revision-Date: 2011-03-04 21:23+0000\n" "Last-Translator: partizan \n" "Language-Team: Russian \n" @@ -189,8 +189,8 @@ msgid "could not get filesystem information for %s: %s\n" msgstr "не удалось получить информацию о файловой системе для %s: %s\n" #, c-format -msgid "could not determine mount point for file %s" -msgstr "не удалось определить точку подключения для файла %s" +msgid "could not determine mount point for file %s\n" +msgstr "не удалось определить точку подключения для файла %s\n" #, c-format msgid "could not determine filesystem mount points" diff --git a/lib/libalpm/po/sk.po b/lib/libalpm/po/sk.po index edfd60ae..c3aca832 100644 --- a/lib/libalpm/po/sk.po +++ b/lib/libalpm/po/sk.po @@ -7,7 +7,7 @@ msgid "" 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-03-14 13:51-0500\n" +"POT-Creation-Date: 2011-03-16 19:34-0500\n" "PO-Revision-Date: 2011-03-04 18:24+0000\n" "Last-Translator: toofishes \n" "Language-Team: LANGUAGE \n" @@ -186,7 +186,7 @@ msgid "could not get filesystem information for %s: %s\n" msgstr "" #, c-format -msgid "could not determine mount point for file %s" +msgid "could not determine mount point for file %s\n" msgstr "" #, c-format diff --git a/lib/libalpm/po/sv.po b/lib/libalpm/po/sv.po index 85b69144..76d6223b 100644 --- a/lib/libalpm/po/sv.po +++ b/lib/libalpm/po/sv.po @@ -7,7 +7,7 @@ msgid "" 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-03-14 13:51-0500\n" +"POT-Creation-Date: 2011-03-16 19:34-0500\n" "PO-Revision-Date: 2011-03-04 18:24+0000\n" "Last-Translator: toofishes \n" "Language-Team: LANGUAGE \n" @@ -186,7 +186,7 @@ msgid "could not get filesystem information for %s: %s\n" msgstr "" #, c-format -msgid "could not determine mount point for file %s" +msgid "could not determine mount point for file %s\n" msgstr "" #, c-format diff --git a/lib/libalpm/po/tr.po b/lib/libalpm/po/tr.po index 527c7847..d373fa10 100644 --- a/lib/libalpm/po/tr.po +++ b/lib/libalpm/po/tr.po @@ -7,7 +7,7 @@ msgid "" 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-03-14 13:51-0500\n" +"POT-Creation-Date: 2011-03-16 19:34-0500\n" "PO-Revision-Date: 2011-03-05 01:11+0000\n" "Last-Translator: ras0ir \n" "Language-Team: Turkish \n" @@ -186,8 +186,8 @@ msgid "could not get filesystem information for %s: %s\n" msgstr "%s için dosya sistemi bilgisi alınamadı: %s\n" #, c-format -msgid "could not determine mount point for file %s" -msgstr "%s dosyası için bağlama noktası belirlenemedi" +msgid "could not determine mount point for file %s\n" +msgstr "%s dosyası için bağlama noktası belirlenemedi\n" #, c-format msgid "could not determine filesystem mount points" diff --git a/lib/libalpm/po/uk.po b/lib/libalpm/po/uk.po index b5c72e65..41d7d7ec 100644 --- a/lib/libalpm/po/uk.po +++ b/lib/libalpm/po/uk.po @@ -7,7 +7,7 @@ msgid "" 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-03-14 13:51-0500\n" +"POT-Creation-Date: 2011-03-16 19:34-0500\n" "PO-Revision-Date: 2011-03-04 18:24+0000\n" "Last-Translator: toofishes \n" "Language-Team: LANGUAGE \n" @@ -187,7 +187,7 @@ msgid "could not get filesystem information for %s: %s\n" msgstr "" #, c-format -msgid "could not determine mount point for file %s" +msgid "could not determine mount point for file %s\n" msgstr "" #, c-format diff --git a/lib/libalpm/po/zh_CN.po b/lib/libalpm/po/zh_CN.po index 4aa59004..ca170930 100644 --- a/lib/libalpm/po/zh_CN.po +++ b/lib/libalpm/po/zh_CN.po @@ -7,7 +7,7 @@ msgid "" 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-03-14 13:51-0500\n" +"POT-Creation-Date: 2011-03-16 19:34-0500\n" "PO-Revision-Date: 2011-03-15 05:36+0000\n" "Last-Translator: leonfeng \n" "Language-Team: Chinese (China) \n" @@ -186,8 +186,8 @@ msgid "could not get filesystem information for %s: %s\n" msgstr "" #, c-format -msgid "could not determine mount point for file %s" -msgstr "无法确定文件 %s 的挂载点" +msgid "could not determine mount point for file %s\n" +msgstr "无法确定文件 %s 的挂载点\n" #, c-format msgid "could not determine filesystem mount points" -- cgit v1.2.3-70-g09d2 From deed0286ef7045ce54fc54f8cadebfe3ebb5f725 Mon Sep 17 00:00:00 2001 From: Dave Reisner Date: Wed, 16 Mar 2011 19:39:40 -0400 Subject: alpm_list: fix typo in doxygen comment Signed-off-by: Dave Reisner Signed-off-by: Dan McGee --- lib/libalpm/alpm_list.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/libalpm/alpm_list.c b/lib/libalpm/alpm_list.c index 4cab665f..f0619bcd 100644 --- a/lib/libalpm/alpm_list.c +++ b/lib/libalpm/alpm_list.c @@ -287,7 +287,7 @@ alpm_list_t SYMEXPORT *alpm_list_msort(alpm_list_t *list, size_t n, alpm_list_fn /** * @brief Remove an item from the list. - * item is not freed; this is the respnsiblity of the caller. + * item is not freed; this is the responsiblity of the caller. * * @param haystack the list to remove the item from * @param item the item to remove from the list -- cgit v1.2.3-70-g09d2 From 40a6c5c5eca05b5f65b1dc0c6d5c87fcd313fb2e Mon Sep 17 00:00:00 2001 From: Dave Reisner Date: Wed, 16 Mar 2011 17:23:00 -0400 Subject: Only read from stdin if '-' is provided as a target This prevents a regression for people who enjoy piping yes to pacman to avoid prompts. Signed-off-by: Dave Reisner Signed-off-by: Dan McGee --- src/pacman/pacman.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index 984bd1b7..073a0175 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -1361,10 +1361,14 @@ int main(int argc, char *argv[]) cleanup(ret); } - /* we also support reading targets from stdin */ - if(!isatty(fileno(stdin))) { + /* we support reading targets from stdin if a cmdline parameter is '-' */ + if(!isatty(fileno(stdin)) && alpm_list_find_str(pm_targets, "-")) { char line[PATH_MAX]; int i = 0; + + /* remove the '-' from the list */ + pm_targets = alpm_list_remove_str(pm_targets, "-", NULL); + while(i < PATH_MAX && (line[i] = (char)fgetc(stdin)) != EOF) { if(isspace((unsigned char)line[i])) { /* avoid adding zero length arg when multiple spaces separate args */ -- cgit v1.2.3-70-g09d2 From 3707d5bc468dcd8611073d22b24d6f6be19bbe94 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Wed, 16 Mar 2011 19:03:52 -0500 Subject: Warn but don't error for unknown pacman.conf directives This makes all the pacman developers' jobs harder as we have to switch files whenever running multiple pacman versions and are using newly introduced options. Instead of erroring out, print warnings and continue on. This patch also fixes a const-correctness issue. We immediately cast a 'const char *' to a 'char *' in setrepeatingoption(), which is just plain wrong as we manipulate the underlying string. Fix the types and remove the now unnecessary variable. Finally, a few messages change here for consistency and clarity and because we continue parsing rather than bailing out on a problem. Signed-off-by: Dan McGee --- src/pacman/pacman.c | 50 ++++++++++++++++++++++++-------------------------- 1 file changed, 24 insertions(+), 26 deletions(-) diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index 073a0175..55f99a66 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -817,21 +817,20 @@ static void option_add_cleanmethod(const char *value) { * @param option the string (friendly) name of the option, used for messages * @param optionfunc a function pointer to an alpm_option_add_* function */ -static void setrepeatingoption(const char *ptr, const char *option, +static void setrepeatingoption(char *ptr, const char *option, void (*optionfunc)(const char*)) { - char *p = (char*)ptr; char *q; - while((q = strchr(p, ' '))) { + while((q = strchr(ptr, ' '))) { *q = '\0'; - (*optionfunc)(p); - pm_printf(PM_LOG_DEBUG, "config: %s: %s\n", option, p); - p = q; - p++; + (*optionfunc)(ptr); + pm_printf(PM_LOG_DEBUG, "config: %s: %s\n", option, ptr); + ptr = q; + ptr++; } - (*optionfunc)(p); - pm_printf(PM_LOG_DEBUG, "config: %s: %s\n", option, p); + (*optionfunc)(ptr); + pm_printf(PM_LOG_DEBUG, "config: %s: %s\n", option, ptr); } static char *get_filename(const char *url) { @@ -954,7 +953,8 @@ cleanup: return(ret); } -static int _parse_options(char *key, char *value) +static int _parse_options(const char *key, char *value, + const char *file, int linenum) { if(value == NULL) { /* options without settings */ @@ -976,8 +976,9 @@ static int _parse_options(char *key, char *value) } else if(strcmp(key, "CheckSpace") == 0) { alpm_option_set_checkspace(1); } else { - pm_printf(PM_LOG_ERROR, _("directive '%s' without value not recognized\n"), key); - return(1); + pm_printf(PM_LOG_WARNING, + _("config file %s, line %d: directive '%s' in section '%s' not recognized.\n"), + file, linenum, key, "options"); } } else { /* options with settings */ @@ -1028,8 +1029,10 @@ static int _parse_options(char *key, char *value) } else if (strcmp(key, "CleanMethod") == 0) { setrepeatingoption(value, "CleanMethod", option_add_cleanmethod); } else { - pm_printf(PM_LOG_ERROR, _("directive '%s' with a value not recognized\n"), key); - return(1); + + pm_printf(PM_LOG_WARNING, + _("config file %s, line %d: directive '%s' in section '%s' not recognized.\n"), + file, linenum, key, "options"); } } @@ -1163,7 +1166,7 @@ static int _parseconfig(const char *file, const char *givensection, /* Include is allowed in both options and repo sections */ if(strcmp(key, "Include") == 0) { if(value == NULL) { - pm_printf(PM_LOG_ERROR, _("config file %s, line %d: directive %s needs a value\n"), + pm_printf(PM_LOG_ERROR, _("config file %s, line %d: directive '%s' needs a value\n"), file, linenum, key); ret = 1; goto cleanup; @@ -1175,12 +1178,12 @@ static int _parseconfig(const char *file, const char *givensection, switch(globret) { case GLOB_NOSPACE: pm_printf(PM_LOG_DEBUG, - "config file %s, line %d: include globing out of space\n", + "config file %s, line %d: include globbing out of space\n", file, linenum); break; case GLOB_ABORTED: pm_printf(PM_LOG_DEBUG, - "config file %s, line %d: include globing read error for %s\n", + "config file %s, line %d: include globbing read error for %s\n", file, linenum, value); break; case GLOB_NOMATCH: @@ -1201,18 +1204,14 @@ static int _parseconfig(const char *file, const char *givensection, } if(strcmp(section, "options") == 0) { /* we are either in options ... */ - if((ret = _parse_options(key, value)) != 0) { - pm_printf(PM_LOG_ERROR, _("config file %s, line %d: problem in options section\n"), - file, linenum); - ret = 1; + if((ret = _parse_options(key, value, file, linenum)) != 0) { goto cleanup; } - continue; } else { /* ... or in a repo section */ if(strcmp(key, "Server") == 0) { if(value == NULL) { - pm_printf(PM_LOG_ERROR, _("config file %s, line %d: directive %s needs a value\n"), + pm_printf(PM_LOG_ERROR, _("config file %s, line %d: directive '%s' needs a value\n"), file, linenum, key); ret = 1; goto cleanup; @@ -1222,10 +1221,9 @@ static int _parseconfig(const char *file, const char *givensection, goto cleanup; } } else { - pm_printf(PM_LOG_ERROR, _("config file %s, line %d: directive '%s' in repository section '%s' not recognized.\n"), + pm_printf(PM_LOG_WARNING, + _("config file %s, line %d: directive '%s' in section '%s' not recognized.\n"), file, linenum, key, section); - ret = 1; - goto cleanup; } } -- cgit v1.2.3-70-g09d2 From 308aa38a40fb26d535f0b874bb64fe987126d03f Mon Sep 17 00:00:00 2001 From: Dave Reisner Date: Wed, 16 Mar 2011 20:24:11 -0400 Subject: pacman.8: (re)document behavior of reading from stdin Change the term 'packages' to 'targets' in the synopsis as well, since command line parameters could just as well be groups, repos, or URLs. Signed-off-by: Dave Reisner Signed-off-by: Dan McGee --- doc/pacman.8.txt | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/doc/pacman.8.txt b/doc/pacman.8.txt index 7a13b897..249c774e 100644 --- a/doc/pacman.8.txt +++ b/doc/pacman.8.txt @@ -11,7 +11,7 @@ pacman - package manager utility Synopsis -------- -'pacman' [options] [packages] +'pacman' [options] [targets] Description @@ -25,6 +25,12 @@ Since version 3.0.0, pacman has been the frontend to linkman:libalpm[3], the ``Arch Linux Package Management'' library. This library allows alternative front ends to be written (for instance, a GUI front end). +Invoking pacman involves specifying an operation with any potential options and +targets to operate on. A 'target' is usually a package name, filename, URL, or +a search string. Targets can be provided as command line arguments. +Additionally, if a single dash (-) is passed as an argument, targets will be +read from stdin. + Operations ---------- -- cgit v1.2.3-70-g09d2