summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--po/bg.po6
-rw-r--r--po/cs.po6
-rw-r--r--po/cz.po6
-rw-r--r--po/de.po6
-rw-r--r--po/el.po6
-rw-r--r--po/en.po6
-rw-r--r--po/es.po6
-rw-r--r--po/es_ES.po6
-rw-r--r--po/fr.po6
-rw-r--r--po/id.po6
-rw-r--r--po/it.po6
-rw-r--r--po/ja.po6
-rw-r--r--po/nl.po6
-rw-r--r--po/no.po6
-rw-r--r--po/pl.po6
-rw-r--r--po/pt_BR.po6
-rw-r--r--po/pt_PT.po6
-rw-r--r--po/ru.po6
-rw-r--r--po/sk.po6
-rw-r--r--po/sl.po6
-rw-r--r--po/slapt-get.pot6
-rw-r--r--po/sv.po6
-rw-r--r--po/tr.po6
-rw-r--r--po/uk.po6
-rw-r--r--po/vi.po6
-rw-r--r--po/zh_CN.po6
-rw-r--r--src/configuration.c9
-rw-r--r--src/configuration.h1
-rw-r--r--src/curl.c24
-rw-r--r--src/gpgme.c7
-rw-r--r--src/package.c80
31 files changed, 81 insertions, 196 deletions
diff --git a/po/bg.po b/po/bg.po
index baa8639..f5e2427 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: 0.9.12\n"
"POT-Creation-Date: 2003-11-03 14:28+0000\n"
-"PO-Revision-Date: 2007-06-27 12:00+0500\n"
+"PO-Revision-Date: 2007-06-27 15:15+0500\n"
"Last-Translator: Victor Keranov <victor_keranov@mail.bg>\n"
"Language-Team: slapt-get-devel <slapt-get-devel@software.jaos.org>\n"
"MIME-Version: 1.0\n"
@@ -162,10 +162,6 @@ msgid "Get %s %s %s [%.1f%s]..."
msgstr "Get %s %s %s [%.1f%s]..."
#, c-format
-msgid "Get %s %s %s [%.1f%s]...\n"
-msgstr "Get %s %s %s [%.1f%s]...\n"
-
-#, c-format
msgid "Failed to unlink %s\n"
msgstr "Failed to unlink %s\n"
diff --git a/po/cs.po b/po/cs.po
index d6b4045..5be2301 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: 0.9.12\n"
"POT-Creation-Date: 2003-11-03 14:28+0000\n"
-"PO-Revision-Date: 2007-06-27 12:00+0500\n"
+"PO-Revision-Date: 2007-06-27 15:15+0500\n"
"Last-Translator: Oto Petrik <oto.petrik@centrum.cz>\n"
"Language-Team: slapt-get-devel <slapt-get-devel@software.jaos.org>\n"
"MIME-Version: 1.0\n"
@@ -162,10 +162,6 @@ msgid "Get %s %s %s [%.1f%s]..."
msgstr "Mm %s %s %s [%.1f%s]..."
#, c-format
-msgid "Get %s %s %s [%.1f%s]...\n"
-msgstr "Mm %s %s %s [%.1f%s]...\n"
-
-#, c-format
msgid "Failed to unlink %s\n"
msgstr "Nepodailo se smazat %s\n"
diff --git a/po/cz.po b/po/cz.po
index ceab90a..eaa7179 100644
--- a/po/cz.po
+++ b/po/cz.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: 0.9.12\n"
"POT-Creation-Date: 2003-11-03 14:28+0000\n"
-"PO-Revision-Date: 2007-06-27 12:00+0500\n"
+"PO-Revision-Date: 2007-06-27 15:15+0500\n"
"Last-Translator: Oto Petrik <oto.petrik@centrum.cz>\n"
"Language-Team: slapt-get-devel <slapt-get-devel@software.jaos.org>\n"
"MIME-Version: 1.0\n"
@@ -164,10 +164,6 @@ msgid "Get %s %s %s [%.1f%s]..."
msgstr "Stahuji %s %s %s [%.1f%s]..."
#, c-format
-msgid "Get %s %s %s [%.1f%s]...\n"
-msgstr "Stahuji %s %s %s [%.1f%s]...\n"
-
-#, c-format
msgid "Failed to unlink %s\n"
msgstr "Nepodailo se smazat %s\n"
diff --git a/po/de.po b/po/de.po
index 7f7fb43..43133d4 100644
--- a/po/de.po
+++ b/po/de.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: 0.9.12\n"
"POT-Creation-Date: 2003-11-03 14:28+0000\n"
-"PO-Revision-Date: 2007-06-27 12:00+0500\n"
+"PO-Revision-Date: 2007-06-27 15:15+0500\n"
"Last-Translator: Manfred Mueller <mmueller@live-modules.org>\n"
"Language-Team: slapt-get-devel <slapt-get-devel@software.jaos.org>\n"
"MIME-Version: 1.0\n"
@@ -164,10 +164,6 @@ msgid "Get %s %s %s [%.1f%s]..."
msgstr "Hole %s %s %s [%.1f%s]... "
#, c-format
-msgid "Get %s %s %s [%.1f%s]...\n"
-msgstr "Hole %s %s %s [%.1f%s]... \n"
-
-#, c-format
msgid "Failed to unlink %s\n"
msgstr "Konnte die Verknuepfung %s nicht loesen\n"
diff --git a/po/el.po b/po/el.po
index ebbc455..4ccdea7 100644
--- a/po/el.po
+++ b/po/el.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: 0.9.12\n"
"POT-Creation-Date: 2003-11-03 14:28+0000\n"
-"PO-Revision-Date: 2007-06-27 12:00+0500\n"
+"PO-Revision-Date: 2007-06-27 15:15+0500\n"
"Last-Translator: Savvas Eftratiadis <pigouinos@mailworks.org.\n"
"Language-Team: slapt-get-devel <slapt-get-devel@software.jaos.org>\n"
"MIME-Version: 1.0\n"
@@ -162,10 +162,6 @@ msgid "Get %s %s %s [%.1f%s]..."
msgstr "Get %s %s %s [%.1f%s]..."
#, c-format
-msgid "Get %s %s %s [%.1f%s]...\n"
-msgstr "Get %s %s %s [%.1f%s]...\n"
-
-#, c-format
msgid "Failed to unlink %s\n"
msgstr " unlink %s\n"
diff --git a/po/en.po b/po/en.po
index 07aa290..df8ca3b 100644
--- a/po/en.po
+++ b/po/en.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: 0.9.12\n"
"POT-Creation-Date: 2003-11-03 14:28+0000\n"
-"PO-Revision-Date: 2007-06-27 12:00+0500\n"
+"PO-Revision-Date: 2007-06-27 15:15+0500\n"
"Last-Translator: Jason Woodward <woodwardj@jaos.org>\n"
"Language-Team: slapt-get-devel <slapt-get-devel@software.jaos.org>\n"
"MIME-Version: 1.0\n"
@@ -162,10 +162,6 @@ msgid "Get %s %s %s [%.1f%s]..."
msgstr "Get %s %s %s [%.1f%s]..."
#, c-format
-msgid "Get %s %s %s [%.1f%s]...\n"
-msgstr "Get %s %s %s [%.1f%s]...\n"
-
-#, c-format
msgid "Failed to unlink %s\n"
msgstr "Failed to unlink %s\n"
diff --git a/po/es.po b/po/es.po
index 662ab18..55ecaf7 100644
--- a/po/es.po
+++ b/po/es.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: 0.9.12\n"
"POT-Creation-Date: 2003-11-03 14:28+0000\n"
-"PO-Revision-Date: 2007-06-27 12:00+0500\n"
+"PO-Revision-Date: 2007-06-27 15:15+0500\n"
"Last-Translator: Ruben Gutierrez <ruben@snpp.com.ar>\n"
"Language-Team: slapt-get-devel <slapt-get-devel@software.jaos.org>\n"
"MIME-Version: 1.0\n"
@@ -162,10 +162,6 @@ msgid "Get %s %s %s [%.1f%s]..."
msgstr "Des %s %s %s [%.1f%s]..."
#, c-format
-msgid "Get %s %s %s [%.1f%s]...\n"
-msgstr "Des %s %s %s [%.1f%s]...\n"
-
-#, c-format
msgid "Failed to unlink %s\n"
msgstr "No se pudo eliminar (unlink) %s\n"
diff --git a/po/es_ES.po b/po/es_ES.po
index c1e5b0d..9affc5d 100644
--- a/po/es_ES.po
+++ b/po/es_ES.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: 0.9.12\n"
"POT-Creation-Date: 2003-11-03 14:28+0000\n"
-"PO-Revision-Date: 2007-06-27 12:00+0500\n"
+"PO-Revision-Date: 2007-06-27 15:15+0500\n"
"Last-Translator: Ruben Gutierrez <ruben@snpp.com.ar>\n"
"Language-Team: slapt-get-devel <slapt-get-devel@software.jaos.org>\n"
"MIME-Version: 1.0\n"
@@ -162,10 +162,6 @@ msgid "Get %s %s %s [%.1f%s]..."
msgstr "Des %s %s %s [%.1f%s]..."
#, c-format
-msgid "Get %s %s %s [%.1f%s]...\n"
-msgstr "Des %s %s %s [%.1f%s]...\n"
-
-#, c-format
msgid "Failed to unlink %s\n"
msgstr "No se pudo eliminar (unlink) %s\n"
diff --git a/po/fr.po b/po/fr.po
index ba973b8..0e82e9b 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: 0.9.12\n"
"POT-Creation-Date: 2003-11-03 14:28+0000\n"
-"PO-Revision-Date: 2007-06-27 12:00+0500\n"
+"PO-Revision-Date: 2007-06-27 15:15+0500\n"
"Last-Translators: Verachten Bruno <gounthar@gmail.com>, solsTiCe d'Hiver <solstice.dhiver@laposte.net>\n"
"Language-Team: slapt-get-devel <slapt-get-devel@software.jaos.org>\n"
"MIME-Version: 1.0\n"
@@ -162,10 +162,6 @@ msgid "Get %s %s %s [%.1f%s]..."
msgstr "Rception de%s %s %s [%.1f%s]..."
#, c-format
-msgid "Get %s %s %s [%.1f%s]...\n"
-msgstr "Rception de%s %s %s [%.1f%s]...\n"
-
-#, c-format
msgid "Failed to unlink %s\n"
msgstr "Echec de l'effacement du lien %s\n"
diff --git a/po/id.po b/po/id.po
index d507e71..aef5540 100644
--- a/po/id.po
+++ b/po/id.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: 0.9.12\n"
"POT-Creation-Date: 2003-11-03 14:28+0000\n"
-"PO-Revision-Date: 2007-06-27 12:00+0500\n"
+"PO-Revision-Date: 2007-06-27 15:15+0500\n"
"Last-Translator: Kemas Antonius <kyantonius@kyantonius.com>\n"
"Language-Team: slapt-get-devel <slapt-get-devel@software.jaos.org>\n"
"MIME-Version: 1.0\n"
@@ -162,10 +162,6 @@ msgid "Get %s %s %s [%.1f%s]..."
msgstr "Mendapatkan %s %s %s [%.1f%s]..."
#, c-format
-msgid "Get %s %s %s [%.1f%s]...\n"
-msgstr "Mendapatkan %s %s %s [%.1f%s]...\n"
-
-#, c-format
msgid "Failed to unlink %s\n"
msgstr "Gagal melepaskan taut %s\n"
diff --git a/po/it.po b/po/it.po
index dacda9a..e751d2d 100644
--- a/po/it.po
+++ b/po/it.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: 0.9.12\n"
"POT-Creation-Date: 2003-11-03 14:28+0000\n"
-"PO-Revision-Date: 2007-06-27 12:00+0500\n"
+"PO-Revision-Date: 2007-06-27 15:15+0500\n"
"Last-Translator: Francesco Gigli <jaramir@slack.it>\n"
"Language-Team: Italian <tp@lists.linux.it>\n"
"MIME-Version: 1.0\n"
@@ -162,10 +162,6 @@ msgid "Get %s %s %s [%.1f%s]..."
msgstr "Get %s %s %s [%.1f%s]..."
#, c-format
-msgid "Get %s %s %s [%.1f%s]...\n"
-msgstr "Get %s %s %s [%.1f%s]...\n"
-
-#, c-format
msgid "Failed to unlink %s\n"
msgstr "Errore in unlink %s\n"
diff --git a/po/ja.po b/po/ja.po
index 689743b..acf6ad7 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: 0.9.12\n"
"POT-Creation-Date: 2006-03-08 19:49+0900\n"
-"PO-Revision-Date: 2007-06-27 12:00+0500\n"
+"PO-Revision-Date: 2007-06-27 15:15+0500\n"
"Last-Translator: JW <J_W@somewhere.c0.jp>\n"
"Language-Team: slapt-get-devel <slapt-get-devel@software.jaos.org>\n"
"MIME-Version: 1.0\n"
@@ -164,10 +164,6 @@ msgid "Get %s %s %s [%.1f%s]..."
msgstr "Get %s %s %s [%.1f%s]..."
#, c-format
-msgid "Get %s %s %s [%.1f%s]...\n"
-msgstr "Get %s %s %s [%.1f%s]...\n"
-
-#, c-format
msgid "Failed to unlink %s\n"
msgstr "Failed to unlink %s\n"
diff --git a/po/nl.po b/po/nl.po
index 024c953..1e9692b 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: 0.9.12\n"
"POT-Creation-Date: 2003-11-03 14:28+0000\n"
-"PO-Revision-Date: 2007-06-27 12:00+0500\n"
+"PO-Revision-Date: 2007-06-27 15:15+0500\n"
"Last-Translator: Stefan Koopmanschap <stefan@electronicmusicworld.com>\n"
"Language-Team: slapt-get-devel <slapt-get-devel@software.jaos.org>\n"
"MIME-Version: 1.0\n"
@@ -162,10 +162,6 @@ msgid "Get %s %s %s [%.1f%s]..."
msgstr "Ophalen: %s %s %s [%.1f%s]..."
#, c-format
-msgid "Get %s %s %s [%.1f%s]...\n"
-msgstr "Ophalen: %s %s %s [%.1f%s]...\n"
-
-#, c-format
msgid "Failed to unlink %s\n"
msgstr "Kon koppeling niet vebreken %s\n"
diff --git a/po/no.po b/po/no.po
index 9c93bed..10e7488 100644
--- a/po/no.po
+++ b/po/no.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: 0.9.12\n"
"POT-Creation-Date: 2003-11-03 14:28+0000\n"
-"PO-Revision-Date: 2007-06-27 12:00+0500\n"
+"PO-Revision-Date: 2007-06-27 15:15+0500\n"
"Last-Translator: Joran Kvalvaag <jk@nerdworks.org>\n"
"Language-Team: slapt-get-devel <slapt-get-devel@software.jaos.org>\n"
"MIME-Version: 1.0\n"
@@ -162,10 +162,6 @@ msgid "Get %s %s %s [%.1f%s]..."
msgstr "Get %s %s %s [%.1f%s]..."
#, c-format
-msgid "Get %s %s %s [%.1f%s]...\n"
-msgstr "Get %s %s %s [%.1f%s]...\n"
-
-#, c-format
msgid "Failed to unlink %s\n"
msgstr "Klarte ikke unlinke %s\n"
diff --git a/po/pl.po b/po/pl.po
index 90e155c..6673142 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: 0.9.12\n"
"POT-Creation-Date: 2003-11-03 14:28+0000\n"
-"PO-Revision-Date: 2007-06-27 12:00+0500\n"
+"PO-Revision-Date: 2007-06-27 15:15+0500\n"
"Last-Translators: Sajmon <sajmon@tenboard.com>, Paul Blazejowski <paulb@blazebox.homeip.net>, nixon <nixon@klub.chip.pl> and simon <ssiimm@poczta.onet.pl>\n"
"Language-Team: polish slapt-get-devel <slapt-get-devel@software.jaos.org>\n"
"MIME-Version: 1.0\n"
@@ -163,10 +163,6 @@ msgid "Get %s %s %s [%.1f%s]..."
msgstr "Pob %s %s %s [%.1f%s]..."
#, c-format
-msgid "Get %s %s %s [%.1f%s]...\n"
-msgstr "Pob %s %s %s [%.1f%s]...\n"
-
-#, c-format
msgid "Failed to unlink %s\n"
msgstr "Nie powiodo si odlinkowanie %s\n"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index e7458c7..a3240b4 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: 0.9.12\n"
"POT-Creation-Date: 2003-11-03 14:28+0000\n"
-"PO-Revision-Date: 2007-06-27 12:00+0500\n"
+"PO-Revision-Date: 2007-06-27 15:15+0500\n"
"Last-Translator: Henrique Pinto <henrique.pinto@kdemail.net>\n"
"Language-Team: slapt-get-devel <slapt-get-devel@software.jaos.org>\n"
"MIME-Version: 1.0\n"
@@ -162,10 +162,6 @@ msgid "Get %s %s %s [%.1f%s]..."
msgstr "Obtendo %s %s %s [%.1f%s]..."
#, c-format
-msgid "Get %s %s %s [%.1f%s]...\n"
-msgstr "Obtendo %s %s %s [%.1f%s]...\n"
-
-#, c-format
msgid "Failed to unlink %s\n"
msgstr "Falha ao excluir %s\n"
diff --git a/po/pt_PT.po b/po/pt_PT.po
index 2631f54..789f3ee 100644
--- a/po/pt_PT.po
+++ b/po/pt_PT.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: 0.9.12\n"
"POT-Creation-Date: 2003-11-03 14:28+0000\n"
-"PO-Revision-Date: 2007-06-27 12:00+0500\n"
+"PO-Revision-Date: 2007-06-27 15:15+0500\n"
"Last-Translator: Miguel Santinho <msantinho@simplicidade.com>\n"
"Language-Team: slapt-get-devel <slapt-get-devel@software.jaos.org>\n"
"MIME-Version: 1.0\n"
@@ -162,10 +162,6 @@ msgid "Get %s %s %s [%.1f%s]..."
msgstr "Obter %s %s %s [%.1f%s]..."
#, c-format
-msgid "Get %s %s %s [%.1f%s]...\n"
-msgstr "Obter %s %s %s [%.1f%s]...\n"
-
-#, c-format
msgid "Failed to unlink %s\n"
msgstr "Falha ao remover %s\n"
diff --git a/po/ru.po b/po/ru.po
index 2c2888b..633e459 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: 0.9.12\n"
"POT-Creation-Date: 2005-09-07 23:24 EEST\n"
-"PO-Revision-Date: 2007-06-27 12:00+0500\n"
+"PO-Revision-Date: 2007-06-27 15:15+0500\n"
"Last-Translators: sin <digitalhunger@gmail.com>\n"
"Language-Team: DeepStyle Team <hottab@deepstyle.org.ua>\n"
"MIME-Version: 1.0\n"
@@ -163,10 +163,6 @@ msgid "Get %s %s %s [%.1f%s]..."
msgstr " %s %s %s [%.1f%s]..."
#, c-format
-msgid "Get %s %s %s [%.1f%s]...\n"
-msgstr " %s %s %s [%.1f%s]...\n"
-
-#, c-format
msgid "Failed to unlink %s\n"
msgstr " %s\n"
diff --git a/po/sk.po b/po/sk.po
index 37450c1..1e10496 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: 0.9.12\n"
"POT-Creation-Date: 2005-06-23 21:28+0500\n"
-"PO-Revision-Date: 2007-06-27 12:00+0500\n"
+"PO-Revision-Date: 2007-06-27 15:15+0500\n"
"Last-Translator: Erik Gyepes <depi@depi.sk>\n"
"Language-Team: slapt-get-devel <slapt-get-devel@software.jaos.org>\n"
"MIME-Version: 1.0\n"
@@ -162,10 +162,6 @@ msgid "Get %s %s %s [%.1f%s]..."
msgstr "Zskava sa %s %s %s [%.1f%s]..."
#, c-format
-msgid "Get %s %s %s [%.1f%s]...\n"
-msgstr "Zskava sa %s %s %s [%.1f%s]...\n"
-
-#, c-format
msgid "Failed to unlink %s\n"
msgstr "Nepodarilo sa zmaza %s\n"
diff --git a/po/sl.po b/po/sl.po
index 38cf59a..3096a5b 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: 0.9.12\n"
"POT-Creation-Date: 2005-03-09\n"
-"PO-Revision-Date: 2007-06-27 12:00+0500\n"
+"PO-Revision-Date: 2007-06-27 15:15+0500\n"
"Last-Translator: Uros Trsavec <utrsav@walla.com>\n"
"Language-Team: slapt-get-devel <slapt-get-devel@software.jaos.org>\n"
"MIME-Version: 1.0\n"
@@ -162,10 +162,6 @@ msgid "Get %s %s %s [%.1f%s]..."
msgstr "Dobi %s %s %s [%.1f%s]..."
#, c-format
-msgid "Get %s %s %s [%.1f%s]...\n"
-msgstr "Dobi %s %s %s [%.1f%s]...\n"
-
-#, c-format
msgid "Failed to unlink %s\n"
msgstr "Napaka pri prekinjanju povezave%s\n"
diff --git a/po/slapt-get.pot b/po/slapt-get.pot
index 539fd3b..3ed6c64 100644
--- a/po/slapt-get.pot
+++ b/po/slapt-get.pot
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: 0.9.12\n"
"POT-Creation-Date: 2003-11-03 14:28+0000\n"
-"PO-Revision-Date: 2007-06-27 12:00+0500\n"
+"PO-Revision-Date: 2007-06-27 15:15+0500\n"
"Last-Translator: Jason Woodward <woodwardj@jaos.org>\n"
"Language-Team: slapt-get-devel <slapt-get-devel@software.jaos.org>\n"
"MIME-Version: 1.0\n"
@@ -162,10 +162,6 @@ msgid "Get %s %s %s [%.1f%s]..."
msgstr ""
#, c-format
-msgid "Get %s %s %s [%.1f%s]...\n"
-msgstr ""
-
-#, c-format
msgid "Failed to unlink %s\n"
msgstr ""
diff --git a/po/sv.po b/po/sv.po
index 59b4822..f28e4e9 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: 0.9.12\n"
"POT-Creation-Date: 2003-11-03 14:28+0000\n"
-"PO-Revision-Date: 2007-06-27 12:00+0500\n"
+"PO-Revision-Date: 2007-06-27 15:15+0500\n"
"Last-Translator: Joel Bjurman <ypolt@lediga.st>\n"
"Language-Team: slapt-get-devel <slapt-get-devel@software.jaos.org>\n"
"MIME-Version: 1.0\n"
@@ -162,10 +162,6 @@ msgid "Get %s %s %s [%.1f%s]..."
msgstr "Ls: %s %s %s [%.1f%s]..."
#, c-format
-msgid "Get %s %s %s [%.1f%s]...\n"
-msgstr "Ls: %s %s %s [%.1f%s]...\n"
-
-#, c-format
msgid "Failed to unlink %s\n"
msgstr "Misslyckades att bryta lnk %s\n"
diff --git a/po/tr.po b/po/tr.po
index 2f4bcb3..0a350ab 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: 0.9.12\n"
"POT-Creation-Date: 2003-11-03 14:28+0000\n"
-"PO-Revision-Date: 2007-06-27 12:00+0500\n"
+"PO-Revision-Date: 2007-06-27 15:15+0500\n"
"Last-Translator: Bekir SONAT <bekirsonat@kde.org.tr>\n"
"Language-Team: slapt-get-devel <slapt-get-devel@software.jaos.org>\n"
"MIME-Version: 1.0\n"
@@ -162,10 +162,6 @@ msgid "Get %s %s %s [%.1f%s]..."
msgstr "Al %s %s %s [%.1f%s]..."
#, c-format
-msgid "Get %s %s %s [%.1f%s]...\n"
-msgstr "Al %s %s %s [%.1f%s]...\n"
-
-#, c-format
msgid "Failed to unlink %s\n"
msgstr "Başarısız unlink %s\n"
diff --git a/po/uk.po b/po/uk.po
index 3d32dc1..190d472 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: 0.9.12\n"
"POT-Creation-Date: 2005-09-07 23:24 EEST\n"
-"PO-Revision-Date: 2007-06-27 12:00+0500\n"
+"PO-Revision-Date: 2007-06-27 15:15+0500\n"
"Last-Translators: sin <digitalhunger@gmail.com>\n"
"Language-Team: DeepStyle Team <hottab@deepstyle.org.ua>\n"
"MIME-Version: 1.0\n"
@@ -163,10 +163,6 @@ msgid "Get %s %s %s [%.1f%s]..."
msgstr " %s %s %s [%.1f%s]..."
#, c-format
-msgid "Get %s %s %s [%.1f%s]...\n"
-msgstr " %s %s %s [%.1f%s]...\n"
-
-#, c-format
msgid "Failed to unlink %s\n"
msgstr " %s\n"
diff --git a/po/vi.po b/po/vi.po
index bb3d59c..78bea94 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: 0.9.12\n"
"POT-Creation-Date: 2003-11-03 14:28+0000\n"
-"PO-Revision-Date: 2007-06-27 12:00+0500\n"
+"PO-Revision-Date: 2007-06-27 15:15+0500\n"
"Last-Translator: Nguyễn Văn Vũ <vncasper@yahoo.com>\n"
"Language-Team: gnome-vi <gnomevi-list@lists.sourceforge.net>\n"
"MIME-Version: 1.0\n"
@@ -162,10 +162,6 @@ msgid "Get %s %s %s [%.1f%s]..."
msgstr "Đang nhận dữ liệu %s %s %s [%.1f%s]..."
#, c-format
-msgid "Get %s %s %s [%.1f%s]...\n"
-msgstr "Đang nhận dữ liệu %s %s %s [%.1f%s]...\n"
-
-#, c-format
msgid "Failed to unlink %s\n"
msgstr "Bị lỗi khi xoá %s\n"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index adeb5e1..229f566 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: 0.9.12\n"
"POT-Creation-Date: 2003-11-03 14:28+0000\n"
-"PO-Revision-Date: 2007-06-27 12:00+0500\n"
+"PO-Revision-Date: 2007-06-27 15:15+0500\n"
"Last-Translator: Yang Jinsong <shannleon@gmail.com>\n"
"Language-Team: slapt-get-devel <slapt-get-devel@software.jaos.org>\n"
"MIME-Version: 1.0\n"
@@ -162,10 +162,6 @@ msgid "Get %s %s %s [%.1f%s]..."
msgstr "获取 %s %s %s [%.1f%s]..."
#, c-format
-msgid "Get %s %s %s [%.1f%s]...\n"
-msgstr "获取 %s %s %s [%.1f%s]...\n"
-
-#, c-format
msgid "Failed to unlink %s\n"
msgstr "删除链接 %s 失败\n"
diff --git a/src/configuration.c b/src/configuration.c
index c31d9ed..2957930 100644
--- a/src/configuration.c
+++ b/src/configuration.c
@@ -387,3 +387,12 @@ void slapt_free_source_list(struct slapt_source_list *list)
free(list);
}
+SLAPT_BOOL_T slapt_is_interactive(const slapt_rc_config *global_config)
+{
+ SLAPT_BOOL_T interactive = global_config->progress_cb == NULL
+ ? SLAPT_TRUE
+ : SLAPT_FALSE;
+
+ return interactive;
+}
+
diff --git a/src/configuration.h b/src/configuration.h
index 1591764..388e6f0 100644
--- a/src/configuration.h
+++ b/src/configuration.h
@@ -64,3 +64,4 @@ void slapt_add_source(struct slapt_source_list *list,const char *s);
void slapt_remove_source (struct slapt_source_list *list, const char *s);
void slapt_free_source_list(struct slapt_source_list *list);
+SLAPT_BOOL_T slapt_is_interactive(const slapt_rc_config *);
diff --git a/src/curl.c b/src/curl.c
index 2e8ada2..873d69c 100644
--- a/src/curl.c
+++ b/src/curl.c
@@ -195,6 +195,7 @@ const char *slapt_download_pkg(const slapt_rc_config *global_config,
size_t f_size = 0;
slapt_code_t verify = SLAPT_OK;
int dl_return = -1, dl_total_size = 0;
+ SLAPT_BOOL_T is_interactive = slapt_is_interactive(global_config);
long filetime = 0;
if (pkg == NULL) {
@@ -234,19 +235,13 @@ const char *slapt_download_pkg(const slapt_rc_config *global_config,
}
if (global_config->progress_cb == NULL) {
- if (global_config->dl_stats == SLAPT_TRUE) {
- printf(gettext("Get %s %s %s [%.1f%s]...\n"),
- pkg->mirror,pkg->name,pkg->version,
- ( dl_total_size > 1024 ) ? dl_total_size / 1024.0 : dl_total_size,
- ( dl_total_size > 1024 ) ? "MB" : "kB"
- );
- } else {
- printf(gettext("Get %s %s %s [%.1f%s]..."),
- pkg->mirror,pkg->name,pkg->version,
- ( dl_total_size > 1024 ) ? dl_total_size / 1024.0 : dl_total_size,
- ( dl_total_size > 1024 ) ? "MB" : "kB"
- );
- }
+ printf(gettext("Get %s %s %s [%.1f%s]..."),
+ pkg->mirror,pkg->name,pkg->version,
+ ( dl_total_size > 1024 ) ? dl_total_size / 1024.0 : dl_total_size,
+ ( dl_total_size > 1024 ) ? "MB" : "kB"
+ );
+ if (global_config->dl_stats == SLAPT_TRUE)
+ printf("\n");
}
/* open the file to write, append if already present */
@@ -259,8 +254,7 @@ const char *slapt_download_pkg(const slapt_rc_config *global_config,
dl_return = slapt_download_data(fh,url,f_size,&filetime,global_config);
if (dl_return == 0) {
- if (global_config->dl_stats == SLAPT_FALSE &&
- global_config->progress_cb == NULL)
+ if (is_interactive)
printf(gettext("Done\n"));
} else if (dl_return == CURLE_HTTP_RANGE_ERROR ||
diff --git a/src/gpgme.c b/src/gpgme.c
index 068a5bd..12ef323 100644
--- a/src/gpgme.c
+++ b/src/gpgme.c
@@ -24,9 +24,7 @@ FILE *slapt_get_pkg_source_checksums_signature (const slapt_rc_config *global_co
{
FILE *tmp_checksum_f = NULL;
char *checksum_head = NULL;
- SLAPT_BOOL_T interactive = global_config->progress_cb == NULL && global_config->dl_stats == SLAPT_FALSE
- ? SLAPT_TRUE
- : SLAPT_FALSE;
+ SLAPT_BOOL_T interactive = slapt_is_interactive(global_config);
char *location_uncompressed = SLAPT_CHECKSUM_ASC_FILE;
char *location_compressed = SLAPT_CHECKSUM_ASC_FILE_GZ;
char *filename = NULL;
@@ -68,6 +66,9 @@ FILE *slapt_get_pkg_source_checksums_signature (const slapt_rc_config *global_co
} else {
const char *err = NULL;
+ if (global_config->dl_stats == SLAPT_TRUE)
+ printf("\n");
+
if ((tmp_checksum_f = slapt_open_file(filename,"w+b")) == NULL)
exit(EXIT_FAILURE);
diff --git a/src/package.c b/src/package.c
index a074977..8fb7d1c 100644
--- a/src/package.c
+++ b/src/package.c
@@ -2735,6 +2735,7 @@ struct slapt_pkg_list *slapt_get_pkg_source_packages (const slapt_rc_config *glo
{
struct slapt_pkg_list *available_pkgs = NULL;
char *pkg_head = NULL;
+ SLAPT_BOOL_T is_interactive = slapt_is_interactive(global_config);
*compressed = 0;
@@ -2769,15 +2770,14 @@ struct slapt_pkg_list *slapt_get_pkg_source_packages (const slapt_rc_config *glo
return NULL;
}
- if (global_config->progress_cb == NULL)
+ if (is_interactive)
printf(gettext("Cached\n"));
} else {
FILE *tmp_pkg_f = NULL;
const char *err = NULL;
- if (global_config->progress_cb == NULL &&
- global_config->dl_stats == SLAPT_TRUE)
+ if (global_config->dl_stats == SLAPT_TRUE)
printf("\n");
if ((tmp_pkg_f = slapt_open_file(pkg_filename,"w+b")) == NULL)
@@ -2820,8 +2820,7 @@ struct slapt_pkg_list *slapt_get_pkg_source_packages (const slapt_rc_config *glo
if (pkg_head != NULL)
slapt_write_head_cache(pkg_head,pkg_filename);
- if (global_config->progress_cb == NULL &&
- global_config->dl_stats == SLAPT_FALSE)
+ if (is_interactive)
printf(gettext("Done\n"));
} else {
@@ -2859,15 +2858,14 @@ struct slapt_pkg_list *slapt_get_pkg_source_packages (const slapt_rc_config *glo
available_pkgs = slapt_parse_packages_txt(tmp_pkg_f);
fclose(tmp_pkg_f);
- if (global_config->progress_cb == NULL)
+ if (is_interactive)
printf(gettext("Cached\n"));
} else {
FILE *tmp_pkg_f = NULL;
const char *err = NULL;
- if (global_config->progress_cb == NULL &&
- global_config->dl_stats == SLAPT_TRUE)
+ if (global_config->dl_stats == SLAPT_TRUE)
printf("\n");
if ((tmp_pkg_f = slapt_open_file(pkg_filename,"w+b")) == NULL)
@@ -2903,8 +2901,7 @@ struct slapt_pkg_list *slapt_get_pkg_source_packages (const slapt_rc_config *glo
if (pkg_head != NULL)
slapt_write_head_cache(pkg_head,pkg_filename);
- if (global_config->progress_cb == NULL &&
- global_config->dl_stats == SLAPT_FALSE)
+ if (is_interactive)
printf(gettext("Done\n"));
} else {
@@ -2934,6 +2931,7 @@ struct slapt_pkg_list *slapt_get_pkg_source_patches (const slapt_rc_config *glob
{
struct slapt_pkg_list *patch_pkgs = NULL;
char *patch_head = NULL;
+ SLAPT_BOOL_T is_interactive = slapt_is_interactive(global_config);
*compressed = 0;
if ((patch_head = slapt_head_mirror_data(url,SLAPT_PATCHES_LIST_GZ)) != NULL) {
@@ -2951,15 +2949,14 @@ struct slapt_pkg_list *slapt_get_pkg_source_patches (const slapt_rc_config *glob
patch_pkgs = slapt_parse_packages_txt(tmp_patch_f);
fclose(tmp_patch_f);
- if (global_config->progress_cb == NULL)
+ if (is_interactive)
printf(gettext("Cached\n"));
} else {
FILE *tmp_patch_f = NULL;
const char *err = NULL;
- if (global_config->progress_cb == NULL &&
- global_config->dl_stats == SLAPT_TRUE)
+ if (global_config->dl_stats == SLAPT_TRUE)
printf("\n");
if ((tmp_patch_f = slapt_open_file(patch_filename,"w+b")) == NULL)
@@ -2980,8 +2977,7 @@ struct slapt_pkg_list *slapt_get_pkg_source_patches (const slapt_rc_config *glob
patch_pkgs = slapt_parse_packages_txt(tmp_patch_uncompressed_f);
- if (global_config->progress_cb == NULL &&
- global_config->dl_stats == SLAPT_FALSE)
+ if (is_interactive)
printf(gettext("Done\n"));
if (patch_head != NULL)
@@ -2996,8 +2992,7 @@ struct slapt_pkg_list *slapt_get_pkg_source_patches (const slapt_rc_config *glob
slapt_clear_head_cache(patch_filename);
}
- if (global_config->progress_cb == NULL &&
- global_config->dl_stats == SLAPT_TRUE)
+ if (global_config->dl_stats == SLAPT_TRUE)
printf("\n");
}
@@ -3025,7 +3020,7 @@ struct slapt_pkg_list *slapt_get_pkg_source_patches (const slapt_rc_config *glob
patch_pkgs = slapt_parse_packages_txt(tmp_patch_f);
- if (global_config->progress_cb == NULL)
+ if (is_interactive)
printf(gettext("Cached\n"));
fclose(tmp_patch_f);
@@ -3033,8 +3028,7 @@ struct slapt_pkg_list *slapt_get_pkg_source_patches (const slapt_rc_config *glob
FILE *tmp_patch_f = NULL;
const char *err = NULL;
- if (global_config->progress_cb == NULL &&
- global_config->dl_stats == SLAPT_TRUE)
+ if (global_config->dl_stats == SLAPT_TRUE)
printf("\n");
if ((tmp_patch_f = slapt_open_file(patch_filename,"w+b")) == NULL)
@@ -3047,8 +3041,7 @@ struct slapt_pkg_list *slapt_get_pkg_source_patches (const slapt_rc_config *glob
rewind(tmp_patch_f); /* make sure we are back at the front of the file */
patch_pkgs = slapt_parse_packages_txt(tmp_patch_f);
- if (global_config->progress_cb == NULL &&
- global_config->dl_stats == SLAPT_FALSE)
+ if (is_interactive)
printf(gettext("Done\n"));
if (patch_head != NULL)
@@ -3059,14 +3052,12 @@ struct slapt_pkg_list *slapt_get_pkg_source_patches (const slapt_rc_config *glob
doesn't have patches source_dl_failed = 1; */
slapt_clear_head_cache(patch_filename);
- if (global_config->progress_cb == NULL &&
- global_config->dl_stats == SLAPT_FALSE)
+ if (is_interactive)
printf(gettext("Done\n"));
}
- if (global_config->progress_cb == NULL &&
- global_config->dl_stats == SLAPT_TRUE)
+ if (global_config->dl_stats == SLAPT_TRUE)
printf("\n");
fclose(tmp_patch_f);
@@ -3086,6 +3077,7 @@ FILE *slapt_get_pkg_source_checksums (const slapt_rc_config *global_config,
{
FILE *tmp_checksum_f = NULL;
char *checksum_head = NULL;
+ SLAPT_BOOL_T is_interactive = slapt_is_interactive(global_config);
*compressed = 0;
if ((checksum_head = slapt_head_mirror_data(url,SLAPT_CHECKSUM_FILE_GZ)) != NULL) {
@@ -3099,15 +3091,14 @@ FILE *slapt_get_pkg_source_checksums (const slapt_rc_config *global_config,
slapt_gunzip_file(filename,tmp_checksum_f);
- if (global_config->progress_cb == NULL)
+ if (is_interactive)
printf(gettext("Cached\n"));
} else {
FILE *working_checksum_f = NULL;
const char *err = NULL;
- if (global_config->progress_cb == NULL &&
- global_config->dl_stats == SLAPT_TRUE)
+ if (global_config->dl_stats == SLAPT_TRUE)
printf("\n");
if ((working_checksum_f = slapt_open_file(filename,"w+b")) == NULL)
@@ -3118,11 +3109,9 @@ FILE *slapt_get_pkg_source_checksums (const slapt_rc_config *global_config,
SLAPT_CHECKSUM_FILE_GZ);
if (!err) {
- if (global_config->progress_cb == NULL &&
- global_config->dl_stats == SLAPT_TRUE)
+ if (global_config->dl_stats == SLAPT_TRUE)
printf("\n");
- if (global_config->progress_cb == NULL &&
- global_config->dl_stats == SLAPT_FALSE)
+ if (is_interactive)
printf(gettext("Done\n"));
fclose(working_checksum_f);
@@ -3172,7 +3161,7 @@ FILE *slapt_get_pkg_source_checksums (const slapt_rc_config *global_config,
if ((tmp_checksum_f = slapt_open_file(filename,"r")) == NULL)
exit(EXIT_FAILURE);
- if (global_config->progress_cb == NULL)
+ if (is_interactive)
printf(gettext("Cached\n"));
} else {
@@ -3181,8 +3170,7 @@ FILE *slapt_get_pkg_source_checksums (const slapt_rc_config *global_config,
if ((tmp_checksum_f = slapt_open_file(filename,"w+b")) == NULL)
exit(EXIT_FAILURE);
- if (global_config->progress_cb == NULL &&
- global_config->dl_stats == SLAPT_TRUE)
+ if (global_config->dl_stats == SLAPT_TRUE)
printf("\n");
err = slapt_get_mirror_data_from_source(tmp_checksum_f,
@@ -3190,8 +3178,7 @@ FILE *slapt_get_pkg_source_checksums (const slapt_rc_config *global_config,
SLAPT_CHECKSUM_FILE);
if (!err) {
- if (global_config->progress_cb == NULL &&
- global_config->dl_stats == SLAPT_FALSE)
+ if (is_interactive)
printf(gettext("Done\n"));
} else {
@@ -3211,8 +3198,7 @@ FILE *slapt_get_pkg_source_checksums (const slapt_rc_config *global_config,
if (checksum_head != NULL)
slapt_write_head_cache(checksum_head,filename);
- if (global_config->progress_cb == NULL &&
- global_config->dl_stats == SLAPT_TRUE)
+ if (global_config->dl_stats == SLAPT_TRUE)
printf("\n");
}
@@ -3236,6 +3222,7 @@ int slapt_get_pkg_source_changelog (const slapt_rc_config *global_config,
char *location_uncomp = SLAPT_CHANGELOG_FILE;
char *location = location_gz;
int success = 0,failure = -1;
+ SLAPT_BOOL_T is_interactive = slapt_is_interactive(global_config);
*compressed = 0;
changelog_head = slapt_head_mirror_data(url,location);
@@ -3248,7 +3235,7 @@ int slapt_get_pkg_source_changelog (const slapt_rc_config *global_config,
}
if (changelog_head == NULL) {
- if (global_config->progress_cb == NULL)
+ if (is_interactive)
printf(gettext("Done\n"));
return success;
}
@@ -3258,15 +3245,14 @@ int slapt_get_pkg_source_changelog (const slapt_rc_config *global_config,
if (local_head != NULL && strcmp(changelog_head,local_head) == 0) {
- if (global_config->progress_cb == NULL)
+ if (is_interactive)
printf(gettext("Cached\n"));
} else {
FILE *working_changelog_f = NULL;
const char *err = NULL;
- if (global_config->progress_cb == NULL &&
- global_config->dl_stats == SLAPT_TRUE)
+ if (global_config->dl_stats == SLAPT_TRUE)
printf("\n");
if ((working_changelog_f = slapt_open_file(filename,"w+b")) == NULL)
@@ -3276,11 +3262,9 @@ int slapt_get_pkg_source_changelog (const slapt_rc_config *global_config,
global_config,url,
location);
if (!err) {
- if (global_config->progress_cb == NULL &&
- global_config->dl_stats == SLAPT_TRUE)
+ if (global_config->dl_stats == SLAPT_TRUE)
printf("\n");
- if (global_config->progress_cb == NULL &&
- global_config->dl_stats == SLAPT_FALSE)
+ if (is_interactive)
printf(gettext("Done\n"));
/* if all is good, write it */