From 825a6a0d7b41e624c01d0236ec73d31296c352c6 Mon Sep 17 00:00:00 2001 From: Guillaume Cottenceau Date: Fri, 30 Aug 2002 18:15:36 +0000 Subject: handle /etc/urpmi/proxy.cfg proxies, have a proxy dialog config in edit-urpm-sources --- po/hr.po | 283 ++++++++++++++++++++++++++++++++++----------------------------- 1 file changed, 153 insertions(+), 130 deletions(-) (limited to 'po/hr.po') diff --git a/po/hr.po b/po/hr.po index 86e6b9a7..8f3b730a 100644 --- a/po/hr.po +++ b/po/hr.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: rpmdrake 1.3\n" -"POT-Creation-Date: 2002-08-30 10:17+0200\n" +"POT-Creation-Date: 2002-08-30 20:11+0200\n" "PO-Revision-Date: 2002-03-07 18:34CET\n" "Last-Translator: Vlatko Kosturjak \n" "Language-Team: Croatian \n" @@ -61,7 +61,7 @@ msgstr "putanja ili mjesto za montiranje: " msgid "Removable device" msgstr "" -#: ../edit-urpm-sources.pl_.c:59 ../rpmdrake_.c:465 +#: ../edit-urpm-sources.pl_.c:59 ../rpmdrake_.c:461 msgid "Security updates" msgstr "Sigurnosne dogradnje" @@ -79,7 +79,7 @@ msgstr "Izaberite mirror:" msgid "Login:" msgstr "login:" -#: ../edit-urpm-sources.pl_.c:92 +#: ../edit-urpm-sources.pl_.c:92 ../edit-urpm-sources.pl_.c:228 msgid "Password:" msgstr "Lozinka:" @@ -115,14 +115,16 @@ msgid "Type of source:" msgstr "Tip izvora:" #: ../edit-urpm-sources.pl_.c:124 ../edit-urpm-sources.pl_.c:183 -#: ../rpmdrake.pm_.c:78 ../rpmdrake.pm_.c:98 ../rpmdrake.pm_.c:272 -#: ../rpmdrake_.c:322 ../rpmdrake_.c:780 ../rpmdrake_.c:806 +#: ../edit-urpm-sources.pl_.c:232 ../rpmdrake.pm_.c:78 ../rpmdrake.pm_.c:98 +#: ../rpmdrake.pm_.c:270 ../rpmdrake_.c:318 ../rpmdrake_.c:777 +#: ../rpmdrake_.c:803 msgid "Ok" msgstr "U Redu" #: ../edit-urpm-sources.pl_.c:127 ../edit-urpm-sources.pl_.c:175 #: ../edit-urpm-sources.pl_.c:183 ../edit-urpm-sources.pl_.c:202 -#: ../rpmdrake.pm_.c:272 ../rpmdrake_.c:322 ../rpmdrake_.c:806 +#: ../edit-urpm-sources.pl_.c:233 ../rpmdrake.pm_.c:270 ../rpmdrake_.c:318 +#: ../rpmdrake_.c:803 msgid "Cancel" msgstr "Odustani" @@ -181,45 +183,75 @@ msgstr "Nadogradi" msgid "Please wait, updating media..." msgstr "Provjeravam ovisnosti..." -#: ../edit-urpm-sources.pl_.c:216 +#: ../edit-urpm-sources.pl_.c:215 +#, fuzzy +msgid "Configure proxies" +msgstr "Podesiti izvor?" + +#: ../edit-urpm-sources.pl_.c:220 +msgid "" +"If you need a proxy, enter the hostname and an optional port (syntax: " +"):" +msgstr "" + +#: ../edit-urpm-sources.pl_.c:222 +#, fuzzy +msgid "Proxy hostname:" +msgstr "Proxy korisnik:" + +#: ../edit-urpm-sources.pl_.c:224 +msgid "You may specify a user/password for the proxy authentication:" +msgstr "" + +#: ../edit-urpm-sources.pl_.c:226 +#, fuzzy +msgid "User:" +msgstr "Korisnik:" + +#: ../edit-urpm-sources.pl_.c:250 #, fuzzy msgid "Configure sources" msgstr "Podesiti izvor?" -#: ../edit-urpm-sources.pl_.c:217 +#: ../edit-urpm-sources.pl_.c:251 msgid "Enabled?" msgstr "" -#: ../edit-urpm-sources.pl_.c:217 +#: ../edit-urpm-sources.pl_.c:251 msgid "Source" msgstr "Izvor" -#: ../edit-urpm-sources.pl_.c:245 ../rpmdrake_.c:602 +#: ../edit-urpm-sources.pl_.c:279 ../rpmdrake_.c:598 #, fuzzy msgid "Remove" msgstr "Prenosivi medij" -#: ../edit-urpm-sources.pl_.c:247 +#: ../edit-urpm-sources.pl_.c:281 msgid "Edit" msgstr "Ažuriraj" -#: ../edit-urpm-sources.pl_.c:249 +#: ../edit-urpm-sources.pl_.c:283 msgid "Add..." msgstr "" -#: ../edit-urpm-sources.pl_.c:251 +#: ../edit-urpm-sources.pl_.c:285 msgid "Update..." msgstr "" -#: ../edit-urpm-sources.pl_.c:254 +#: ../edit-urpm-sources.pl_.c:286 +#, fuzzy +msgid "Proxy..." +msgstr "Greška..." + +#: ../edit-urpm-sources.pl_.c:289 msgid "Save and quit" msgstr "" -#: ../edit-urpm-sources.pl_.c:255 ../rpmdrake_.c:605 +#: ../edit-urpm-sources.pl_.c:290 ../rpmdrake_.c:601 msgid "Quit" msgstr "Završi" -#: ../edit-urpm-sources.pl_.c:265 ../rpmdrake_.c:905 +#: ../edit-urpm-sources.pl_.c:300 ../rpmdrake_.c:902 #, c-format msgid "" "%s\n" @@ -227,7 +259,7 @@ msgid "" "Is it ok to continue?" msgstr "" -#: ../edit-urpm-sources.pl_.c:268 +#: ../edit-urpm-sources.pl_.c:303 msgid "" "Welcome to the packages source editor!\n" "\n" @@ -358,11 +390,11 @@ msgid "China" msgstr "" #: ../rpmdrake.pm_.c:167 ../rpmdrake.pm_.c:168 ../rpmdrake.pm_.c:169 -#: ../rpmdrake.pm_.c:170 ../rpmdrake.pm_.c:222 +#: ../rpmdrake.pm_.c:170 ../rpmdrake.pm_.c:220 msgid "United States" msgstr "" -#: ../rpmdrake.pm_.c:230 +#: ../rpmdrake.pm_.c:228 msgid "" "I need to contact MandrakeSoft website to get the mirrors list.\n" "Please check that your network is currently running.\n" @@ -370,15 +402,15 @@ msgid "" "Is it ok to continue?" msgstr "" -#: ../rpmdrake.pm_.c:234 +#: ../rpmdrake.pm_.c:232 msgid "Please wait, downloading mirrors addresses from MandrakeSoft website." msgstr "" -#: ../rpmdrake.pm_.c:240 +#: ../rpmdrake.pm_.c:238 msgid "Error during download" msgstr "" -#: ../rpmdrake.pm_.c:241 +#: ../rpmdrake.pm_.c:239 #, c-format msgid "" "There was an error downloading the mirrors list:\n" @@ -388,12 +420,12 @@ msgid "" "Please try again later." msgstr "" -#: ../rpmdrake.pm_.c:249 +#: ../rpmdrake.pm_.c:247 #, fuzzy msgid "No mirror" msgstr "Nema greške" -#: ../rpmdrake.pm_.c:250 +#: ../rpmdrake.pm_.c:248 msgid "" "I can't find any suitable mirror.\n" "\n" @@ -402,7 +434,7 @@ msgid "" "by Mandrake Linux Official Updates." msgstr "" -#: ../rpmdrake.pm_.c:264 +#: ../rpmdrake.pm_.c:262 #, fuzzy msgid "Please choose the desired mirror." msgstr "" @@ -413,95 +445,95 @@ msgstr "" msgid "Other" msgstr "" -#: ../rpmdrake_.c:135 ../rpmdrake_.c:425 ../rpmdrake_.c:426 +#: ../rpmdrake_.c:131 ../rpmdrake_.c:421 ../rpmdrake_.c:422 msgid "(Non available)" msgstr "" -#: ../rpmdrake_.c:143 ../rpmdrake_.c:194 +#: ../rpmdrake_.c:139 ../rpmdrake_.c:190 #, fuzzy msgid "Search results" msgstr "Rezultati pretraživanja" -#: ../rpmdrake_.c:143 +#: ../rpmdrake_.c:139 #, fuzzy msgid "Search results (none)" msgstr "Rezultati pretraživanja" -#: ../rpmdrake_.c:158 +#: ../rpmdrake_.c:154 #, fuzzy msgid "Please wait, searching..." msgstr "Molimo pričekajte dok rpm uklanja navedene pakete:" -#: ../rpmdrake_.c:161 +#: ../rpmdrake_.c:157 msgid "Stop" msgstr "" -#: ../rpmdrake_.c:195 ../rpmdrake_.c:295 +#: ../rpmdrake_.c:191 ../rpmdrake_.c:291 msgid "Addable" msgstr "" -#: ../rpmdrake_.c:195 ../rpmdrake_.c:295 +#: ../rpmdrake_.c:191 ../rpmdrake_.c:291 msgid "Upgradable" msgstr "" -#: ../rpmdrake_.c:197 +#: ../rpmdrake_.c:193 #, fuzzy msgid "Not selected" msgstr "" "Odznači\n" "sve" -#: ../rpmdrake_.c:197 +#: ../rpmdrake_.c:193 #, fuzzy msgid "Selected" msgstr "Izaberi sve" -#: ../rpmdrake_.c:232 +#: ../rpmdrake_.c:228 msgid "More information on package..." msgstr "" -#: ../rpmdrake_.c:234 +#: ../rpmdrake_.c:230 msgid "One of the following packages is needed:" msgstr "" -#: ../rpmdrake_.c:234 +#: ../rpmdrake_.c:230 msgid "Please choose" msgstr "" -#: ../rpmdrake_.c:250 +#: ../rpmdrake_.c:246 #, fuzzy msgid "unknown package " msgstr "Nepoznata stranica" -#: ../rpmdrake_.c:260 +#: ../rpmdrake_.c:256 #, fuzzy msgid "Please wait, listing packages..." msgstr "Molimo pričekajte dok rpm uklanja navedene pakete:" -#: ../rpmdrake_.c:274 +#: ../rpmdrake_.c:270 msgid "(none)" msgstr "(nema)" -#: ../rpmdrake_.c:276 +#: ../rpmdrake_.c:272 #, fuzzy msgid "No update" msgstr "normalne dogradnje" -#: ../rpmdrake_.c:277 +#: ../rpmdrake_.c:273 msgid "" "The list of updates is void. This means that either there is\n" "no available update for the packages installed on your computer,\n" "or you already installed all of them." msgstr "" -#: ../rpmdrake_.c:328 +#: ../rpmdrake_.c:324 #, fuzzy msgid "Some additional packages need to be removed" msgstr "" "Ovi dodatni paketi su potrebni da budu instalirani u pravilu da sve radi " "ispravno:" -#: ../rpmdrake_.c:329 +#: ../rpmdrake_.c:325 #, fuzzy msgid "" "Because of their dependencies, the following package(s) also need to be\n" @@ -511,54 +543,54 @@ msgstr "" "U pravilu da zadovoljite sve ovisnosti,\n" "slijedeći paketi biti će uklonjeni:" -#: ../rpmdrake_.c:335 +#: ../rpmdrake_.c:331 msgid "Some packages can't be removed" msgstr "" -#: ../rpmdrake_.c:336 ../rpmdrake_.c:394 +#: ../rpmdrake_.c:332 ../rpmdrake_.c:390 msgid "" "Because of their dependencies, the following package(s) must be\n" "unselected now:\n" "\n" msgstr "" -#: ../rpmdrake_.c:364 +#: ../rpmdrake_.c:360 msgid "Additional packages needed" msgstr "" -#: ../rpmdrake_.c:365 +#: ../rpmdrake_.c:361 msgid "" "To satisfy dependencies, the following package(s) also need\n" "to be installed:\n" "\n" msgstr "" -#: ../rpmdrake_.c:378 +#: ../rpmdrake_.c:374 #, fuzzy msgid "Some packages can't be installed" msgstr "Paketa već instalirano" -#: ../rpmdrake_.c:379 +#: ../rpmdrake_.c:375 msgid "" "Sorry, the following package(s) can't be selected:\n" "\n" msgstr "" -#: ../rpmdrake_.c:393 ../rpmdrake_.c:564 +#: ../rpmdrake_.c:389 ../rpmdrake_.c:560 msgid "Some packages need to be removed" msgstr "" -#: ../rpmdrake_.c:415 +#: ../rpmdrake_.c:411 #, c-format msgid "Selected: %d MB / Free disk space: %d MB" msgstr "" -#: ../rpmdrake_.c:417 +#: ../rpmdrake_.c:413 #, c-format msgid "Selected size: %d MB" msgstr "" -#: ../rpmdrake_.c:423 +#: ../rpmdrake_.c:419 #, c-format msgid "" "%sFiles:\n" @@ -568,12 +600,12 @@ msgid "" "%s" msgstr "" -#: ../rpmdrake_.c:424 +#: ../rpmdrake_.c:420 #, fuzzy, c-format msgid "Source: %s\n" msgstr "Izvor" -#: ../rpmdrake_.c:429 +#: ../rpmdrake_.c:425 #, c-format msgid "" "Name: %s\n" @@ -586,7 +618,7 @@ msgid "" "%s\n" msgstr "" -#: ../rpmdrake_.c:433 +#: ../rpmdrake_.c:429 #, c-format msgid "" "Name: %s\n" @@ -598,75 +630,75 @@ msgid "" "%s\n" msgstr "" -#: ../rpmdrake_.c:465 +#: ../rpmdrake_.c:461 #, fuzzy msgid "Bugfixes updates" msgstr "Sigurnosne dogradnje" -#: ../rpmdrake_.c:465 +#: ../rpmdrake_.c:461 #, fuzzy msgid "Normal updates" msgstr "normalne dogradnje" -#: ../rpmdrake_.c:484 +#: ../rpmdrake_.c:480 #, fuzzy msgid "Mandrake choices" msgstr "MandrakeDogradnja" -#: ../rpmdrake_.c:485 +#: ../rpmdrake_.c:481 msgid "All packages, alphabetical" msgstr "" -#: ../rpmdrake_.c:486 +#: ../rpmdrake_.c:482 #, fuzzy msgid "All packages," msgstr "0 paketa, 0 byte-ova" -#: ../rpmdrake_.c:509 +#: ../rpmdrake_.c:505 msgid "by group" msgstr "" -#: ../rpmdrake_.c:509 +#: ../rpmdrake_.c:505 #, fuzzy msgid "by size" msgstr "Velič. Dub." -#: ../rpmdrake_.c:510 +#: ../rpmdrake_.c:506 msgid "by selection state" msgstr "" -#: ../rpmdrake_.c:511 +#: ../rpmdrake_.c:507 msgid "by source repository" msgstr "" -#: ../rpmdrake_.c:511 +#: ../rpmdrake_.c:507 msgid "by update availability" msgstr "" -#: ../rpmdrake_.c:532 +#: ../rpmdrake_.c:528 #, fuzzy msgid "in descriptions" msgstr "Opisi" -#: ../rpmdrake_.c:532 +#: ../rpmdrake_.c:528 msgid "in names" msgstr "" -#: ../rpmdrake_.c:533 +#: ../rpmdrake_.c:529 #, fuzzy msgid "in files" msgstr "Lokalno" -#: ../rpmdrake_.c:544 +#: ../rpmdrake_.c:540 msgid "Maximum information" msgstr "" -#: ../rpmdrake_.c:544 +#: ../rpmdrake_.c:540 #, fuzzy msgid "Normal information" msgstr "normalne dogradnje" -#: ../rpmdrake_.c:565 +#: ../rpmdrake_.c:561 #, c-format msgid "" "The following packages have to be removed for others to be upgraded:\n" @@ -676,41 +708,41 @@ msgid "" "Is it ok to continue?" msgstr "" -#: ../rpmdrake_.c:586 +#: ../rpmdrake_.c:582 msgid "Find:" msgstr "Pronađi:" -#: ../rpmdrake_.c:591 +#: ../rpmdrake_.c:587 #, fuzzy msgid "Search" msgstr "Traži" -#: ../rpmdrake_.c:603 +#: ../rpmdrake_.c:599 msgid "Install" msgstr "Instaliraj" -#: ../rpmdrake_.c:614 +#: ../rpmdrake_.c:610 msgid "-adobe-times-bold-r-normal--25-*-100-100-p-*-iso8859-*,*-r-*" msgstr "" -#: ../rpmdrake_.c:615 +#: ../rpmdrake_.c:611 #, fuzzy msgid "Mandrake Update" msgstr "" "Mandrake\n" "Dogradnja" -#: ../rpmdrake_.c:615 +#: ../rpmdrake_.c:611 #, fuzzy msgid "Software Packages Removal" msgstr " Upravitelj programima " -#: ../rpmdrake_.c:616 +#: ../rpmdrake_.c:612 #, fuzzy msgid "Software Packages Installation" msgstr "Instalacija paketa" -#: ../rpmdrake_.c:648 +#: ../rpmdrake_.c:644 msgid "" "I need to contact the mirror to get latest update packages.\n" "Please check that your network is currently running.\n" @@ -718,23 +750,23 @@ msgid "" "Is it ok to continue?" msgstr "" -#: ../rpmdrake_.c:652 +#: ../rpmdrake_.c:648 msgid "Please wait, contacting mirror to update packages information." msgstr "" -#: ../rpmdrake_.c:654 +#: ../rpmdrake_.c:650 msgid "Error updating medium" msgstr "" -#: ../rpmdrake_.c:655 +#: ../rpmdrake_.c:651 msgid "There was an unrecoverable error while updating packages information." msgstr "" -#: ../rpmdrake_.c:661 +#: ../rpmdrake_.c:657 msgid "How to choose manually your mirror" msgstr "" -#: ../rpmdrake_.c:662 +#: ../rpmdrake_.c:658 msgid "" "You may also choose your desired mirror manually: to do so,\n" "launch the Software Sources Manager, and then add a `Security\n" @@ -743,15 +775,15 @@ msgid "" "Then, restart MandrakeUpdate." msgstr "" -#: ../rpmdrake_.c:668 +#: ../rpmdrake_.c:664 msgid "Please wait, contacting mirror to initialize updates packages." msgstr "" -#: ../rpmdrake_.c:672 +#: ../rpmdrake_.c:668 msgid "Error adding update medium" msgstr "" -#: ../rpmdrake_.c:673 +#: ../rpmdrake_.c:669 #, c-format msgid "" "There was an error while adding the update medium via urpmi.\n" @@ -764,48 +796,52 @@ msgid "" "Do you want to try another mirror?" msgstr "" -#: ../rpmdrake_.c:702 +#: ../rpmdrake_.c:698 #, fuzzy msgid "Please wait, finding available packages..." msgstr "ponovno učitaj popise raspoloživih aplikacija" -#: ../rpmdrake_.c:725 +#: ../rpmdrake_.c:721 msgid "All requested packages were installed successfully." msgstr "" -#: ../rpmdrake_.c:725 +#: ../rpmdrake_.c:721 msgid "Everything installed successfully" msgstr "" -#: ../rpmdrake_.c:728 +#: ../rpmdrake_.c:724 #, fuzzy msgid "Installation finished" msgstr "moguće instalirati" -#: ../rpmdrake_.c:731 +#: ../rpmdrake_.c:727 #, c-format msgid "Inspecting %s" msgstr "" -#: ../rpmdrake_.c:747 +#: ../rpmdrake_.c:743 #, fuzzy, c-format msgid "Remove .%s" msgstr "Prenosivi medij" -#: ../rpmdrake_.c:749 +#: ../rpmdrake_.c:745 #, c-format msgid "Use .%s as main file" msgstr "" -#: ../rpmdrake_.c:751 +#: ../rpmdrake_.c:747 msgid "Do nothing" msgstr "" -#: ../rpmdrake_.c:754 +#: ../rpmdrake_.c:750 msgid "-misc-fixed-medium-r-normal--12-*-*-100--*-*-*-*-*,*" msgstr "" -#: ../rpmdrake_.c:761 +#: ../rpmdrake_.c:759 +msgid "Inspect..." +msgstr "" + +#: ../rpmdrake_.c:772 #, c-format msgid "" "The installation is finished; %s.\n" @@ -814,83 +850,79 @@ msgid "" "you may now inspect some in order to take actions:" msgstr "" -#: ../rpmdrake_.c:762 +#: ../rpmdrake_.c:773 #, fuzzy msgid "" "some packages failed to install\n" "correctly" msgstr "Paketa već instalirano" -#: ../rpmdrake_.c:763 +#: ../rpmdrake_.c:774 #, fuzzy msgid "everything was installed correctly" msgstr "Paket je već instaliran" -#: ../rpmdrake_.c:768 -msgid "Inspect..." -msgstr "" - -#: ../rpmdrake_.c:796 +#: ../rpmdrake_.c:793 #, fuzzy msgid "Unable to get source packages." msgstr "Loši, nečitljivi ili nisu pronađeni paketi" -#: ../rpmdrake_.c:797 +#: ../rpmdrake_.c:794 msgid "Unable to get source packages, sorry." msgstr "" -#: ../rpmdrake_.c:804 +#: ../rpmdrake_.c:801 msgid "Change medium" msgstr "" -#: ../rpmdrake_.c:805 +#: ../rpmdrake_.c:802 #, c-format msgid "Please insert the medium named \"%s\" on device [%s]" msgstr "" -#: ../rpmdrake_.c:813 +#: ../rpmdrake_.c:810 #, fuzzy msgid "Installation failed" msgstr "moguće instalirati" -#: ../rpmdrake_.c:814 +#: ../rpmdrake_.c:811 msgid "" "Installation failed, some files are missing.\n" "You may want to update your sources database." msgstr "" -#: ../rpmdrake_.c:817 +#: ../rpmdrake_.c:814 #, fuzzy msgid "Please wait, removing packages to allow others to be upgraded..." msgstr "Molimo odaberite pakete koje želite dograditi" -#: ../rpmdrake_.c:826 +#: ../rpmdrake_.c:823 msgid "Program missing" msgstr "" -#: ../rpmdrake_.c:827 +#: ../rpmdrake_.c:824 msgid "A required program is missing (grpmi). Check your installation." msgstr "" -#: ../rpmdrake_.c:845 +#: ../rpmdrake_.c:842 #, fuzzy msgid "Everything already installed." msgstr "Paket je već instaliran" -#: ../rpmdrake_.c:846 +#: ../rpmdrake_.c:843 msgid "Everything already installed (is this supposed to happen at all?)." msgstr "" -#: ../rpmdrake_.c:856 +#: ../rpmdrake_.c:853 msgid "Please wait, reading packages database..." msgstr "" -#: ../rpmdrake_.c:894 +#: ../rpmdrake_.c:891 #, fuzzy msgid "Please wait, removing packages..." msgstr "Molimo pričekajte dok rpm uklanja navedene pakete:" -#: ../rpmdrake_.c:909 +#: ../rpmdrake_.c:906 msgid "" "Welcome to the software removal tool!\n" "\n" @@ -898,7 +930,7 @@ msgid "" "your computer." msgstr "" -#: ../rpmdrake_.c:914 +#: ../rpmdrake_.c:911 msgid "" "Welcome to MandrakeUpdate!\n" "\n" @@ -906,7 +938,7 @@ msgid "" "computer." msgstr "" -#: ../rpmdrake_.c:919 +#: ../rpmdrake_.c:916 msgid "" "Welcome to the software installation tool!\n" "\n" @@ -1130,9 +1162,6 @@ msgstr "Instaliraj sve" #~ msgid "Force" #~ msgstr "Prisili" -#~ msgid "Error..." -#~ msgstr "Greška..." - #~ msgid "Problems occured during installation" #~ msgstr "Dogodili su se problemi prilikom instalacije" @@ -1433,9 +1462,6 @@ msgstr "Instaliraj sve" #~ msgid "Ftp Proxy:" #~ msgstr "Ftp Proxy:" -#~ msgid "Proxy username:" -#~ msgstr "Proxy korisnik:" - #~ msgid "Proxy password:" #~ msgstr "Proxy Lozinka:" @@ -1475,9 +1501,6 @@ msgstr "Instaliraj sve" #~ msgid "Choose Packages" #~ msgstr "Izaberite pakete" -#~ msgid "Username:" -#~ msgstr "Korisnik:" - #~ msgid "Security" #~ msgstr "Sigurnost" -- cgit v1.2.1