summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Changes2
-rw-r--r--po/.tx/config2
-rw-r--r--po/cs.po13
-rw-r--r--po/de.po13
-rw-r--r--po/es.po9
-rw-r--r--po/fi.po94
-rw-r--r--po/pt.po19
-rw-r--r--po/ru.po44
-rw-r--r--urpm/download.pm2
9 files changed, 133 insertions, 65 deletions
diff --git a/Changes b/Changes
index 008ea018..aa815308 100644
--- a/Changes
+++ b/Changes
@@ -1,3 +1,5 @@
+- Set wget as default downloader (mga#24362)
+
Version 8.131 - 13 April 2023
- urpmi:
diff --git a/po/.tx/config b/po/.tx/config
index 81afe5a6..93b5b44d 100644
--- a/po/.tx/config
+++ b/po/.tx/config
@@ -1,7 +1,7 @@
[main]
host = https://www.transifex.com
-[mageia.urpmi]
+[o:MageiaLinux:p:mageia:r:urpmi]
file_filter = <lang>.po
source_file = urpmi.pot
source_lang = en
diff --git a/po/cs.po b/po/cs.po
index 716f9ad6..39a4d640 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -2,16 +2,16 @@
# Copyright (C) YEAR Free Software Foundation, Inc.
#
# Translators:
-# Jiří Vírava <appukonrad@gmail.com>, 2014
-# Luděk Janča <joelp@email.cz>, 2021
+# Appukonrad <appukonrad@gmail.com>, 2014
+# Luděk Janča <joelp@email.cz>, 2021,2023
# fri, 2013-2015,2019-2020,2022
msgid ""
msgstr ""
"Project-Id-Version: Mageia\n"
"POT-Creation-Date: 2022-06-13 18:28+0300\n"
"PO-Revision-Date: 2013-04-04 14:13+0000\n"
-"Last-Translator: fri, 2013-2015,2019-2020,2022\n"
-"Language-Team: Czech (http://www.transifex.com/MageiaLinux/mageia/language/"
+"Last-Translator: Luděk Janča <joelp@email.cz>, 2021,2023\n"
+"Language-Team: Czech (http://app.transifex.com/MageiaLinux/mageia/language/"
"cs/)\n"
"Language: cs\n"
"MIME-Version: 1.0\n"
@@ -3277,8 +3277,9 @@ msgstr "Grafické rozhraní pro instalaci balíčků RPM"
#: ../polkit/org.mageia.gurpmi2.policy.in.h:1
msgid "Run Mageia Package Installer"
-msgstr "Spustit instalátor balíčků Mageii"
+msgstr "Spustit instalátor balíčků distribuce Mageia"
#: ../polkit/org.mageia.gurpmi2.policy.in.h:2
msgid "Authentication is required to run Mageia Package Installer"
-msgstr "Ke spuštění instalátoru balíčků Mageii je vyžadována autentizace"
+msgstr ""
+"Ke spuštění instalátoru balíčků distribuce Mageia je vyžadována autentizace"
diff --git a/po/de.po b/po/de.po
index b1f37d50..224f64e3 100644
--- a/po/de.po
+++ b/po/de.po
@@ -4,7 +4,8 @@
# Translators:
# Ettore Atalan <atalanttore@googlemail.com>, 2018
# Klaus Christian Harke <k.c.harke@gmx.net>, 2021
-# psyca, 2014-2017,2019-2020,2022
+# psyca, 2014-2017,2019-2020,2022-2024
+# Marc Lattemann, 2014
# Marc Lattemann, 2014
# Oliver Burger <obgr_seneca@mageia.org>, 2013
# Sigrid Carrera <sigrid.carrera@googlemail.com>, 2013
@@ -13,8 +14,8 @@ msgstr ""
"Project-Id-Version: Mageia\n"
"POT-Creation-Date: 2022-06-13 18:28+0300\n"
"PO-Revision-Date: 2013-04-04 14:13+0000\n"
-"Last-Translator: psyca, 2014-2017,2019-2020,2022\n"
-"Language-Team: German (http://www.transifex.com/MageiaLinux/mageia/language/"
+"Last-Translator: psyca, 2014-2017,2019-2020,2022-2024\n"
+"Language-Team: German (http://app.transifex.com/MageiaLinux/mageia/language/"
"de/)\n"
"Language: de\n"
"MIME-Version: 1.0\n"
@@ -1121,7 +1122,7 @@ msgstr "Paket %s ausgelassen"
#: ../urpm/media.pm:877
#, c-format
msgid "would install instead of upgrade package %s"
-msgstr "Anstatt des Aktualisierungspaketes lieber %s installieren"
+msgstr "würde das Paket %s installieren anstatt zu aktualisieren"
#: ../urpm/media.pm:960
#, c-format
@@ -1469,8 +1470,8 @@ msgstr[1] "Vielleicht wollen Sie diese entfernen."
msgid ""
"The following package:\n"
"%s\n"
-"is now orphaned, if you wish to remove it, you can use \"urpme --auto-orphans"
-"\""
+"is now orphaned, if you wish to remove it, you can use \"urpme --auto-"
+"orphans\""
msgid_plural ""
"The following packages:\n"
"%s\n"
diff --git a/po/es.po b/po/es.po
index cdf0952f..c6839da4 100644
--- a/po/es.po
+++ b/po/es.po
@@ -11,7 +11,7 @@
# Fabian Mandelbaum <fabman@mandrakesoft.com>, 2001-2002,2003, 2004
# Fabian Mandelbaum <fmandelbaum@hotmail.com>, 2003-2004
# Jaime Crespo <505201@unizar.es>, 2004-2005
-# José Alberto Valle Cid <j.alberto.vc@gmail.com>, 2020,2022
+# José Alberto Valle Cid <j.alberto.vc@gmail.com>, 2020,2022-2023
# José Alberto Valle Cid <mdktrans@blogdrake.net>, 2010
# 9d2429286e4b6db037855ee18ff950ea_21b1117 <e234ccd2dcb0d5482e17780be633a729_130514>, 2014
# José Manuel Pérez <jmprodu@hotmail.com>, 2005
@@ -21,8 +21,9 @@ msgstr ""
"Project-Id-Version: Mageia\n"
"POT-Creation-Date: 2022-06-13 18:28+0300\n"
"PO-Revision-Date: 2013-04-04 14:13+0000\n"
-"Last-Translator: José Alberto Valle Cid <j.alberto.vc@gmail.com>, 2020,2022\n"
-"Language-Team: Spanish (http://www.transifex.com/MageiaLinux/mageia/language/"
+"Last-Translator: José Alberto Valle Cid <j.alberto.vc@gmail.com>, "
+"2020,2022-2023\n"
+"Language-Team: Spanish (http://app.transifex.com/MageiaLinux/mageia/language/"
"es/)\n"
"Language: es\n"
"MIME-Version: 1.0\n"
@@ -2814,7 +2815,7 @@ msgstr " --all-media - con --distrib, añadir cada soporte listado\n"
#, c-format
msgid " --ignorearch - with --distrib, add media from incompatible archs\n"
msgstr ""
-" --ignorearch - with --distrib, añade medios de arquitecturas "
+" --ignorearch - con --distrib, añade medios de arquitecturas "
"incompatibles\n"
#: ../urpmi.addmedia:80
diff --git a/po/fi.po b/po/fi.po
index b0b06089..8f829a57 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -4,19 +4,22 @@
# Translators:
# Anssi Hannula <anssi@mandriva.org>, 2007-2009
# Jani Välimaa <jani.valimaa@gmail.com>, 2009
+# Jani Välimaa, 2022
# wally <wally@mandriva.org>, 2009
# Kim Enkovaara <kim.enkovaara@iki.fi>, 2000
+# Kimmo Kujansuu <mrkujansuu@gmail.com>, 2023
# Matias Griese <mahagr@utu.fi>, 2001-2002
# Taisto Kuikka <69319@batman.jypoly.fi>, 2003-2004
# Thomas Backlund <tmb@mandrake.org>, 2002-2005
# Thomas Backlund <tmb@mandriva.org>, 2005,2009
+# wally <wally@mandriva.org>, 2009
msgid ""
msgstr ""
"Project-Id-Version: Mageia\n"
"POT-Creation-Date: 2022-06-13 18:28+0300\n"
-"PO-Revision-Date: 2020-07-10 16:45+0000\n"
-"Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
-"Language-Team: Finnish (http://www.transifex.com/MageiaLinux/mageia/language/"
+"PO-Revision-Date: 2013-04-04 14:13+0000\n"
+"Last-Translator: Kimmo Kujansuu <mrkujansuu@gmail.com>, 2023\n"
+"Language-Team: Finnish (http://app.transifex.com/MageiaLinux/mageia/language/"
"fi/)\n"
"Language: fi\n"
"MIME-Version: 1.0\n"
@@ -52,7 +55,7 @@ msgstr "Valmistellaan..."
#: ../gurpm/RPMProgressDialog.pm:314
#, c-format
msgid "Removing package `%s' ..."
-msgstr ""
+msgstr "Poistetaan paketti '%s'..."
#: ../gurpm/RPMProgressDialog.pm:317
#, c-format
@@ -262,12 +265,12 @@ msgstr "Paketteja ei määritelty"
#: ../gurpmi2:47
#, c-format
msgid "Must be root"
-msgstr "On oltava pääkäyttäjän oikeudet"
+msgstr "Pääkäyttäjän oikeudet tarvitaan"
#: ../gurpmi2:77
#, c-format
msgid "Preparing packages installation..."
-msgstr "Valmistellaan ohjelmistopakettien asennusta..."
+msgstr "Valmistellaan pakettien asennusta..."
#: ../gurpmi2:92 ../urpmi:506
#, c-format
@@ -476,6 +479,8 @@ msgstr "Suoritetaan urpmi rajoitetussa tilassa..."
#, c-format
msgid "While some packages may have been installed, there were failures.\n"
msgstr ""
+"Vaikka jotkin paketit on saatettu asentaa, niissä oli virheitä.\n"
+"\n"
#: ../urpm.pm:195
#, c-format
@@ -1007,7 +1012,7 @@ msgstr "Yritetäänkö pakottaa asennus (--force) (k/E)?"
#: ../urpm/main_loop.pm:593
#, c-format
msgid "Packages are up to date"
-msgstr "Paketit ovat ajantasalla"
+msgstr "Paketit ovat ajan tasalla"
#: ../urpm/main_loop.pm:604 ../urpm/parallel.pm:340
#, c-format
@@ -1071,17 +1076,17 @@ msgstr ""
#: ../urpm/media.pm:793
#, c-format
msgid "ignoring non-free medium `%s'"
-msgstr ""
+msgstr "ohitetaan 'non-free' media '%s'"
#: ../urpm/media.pm:803
#, c-format
msgid "un-ignoring non-free medium `%s' b/c nonfree packages are installed"
-msgstr ""
+msgstr "un-ignoring non-free medium `%s' b/c nonfree paketit ovat asennettu"
#: ../urpm/media.pm:807
#, c-format
msgid "un-ignoring tainted medium `%s' b/c tainted packages are installed"
-msgstr ""
+msgstr "un-ignoring tainted medium `%s' b/c tainted paketit ovat asennettu"
#: ../urpm/media.pm:816
#, c-format
@@ -1089,6 +1094,8 @@ msgid ""
"un-ignoring 32bit medium `%s' b/c 32-bit packages are installed or system is "
"32-bit EFI"
msgstr ""
+"un-ignoring 32bit medium `%s' b/c 32-bit paketit ovat asennettu tai "
+"järjestelmä on 32-bit EFI"
#: ../urpm/media.pm:844
#, c-format
@@ -1374,7 +1381,7 @@ msgstr "Arkkitehtuuri"
#: ../urpm/msg.pm:229
#, c-format
msgid "(recommended)"
-msgstr ""
+msgstr "(suositeltu)"
#: ../urpm/msg.pm:244
#, c-format
@@ -1429,14 +1436,18 @@ msgid_plural ""
"%s\n"
"are now orphaned."
msgstr[0] ""
+"Seuraava paketti on tarpeeton (orphan):\n"
+"%s"
msgstr[1] ""
+"Seuraavat paketit ovat tarpeettomia (orphan):\n"
+"%s"
#: ../urpm/orphans.pm:616
#, c-format
msgid "You may wish to remove it."
msgid_plural "You may wish to remove them."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Voit haluta poistaa sen."
+msgstr[1] "Voit haluta poistaa ne."
#: ../urpm/orphans.pm:633
#, c-format
@@ -1533,7 +1544,7 @@ msgstr "Liitetään %s"
#: ../urpm/removable.pm:112
#, c-format
msgid "unmounting %s"
-msgstr "Irrotetaan %s"
+msgstr "Irroitetaan %s"
#: ../urpm/select.pm:44
#, c-format
@@ -1562,7 +1573,7 @@ msgstr "Seuraavat paketit sisältävät %s: %s"
#: ../urpm/select.pm:223
#, c-format
msgid "You should use \"-a\" to use all of them"
-msgstr "Käytä valitsinta \"-a\" valitaksesi ne kaikki"
+msgstr "Käytä valitsinta \"-a\" valitaksesi kaikki"
#: ../urpm/select.pm:371
#, c-format
@@ -1637,12 +1648,12 @@ msgstr "Virheellinen allekirjoitus (%s)"
#: ../urpm/signature.pm:76
#, c-format
msgid "SECURITY: The following package is _NOT_ signed (%s): %s"
-msgstr ""
+msgstr "TIETOTURVA: Seuraava paketti EI ole allekirjoitettu (%s): %s"
#: ../urpm/signature.pm:82
#, c-format
msgid "SECURITY: NOT checking package \"%s\" (due to configuration)"
-msgstr ""
+msgstr "TIETOTURVA: EI tarkista pakettia \"%s\" (konfiguraation takia)"
#: ../urpm/signature.pm:101
#, c-format
@@ -1657,12 +1668,12 @@ msgstr "Puuttuva allekirjoitus (%s)"
#: ../urpm/signature.pm:106
#, c-format
msgid "SECURITY: Medium \"%s\" has no key (%s)!"
-msgstr ""
+msgstr "TIETOTURVA: Keskitaso \"%s\" ei avainta (%s)!"
#: ../urpm/signature.pm:108
#, c-format
msgid "Medium without key (%s)"
-msgstr ""
+msgstr "Media ilman avainta (%s)"
#: ../urpm/sys.pm:198
#, c-format
@@ -1908,7 +1919,7 @@ msgstr ""
#: ../urpmf:45
#, c-format
msgid " -F<str> - change field separator (defaults to ':').\n"
-msgstr " -F<erotin> - vaihda kenttäerotinta (oletus \":\").\n"
+msgstr " -F<str> - vaihda kenttäerotinta (oletus ':').\n"
#: ../urpmf:46
#, c-format
@@ -2064,7 +2075,7 @@ msgstr " --sourcerpm - lähdepaketin nimi.\n"
#: ../urpmf:75
#, c-format
msgid " --recommends - recommends tags\n"
-msgstr ""
+msgstr " --recommends - suositellut paketit\n"
#: ../urpmf:76
#, c-format
@@ -2142,6 +2153,7 @@ msgstr " --auto-orphans - poista tarpeettomat paketit (orphans) kysymättä.\n"
#, c-format
msgid " --no-recommends - do not auto select \"recommended\" packages.\n"
msgstr ""
+" --no-recommends - älä valitse \"suositeltuja\" paketteja automaattisesti.\n"
#: ../urpmi:81
#, c-format
@@ -2216,7 +2228,7 @@ msgstr " --noclean - älä poista rpm-paketteja välimuistista.\n"
msgid ""
" --downgrade - downgrade a package from the version currently installed\n"
" to the previously highest version\n"
-msgstr ""
+msgstr " --downgrade - asenna nykyisestä paketista aiempi versio\n"
#: ../urpmi:99
#, c-format
@@ -2247,6 +2259,7 @@ msgstr ""
#, c-format
msgid " --allow-recommends - auto select \"recommended\" packages.\n"
msgstr ""
+" --allow-recommends - valitse \"suositellut\" paketit automaattisesti.\n"
#: ../urpmi:109
#, c-format
@@ -2628,7 +2641,7 @@ msgstr[1] "Seuraavat tarpeettomat paketit poistetaan."
#: ../urpmi:599
#, c-format
msgid "WARNING: %s option is in use. Some strange problems may happen"
-msgstr ""
+msgstr "VAROITUS: valitsimen %s käyttö voi aiheuttaa odottamattomia ongelmia"
#: ../urpmi:611
#, c-format
@@ -2666,6 +2679,26 @@ msgid ""
"\n"
"and [options] are from\n"
msgstr ""
+"käyttö: urpmi.addmedia [options] <name> <url>\n"
+"jossa <url> on yksi\n"
+" [file:/]/<path>\n"
+" ftp://<login>:<password>@<host>/<path>\n"
+" ftp://<host>/<path>\n"
+" http://<host>/<path>\n"
+" https://<host>/<path>\n"
+" cdrom://<path>\n"
+"\n"
+"käyttö: urpmi.addmedia [options] --distrib --mirrorlist <url>\n"
+"käyttö: urpmi.addmedia [options] --mirrorlist <url> <name> <relative path>\n"
+"\n"
+"esimerkit:\n"
+"\n"
+" urpmi.addmedia --distrib --mirrorlist '$MIRRORLIST'\n"
+" urpmi.addmedia --mirrorlist '$MIRRORLIST' backports media/main/backports\n"
+" urpmi.addmedia --distrib --zeroconf\n"
+"\n"
+"\n"
+"ja [options] ovat\n"
#: ../urpmi.addmedia:57 ../urpmi.update:34 ../urpmq:71
#, c-format
@@ -2746,9 +2779,11 @@ msgstr ""
" --all-media - lisää kaikki mediat käytettäessä valitsinta --distrib.\n"
#: ../urpmi.addmedia:79
-#, fuzzy, c-format
+#, c-format
msgid " --ignorearch - with --distrib, add media from incompatible archs\n"
-msgstr " --ignorearch - älä tarkista rpm-pakettien arkkitehtuuria.\n"
+msgstr ""
+" --ignorearch - lisää yhteensopimattoman arkkitehtuurin media valitsimen "
+"--distrib kanssa\n"
#: ../urpmi.addmedia:80
#, c-format
@@ -2924,6 +2959,7 @@ msgstr ""
#, c-format
msgid " -a - select all enabled non-removable media.\n"
msgstr ""
+" -a - valitse kaikki aktivoidut ei-irroitettavat mediat.\n"
#: ../urpmi.update:52
#, c-format
@@ -3046,7 +3082,7 @@ msgstr ""
#: ../urpmq:63
#, c-format
msgid " --sources - print source URLs of selected packages\n"
-msgstr ""
+msgstr " --sources - tulosta valittujen pakettien lähdeosoite\n"
#: ../urpmq:65
#, c-format
@@ -3092,7 +3128,7 @@ msgstr " --requires - tulosta riippuvuusmerkinnät (\"Requires\").\n"
#: ../urpmq:84
#, c-format
msgid " --recommends - print recommends.\n"
-msgstr ""
+msgstr " --recommends - tulosta suositellut paketit.\n"
#: ../urpmq:85
#, c-format
@@ -3262,8 +3298,8 @@ msgstr "Graafinen ohjelmien asennin"
#: ../polkit/org.mageia.gurpmi2.policy.in.h:1
msgid "Run Mageia Package Installer"
-msgstr ""
+msgstr "Suorita Mageia pakettien asennin"
#: ../polkit/org.mageia.gurpmi2.policy.in.h:2
msgid "Authentication is required to run Mageia Package Installer"
-msgstr ""
+msgstr "Autentikointi tarvitaan Mageia pakettien asentimen suorittamiseksi"
diff --git a/po/pt.po b/po/pt.po
index 5c8c781e..743df7f9 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -10,9 +10,11 @@
# Jose Jorge <jose.jorge@oreka.com>, 2003
# Manuela Silva <mmsrs@sky.com>, 2020
# Manuela Silva <mmsrs@sky.com>, 2014,2017
-# Manuela Silva <mmsrs@sky.com>, 2021
+# Manuela Silva <mmsrs@sky.com>, 2014,2017,2020-2021,2023
# Pedro <simplew8@gmail.com>, 2012
# Rui <xymarior@yandex.com>, 2018-2019
+# zecas <jjorge@free.fr>, 2004
+# Zé <mmodem00@gmail.com>, 2010
# Zé <mmodem00@gmail.com>, 2010
# Zé <mmodem00@netvisao.pt>, 2004-2006
# Zé <ze@mandriva.org>, 2006-2008,2010
@@ -21,8 +23,8 @@ msgstr ""
"Project-Id-Version: Mageia\n"
"POT-Creation-Date: 2022-06-13 18:28+0300\n"
"PO-Revision-Date: 2013-04-04 14:13+0000\n"
-"Last-Translator: Manuela Silva <mmsrs@sky.com>, 2021\n"
-"Language-Team: Portuguese (http://www.transifex.com/MageiaLinux/mageia/"
+"Last-Translator: Manuela Silva <mmsrs@sky.com>, 2014,2017,2020-2021,2023\n"
+"Language-Team: Portuguese (http://app.transifex.com/MageiaLinux/mageia/"
"language/pt/)\n"
"Language: pt\n"
"MIME-Version: 1.0\n"
@@ -128,11 +130,12 @@ msgid ""
"\n"
"Proceed?"
msgstr ""
-"Está prestes a instalar os seguintes pacotes de software no seu computador:\n"
+"Está prestes a instalar os seguintes pacotes de programas no seu "
+"computador:\n"
"\n"
"%s\n"
"\n"
-"Deseja continuar?"
+"Continuar?"
#: ../gurpmi:99
#, c-format
@@ -143,7 +146,7 @@ msgid ""
"\n"
"You may prefer to just save it. What is your choice?"
msgstr ""
-"Está prestes a instalar o seguinte pacote de software no seu computador:\n"
+"Está prestes a instalar o seguinte pacote de programas no seu computador:\n"
"\n"
"%s\n"
"\n"
@@ -630,9 +633,9 @@ msgid ""
"\n"
"usage:\n"
msgstr ""
-"versão %s %s\n"
+"utilização%s versão %s\n"
"%s\n"
-"Isto é um programa livre e pode ser redistribuído sob os termos GPL GNU.\n"
+"Isto é um programa livre e pode ser redistribuído sob os termos de GPL GNU.\n"
"\n"
"uso:\n"
diff --git a/po/ru.po b/po/ru.po
index e585d256..cb07b5af 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -6,24 +6,25 @@
# Alexander Kazancev <kazancas@mandriva.ru>, 2008-2009
# Aleksey Smirnov <smi@logic.ru>, 2000
# Alexander Kazancev <kazancas@gmail.com>, 2008
-# AlexL <loginov.alex.valer@gmail.com>, 2019-2020
+# AlexL <loginov.alex.valer@gmail.com>, 2019-2020,2023
# Alice Lafox <alice@lafox.com.ua>, 2003
# Alice Lafox <alice@lafox.net>, 2004-2005
# Анатолий Валерианович <ffox909@mail.ru>, 2014
# Pavel Maryanov <acid_jack@ukr.net>, 2002-2009
# Валентин Сайков <saikov.vb@gmail.com>, 2014
+# Victor, 2023
# Vladimir Choundalov <choundalovvv@point.pwp.ru>, 2001
# Анатолий Валерианович <ffox909@mail.ru>, 2014
# Валентин Сайков <saikov.vb@gmail.com>, 2014
# Виктор, 2022
-# Виктор, 2022-2023
+# Victor, 2022-2023
msgid ""
msgstr ""
"Project-Id-Version: Mageia\n"
"POT-Creation-Date: 2022-06-13 18:28+0300\n"
"PO-Revision-Date: 2013-04-04 14:13+0000\n"
-"Last-Translator: Виктор, 2022-2023\n"
-"Language-Team: Russian (http://www.transifex.com/MageiaLinux/mageia/language/"
+"Last-Translator: AlexL <loginov.alex.valer@gmail.com>, 2019-2020,2023\n"
+"Language-Team: Russian (http://app.transifex.com/MageiaLinux/mageia/language/"
"ru/)\n"
"Language: ru\n"
"MIME-Version: 1.0\n"
@@ -353,7 +354,7 @@ msgstr "Будет загружено %s пакетов."
#, c-format
msgid "Proceed with the installation of one package?"
msgid_plural "Proceed with the installation of the %d packages?"
-msgstr[0] "Продолжить установку %d пакета?"
+msgstr[0] "Продолжить установку одного пакета?"
msgstr[1] "Продолжить установку %d пакетов?"
msgstr[2] "Продолжить установку %d пакетов?"
msgstr[3] "Продолжить установку %d пакетов?"
@@ -696,7 +697,7 @@ msgstr "%s недоступен, выполняется откат до %s"
#, c-format
msgid "can not read proxy settings (not enough rights to read %s)"
msgstr ""
-"не удаётся прочитать параметры прокси-сервера (недостаточно прав, чтобы "
+"не удаётся прочитать настройки прокси-сервера (недостаточно прав, чтобы "
"прочитать %s)"
#: ../urpm/download.pm:201
@@ -1842,7 +1843,7 @@ msgstr "Нет осиротевших пакетов для удаления"
msgid "To satisfy dependencies, the following package will be removed"
msgid_plural ""
"To satisfy dependencies, the following %d packages will be removed"
-msgstr[0] "Для удовлетворения зависимостей, следующий %d пакет будет удалён"
+msgstr[0] "Для удовлетворения зависимостей, следующий пакет будет удалён"
msgstr[1] "Для удовлетворения зависимостей, следующие %d пакеты будут удалены"
msgstr[2] "Для удовлетворения зависимостей, следующие %d пакеты будут удалены"
msgstr[3] "Для удовлетворения зависимостей, следующие %d пакеты будут удалены"
@@ -1861,9 +1862,9 @@ msgstr[3] "(осиротевшие пакеты)"
msgid "Remove %d package?"
msgid_plural "Remove %d packages?"
msgstr[0] "Удалить %d пакет?"
-msgstr[1] "Удалить %d пакета?"
-msgstr[2] "Удалить %d пакетов?"
-msgstr[3] "Удалить %d пакет?"
+msgstr[1] "Удалить %d пакеты?"
+msgstr[2] "Удалить %d пакеты?"
+msgstr[3] "Удалить %d пакеты?"
#: ../urpme:163
#, c-format
@@ -2716,6 +2717,27 @@ msgid ""
"\n"
"and [options] are from\n"
msgstr ""
+"Использование: urpmi.addmedia [параметры] <name> <url>,\n"
+"где <url> одно из\n"
+" [file:/]/<path>\n"
+" ftp://<login>:<password>@<host>/<path>\n"
+" ftp://<host>/<path>\n"
+" http://<host>/<path>\n"
+" https://<host>/<path>\n"
+" cdrom://<path>\n"
+"\n"
+"использование: urpmi.addmedia [параметры] --distrib --mirrorlist <url>\n"
+"использование: urpmi.addmedia [параметры] --mirrorlist <url> <name> "
+"<relative path>\n"
+"\n"
+"примеры:\n"
+"\n"
+" urpmi.addmedia --distrib --mirrorlist '$MIRRORLIST'\n"
+" urpmi.addmedia --mirrorlist '$MIRRORLIST' backports media/main/backports\n"
+" urpmi.addmedia --distrib --zeroconf\n"
+"\n"
+"\n"
+"и [параметры] из\n"
#: ../urpmi.addmedia:57 ../urpmi.update:34 ../urpmq:71
#, c-format
@@ -2800,6 +2822,8 @@ msgstr ""
#, c-format
msgid " --ignorearch - with --distrib, add media from incompatible archs\n"
msgstr ""
+"--ignorearch - вместе с --distrib, добавить источник с несовместимыми "
+"архитектурами\n"
#: ../urpmi.addmedia:80
#, c-format
diff --git a/urpm/download.pm b/urpm/download.pm
index 302ccc4f..1efd3723 100644
--- a/urpm/download.pm
+++ b/urpm/download.pm
@@ -44,8 +44,8 @@ sub ftp_http_downloaders() { qw(wget curl prozilla aria2) }
sub available_ftp_http_downloaders() {
my %binaries = (
+ wget => 'wget',
curl => 'curl',
- wget => 'wget',
prozilla => 'proz',
aria2 => 'aria2c',
);
generated by cgit v1.2.1 (git 2.21.0) at 2024-10-21 19:03:12 +0000