From 57c0433d697c39c53f81ce30c0cd5ce655750c73 Mon Sep 17 00:00:00 2001 From: Yuri Chornoivan Date: Sun, 20 Dec 2020 15:07:56 +0200 Subject: Update bootiso catalog --- docs/docs/stable/bootiso/ast.po | 74 ++++++++++----------- docs/docs/stable/bootiso/bootiso.pot | 71 ++++++++++---------- docs/docs/stable/bootiso/ca.po | 74 ++++++++++----------- docs/docs/stable/bootiso/cs.po | 76 +++++++++++----------- docs/docs/stable/bootiso/de.po | 82 ++++++++++++----------- docs/docs/stable/bootiso/el.po | 81 ++++++++++++----------- docs/docs/stable/bootiso/en/netInstall-intro.xml | 28 ++++---- docs/docs/stable/bootiso/eo.po | 74 ++++++++++----------- docs/docs/stable/bootiso/es.po | 79 +++++++++++----------- docs/docs/stable/bootiso/et.po | 79 +++++++++++----------- docs/docs/stable/bootiso/eu.po | 74 ++++++++++----------- docs/docs/stable/bootiso/fr.po | 83 +++++++++++++----------- docs/docs/stable/bootiso/he.po | 74 ++++++++++----------- docs/docs/stable/bootiso/hi.po | 74 ++++++++++----------- docs/docs/stable/bootiso/hr.po | 75 +++++++++++---------- docs/docs/stable/bootiso/hu.po | 74 ++++++++++----------- docs/docs/stable/bootiso/ja.po | 82 ++++++++++++----------- docs/docs/stable/bootiso/nb.po | 79 +++++++++++----------- docs/docs/stable/bootiso/nl.po | 80 ++++++++++++----------- docs/docs/stable/bootiso/pl.po | 75 ++++++++++----------- docs/docs/stable/bootiso/pt.po | 81 ++++++++++++----------- docs/docs/stable/bootiso/pt_BR.po | 79 +++++++++++----------- docs/docs/stable/bootiso/ru.po | 83 +++++++++++++----------- docs/docs/stable/bootiso/sl.po | 74 ++++++++++----------- docs/docs/stable/bootiso/sq.po | 79 +++++++++++----------- docs/docs/stable/bootiso/sr.po | 79 +++++++++++----------- docs/docs/stable/bootiso/sv.po | 78 +++++++++++----------- docs/docs/stable/bootiso/tg.po | 74 ++++++++++----------- docs/docs/stable/bootiso/tr.po | 75 +++++++++++---------- docs/docs/stable/bootiso/uk.po | 83 +++++++++++++----------- docs/docs/stable/bootiso/zh_CN.po | 74 ++++++++++----------- docs/docs/stable/bootiso/zh_TW.po | 74 ++++++++++----------- 32 files changed, 1235 insertions(+), 1186 deletions(-) diff --git a/docs/docs/stable/bootiso/ast.po b/docs/docs/stable/bootiso/ast.po index 439ea726..d586407b 100644 --- a/docs/docs/stable/bootiso/ast.po +++ b/docs/docs/stable/bootiso/ast.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: Mageia Boot ISO Help 6.0\n" "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n" -"POT-Creation-Date: 2019-01-18 19:11+0200\n" +"POT-Creation-Date: 2020-12-20 15:06+0200\n" "PO-Revision-Date: 2017-04-04 18:35+0000\n" "Last-Translator: enolp , 2020\n" "Language-Team: Asturian (https://www.transifex.com/MageiaLinux/teams/9361/" @@ -87,72 +87,67 @@ msgid "Installing Mageia using a Tiny Boot Image" msgstr "" #. type: Content of:
-#: en/netInstall-intro.xml:11 +#: en/netInstall-intro.xml:12 msgid "Introduction" msgstr "Introducción" #. type: Content of: <section><section><title> -#: en/netInstall-intro.xml:14 +#: en/netInstall-intro.xml:15 msgid "NetInstall Media" msgstr "" #. type: Content of: <section><section><section><title> -#: en/netInstall-intro.xml:17 +#: en/netInstall-intro.xml:18 msgid "Description" msgstr "Descripción" #. type: Content of: <section><section><section><para> -#: en/netInstall-intro.xml:19 +#: en/netInstall-intro.xml:20 msgid "These minimal ISO's contain:" msgstr "Estes ISOs mínimes contienen:" #. type: Content of: <section><section><section><itemizedlist><listitem><para> -#: en/netInstall-intro.xml:23 +#: en/netInstall-intro.xml:24 msgid "" -"less than 100 MB and are convenient if bandwidth is too low to download a " +"less than 120 MB and are convenient if bandwidth is too low to download a " "full DVD, or if you have a PC without a DVD drive or unable to boot from a " "USB stick." msgstr "" #. type: Content of: <section><section><section><itemizedlist><listitem><para> -#: en/netInstall-intro.xml:29 +#: en/netInstall-intro.xml:30 msgid "" -"no more than that which is needed to a) start the <literal>DrakX</literal> " -"installer and b) find <literal>DrakX-installer-stage2</literal> and other " +"no more than that which is needed to (a) start the <literal>DrakX</literal> " +"installer and (b) find <literal>DrakX-installer-stage2</literal> and other " "packages that are needed to continue and complete the install." msgstr "" #. type: Content of: <section><section><section><para> -#: en/netInstall-intro.xml:36 +#: en/netInstall-intro.xml:37 msgid "" "The required source packages may be on a PC hard disk, a local drive, a " "local network or on the Internet." msgstr "" -#. type: Content of: <section><section><section><note><para> -#: en/netInstall-intro.xml:40 -msgid "Installation via encrypted wifi or bluetooth is not supported." -msgstr "" - #. type: Content of: <section><section><section><title> -#: en/netInstall-intro.xml:46 +#: en/netInstall-intro.xml:42 msgid "Availability" msgstr "Disponibilidá" #. type: Content of: <section><section><section><para> -#: en/netInstall-intro.xml:48 +#: en/netInstall-intro.xml:44 msgid "There a two versions of the NetInstall media:" msgstr "" #. type: Content of: <section><section><section><itemizedlist><listitem><para> -#: en/netInstall-intro.xml:52 +#: en/netInstall-intro.xml:48 msgid "" "<emphasis role=\"bold\">netinstall.iso</emphasis> For those who prefer not " "to use non-free software, this ISO contains only free software." msgstr "" #. type: Content of: <section><section><section><itemizedlist><listitem><para> -#: en/netInstall-intro.xml:58 +#: en/netInstall-intro.xml:54 msgid "" "<emphasis role=\"bold\">netinstall-nonfree.iso</emphasis> This ISO " "additionally includes proprietary device drivers, which may be required for " @@ -160,7 +155,7 @@ msgid "" msgstr "" #. type: Content of: <section><section><section><para> -#: en/netInstall-intro.xml:64 +#: en/netInstall-intro.xml:60 msgid "" "Both versions are available in the form of separate 32-bit and 64-bit ISO's. " "See here: <link xlink:href=\"https://www.mageia.org/downloads/\">https://www." @@ -168,12 +163,12 @@ msgid "" msgstr "" #. type: Content of: <section><section><section><title> -#: en/netInstall-intro.xml:70 +#: en/netInstall-intro.xml:66 msgid "Preparation" msgstr "" #. type: Content of: <section><section><section><para> -#: en/netInstall-intro.xml:72 +#: en/netInstall-intro.xml:68 msgid "" "After downloading the image, burn it to a CD/DVD or, if you prefer to put it " "on a USB stick, follow the instructions here: <link xlink:href=\"https://" @@ -183,26 +178,28 @@ msgid "" msgstr "" #. type: Content of: <section><section><title> -#: en/netInstall-intro.xml:79 +#: en/netInstall-intro.xml:75 msgid "Installation Stages" msgstr "" #. type: Content of: <section><section><para> -#: en/netInstall-intro.xml:81 +#: en/netInstall-intro.xml:77 msgid "The installation is carried out in two stages:" msgstr "" #. type: Content of: <section><section><itemizedlist><listitem><para> -#: en/netInstall-intro.xml:85 +#: en/netInstall-intro.xml:81 msgid "" "<emphasis role=\"bold\">Stage 1</emphasis> This is the pre-Installation " "stage. You will need to provide the method and details for accessing the " "medium containing the files to be used for the installation. If the method " -"involves a server, then the network connection will be activated." +"involves a server, then the network connection will be activated. This " +"network can be a WiFi connection with WEP or WPA2 encryption (though please " +"be mindful of the Warning below regarding keyboard input)." msgstr "" #. type: Content of: <section><section><itemizedlist><listitem><para> -#: en/netInstall-intro.xml:93 +#: en/netInstall-intro.xml:91 msgid "" "<emphasis role=\"bold\">Stage 2</emphasis> This is the actual Installation " "stage, which will automatically commence once a connection to the installer " @@ -210,7 +207,7 @@ msgid "" msgstr "" #. type: Content of: <section><section><note><para> -#: en/netInstall-intro.xml:100 +#: en/netInstall-intro.xml:98 msgid "" "During Stage 1, nothing will be written to your Hard Disk, so it is safe to " "quit at any point during Stage 1 if you wish. You can do so by pressing " @@ -219,7 +216,7 @@ msgid "" msgstr "" #. type: Content of: <section><section><tip><para> -#: en/netInstall-intro.xml:112 +#: en/netInstall-intro.xml:110 msgid "" "You can use <keycombo> <keycap>Alt</keycap> <keycap>F3</keycap> </keycombo> " "to read the logs and <keycombo> <keycap>Alt</keycap> <keycap>F1</keycap> </" @@ -227,14 +224,15 @@ msgid "" msgstr "" #. type: Content of: <section><section><warning><para> -#: en/netInstall-intro.xml:124 -msgid "" -"Unlike when installing from DVD or LiveCD, during the first part of the " -"installation (<emphasis role=\"bold\">Stage 1</emphasis>), you will be asked " -"to type things. During this stage, your keyboard will operate as per an " -"<link xlink:href=\"https://en.wikipedia.org/wiki/" -"Keyboard_layout#United_States\">American keyboard</link> layout. This can be " -"very confusing when you need to type names and paths." +#: en/netInstall-intro.xml:122 +msgid "" +"Unlike when installing from DVD or LiveCD, you will be asked to type things " +"during the first part of a Network installation (<emphasis role=\"bold" +"\">Stage 1</emphasis>). Throughout this stage, however, your keyboard will " +"operate as per an <link xlink:href=\"https://en.wikipedia.org/wiki/" +"Keyboard_layout#United_States\">American keyboard</link> layout. Please bear " +"this in mind to avoid confusion when entering things like names and paths " +"etc." msgstr "" #. type: Content of: <section><title> diff --git a/docs/docs/stable/bootiso/bootiso.pot b/docs/docs/stable/bootiso/bootiso.pot index 312855f8..a3ba2d4c 100644 --- a/docs/docs/stable/bootiso/bootiso.pot +++ b/docs/docs/stable/bootiso/bootiso.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Mageia Boot ISO Help 6.0\n" "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n" -"POT-Creation-Date: 2019-01-18 19:11+0200\n" +"POT-Creation-Date: 2020-12-20 15:06+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -82,72 +82,67 @@ msgid "Installing Mageia using a Tiny Boot Image" msgstr "" #. type: Content of: <section><title> -#: en/netInstall-intro.xml:11 +#: en/netInstall-intro.xml:12 msgid "Introduction" msgstr "" #. type: Content of: <section><section><title> -#: en/netInstall-intro.xml:14 +#: en/netInstall-intro.xml:15 msgid "NetInstall Media" msgstr "" #. type: Content of: <section><section><section><title> -#: en/netInstall-intro.xml:17 +#: en/netInstall-intro.xml:18 msgid "Description" msgstr "" #. type: Content of: <section><section><section><para> -#: en/netInstall-intro.xml:19 +#: en/netInstall-intro.xml:20 msgid "These minimal ISO's contain:" msgstr "" #. type: Content of: <section><section><section><itemizedlist><listitem><para> -#: en/netInstall-intro.xml:23 +#: en/netInstall-intro.xml:24 msgid "" -"less than 100 MB and are convenient if bandwidth is too low to download a " +"less than 120 MB and are convenient if bandwidth is too low to download a " "full DVD, or if you have a PC without a DVD drive or unable to boot from a " "USB stick." msgstr "" #. type: Content of: <section><section><section><itemizedlist><listitem><para> -#: en/netInstall-intro.xml:29 +#: en/netInstall-intro.xml:30 msgid "" -"no more than that which is needed to a) start the <literal>DrakX</literal> " -"installer and b) find <literal>DrakX-installer-stage2</literal> and other " +"no more than that which is needed to (a) start the <literal>DrakX</literal> " +"installer and (b) find <literal>DrakX-installer-stage2</literal> and other " "packages that are needed to continue and complete the install." msgstr "" #. type: Content of: <section><section><section><para> -#: en/netInstall-intro.xml:36 +#: en/netInstall-intro.xml:37 msgid "" "The required source packages may be on a PC hard disk, a local drive, a " "local network or on the Internet." msgstr "" -#. type: Content of: <section><section><section><note><para> -#: en/netInstall-intro.xml:40 -msgid "Installation via encrypted wifi or bluetooth is not supported." -msgstr "" - #. type: Content of: <section><section><section><title> -#: en/netInstall-intro.xml:46 +#: en/netInstall-intro.xml:42 msgid "Availability" msgstr "" #. type: Content of: <section><section><section><para> -#: en/netInstall-intro.xml:48 +#: en/netInstall-intro.xml:44 msgid "There a two versions of the NetInstall media:" msgstr "" #. type: Content of: <section><section><section><itemizedlist><listitem><para> -#: en/netInstall-intro.xml:52 +#: en/netInstall-intro.xml:48 msgid "" "<emphasis role=\"bold\">netinstall.iso</emphasis> For those who prefer not " "to use non-free software, this ISO contains only free software." msgstr "" #. type: Content of: <section><section><section><itemizedlist><listitem><para> -#: en/netInstall-intro.xml:58 +#: en/netInstall-intro.xml:54 msgid "" "<emphasis role=\"bold\">netinstall-nonfree.iso</emphasis> This ISO " "additionally includes proprietary device drivers, which may be required for " @@ -155,7 +150,7 @@ msgid "" msgstr "" #. type: Content of: <section><section><section><para> -#: en/netInstall-intro.xml:64 +#: en/netInstall-intro.xml:60 msgid "" "Both versions are available in the form of separate 32-bit and 64-bit " "ISO's. See here: <link " @@ -163,12 +158,12 @@ msgid "" msgstr "" #. type: Content of: <section><section><section><title> -#: en/netInstall-intro.xml:70 +#: en/netInstall-intro.xml:66 msgid "Preparation" msgstr "" #. type: Content of: <section><section><section><para> -#: en/netInstall-intro.xml:72 +#: en/netInstall-intro.xml:68 msgid "" "After downloading the image, burn it to a CD/DVD or, if you prefer to put it " "on a USB stick, follow the instructions here: <link " @@ -176,26 +171,28 @@ msgid "" msgstr "" #. type: Content of: <section><section><title> -#: en/netInstall-intro.xml:79 +#: en/netInstall-intro.xml:75 msgid "Installation Stages" msgstr "" #. type: Content of: <section><section><para> -#: en/netInstall-intro.xml:81 +#: en/netInstall-intro.xml:77 msgid "The installation is carried out in two stages:" msgstr "" #. type: Content of: <section><section><itemizedlist><listitem><para> -#: en/netInstall-intro.xml:85 +#: en/netInstall-intro.xml:81 msgid "" "<emphasis role=\"bold\">Stage 1</emphasis> This is the pre-Installation " "stage. You will need to provide the method and details for accessing the " "medium containing the files to be used for the installation. If the method " -"involves a server, then the network connection will be activated." +"involves a server, then the network connection will be activated. This " +"network can be a WiFi connection with WEP or WPA2 encryption (though please " +"be mindful of the Warning below regarding keyboard input)." msgstr "" #. type: Content of: <section><section><itemizedlist><listitem><para> -#: en/netInstall-intro.xml:93 +#: en/netInstall-intro.xml:91 msgid "" "<emphasis role=\"bold\">Stage 2</emphasis> This is the actual Installation " "stage, which will automatically commence once a connection to the installer " @@ -203,7 +200,7 @@ msgid "" msgstr "" #. type: Content of: <section><section><note><para> -#: en/netInstall-intro.xml:100 +#: en/netInstall-intro.xml:98 msgid "" "During Stage 1, nothing will be written to your Hard Disk, so it is safe to " "quit at any point during Stage 1 if you wish. You can do so by pressing " @@ -212,7 +209,7 @@ msgid "" msgstr "" #. type: Content of: <section><section><tip><para> -#: en/netInstall-intro.xml:112 +#: en/netInstall-intro.xml:110 msgid "" "You can use <keycombo> <keycap>Alt</keycap> <keycap>F3</keycap> </keycombo> " "to read the logs and <keycombo> <keycap>Alt</keycap> <keycap>F1</keycap> " @@ -220,15 +217,15 @@ msgid "" msgstr "" #. type: Content of: <section><section><warning><para> -#: en/netInstall-intro.xml:124 +#: en/netInstall-intro.xml:122 msgid "" -"Unlike when installing from DVD or LiveCD, during the first part of the " -"installation (<emphasis role=\"bold\">Stage 1</emphasis>), you will be asked " -"to type things. During this stage, your keyboard will operate as per an " -"<link " +"Unlike when installing from DVD or LiveCD, you will be asked to type things " +"during the first part of a Network installation (<emphasis " +"role=\"bold\">Stage 1</emphasis>). Throughout this stage, however, your " +"keyboard will operate as per an <link " "xlink:href=\"https://en.wikipedia.org/wiki/Keyboard_layout#United_States\">American " -"keyboard</link> layout. This can be very confusing when you need to type " -"names and paths." +"keyboard</link> layout. Please bear this in mind to avoid confusion when " +"entering things like names and paths etc." msgstr "" #. type: Content of: <section><title> diff --git a/docs/docs/stable/bootiso/ca.po b/docs/docs/stable/bootiso/ca.po index b4be9b34..e4a2a615 100644 --- a/docs/docs/stable/bootiso/ca.po +++ b/docs/docs/stable/bootiso/ca.po @@ -13,7 +13,7 @@ msgid "" msgstr "" "Project-Id-Version: Mageia Boot ISO Help 6.0\n" "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n" -"POT-Creation-Date: 2019-01-18 19:11+0200\n" +"POT-Creation-Date: 2020-12-20 15:06+0200\n" "PO-Revision-Date: 2017-04-04 18:35+0000\n" "Last-Translator: Robert Antoni Buj Gelonch <rbuj@fedoraproject.org>, 2019\n" "Language-Team: Catalan (https://www.transifex.com/MageiaLinux/teams/9361/" @@ -95,72 +95,67 @@ msgid "Installing Mageia using a Tiny Boot Image" msgstr "Instal·lació de Mageia mitjançant una imatge d'arrencada petita" #. type: Content of: <section><title> -#: en/netInstall-intro.xml:11 +#: en/netInstall-intro.xml:12 msgid "Introduction" msgstr "Introducció" #. type: Content of: <section><section><title> -#: en/netInstall-intro.xml:14 +#: en/netInstall-intro.xml:15 msgid "NetInstall Media" msgstr "" #. type: Content of: <section><section><section><title> -#: en/netInstall-intro.xml:17 +#: en/netInstall-intro.xml:18 msgid "Description" msgstr "Descripció" #. type: Content of: <section><section><section><para> -#: en/netInstall-intro.xml:19 +#: en/netInstall-intro.xml:20 msgid "These minimal ISO's contain:" msgstr "" #. type: Content of: <section><section><section><itemizedlist><listitem><para> -#: en/netInstall-intro.xml:23 +#: en/netInstall-intro.xml:24 msgid "" -"less than 100 MB and are convenient if bandwidth is too low to download a " +"less than 120 MB and are convenient if bandwidth is too low to download a " "full DVD, or if you have a PC without a DVD drive or unable to boot from a " "USB stick." msgstr "" #. type: Content of: <section><section><section><itemizedlist><listitem><para> -#: en/netInstall-intro.xml:29 +#: en/netInstall-intro.xml:30 msgid "" -"no more than that which is needed to a) start the <literal>DrakX</literal> " -"installer and b) find <literal>DrakX-installer-stage2</literal> and other " +"no more than that which is needed to (a) start the <literal>DrakX</literal> " +"installer and (b) find <literal>DrakX-installer-stage2</literal> and other " "packages that are needed to continue and complete the install." msgstr "" #. type: Content of: <section><section><section><para> -#: en/netInstall-intro.xml:36 +#: en/netInstall-intro.xml:37 msgid "" "The required source packages may be on a PC hard disk, a local drive, a " "local network or on the Internet." msgstr "" -#. type: Content of: <section><section><section><note><para> -#: en/netInstall-intro.xml:40 -msgid "Installation via encrypted wifi or bluetooth is not supported." -msgstr "" - #. type: Content of: <section><section><section><title> -#: en/netInstall-intro.xml:46 +#: en/netInstall-intro.xml:42 msgid "Availability" msgstr "Disponibilitat" #. type: Content of: <section><section><section><para> -#: en/netInstall-intro.xml:48 +#: en/netInstall-intro.xml:44 msgid "There a two versions of the NetInstall media:" msgstr "" #. type: Content of: <section><section><section><itemizedlist><listitem><para> -#: en/netInstall-intro.xml:52 +#: en/netInstall-intro.xml:48 msgid "" "<emphasis role=\"bold\">netinstall.iso</emphasis> For those who prefer not " "to use non-free software, this ISO contains only free software." msgstr "" #. type: Content of: <section><section><section><itemizedlist><listitem><para> -#: en/netInstall-intro.xml:58 +#: en/netInstall-intro.xml:54 msgid "" "<emphasis role=\"bold\">netinstall-nonfree.iso</emphasis> This ISO " "additionally includes proprietary device drivers, which may be required for " @@ -168,7 +163,7 @@ msgid "" msgstr "" #. type: Content of: <section><section><section><para> -#: en/netInstall-intro.xml:64 +#: en/netInstall-intro.xml:60 msgid "" "Both versions are available in the form of separate 32-bit and 64-bit ISO's. " "See here: <link xlink:href=\"https://www.mageia.org/downloads/\">https://www." @@ -176,12 +171,12 @@ msgid "" msgstr "" #. type: Content of: <section><section><section><title> -#: en/netInstall-intro.xml:70 +#: en/netInstall-intro.xml:66 msgid "Preparation" msgstr "Preparació" #. type: Content of: <section><section><section><para> -#: en/netInstall-intro.xml:72 +#: en/netInstall-intro.xml:68 msgid "" "After downloading the image, burn it to a CD/DVD or, if you prefer to put it " "on a USB stick, follow the instructions here: <link xlink:href=\"https://" @@ -191,26 +186,28 @@ msgid "" msgstr "" #. type: Content of: <section><section><title> -#: en/netInstall-intro.xml:79 +#: en/netInstall-intro.xml:75 msgid "Installation Stages" msgstr "" #. type: Content of: <section><section><para> -#: en/netInstall-intro.xml:81 +#: en/netInstall-intro.xml:77 msgid "The installation is carried out in two stages:" msgstr "" #. type: Content of: <section><section><itemizedlist><listitem><para> -#: en/netInstall-intro.xml:85 +#: en/netInstall-intro.xml:81 msgid "" "<emphasis role=\"bold\">Stage 1</emphasis> This is the pre-Installation " "stage. You will need to provide the method and details for accessing the " "medium containing the files to be used for the installation. If the method " -"involves a server, then the network connection will be activated." +"involves a server, then the network connection will be activated. This " +"network can be a WiFi connection with WEP or WPA2 encryption (though please " +"be mindful of the Warning below regarding keyboard input)." msgstr "" #. type: Content of: <section><section><itemizedlist><listitem><para> -#: en/netInstall-intro.xml:93 +#: en/netInstall-intro.xml:91 msgid "" "<emphasis role=\"bold\">Stage 2</emphasis> This is the actual Installation " "stage, which will automatically commence once a connection to the installer " @@ -218,7 +215,7 @@ msgid "" msgstr "" #. type: Content of: <section><section><note><para> -#: en/netInstall-intro.xml:100 +#: en/netInstall-intro.xml:98 msgid "" "During Stage 1, nothing will be written to your Hard Disk, so it is safe to " "quit at any point during Stage 1 if you wish. You can do so by pressing " @@ -227,7 +224,7 @@ msgid "" msgstr "" #. type: Content of: <section><section><tip><para> -#: en/netInstall-intro.xml:112 +#: en/netInstall-intro.xml:110 msgid "" "You can use <keycombo> <keycap>Alt</keycap> <keycap>F3</keycap> </keycombo> " "to read the logs and <keycombo> <keycap>Alt</keycap> <keycap>F1</keycap> </" @@ -235,14 +232,15 @@ msgid "" msgstr "" #. type: Content of: <section><section><warning><para> -#: en/netInstall-intro.xml:124 -msgid "" -"Unlike when installing from DVD or LiveCD, during the first part of the " -"installation (<emphasis role=\"bold\">Stage 1</emphasis>), you will be asked " -"to type things. During this stage, your keyboard will operate as per an " -"<link xlink:href=\"https://en.wikipedia.org/wiki/" -"Keyboard_layout#United_States\">American keyboard</link> layout. This can be " -"very confusing when you need to type names and paths." +#: en/netInstall-intro.xml:122 +msgid "" +"Unlike when installing from DVD or LiveCD, you will be asked to type things " +"during the first part of a Network installation (<emphasis role=\"bold" +"\">Stage 1</emphasis>). Throughout this stage, however, your keyboard will " +"operate as per an <link xlink:href=\"https://en.wikipedia.org/wiki/" +"Keyboard_layout#United_States\">American keyboard</link> layout. Please bear " +"this in mind to avoid confusion when entering things like names and paths " +"etc." msgstr "" #. type: Content of: <section><title> diff --git a/docs/docs/stable/bootiso/cs.po b/docs/docs/stable/bootiso/cs.po index 9cd991e0..560ccde2 100644 --- a/docs/docs/stable/bootiso/cs.po +++ b/docs/docs/stable/bootiso/cs.po @@ -14,7 +14,7 @@ msgid "" msgstr "" "Project-Id-Version: Mageia Boot ISO Help 6.0\n" "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n" -"POT-Creation-Date: 2019-01-18 19:11+0200\n" +"POT-Creation-Date: 2020-12-20 15:06+0200\n" "PO-Revision-Date: 2017-04-04 18:35+0000\n" "Last-Translator: Luděk Janča <joelp@email.cz>, 2020\n" "Language-Team: Czech (https://www.transifex.com/MageiaLinux/teams/9361/cs/)\n" @@ -96,29 +96,30 @@ msgid "Installing Mageia using a Tiny Boot Image" msgstr "Instalace Mageie s velmi malým instalačním obrazem" #. type: Content of: <section><title> -#: en/netInstall-intro.xml:11 +#: en/netInstall-intro.xml:12 msgid "Introduction" msgstr "Úvod" #. type: Content of: <section><section><title> -#: en/netInstall-intro.xml:14 +#: en/netInstall-intro.xml:15 msgid "NetInstall Media" msgstr "Média pro síťovou instalaci" #. type: Content of: <section><section><section><title> -#: en/netInstall-intro.xml:17 +#: en/netInstall-intro.xml:18 msgid "Description" msgstr "Popis" #. type: Content of: <section><section><section><para> -#: en/netInstall-intro.xml:19 +#: en/netInstall-intro.xml:20 msgid "These minimal ISO's contain:" msgstr "Tato malá ISO obsahují:" #. type: Content of: <section><section><section><itemizedlist><listitem><para> -#: en/netInstall-intro.xml:23 +#: en/netInstall-intro.xml:24 +#, fuzzy msgid "" -"less than 100 MB and are convenient if bandwidth is too low to download a " +"less than 120 MB and are convenient if bandwidth is too low to download a " "full DVD, or if you have a PC without a DVD drive or unable to boot from a " "USB stick." msgstr "" @@ -126,44 +127,39 @@ msgstr "" "pokud máte PC bez jednotky DVD nebo nelze zavést systém z USB disku." #. type: Content of: <section><section><section><itemizedlist><listitem><para> -#: en/netInstall-intro.xml:29 +#: en/netInstall-intro.xml:30 msgid "" -"no more than that which is needed to a) start the <literal>DrakX</literal> " -"installer and b) find <literal>DrakX-installer-stage2</literal> and other " +"no more than that which is needed to (a) start the <literal>DrakX</literal> " +"installer and (b) find <literal>DrakX-installer-stage2</literal> and other " "packages that are needed to continue and complete the install." msgstr "" #. type: Content of: <section><section><section><para> -#: en/netInstall-intro.xml:36 +#: en/netInstall-intro.xml:37 msgid "" "The required source packages may be on a PC hard disk, a local drive, a " "local network or on the Internet." msgstr "" -#. type: Content of: <section><section><section><note><para> -#: en/netInstall-intro.xml:40 -msgid "Installation via encrypted wifi or bluetooth is not supported." -msgstr "Instalace přes šifrovanou WiFi nebo Bluetooth není podporována." - #. type: Content of: <section><section><section><title> -#: en/netInstall-intro.xml:46 +#: en/netInstall-intro.xml:42 msgid "Availability" msgstr "Dostupnost" #. type: Content of: <section><section><section><para> -#: en/netInstall-intro.xml:48 +#: en/netInstall-intro.xml:44 msgid "There a two versions of the NetInstall media:" msgstr "Jsou zde dvě verze instalačního média NetInstall:" #. type: Content of: <section><section><section><itemizedlist><listitem><para> -#: en/netInstall-intro.xml:52 +#: en/netInstall-intro.xml:48 msgid "" "<emphasis role=\"bold\">netinstall.iso</emphasis> For those who prefer not " "to use non-free software, this ISO contains only free software." msgstr "" #. type: Content of: <section><section><section><itemizedlist><listitem><para> -#: en/netInstall-intro.xml:58 +#: en/netInstall-intro.xml:54 msgid "" "<emphasis role=\"bold\">netinstall-nonfree.iso</emphasis> This ISO " "additionally includes proprietary device drivers, which may be required for " @@ -171,7 +167,7 @@ msgid "" msgstr "" #. type: Content of: <section><section><section><para> -#: en/netInstall-intro.xml:64 +#: en/netInstall-intro.xml:60 msgid "" "Both versions are available in the form of separate 32-bit and 64-bit ISO's. " "See here: <link xlink:href=\"https://www.mageia.org/downloads/\">https://www." @@ -179,12 +175,12 @@ msgid "" msgstr "" #. type: Content of: <section><section><section><title> -#: en/netInstall-intro.xml:70 +#: en/netInstall-intro.xml:66 msgid "Preparation" msgstr "Příprava" #. type: Content of: <section><section><section><para> -#: en/netInstall-intro.xml:72 +#: en/netInstall-intro.xml:68 msgid "" "After downloading the image, burn it to a CD/DVD or, if you prefer to put it " "on a USB stick, follow the instructions here: <link xlink:href=\"https://" @@ -194,26 +190,28 @@ msgid "" msgstr "" #. type: Content of: <section><section><title> -#: en/netInstall-intro.xml:79 +#: en/netInstall-intro.xml:75 msgid "Installation Stages" msgstr "Fáze instalace" #. type: Content of: <section><section><para> -#: en/netInstall-intro.xml:81 +#: en/netInstall-intro.xml:77 msgid "The installation is carried out in two stages:" msgstr "Instalace se provede ve dvou fázích:" #. type: Content of: <section><section><itemizedlist><listitem><para> -#: en/netInstall-intro.xml:85 +#: en/netInstall-intro.xml:81 msgid "" "<emphasis role=\"bold\">Stage 1</emphasis> This is the pre-Installation " "stage. You will need to provide the method and details for accessing the " "medium containing the files to be used for the installation. If the method " -"involves a server, then the network connection will be activated." +"involves a server, then the network connection will be activated. This " +"network can be a WiFi connection with WEP or WPA2 encryption (though please " +"be mindful of the Warning below regarding keyboard input)." msgstr "" #. type: Content of: <section><section><itemizedlist><listitem><para> -#: en/netInstall-intro.xml:93 +#: en/netInstall-intro.xml:91 msgid "" "<emphasis role=\"bold\">Stage 2</emphasis> This is the actual Installation " "stage, which will automatically commence once a connection to the installer " @@ -221,7 +219,7 @@ msgid "" msgstr "" #. type: Content of: <section><section><note><para> -#: en/netInstall-intro.xml:100 +#: en/netInstall-intro.xml:98 msgid "" "During Stage 1, nothing will be written to your Hard Disk, so it is safe to " "quit at any point during Stage 1 if you wish. You can do so by pressing " @@ -233,7 +231,7 @@ msgstr "" "keycap> <keycap>Alt</keycap> <keycap>Del</keycap> </keycombo>." #. type: Content of: <section><section><tip><para> -#: en/netInstall-intro.xml:112 +#: en/netInstall-intro.xml:110 msgid "" "You can use <keycombo> <keycap>Alt</keycap> <keycap>F3</keycap> </keycombo> " "to read the logs and <keycombo> <keycap>Alt</keycap> <keycap>F1</keycap> </" @@ -244,14 +242,15 @@ msgstr "" "<keycap>F1</keycap> </keycombo> pro návrat do instalační obrazovky." #. type: Content of: <section><section><warning><para> -#: en/netInstall-intro.xml:124 +#: en/netInstall-intro.xml:122 msgid "" -"Unlike when installing from DVD or LiveCD, during the first part of the " -"installation (<emphasis role=\"bold\">Stage 1</emphasis>), you will be asked " -"to type things. During this stage, your keyboard will operate as per an " -"<link xlink:href=\"https://en.wikipedia.org/wiki/" -"Keyboard_layout#United_States\">American keyboard</link> layout. This can be " -"very confusing when you need to type names and paths." +"Unlike when installing from DVD or LiveCD, you will be asked to type things " +"during the first part of a Network installation (<emphasis role=\"bold" +"\">Stage 1</emphasis>). Throughout this stage, however, your keyboard will " +"operate as per an <link xlink:href=\"https://en.wikipedia.org/wiki/" +"Keyboard_layout#United_States\">American keyboard</link> layout. Please bear " +"this in mind to avoid confusion when entering things like names and paths " +"etc." msgstr "" #. type: Content of: <section><title> @@ -727,3 +726,6 @@ msgstr "" "Nikdo se nepotká se všemi instalačními obrazovkami, které vidíte v této " "příručce. Kterou obrazovku uvidíte, záleží na vašem vybavení počítače a na " "volbách, které učiníte během instalace." + +#~ msgid "Installation via encrypted wifi or bluetooth is not supported." +#~ msgstr "Instalace přes šifrovanou WiFi nebo Bluetooth není podporována." diff --git a/docs/docs/stable/bootiso/de.po b/docs/docs/stable/bootiso/de.po index 9463dc77..8789d537 100644 --- a/docs/docs/stable/bootiso/de.po +++ b/docs/docs/stable/bootiso/de.po @@ -15,7 +15,7 @@ msgid "" msgstr "" "Project-Id-Version: Mageia Boot ISO Help 6.0\n" "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n" -"POT-Creation-Date: 2019-01-18 19:11+0200\n" +"POT-Creation-Date: 2020-12-20 15:06+0200\n" "PO-Revision-Date: 2017-04-04 18:35+0000\n" "Last-Translator: psyca, 2019\n" "Language-Team: German (https://www.transifex.com/MageiaLinux/teams/9361/" @@ -101,29 +101,30 @@ msgid "Installing Mageia using a Tiny Boot Image" msgstr "Mageia mittels einem kleinem Boot-Image installieren" #. type: Content of: <section><title> -#: en/netInstall-intro.xml:11 +#: en/netInstall-intro.xml:12 msgid "Introduction" msgstr "Einleitung" #. type: Content of: <section><section><title> -#: en/netInstall-intro.xml:14 +#: en/netInstall-intro.xml:15 msgid "NetInstall Media" msgstr "NetInstall Medien" #. type: Content of: <section><section><section><title> -#: en/netInstall-intro.xml:17 +#: en/netInstall-intro.xml:18 msgid "Description" msgstr "Beschreibung" #. type: Content of: <section><section><section><para> -#: en/netInstall-intro.xml:19 +#: en/netInstall-intro.xml:20 msgid "These minimal ISO's contain:" msgstr "Diese minimalen ISOs enthalten:" #. type: Content of: <section><section><section><itemizedlist><listitem><para> -#: en/netInstall-intro.xml:23 +#: en/netInstall-intro.xml:24 +#, fuzzy msgid "" -"less than 100 MB and are convenient if bandwidth is too low to download a " +"less than 120 MB and are convenient if bandwidth is too low to download a " "full DVD, or if you have a PC without a DVD drive or unable to boot from a " "USB stick." msgstr "" @@ -132,10 +133,11 @@ msgstr "" "ohne ein DVD-Laufwerk haben oder nicht von einem USB-Stick booten können." #. type: Content of: <section><section><section><itemizedlist><listitem><para> -#: en/netInstall-intro.xml:29 +#: en/netInstall-intro.xml:30 +#, fuzzy msgid "" -"no more than that which is needed to a) start the <literal>DrakX</literal> " -"installer and b) find <literal>DrakX-installer-stage2</literal> and other " +"no more than that which is needed to (a) start the <literal>DrakX</literal> " +"installer and (b) find <literal>DrakX-installer-stage2</literal> and other " "packages that are needed to continue and complete the install." msgstr "" "nicht mehr, als was benötigt wird um a) den <literal>DrakX</literal> " @@ -144,7 +146,7 @@ msgstr "" "abzuschließen." #. type: Content of: <section><section><section><para> -#: en/netInstall-intro.xml:36 +#: en/netInstall-intro.xml:37 msgid "" "The required source packages may be on a PC hard disk, a local drive, a " "local network or on the Internet." @@ -152,24 +154,18 @@ msgstr "" "Die benötigten Quellpakete können sich auf einer PC Festplatte, einem " "lokalen Laufwerk, einem lokalen Netzwerk oder im Internet befinden." -#. type: Content of: <section><section><section><note><para> -#: en/netInstall-intro.xml:40 -msgid "Installation via encrypted wifi or bluetooth is not supported." -msgstr "" -"Installation über verschlüsseltes WLAN oder Bluetooth wird nicht unterstützt." - #. type: Content of: <section><section><section><title> -#: en/netInstall-intro.xml:46 +#: en/netInstall-intro.xml:42 msgid "Availability" msgstr "Verfügbarkeit" #. type: Content of: <section><section><section><para> -#: en/netInstall-intro.xml:48 +#: en/netInstall-intro.xml:44 msgid "There a two versions of the NetInstall media:" msgstr "Es gibt zwei Versionen der NetInstall Medien:" #. type: Content of: <section><section><section><itemizedlist><listitem><para> -#: en/netInstall-intro.xml:52 +#: en/netInstall-intro.xml:48 msgid "" "<emphasis role=\"bold\">netinstall.iso</emphasis> For those who prefer not " "to use non-free software, this ISO contains only free software." @@ -179,7 +175,7 @@ msgstr "" "Software." #. type: Content of: <section><section><section><itemizedlist><listitem><para> -#: en/netInstall-intro.xml:58 +#: en/netInstall-intro.xml:54 msgid "" "<emphasis role=\"bold\">netinstall-nonfree.iso</emphasis> This ISO " "additionally includes proprietary device drivers, which may be required for " @@ -190,7 +186,7 @@ msgstr "" "Netzwerkgerät, Festplattencontroller, etc., benötigt wird." #. type: Content of: <section><section><section><para> -#: en/netInstall-intro.xml:64 +#: en/netInstall-intro.xml:60 msgid "" "Both versions are available in the form of separate 32-bit and 64-bit ISO's. " "See here: <link xlink:href=\"https://www.mageia.org/downloads/\">https://www." @@ -201,12 +197,12 @@ msgstr "" "mageia.org/downloads/</link>" #. type: Content of: <section><section><section><title> -#: en/netInstall-intro.xml:70 +#: en/netInstall-intro.xml:66 msgid "Preparation" msgstr "Vorbereitung" #. type: Content of: <section><section><section><para> -#: en/netInstall-intro.xml:72 +#: en/netInstall-intro.xml:68 msgid "" "After downloading the image, burn it to a CD/DVD or, if you prefer to put it " "on a USB stick, follow the instructions here: <link xlink:href=\"https://" @@ -222,22 +218,25 @@ msgstr "" "de#Eine_Mageia_ISO_auf_ein_USB_Laufwerk_.C3.BCbertragen</link>" #. type: Content of: <section><section><title> -#: en/netInstall-intro.xml:79 +#: en/netInstall-intro.xml:75 msgid "Installation Stages" msgstr "Installationsphasen" #. type: Content of: <section><section><para> -#: en/netInstall-intro.xml:81 +#: en/netInstall-intro.xml:77 msgid "The installation is carried out in two stages:" msgstr "Die Installation wird in zwei Stufen durchgeführt:" #. type: Content of: <section><section><itemizedlist><listitem><para> -#: en/netInstall-intro.xml:85 +#: en/netInstall-intro.xml:81 +#, fuzzy msgid "" "<emphasis role=\"bold\">Stage 1</emphasis> This is the pre-Installation " "stage. You will need to provide the method and details for accessing the " "medium containing the files to be used for the installation. If the method " -"involves a server, then the network connection will be activated." +"involves a server, then the network connection will be activated. This " +"network can be a WiFi connection with WEP or WPA2 encryption (though please " +"be mindful of the Warning below regarding keyboard input)." msgstr "" "<emphasis role=\"bold\">Phase 1</emphasis> Dies ist die Phase vor der " "Installation. Hier müssen Sie die Methode und Details für den Zugriff auf " @@ -246,7 +245,7 @@ msgstr "" "Netzwerkverbindung aktiviert." #. type: Content of: <section><section><itemizedlist><listitem><para> -#: en/netInstall-intro.xml:93 +#: en/netInstall-intro.xml:91 msgid "" "<emphasis role=\"bold\">Stage 2</emphasis> This is the actual Installation " "stage, which will automatically commence once a connection to the installer " @@ -257,7 +256,7 @@ msgstr "" "Installationsdateien hergestellt wurde." #. type: Content of: <section><section><note><para> -#: en/netInstall-intro.xml:100 +#: en/netInstall-intro.xml:98 msgid "" "During Stage 1, nothing will be written to your Hard Disk, so it is safe to " "quit at any point during Stage 1 if you wish. You can do so by pressing " @@ -270,7 +269,7 @@ msgstr "" "keycap> <keycap>Alt</keycap> <keycap>Entf</keycap></keycombo> drücken." #. type: Content of: <section><section><tip><para> -#: en/netInstall-intro.xml:112 +#: en/netInstall-intro.xml:110 msgid "" "You can use <keycombo> <keycap>Alt</keycap> <keycap>F3</keycap> </keycombo> " "to read the logs and <keycombo> <keycap>Alt</keycap> <keycap>F1</keycap> </" @@ -282,14 +281,16 @@ msgstr "" "den Installationsbildschirm wechseln." #. type: Content of: <section><section><warning><para> -#: en/netInstall-intro.xml:124 +#: en/netInstall-intro.xml:122 +#, fuzzy msgid "" -"Unlike when installing from DVD or LiveCD, during the first part of the " -"installation (<emphasis role=\"bold\">Stage 1</emphasis>), you will be asked " -"to type things. During this stage, your keyboard will operate as per an " -"<link xlink:href=\"https://en.wikipedia.org/wiki/" -"Keyboard_layout#United_States\">American keyboard</link> layout. This can be " -"very confusing when you need to type names and paths." +"Unlike when installing from DVD or LiveCD, you will be asked to type things " +"during the first part of a Network installation (<emphasis role=\"bold" +"\">Stage 1</emphasis>). Throughout this stage, however, your keyboard will " +"operate as per an <link xlink:href=\"https://en.wikipedia.org/wiki/" +"Keyboard_layout#United_States\">American keyboard</link> layout. Please bear " +"this in mind to avoid confusion when entering things like names and paths " +"etc." msgstr "" "Anders als bei der Installation von DVD oder LiveCD werden Sie während dem " "ersten Teil der Installation (<emphasis role=\"bold\">Phase 1</emphasis>), " @@ -860,3 +861,8 @@ msgstr "" "Umständen von dem ab, was Sie auf Ihrem Bildschirm sehen. Das ist ganz " "normal, denn was Ihnen angezeigt wird, ist abhängig von Ihrer Hardware und " "von den Entscheidungen, die Sie während der Installation treffen." + +#~ msgid "Installation via encrypted wifi or bluetooth is not supported." +#~ msgstr "" +#~ "Installation über verschlüsseltes WLAN oder Bluetooth wird nicht " +#~ "unterstützt." diff --git a/docs/docs/stable/bootiso/el.po b/docs/docs/stable/bootiso/el.po index daa8ab65..7b9132ea 100644 --- a/docs/docs/stable/bootiso/el.po +++ b/docs/docs/stable/bootiso/el.po @@ -14,7 +14,7 @@ msgid "" msgstr "" "Project-Id-Version: Mageia Boot ISO Help 6.0\n" "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n" -"POT-Creation-Date: 2019-01-18 19:11+0200\n" +"POT-Creation-Date: 2020-12-20 15:06+0200\n" "PO-Revision-Date: 2017-04-04 18:35+0000\n" "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>, 2019\n" "Language-Team: Greek (https://www.transifex.com/MageiaLinux/teams/9361/el/)\n" @@ -99,29 +99,30 @@ msgid "Installing Mageia using a Tiny Boot Image" msgstr "Εγκατάσταση της Mageia μέσω μιας μικροσκοπικής εικόνας εκκίνησης" #. type: Content of: <section><title> -#: en/netInstall-intro.xml:11 +#: en/netInstall-intro.xml:12 msgid "Introduction" msgstr "Εισαγωγή" #. type: Content of: <section><section><title> -#: en/netInstall-intro.xml:14 +#: en/netInstall-intro.xml:15 msgid "NetInstall Media" msgstr "Μέσο NetInstall" #. type: Content of: <section><section><section><title> -#: en/netInstall-intro.xml:17 +#: en/netInstall-intro.xml:18 msgid "Description" msgstr "Περιγραφή" #. type: Content of: <section><section><section><para> -#: en/netInstall-intro.xml:19 +#: en/netInstall-intro.xml:20 msgid "These minimal ISO's contain:" msgstr "Τα ISO ελάχιστης εγκατάστασης περιέχουν:" #. type: Content of: <section><section><section><itemizedlist><listitem><para> -#: en/netInstall-intro.xml:23 +#: en/netInstall-intro.xml:24 +#, fuzzy msgid "" -"less than 100 MB and are convenient if bandwidth is too low to download a " +"less than 120 MB and are convenient if bandwidth is too low to download a " "full DVD, or if you have a PC without a DVD drive or unable to boot from a " "USB stick." msgstr "" @@ -130,10 +131,11 @@ msgstr "" "όταν ο υπολογιστής δεν υποστηρίζει την εκκίνηση από ένα κλειδί USB." #. type: Content of: <section><section><section><itemizedlist><listitem><para> -#: en/netInstall-intro.xml:29 +#: en/netInstall-intro.xml:30 +#, fuzzy msgid "" -"no more than that which is needed to a) start the <literal>DrakX</literal> " -"installer and b) find <literal>DrakX-installer-stage2</literal> and other " +"no more than that which is needed to (a) start the <literal>DrakX</literal> " +"installer and (b) find <literal>DrakX-installer-stage2</literal> and other " "packages that are needed to continue and complete the install." msgstr "" "όχι περισσότερο από τα απαραίτητα για α)την εκκίνηση του εγκαταστάτη " @@ -142,7 +144,7 @@ msgstr "" "αποπεράτωση της εγκατάστασης." #. type: Content of: <section><section><section><para> -#: en/netInstall-intro.xml:36 +#: en/netInstall-intro.xml:37 msgid "" "The required source packages may be on a PC hard disk, a local drive, a " "local network or on the Internet." @@ -150,24 +152,18 @@ msgstr "" "Το απαιτούμενο πηγαίο πακέτο μπορεί να βρίσκεται σε έναν σκληρό δίσκο του " "υπολογιστή, έναν τοπικό δίσκο, στο τοπικό δίκτυο ή στο διαδίκτυο." -#. type: Content of: <section><section><section><note><para> -#: en/netInstall-intro.xml:40 -msgid "Installation via encrypted wifi or bluetooth is not supported." -msgstr "" -"Η εγκατάσταση μέσω κρυπτογραφημένου wifi ή bluetooth δεν υποστηρίζεται." - #. type: Content of: <section><section><section><title> -#: en/netInstall-intro.xml:46 +#: en/netInstall-intro.xml:42 msgid "Availability" msgstr "Διαθεσιμότητα" #. type: Content of: <section><section><section><para> -#: en/netInstall-intro.xml:48 +#: en/netInstall-intro.xml:44 msgid "There a two versions of the NetInstall media:" msgstr "Υπάρχουν δυο εκδόσεις του μέσου Netinstall:" #. type: Content of: <section><section><section><itemizedlist><listitem><para> -#: en/netInstall-intro.xml:52 +#: en/netInstall-intro.xml:48 msgid "" "<emphasis role=\"bold\">netinstall.iso</emphasis> For those who prefer not " "to use non-free software, this ISO contains only free software." @@ -177,7 +173,7 @@ msgstr "" "ιδιόκτητο λογισμικό." #. type: Content of: <section><section><section><itemizedlist><listitem><para> -#: en/netInstall-intro.xml:58 +#: en/netInstall-intro.xml:54 msgid "" "<emphasis role=\"bold\">netinstall-nonfree.iso</emphasis> This ISO " "additionally includes proprietary device drivers, which may be required for " @@ -188,7 +184,7 @@ msgstr "" "περιφερειακά δικτύου, ελεγκτές δίσκων, κλπ." #. type: Content of: <section><section><section><para> -#: en/netInstall-intro.xml:64 +#: en/netInstall-intro.xml:60 msgid "" "Both versions are available in the form of separate 32-bit and 64-bit ISO's. " "See here: <link xlink:href=\"https://www.mageia.org/downloads/\">https://www." @@ -199,12 +195,12 @@ msgstr "" "www.mageia.org/downloads/</link>" #. type: Content of: <section><section><section><title> -#: en/netInstall-intro.xml:70 +#: en/netInstall-intro.xml:66 msgid "Preparation" msgstr "Προετοιμασία" #. type: Content of: <section><section><section><para> -#: en/netInstall-intro.xml:72 +#: en/netInstall-intro.xml:68 msgid "" "After downloading the image, burn it to a CD/DVD or, if you prefer to put it " "on a USB stick, follow the instructions here: <link xlink:href=\"https://" @@ -219,22 +215,25 @@ msgstr "" "org/en/Installation_Media#Dump_Mageia_ISOs_on_an_USB_stick</link>" #. type: Content of: <section><section><title> -#: en/netInstall-intro.xml:79 +#: en/netInstall-intro.xml:75 msgid "Installation Stages" msgstr "Τα στάδια της εγκατάστασης" #. type: Content of: <section><section><para> -#: en/netInstall-intro.xml:81 +#: en/netInstall-intro.xml:77 msgid "The installation is carried out in two stages:" msgstr "Η εγκατάσταση πραγματοποιείται σε δυο στάδια:" #. type: Content of: <section><section><itemizedlist><listitem><para> -#: en/netInstall-intro.xml:85 +#: en/netInstall-intro.xml:81 +#, fuzzy msgid "" "<emphasis role=\"bold\">Stage 1</emphasis> This is the pre-Installation " "stage. You will need to provide the method and details for accessing the " "medium containing the files to be used for the installation. If the method " -"involves a server, then the network connection will be activated." +"involves a server, then the network connection will be activated. This " +"network can be a WiFi connection with WEP or WPA2 encryption (though please " +"be mindful of the Warning below regarding keyboard input)." msgstr "" "<emphasis role=\"bold\">1ο στάδιο</emphasis> Το στάδιο της προεγκατάστασης. " "Θα πρέπει να παράσχετε την μέθοδο και τις λεπτομέρειες για την πρόσβαση στο " @@ -242,7 +241,7 @@ msgstr "" "απαιτείται η χρήση ενός διακομιστή, τότε θα ενεργοποιηθεί η δικτυακή σύνδεση." #. type: Content of: <section><section><itemizedlist><listitem><para> -#: en/netInstall-intro.xml:93 +#: en/netInstall-intro.xml:91 msgid "" "<emphasis role=\"bold\">Stage 2</emphasis> This is the actual Installation " "stage, which will automatically commence once a connection to the installer " @@ -253,7 +252,7 @@ msgstr "" "αρχεία της εγκατάστασης." #. type: Content of: <section><section><note><para> -#: en/netInstall-intro.xml:100 +#: en/netInstall-intro.xml:98 msgid "" "During Stage 1, nothing will be written to your Hard Disk, so it is safe to " "quit at any point during Stage 1 if you wish. You can do so by pressing " @@ -266,7 +265,7 @@ msgstr "" "<keycap>Del</keycap> </keycombo>." #. type: Content of: <section><section><tip><para> -#: en/netInstall-intro.xml:112 +#: en/netInstall-intro.xml:110 msgid "" "You can use <keycombo> <keycap>Alt</keycap> <keycap>F3</keycap> </keycombo> " "to read the logs and <keycombo> <keycap>Alt</keycap> <keycap>F1</keycap> </" @@ -278,14 +277,16 @@ msgstr "" "επιστροφή στην οθόνη εγκατάστασης." #. type: Content of: <section><section><warning><para> -#: en/netInstall-intro.xml:124 +#: en/netInstall-intro.xml:122 +#, fuzzy msgid "" -"Unlike when installing from DVD or LiveCD, during the first part of the " -"installation (<emphasis role=\"bold\">Stage 1</emphasis>), you will be asked " -"to type things. During this stage, your keyboard will operate as per an " -"<link xlink:href=\"https://en.wikipedia.org/wiki/" -"Keyboard_layout#United_States\">American keyboard</link> layout. This can be " -"very confusing when you need to type names and paths." +"Unlike when installing from DVD or LiveCD, you will be asked to type things " +"during the first part of a Network installation (<emphasis role=\"bold" +"\">Stage 1</emphasis>). Throughout this stage, however, your keyboard will " +"operate as per an <link xlink:href=\"https://en.wikipedia.org/wiki/" +"Keyboard_layout#United_States\">American keyboard</link> layout. Please bear " +"this in mind to avoid confusion when entering things like names and paths " +"etc." msgstr "" "Εν αντιθέσει με μια εγκατάσταση μέσω ενός DVD ή ενός ζωντανού DVD, κατά το " "πρώτο μέρος της εγκατάστασης, το λεγόμενο <emphasis role=\"bold\">1ο στάδιο</" @@ -843,3 +844,7 @@ msgstr "" "Κανένας δεν βλέπει όλες τις οθόνες του εγκαταστάτη που υπάρχουν σε αυτό το " "εγχειρίδιο. Για το ποιες οθόνες θα βλέπετε, εξαρτάται από το υλικό σας και " "τις επιλογές που κάνετε κατά την εγκατάσταση." + +#~ msgid "Installation via encrypted wifi or bluetooth is not supported." +#~ msgstr "" +#~ "Η εγκατάσταση μέσω κρυπτογραφημένου wifi ή bluetooth δεν υποστηρίζεται." diff --git a/docs/docs/stable/bootiso/en/netInstall-intro.xml b/docs/docs/stable/bootiso/en/netInstall-intro.xml index 2e3c6f02..89d844ad 100644 --- a/docs/docs/stable/bootiso/en/netInstall-intro.xml +++ b/docs/docs/stable/bootiso/en/netInstall-intro.xml @@ -7,6 +7,7 @@ xmlns:html="http://www.w3.org/1999/xhtml" xmlns:db="http://docbook.org/ns/docbook"> <!-- 2018/05/18 apb: Created this xml, along with netInstall-stage1.xml and netInstall-stage2.xml to replace the previously single xml for NetInstall. --> + <!-- 2020/12/18 apb: (1)Updated: ISO size now less than 120 MB. (2)Updated to include WPA encryption and removed mention of Bluetooth. (3)Tweaked wording regarding US keyboard and highlighted this in para about WiFi encryption. --> <title>Introduction @@ -20,14 +21,14 @@ - less than 100 MB and are convenient if bandwidth is too low to + less than 120 MB and are convenient if bandwidth is too low to download a full DVD, or if you have a PC without a DVD drive or unable to boot from a USB stick. - no more than that which is needed to a) start the - DrakX installer and b) find + no more than that which is needed to (a) start the + DrakX installer and (b) find DrakX-installer-stage2 and other packages that are needed to continue and complete the install. @@ -35,11 +36,6 @@ The required source packages may be on a PC hard disk, a local drive, a local network or on the Internet. - - - Installation via encrypted wifi or bluetooth is not - supported. -
@@ -86,7 +82,9 @@ pre-Installation stage. You will need to provide the method and details for accessing the medium containing the files to be used for the installation. If the method involves a server, then the network - connection will be activated. + connection will be activated. This network can be a WiFi connection + with WEP or WPA2 encryption (though please be mindful of the Warning + below regarding keyboard input). @@ -121,13 +119,13 @@ - Unlike when installing from DVD or LiveCD, during the first part - of the installation (Stage 1), you will - be asked to type things. During this stage, your keyboard will operate - as per an Unlike when installing from DVD or LiveCD, you will be asked to + type things during the first part of a Network installation (Stage 1). Throughout this stage, however, your + keyboard will operate as per an American - keyboard layout. This can be very confusing when you need to type - names and paths. + keyboard layout. Please bear this in mind to avoid confusion when + entering things like names and paths etc.
diff --git a/docs/docs/stable/bootiso/eo.po b/docs/docs/stable/bootiso/eo.po index 526a0a0f..5c57b327 100644 --- a/docs/docs/stable/bootiso/eo.po +++ b/docs/docs/stable/bootiso/eo.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: Mageia Boot ISO Help 6.0\n" "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n" -"POT-Creation-Date: 2019-01-18 19:11+0200\n" +"POT-Creation-Date: 2020-12-20 15:06+0200\n" "PO-Revision-Date: 2017-04-04 18:35+0000\n" "Last-Translator: Yuri Chornoivan , 2019\n" "Language-Team: Esperanto (https://www.transifex.com/MageiaLinux/teams/9361/" @@ -93,72 +93,67 @@ msgid "Installing Mageia using a Tiny Boot Image" msgstr "" #. type: Content of:
-#: en/netInstall-intro.xml:11 +#: en/netInstall-intro.xml:12 msgid "Introduction" msgstr "Enkonduko" #. type: Content of: <section><section><title> -#: en/netInstall-intro.xml:14 +#: en/netInstall-intro.xml:15 msgid "NetInstall Media" msgstr "" #. type: Content of: <section><section><section><title> -#: en/netInstall-intro.xml:17 +#: en/netInstall-intro.xml:18 msgid "Description" msgstr "Priskribo" #. type: Content of: <section><section><section><para> -#: en/netInstall-intro.xml:19 +#: en/netInstall-intro.xml:20 msgid "These minimal ISO's contain:" msgstr "" #. type: Content of: <section><section><section><itemizedlist><listitem><para> -#: en/netInstall-intro.xml:23 +#: en/netInstall-intro.xml:24 msgid "" -"less than 100 MB and are convenient if bandwidth is too low to download a " +"less than 120 MB and are convenient if bandwidth is too low to download a " "full DVD, or if you have a PC without a DVD drive or unable to boot from a " "USB stick." msgstr "" #. type: Content of: <section><section><section><itemizedlist><listitem><para> -#: en/netInstall-intro.xml:29 +#: en/netInstall-intro.xml:30 msgid "" -"no more than that which is needed to a) start the <literal>DrakX</literal> " -"installer and b) find <literal>DrakX-installer-stage2</literal> and other " +"no more than that which is needed to (a) start the <literal>DrakX</literal> " +"installer and (b) find <literal>DrakX-installer-stage2</literal> and other " "packages that are needed to continue and complete the install." msgstr "" #. type: Content of: <section><section><section><para> -#: en/netInstall-intro.xml:36 +#: en/netInstall-intro.xml:37 msgid "" "The required source packages may be on a PC hard disk, a local drive, a " "local network or on the Internet." msgstr "" -#. type: Content of: <section><section><section><note><para> -#: en/netInstall-intro.xml:40 -msgid "Installation via encrypted wifi or bluetooth is not supported." -msgstr "" - #. type: Content of: <section><section><section><title> -#: en/netInstall-intro.xml:46 +#: en/netInstall-intro.xml:42 msgid "Availability" msgstr "" #. type: Content of: <section><section><section><para> -#: en/netInstall-intro.xml:48 +#: en/netInstall-intro.xml:44 msgid "There a two versions of the NetInstall media:" msgstr "" #. type: Content of: <section><section><section><itemizedlist><listitem><para> -#: en/netInstall-intro.xml:52 +#: en/netInstall-intro.xml:48 msgid "" "<emphasis role=\"bold\">netinstall.iso</emphasis> For those who prefer not " "to use non-free software, this ISO contains only free software." msgstr "" #. type: Content of: <section><section><section><itemizedlist><listitem><para> -#: en/netInstall-intro.xml:58 +#: en/netInstall-intro.xml:54 msgid "" "<emphasis role=\"bold\">netinstall-nonfree.iso</emphasis> This ISO " "additionally includes proprietary device drivers, which may be required for " @@ -166,7 +161,7 @@ msgid "" msgstr "" #. type: Content of: <section><section><section><para> -#: en/netInstall-intro.xml:64 +#: en/netInstall-intro.xml:60 msgid "" "Both versions are available in the form of separate 32-bit and 64-bit ISO's. " "See here: <link xlink:href=\"https://www.mageia.org/downloads/\">https://www." @@ -174,12 +169,12 @@ msgid "" msgstr "" #. type: Content of: <section><section><section><title> -#: en/netInstall-intro.xml:70 +#: en/netInstall-intro.xml:66 msgid "Preparation" msgstr "" #. type: Content of: <section><section><section><para> -#: en/netInstall-intro.xml:72 +#: en/netInstall-intro.xml:68 msgid "" "After downloading the image, burn it to a CD/DVD or, if you prefer to put it " "on a USB stick, follow the instructions here: <link xlink:href=\"https://" @@ -189,26 +184,28 @@ msgid "" msgstr "" #. type: Content of: <section><section><title> -#: en/netInstall-intro.xml:79 +#: en/netInstall-intro.xml:75 msgid "Installation Stages" msgstr "" #. type: Content of: <section><section><para> -#: en/netInstall-intro.xml:81 +#: en/netInstall-intro.xml:77 msgid "The installation is carried out in two stages:" msgstr "" #. type: Content of: <section><section><itemizedlist><listitem><para> -#: en/netInstall-intro.xml:85 +#: en/netInstall-intro.xml:81 msgid "" "<emphasis role=\"bold\">Stage 1</emphasis> This is the pre-Installation " "stage. You will need to provide the method and details for accessing the " "medium containing the files to be used for the installation. If the method " -"involves a server, then the network connection will be activated." +"involves a server, then the network connection will be activated. This " +"network can be a WiFi connection with WEP or WPA2 encryption (though please " +"be mindful of the Warning below regarding keyboard input)." msgstr "" #. type: Content of: <section><section><itemizedlist><listitem><para> -#: en/netInstall-intro.xml:93 +#: en/netInstall-intro.xml:91 msgid "" "<emphasis role=\"bold\">Stage 2</emphasis> This is the actual Installation " "stage, which will automatically commence once a connection to the installer " @@ -216,7 +213,7 @@ msgid "" msgstr "" #. type: Content of: <section><section><note><para> -#: en/netInstall-intro.xml:100 +#: en/netInstall-intro.xml:98 msgid "" "During Stage 1, nothing will be written to your Hard Disk, so it is safe to " "quit at any point during Stage 1 if you wish. You can do so by pressing " @@ -225,7 +222,7 @@ msgid "" msgstr "" #. type: Content of: <section><section><tip><para> -#: en/netInstall-intro.xml:112 +#: en/netInstall-intro.xml:110 msgid "" "You can use <keycombo> <keycap>Alt</keycap> <keycap>F3</keycap> </keycombo> " "to read the logs and <keycombo> <keycap>Alt</keycap> <keycap>F1</keycap> </" @@ -233,14 +230,15 @@ msgid "" msgstr "" #. type: Content of: <section><section><warning><para> -#: en/netInstall-intro.xml:124 -msgid "" -"Unlike when installing from DVD or LiveCD, during the first part of the " -"installation (<emphasis role=\"bold\">Stage 1</emphasis>), you will be asked " -"to type things. During this stage, your keyboard will operate as per an " -"<link xlink:href=\"https://en.wikipedia.org/wiki/" -"Keyboard_layout#United_States\">American keyboard</link> layout. This can be " -"very confusing when you need to type names and paths." +#: en/netInstall-intro.xml:122 +msgid "" +"Unlike when installing from DVD or LiveCD, you will be asked to type things " +"during the first part of a Network installation (<emphasis role=\"bold" +"\">Stage 1</emphasis>). Throughout this stage, however, your keyboard will " +"operate as per an <link xlink:href=\"https://en.wikipedia.org/wiki/" +"Keyboard_layout#United_States\">American keyboard</link> layout. Please bear " +"this in mind to avoid confusion when entering things like names and paths " +"etc." msgstr "" #. type: Content of: <section><title> diff --git a/docs/docs/stable/bootiso/es.po b/docs/docs/stable/bootiso/es.po index eceae240..e468a534 100644 --- a/docs/docs/stable/bootiso/es.po +++ b/docs/docs/stable/bootiso/es.po @@ -15,7 +15,7 @@ msgid "" msgstr "" "Project-Id-Version: Mageia Boot ISO Help 6.0\n" "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n" -"POT-Creation-Date: 2019-01-18 19:11+0200\n" +"POT-Creation-Date: 2020-12-20 15:06+0200\n" "PO-Revision-Date: 2017-04-04 18:35+0000\n" "Last-Translator: José Alberto Valle Cid <j.alberto.vc@gmail.com>, 2020\n" "Language-Team: Spanish (https://www.transifex.com/MageiaLinux/teams/9361/" @@ -100,29 +100,30 @@ msgid "Installing Mageia using a Tiny Boot Image" msgstr "Instalando Mageia usando una imagen mínima" #. type: Content of: <section><title> -#: en/netInstall-intro.xml:11 +#: en/netInstall-intro.xml:12 msgid "Introduction" msgstr "Introducción" #. type: Content of: <section><section><title> -#: en/netInstall-intro.xml:14 +#: en/netInstall-intro.xml:15 msgid "NetInstall Media" msgstr "Instalación por internet" #. type: Content of: <section><section><section><title> -#: en/netInstall-intro.xml:17 +#: en/netInstall-intro.xml:18 msgid "Description" msgstr "Descripción" #. type: Content of: <section><section><section><para> -#: en/netInstall-intro.xml:19 +#: en/netInstall-intro.xml:20 msgid "These minimal ISO's contain:" msgstr "Estas pequeñas ISOs contienen:" #. type: Content of: <section><section><section><itemizedlist><listitem><para> -#: en/netInstall-intro.xml:23 +#: en/netInstall-intro.xml:24 +#, fuzzy msgid "" -"less than 100 MB and are convenient if bandwidth is too low to download a " +"less than 120 MB and are convenient if bandwidth is too low to download a " "full DVD, or if you have a PC without a DVD drive or unable to boot from a " "USB stick." msgstr "" @@ -131,10 +132,11 @@ msgstr "" "no es capaz de arrancar desde un memoria USB." #. type: Content of: <section><section><section><itemizedlist><listitem><para> -#: en/netInstall-intro.xml:29 +#: en/netInstall-intro.xml:30 +#, fuzzy msgid "" -"no more than that which is needed to a) start the <literal>DrakX</literal> " -"installer and b) find <literal>DrakX-installer-stage2</literal> and other " +"no more than that which is needed to (a) start the <literal>DrakX</literal> " +"installer and (b) find <literal>DrakX-installer-stage2</literal> and other " "packages that are needed to continue and complete the install." msgstr "" "no más de lo necesario para a) iniciar el instalador <literal>DrakX</" @@ -142,7 +144,7 @@ msgstr "" "paquetes necesarios para continuar y completar la instalación." #. type: Content of: <section><section><section><para> -#: en/netInstall-intro.xml:36 +#: en/netInstall-intro.xml:37 msgid "" "The required source packages may be on a PC hard disk, a local drive, a " "local network or on the Internet." @@ -150,23 +152,18 @@ msgstr "" "Las fuentes de los paquetes necesarios pueden estar en el disco duro de un " "PC, un disco local, una red local o en internet." -#. type: Content of: <section><section><section><note><para> -#: en/netInstall-intro.xml:40 -msgid "Installation via encrypted wifi or bluetooth is not supported." -msgstr "No está soportada la instalación vía wifi encriptada o bluetooth." - #. type: Content of: <section><section><section><title> -#: en/netInstall-intro.xml:46 +#: en/netInstall-intro.xml:42 msgid "Availability" msgstr "Disponibilidad" #. type: Content of: <section><section><section><para> -#: en/netInstall-intro.xml:48 +#: en/netInstall-intro.xml:44 msgid "There a two versions of the NetInstall media:" msgstr "Hay dos versiones:" #. type: Content of: <section><section><section><itemizedlist><listitem><para> -#: en/netInstall-intro.xml:52 +#: en/netInstall-intro.xml:48 msgid "" "<emphasis role=\"bold\">netinstall.iso</emphasis> For those who prefer not " "to use non-free software, this ISO contains only free software." @@ -175,7 +172,7 @@ msgstr "" "prefieren no usar software no libre, esta ISO solo contiene software libre." #. type: Content of: <section><section><section><itemizedlist><listitem><para> -#: en/netInstall-intro.xml:58 +#: en/netInstall-intro.xml:54 msgid "" "<emphasis role=\"bold\">netinstall-nonfree.iso</emphasis> This ISO " "additionally includes proprietary device drivers, which may be required for " @@ -186,7 +183,7 @@ msgstr "" "de red, controladora de disco, etc." #. type: Content of: <section><section><section><para> -#: en/netInstall-intro.xml:64 +#: en/netInstall-intro.xml:60 msgid "" "Both versions are available in the form of separate 32-bit and 64-bit ISO's. " "See here: <link xlink:href=\"https://www.mageia.org/downloads/\">https://www." @@ -197,12 +194,12 @@ msgstr "" "org/downloads/</link>" #. type: Content of: <section><section><section><title> -#: en/netInstall-intro.xml:70 +#: en/netInstall-intro.xml:66 msgid "Preparation" msgstr "Preparación" #. type: Content of: <section><section><section><para> -#: en/netInstall-intro.xml:72 +#: en/netInstall-intro.xml:68 msgid "" "After downloading the image, burn it to a CD/DVD or, if you prefer to put it " "on a USB stick, follow the instructions here: <link xlink:href=\"https://" @@ -218,22 +215,25 @@ msgstr "" "link>" #. type: Content of: <section><section><title> -#: en/netInstall-intro.xml:79 +#: en/netInstall-intro.xml:75 msgid "Installation Stages" msgstr "Etapas de la instalación" #. type: Content of: <section><section><para> -#: en/netInstall-intro.xml:81 +#: en/netInstall-intro.xml:77 msgid "The installation is carried out in two stages:" msgstr "La instalación se lleva a cabo en dos etapas:" #. type: Content of: <section><section><itemizedlist><listitem><para> -#: en/netInstall-intro.xml:85 +#: en/netInstall-intro.xml:81 +#, fuzzy msgid "" "<emphasis role=\"bold\">Stage 1</emphasis> This is the pre-Installation " "stage. You will need to provide the method and details for accessing the " "medium containing the files to be used for the installation. If the method " -"involves a server, then the network connection will be activated." +"involves a server, then the network connection will be activated. This " +"network can be a WiFi connection with WEP or WPA2 encryption (though please " +"be mindful of the Warning below regarding keyboard input)." msgstr "" "<emphasis role=\"bold\">Etapa 1</emphasis> Es la preinstalación. Necesitará " "conseguir un medio de instalación (memoria USB/DVD/por internet, etc) que " @@ -241,7 +241,7 @@ msgstr "" "un servidor, entonces la conexión a internet se activará." #. type: Content of: <section><section><itemizedlist><listitem><para> -#: en/netInstall-intro.xml:93 +#: en/netInstall-intro.xml:91 msgid "" "<emphasis role=\"bold\">Stage 2</emphasis> This is the actual Installation " "stage, which will automatically commence once a connection to the installer " @@ -252,7 +252,7 @@ msgstr "" "medio escogido. " #. type: Content of: <section><section><note><para> -#: en/netInstall-intro.xml:100 +#: en/netInstall-intro.xml:98 msgid "" "During Stage 1, nothing will be written to your Hard Disk, so it is safe to " "quit at any point during Stage 1 if you wish. You can do so by pressing " @@ -265,7 +265,7 @@ msgstr "" "keycombo>." #. type: Content of: <section><section><tip><para> -#: en/netInstall-intro.xml:112 +#: en/netInstall-intro.xml:110 msgid "" "You can use <keycombo> <keycap>Alt</keycap> <keycap>F3</keycap> </keycombo> " "to read the logs and <keycombo> <keycap>Alt</keycap> <keycap>F1</keycap> </" @@ -276,14 +276,16 @@ msgstr "" "keycap> </keycombo> para volver a la pantalla del instalador." #. type: Content of: <section><section><warning><para> -#: en/netInstall-intro.xml:124 +#: en/netInstall-intro.xml:122 +#, fuzzy msgid "" -"Unlike when installing from DVD or LiveCD, during the first part of the " -"installation (<emphasis role=\"bold\">Stage 1</emphasis>), you will be asked " -"to type things. During this stage, your keyboard will operate as per an " -"<link xlink:href=\"https://en.wikipedia.org/wiki/" -"Keyboard_layout#United_States\">American keyboard</link> layout. This can be " -"very confusing when you need to type names and paths." +"Unlike when installing from DVD or LiveCD, you will be asked to type things " +"during the first part of a Network installation (<emphasis role=\"bold" +"\">Stage 1</emphasis>). Throughout this stage, however, your keyboard will " +"operate as per an <link xlink:href=\"https://en.wikipedia.org/wiki/" +"Keyboard_layout#United_States\">American keyboard</link> layout. Please bear " +"this in mind to avoid confusion when entering things like names and paths " +"etc." msgstr "" "Al contrario de cuando se instala usando un DVD o un LiveCD, durante la " "<emphasis role=\"bold\">Etapa 1</emphasis> de la instalación, se le pedirá " @@ -835,3 +837,6 @@ msgid "" msgstr "" "Nadie verá las imágenes que puede ver en este manual. Las imágenes que verá " "dependerán de su hardware y las decisiones que tomó durante la instalación." + +#~ msgid "Installation via encrypted wifi or bluetooth is not supported." +#~ msgstr "No está soportada la instalación vía wifi encriptada o bluetooth." diff --git a/docs/docs/stable/bootiso/et.po b/docs/docs/stable/bootiso/et.po index 1423c9b6..9dd8ffdc 100644 --- a/docs/docs/stable/bootiso/et.po +++ b/docs/docs/stable/bootiso/et.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: Mageia Boot ISO Help 6.0\n" "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n" -"POT-Creation-Date: 2019-01-18 19:11+0200\n" +"POT-Creation-Date: 2020-12-20 15:06+0200\n" "PO-Revision-Date: 2017-04-04 18:35+0000\n" "Last-Translator: Marek Laane <qiilaq69@gmail.com>, 2019\n" "Language-Team: Estonian (https://www.transifex.com/MageiaLinux/teams/9361/" @@ -98,29 +98,30 @@ msgid "Installing Mageia using a Tiny Boot Image" msgstr "Mageia paigaldamine väikese alglaadimistõmmise abil" #. type: Content of: <section><title> -#: en/netInstall-intro.xml:11 +#: en/netInstall-intro.xml:12 msgid "Introduction" msgstr "Sissejuhatus" #. type: Content of: <section><section><title> -#: en/netInstall-intro.xml:14 +#: en/netInstall-intro.xml:15 msgid "NetInstall Media" msgstr "Võrgupaigalduse andmekandjad" #. type: Content of: <section><section><section><title> -#: en/netInstall-intro.xml:17 +#: en/netInstall-intro.xml:18 msgid "Description" msgstr "Kirjeldus" #. type: Content of: <section><section><section><para> -#: en/netInstall-intro.xml:19 +#: en/netInstall-intro.xml:20 msgid "These minimal ISO's contain:" msgstr "Need minimaalse mahuga ISO-tõmmised sisaldavad:" #. type: Content of: <section><section><section><itemizedlist><listitem><para> -#: en/netInstall-intro.xml:23 +#: en/netInstall-intro.xml:24 +#, fuzzy msgid "" -"less than 100 MB and are convenient if bandwidth is too low to download a " +"less than 120 MB and are convenient if bandwidth is too low to download a " "full DVD, or if you have a PC without a DVD drive or unable to boot from a " "USB stick." msgstr "" @@ -129,10 +130,11 @@ msgstr "" "käivitada USB-pulga pealt." #. type: Content of: <section><section><section><itemizedlist><listitem><para> -#: en/netInstall-intro.xml:29 +#: en/netInstall-intro.xml:30 +#, fuzzy msgid "" -"no more than that which is needed to a) start the <literal>DrakX</literal> " -"installer and b) find <literal>DrakX-installer-stage2</literal> and other " +"no more than that which is needed to (a) start the <literal>DrakX</literal> " +"installer and (b) find <literal>DrakX-installer-stage2</literal> and other " "packages that are needed to continue and complete the install." msgstr "" "vaid tarkvara, mida on vaja a) paigaldusprogrammi <literal>DrakX</literal> " @@ -140,7 +142,7 @@ msgstr "" "mõningate pakettide leidmiseks, et siis jätkata paigaldamisega." #. type: Content of: <section><section><section><para> -#: en/netInstall-intro.xml:36 +#: en/netInstall-intro.xml:37 msgid "" "The required source packages may be on a PC hard disk, a local drive, a " "local network or on the Internet." @@ -148,23 +150,18 @@ msgstr "" "Need paketid võivad asuda arvuti kõvakettal, mõnel muul kohalikul kettal, " "kohalikus võrgus või internetis. " -#. type: Content of: <section><section><section><note><para> -#: en/netInstall-intro.xml:40 -msgid "Installation via encrypted wifi or bluetooth is not supported." -msgstr "Paigaldus üle krüptitud WiFi või Bluetoothi ei ole toetatud." - #. type: Content of: <section><section><section><title> -#: en/netInstall-intro.xml:46 +#: en/netInstall-intro.xml:42 msgid "Availability" msgstr "Saadavus" #. type: Content of: <section><section><section><para> -#: en/netInstall-intro.xml:48 +#: en/netInstall-intro.xml:44 msgid "There a two versions of the NetInstall media:" msgstr "Võrgupaigalduse andmekandjatel on kaks versiooni:" #. type: Content of: <section><section><section><itemizedlist><listitem><para> -#: en/netInstall-intro.xml:52 +#: en/netInstall-intro.xml:48 msgid "" "<emphasis role=\"bold\">netinstall.iso</emphasis> For those who prefer not " "to use non-free software, this ISO contains only free software." @@ -173,7 +170,7 @@ msgstr "" "kasutada ainult vaba tarkvara - see tõmmis seda sisaldabki." #. type: Content of: <section><section><section><itemizedlist><listitem><para> -#: en/netInstall-intro.xml:58 +#: en/netInstall-intro.xml:54 msgid "" "<emphasis role=\"bold\">netinstall-nonfree.iso</emphasis> This ISO " "additionally includes proprietary device drivers, which may be required for " @@ -184,7 +181,7 @@ msgstr "" "võrguseadmele, kettakontrollerile vms." #. type: Content of: <section><section><section><para> -#: en/netInstall-intro.xml:64 +#: en/netInstall-intro.xml:60 msgid "" "Both versions are available in the form of separate 32-bit and 64-bit ISO's. " "See here: <link xlink:href=\"https://www.mageia.org/downloads/\">https://www." @@ -195,12 +192,12 @@ msgstr "" "mageia.org/downloads/</link>" #. type: Content of: <section><section><section><title> -#: en/netInstall-intro.xml:70 +#: en/netInstall-intro.xml:66 msgid "Preparation" msgstr "Valmistumine" #. type: Content of: <section><section><section><para> -#: en/netInstall-intro.xml:72 +#: en/netInstall-intro.xml:68 msgid "" "After downloading the image, burn it to a CD/DVD or, if you prefer to put it " "on a USB stick, follow the instructions here: <link xlink:href=\"https://" @@ -214,22 +211,25 @@ msgstr "" "wiki.mageia.org/en/Installation_Media#Dump_Mageia_ISOs_on_an_USB_stick</link>" #. type: Content of: <section><section><title> -#: en/netInstall-intro.xml:79 +#: en/netInstall-intro.xml:75 msgid "Installation Stages" msgstr "Paigaldamise järgud" #. type: Content of: <section><section><para> -#: en/netInstall-intro.xml:81 +#: en/netInstall-intro.xml:77 msgid "The installation is carried out in two stages:" msgstr "Paigaldamine toimub kahes järgus:" #. type: Content of: <section><section><itemizedlist><listitem><para> -#: en/netInstall-intro.xml:85 +#: en/netInstall-intro.xml:81 +#, fuzzy msgid "" "<emphasis role=\"bold\">Stage 1</emphasis> This is the pre-Installation " "stage. You will need to provide the method and details for accessing the " "medium containing the files to be used for the installation. If the method " -"involves a server, then the network connection will be activated." +"involves a server, then the network connection will be activated. This " +"network can be a WiFi connection with WEP or WPA2 encryption (though please " +"be mindful of the Warning below regarding keyboard input)." msgstr "" "<emphasis role=\"bold\">1. järk (Stage 1)</emphasis> on õigupoolest " "paigalduseelne järk Selle ajal tuleb paika panna paigaldamise meetod ja " @@ -237,7 +237,7 @@ msgstr "" "andmekandjale. Kui meetod vajab serverit, aktiveeritakse ka võrguühendus." #. type: Content of: <section><section><itemizedlist><listitem><para> -#: en/netInstall-intro.xml:93 +#: en/netInstall-intro.xml:91 msgid "" "<emphasis role=\"bold\">Stage 2</emphasis> This is the actual Installation " "stage, which will automatically commence once a connection to the installer " @@ -248,7 +248,7 @@ msgstr "" "paigaldamiseks vajalike failidega." #. type: Content of: <section><section><note><para> -#: en/netInstall-intro.xml:100 +#: en/netInstall-intro.xml:98 msgid "" "During Stage 1, nothing will be written to your Hard Disk, so it is safe to " "quit at any point during Stage 1 if you wish. You can do so by pressing " @@ -261,7 +261,7 @@ msgstr "" "<keycap>Del</keycap></keycombo>." #. type: Content of: <section><section><tip><para> -#: en/netInstall-intro.xml:112 +#: en/netInstall-intro.xml:110 msgid "" "You can use <keycombo> <keycap>Alt</keycap> <keycap>F3</keycap> </keycombo> " "to read the logs and <keycombo> <keycap>Alt</keycap> <keycap>F1</keycap> </" @@ -272,14 +272,16 @@ msgstr "" "keycap></keycombo> abil naasta paigaldusekraanile." #. type: Content of: <section><section><warning><para> -#: en/netInstall-intro.xml:124 +#: en/netInstall-intro.xml:122 +#, fuzzy msgid "" -"Unlike when installing from DVD or LiveCD, during the first part of the " -"installation (<emphasis role=\"bold\">Stage 1</emphasis>), you will be asked " -"to type things. During this stage, your keyboard will operate as per an " -"<link xlink:href=\"https://en.wikipedia.org/wiki/" -"Keyboard_layout#United_States\">American keyboard</link> layout. This can be " -"very confusing when you need to type names and paths." +"Unlike when installing from DVD or LiveCD, you will be asked to type things " +"during the first part of a Network installation (<emphasis role=\"bold" +"\">Stage 1</emphasis>). Throughout this stage, however, your keyboard will " +"operate as per an <link xlink:href=\"https://en.wikipedia.org/wiki/" +"Keyboard_layout#United_States\">American keyboard</link> layout. Please bear " +"this in mind to avoid confusion when entering things like names and paths " +"etc." msgstr "" "Erinevalt paigaldamisest DVD või LiveDVD pealt on siin paigaldamise esimesel " "etapil (<emphasis role=\"bold\">Stage 1</emphasis>) vaja üht-teist ka ise " @@ -835,3 +837,6 @@ msgstr "" "Keegi ei näe kõiki käsiraamatus toodud paigaldusprogrammi ekraane. See, " "millised ekraanid on näha, sõltub teie riistvarast ja paigaldamise käigus " "langetatud valikutest." + +#~ msgid "Installation via encrypted wifi or bluetooth is not supported." +#~ msgstr "Paigaldus üle krüptitud WiFi või Bluetoothi ei ole toetatud." diff --git a/docs/docs/stable/bootiso/eu.po b/docs/docs/stable/bootiso/eu.po index 7dbcf8de..f886a9bd 100644 --- a/docs/docs/stable/bootiso/eu.po +++ b/docs/docs/stable/bootiso/eu.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: Mageia Boot ISO Help 6.0\n" "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n" -"POT-Creation-Date: 2019-01-18 19:11+0200\n" +"POT-Creation-Date: 2020-12-20 15:06+0200\n" "PO-Revision-Date: 2017-04-04 18:35+0000\n" "Last-Translator: Egoitz Rodriguez <egoitzro@gmail.com>, 2019\n" "Language-Team: Basque (https://www.transifex.com/MageiaLinux/teams/9361/" @@ -94,72 +94,67 @@ msgid "Installing Mageia using a Tiny Boot Image" msgstr "" #. type: Content of: <section><title> -#: en/netInstall-intro.xml:11 +#: en/netInstall-intro.xml:12 msgid "Introduction" msgstr "Sarrera" #. type: Content of: <section><section><title> -#: en/netInstall-intro.xml:14 +#: en/netInstall-intro.xml:15 msgid "NetInstall Media" msgstr "" #. type: Content of: <section><section><section><title> -#: en/netInstall-intro.xml:17 +#: en/netInstall-intro.xml:18 msgid "Description" msgstr "Azalpena" #. type: Content of: <section><section><section><para> -#: en/netInstall-intro.xml:19 +#: en/netInstall-intro.xml:20 msgid "These minimal ISO's contain:" msgstr "" #. type: Content of: <section><section><section><itemizedlist><listitem><para> -#: en/netInstall-intro.xml:23 +#: en/netInstall-intro.xml:24 msgid "" -"less than 100 MB and are convenient if bandwidth is too low to download a " +"less than 120 MB and are convenient if bandwidth is too low to download a " "full DVD, or if you have a PC without a DVD drive or unable to boot from a " "USB stick." msgstr "" #. type: Content of: <section><section><section><itemizedlist><listitem><para> -#: en/netInstall-intro.xml:29 +#: en/netInstall-intro.xml:30 msgid "" -"no more than that which is needed to a) start the <literal>DrakX</literal> " -"installer and b) find <literal>DrakX-installer-stage2</literal> and other " +"no more than that which is needed to (a) start the <literal>DrakX</literal> " +"installer and (b) find <literal>DrakX-installer-stage2</literal> and other " "packages that are needed to continue and complete the install." msgstr "" #. type: Content of: <section><section><section><para> -#: en/netInstall-intro.xml:36 +#: en/netInstall-intro.xml:37 msgid "" "The required source packages may be on a PC hard disk, a local drive, a " "local network or on the Internet." msgstr "" -#. type: Content of: <section><section><section><note><para> -#: en/netInstall-intro.xml:40 -msgid "Installation via encrypted wifi or bluetooth is not supported." -msgstr "" - #. type: Content of: <section><section><section><title> -#: en/netInstall-intro.xml:46 +#: en/netInstall-intro.xml:42 msgid "Availability" msgstr "" #. type: Content of: <section><section><section><para> -#: en/netInstall-intro.xml:48 +#: en/netInstall-intro.xml:44 msgid "There a two versions of the NetInstall media:" msgstr "" #. type: Content of: <section><section><section><itemizedlist><listitem><para> -#: en/netInstall-intro.xml:52 +#: en/netInstall-intro.xml:48 msgid "" "<emphasis role=\"bold\">netinstall.iso</emphasis> For those who prefer not " "to use non-free software, this ISO contains only free software." msgstr "" #. type: Content of: <section><section><section><itemizedlist><listitem><para> -#: en/netInstall-intro.xml:58 +#: en/netInstall-intro.xml:54 msgid "" "<emphasis role=\"bold\">netinstall-nonfree.iso</emphasis> This ISO " "additionally includes proprietary device drivers, which may be required for " @@ -167,7 +162,7 @@ msgid "" msgstr "" #. type: Content of: <section><section><section><para> -#: en/netInstall-intro.xml:64 +#: en/netInstall-intro.xml:60 msgid "" "Both versions are available in the form of separate 32-bit and 64-bit ISO's. " "See here: <link xlink:href=\"https://www.mageia.org/downloads/\">https://www." @@ -175,12 +170,12 @@ msgid "" msgstr "" #. type: Content of: <section><section><section><title> -#: en/netInstall-intro.xml:70 +#: en/netInstall-intro.xml:66 msgid "Preparation" msgstr "Aurkezpena" #. type: Content of: <section><section><section><para> -#: en/netInstall-intro.xml:72 +#: en/netInstall-intro.xml:68 msgid "" "After downloading the image, burn it to a CD/DVD or, if you prefer to put it " "on a USB stick, follow the instructions here: <link xlink:href=\"https://" @@ -190,26 +185,28 @@ msgid "" msgstr "" #. type: Content of: <section><section><title> -#: en/netInstall-intro.xml:79 +#: en/netInstall-intro.xml:75 msgid "Installation Stages" msgstr "" #. type: Content of: <section><section><para> -#: en/netInstall-intro.xml:81 +#: en/netInstall-intro.xml:77 msgid "The installation is carried out in two stages:" msgstr "" #. type: Content of: <section><section><itemizedlist><listitem><para> -#: en/netInstall-intro.xml:85 +#: en/netInstall-intro.xml:81 msgid "" "<emphasis role=\"bold\">Stage 1</emphasis> This is the pre-Installation " "stage. You will need to provide the method and details for accessing the " "medium containing the files to be used for the installation. If the method " -"involves a server, then the network connection will be activated." +"involves a server, then the network connection will be activated. This " +"network can be a WiFi connection with WEP or WPA2 encryption (though please " +"be mindful of the Warning below regarding keyboard input)." msgstr "" #. type: Content of: <section><section><itemizedlist><listitem><para> -#: en/netInstall-intro.xml:93 +#: en/netInstall-intro.xml:91 msgid "" "<emphasis role=\"bold\">Stage 2</emphasis> This is the actual Installation " "stage, which will automatically commence once a connection to the installer " @@ -217,7 +214,7 @@ msgid "" msgstr "" #. type: Content of: <section><section><note><para> -#: en/netInstall-intro.xml:100 +#: en/netInstall-intro.xml:98 msgid "" "During Stage 1, nothing will be written to your Hard Disk, so it is safe to " "quit at any point during Stage 1 if you wish. You can do so by pressing " @@ -226,7 +223,7 @@ msgid "" msgstr "" #. type: Content of: <section><section><tip><para> -#: en/netInstall-intro.xml:112 +#: en/netInstall-intro.xml:110 msgid "" "You can use <keycombo> <keycap>Alt</keycap> <keycap>F3</keycap> </keycombo> " "to read the logs and <keycombo> <keycap>Alt</keycap> <keycap>F1</keycap> </" @@ -234,14 +231,15 @@ msgid "" msgstr "" #. type: Content of: <section><section><warning><para> -#: en/netInstall-intro.xml:124 -msgid "" -"Unlike when installing from DVD or LiveCD, during the first part of the " -"installation (<emphasis role=\"bold\">Stage 1</emphasis>), you will be asked " -"to type things. During this stage, your keyboard will operate as per an " -"<link xlink:href=\"https://en.wikipedia.org/wiki/" -"Keyboard_layout#United_States\">American keyboard</link> layout. This can be " -"very confusing when you need to type names and paths." +#: en/netInstall-intro.xml:122 +msgid "" +"Unlike when installing from DVD or LiveCD, you will be asked to type things " +"during the first part of a Network installation (<emphasis role=\"bold" +"\">Stage 1</emphasis>). Throughout this stage, however, your keyboard will " +"operate as per an <link xlink:href=\"https://en.wikipedia.org/wiki/" +"Keyboard_layout#United_States\">American keyboard</link> layout. Please bear " +"this in mind to avoid confusion when entering things like names and paths " +"etc." msgstr "" #. type: Content of: <section><title> diff --git a/docs/docs/stable/bootiso/fr.po b/docs/docs/stable/bootiso/fr.po index efab66ef..c34061e4 100644 --- a/docs/docs/stable/bootiso/fr.po +++ b/docs/docs/stable/bootiso/fr.po @@ -17,7 +17,7 @@ msgid "" msgstr "" "Project-Id-Version: Mageia Boot ISO Help 6.0\n" "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n" -"POT-Creation-Date: 2019-01-18 19:11+0200\n" +"POT-Creation-Date: 2020-12-20 15:06+0200\n" "PO-Revision-Date: 2017-04-04 18:35+0000\n" "Last-Translator: stroibe974 <sebsweb@gmail.com>, 2019\n" "Language-Team: French (https://www.transifex.com/MageiaLinux/teams/9361/" @@ -103,29 +103,30 @@ msgid "Installing Mageia using a Tiny Boot Image" msgstr "Installation à partir d'une image minimale d'amorçage" #. type: Content of: <section><title> -#: en/netInstall-intro.xml:11 +#: en/netInstall-intro.xml:12 msgid "Introduction" msgstr "Introduction" #. type: Content of: <section><section><title> -#: en/netInstall-intro.xml:14 +#: en/netInstall-intro.xml:15 msgid "NetInstall Media" msgstr "Media d'installation réseau" #. type: Content of: <section><section><section><title> -#: en/netInstall-intro.xml:17 +#: en/netInstall-intro.xml:18 msgid "Description" msgstr "Description" #. type: Content of: <section><section><section><para> -#: en/netInstall-intro.xml:19 +#: en/netInstall-intro.xml:20 msgid "These minimal ISO's contain:" msgstr "Ces images minimalistes contiennent :" #. type: Content of: <section><section><section><itemizedlist><listitem><para> -#: en/netInstall-intro.xml:23 +#: en/netInstall-intro.xml:24 +#, fuzzy msgid "" -"less than 100 MB and are convenient if bandwidth is too low to download a " +"less than 120 MB and are convenient if bandwidth is too low to download a " "full DVD, or if you have a PC without a DVD drive or unable to boot from a " "USB stick." msgstr "" @@ -134,10 +135,11 @@ msgstr "" "s'il ne peut pas démarrer sur une clé USB." #. type: Content of: <section><section><section><itemizedlist><listitem><para> -#: en/netInstall-intro.xml:29 +#: en/netInstall-intro.xml:30 +#, fuzzy msgid "" -"no more than that which is needed to a) start the <literal>DrakX</literal> " -"installer and b) find <literal>DrakX-installer-stage2</literal> and other " +"no more than that which is needed to (a) start the <literal>DrakX</literal> " +"installer and (b) find <literal>DrakX-installer-stage2</literal> and other " "packages that are needed to continue and complete the install." msgstr "" "que ce qui est nécessaire pour a) démarrer l'installeur <literal>Drakx</" @@ -145,7 +147,7 @@ msgstr "" "paquets indispensables pour continuer et terminer l'installation." #. type: Content of: <section><section><section><para> -#: en/netInstall-intro.xml:36 +#: en/netInstall-intro.xml:37 msgid "" "The required source packages may be on a PC hard disk, a local drive, a " "local network or on the Internet." @@ -153,25 +155,18 @@ msgstr "" "Ces paquets peuvent se trouver sur le disque dur de l'ordinateur, sur un " "périphérique de stockage, un réseau local ou sur Internet. " -#. type: Content of: <section><section><section><note><para> -#: en/netInstall-intro.xml:40 -msgid "Installation via encrypted wifi or bluetooth is not supported." -msgstr "" -"Il n'est pas possible de réaliser une 'installation par un réseau wifi " -"chiffré ou par Bluetooth." - #. type: Content of: <section><section><section><title> -#: en/netInstall-intro.xml:46 +#: en/netInstall-intro.xml:42 msgid "Availability" msgstr "Disponibilité" #. type: Content of: <section><section><section><para> -#: en/netInstall-intro.xml:48 +#: en/netInstall-intro.xml:44 msgid "There a two versions of the NetInstall media:" msgstr "Il existe deux familles de media NetInstall :" #. type: Content of: <section><section><section><itemizedlist><listitem><para> -#: en/netInstall-intro.xml:52 +#: en/netInstall-intro.xml:48 msgid "" "<emphasis role=\"bold\">netinstall.iso</emphasis> For those who prefer not " "to use non-free software, this ISO contains only free software." @@ -181,7 +176,7 @@ msgstr "" "des logiciels libres." #. type: Content of: <section><section><section><itemizedlist><listitem><para> -#: en/netInstall-intro.xml:58 +#: en/netInstall-intro.xml:54 msgid "" "<emphasis role=\"bold\">netinstall-nonfree.iso</emphasis> This ISO " "additionally includes proprietary device drivers, which may be required for " @@ -192,7 +187,7 @@ msgstr "" "réseau, contrôleur de disque, etc." #. type: Content of: <section><section><section><para> -#: en/netInstall-intro.xml:64 +#: en/netInstall-intro.xml:60 msgid "" "Both versions are available in the form of separate 32-bit and 64-bit ISO's. " "See here: <link xlink:href=\"https://www.mageia.org/downloads/\">https://www." @@ -203,12 +198,12 @@ msgstr "" "\">https://www.mageia.org/downloads/</link>" #. type: Content of: <section><section><section><title> -#: en/netInstall-intro.xml:70 +#: en/netInstall-intro.xml:66 msgid "Preparation" msgstr "Préparation" #. type: Content of: <section><section><section><para> -#: en/netInstall-intro.xml:72 +#: en/netInstall-intro.xml:68 msgid "" "After downloading the image, burn it to a CD/DVD or, if you prefer to put it " "on a USB stick, follow the instructions here: <link xlink:href=\"https://" @@ -224,22 +219,25 @@ msgstr "" "C3.A9riph.C3.A9rique_USB</link>" #. type: Content of: <section><section><title> -#: en/netInstall-intro.xml:79 +#: en/netInstall-intro.xml:75 msgid "Installation Stages" msgstr "Étapes d'installation" #. type: Content of: <section><section><para> -#: en/netInstall-intro.xml:81 +#: en/netInstall-intro.xml:77 msgid "The installation is carried out in two stages:" msgstr "L'installation se déroulent en deux étapes :" #. type: Content of: <section><section><itemizedlist><listitem><para> -#: en/netInstall-intro.xml:85 +#: en/netInstall-intro.xml:81 +#, fuzzy msgid "" "<emphasis role=\"bold\">Stage 1</emphasis> This is the pre-Installation " "stage. You will need to provide the method and details for accessing the " "medium containing the files to be used for the installation. If the method " -"involves a server, then the network connection will be activated." +"involves a server, then the network connection will be activated. This " +"network can be a WiFi connection with WEP or WPA2 encryption (though please " +"be mindful of the Warning below regarding keyboard input)." msgstr "" "<emphasis role=\"bold\">Étape 1</emphasis> Il s'agit de l'étape de pré-" "installation. Vous devrez renseigner la méthode et les détails pour accéder " @@ -247,7 +245,7 @@ msgstr "" "l'utilisation d'un serveur, alors la connexion au réseau sera activée. " #. type: Content of: <section><section><itemizedlist><listitem><para> -#: en/netInstall-intro.xml:93 +#: en/netInstall-intro.xml:91 msgid "" "<emphasis role=\"bold\">Stage 2</emphasis> This is the actual Installation " "stage, which will automatically commence once a connection to the installer " @@ -258,7 +256,7 @@ msgstr "" "connexion aux fichiers de l'installateur sera effective." #. type: Content of: <section><section><note><para> -#: en/netInstall-intro.xml:100 +#: en/netInstall-intro.xml:98 msgid "" "During Stage 1, nothing will be written to your Hard Disk, so it is safe to " "quit at any point during Stage 1 if you wish. You can do so by pressing " @@ -271,7 +269,7 @@ msgstr "" "keycombo>." #. type: Content of: <section><section><tip><para> -#: en/netInstall-intro.xml:112 +#: en/netInstall-intro.xml:110 msgid "" "You can use <keycombo> <keycap>Alt</keycap> <keycap>F3</keycap> </keycombo> " "to read the logs and <keycombo> <keycap>Alt</keycap> <keycap>F1</keycap> </" @@ -283,14 +281,16 @@ msgstr "" "keycombo>." #. type: Content of: <section><section><warning><para> -#: en/netInstall-intro.xml:124 +#: en/netInstall-intro.xml:122 +#, fuzzy msgid "" -"Unlike when installing from DVD or LiveCD, during the first part of the " -"installation (<emphasis role=\"bold\">Stage 1</emphasis>), you will be asked " -"to type things. During this stage, your keyboard will operate as per an " -"<link xlink:href=\"https://en.wikipedia.org/wiki/" -"Keyboard_layout#United_States\">American keyboard</link> layout. This can be " -"very confusing when you need to type names and paths." +"Unlike when installing from DVD or LiveCD, you will be asked to type things " +"during the first part of a Network installation (<emphasis role=\"bold" +"\">Stage 1</emphasis>). Throughout this stage, however, your keyboard will " +"operate as per an <link xlink:href=\"https://en.wikipedia.org/wiki/" +"Keyboard_layout#United_States\">American keyboard</link> layout. Please bear " +"this in mind to avoid confusion when entering things like names and paths " +"etc." msgstr "" "A la différence d'une installation depuis un DVD ou Live DVD, pendant la " "première partie de l'installation, appelée <emphasis role=\"bold\">Stage 1</" @@ -850,3 +850,8 @@ msgstr "" "Lors d'une installation, seuls certains écrans présentés ci-après " "apparaissent, en fonction de votre matériel et des choix d'installation que " "vous faites." + +#~ msgid "Installation via encrypted wifi or bluetooth is not supported." +#~ msgstr "" +#~ "Il n'est pas possible de réaliser une 'installation par un réseau wifi " +#~ "chiffré ou par Bluetooth." diff --git a/docs/docs/stable/bootiso/he.po b/docs/docs/stable/bootiso/he.po index 9e700ed4..d68d71d8 100644 --- a/docs/docs/stable/bootiso/he.po +++ b/docs/docs/stable/bootiso/he.po @@ -13,7 +13,7 @@ msgid "" msgstr "" "Project-Id-Version: Mageia Boot ISO Help 6.0\n" "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n" -"POT-Creation-Date: 2019-01-18 19:11+0200\n" +"POT-Creation-Date: 2020-12-20 15:06+0200\n" "PO-Revision-Date: 2017-04-04 18:35+0000\n" "Last-Translator: Omeritzics Games <omeritzicschwartz@gmail.com>, 2020\n" "Language-Team: Hebrew (https://www.transifex.com/MageiaLinux/teams/9361/" @@ -92,72 +92,67 @@ msgid "Installing Mageia using a Tiny Boot Image" msgstr "" #. type: Content of: <section><title> -#: en/netInstall-intro.xml:11 +#: en/netInstall-intro.xml:12 msgid "Introduction" msgstr "מבוא" #. type: Content of: <section><section><title> -#: en/netInstall-intro.xml:14 +#: en/netInstall-intro.xml:15 msgid "NetInstall Media" msgstr "אמצעי התקנה מהרשת" #. type: Content of: <section><section><section><title> -#: en/netInstall-intro.xml:17 +#: en/netInstall-intro.xml:18 msgid "Description" msgstr "תיאור" #. type: Content of: <section><section><section><para> -#: en/netInstall-intro.xml:19 +#: en/netInstall-intro.xml:20 msgid "These minimal ISO's contain:" msgstr "" #. type: Content of: <section><section><section><itemizedlist><listitem><para> -#: en/netInstall-intro.xml:23 +#: en/netInstall-intro.xml:24 msgid "" -"less than 100 MB and are convenient if bandwidth is too low to download a " +"less than 120 MB and are convenient if bandwidth is too low to download a " "full DVD, or if you have a PC without a DVD drive or unable to boot from a " "USB stick." msgstr "" #. type: Content of: <section><section><section><itemizedlist><listitem><para> -#: en/netInstall-intro.xml:29 +#: en/netInstall-intro.xml:30 msgid "" -"no more than that which is needed to a) start the <literal>DrakX</literal> " -"installer and b) find <literal>DrakX-installer-stage2</literal> and other " +"no more than that which is needed to (a) start the <literal>DrakX</literal> " +"installer and (b) find <literal>DrakX-installer-stage2</literal> and other " "packages that are needed to continue and complete the install." msgstr "" #. type: Content of: <section><section><section><para> -#: en/netInstall-intro.xml:36 +#: en/netInstall-intro.xml:37 msgid "" "The required source packages may be on a PC hard disk, a local drive, a " "local network or on the Internet." msgstr "" -#. type: Content of: <section><section><section><note><para> -#: en/netInstall-intro.xml:40 -msgid "Installation via encrypted wifi or bluetooth is not supported." -msgstr "" - #. type: Content of: <section><section><section><title> -#: en/netInstall-intro.xml:46 +#: en/netInstall-intro.xml:42 msgid "Availability" msgstr "" #. type: Content of: <section><section><section><para> -#: en/netInstall-intro.xml:48 +#: en/netInstall-intro.xml:44 msgid "There a two versions of the NetInstall media:" msgstr "ישנן שתי גרסאות של אמצעי ההתקנה מהרשת:" #. type: Content of: <section><section><section><itemizedlist><listitem><para> -#: en/netInstall-intro.xml:52 +#: en/netInstall-intro.xml:48 msgid "" "<emphasis role=\"bold\">netinstall.iso</emphasis> For those who prefer not " "to use non-free software, this ISO contains only free software." msgstr "" #. type: Content of: <section><section><section><itemizedlist><listitem><para> -#: en/netInstall-intro.xml:58 +#: en/netInstall-intro.xml:54 msgid "" "<emphasis role=\"bold\">netinstall-nonfree.iso</emphasis> This ISO " "additionally includes proprietary device drivers, which may be required for " @@ -165,7 +160,7 @@ msgid "" msgstr "" #. type: Content of: <section><section><section><para> -#: en/netInstall-intro.xml:64 +#: en/netInstall-intro.xml:60 msgid "" "Both versions are available in the form of separate 32-bit and 64-bit ISO's. " "See here: <link xlink:href=\"https://www.mageia.org/downloads/\">https://www." @@ -173,12 +168,12 @@ msgid "" msgstr "" #. type: Content of: <section><section><section><title> -#: en/netInstall-intro.xml:70 +#: en/netInstall-intro.xml:66 msgid "Preparation" msgstr "" #. type: Content of: <section><section><section><para> -#: en/netInstall-intro.xml:72 +#: en/netInstall-intro.xml:68 msgid "" "After downloading the image, burn it to a CD/DVD or, if you prefer to put it " "on a USB stick, follow the instructions here: <link xlink:href=\"https://" @@ -188,26 +183,28 @@ msgid "" msgstr "" #. type: Content of: <section><section><title> -#: en/netInstall-intro.xml:79 +#: en/netInstall-intro.xml:75 msgid "Installation Stages" msgstr "" #. type: Content of: <section><section><para> -#: en/netInstall-intro.xml:81 +#: en/netInstall-intro.xml:77 msgid "The installation is carried out in two stages:" msgstr "" #. type: Content of: <section><section><itemizedlist><listitem><para> -#: en/netInstall-intro.xml:85 +#: en/netInstall-intro.xml:81 msgid "" "<emphasis role=\"bold\">Stage 1</emphasis> This is the pre-Installation " "stage. You will need to provide the method and details for accessing the " "medium containing the files to be used for the installation. If the method " -"involves a server, then the network connection will be activated." +"involves a server, then the network connection will be activated. This " +"network can be a WiFi connection with WEP or WPA2 encryption (though please " +"be mindful of the Warning below regarding keyboard input)." msgstr "" #. type: Content of: <section><section><itemizedlist><listitem><para> -#: en/netInstall-intro.xml:93 +#: en/netInstall-intro.xml:91 msgid "" "<emphasis role=\"bold\">Stage 2</emphasis> This is the actual Installation " "stage, which will automatically commence once a connection to the installer " @@ -215,7 +212,7 @@ msgid "" msgstr "" #. type: Content of: <section><section><note><para> -#: en/netInstall-intro.xml:100 +#: en/netInstall-intro.xml:98 msgid "" "During Stage 1, nothing will be written to your Hard Disk, so it is safe to " "quit at any point during Stage 1 if you wish. You can do so by pressing " @@ -224,7 +221,7 @@ msgid "" msgstr "" #. type: Content of: <section><section><tip><para> -#: en/netInstall-intro.xml:112 +#: en/netInstall-intro.xml:110 msgid "" "You can use <keycombo> <keycap>Alt</keycap> <keycap>F3</keycap> </keycombo> " "to read the logs and <keycombo> <keycap>Alt</keycap> <keycap>F1</keycap> </" @@ -232,14 +229,15 @@ msgid "" msgstr "" #. type: Content of: <section><section><warning><para> -#: en/netInstall-intro.xml:124 -msgid "" -"Unlike when installing from DVD or LiveCD, during the first part of the " -"installation (<emphasis role=\"bold\">Stage 1</emphasis>), you will be asked " -"to type things. During this stage, your keyboard will operate as per an " -"<link xlink:href=\"https://en.wikipedia.org/wiki/" -"Keyboard_layout#United_States\">American keyboard</link> layout. This can be " -"very confusing when you need to type names and paths." +#: en/netInstall-intro.xml:122 +msgid "" +"Unlike when installing from DVD or LiveCD, you will be asked to type things " +"during the first part of a Network installation (<emphasis role=\"bold" +"\">Stage 1</emphasis>). Throughout this stage, however, your keyboard will " +"operate as per an <link xlink:href=\"https://en.wikipedia.org/wiki/" +"Keyboard_layout#United_States\">American keyboard</link> layout. Please bear " +"this in mind to avoid confusion when entering things like names and paths " +"etc." msgstr "" #. type: Content of: <section><title> diff --git a/docs/docs/stable/bootiso/hi.po b/docs/docs/stable/bootiso/hi.po index 9a2a6822..9928051b 100644 --- a/docs/docs/stable/bootiso/hi.po +++ b/docs/docs/stable/bootiso/hi.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: Mageia Boot ISO Help 6.0\n" "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n" -"POT-Creation-Date: 2019-01-18 19:11+0200\n" +"POT-Creation-Date: 2020-12-20 15:06+0200\n" "PO-Revision-Date: 2017-04-04 18:35+0000\n" "Last-Translator: Panwar108 <caspian7pena@gmail.com>, 2020\n" "Language-Team: Hindi (https://www.transifex.com/MageiaLinux/teams/9361/hi/)\n" @@ -87,72 +87,67 @@ msgid "Installing Mageia using a Tiny Boot Image" msgstr "" #. type: Content of: <section><title> -#: en/netInstall-intro.xml:11 +#: en/netInstall-intro.xml:12 msgid "Introduction" msgstr "परिचय" #. type: Content of: <section><section><title> -#: en/netInstall-intro.xml:14 +#: en/netInstall-intro.xml:15 msgid "NetInstall Media" msgstr "नेट इंस्टॉल मीडिया" #. type: Content of: <section><section><section><title> -#: en/netInstall-intro.xml:17 +#: en/netInstall-intro.xml:18 msgid "Description" msgstr "विवरण" #. type: Content of: <section><section><section><para> -#: en/netInstall-intro.xml:19 +#: en/netInstall-intro.xml:20 msgid "These minimal ISO's contain:" msgstr "" #. type: Content of: <section><section><section><itemizedlist><listitem><para> -#: en/netInstall-intro.xml:23 +#: en/netInstall-intro.xml:24 msgid "" -"less than 100 MB and are convenient if bandwidth is too low to download a " +"less than 120 MB and are convenient if bandwidth is too low to download a " "full DVD, or if you have a PC without a DVD drive or unable to boot from a " "USB stick." msgstr "" #. type: Content of: <section><section><section><itemizedlist><listitem><para> -#: en/netInstall-intro.xml:29 +#: en/netInstall-intro.xml:30 msgid "" -"no more than that which is needed to a) start the <literal>DrakX</literal> " -"installer and b) find <literal>DrakX-installer-stage2</literal> and other " +"no more than that which is needed to (a) start the <literal>DrakX</literal> " +"installer and (b) find <literal>DrakX-installer-stage2</literal> and other " "packages that are needed to continue and complete the install." msgstr "" #. type: Content of: <section><section><section><para> -#: en/netInstall-intro.xml:36 +#: en/netInstall-intro.xml:37 msgid "" "The required source packages may be on a PC hard disk, a local drive, a " "local network or on the Internet." msgstr "" -#. type: Content of: <section><section><section><note><para> -#: en/netInstall-intro.xml:40 -msgid "Installation via encrypted wifi or bluetooth is not supported." -msgstr "" - #. type: Content of: <section><section><section><title> -#: en/netInstall-intro.xml:46 +#: en/netInstall-intro.xml:42 msgid "Availability" msgstr "उपलब्धता" #. type: Content of: <section><section><section><para> -#: en/netInstall-intro.xml:48 +#: en/netInstall-intro.xml:44 msgid "There a two versions of the NetInstall media:" msgstr "" #. type: Content of: <section><section><section><itemizedlist><listitem><para> -#: en/netInstall-intro.xml:52 +#: en/netInstall-intro.xml:48 msgid "" "<emphasis role=\"bold\">netinstall.iso</emphasis> For those who prefer not " "to use non-free software, this ISO contains only free software." msgstr "" #. type: Content of: <section><section><section><itemizedlist><listitem><para> -#: en/netInstall-intro.xml:58 +#: en/netInstall-intro.xml:54 msgid "" "<emphasis role=\"bold\">netinstall-nonfree.iso</emphasis> This ISO " "additionally includes proprietary device drivers, which may be required for " @@ -160,7 +155,7 @@ msgid "" msgstr "" #. type: Content of: <section><section><section><para> -#: en/netInstall-intro.xml:64 +#: en/netInstall-intro.xml:60 msgid "" "Both versions are available in the form of separate 32-bit and 64-bit ISO's. " "See here: <link xlink:href=\"https://www.mageia.org/downloads/\">https://www." @@ -168,12 +163,12 @@ msgid "" msgstr "" #. type: Content of: <section><section><section><title> -#: en/netInstall-intro.xml:70 +#: en/netInstall-intro.xml:66 msgid "Preparation" msgstr "तैयारी" #. type: Content of: <section><section><section><para> -#: en/netInstall-intro.xml:72 +#: en/netInstall-intro.xml:68 msgid "" "After downloading the image, burn it to a CD/DVD or, if you prefer to put it " "on a USB stick, follow the instructions here: <link xlink:href=\"https://" @@ -183,26 +178,28 @@ msgid "" msgstr "" #. type: Content of: <section><section><title> -#: en/netInstall-intro.xml:79 +#: en/netInstall-intro.xml:75 msgid "Installation Stages" msgstr "इंस्टॉल प्रक्रिया के चरण" #. type: Content of: <section><section><para> -#: en/netInstall-intro.xml:81 +#: en/netInstall-intro.xml:77 msgid "The installation is carried out in two stages:" msgstr "" #. type: Content of: <section><section><itemizedlist><listitem><para> -#: en/netInstall-intro.xml:85 +#: en/netInstall-intro.xml:81 msgid "" "<emphasis role=\"bold\">Stage 1</emphasis> This is the pre-Installation " "stage. You will need to provide the method and details for accessing the " "medium containing the files to be used for the installation. If the method " -"involves a server, then the network connection will be activated." +"involves a server, then the network connection will be activated. This " +"network can be a WiFi connection with WEP or WPA2 encryption (though please " +"be mindful of the Warning below regarding keyboard input)." msgstr "" #. type: Content of: <section><section><itemizedlist><listitem><para> -#: en/netInstall-intro.xml:93 +#: en/netInstall-intro.xml:91 msgid "" "<emphasis role=\"bold\">Stage 2</emphasis> This is the actual Installation " "stage, which will automatically commence once a connection to the installer " @@ -210,7 +207,7 @@ msgid "" msgstr "" #. type: Content of: <section><section><note><para> -#: en/netInstall-intro.xml:100 +#: en/netInstall-intro.xml:98 msgid "" "During Stage 1, nothing will be written to your Hard Disk, so it is safe to " "quit at any point during Stage 1 if you wish. You can do so by pressing " @@ -219,7 +216,7 @@ msgid "" msgstr "" #. type: Content of: <section><section><tip><para> -#: en/netInstall-intro.xml:112 +#: en/netInstall-intro.xml:110 msgid "" "You can use <keycombo> <keycap>Alt</keycap> <keycap>F3</keycap> </keycombo> " "to read the logs and <keycombo> <keycap>Alt</keycap> <keycap>F1</keycap> </" @@ -227,14 +224,15 @@ msgid "" msgstr "" #. type: Content of: <section><section><warning><para> -#: en/netInstall-intro.xml:124 -msgid "" -"Unlike when installing from DVD or LiveCD, during the first part of the " -"installation (<emphasis role=\"bold\">Stage 1</emphasis>), you will be asked " -"to type things. During this stage, your keyboard will operate as per an " -"<link xlink:href=\"https://en.wikipedia.org/wiki/" -"Keyboard_layout#United_States\">American keyboard</link> layout. This can be " -"very confusing when you need to type names and paths." +#: en/netInstall-intro.xml:122 +msgid "" +"Unlike when installing from DVD or LiveCD, you will be asked to type things " +"during the first part of a Network installation (<emphasis role=\"bold" +"\">Stage 1</emphasis>). Throughout this stage, however, your keyboard will " +"operate as per an <link xlink:href=\"https://en.wikipedia.org/wiki/" +"Keyboard_layout#United_States\">American keyboard</link> layout. Please bear " +"this in mind to avoid confusion when entering things like names and paths " +"etc." msgstr "" #. type: Content of: <section><title> diff --git a/docs/docs/stable/bootiso/hr.po b/docs/docs/stable/bootiso/hr.po index 43b97dc0..5f0b0080 100644 --- a/docs/docs/stable/bootiso/hr.po +++ b/docs/docs/stable/bootiso/hr.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: Mageia Boot ISO Help 6.0\n" "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n" -"POT-Creation-Date: 2019-01-18 19:11+0200\n" +"POT-Creation-Date: 2020-12-20 15:06+0200\n" "PO-Revision-Date: 2017-04-04 18:35+0000\n" "Last-Translator: Ivica Kolić <ikoli@yahoo.com>, 2019\n" "Language-Team: Croatian (https://www.transifex.com/MageiaLinux/teams/9361/" @@ -99,29 +99,30 @@ msgid "Installing Mageia using a Tiny Boot Image" msgstr "" #. type: Content of: <section><title> -#: en/netInstall-intro.xml:11 +#: en/netInstall-intro.xml:12 msgid "Introduction" msgstr "Uvod" #. type: Content of: <section><section><title> -#: en/netInstall-intro.xml:14 +#: en/netInstall-intro.xml:15 msgid "NetInstall Media" msgstr "NetInstall medij" #. type: Content of: <section><section><section><title> -#: en/netInstall-intro.xml:17 +#: en/netInstall-intro.xml:18 msgid "Description" msgstr "Opis" #. type: Content of: <section><section><section><para> -#: en/netInstall-intro.xml:19 +#: en/netInstall-intro.xml:20 msgid "These minimal ISO's contain:" msgstr "Ovaj minimalni ISO sadrži:" #. type: Content of: <section><section><section><itemizedlist><listitem><para> -#: en/netInstall-intro.xml:23 +#: en/netInstall-intro.xml:24 +#, fuzzy msgid "" -"less than 100 MB and are convenient if bandwidth is too low to download a " +"less than 120 MB and are convenient if bandwidth is too low to download a " "full DVD, or if you have a PC without a DVD drive or unable to boot from a " "USB stick." msgstr "" @@ -130,37 +131,32 @@ msgstr "" "podignuti sustav sa USB stika." #. type: Content of: <section><section><section><itemizedlist><listitem><para> -#: en/netInstall-intro.xml:29 +#: en/netInstall-intro.xml:30 msgid "" -"no more than that which is needed to a) start the <literal>DrakX</literal> " -"installer and b) find <literal>DrakX-installer-stage2</literal> and other " +"no more than that which is needed to (a) start the <literal>DrakX</literal> " +"installer and (b) find <literal>DrakX-installer-stage2</literal> and other " "packages that are needed to continue and complete the install." msgstr "" #. type: Content of: <section><section><section><para> -#: en/netInstall-intro.xml:36 +#: en/netInstall-intro.xml:37 msgid "" "The required source packages may be on a PC hard disk, a local drive, a " "local network or on the Internet." msgstr "" -#. type: Content of: <section><section><section><note><para> -#: en/netInstall-intro.xml:40 -msgid "Installation via encrypted wifi or bluetooth is not supported." -msgstr "" - #. type: Content of: <section><section><section><title> -#: en/netInstall-intro.xml:46 +#: en/netInstall-intro.xml:42 msgid "Availability" msgstr "Dostupnost" #. type: Content of: <section><section><section><para> -#: en/netInstall-intro.xml:48 +#: en/netInstall-intro.xml:44 msgid "There a two versions of the NetInstall media:" msgstr "Postoje dvije verzije NetInstall medija:" #. type: Content of: <section><section><section><itemizedlist><listitem><para> -#: en/netInstall-intro.xml:52 +#: en/netInstall-intro.xml:48 msgid "" "<emphasis role=\"bold\">netinstall.iso</emphasis> For those who prefer not " "to use non-free software, this ISO contains only free software." @@ -169,7 +165,7 @@ msgstr "" "koristiti neslobodan software, ovaj ISO sadrži samo slobodan software." #. type: Content of: <section><section><section><itemizedlist><listitem><para> -#: en/netInstall-intro.xml:58 +#: en/netInstall-intro.xml:54 msgid "" "<emphasis role=\"bold\">netinstall-nonfree.iso</emphasis> This ISO " "additionally includes proprietary device drivers, which may be required for " @@ -180,7 +176,7 @@ msgstr "" "za vaš mrežni uređaj, disk kontroler, itd." #. type: Content of: <section><section><section><para> -#: en/netInstall-intro.xml:64 +#: en/netInstall-intro.xml:60 msgid "" "Both versions are available in the form of separate 32-bit and 64-bit ISO's. " "See here: <link xlink:href=\"https://www.mageia.org/downloads/\">https://www." @@ -191,12 +187,12 @@ msgstr "" "\">https://www.mageia.org/downloads/</link>" #. type: Content of: <section><section><section><title> -#: en/netInstall-intro.xml:70 +#: en/netInstall-intro.xml:66 msgid "Preparation" msgstr "Priprema" #. type: Content of: <section><section><section><para> -#: en/netInstall-intro.xml:72 +#: en/netInstall-intro.xml:68 msgid "" "After downloading the image, burn it to a CD/DVD or, if you prefer to put it " "on a USB stick, follow the instructions here: <link xlink:href=\"https://" @@ -206,26 +202,28 @@ msgid "" msgstr "" #. type: Content of: <section><section><title> -#: en/netInstall-intro.xml:79 +#: en/netInstall-intro.xml:75 msgid "Installation Stages" msgstr "" #. type: Content of: <section><section><para> -#: en/netInstall-intro.xml:81 +#: en/netInstall-intro.xml:77 msgid "The installation is carried out in two stages:" msgstr "" #. type: Content of: <section><section><itemizedlist><listitem><para> -#: en/netInstall-intro.xml:85 +#: en/netInstall-intro.xml:81 msgid "" "<emphasis role=\"bold\">Stage 1</emphasis> This is the pre-Installation " "stage. You will need to provide the method and details for accessing the " "medium containing the files to be used for the installation. If the method " -"involves a server, then the network connection will be activated." +"involves a server, then the network connection will be activated. This " +"network can be a WiFi connection with WEP or WPA2 encryption (though please " +"be mindful of the Warning below regarding keyboard input)." msgstr "" #. type: Content of: <section><section><itemizedlist><listitem><para> -#: en/netInstall-intro.xml:93 +#: en/netInstall-intro.xml:91 msgid "" "<emphasis role=\"bold\">Stage 2</emphasis> This is the actual Installation " "stage, which will automatically commence once a connection to the installer " @@ -233,7 +231,7 @@ msgid "" msgstr "" #. type: Content of: <section><section><note><para> -#: en/netInstall-intro.xml:100 +#: en/netInstall-intro.xml:98 msgid "" "During Stage 1, nothing will be written to your Hard Disk, so it is safe to " "quit at any point during Stage 1 if you wish. You can do so by pressing " @@ -242,7 +240,7 @@ msgid "" msgstr "" #. type: Content of: <section><section><tip><para> -#: en/netInstall-intro.xml:112 +#: en/netInstall-intro.xml:110 msgid "" "You can use <keycombo> <keycap>Alt</keycap> <keycap>F3</keycap> </keycombo> " "to read the logs and <keycombo> <keycap>Alt</keycap> <keycap>F1</keycap> </" @@ -250,14 +248,15 @@ msgid "" msgstr "" #. type: Content of: <section><section><warning><para> -#: en/netInstall-intro.xml:124 -msgid "" -"Unlike when installing from DVD or LiveCD, during the first part of the " -"installation (<emphasis role=\"bold\">Stage 1</emphasis>), you will be asked " -"to type things. During this stage, your keyboard will operate as per an " -"<link xlink:href=\"https://en.wikipedia.org/wiki/" -"Keyboard_layout#United_States\">American keyboard</link> layout. This can be " -"very confusing when you need to type names and paths." +#: en/netInstall-intro.xml:122 +msgid "" +"Unlike when installing from DVD or LiveCD, you will be asked to type things " +"during the first part of a Network installation (<emphasis role=\"bold" +"\">Stage 1</emphasis>). Throughout this stage, however, your keyboard will " +"operate as per an <link xlink:href=\"https://en.wikipedia.org/wiki/" +"Keyboard_layout#United_States\">American keyboard</link> layout. Please bear " +"this in mind to avoid confusion when entering things like names and paths " +"etc." msgstr "" #. type: Content of: <section><title> diff --git a/docs/docs/stable/bootiso/hu.po b/docs/docs/stable/bootiso/hu.po index 83de2c68..4c632a63 100644 --- a/docs/docs/stable/bootiso/hu.po +++ b/docs/docs/stable/bootiso/hu.po @@ -14,7 +14,7 @@ msgid "" msgstr "" "Project-Id-Version: Mageia Boot ISO Help 6.0\n" "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n" -"POT-Creation-Date: 2019-01-18 19:11+0200\n" +"POT-Creation-Date: 2020-12-20 15:06+0200\n" "PO-Revision-Date: 2017-04-04 18:35+0000\n" "Last-Translator: István Norbert Péter <peter.norbert.istvan@gmail.com>, " "2019\n" @@ -97,72 +97,67 @@ msgid "Installing Mageia using a Tiny Boot Image" msgstr "" #. type: Content of: <section><title> -#: en/netInstall-intro.xml:11 +#: en/netInstall-intro.xml:12 msgid "Introduction" msgstr "Bevezetés" #. type: Content of: <section><section><title> -#: en/netInstall-intro.xml:14 +#: en/netInstall-intro.xml:15 msgid "NetInstall Media" msgstr "" #. type: Content of: <section><section><section><title> -#: en/netInstall-intro.xml:17 +#: en/netInstall-intro.xml:18 msgid "Description" msgstr "Leírás" #. type: Content of: <section><section><section><para> -#: en/netInstall-intro.xml:19 +#: en/netInstall-intro.xml:20 msgid "These minimal ISO's contain:" msgstr "" #. type: Content of: <section><section><section><itemizedlist><listitem><para> -#: en/netInstall-intro.xml:23 +#: en/netInstall-intro.xml:24 msgid "" -"less than 100 MB and are convenient if bandwidth is too low to download a " +"less than 120 MB and are convenient if bandwidth is too low to download a " "full DVD, or if you have a PC without a DVD drive or unable to boot from a " "USB stick." msgstr "" #. type: Content of: <section><section><section><itemizedlist><listitem><para> -#: en/netInstall-intro.xml:29 +#: en/netInstall-intro.xml:30 msgid "" -"no more than that which is needed to a) start the <literal>DrakX</literal> " -"installer and b) find <literal>DrakX-installer-stage2</literal> and other " +"no more than that which is needed to (a) start the <literal>DrakX</literal> " +"installer and (b) find <literal>DrakX-installer-stage2</literal> and other " "packages that are needed to continue and complete the install." msgstr "" #. type: Content of: <section><section><section><para> -#: en/netInstall-intro.xml:36 +#: en/netInstall-intro.xml:37 msgid "" "The required source packages may be on a PC hard disk, a local drive, a " "local network or on the Internet." msgstr "" -#. type: Content of: <section><section><section><note><para> -#: en/netInstall-intro.xml:40 -msgid "Installation via encrypted wifi or bluetooth is not supported." -msgstr "" - #. type: Content of: <section><section><section><title> -#: en/netInstall-intro.xml:46 +#: en/netInstall-intro.xml:42 msgid "Availability" msgstr "" #. type: Content of: <section><section><section><para> -#: en/netInstall-intro.xml:48 +#: en/netInstall-intro.xml:44 msgid "There a two versions of the NetInstall media:" msgstr "" #. type: Content of: <section><section><section><itemizedlist><listitem><para> -#: en/netInstall-intro.xml:52 +#: en/netInstall-intro.xml:48 msgid "" "<emphasis role=\"bold\">netinstall.iso</emphasis> For those who prefer not " "to use non-free software, this ISO contains only free software." msgstr "" #. type: Content of: <section><section><section><itemizedlist><listitem><para> -#: en/netInstall-intro.xml:58 +#: en/netInstall-intro.xml:54 msgid "" "<emphasis role=\"bold\">netinstall-nonfree.iso</emphasis> This ISO " "additionally includes proprietary device drivers, which may be required for " @@ -170,7 +165,7 @@ msgid "" msgstr "" #. type: Content of: <section><section><section><para> -#: en/netInstall-intro.xml:64 +#: en/netInstall-intro.xml:60 msgid "" "Both versions are available in the form of separate 32-bit and 64-bit ISO's. " "See here: <link xlink:href=\"https://www.mageia.org/downloads/\">https://www." @@ -178,12 +173,12 @@ msgid "" msgstr "" #. type: Content of: <section><section><section><title> -#: en/netInstall-intro.xml:70 +#: en/netInstall-intro.xml:66 msgid "Preparation" msgstr "Előkészítés" #. type: Content of: <section><section><section><para> -#: en/netInstall-intro.xml:72 +#: en/netInstall-intro.xml:68 msgid "" "After downloading the image, burn it to a CD/DVD or, if you prefer to put it " "on a USB stick, follow the instructions here: <link xlink:href=\"https://" @@ -193,26 +188,28 @@ msgid "" msgstr "" #. type: Content of: <section><section><title> -#: en/netInstall-intro.xml:79 +#: en/netInstall-intro.xml:75 msgid "Installation Stages" msgstr "" #. type: Content of: <section><section><para> -#: en/netInstall-intro.xml:81 +#: en/netInstall-intro.xml:77 msgid "The installation is carried out in two stages:" msgstr "" #. type: Content of: <section><section><itemizedlist><listitem><para> -#: en/netInstall-intro.xml:85 +#: en/netInstall-intro.xml:81 msgid "" "<emphasis role=\"bold\">Stage 1</emphasis> This is the pre-Installation " "stage. You will need to provide the method and details for accessing the " "medium containing the files to be used for the installation. If the method " -"involves a server, then the network connection will be activated." +"involves a server, then the network connection will be activated. This " +"network can be a WiFi connection with WEP or WPA2 encryption (though please " +"be mindful of the Warning below regarding keyboard input)." msgstr "" #. type: Content of: <section><section><itemizedlist><listitem><para> -#: en/netInstall-intro.xml:93 +#: en/netInstall-intro.xml:91 msgid "" "<emphasis role=\"bold\">Stage 2</emphasis> This is the actual Installation " "stage, which will automatically commence once a connection to the installer " @@ -220,7 +217,7 @@ msgid "" msgstr "" #. type: Content of: <section><section><note><para> -#: en/netInstall-intro.xml:100 +#: en/netInstall-intro.xml:98 msgid "" "During Stage 1, nothing will be written to your Hard Disk, so it is safe to " "quit at any point during Stage 1 if you wish. You can do so by pressing " @@ -229,7 +226,7 @@ msgid "" msgstr "" #. type: Content of: <section><section><tip><para> -#: en/netInstall-intro.xml:112 +#: en/netInstall-intro.xml:110 msgid "" "You can use <keycombo> <keycap>Alt</keycap> <keycap>F3</keycap> </keycombo> " "to read the logs and <keycombo> <keycap>Alt</keycap> <keycap>F1</keycap> </" @@ -237,14 +234,15 @@ msgid "" msgstr "" #. type: Content of: <section><section><warning><para> -#: en/netInstall-intro.xml:124 -msgid "" -"Unlike when installing from DVD or LiveCD, during the first part of the " -"installation (<emphasis role=\"bold\">Stage 1</emphasis>), you will be asked " -"to type things. During this stage, your keyboard will operate as per an " -"<link xlink:href=\"https://en.wikipedia.org/wiki/" -"Keyboard_layout#United_States\">American keyboard</link> layout. This can be " -"very confusing when you need to type names and paths." +#: en/netInstall-intro.xml:122 +msgid "" +"Unlike when installing from DVD or LiveCD, you will be asked to type things " +"during the first part of a Network installation (<emphasis role=\"bold" +"\">Stage 1</emphasis>). Throughout this stage, however, your keyboard will " +"operate as per an <link xlink:href=\"https://en.wikipedia.org/wiki/" +"Keyboard_layout#United_States\">American keyboard</link> layout. Please bear " +"this in mind to avoid confusion when entering things like names and paths " +"etc." msgstr "" #. type: Content of: <section><title> diff --git a/docs/docs/stable/bootiso/ja.po b/docs/docs/stable/bootiso/ja.po index f8120e15..0059c8b8 100644 --- a/docs/docs/stable/bootiso/ja.po +++ b/docs/docs/stable/bootiso/ja.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: Mageia Boot ISO Help 6.0\n" "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n" -"POT-Creation-Date: 2019-01-18 19:11+0200\n" +"POT-Creation-Date: 2020-12-20 15:06+0200\n" "PO-Revision-Date: 2017-04-04 18:35+0000\n" "Last-Translator: Masanori Kakura <kakurasan@gmail.com>, 2019\n" "Language-Team: Japanese (https://www.transifex.com/MageiaLinux/teams/9361/" @@ -98,29 +98,30 @@ msgid "Installing Mageia using a Tiny Boot Image" msgstr "小さな起動イメージを用いて Mageia をインストール" #. type: Content of: <section><title> -#: en/netInstall-intro.xml:11 +#: en/netInstall-intro.xml:12 msgid "Introduction" msgstr "はじめに" #. type: Content of: <section><section><title> -#: en/netInstall-intro.xml:14 +#: en/netInstall-intro.xml:15 msgid "NetInstall Media" msgstr "ネット インストール メディア" #. type: Content of: <section><section><section><title> -#: en/netInstall-intro.xml:17 +#: en/netInstall-intro.xml:18 msgid "Description" msgstr "説明" #. type: Content of: <section><section><section><para> -#: en/netInstall-intro.xml:19 +#: en/netInstall-intro.xml:20 msgid "These minimal ISO's contain:" msgstr "これらの最小限の ISO は:" #. type: Content of: <section><section><section><itemizedlist><listitem><para> -#: en/netInstall-intro.xml:23 +#: en/netInstall-intro.xml:24 +#, fuzzy msgid "" -"less than 100 MB and are convenient if bandwidth is too low to download a " +"less than 120 MB and are convenient if bandwidth is too low to download a " "full DVD, or if you have a PC without a DVD drive or unable to boot from a " "USB stick." msgstr "" @@ -129,10 +130,11 @@ msgstr "" "利です。" #. type: Content of: <section><section><section><itemizedlist><listitem><para> -#: en/netInstall-intro.xml:29 +#: en/netInstall-intro.xml:30 +#, fuzzy msgid "" -"no more than that which is needed to a) start the <literal>DrakX</literal> " -"installer and b) find <literal>DrakX-installer-stage2</literal> and other " +"no more than that which is needed to (a) start the <literal>DrakX</literal> " +"installer and (b) find <literal>DrakX-installer-stage2</literal> and other " "packages that are needed to continue and complete the install." msgstr "" "以下に必要なもの以外を含みません。a) <literal>DrakX</literal> インストーラを" @@ -140,7 +142,7 @@ msgstr "" "完了に必要な他のパッケージを見つける" #. type: Content of: <section><section><section><para> -#: en/netInstall-intro.xml:36 +#: en/netInstall-intro.xml:37 msgid "" "The required source packages may be on a PC hard disk, a local drive, a " "local network or on the Internet." @@ -148,24 +150,18 @@ msgstr "" "要求されるソース パッケージは PC のハード ディスク, ローカルのドライブ, ロー" "カル ネットワーク, インターネット上から利用できます。" -#. type: Content of: <section><section><section><note><para> -#: en/netInstall-intro.xml:40 -msgid "Installation via encrypted wifi or bluetooth is not supported." -msgstr "" -"暗号化された wifi または bluetooth 経由のインストールはサポートされません。" - #. type: Content of: <section><section><section><title> -#: en/netInstall-intro.xml:46 +#: en/netInstall-intro.xml:42 msgid "Availability" msgstr "種類" #. type: Content of: <section><section><section><para> -#: en/netInstall-intro.xml:48 +#: en/netInstall-intro.xml:44 msgid "There a two versions of the NetInstall media:" msgstr "ネット インストール メディアには二つのバージョンがあります:" #. type: Content of: <section><section><section><itemizedlist><listitem><para> -#: en/netInstall-intro.xml:52 +#: en/netInstall-intro.xml:48 msgid "" "<emphasis role=\"bold\">netinstall.iso</emphasis> For those who prefer not " "to use non-free software, this ISO contains only free software." @@ -174,7 +170,7 @@ msgstr "" "用しないことを好む方々に向けたものとなります。" #. type: Content of: <section><section><section><itemizedlist><listitem><para> -#: en/netInstall-intro.xml:58 +#: en/netInstall-intro.xml:54 msgid "" "<emphasis role=\"bold\">netinstall-nonfree.iso</emphasis> This ISO " "additionally includes proprietary device drivers, which may be required for " @@ -185,7 +181,7 @@ msgstr "" "スク コントローラなどに必要となる可能性があります。" #. type: Content of: <section><section><section><para> -#: en/netInstall-intro.xml:64 +#: en/netInstall-intro.xml:60 msgid "" "Both versions are available in the form of separate 32-bit and 64-bit ISO's. " "See here: <link xlink:href=\"https://www.mageia.org/downloads/\">https://www." @@ -196,12 +192,12 @@ msgstr "" "\">https://www.mageia.org/ja/downloads/</link>" #. type: Content of: <section><section><section><title> -#: en/netInstall-intro.xml:70 +#: en/netInstall-intro.xml:66 msgid "Preparation" msgstr "準備" #. type: Content of: <section><section><section><para> -#: en/netInstall-intro.xml:72 +#: en/netInstall-intro.xml:68 msgid "" "After downloading the image, burn it to a CD/DVD or, if you prefer to put it " "on a USB stick, follow the instructions here: <link xlink:href=\"https://" @@ -215,22 +211,25 @@ msgstr "" "wiki.mageia.org/en/Installation_Media#Dump_Mageia_ISOs_on_an_USB_stick</link>" #. type: Content of: <section><section><title> -#: en/netInstall-intro.xml:79 +#: en/netInstall-intro.xml:75 msgid "Installation Stages" msgstr "インストールの段階" #. type: Content of: <section><section><para> -#: en/netInstall-intro.xml:81 +#: en/netInstall-intro.xml:77 msgid "The installation is carried out in two stages:" msgstr "インストールは二つの段階で行われます:" #. type: Content of: <section><section><itemizedlist><listitem><para> -#: en/netInstall-intro.xml:85 +#: en/netInstall-intro.xml:81 +#, fuzzy msgid "" "<emphasis role=\"bold\">Stage 1</emphasis> This is the pre-Installation " "stage. You will need to provide the method and details for accessing the " "medium containing the files to be used for the installation. If the method " -"involves a server, then the network connection will be activated." +"involves a server, then the network connection will be activated. This " +"network can be a WiFi connection with WEP or WPA2 encryption (though please " +"be mindful of the Warning below regarding keyboard input)." msgstr "" "<emphasis role=\"bold\">Stage 1</emphasis> これはインストール前の段階です。イ" "ンストールに用いられるファイルを含むメディアにアクセスするための方法と詳細を" @@ -238,7 +237,7 @@ msgstr "" "続が有効化されます。" #. type: Content of: <section><section><itemizedlist><listitem><para> -#: en/netInstall-intro.xml:93 +#: en/netInstall-intro.xml:91 msgid "" "<emphasis role=\"bold\">Stage 2</emphasis> This is the actual Installation " "stage, which will automatically commence once a connection to the installer " @@ -248,7 +247,7 @@ msgstr "" "インストーラのファイルに接続できしだい自動的に開始します。" #. type: Content of: <section><section><note><para> -#: en/netInstall-intro.xml:100 +#: en/netInstall-intro.xml:98 msgid "" "During Stage 1, nothing will be written to your Hard Disk, so it is safe to " "quit at any point during Stage 1 if you wish. You can do so by pressing " @@ -261,7 +260,7 @@ msgstr "" "を押します。" #. type: Content of: <section><section><tip><para> -#: en/netInstall-intro.xml:112 +#: en/netInstall-intro.xml:110 msgid "" "You can use <keycombo> <keycap>Alt</keycap> <keycap>F3</keycap> </keycombo> " "to read the logs and <keycombo> <keycap>Alt</keycap> <keycap>F1</keycap> </" @@ -272,14 +271,16 @@ msgstr "" "<keycap>F1</keycap> </keycombo> を使用します。" #. type: Content of: <section><section><warning><para> -#: en/netInstall-intro.xml:124 +#: en/netInstall-intro.xml:122 +#, fuzzy msgid "" -"Unlike when installing from DVD or LiveCD, during the first part of the " -"installation (<emphasis role=\"bold\">Stage 1</emphasis>), you will be asked " -"to type things. During this stage, your keyboard will operate as per an " -"<link xlink:href=\"https://en.wikipedia.org/wiki/" -"Keyboard_layout#United_States\">American keyboard</link> layout. This can be " -"very confusing when you need to type names and paths." +"Unlike when installing from DVD or LiveCD, you will be asked to type things " +"during the first part of a Network installation (<emphasis role=\"bold" +"\">Stage 1</emphasis>). Throughout this stage, however, your keyboard will " +"operate as per an <link xlink:href=\"https://en.wikipedia.org/wiki/" +"Keyboard_layout#United_States\">American keyboard</link> layout. Please bear " +"this in mind to avoid confusion when entering things like names and paths " +"etc." msgstr "" "DVD や ライブ CD からのインストール時とは異なり、インストールの最初の段階 " "(<emphasis role=\"bold\">Stage 1</emphasis>) では、入力を行う場面があります。" @@ -830,3 +831,8 @@ msgstr "" "あなたが本マニュアル内で目にしたすべてのインストーラの画面を目にする人はいな" "いでしょう。どの画面を見ることになるのかは、あなたのハードウェアとインストー" "ル時の選択内容によって変わります。" + +#~ msgid "Installation via encrypted wifi or bluetooth is not supported." +#~ msgstr "" +#~ "暗号化された wifi または bluetooth 経由のインストールはサポートされませ" +#~ "ん。" diff --git a/docs/docs/stable/bootiso/nb.po b/docs/docs/stable/bootiso/nb.po index 46ffb3e3..47c0537a 100644 --- a/docs/docs/stable/bootiso/nb.po +++ b/docs/docs/stable/bootiso/nb.po @@ -13,7 +13,7 @@ msgid "" msgstr "" "Project-Id-Version: Mageia Boot ISO Help 6.0\n" "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n" -"POT-Creation-Date: 2019-01-18 19:11+0200\n" +"POT-Creation-Date: 2020-12-20 15:06+0200\n" "PO-Revision-Date: 2017-04-04 18:35+0000\n" "Last-Translator: Karl Morten Ramberg <karl.m.ramberg@gmail.com>, 2020\n" "Language-Team: Norwegian Bokmål (https://www.transifex.com/MageiaLinux/" @@ -98,29 +98,30 @@ msgid "Installing Mageia using a Tiny Boot Image" msgstr "Installer Mageia fra et Lite Boot Bilde" #. type: Content of: <section><title> -#: en/netInstall-intro.xml:11 +#: en/netInstall-intro.xml:12 msgid "Introduction" msgstr "Introduksjon" #. type: Content of: <section><section><title> -#: en/netInstall-intro.xml:14 +#: en/netInstall-intro.xml:15 msgid "NetInstall Media" msgstr "Mageia NettverksInstallering" #. type: Content of: <section><section><section><title> -#: en/netInstall-intro.xml:17 +#: en/netInstall-intro.xml:18 msgid "Description" msgstr "Beskrivelse" #. type: Content of: <section><section><section><para> -#: en/netInstall-intro.xml:19 +#: en/netInstall-intro.xml:20 msgid "These minimal ISO's contain:" msgstr "Disse minimale ISOene inneholder:" #. type: Content of: <section><section><section><itemizedlist><listitem><para> -#: en/netInstall-intro.xml:23 +#: en/netInstall-intro.xml:24 +#, fuzzy msgid "" -"less than 100 MB and are convenient if bandwidth is too low to download a " +"less than 120 MB and are convenient if bandwidth is too low to download a " "full DVD, or if you have a PC without a DVD drive or unable to boot from a " "USB stick." msgstr "" @@ -129,10 +130,11 @@ msgstr "" "uten DVD-stasjon eller som ikke kan starte fra en USB-pinne." #. type: Content of: <section><section><section><itemizedlist><listitem><para> -#: en/netInstall-intro.xml:29 +#: en/netInstall-intro.xml:30 +#, fuzzy msgid "" -"no more than that which is needed to a) start the <literal>DrakX</literal> " -"installer and b) find <literal>DrakX-installer-stage2</literal> and other " +"no more than that which is needed to (a) start the <literal>DrakX</literal> " +"installer and (b) find <literal>DrakX-installer-stage2</literal> and other " "packages that are needed to continue and complete the install." msgstr "" "ikke mer enn det som trengs for å a) starte <literal>DrakX</literal> " @@ -141,7 +143,7 @@ msgstr "" "installasjonen." #. type: Content of: <section><section><section><para> -#: en/netInstall-intro.xml:36 +#: en/netInstall-intro.xml:37 msgid "" "The required source packages may be on a PC hard disk, a local drive, a " "local network or on the Internet." @@ -149,23 +151,18 @@ msgstr "" "De nødvendige kildepakkene kan ligge på en PC-harddisk, en lokal stasjon, et " "lokalt nettverk eller på Internett." -#. type: Content of: <section><section><section><note><para> -#: en/netInstall-intro.xml:40 -msgid "Installation via encrypted wifi or bluetooth is not supported." -msgstr "Installasjon via kryptert wifi eller bluetooth støttes ikke." - #. type: Content of: <section><section><section><title> -#: en/netInstall-intro.xml:46 +#: en/netInstall-intro.xml:42 msgid "Availability" msgstr "Tilgjengelighet" #. type: Content of: <section><section><section><para> -#: en/netInstall-intro.xml:48 +#: en/netInstall-intro.xml:44 msgid "There a two versions of the NetInstall media:" msgstr "Det er to versjoner av NettInstallasjons media:" #. type: Content of: <section><section><section><itemizedlist><listitem><para> -#: en/netInstall-intro.xml:52 +#: en/netInstall-intro.xml:48 msgid "" "<emphasis role=\"bold\">netinstall.iso</emphasis> For those who prefer not " "to use non-free software, this ISO contains only free software." @@ -175,7 +172,7 @@ msgstr "" "programvare." #. type: Content of: <section><section><section><itemizedlist><listitem><para> -#: en/netInstall-intro.xml:58 +#: en/netInstall-intro.xml:54 msgid "" "<emphasis role=\"bold\">netinstall-nonfree.iso</emphasis> This ISO " "additionally includes proprietary device drivers, which may be required for " @@ -186,7 +183,7 @@ msgstr "" "for nettverksenheten, diskkontrolleren etc." #. type: Content of: <section><section><section><para> -#: en/netInstall-intro.xml:64 +#: en/netInstall-intro.xml:60 msgid "" "Both versions are available in the form of separate 32-bit and 64-bit ISO's. " "See here: <link xlink:href=\"https://www.mageia.org/downloads/\">https://www." @@ -197,12 +194,12 @@ msgstr "" "\">https://www.mageia.org/downloads/</link>" #. type: Content of: <section><section><section><title> -#: en/netInstall-intro.xml:70 +#: en/netInstall-intro.xml:66 msgid "Preparation" msgstr "Forberedelse" #. type: Content of: <section><section><section><para> -#: en/netInstall-intro.xml:72 +#: en/netInstall-intro.xml:68 msgid "" "After downloading the image, burn it to a CD/DVD or, if you prefer to put it " "on a USB stick, follow the instructions here: <link xlink:href=\"https://" @@ -217,22 +214,25 @@ msgstr "" "org/en/Installation_Media#Dump_Mageia_ISOs_on_an_USB_stick </link>." #. type: Content of: <section><section><title> -#: en/netInstall-intro.xml:79 +#: en/netInstall-intro.xml:75 msgid "Installation Stages" msgstr "Installasjonstrinn" #. type: Content of: <section><section><para> -#: en/netInstall-intro.xml:81 +#: en/netInstall-intro.xml:77 msgid "The installation is carried out in two stages:" msgstr "Installasjonen skjer i to trinn:" #. type: Content of: <section><section><itemizedlist><listitem><para> -#: en/netInstall-intro.xml:85 +#: en/netInstall-intro.xml:81 +#, fuzzy msgid "" "<emphasis role=\"bold\">Stage 1</emphasis> This is the pre-Installation " "stage. You will need to provide the method and details for accessing the " "medium containing the files to be used for the installation. If the method " -"involves a server, then the network connection will be activated." +"involves a server, then the network connection will be activated. This " +"network can be a WiFi connection with WEP or WPA2 encryption (though please " +"be mindful of the Warning below regarding keyboard input)." msgstr "" "<emphasis role=\"bold\">Fase 1 </emphasis>Dette er pre-installasjonsfasen. " "Du må angi metodene og detaljene for aksess til mediet som inneholder filene " @@ -240,7 +240,7 @@ msgstr "" "nettverksforbindelsen aktivert." #. type: Content of: <section><section><itemizedlist><listitem><para> -#: en/netInstall-intro.xml:93 +#: en/netInstall-intro.xml:91 msgid "" "<emphasis role=\"bold\">Stage 2</emphasis> This is the actual Installation " "stage, which will automatically commence once a connection to the installer " @@ -251,7 +251,7 @@ msgstr "" "installasjonsfilene er opprettet." #. type: Content of: <section><section><note><para> -#: en/netInstall-intro.xml:100 +#: en/netInstall-intro.xml:98 msgid "" "During Stage 1, nothing will be written to your Hard Disk, so it is safe to " "quit at any point during Stage 1 if you wish. You can do so by pressing " @@ -264,7 +264,7 @@ msgstr "" "keycap><keycap>Del</keycap></keycombo>." #. type: Content of: <section><section><tip><para> -#: en/netInstall-intro.xml:112 +#: en/netInstall-intro.xml:110 msgid "" "You can use <keycombo> <keycap>Alt</keycap> <keycap>F3</keycap> </keycombo> " "to read the logs and <keycombo> <keycap>Alt</keycap> <keycap>F1</keycap> </" @@ -275,14 +275,16 @@ msgstr "" "keycap></keycombo>for å gå tilbake til installasjonsskjermbildet." #. type: Content of: <section><section><warning><para> -#: en/netInstall-intro.xml:124 +#: en/netInstall-intro.xml:122 +#, fuzzy msgid "" -"Unlike when installing from DVD or LiveCD, during the first part of the " -"installation (<emphasis role=\"bold\">Stage 1</emphasis>), you will be asked " -"to type things. During this stage, your keyboard will operate as per an " -"<link xlink:href=\"https://en.wikipedia.org/wiki/" -"Keyboard_layout#United_States\">American keyboard</link> layout. This can be " -"very confusing when you need to type names and paths." +"Unlike when installing from DVD or LiveCD, you will be asked to type things " +"during the first part of a Network installation (<emphasis role=\"bold" +"\">Stage 1</emphasis>). Throughout this stage, however, your keyboard will " +"operate as per an <link xlink:href=\"https://en.wikipedia.org/wiki/" +"Keyboard_layout#United_States\">American keyboard</link> layout. Please bear " +"this in mind to avoid confusion when entering things like names and paths " +"etc." msgstr "" "I motsetning til installasjon fra DVD eller Live CD vil du under første del " "av installasjonen, (<emphasis role=\"bold\">Trinn 1</emphasis>) , bli spurt " @@ -836,3 +838,6 @@ msgstr "" "Ingen vil se alle installasjonsskjermbildene du ser i denne manualen. Hvilke " "skjermbilder du kommer til å se er avhengig av din maskinvare og de valg du " "gjør under installasjonen." + +#~ msgid "Installation via encrypted wifi or bluetooth is not supported." +#~ msgstr "Installasjon via kryptert wifi eller bluetooth støttes ikke." diff --git a/docs/docs/stable/bootiso/nl.po b/docs/docs/stable/bootiso/nl.po index 1d77d60f..802d5b7b 100644 --- a/docs/docs/stable/bootiso/nl.po +++ b/docs/docs/stable/bootiso/nl.po @@ -15,7 +15,7 @@ msgid "" msgstr "" "Project-Id-Version: Mageia Boot ISO Help 6.0\n" "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n" -"POT-Creation-Date: 2019-01-18 19:11+0200\n" +"POT-Creation-Date: 2020-12-20 15:06+0200\n" "PO-Revision-Date: 2017-04-04 18:35+0000\n" "Last-Translator: dragnadh, 2020\n" "Language-Team: Dutch (https://www.transifex.com/MageiaLinux/teams/9361/nl/)\n" @@ -102,29 +102,30 @@ msgid "Installing Mageia using a Tiny Boot Image" msgstr "Installeer Mageia met een Tiny Boot Image" #. type: Content of: <section><title> -#: en/netInstall-intro.xml:11 +#: en/netInstall-intro.xml:12 msgid "Introduction" msgstr "Introductie" #. type: Content of: <section><section><title> -#: en/netInstall-intro.xml:14 +#: en/netInstall-intro.xml:15 msgid "NetInstall Media" msgstr "Netinstallatie-media" #. type: Content of: <section><section><section><title> -#: en/netInstall-intro.xml:17 +#: en/netInstall-intro.xml:18 msgid "Description" msgstr "Beschrijving" #. type: Content of: <section><section><section><para> -#: en/netInstall-intro.xml:19 +#: en/netInstall-intro.xml:20 msgid "These minimal ISO's contain:" msgstr "Deze minimale ISO's bevatten:" #. type: Content of: <section><section><section><itemizedlist><listitem><para> -#: en/netInstall-intro.xml:23 +#: en/netInstall-intro.xml:24 +#, fuzzy msgid "" -"less than 100 MB and are convenient if bandwidth is too low to download a " +"less than 120 MB and are convenient if bandwidth is too low to download a " "full DVD, or if you have a PC without a DVD drive or unable to boot from a " "USB stick." msgstr "" @@ -133,10 +134,11 @@ msgstr "" "niet kan opstarten vanaf een USB-stick." #. type: Content of: <section><section><section><itemizedlist><listitem><para> -#: en/netInstall-intro.xml:29 +#: en/netInstall-intro.xml:30 +#, fuzzy msgid "" -"no more than that which is needed to a) start the <literal>DrakX</literal> " -"installer and b) find <literal>DrakX-installer-stage2</literal> and other " +"no more than that which is needed to (a) start the <literal>DrakX</literal> " +"installer and (b) find <literal>DrakX-installer-stage2</literal> and other " "packages that are needed to continue and complete the install." msgstr "" "niet meer dan wat nodig is om a) het <literal>DrakX</literal>-" @@ -145,7 +147,7 @@ msgstr "" "installatie voort te zetten en te voltooien." #. type: Content of: <section><section><section><para> -#: en/netInstall-intro.xml:36 +#: en/netInstall-intro.xml:37 msgid "" "The required source packages may be on a PC hard disk, a local drive, a " "local network or on the Internet." @@ -153,23 +155,18 @@ msgstr "" "De benodigde bronpakketten kunnen op de harde schijf van een PC, een lokaal " "station, een lokaal netwerk of op het internet staan." -#. type: Content of: <section><section><section><note><para> -#: en/netInstall-intro.xml:40 -msgid "Installation via encrypted wifi or bluetooth is not supported." -msgstr "Installatie via versleutelde wifi of bluetooth wordt niet ondersteund." - #. type: Content of: <section><section><section><title> -#: en/netInstall-intro.xml:46 +#: en/netInstall-intro.xml:42 msgid "Availability" msgstr "Beschikbaarheid" #. type: Content of: <section><section><section><para> -#: en/netInstall-intro.xml:48 +#: en/netInstall-intro.xml:44 msgid "There a two versions of the NetInstall media:" msgstr "Er zijn twee versies van de NetInstall media:" #. type: Content of: <section><section><section><itemizedlist><listitem><para> -#: en/netInstall-intro.xml:52 +#: en/netInstall-intro.xml:48 msgid "" "<emphasis role=\"bold\">netinstall.iso</emphasis> For those who prefer not " "to use non-free software, this ISO contains only free software." @@ -178,7 +175,7 @@ msgstr "" "geen niet-vrije software gebruiken, bevat deze ISO alleen vrije software." #. type: Content of: <section><section><section><itemizedlist><listitem><para> -#: en/netInstall-intro.xml:58 +#: en/netInstall-intro.xml:54 msgid "" "<emphasis role=\"bold\">netinstall-nonfree.iso</emphasis> This ISO " "additionally includes proprietary device drivers, which may be required for " @@ -189,7 +186,7 @@ msgstr "" "netwerkapparaat, schijfbeheerder, enz. " #. type: Content of: <section><section><section><para> -#: en/netInstall-intro.xml:64 +#: en/netInstall-intro.xml:60 msgid "" "Both versions are available in the form of separate 32-bit and 64-bit ISO's. " "See here: <link xlink:href=\"https://www.mageia.org/downloads/\">https://www." @@ -200,12 +197,12 @@ msgstr "" "downloads/\">https://www.mageia.org/downloads/</link>" #. type: Content of: <section><section><section><title> -#: en/netInstall-intro.xml:70 +#: en/netInstall-intro.xml:66 msgid "Preparation" msgstr "Voorbereiding" #. type: Content of: <section><section><section><para> -#: en/netInstall-intro.xml:72 +#: en/netInstall-intro.xml:68 msgid "" "After downloading the image, burn it to a CD/DVD or, if you prefer to put it " "on a USB stick, follow the instructions here: <link xlink:href=\"https://" @@ -220,22 +217,25 @@ msgstr "" "org/en/Installation_Media#Dump_Mageia_ISOs_on_an_USB_stick</link>" #. type: Content of: <section><section><title> -#: en/netInstall-intro.xml:79 +#: en/netInstall-intro.xml:75 msgid "Installation Stages" msgstr "Installatie fasen" #. type: Content of: <section><section><para> -#: en/netInstall-intro.xml:81 +#: en/netInstall-intro.xml:77 msgid "The installation is carried out in two stages:" msgstr "De installatie wordt uitgevoerd in twee fasen:" #. type: Content of: <section><section><itemizedlist><listitem><para> -#: en/netInstall-intro.xml:85 +#: en/netInstall-intro.xml:81 +#, fuzzy msgid "" "<emphasis role=\"bold\">Stage 1</emphasis> This is the pre-Installation " "stage. You will need to provide the method and details for accessing the " "medium containing the files to be used for the installation. If the method " -"involves a server, then the network connection will be activated." +"involves a server, then the network connection will be activated. This " +"network can be a WiFi connection with WEP or WPA2 encryption (though please " +"be mindful of the Warning below regarding keyboard input)." msgstr "" "<emphasis role=\"bold\">Fase 1</emphasis> Dit is de fase voorafgaand aan de " "installatie. U moet de methode en de details voor de toegang tot het medium " @@ -243,7 +243,7 @@ msgstr "" "de methode een server betreft, dan wordt de netwerkverbinding geactiveerd." #. type: Content of: <section><section><itemizedlist><listitem><para> -#: en/netInstall-intro.xml:93 +#: en/netInstall-intro.xml:91 msgid "" "<emphasis role=\"bold\">Stage 2</emphasis> This is the actual Installation " "stage, which will automatically commence once a connection to the installer " @@ -254,7 +254,7 @@ msgstr "" "installatiebestanden tot stand is gebracht." #. type: Content of: <section><section><note><para> -#: en/netInstall-intro.xml:100 +#: en/netInstall-intro.xml:98 msgid "" "During Stage 1, nothing will be written to your Hard Disk, so it is safe to " "quit at any point during Stage 1 if you wish. You can do so by pressing " @@ -267,7 +267,7 @@ msgstr "" "keycombo> in te drukken." #. type: Content of: <section><section><tip><para> -#: en/netInstall-intro.xml:112 +#: en/netInstall-intro.xml:110 msgid "" "You can use <keycombo> <keycap>Alt</keycap> <keycap>F3</keycap> </keycombo> " "to read the logs and <keycombo> <keycap>Alt</keycap> <keycap>F1</keycap> </" @@ -279,14 +279,16 @@ msgstr "" "installatiescherm." #. type: Content of: <section><section><warning><para> -#: en/netInstall-intro.xml:124 +#: en/netInstall-intro.xml:122 +#, fuzzy msgid "" -"Unlike when installing from DVD or LiveCD, during the first part of the " -"installation (<emphasis role=\"bold\">Stage 1</emphasis>), you will be asked " -"to type things. During this stage, your keyboard will operate as per an " -"<link xlink:href=\"https://en.wikipedia.org/wiki/" -"Keyboard_layout#United_States\">American keyboard</link> layout. This can be " -"very confusing when you need to type names and paths." +"Unlike when installing from DVD or LiveCD, you will be asked to type things " +"during the first part of a Network installation (<emphasis role=\"bold" +"\">Stage 1</emphasis>). Throughout this stage, however, your keyboard will " +"operate as per an <link xlink:href=\"https://en.wikipedia.org/wiki/" +"Keyboard_layout#United_States\">American keyboard</link> layout. Please bear " +"this in mind to avoid confusion when entering things like names and paths " +"etc." msgstr "" "In tegenstelling tot het installeren via DVD of LiveCD, wordt tijdens het " "eerste deel van de installatie (<emphasis role=\"bold\">Fase 1</emphasis>), " @@ -844,3 +846,7 @@ msgstr "" "U zult niet alle installatieschermen zien die in deze handleiding besproken " "worden. Welke schermen u krijgt hangt af van uw systeem en van de keuzes die " "u tijdens het installeren maakt." + +#~ msgid "Installation via encrypted wifi or bluetooth is not supported." +#~ msgstr "" +#~ "Installatie via versleutelde wifi of bluetooth wordt niet ondersteund." diff --git a/docs/docs/stable/bootiso/pl.po b/docs/docs/stable/bootiso/pl.po index 616c0751..b62753a6 100644 --- a/docs/docs/stable/bootiso/pl.po +++ b/docs/docs/stable/bootiso/pl.po @@ -13,7 +13,7 @@ msgid "" msgstr "" "Project-Id-Version: Mageia Boot ISO Help 6.0\n" "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n" -"POT-Creation-Date: 2019-01-18 19:11+0200\n" +"POT-Creation-Date: 2020-12-20 15:06+0200\n" "PO-Revision-Date: 2017-04-04 18:35+0000\n" "Last-Translator: Szymon Scholz <szymonscholz@gmail.com>, 2019\n" "Language-Team: Polish (https://www.transifex.com/MageiaLinux/teams/9361/" @@ -97,65 +97,60 @@ msgid "Installing Mageia using a Tiny Boot Image" msgstr "" #. type: Content of: <section><title> -#: en/netInstall-intro.xml:11 +#: en/netInstall-intro.xml:12 msgid "Introduction" msgstr "Wprowadzenie" #. type: Content of: <section><section><title> -#: en/netInstall-intro.xml:14 +#: en/netInstall-intro.xml:15 msgid "NetInstall Media" msgstr "" #. type: Content of: <section><section><section><title> -#: en/netInstall-intro.xml:17 +#: en/netInstall-intro.xml:18 msgid "Description" msgstr "Opis" #. type: Content of: <section><section><section><para> -#: en/netInstall-intro.xml:19 +#: en/netInstall-intro.xml:20 msgid "These minimal ISO's contain:" msgstr "" #. type: Content of: <section><section><section><itemizedlist><listitem><para> -#: en/netInstall-intro.xml:23 +#: en/netInstall-intro.xml:24 msgid "" -"less than 100 MB and are convenient if bandwidth is too low to download a " +"less than 120 MB and are convenient if bandwidth is too low to download a " "full DVD, or if you have a PC without a DVD drive or unable to boot from a " "USB stick." msgstr "" #. type: Content of: <section><section><section><itemizedlist><listitem><para> -#: en/netInstall-intro.xml:29 +#: en/netInstall-intro.xml:30 msgid "" -"no more than that which is needed to a) start the <literal>DrakX</literal> " -"installer and b) find <literal>DrakX-installer-stage2</literal> and other " +"no more than that which is needed to (a) start the <literal>DrakX</literal> " +"installer and (b) find <literal>DrakX-installer-stage2</literal> and other " "packages that are needed to continue and complete the install." msgstr "" #. type: Content of: <section><section><section><para> -#: en/netInstall-intro.xml:36 +#: en/netInstall-intro.xml:37 msgid "" "The required source packages may be on a PC hard disk, a local drive, a " "local network or on the Internet." msgstr "" -#. type: Content of: <section><section><section><note><para> -#: en/netInstall-intro.xml:40 -msgid "Installation via encrypted wifi or bluetooth is not supported." -msgstr "Instalacja przez szyfrowane wifi lub bluetooth nie jest wspierana." - #. type: Content of: <section><section><section><title> -#: en/netInstall-intro.xml:46 +#: en/netInstall-intro.xml:42 msgid "Availability" msgstr "Dostępność" #. type: Content of: <section><section><section><para> -#: en/netInstall-intro.xml:48 +#: en/netInstall-intro.xml:44 msgid "There a two versions of the NetInstall media:" msgstr "Istnieją dwie wersje Instalacji Sieciowej:" #. type: Content of: <section><section><section><itemizedlist><listitem><para> -#: en/netInstall-intro.xml:52 +#: en/netInstall-intro.xml:48 msgid "" "<emphasis role=\"bold\">netinstall.iso</emphasis> For those who prefer not " "to use non-free software, this ISO contains only free software." @@ -165,7 +160,7 @@ msgstr "" "oprogramowanie." #. type: Content of: <section><section><section><itemizedlist><listitem><para> -#: en/netInstall-intro.xml:58 +#: en/netInstall-intro.xml:54 msgid "" "<emphasis role=\"bold\">netinstall-nonfree.iso</emphasis> This ISO " "additionally includes proprietary device drivers, which may be required for " @@ -173,7 +168,7 @@ msgid "" msgstr "" #. type: Content of: <section><section><section><para> -#: en/netInstall-intro.xml:64 +#: en/netInstall-intro.xml:60 msgid "" "Both versions are available in the form of separate 32-bit and 64-bit ISO's. " "See here: <link xlink:href=\"https://www.mageia.org/downloads/\">https://www." @@ -181,12 +176,12 @@ msgid "" msgstr "" #. type: Content of: <section><section><section><title> -#: en/netInstall-intro.xml:70 +#: en/netInstall-intro.xml:66 msgid "Preparation" msgstr "Przygotowanie" #. type: Content of: <section><section><section><para> -#: en/netInstall-intro.xml:72 +#: en/netInstall-intro.xml:68 msgid "" "After downloading the image, burn it to a CD/DVD or, if you prefer to put it " "on a USB stick, follow the instructions here: <link xlink:href=\"https://" @@ -196,26 +191,28 @@ msgid "" msgstr "" #. type: Content of: <section><section><title> -#: en/netInstall-intro.xml:79 +#: en/netInstall-intro.xml:75 msgid "Installation Stages" msgstr "Etapy Instalacji" #. type: Content of: <section><section><para> -#: en/netInstall-intro.xml:81 +#: en/netInstall-intro.xml:77 msgid "The installation is carried out in two stages:" msgstr "" #. type: Content of: <section><section><itemizedlist><listitem><para> -#: en/netInstall-intro.xml:85 +#: en/netInstall-intro.xml:81 msgid "" "<emphasis role=\"bold\">Stage 1</emphasis> This is the pre-Installation " "stage. You will need to provide the method and details for accessing the " "medium containing the files to be used for the installation. If the method " -"involves a server, then the network connection will be activated." +"involves a server, then the network connection will be activated. This " +"network can be a WiFi connection with WEP or WPA2 encryption (though please " +"be mindful of the Warning below regarding keyboard input)." msgstr "" #. type: Content of: <section><section><itemizedlist><listitem><para> -#: en/netInstall-intro.xml:93 +#: en/netInstall-intro.xml:91 msgid "" "<emphasis role=\"bold\">Stage 2</emphasis> This is the actual Installation " "stage, which will automatically commence once a connection to the installer " @@ -223,7 +220,7 @@ msgid "" msgstr "" #. type: Content of: <section><section><note><para> -#: en/netInstall-intro.xml:100 +#: en/netInstall-intro.xml:98 msgid "" "During Stage 1, nothing will be written to your Hard Disk, so it is safe to " "quit at any point during Stage 1 if you wish. You can do so by pressing " @@ -232,7 +229,7 @@ msgid "" msgstr "" #. type: Content of: <section><section><tip><para> -#: en/netInstall-intro.xml:112 +#: en/netInstall-intro.xml:110 msgid "" "You can use <keycombo> <keycap>Alt</keycap> <keycap>F3</keycap> </keycombo> " "to read the logs and <keycombo> <keycap>Alt</keycap> <keycap>F1</keycap> </" @@ -240,14 +237,15 @@ msgid "" msgstr "" #. type: Content of: <section><section><warning><para> -#: en/netInstall-intro.xml:124 +#: en/netInstall-intro.xml:122 msgid "" -"Unlike when installing from DVD or LiveCD, during the first part of the " -"installation (<emphasis role=\"bold\">Stage 1</emphasis>), you will be asked " -"to type things. During this stage, your keyboard will operate as per an " -"<link xlink:href=\"https://en.wikipedia.org/wiki/" -"Keyboard_layout#United_States\">American keyboard</link> layout. This can be " -"very confusing when you need to type names and paths." +"Unlike when installing from DVD or LiveCD, you will be asked to type things " +"during the first part of a Network installation (<emphasis role=\"bold" +"\">Stage 1</emphasis>). Throughout this stage, however, your keyboard will " +"operate as per an <link xlink:href=\"https://en.wikipedia.org/wiki/" +"Keyboard_layout#United_States\">American keyboard</link> layout. Please bear " +"this in mind to avoid confusion when entering things like names and paths " +"etc." msgstr "" #. type: Content of: <section><title> @@ -719,3 +717,6 @@ msgstr "" "Nikt nie zobaczy wszystkich zrzutów ekranu zaprezentowanych w tym manualu. " "To które ekrany zobaczysz zależy od tego jaki posiadasz sprzęt oraz jakich " "wyborów dokonasz podczas instalacji." + +#~ msgid "Installation via encrypted wifi or bluetooth is not supported." +#~ msgstr "Instalacja przez szyfrowane wifi lub bluetooth nie jest wspierana." diff --git a/docs/docs/stable/bootiso/pt.po b/docs/docs/stable/bootiso/pt.po index 627667d5..def351eb 100644 --- a/docs/docs/stable/bootiso/pt.po +++ b/docs/docs/stable/bootiso/pt.po @@ -14,7 +14,7 @@ msgid "" msgstr "" "Project-Id-Version: Mageia Boot ISO Help 6.0\n" "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n" -"POT-Creation-Date: 2019-01-18 19:11+0200\n" +"POT-Creation-Date: 2020-12-20 15:06+0200\n" "PO-Revision-Date: 2017-04-04 18:35+0000\n" "Last-Translator: Sérgio Marques <smarquespt@gmail.com>, 2019\n" "Language-Team: Portuguese (https://www.transifex.com/MageiaLinux/teams/9361/" @@ -102,29 +102,30 @@ msgid "Installing Mageia using a Tiny Boot Image" msgstr "Instalar Mageia utilizando uma imagem de arranque" #. type: Content of: <section><title> -#: en/netInstall-intro.xml:11 +#: en/netInstall-intro.xml:12 msgid "Introduction" msgstr "Introdução" #. type: Content of: <section><section><title> -#: en/netInstall-intro.xml:14 +#: en/netInstall-intro.xml:15 msgid "NetInstall Media" msgstr "NetInstall Media" #. type: Content of: <section><section><section><title> -#: en/netInstall-intro.xml:17 +#: en/netInstall-intro.xml:18 msgid "Description" msgstr "Descrição" #. type: Content of: <section><section><section><para> -#: en/netInstall-intro.xml:19 +#: en/netInstall-intro.xml:20 msgid "These minimal ISO's contain:" msgstr "Estes ISO têm:" #. type: Content of: <section><section><section><itemizedlist><listitem><para> -#: en/netInstall-intro.xml:23 +#: en/netInstall-intro.xml:24 +#, fuzzy msgid "" -"less than 100 MB and are convenient if bandwidth is too low to download a " +"less than 120 MB and are convenient if bandwidth is too low to download a " "full DVD, or if you have a PC without a DVD drive or unable to boot from a " "USB stick." msgstr "" @@ -133,10 +134,11 @@ msgstr "" "consigam arrancar através de uma unidade USB." #. type: Content of: <section><section><section><itemizedlist><listitem><para> -#: en/netInstall-intro.xml:29 +#: en/netInstall-intro.xml:30 +#, fuzzy msgid "" -"no more than that which is needed to a) start the <literal>DrakX</literal> " -"installer and b) find <literal>DrakX-installer-stage2</literal> and other " +"no more than that which is needed to (a) start the <literal>DrakX</literal> " +"installer and (b) find <literal>DrakX-installer-stage2</literal> and other " "packages that are needed to continue and complete the install." msgstr "" "apenas as ferramentas necessárias para a) iniciar o instalador " @@ -145,7 +147,7 @@ msgstr "" "realizar a instalação." #. type: Content of: <section><section><section><para> -#: en/netInstall-intro.xml:36 +#: en/netInstall-intro.xml:37 msgid "" "The required source packages may be on a PC hard disk, a local drive, a " "local network or on the Internet." @@ -153,32 +155,25 @@ msgstr "" "Os pacotes necessários para a instalação podem estar no disco rígido do PC, " "numa unidade externa, na rede local ou na Internet." -#. type: Content of: <section><section><section><note><para> -#: en/netInstall-intro.xml:40 -msgid "Installation via encrypted wifi or bluetooth is not supported." -msgstr "" -"A instalação através de redes Wi-Fi cifradas ou por ligações Bluetooth não " -"são suportadas." - #. type: Content of: <section><section><section><title> -#: en/netInstall-intro.xml:46 +#: en/netInstall-intro.xml:42 msgid "Availability" msgstr "Disponibilidade" #. type: Content of: <section><section><section><para> -#: en/netInstall-intro.xml:48 +#: en/netInstall-intro.xml:44 msgid "There a two versions of the NetInstall media:" msgstr "Existem duas versões do disco NetInstall:" #. type: Content of: <section><section><section><itemizedlist><listitem><para> -#: en/netInstall-intro.xml:52 +#: en/netInstall-intro.xml:48 msgid "" "<emphasis role=\"bold\">netinstall.iso</emphasis> For those who prefer not " "to use non-free software, this ISO contains only free software." msgstr "" #. type: Content of: <section><section><section><itemizedlist><listitem><para> -#: en/netInstall-intro.xml:58 +#: en/netInstall-intro.xml:54 msgid "" "<emphasis role=\"bold\">netinstall-nonfree.iso</emphasis> This ISO " "additionally includes proprietary device drivers, which may be required for " @@ -186,7 +181,7 @@ msgid "" msgstr "" #. type: Content of: <section><section><section><para> -#: en/netInstall-intro.xml:64 +#: en/netInstall-intro.xml:60 msgid "" "Both versions are available in the form of separate 32-bit and 64-bit ISO's. " "See here: <link xlink:href=\"https://www.mageia.org/downloads/\">https://www." @@ -194,12 +189,12 @@ msgid "" msgstr "" #. type: Content of: <section><section><section><title> -#: en/netInstall-intro.xml:70 +#: en/netInstall-intro.xml:66 msgid "Preparation" msgstr "Preparação" #. type: Content of: <section><section><section><para> -#: en/netInstall-intro.xml:72 +#: en/netInstall-intro.xml:68 msgid "" "After downloading the image, burn it to a CD/DVD or, if you prefer to put it " "on a USB stick, follow the instructions here: <link xlink:href=\"https://" @@ -209,26 +204,28 @@ msgid "" msgstr "" #. type: Content of: <section><section><title> -#: en/netInstall-intro.xml:79 +#: en/netInstall-intro.xml:75 msgid "Installation Stages" msgstr "" #. type: Content of: <section><section><para> -#: en/netInstall-intro.xml:81 +#: en/netInstall-intro.xml:77 msgid "The installation is carried out in two stages:" msgstr "" #. type: Content of: <section><section><itemizedlist><listitem><para> -#: en/netInstall-intro.xml:85 +#: en/netInstall-intro.xml:81 msgid "" "<emphasis role=\"bold\">Stage 1</emphasis> This is the pre-Installation " "stage. You will need to provide the method and details for accessing the " "medium containing the files to be used for the installation. If the method " -"involves a server, then the network connection will be activated." +"involves a server, then the network connection will be activated. This " +"network can be a WiFi connection with WEP or WPA2 encryption (though please " +"be mindful of the Warning below regarding keyboard input)." msgstr "" #. type: Content of: <section><section><itemizedlist><listitem><para> -#: en/netInstall-intro.xml:93 +#: en/netInstall-intro.xml:91 msgid "" "<emphasis role=\"bold\">Stage 2</emphasis> This is the actual Installation " "stage, which will automatically commence once a connection to the installer " @@ -236,7 +233,7 @@ msgid "" msgstr "" #. type: Content of: <section><section><note><para> -#: en/netInstall-intro.xml:100 +#: en/netInstall-intro.xml:98 msgid "" "During Stage 1, nothing will be written to your Hard Disk, so it is safe to " "quit at any point during Stage 1 if you wish. You can do so by pressing " @@ -245,7 +242,7 @@ msgid "" msgstr "" #. type: Content of: <section><section><tip><para> -#: en/netInstall-intro.xml:112 +#: en/netInstall-intro.xml:110 msgid "" "You can use <keycombo> <keycap>Alt</keycap> <keycap>F3</keycap> </keycombo> " "to read the logs and <keycombo> <keycap>Alt</keycap> <keycap>F1</keycap> </" @@ -253,14 +250,15 @@ msgid "" msgstr "" #. type: Content of: <section><section><warning><para> -#: en/netInstall-intro.xml:124 +#: en/netInstall-intro.xml:122 msgid "" -"Unlike when installing from DVD or LiveCD, during the first part of the " -"installation (<emphasis role=\"bold\">Stage 1</emphasis>), you will be asked " -"to type things. During this stage, your keyboard will operate as per an " -"<link xlink:href=\"https://en.wikipedia.org/wiki/" -"Keyboard_layout#United_States\">American keyboard</link> layout. This can be " -"very confusing when you need to type names and paths." +"Unlike when installing from DVD or LiveCD, you will be asked to type things " +"during the first part of a Network installation (<emphasis role=\"bold" +"\">Stage 1</emphasis>). Throughout this stage, however, your keyboard will " +"operate as per an <link xlink:href=\"https://en.wikipedia.org/wiki/" +"Keyboard_layout#United_States\">American keyboard</link> layout. Please bear " +"this in mind to avoid confusion when entering things like names and paths " +"etc." msgstr "" #. type: Content of: <section><title> @@ -729,3 +727,8 @@ msgid "" "screens you will see, depends on your hardware and the choices you make " "while installing." msgstr "" + +#~ msgid "Installation via encrypted wifi or bluetooth is not supported." +#~ msgstr "" +#~ "A instalação através de redes Wi-Fi cifradas ou por ligações Bluetooth " +#~ "não são suportadas." diff --git a/docs/docs/stable/bootiso/pt_BR.po b/docs/docs/stable/bootiso/pt_BR.po index 812e638b..5db58d71 100644 --- a/docs/docs/stable/bootiso/pt_BR.po +++ b/docs/docs/stable/bootiso/pt_BR.po @@ -15,7 +15,7 @@ msgid "" msgstr "" "Project-Id-Version: Mageia Boot ISO Help 6.0\n" "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n" -"POT-Creation-Date: 2019-01-18 19:11+0200\n" +"POT-Creation-Date: 2020-12-20 15:06+0200\n" "PO-Revision-Date: 2017-04-04 18:35+0000\n" "Last-Translator: Marcio Andre Padula <padula1000@gmail.com>, 2019\n" "Language-Team: Portuguese (Brazil) (https://www.transifex.com/MageiaLinux/" @@ -100,29 +100,30 @@ msgid "Installing Mageia using a Tiny Boot Image" msgstr "Instalando o Mageia usando uma imagem de inicialização minúscula" #. type: Content of: <section><title> -#: en/netInstall-intro.xml:11 +#: en/netInstall-intro.xml:12 msgid "Introduction" msgstr "Introdução" #. type: Content of: <section><section><title> -#: en/netInstall-intro.xml:14 +#: en/netInstall-intro.xml:15 msgid "NetInstall Media" msgstr "NetInstall Media" #. type: Content of: <section><section><section><title> -#: en/netInstall-intro.xml:17 +#: en/netInstall-intro.xml:18 msgid "Description" msgstr "Descrição" #. type: Content of: <section><section><section><para> -#: en/netInstall-intro.xml:19 +#: en/netInstall-intro.xml:20 msgid "These minimal ISO's contain:" msgstr "Essas ISOs mínimas contêm:" #. type: Content of: <section><section><section><itemizedlist><listitem><para> -#: en/netInstall-intro.xml:23 +#: en/netInstall-intro.xml:24 +#, fuzzy msgid "" -"less than 100 MB and are convenient if bandwidth is too low to download a " +"less than 120 MB and are convenient if bandwidth is too low to download a " "full DVD, or if you have a PC without a DVD drive or unable to boot from a " "USB stick." msgstr "" @@ -131,10 +132,11 @@ msgstr "" "ou não conseguir inicializar a partir de um pendrive." #. type: Content of: <section><section><section><itemizedlist><listitem><para> -#: en/netInstall-intro.xml:29 +#: en/netInstall-intro.xml:30 +#, fuzzy msgid "" -"no more than that which is needed to a) start the <literal>DrakX</literal> " -"installer and b) find <literal>DrakX-installer-stage2</literal> and other " +"no more than that which is needed to (a) start the <literal>DrakX</literal> " +"installer and (b) find <literal>DrakX-installer-stage2</literal> and other " "packages that are needed to continue and complete the install." msgstr "" "Não mais do que aquilo que é necessário para a) iniciar o <literal>DrakX</" @@ -142,7 +144,7 @@ msgstr "" "e outros pacotes que são necessários para continuar e completar a instalação." #. type: Content of: <section><section><section><para> -#: en/netInstall-intro.xml:36 +#: en/netInstall-intro.xml:37 msgid "" "The required source packages may be on a PC hard disk, a local drive, a " "local network or on the Internet." @@ -150,23 +152,18 @@ msgstr "" "Os pacotes de fonte necessários podem estar em um disco rígido do PC, uma " "unidade local, uma rede local ou na Internet." -#. type: Content of: <section><section><section><note><para> -#: en/netInstall-intro.xml:40 -msgid "Installation via encrypted wifi or bluetooth is not supported." -msgstr "A instalação via wifi criptografado ou bluetooth não é suportada." - #. type: Content of: <section><section><section><title> -#: en/netInstall-intro.xml:46 +#: en/netInstall-intro.xml:42 msgid "Availability" msgstr "Disponibilidade" #. type: Content of: <section><section><section><para> -#: en/netInstall-intro.xml:48 +#: en/netInstall-intro.xml:44 msgid "There a two versions of the NetInstall media:" msgstr "Existem duas versões da mídia NetInstall:" #. type: Content of: <section><section><section><itemizedlist><listitem><para> -#: en/netInstall-intro.xml:52 +#: en/netInstall-intro.xml:48 msgid "" "<emphasis role=\"bold\">netinstall.iso</emphasis> For those who prefer not " "to use non-free software, this ISO contains only free software." @@ -175,7 +172,7 @@ msgstr "" "não usar software não-livre, este ISO contém somente software livre." #. type: Content of: <section><section><section><itemizedlist><listitem><para> -#: en/netInstall-intro.xml:58 +#: en/netInstall-intro.xml:54 msgid "" "<emphasis role=\"bold\">netinstall-nonfree.iso</emphasis> This ISO " "additionally includes proprietary device drivers, which may be required for " @@ -186,7 +183,7 @@ msgstr "" "necessários para o seu dispositivo de rede, controlador de disco, etc." #. type: Content of: <section><section><section><para> -#: en/netInstall-intro.xml:64 +#: en/netInstall-intro.xml:60 msgid "" "Both versions are available in the form of separate 32-bit and 64-bit ISO's. " "See here: <link xlink:href=\"https://www.mageia.org/downloads/\">https://www." @@ -197,12 +194,12 @@ msgstr "" "\">https://www.mageia.org/downloads/</link>" #. type: Content of: <section><section><section><title> -#: en/netInstall-intro.xml:70 +#: en/netInstall-intro.xml:66 msgid "Preparation" msgstr "preparação" #. type: Content of: <section><section><section><para> -#: en/netInstall-intro.xml:72 +#: en/netInstall-intro.xml:68 msgid "" "After downloading the image, burn it to a CD/DVD or, if you prefer to put it " "on a USB stick, follow the instructions here: <link xlink:href=\"https://" @@ -216,22 +213,25 @@ msgstr "" "mageia.org/en/Installation_Media#Dump_Mageia_ISOs_on_an_USB_stick</link>" #. type: Content of: <section><section><title> -#: en/netInstall-intro.xml:79 +#: en/netInstall-intro.xml:75 msgid "Installation Stages" msgstr "Estágios de Instalação" #. type: Content of: <section><section><para> -#: en/netInstall-intro.xml:81 +#: en/netInstall-intro.xml:77 msgid "The installation is carried out in two stages:" msgstr "A instalação é realizada em duas etapas:" #. type: Content of: <section><section><itemizedlist><listitem><para> -#: en/netInstall-intro.xml:85 +#: en/netInstall-intro.xml:81 +#, fuzzy msgid "" "<emphasis role=\"bold\">Stage 1</emphasis> This is the pre-Installation " "stage. You will need to provide the method and details for accessing the " "medium containing the files to be used for the installation. If the method " -"involves a server, then the network connection will be activated." +"involves a server, then the network connection will be activated. This " +"network can be a WiFi connection with WEP or WPA2 encryption (though please " +"be mindful of the Warning below regarding keyboard input)." msgstr "" "<emphasis role=\"bold\">Etapa 1</emphasis> Este é etapa de pré instalação. " "Você deverá informar a maneira e detalhes para acessar a mídia contendo os " @@ -239,7 +239,7 @@ msgstr "" "servidor, então uma conexão com a rede deverá ser ativada." #. type: Content of: <section><section><itemizedlist><listitem><para> -#: en/netInstall-intro.xml:93 +#: en/netInstall-intro.xml:91 msgid "" "<emphasis role=\"bold\">Stage 2</emphasis> This is the actual Installation " "stage, which will automatically commence once a connection to the installer " @@ -250,7 +250,7 @@ msgstr "" "instalação." #. type: Content of: <section><section><note><para> -#: en/netInstall-intro.xml:100 +#: en/netInstall-intro.xml:98 msgid "" "During Stage 1, nothing will be written to your Hard Disk, so it is safe to " "quit at any point during Stage 1 if you wish. You can do so by pressing " @@ -263,7 +263,7 @@ msgstr "" "keycap><keycap>Del</keycap></keycombo>." #. type: Content of: <section><section><tip><para> -#: en/netInstall-intro.xml:112 +#: en/netInstall-intro.xml:110 msgid "" "You can use <keycombo> <keycap>Alt</keycap> <keycap>F3</keycap> </keycombo> " "to read the logs and <keycombo> <keycap>Alt</keycap> <keycap>F1</keycap> </" @@ -274,14 +274,16 @@ msgstr "" "keycombo> para retornar a tela de instalação." #. type: Content of: <section><section><warning><para> -#: en/netInstall-intro.xml:124 +#: en/netInstall-intro.xml:122 +#, fuzzy msgid "" -"Unlike when installing from DVD or LiveCD, during the first part of the " -"installation (<emphasis role=\"bold\">Stage 1</emphasis>), you will be asked " -"to type things. During this stage, your keyboard will operate as per an " -"<link xlink:href=\"https://en.wikipedia.org/wiki/" -"Keyboard_layout#United_States\">American keyboard</link> layout. This can be " -"very confusing when you need to type names and paths." +"Unlike when installing from DVD or LiveCD, you will be asked to type things " +"during the first part of a Network installation (<emphasis role=\"bold" +"\">Stage 1</emphasis>). Throughout this stage, however, your keyboard will " +"operate as per an <link xlink:href=\"https://en.wikipedia.org/wiki/" +"Keyboard_layout#United_States\">American keyboard</link> layout. Please bear " +"this in mind to avoid confusion when entering things like names and paths " +"etc." msgstr "" "Ao contrário de quando a instalação é por um DVD ou LiveCD, durante a " "primeira etapa da instalação (<emphasis role=\"bold\">Etapa 1</emphasis>), " @@ -839,3 +841,6 @@ msgstr "" "Ninguém vai ver todas as telas do instalador mostradas neste manual. As " "telas que você verá dependem de seu hardware e as escolhas que você faz " "durante a instalação." + +#~ msgid "Installation via encrypted wifi or bluetooth is not supported." +#~ msgstr "A instalação via wifi criptografado ou bluetooth não é suportada." diff --git a/docs/docs/stable/bootiso/ru.po b/docs/docs/stable/bootiso/ru.po index 944fe714..000ca7e1 100644 --- a/docs/docs/stable/bootiso/ru.po +++ b/docs/docs/stable/bootiso/ru.po @@ -13,7 +13,7 @@ msgid "" msgstr "" "Project-Id-Version: Mageia Boot ISO Help 6.0\n" "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n" -"POT-Creation-Date: 2019-01-18 19:11+0200\n" +"POT-Creation-Date: 2020-12-20 15:06+0200\n" "PO-Revision-Date: 2017-04-04 18:35+0000\n" "Last-Translator: AlexL <loginov.alex.valer@gmail.com>, 2019\n" "Language-Team: Russian (https://www.transifex.com/MageiaLinux/teams/9361/" @@ -102,29 +102,30 @@ msgid "Installing Mageia using a Tiny Boot Image" msgstr "Установка Mageia с маленького загрузочного образа" #. type: Content of: <section><title> -#: en/netInstall-intro.xml:11 +#: en/netInstall-intro.xml:12 msgid "Introduction" msgstr "Введение" #. type: Content of: <section><section><title> -#: en/netInstall-intro.xml:14 +#: en/netInstall-intro.xml:15 msgid "NetInstall Media" msgstr "Носители NetInstall" #. type: Content of: <section><section><section><title> -#: en/netInstall-intro.xml:17 +#: en/netInstall-intro.xml:18 msgid "Description" msgstr "Описание" #. type: Content of: <section><section><section><para> -#: en/netInstall-intro.xml:19 +#: en/netInstall-intro.xml:20 msgid "These minimal ISO's contain:" msgstr "Эти минималистичные образы ISO имеют следующие характеристики:" #. type: Content of: <section><section><section><itemizedlist><listitem><para> -#: en/netInstall-intro.xml:23 +#: en/netInstall-intro.xml:24 +#, fuzzy msgid "" -"less than 100 MB and are convenient if bandwidth is too low to download a " +"less than 120 MB and are convenient if bandwidth is too low to download a " "full DVD, or if you have a PC without a DVD drive or unable to boot from a " "USB stick." msgstr "" @@ -134,10 +135,11 @@ msgstr "" "диска USB." #. type: Content of: <section><section><section><itemizedlist><listitem><para> -#: en/netInstall-intro.xml:29 +#: en/netInstall-intro.xml:30 +#, fuzzy msgid "" -"no more than that which is needed to a) start the <literal>DrakX</literal> " -"installer and b) find <literal>DrakX-installer-stage2</literal> and other " +"no more than that which is needed to (a) start the <literal>DrakX</literal> " +"installer and (b) find <literal>DrakX-installer-stage2</literal> and other " "packages that are needed to continue and complete the install." msgstr "" "на носителях для установки содержится не больше данных, чем это нужно для а) " @@ -146,7 +148,7 @@ msgstr "" "для продолжения и завершения установки системы." #. type: Content of: <section><section><section><para> -#: en/netInstall-intro.xml:36 +#: en/netInstall-intro.xml:37 msgid "" "The required source packages may be on a PC hard disk, a local drive, a " "local network or on the Internet." @@ -154,25 +156,18 @@ msgstr "" "Нужные пакеты программного обеспечения могут храниться на диске компьютера, " "локальном диске, диске в локальной сети или сервере в интернете." -#. type: Content of: <section><section><section><note><para> -#: en/netInstall-intro.xml:40 -msgid "Installation via encrypted wifi or bluetooth is not supported." -msgstr "" -"Поддержка установки с помощью зашифрованного канала wifi или bluetooth не " -"предусмотрена." - #. type: Content of: <section><section><section><title> -#: en/netInstall-intro.xml:46 +#: en/netInstall-intro.xml:42 msgid "Availability" msgstr "Доступность" #. type: Content of: <section><section><section><para> -#: en/netInstall-intro.xml:48 +#: en/netInstall-intro.xml:44 msgid "There a two versions of the NetInstall media:" msgstr "Предусмотрены две версии носителя NetInstall:" #. type: Content of: <section><section><section><itemizedlist><listitem><para> -#: en/netInstall-intro.xml:52 +#: en/netInstall-intro.xml:48 msgid "" "<emphasis role=\"bold\">netinstall.iso</emphasis> For those who prefer not " "to use non-free software, this ISO contains only free software." @@ -182,7 +177,7 @@ msgstr "" "образе содержится только свободное программное обеспечение." #. type: Content of: <section><section><section><itemizedlist><listitem><para> -#: en/netInstall-intro.xml:58 +#: en/netInstall-intro.xml:54 msgid "" "<emphasis role=\"bold\">netinstall-nonfree.iso</emphasis> This ISO " "additionally includes proprietary device drivers, which may be required for " @@ -194,7 +189,7 @@ msgstr "" "дисков или, возможно, другого устройства." #. type: Content of: <section><section><section><para> -#: en/netInstall-intro.xml:64 +#: en/netInstall-intro.xml:60 msgid "" "Both versions are available in the form of separate 32-bit and 64-bit ISO's. " "See here: <link xlink:href=\"https://www.mageia.org/downloads/\">https://www." @@ -206,12 +201,12 @@ msgstr "" "link>" #. type: Content of: <section><section><section><title> -#: en/netInstall-intro.xml:70 +#: en/netInstall-intro.xml:66 msgid "Preparation" msgstr "Подготовка" #. type: Content of: <section><section><section><para> -#: en/netInstall-intro.xml:72 +#: en/netInstall-intro.xml:68 msgid "" "After downloading the image, burn it to a CD/DVD or, if you prefer to put it " "on a USB stick, follow the instructions here: <link xlink:href=\"https://" @@ -226,22 +221,25 @@ msgstr "" "Installation_Media#Dump_Mageia_ISOs_on_an_USB_stick</link>" #. type: Content of: <section><section><title> -#: en/netInstall-intro.xml:79 +#: en/netInstall-intro.xml:75 msgid "Installation Stages" msgstr "Этапы установки" #. type: Content of: <section><section><para> -#: en/netInstall-intro.xml:81 +#: en/netInstall-intro.xml:77 msgid "The installation is carried out in two stages:" msgstr "Установка выполняется в два этапа:" #. type: Content of: <section><section><itemizedlist><listitem><para> -#: en/netInstall-intro.xml:85 +#: en/netInstall-intro.xml:81 +#, fuzzy msgid "" "<emphasis role=\"bold\">Stage 1</emphasis> This is the pre-Installation " "stage. You will need to provide the method and details for accessing the " "medium containing the files to be used for the installation. If the method " -"involves a server, then the network connection will be activated." +"involves a server, then the network connection will be activated. This " +"network can be a WiFi connection with WEP or WPA2 encryption (though please " +"be mindful of the Warning below regarding keyboard input)." msgstr "" "<emphasis role=\"bold\">Этап 1</emphasis> Это этап предварительного " "приготовления. Вам следует определить способ и параметры доступа к хранилищу " @@ -250,7 +248,7 @@ msgstr "" "соединения с сетью." #. type: Content of: <section><section><itemizedlist><listitem><para> -#: en/netInstall-intro.xml:93 +#: en/netInstall-intro.xml:91 msgid "" "<emphasis role=\"bold\">Stage 2</emphasis> This is the actual Installation " "stage, which will automatically commence once a connection to the installer " @@ -261,7 +259,7 @@ msgstr "" "файлов пакетов." #. type: Content of: <section><section><note><para> -#: en/netInstall-intro.xml:100 +#: en/netInstall-intro.xml:98 msgid "" "During Stage 1, nothing will be written to your Hard Disk, so it is safe to " "quit at any point during Stage 1 if you wish. You can do so by pressing " @@ -274,7 +272,7 @@ msgstr "" "<keycap>Alt</keycap> <keycap>Del</keycap></keycombo>." #. type: Content of: <section><section><tip><para> -#: en/netInstall-intro.xml:112 +#: en/netInstall-intro.xml:110 msgid "" "You can use <keycombo> <keycap>Alt</keycap> <keycap>F3</keycap> </keycombo> " "to read the logs and <keycombo> <keycap>Alt</keycap> <keycap>F1</keycap> </" @@ -286,14 +284,16 @@ msgstr "" "keycap><keycap>F1</keycap></keycombo>, чтобы вернуться к экрану установки." #. type: Content of: <section><section><warning><para> -#: en/netInstall-intro.xml:124 +#: en/netInstall-intro.xml:122 +#, fuzzy msgid "" -"Unlike when installing from DVD or LiveCD, during the first part of the " -"installation (<emphasis role=\"bold\">Stage 1</emphasis>), you will be asked " -"to type things. During this stage, your keyboard will operate as per an " -"<link xlink:href=\"https://en.wikipedia.org/wiki/" -"Keyboard_layout#United_States\">American keyboard</link> layout. This can be " -"very confusing when you need to type names and paths." +"Unlike when installing from DVD or LiveCD, you will be asked to type things " +"during the first part of a Network installation (<emphasis role=\"bold" +"\">Stage 1</emphasis>). Throughout this stage, however, your keyboard will " +"operate as per an <link xlink:href=\"https://en.wikipedia.org/wiki/" +"Keyboard_layout#United_States\">American keyboard</link> layout. Please bear " +"this in mind to avoid confusion when entering things like names and paths " +"etc." msgstr "" "В отличие от установки с DVD или компакт-диска с портативной системой, во " "время первой части установки, <emphasis role=\"bold\">Этапа 1</emphasis>, " @@ -851,3 +851,8 @@ msgstr "" "Все страницы, описанные в этом учебнике увидеть сразу невозможно. Набор " "страниц, которые вы увидите, зависит от набора оборудования в системе и " "выбранного вами варианта установки." + +#~ msgid "Installation via encrypted wifi or bluetooth is not supported." +#~ msgstr "" +#~ "Поддержка установки с помощью зашифрованного канала wifi или bluetooth не " +#~ "предусмотрена." diff --git a/docs/docs/stable/bootiso/sl.po b/docs/docs/stable/bootiso/sl.po index 7bb2126c..9579baf6 100644 --- a/docs/docs/stable/bootiso/sl.po +++ b/docs/docs/stable/bootiso/sl.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: Mageia Boot ISO Help 6.0\n" "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n" -"POT-Creation-Date: 2019-01-18 19:11+0200\n" +"POT-Creation-Date: 2020-12-20 15:06+0200\n" "PO-Revision-Date: 2017-04-04 18:35+0000\n" "Last-Translator: Filip Komar <filip.komar@guest.arnes.si>, 2020\n" "Language-Team: Slovenian (https://www.transifex.com/MageiaLinux/teams/9361/" @@ -98,72 +98,67 @@ msgid "Installing Mageia using a Tiny Boot Image" msgstr "Namestitev z majhno datoteko odtisa diska" #. type: Content of: <section><title> -#: en/netInstall-intro.xml:11 +#: en/netInstall-intro.xml:12 msgid "Introduction" msgstr "Predstavitev" #. type: Content of: <section><section><title> -#: en/netInstall-intro.xml:14 +#: en/netInstall-intro.xml:15 msgid "NetInstall Media" msgstr "" #. type: Content of: <section><section><section><title> -#: en/netInstall-intro.xml:17 +#: en/netInstall-intro.xml:18 msgid "Description" msgstr "Opis" #. type: Content of: <section><section><section><para> -#: en/netInstall-intro.xml:19 +#: en/netInstall-intro.xml:20 msgid "These minimal ISO's contain:" msgstr "" #. type: Content of: <section><section><section><itemizedlist><listitem><para> -#: en/netInstall-intro.xml:23 +#: en/netInstall-intro.xml:24 msgid "" -"less than 100 MB and are convenient if bandwidth is too low to download a " +"less than 120 MB and are convenient if bandwidth is too low to download a " "full DVD, or if you have a PC without a DVD drive or unable to boot from a " "USB stick." msgstr "" #. type: Content of: <section><section><section><itemizedlist><listitem><para> -#: en/netInstall-intro.xml:29 +#: en/netInstall-intro.xml:30 msgid "" -"no more than that which is needed to a) start the <literal>DrakX</literal> " -"installer and b) find <literal>DrakX-installer-stage2</literal> and other " +"no more than that which is needed to (a) start the <literal>DrakX</literal> " +"installer and (b) find <literal>DrakX-installer-stage2</literal> and other " "packages that are needed to continue and complete the install." msgstr "" #. type: Content of: <section><section><section><para> -#: en/netInstall-intro.xml:36 +#: en/netInstall-intro.xml:37 msgid "" "The required source packages may be on a PC hard disk, a local drive, a " "local network or on the Internet." msgstr "" -#. type: Content of: <section><section><section><note><para> -#: en/netInstall-intro.xml:40 -msgid "Installation via encrypted wifi or bluetooth is not supported." -msgstr "" - #. type: Content of: <section><section><section><title> -#: en/netInstall-intro.xml:46 +#: en/netInstall-intro.xml:42 msgid "Availability" msgstr "" #. type: Content of: <section><section><section><para> -#: en/netInstall-intro.xml:48 +#: en/netInstall-intro.xml:44 msgid "There a two versions of the NetInstall media:" msgstr "Obstajata dve verziji omrežnih namestitvenih medijev:" #. type: Content of: <section><section><section><itemizedlist><listitem><para> -#: en/netInstall-intro.xml:52 +#: en/netInstall-intro.xml:48 msgid "" "<emphasis role=\"bold\">netinstall.iso</emphasis> For those who prefer not " "to use non-free software, this ISO contains only free software." msgstr "" #. type: Content of: <section><section><section><itemizedlist><listitem><para> -#: en/netInstall-intro.xml:58 +#: en/netInstall-intro.xml:54 msgid "" "<emphasis role=\"bold\">netinstall-nonfree.iso</emphasis> This ISO " "additionally includes proprietary device drivers, which may be required for " @@ -171,7 +166,7 @@ msgid "" msgstr "" #. type: Content of: <section><section><section><para> -#: en/netInstall-intro.xml:64 +#: en/netInstall-intro.xml:60 msgid "" "Both versions are available in the form of separate 32-bit and 64-bit ISO's. " "See here: <link xlink:href=\"https://www.mageia.org/downloads/\">https://www." @@ -179,12 +174,12 @@ msgid "" msgstr "" #. type: Content of: <section><section><section><title> -#: en/netInstall-intro.xml:70 +#: en/netInstall-intro.xml:66 msgid "Preparation" msgstr "Priprava" #. type: Content of: <section><section><section><para> -#: en/netInstall-intro.xml:72 +#: en/netInstall-intro.xml:68 msgid "" "After downloading the image, burn it to a CD/DVD or, if you prefer to put it " "on a USB stick, follow the instructions here: <link xlink:href=\"https://" @@ -194,26 +189,28 @@ msgid "" msgstr "" #. type: Content of: <section><section><title> -#: en/netInstall-intro.xml:79 +#: en/netInstall-intro.xml:75 msgid "Installation Stages" msgstr "Koraki namestitve" #. type: Content of: <section><section><para> -#: en/netInstall-intro.xml:81 +#: en/netInstall-intro.xml:77 msgid "The installation is carried out in two stages:" msgstr "" #. type: Content of: <section><section><itemizedlist><listitem><para> -#: en/netInstall-intro.xml:85 +#: en/netInstall-intro.xml:81 msgid "" "<emphasis role=\"bold\">Stage 1</emphasis> This is the pre-Installation " "stage. You will need to provide the method and details for accessing the " "medium containing the files to be used for the installation. If the method " -"involves a server, then the network connection will be activated." +"involves a server, then the network connection will be activated. This " +"network can be a WiFi connection with WEP or WPA2 encryption (though please " +"be mindful of the Warning below regarding keyboard input)." msgstr "" #. type: Content of: <section><section><itemizedlist><listitem><para> -#: en/netInstall-intro.xml:93 +#: en/netInstall-intro.xml:91 msgid "" "<emphasis role=\"bold\">Stage 2</emphasis> This is the actual Installation " "stage, which will automatically commence once a connection to the installer " @@ -221,7 +218,7 @@ msgid "" msgstr "" #. type: Content of: <section><section><note><para> -#: en/netInstall-intro.xml:100 +#: en/netInstall-intro.xml:98 msgid "" "During Stage 1, nothing will be written to your Hard Disk, so it is safe to " "quit at any point during Stage 1 if you wish. You can do so by pressing " @@ -230,7 +227,7 @@ msgid "" msgstr "" #. type: Content of: <section><section><tip><para> -#: en/netInstall-intro.xml:112 +#: en/netInstall-intro.xml:110 msgid "" "You can use <keycombo> <keycap>Alt</keycap> <keycap>F3</keycap> </keycombo> " "to read the logs and <keycombo> <keycap>Alt</keycap> <keycap>F1</keycap> </" @@ -238,14 +235,15 @@ msgid "" msgstr "" #. type: Content of: <section><section><warning><para> -#: en/netInstall-intro.xml:124 -msgid "" -"Unlike when installing from DVD or LiveCD, during the first part of the " -"installation (<emphasis role=\"bold\">Stage 1</emphasis>), you will be asked " -"to type things. During this stage, your keyboard will operate as per an " -"<link xlink:href=\"https://en.wikipedia.org/wiki/" -"Keyboard_layout#United_States\">American keyboard</link> layout. This can be " -"very confusing when you need to type names and paths." +#: en/netInstall-intro.xml:122 +msgid "" +"Unlike when installing from DVD or LiveCD, you will be asked to type things " +"during the first part of a Network installation (<emphasis role=\"bold" +"\">Stage 1</emphasis>). Throughout this stage, however, your keyboard will " +"operate as per an <link xlink:href=\"https://en.wikipedia.org/wiki/" +"Keyboard_layout#United_States\">American keyboard</link> layout. Please bear " +"this in mind to avoid confusion when entering things like names and paths " +"etc." msgstr "" #. type: Content of: <section><title> diff --git a/docs/docs/stable/bootiso/sq.po b/docs/docs/stable/bootiso/sq.po index 0744e085..f11933ed 100644 --- a/docs/docs/stable/bootiso/sq.po +++ b/docs/docs/stable/bootiso/sq.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: Mageia Boot ISO Help 6.0\n" "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n" -"POT-Creation-Date: 2019-01-18 19:11+0200\n" +"POT-Creation-Date: 2020-12-20 15:06+0200\n" "PO-Revision-Date: 2017-04-04 18:35+0000\n" "Last-Translator: Ardit Dani <ardit.dani@gmail.com>, 2019\n" "Language-Team: Albanian (https://www.transifex.com/MageiaLinux/teams/9361/" @@ -97,29 +97,30 @@ msgid "Installing Mageia using a Tiny Boot Image" msgstr "Instalimi Mageia me një Imazh të Vogël Ndezës" #. type: Content of: <section><title> -#: en/netInstall-intro.xml:11 +#: en/netInstall-intro.xml:12 msgid "Introduction" msgstr "Paraqitje" #. type: Content of: <section><section><title> -#: en/netInstall-intro.xml:14 +#: en/netInstall-intro.xml:15 msgid "NetInstall Media" msgstr "NetInstall Media" #. type: Content of: <section><section><section><title> -#: en/netInstall-intro.xml:17 +#: en/netInstall-intro.xml:18 msgid "Description" msgstr "Përshkrimi" #. type: Content of: <section><section><section><para> -#: en/netInstall-intro.xml:19 +#: en/netInstall-intro.xml:20 msgid "These minimal ISO's contain:" msgstr "Këto ISO minimale përmbajnë:" #. type: Content of: <section><section><section><itemizedlist><listitem><para> -#: en/netInstall-intro.xml:23 +#: en/netInstall-intro.xml:24 +#, fuzzy msgid "" -"less than 100 MB and are convenient if bandwidth is too low to download a " +"less than 120 MB and are convenient if bandwidth is too low to download a " "full DVD, or if you have a PC without a DVD drive or unable to boot from a " "USB stick." msgstr "" @@ -128,10 +129,11 @@ msgstr "" "ose nuk mund të ndizni nga një USB." #. type: Content of: <section><section><section><itemizedlist><listitem><para> -#: en/netInstall-intro.xml:29 +#: en/netInstall-intro.xml:30 +#, fuzzy msgid "" -"no more than that which is needed to a) start the <literal>DrakX</literal> " -"installer and b) find <literal>DrakX-installer-stage2</literal> and other " +"no more than that which is needed to (a) start the <literal>DrakX</literal> " +"installer and (b) find <literal>DrakX-installer-stage2</literal> and other " "packages that are needed to continue and complete the install." msgstr "" "jo më shumë se ajo që është e nevojshme për a) të fillojë <literal>DrakX</" @@ -140,7 +142,7 @@ msgstr "" "instalimin." #. type: Content of: <section><section><section><para> -#: en/netInstall-intro.xml:36 +#: en/netInstall-intro.xml:37 msgid "" "The required source packages may be on a PC hard disk, a local drive, a " "local network or on the Internet." @@ -148,23 +150,18 @@ msgstr "" "Paketat e kërkuara mund të jenë në një disk të PC, një disk lokal, një rrjet " "lokal ose në internet." -#. type: Content of: <section><section><section><note><para> -#: en/netInstall-intro.xml:40 -msgid "Installation via encrypted wifi or bluetooth is not supported." -msgstr "Instalimi me anë të Wi-Fi të koduar ose Bluetooth nuk mbështetet." - #. type: Content of: <section><section><section><title> -#: en/netInstall-intro.xml:46 +#: en/netInstall-intro.xml:42 msgid "Availability" msgstr "Disponueshmëri" #. type: Content of: <section><section><section><para> -#: en/netInstall-intro.xml:48 +#: en/netInstall-intro.xml:44 msgid "There a two versions of the NetInstall media:" msgstr "Ka dy versione të mediave NetInstall:" #. type: Content of: <section><section><section><itemizedlist><listitem><para> -#: en/netInstall-intro.xml:52 +#: en/netInstall-intro.xml:48 msgid "" "<emphasis role=\"bold\">netinstall.iso</emphasis> For those who prefer not " "to use non-free software, this ISO contains only free software." @@ -173,7 +170,7 @@ msgstr "" "mos përdorin programin pa-pagesë, kjo ISO përmban vetëm programin falas." #. type: Content of: <section><section><section><itemizedlist><listitem><para> -#: en/netInstall-intro.xml:58 +#: en/netInstall-intro.xml:54 msgid "" "<emphasis role=\"bold\">netinstall-nonfree.iso</emphasis> This ISO " "additionally includes proprietary device drivers, which may be required for " @@ -184,7 +181,7 @@ msgstr "" "pajisjen tuaj të rrjetit, kontrolluesin e diskut, etj." #. type: Content of: <section><section><section><para> -#: en/netInstall-intro.xml:64 +#: en/netInstall-intro.xml:60 msgid "" "Both versions are available in the form of separate 32-bit and 64-bit ISO's. " "See here: <link xlink:href=\"https://www.mageia.org/downloads/\">https://www." @@ -195,12 +192,12 @@ msgstr "" "\">https://www.mageia.org/downloads/</link>" #. type: Content of: <section><section><section><title> -#: en/netInstall-intro.xml:70 +#: en/netInstall-intro.xml:66 msgid "Preparation" msgstr "Përgatitje" #. type: Content of: <section><section><section><para> -#: en/netInstall-intro.xml:72 +#: en/netInstall-intro.xml:68 msgid "" "After downloading the image, burn it to a CD/DVD or, if you prefer to put it " "on a USB stick, follow the instructions here: <link xlink:href=\"https://" @@ -214,22 +211,25 @@ msgstr "" "wiki.mageia.org/en/Installation_Media#Dump_Mageia_ISOs_on_an_USB_stick</link>" #. type: Content of: <section><section><title> -#: en/netInstall-intro.xml:79 +#: en/netInstall-intro.xml:75 msgid "Installation Stages" msgstr "Fazat Instalimit" #. type: Content of: <section><section><para> -#: en/netInstall-intro.xml:81 +#: en/netInstall-intro.xml:77 msgid "The installation is carried out in two stages:" msgstr "Instalimi kryhet në dy faza:" #. type: Content of: <section><section><itemizedlist><listitem><para> -#: en/netInstall-intro.xml:85 +#: en/netInstall-intro.xml:81 +#, fuzzy msgid "" "<emphasis role=\"bold\">Stage 1</emphasis> This is the pre-Installation " "stage. You will need to provide the method and details for accessing the " "medium containing the files to be used for the installation. If the method " -"involves a server, then the network connection will be activated." +"involves a server, then the network connection will be activated. This " +"network can be a WiFi connection with WEP or WPA2 encryption (though please " +"be mindful of the Warning below regarding keyboard input)." msgstr "" "<emphasis role=\"bold\">Faza 1</emphasis> Kjo është faza para instalimit. Ju " "do të duhet të jepni metodën dhe detajet për të hyrë në pajisjen që përmban " @@ -237,7 +237,7 @@ msgstr "" "atëherë lidhja e rrjetit do të aktivizohet." #. type: Content of: <section><section><itemizedlist><listitem><para> -#: en/netInstall-intro.xml:93 +#: en/netInstall-intro.xml:91 msgid "" "<emphasis role=\"bold\">Stage 2</emphasis> This is the actual Installation " "stage, which will automatically commence once a connection to the installer " @@ -248,7 +248,7 @@ msgstr "" "me skedarët e instaluesit." #. type: Content of: <section><section><note><para> -#: en/netInstall-intro.xml:100 +#: en/netInstall-intro.xml:98 msgid "" "During Stage 1, nothing will be written to your Hard Disk, so it is safe to " "quit at any point during Stage 1 if you wish. You can do so by pressing " @@ -261,7 +261,7 @@ msgstr "" "<keycap>Del</keycap> </keycombo>." #. type: Content of: <section><section><tip><para> -#: en/netInstall-intro.xml:112 +#: en/netInstall-intro.xml:110 msgid "" "You can use <keycombo> <keycap>Alt</keycap> <keycap>F3</keycap> </keycombo> " "to read the logs and <keycombo> <keycap>Alt</keycap> <keycap>F1</keycap> </" @@ -272,14 +272,16 @@ msgstr "" "<keycap>F1</keycap> </keycombo> për t'u kthyer në ekranin e instaluesit." #. type: Content of: <section><section><warning><para> -#: en/netInstall-intro.xml:124 +#: en/netInstall-intro.xml:122 +#, fuzzy msgid "" -"Unlike when installing from DVD or LiveCD, during the first part of the " -"installation (<emphasis role=\"bold\">Stage 1</emphasis>), you will be asked " -"to type things. During this stage, your keyboard will operate as per an " -"<link xlink:href=\"https://en.wikipedia.org/wiki/" -"Keyboard_layout#United_States\">American keyboard</link> layout. This can be " -"very confusing when you need to type names and paths." +"Unlike when installing from DVD or LiveCD, you will be asked to type things " +"during the first part of a Network installation (<emphasis role=\"bold" +"\">Stage 1</emphasis>). Throughout this stage, however, your keyboard will " +"operate as per an <link xlink:href=\"https://en.wikipedia.org/wiki/" +"Keyboard_layout#United_States\">American keyboard</link> layout. Please bear " +"this in mind to avoid confusion when entering things like names and paths " +"etc." msgstr "" "Ndryshe nga instalimi nga DVD ose LiveCD, gjatë pjesës së parë të instalimit " "(<emphasis role=\"bold\">Faza 1</emphasis>), do t'ju kërkohet të shkruani " @@ -835,3 +837,6 @@ msgstr "" "Askush nuk do të shohë të gjitha ekranet instaluese që ju shihni në këtë " "manual. Cilat ekrane ju do të shihni, varet nga pjesët-elektronike tuaja dhe " "zgjedhjet që bëni gjatë instalimit." + +#~ msgid "Installation via encrypted wifi or bluetooth is not supported." +#~ msgstr "Instalimi me anë të Wi-Fi të koduar ose Bluetooth nuk mbështetet." diff --git a/docs/docs/stable/bootiso/sr.po b/docs/docs/stable/bootiso/sr.po index 54bbbef0..867dc9b4 100644 --- a/docs/docs/stable/bootiso/sr.po +++ b/docs/docs/stable/bootiso/sr.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: Mageia Boot ISO Help 6.0\n" "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n" -"POT-Creation-Date: 2019-01-18 19:11+0200\n" +"POT-Creation-Date: 2020-12-20 15:06+0200\n" "PO-Revision-Date: 2017-04-04 18:35+0000\n" "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>, 2019\n" "Language-Team: Serbian (https://www.transifex.com/MageiaLinux/teams/9361/" @@ -98,29 +98,30 @@ msgid "Installing Mageia using a Tiny Boot Image" msgstr "Инсталирај Mageia коришћењем Tiny Boot Image-а" #. type: Content of: <section><title> -#: en/netInstall-intro.xml:11 +#: en/netInstall-intro.xml:12 msgid "Introduction" msgstr "Упознавање" #. type: Content of: <section><section><title> -#: en/netInstall-intro.xml:14 +#: en/netInstall-intro.xml:15 msgid "NetInstall Media" msgstr "NetInstall Медиј" #. type: Content of: <section><section><section><title> -#: en/netInstall-intro.xml:17 +#: en/netInstall-intro.xml:18 msgid "Description" msgstr "Опис" #. type: Content of: <section><section><section><para> -#: en/netInstall-intro.xml:19 +#: en/netInstall-intro.xml:20 msgid "These minimal ISO's contain:" msgstr "Ови минимални ISO-ои садрже:" #. type: Content of: <section><section><section><itemizedlist><listitem><para> -#: en/netInstall-intro.xml:23 +#: en/netInstall-intro.xml:24 +#, fuzzy msgid "" -"less than 100 MB and are convenient if bandwidth is too low to download a " +"less than 120 MB and are convenient if bandwidth is too low to download a " "full DVD, or if you have a PC without a DVD drive or unable to boot from a " "USB stick." msgstr "" @@ -129,10 +130,11 @@ msgstr "" "инсталацију са USB меморије." #. type: Content of: <section><section><section><itemizedlist><listitem><para> -#: en/netInstall-intro.xml:29 +#: en/netInstall-intro.xml:30 +#, fuzzy msgid "" -"no more than that which is needed to a) start the <literal>DrakX</literal> " -"installer and b) find <literal>DrakX-installer-stage2</literal> and other " +"no more than that which is needed to (a) start the <literal>DrakX</literal> " +"installer and (b) find <literal>DrakX-installer-stage2</literal> and other " "packages that are needed to continue and complete the install." msgstr "" "не више од потребног за a) покретање <literal>DrakX</literal> инсталера и b) " @@ -140,7 +142,7 @@ msgstr "" "су неопходни за наставак и завршетак инсталације." #. type: Content of: <section><section><section><para> -#: en/netInstall-intro.xml:36 +#: en/netInstall-intro.xml:37 msgid "" "The required source packages may be on a PC hard disk, a local drive, a " "local network or on the Internet." @@ -148,23 +150,18 @@ msgstr "" "Неопходни изворни пакети могу бити на хард диску рачунара или локалној мрежи " "или на Интернету." -#. type: Content of: <section><section><section><note><para> -#: en/netInstall-intro.xml:40 -msgid "Installation via encrypted wifi or bluetooth is not supported." -msgstr "Инсталација пре криптованог wifi-ja ili bluetooth-a je подржана." - #. type: Content of: <section><section><section><title> -#: en/netInstall-intro.xml:46 +#: en/netInstall-intro.xml:42 msgid "Availability" msgstr "Доступност" #. type: Content of: <section><section><section><para> -#: en/netInstall-intro.xml:48 +#: en/netInstall-intro.xml:44 msgid "There a two versions of the NetInstall media:" msgstr "Постије две верзије NetInstall медија:" #. type: Content of: <section><section><section><itemizedlist><listitem><para> -#: en/netInstall-intro.xml:52 +#: en/netInstall-intro.xml:48 msgid "" "<emphasis role=\"bold\">netinstall.iso</emphasis> For those who prefer not " "to use non-free software, this ISO contains only free software." @@ -173,7 +170,7 @@ msgstr "" "не користе не-слободан софтвер, овај ISO фајл садржи само слободан софтвер." #. type: Content of: <section><section><section><itemizedlist><listitem><para> -#: en/netInstall-intro.xml:58 +#: en/netInstall-intro.xml:54 msgid "" "<emphasis role=\"bold\">netinstall-nonfree.iso</emphasis> This ISO " "additionally includes proprietary device drivers, which may be required for " @@ -184,7 +181,7 @@ msgstr "" "контролеру, итд." #. type: Content of: <section><section><section><para> -#: en/netInstall-intro.xml:64 +#: en/netInstall-intro.xml:60 msgid "" "Both versions are available in the form of separate 32-bit and 64-bit ISO's. " "See here: <link xlink:href=\"https://www.mageia.org/downloads/\">https://www." @@ -195,12 +192,12 @@ msgstr "" "\">https://www.mageia.org/downloads/</link>" #. type: Content of: <section><section><section><title> -#: en/netInstall-intro.xml:70 +#: en/netInstall-intro.xml:66 msgid "Preparation" msgstr "Припрема" #. type: Content of: <section><section><section><para> -#: en/netInstall-intro.xml:72 +#: en/netInstall-intro.xml:68 msgid "" "After downloading the image, burn it to a CD/DVD or, if you prefer to put it " "on a USB stick, follow the instructions here: <link xlink:href=\"https://" @@ -215,22 +212,25 @@ msgstr "" "org/en/Installation_Media#Dump_Mageia_ISOs_on_an_USB_stick</link>" #. type: Content of: <section><section><title> -#: en/netInstall-intro.xml:79 +#: en/netInstall-intro.xml:75 msgid "Installation Stages" msgstr "Инсталационе фазе" #. type: Content of: <section><section><para> -#: en/netInstall-intro.xml:81 +#: en/netInstall-intro.xml:77 msgid "The installation is carried out in two stages:" msgstr "Инсталација се спроводи у две фазе:" #. type: Content of: <section><section><itemizedlist><listitem><para> -#: en/netInstall-intro.xml:85 +#: en/netInstall-intro.xml:81 +#, fuzzy msgid "" "<emphasis role=\"bold\">Stage 1</emphasis> This is the pre-Installation " "stage. You will need to provide the method and details for accessing the " "medium containing the files to be used for the installation. If the method " -"involves a server, then the network connection will be activated." +"involves a server, then the network connection will be activated. This " +"network can be a WiFi connection with WEP or WPA2 encryption (though please " +"be mindful of the Warning below regarding keyboard input)." msgstr "" "<emphasis role=\"bold\">Фаза 1</emphasis> Ово је пред-инсталациона фаза. " "Биће потребно да пријавите метод и детаље за приступ медију који садржи " @@ -238,7 +238,7 @@ msgstr "" "сервер, тада ће мрежна конекција бити активирана." #. type: Content of: <section><section><itemizedlist><listitem><para> -#: en/netInstall-intro.xml:93 +#: en/netInstall-intro.xml:91 msgid "" "<emphasis role=\"bold\">Stage 2</emphasis> This is the actual Installation " "stage, which will automatically commence once a connection to the installer " @@ -249,7 +249,7 @@ msgstr "" "фајловима." #. type: Content of: <section><section><note><para> -#: en/netInstall-intro.xml:100 +#: en/netInstall-intro.xml:98 msgid "" "During Stage 1, nothing will be written to your Hard Disk, so it is safe to " "quit at any point during Stage 1 if you wish. You can do so by pressing " @@ -262,7 +262,7 @@ msgstr "" "<keycap>Del</keycap> </keycombo>." #. type: Content of: <section><section><tip><para> -#: en/netInstall-intro.xml:112 +#: en/netInstall-intro.xml:110 msgid "" "You can use <keycombo> <keycap>Alt</keycap> <keycap>F3</keycap> </keycombo> " "to read the logs and <keycombo> <keycap>Alt</keycap> <keycap>F1</keycap> </" @@ -273,14 +273,16 @@ msgstr "" "keycap> </keycombo> за повратак на екран за инсталацију." #. type: Content of: <section><section><warning><para> -#: en/netInstall-intro.xml:124 +#: en/netInstall-intro.xml:122 +#, fuzzy msgid "" -"Unlike when installing from DVD or LiveCD, during the first part of the " -"installation (<emphasis role=\"bold\">Stage 1</emphasis>), you will be asked " -"to type things. During this stage, your keyboard will operate as per an " -"<link xlink:href=\"https://en.wikipedia.org/wiki/" -"Keyboard_layout#United_States\">American keyboard</link> layout. This can be " -"very confusing when you need to type names and paths." +"Unlike when installing from DVD or LiveCD, you will be asked to type things " +"during the first part of a Network installation (<emphasis role=\"bold" +"\">Stage 1</emphasis>). Throughout this stage, however, your keyboard will " +"operate as per an <link xlink:href=\"https://en.wikipedia.org/wiki/" +"Keyboard_layout#United_States\">American keyboard</link> layout. Please bear " +"this in mind to avoid confusion when entering things like names and paths " +"etc." msgstr "" "За разлику од инсталације са DVD или LiveCD-а, током првог дела инсталације " "(<emphasis role=\"bold\">Фаза 1</emphasis>), биће потребно да вршите " @@ -832,3 +834,6 @@ msgstr "" "Нико неће видети све инсталационе екране које ви видите у овом упуству. Који " "од екрана ћете видети, зависи од вашег хардвера и избора које сте направили " "током инсталације." + +#~ msgid "Installation via encrypted wifi or bluetooth is not supported." +#~ msgstr "Инсталација пре криптованог wifi-ja ili bluetooth-a je подржана." diff --git a/docs/docs/stable/bootiso/sv.po b/docs/docs/stable/bootiso/sv.po index 446e6a87..09dc9595 100644 --- a/docs/docs/stable/bootiso/sv.po +++ b/docs/docs/stable/bootiso/sv.po @@ -13,7 +13,7 @@ msgid "" msgstr "" "Project-Id-Version: Mageia Boot ISO Help 6.0\n" "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n" -"POT-Creation-Date: 2019-01-18 19:11+0200\n" +"POT-Creation-Date: 2020-12-20 15:06+0200\n" "PO-Revision-Date: 2017-04-04 18:35+0000\n" "Last-Translator: Kristoffer Grundström <lovaren@gmail.com>, 2020\n" "Language-Team: Swedish (https://www.transifex.com/MageiaLinux/teams/9361/" @@ -97,29 +97,30 @@ msgid "Installing Mageia using a Tiny Boot Image" msgstr "Installera Mageia genom att använda en pytteliten uppstartsavbild" #. type: Content of: <section><title> -#: en/netInstall-intro.xml:11 +#: en/netInstall-intro.xml:12 msgid "Introduction" msgstr "Presentation" #. type: Content of: <section><section><title> -#: en/netInstall-intro.xml:14 +#: en/netInstall-intro.xml:15 msgid "NetInstall Media" msgstr "Media för nätverksbaserad installation" #. type: Content of: <section><section><section><title> -#: en/netInstall-intro.xml:17 +#: en/netInstall-intro.xml:18 msgid "Description" msgstr "Beskrivning" #. type: Content of: <section><section><section><para> -#: en/netInstall-intro.xml:19 +#: en/netInstall-intro.xml:20 msgid "These minimal ISO's contain:" msgstr "De här minimala ISO-filerna innehåller:" #. type: Content of: <section><section><section><itemizedlist><listitem><para> -#: en/netInstall-intro.xml:23 +#: en/netInstall-intro.xml:24 +#, fuzzy msgid "" -"less than 100 MB and are convenient if bandwidth is too low to download a " +"less than 120 MB and are convenient if bandwidth is too low to download a " "full DVD, or if you have a PC without a DVD drive or unable to boot from a " "USB stick." msgstr "" @@ -128,10 +129,11 @@ msgstr "" "från ett USB-minne." #. type: Content of: <section><section><section><itemizedlist><listitem><para> -#: en/netInstall-intro.xml:29 +#: en/netInstall-intro.xml:30 +#, fuzzy msgid "" -"no more than that which is needed to a) start the <literal>DrakX</literal> " -"installer and b) find <literal>DrakX-installer-stage2</literal> and other " +"no more than that which is needed to (a) start the <literal>DrakX</literal> " +"installer and (b) find <literal>DrakX-installer-stage2</literal> and other " "packages that are needed to continue and complete the install." msgstr "" "Endast det som behövs för att a) starta <literal>DrakX</literal> " @@ -139,7 +141,7 @@ msgstr "" "paket som behövs för att fortsätta och slutföra installationen." #. type: Content of: <section><section><section><para> -#: en/netInstall-intro.xml:36 +#: en/netInstall-intro.xml:37 msgid "" "The required source packages may be on a PC hard disk, a local drive, a " "local network or on the Internet." @@ -147,23 +149,18 @@ msgstr "" "De nödvändiga paketen kan finnas på en hårddisk, en lokal disk, lokalt " "nätverk, eller på internet." -#. type: Content of: <section><section><section><note><para> -#: en/netInstall-intro.xml:40 -msgid "Installation via encrypted wifi or bluetooth is not supported." -msgstr "Installation via krypterat wifi eller bluetooth stöds inte." - #. type: Content of: <section><section><section><title> -#: en/netInstall-intro.xml:46 +#: en/netInstall-intro.xml:42 msgid "Availability" msgstr "Tillgänglighet" #. type: Content of: <section><section><section><para> -#: en/netInstall-intro.xml:48 +#: en/netInstall-intro.xml:44 msgid "There a two versions of the NetInstall media:" msgstr "Det finns två media-versioner av NetInstall." #. type: Content of: <section><section><section><itemizedlist><listitem><para> -#: en/netInstall-intro.xml:52 +#: en/netInstall-intro.xml:48 msgid "" "<emphasis role=\"bold\">netinstall.iso</emphasis> For those who prefer not " "to use non-free software, this ISO contains only free software." @@ -173,7 +170,7 @@ msgstr "" "programvara." #. type: Content of: <section><section><section><itemizedlist><listitem><para> -#: en/netInstall-intro.xml:58 +#: en/netInstall-intro.xml:54 msgid "" "<emphasis role=\"bold\">netinstall-nonfree.iso</emphasis> This ISO " "additionally includes proprietary device drivers, which may be required for " @@ -184,7 +181,7 @@ msgstr "" "nätverk, hårddiskar etc." #. type: Content of: <section><section><section><para> -#: en/netInstall-intro.xml:64 +#: en/netInstall-intro.xml:60 msgid "" "Both versions are available in the form of separate 32-bit and 64-bit ISO's. " "See here: <link xlink:href=\"https://www.mageia.org/downloads/\">https://www." @@ -195,12 +192,12 @@ msgstr "" "mageia.org/downloads/</link>" #. type: Content of: <section><section><section><title> -#: en/netInstall-intro.xml:70 +#: en/netInstall-intro.xml:66 msgid "Preparation" msgstr "Förberedning" #. type: Content of: <section><section><section><para> -#: en/netInstall-intro.xml:72 +#: en/netInstall-intro.xml:68 msgid "" "After downloading the image, burn it to a CD/DVD or, if you prefer to put it " "on a USB stick, follow the instructions here: <link xlink:href=\"https://" @@ -215,22 +212,25 @@ msgstr "" "org/en/Installation_Media#Dump_Mageia_ISOs_on_an_USB_stick</link>" #. type: Content of: <section><section><title> -#: en/netInstall-intro.xml:79 +#: en/netInstall-intro.xml:75 msgid "Installation Stages" msgstr "Installationsteg" #. type: Content of: <section><section><para> -#: en/netInstall-intro.xml:81 +#: en/netInstall-intro.xml:77 msgid "The installation is carried out in two stages:" msgstr "Installationen utförs i två steg." #. type: Content of: <section><section><itemizedlist><listitem><para> -#: en/netInstall-intro.xml:85 +#: en/netInstall-intro.xml:81 +#, fuzzy msgid "" "<emphasis role=\"bold\">Stage 1</emphasis> This is the pre-Installation " "stage. You will need to provide the method and details for accessing the " "medium containing the files to be used for the installation. If the method " -"involves a server, then the network connection will be activated." +"involves a server, then the network connection will be activated. This " +"network can be a WiFi connection with WEP or WPA2 encryption (though please " +"be mindful of the Warning below regarding keyboard input)." msgstr "" "<emphasis role=\"bold\">Steg 1</emphasis>Det här är för-installationen. Du " "måste ange hur man kommer åt filerna på det media som innehåller " @@ -238,7 +238,7 @@ msgstr "" "nätverksanslutning att upprättas." #. type: Content of: <section><section><itemizedlist><listitem><para> -#: en/netInstall-intro.xml:93 +#: en/netInstall-intro.xml:91 msgid "" "<emphasis role=\"bold\">Stage 2</emphasis> This is the actual Installation " "stage, which will automatically commence once a connection to the installer " @@ -249,7 +249,7 @@ msgstr "" "installationsfilerna har upprättats." #. type: Content of: <section><section><note><para> -#: en/netInstall-intro.xml:100 +#: en/netInstall-intro.xml:98 msgid "" "During Stage 1, nothing will be written to your Hard Disk, so it is safe to " "quit at any point during Stage 1 if you wish. You can do so by pressing " @@ -261,7 +261,7 @@ msgstr "" "<keycap>Alt</keycap> <keycap>Del</keycap> </keycombo>." #. type: Content of: <section><section><tip><para> -#: en/netInstall-intro.xml:112 +#: en/netInstall-intro.xml:110 msgid "" "You can use <keycombo> <keycap>Alt</keycap> <keycap>F3</keycap> </keycombo> " "to read the logs and <keycombo> <keycap>Alt</keycap> <keycap>F1</keycap> </" @@ -272,14 +272,15 @@ msgstr "" "<keycap>F1</keycap> </keycombo> för att återvända till installationsskärmen." #. type: Content of: <section><section><warning><para> -#: en/netInstall-intro.xml:124 +#: en/netInstall-intro.xml:122 msgid "" -"Unlike when installing from DVD or LiveCD, during the first part of the " -"installation (<emphasis role=\"bold\">Stage 1</emphasis>), you will be asked " -"to type things. During this stage, your keyboard will operate as per an " -"<link xlink:href=\"https://en.wikipedia.org/wiki/" -"Keyboard_layout#United_States\">American keyboard</link> layout. This can be " -"very confusing when you need to type names and paths." +"Unlike when installing from DVD or LiveCD, you will be asked to type things " +"during the first part of a Network installation (<emphasis role=\"bold" +"\">Stage 1</emphasis>). Throughout this stage, however, your keyboard will " +"operate as per an <link xlink:href=\"https://en.wikipedia.org/wiki/" +"Keyboard_layout#United_States\">American keyboard</link> layout. Please bear " +"this in mind to avoid confusion when entering things like names and paths " +"etc." msgstr "" #. type: Content of: <section><title> @@ -755,3 +756,6 @@ msgstr "" "Ingen kommer att se alla installerarens skärmbilder som du ser i den här " "handboken. Vilka skärmbilder som just du kommer att se beror på din hårdvara " "och vilka val du gör under installationen." + +#~ msgid "Installation via encrypted wifi or bluetooth is not supported." +#~ msgstr "Installation via krypterat wifi eller bluetooth stöds inte." diff --git a/docs/docs/stable/bootiso/tg.po b/docs/docs/stable/bootiso/tg.po index d642ef84..73e92eac 100644 --- a/docs/docs/stable/bootiso/tg.po +++ b/docs/docs/stable/bootiso/tg.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: Mageia Boot ISO Help 6.0\n" "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n" -"POT-Creation-Date: 2019-01-18 19:11+0200\n" +"POT-Creation-Date: 2020-12-20 15:06+0200\n" "PO-Revision-Date: 2017-04-04 18:35+0000\n" "Last-Translator: Victor Ibragimov <victor.ibragimov@gmail.com>, 2019\n" "Language-Team: Tajik (https://www.transifex.com/MageiaLinux/teams/9361/tg/)\n" @@ -95,72 +95,67 @@ msgid "Installing Mageia using a Tiny Boot Image" msgstr "" #. type: Content of: <section><title> -#: en/netInstall-intro.xml:11 +#: en/netInstall-intro.xml:12 msgid "Introduction" msgstr "Муқаддима" #. type: Content of: <section><section><title> -#: en/netInstall-intro.xml:14 +#: en/netInstall-intro.xml:15 msgid "NetInstall Media" msgstr "" #. type: Content of: <section><section><section><title> -#: en/netInstall-intro.xml:17 +#: en/netInstall-intro.xml:18 msgid "Description" msgstr "Тавсиф" #. type: Content of: <section><section><section><para> -#: en/netInstall-intro.xml:19 +#: en/netInstall-intro.xml:20 msgid "These minimal ISO's contain:" msgstr "" #. type: Content of: <section><section><section><itemizedlist><listitem><para> -#: en/netInstall-intro.xml:23 +#: en/netInstall-intro.xml:24 msgid "" -"less than 100 MB and are convenient if bandwidth is too low to download a " +"less than 120 MB and are convenient if bandwidth is too low to download a " "full DVD, or if you have a PC without a DVD drive or unable to boot from a " "USB stick." msgstr "" #. type: Content of: <section><section><section><itemizedlist><listitem><para> -#: en/netInstall-intro.xml:29 +#: en/netInstall-intro.xml:30 msgid "" -"no more than that which is needed to a) start the <literal>DrakX</literal> " -"installer and b) find <literal>DrakX-installer-stage2</literal> and other " +"no more than that which is needed to (a) start the <literal>DrakX</literal> " +"installer and (b) find <literal>DrakX-installer-stage2</literal> and other " "packages that are needed to continue and complete the install." msgstr "" #. type: Content of: <section><section><section><para> -#: en/netInstall-intro.xml:36 +#: en/netInstall-intro.xml:37 msgid "" "The required source packages may be on a PC hard disk, a local drive, a " "local network or on the Internet." msgstr "" -#. type: Content of: <section><section><section><note><para> -#: en/netInstall-intro.xml:40 -msgid "Installation via encrypted wifi or bluetooth is not supported." -msgstr "" - #. type: Content of: <section><section><section><title> -#: en/netInstall-intro.xml:46 +#: en/netInstall-intro.xml:42 msgid "Availability" msgstr "" #. type: Content of: <section><section><section><para> -#: en/netInstall-intro.xml:48 +#: en/netInstall-intro.xml:44 msgid "There a two versions of the NetInstall media:" msgstr "" #. type: Content of: <section><section><section><itemizedlist><listitem><para> -#: en/netInstall-intro.xml:52 +#: en/netInstall-intro.xml:48 msgid "" "<emphasis role=\"bold\">netinstall.iso</emphasis> For those who prefer not " "to use non-free software, this ISO contains only free software." msgstr "" #. type: Content of: <section><section><section><itemizedlist><listitem><para> -#: en/netInstall-intro.xml:58 +#: en/netInstall-intro.xml:54 msgid "" "<emphasis role=\"bold\">netinstall-nonfree.iso</emphasis> This ISO " "additionally includes proprietary device drivers, which may be required for " @@ -168,7 +163,7 @@ msgid "" msgstr "" #. type: Content of: <section><section><section><para> -#: en/netInstall-intro.xml:64 +#: en/netInstall-intro.xml:60 msgid "" "Both versions are available in the form of separate 32-bit and 64-bit ISO's. " "See here: <link xlink:href=\"https://www.mageia.org/downloads/\">https://www." @@ -176,12 +171,12 @@ msgid "" msgstr "" #. type: Content of: <section><section><section><title> -#: en/netInstall-intro.xml:70 +#: en/netInstall-intro.xml:66 msgid "Preparation" msgstr "" #. type: Content of: <section><section><section><para> -#: en/netInstall-intro.xml:72 +#: en/netInstall-intro.xml:68 msgid "" "After downloading the image, burn it to a CD/DVD or, if you prefer to put it " "on a USB stick, follow the instructions here: <link xlink:href=\"https://" @@ -191,26 +186,28 @@ msgid "" msgstr "" #. type: Content of: <section><section><title> -#: en/netInstall-intro.xml:79 +#: en/netInstall-intro.xml:75 msgid "Installation Stages" msgstr "" #. type: Content of: <section><section><para> -#: en/netInstall-intro.xml:81 +#: en/netInstall-intro.xml:77 msgid "The installation is carried out in two stages:" msgstr "" #. type: Content of: <section><section><itemizedlist><listitem><para> -#: en/netInstall-intro.xml:85 +#: en/netInstall-intro.xml:81 msgid "" "<emphasis role=\"bold\">Stage 1</emphasis> This is the pre-Installation " "stage. You will need to provide the method and details for accessing the " "medium containing the files to be used for the installation. If the method " -"involves a server, then the network connection will be activated." +"involves a server, then the network connection will be activated. This " +"network can be a WiFi connection with WEP or WPA2 encryption (though please " +"be mindful of the Warning below regarding keyboard input)." msgstr "" #. type: Content of: <section><section><itemizedlist><listitem><para> -#: en/netInstall-intro.xml:93 +#: en/netInstall-intro.xml:91 msgid "" "<emphasis role=\"bold\">Stage 2</emphasis> This is the actual Installation " "stage, which will automatically commence once a connection to the installer " @@ -218,7 +215,7 @@ msgid "" msgstr "" #. type: Content of: <section><section><note><para> -#: en/netInstall-intro.xml:100 +#: en/netInstall-intro.xml:98 msgid "" "During Stage 1, nothing will be written to your Hard Disk, so it is safe to " "quit at any point during Stage 1 if you wish. You can do so by pressing " @@ -227,7 +224,7 @@ msgid "" msgstr "" #. type: Content of: <section><section><tip><para> -#: en/netInstall-intro.xml:112 +#: en/netInstall-intro.xml:110 msgid "" "You can use <keycombo> <keycap>Alt</keycap> <keycap>F3</keycap> </keycombo> " "to read the logs and <keycombo> <keycap>Alt</keycap> <keycap>F1</keycap> </" @@ -235,14 +232,15 @@ msgid "" msgstr "" #. type: Content of: <section><section><warning><para> -#: en/netInstall-intro.xml:124 -msgid "" -"Unlike when installing from DVD or LiveCD, during the first part of the " -"installation (<emphasis role=\"bold\">Stage 1</emphasis>), you will be asked " -"to type things. During this stage, your keyboard will operate as per an " -"<link xlink:href=\"https://en.wikipedia.org/wiki/" -"Keyboard_layout#United_States\">American keyboard</link> layout. This can be " -"very confusing when you need to type names and paths." +#: en/netInstall-intro.xml:122 +msgid "" +"Unlike when installing from DVD or LiveCD, you will be asked to type things " +"during the first part of a Network installation (<emphasis role=\"bold" +"\">Stage 1</emphasis>). Throughout this stage, however, your keyboard will " +"operate as per an <link xlink:href=\"https://en.wikipedia.org/wiki/" +"Keyboard_layout#United_States\">American keyboard</link> layout. Please bear " +"this in mind to avoid confusion when entering things like names and paths " +"etc." msgstr "" #. type: Content of: <section><title> diff --git a/docs/docs/stable/bootiso/tr.po b/docs/docs/stable/bootiso/tr.po index 44da5805..2d48610e 100644 --- a/docs/docs/stable/bootiso/tr.po +++ b/docs/docs/stable/bootiso/tr.po @@ -16,7 +16,7 @@ msgid "" msgstr "" "Project-Id-Version: Mageia Boot ISO Help 6.0\n" "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n" -"POT-Creation-Date: 2019-01-18 19:11+0200\n" +"POT-Creation-Date: 2020-12-20 15:06+0200\n" "PO-Revision-Date: 2017-04-04 18:35+0000\n" "Last-Translator: Cenk Yıldızlı <goncagul@national.shitposting.agency>, 2019\n" "Language-Team: Turkish (https://www.transifex.com/MageiaLinux/teams/9361/" @@ -102,29 +102,30 @@ msgid "Installing Mageia using a Tiny Boot Image" msgstr " Mageia'yı Küçük Bir Önyükleme Görüntüsü kullanarak Kur" #. type: Content of: <section><title> -#: en/netInstall-intro.xml:11 +#: en/netInstall-intro.xml:12 msgid "Introduction" msgstr "Giriş" #. type: Content of: <section><section><title> -#: en/netInstall-intro.xml:14 +#: en/netInstall-intro.xml:15 msgid "NetInstall Media" msgstr "NetInstall Kalıp" #. type: Content of: <section><section><section><title> -#: en/netInstall-intro.xml:17 +#: en/netInstall-intro.xml:18 msgid "Description" msgstr "Tanım" #. type: Content of: <section><section><section><para> -#: en/netInstall-intro.xml:19 +#: en/netInstall-intro.xml:20 msgid "These minimal ISO's contain:" msgstr "Minimum ISO'lar şunları içerir:" #. type: Content of: <section><section><section><itemizedlist><listitem><para> -#: en/netInstall-intro.xml:23 +#: en/netInstall-intro.xml:24 +#, fuzzy msgid "" -"less than 100 MB and are convenient if bandwidth is too low to download a " +"less than 120 MB and are convenient if bandwidth is too low to download a " "full DVD, or if you have a PC without a DVD drive or unable to boot from a " "USB stick." msgstr "" @@ -133,15 +134,15 @@ msgstr "" "yapmıyorsanız uygundur." #. type: Content of: <section><section><section><itemizedlist><listitem><para> -#: en/netInstall-intro.xml:29 +#: en/netInstall-intro.xml:30 msgid "" -"no more than that which is needed to a) start the <literal>DrakX</literal> " -"installer and b) find <literal>DrakX-installer-stage2</literal> and other " +"no more than that which is needed to (a) start the <literal>DrakX</literal> " +"installer and (b) find <literal>DrakX-installer-stage2</literal> and other " "packages that are needed to continue and complete the install." msgstr "" #. type: Content of: <section><section><section><para> -#: en/netInstall-intro.xml:36 +#: en/netInstall-intro.xml:37 msgid "" "The required source packages may be on a PC hard disk, a local drive, a " "local network or on the Internet." @@ -149,23 +150,18 @@ msgstr "" "Gerekli kaynak paketleri bir PC sabit diskinde, yerel bir sürücüde, yerel " "bir ağda veya Internet'te olabilir." -#. type: Content of: <section><section><section><note><para> -#: en/netInstall-intro.xml:40 -msgid "Installation via encrypted wifi or bluetooth is not supported." -msgstr "" - #. type: Content of: <section><section><section><title> -#: en/netInstall-intro.xml:46 +#: en/netInstall-intro.xml:42 msgid "Availability" msgstr "" #. type: Content of: <section><section><section><para> -#: en/netInstall-intro.xml:48 +#: en/netInstall-intro.xml:44 msgid "There a two versions of the NetInstall media:" msgstr "NetInstall ortamının iki sürümü var:" #. type: Content of: <section><section><section><itemizedlist><listitem><para> -#: en/netInstall-intro.xml:52 +#: en/netInstall-intro.xml:48 msgid "" "<emphasis role=\"bold\">netinstall.iso</emphasis> For those who prefer not " "to use non-free software, this ISO contains only free software." @@ -174,7 +170,7 @@ msgstr "" "kullanmamayı tercih edenler için bu ISO sadece özgür yazılım içermektedir." #. type: Content of: <section><section><section><itemizedlist><listitem><para> -#: en/netInstall-intro.xml:58 +#: en/netInstall-intro.xml:54 msgid "" "<emphasis role=\"bold\">netinstall-nonfree.iso</emphasis> This ISO " "additionally includes proprietary device drivers, which may be required for " @@ -185,7 +181,7 @@ msgstr "" "özgür olmayan sürücüleri içerir." #. type: Content of: <section><section><section><para> -#: en/netInstall-intro.xml:64 +#: en/netInstall-intro.xml:60 msgid "" "Both versions are available in the form of separate 32-bit and 64-bit ISO's. " "See here: <link xlink:href=\"https://www.mageia.org/downloads/\">https://www." @@ -196,12 +192,12 @@ msgstr "" "mageia.org/downloads/</link>" #. type: Content of: <section><section><section><title> -#: en/netInstall-intro.xml:70 +#: en/netInstall-intro.xml:66 msgid "Preparation" msgstr "Hazırlık" #. type: Content of: <section><section><section><para> -#: en/netInstall-intro.xml:72 +#: en/netInstall-intro.xml:68 msgid "" "After downloading the image, burn it to a CD/DVD or, if you prefer to put it " "on a USB stick, follow the instructions here: <link xlink:href=\"https://" @@ -216,26 +212,28 @@ msgstr "" "org/en/Installation_Media#Dump_Mageia_ISOs_on_an_USB_stick</link>" #. type: Content of: <section><section><title> -#: en/netInstall-intro.xml:79 +#: en/netInstall-intro.xml:75 msgid "Installation Stages" msgstr "Kurulum Aşamaları" #. type: Content of: <section><section><para> -#: en/netInstall-intro.xml:81 +#: en/netInstall-intro.xml:77 msgid "The installation is carried out in two stages:" msgstr "Kurulum iki aşamada gerçekleştirilir:" #. type: Content of: <section><section><itemizedlist><listitem><para> -#: en/netInstall-intro.xml:85 +#: en/netInstall-intro.xml:81 msgid "" "<emphasis role=\"bold\">Stage 1</emphasis> This is the pre-Installation " "stage. You will need to provide the method and details for accessing the " "medium containing the files to be used for the installation. If the method " -"involves a server, then the network connection will be activated." +"involves a server, then the network connection will be activated. This " +"network can be a WiFi connection with WEP or WPA2 encryption (though please " +"be mindful of the Warning below regarding keyboard input)." msgstr "" #. type: Content of: <section><section><itemizedlist><listitem><para> -#: en/netInstall-intro.xml:93 +#: en/netInstall-intro.xml:91 msgid "" "<emphasis role=\"bold\">Stage 2</emphasis> This is the actual Installation " "stage, which will automatically commence once a connection to the installer " @@ -243,7 +241,7 @@ msgid "" msgstr "" #. type: Content of: <section><section><note><para> -#: en/netInstall-intro.xml:100 +#: en/netInstall-intro.xml:98 msgid "" "During Stage 1, nothing will be written to your Hard Disk, so it is safe to " "quit at any point during Stage 1 if you wish. You can do so by pressing " @@ -252,7 +250,7 @@ msgid "" msgstr "" #. type: Content of: <section><section><tip><para> -#: en/netInstall-intro.xml:112 +#: en/netInstall-intro.xml:110 msgid "" "You can use <keycombo> <keycap>Alt</keycap> <keycap>F3</keycap> </keycombo> " "to read the logs and <keycombo> <keycap>Alt</keycap> <keycap>F1</keycap> </" @@ -260,14 +258,15 @@ msgid "" msgstr "" #. type: Content of: <section><section><warning><para> -#: en/netInstall-intro.xml:124 -msgid "" -"Unlike when installing from DVD or LiveCD, during the first part of the " -"installation (<emphasis role=\"bold\">Stage 1</emphasis>), you will be asked " -"to type things. During this stage, your keyboard will operate as per an " -"<link xlink:href=\"https://en.wikipedia.org/wiki/" -"Keyboard_layout#United_States\">American keyboard</link> layout. This can be " -"very confusing when you need to type names and paths." +#: en/netInstall-intro.xml:122 +msgid "" +"Unlike when installing from DVD or LiveCD, you will be asked to type things " +"during the first part of a Network installation (<emphasis role=\"bold" +"\">Stage 1</emphasis>). Throughout this stage, however, your keyboard will " +"operate as per an <link xlink:href=\"https://en.wikipedia.org/wiki/" +"Keyboard_layout#United_States\">American keyboard</link> layout. Please bear " +"this in mind to avoid confusion when entering things like names and paths " +"etc." msgstr "" #. type: Content of: <section><title> diff --git a/docs/docs/stable/bootiso/uk.po b/docs/docs/stable/bootiso/uk.po index af25296b..92a497d1 100644 --- a/docs/docs/stable/bootiso/uk.po +++ b/docs/docs/stable/bootiso/uk.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: Mageia Boot ISO Help 6.0\n" "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n" -"POT-Creation-Date: 2019-01-18 19:11+0200\n" +"POT-Creation-Date: 2020-12-20 15:06+0200\n" "PO-Revision-Date: 2017-04-04 18:35+0000\n" "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>, 2019\n" "Language-Team: Ukrainian (https://www.transifex.com/MageiaLinux/teams/9361/" @@ -100,29 +100,30 @@ msgid "Installing Mageia using a Tiny Boot Image" msgstr "Встановлення Mageia з маленького завантажувального образу" #. type: Content of: <section><title> -#: en/netInstall-intro.xml:11 +#: en/netInstall-intro.xml:12 msgid "Introduction" msgstr "Вступ" #. type: Content of: <section><section><title> -#: en/netInstall-intro.xml:14 +#: en/netInstall-intro.xml:15 msgid "NetInstall Media" msgstr "Носії NetInstall" #. type: Content of: <section><section><section><title> -#: en/netInstall-intro.xml:17 +#: en/netInstall-intro.xml:18 msgid "Description" msgstr "Опис" #. type: Content of: <section><section><section><para> -#: en/netInstall-intro.xml:19 +#: en/netInstall-intro.xml:20 msgid "These minimal ISO's contain:" msgstr "Ці мінімалістичні образи ISO мають такі характеристики:" #. type: Content of: <section><section><section><itemizedlist><listitem><para> -#: en/netInstall-intro.xml:23 +#: en/netInstall-intro.xml:24 +#, fuzzy msgid "" -"less than 100 MB and are convenient if bandwidth is too low to download a " +"less than 120 MB and are convenient if bandwidth is too low to download a " "full DVD, or if you have a PC without a DVD drive or unable to boot from a " "USB stick." msgstr "" @@ -132,10 +133,11 @@ msgstr "" "флеш-диска USB." #. type: Content of: <section><section><section><itemizedlist><listitem><para> -#: en/netInstall-intro.xml:29 +#: en/netInstall-intro.xml:30 +#, fuzzy msgid "" -"no more than that which is needed to a) start the <literal>DrakX</literal> " -"installer and b) find <literal>DrakX-installer-stage2</literal> and other " +"no more than that which is needed to (a) start the <literal>DrakX</literal> " +"installer and (b) find <literal>DrakX-installer-stage2</literal> and other " "packages that are needed to continue and complete the install." msgstr "" "на носіях для встановлення міститься не більше даних, ніж це потрібно для а) " @@ -144,7 +146,7 @@ msgstr "" "для продовження та завершення встановлення системи." #. type: Content of: <section><section><section><para> -#: en/netInstall-intro.xml:36 +#: en/netInstall-intro.xml:37 msgid "" "The required source packages may be on a PC hard disk, a local drive, a " "local network or on the Internet." @@ -153,25 +155,18 @@ msgstr "" "комп'ютера, локальному диску, диску у локальній мережі або сервері у " "інтернеті." -#. type: Content of: <section><section><section><note><para> -#: en/netInstall-intro.xml:40 -msgid "Installation via encrypted wifi or bluetooth is not supported." -msgstr "" -"Підтримки встановлення за допомогою зашифрованого каналу wifi або bluetooth " -"не передбачено." - #. type: Content of: <section><section><section><title> -#: en/netInstall-intro.xml:46 +#: en/netInstall-intro.xml:42 msgid "Availability" msgstr "Доступність" #. type: Content of: <section><section><section><para> -#: en/netInstall-intro.xml:48 +#: en/netInstall-intro.xml:44 msgid "There a two versions of the NetInstall media:" msgstr "Передбачено дві версії носія NetInstall:" #. type: Content of: <section><section><section><itemizedlist><listitem><para> -#: en/netInstall-intro.xml:52 +#: en/netInstall-intro.xml:48 msgid "" "<emphasis role=\"bold\">netinstall.iso</emphasis> For those who prefer not " "to use non-free software, this ISO contains only free software." @@ -181,7 +176,7 @@ msgstr "" "міститься лише вільне програмне забезпечення." #. type: Content of: <section><section><section><itemizedlist><listitem><para> -#: en/netInstall-intro.xml:58 +#: en/netInstall-intro.xml:54 msgid "" "<emphasis role=\"bold\">netinstall-nonfree.iso</emphasis> This ISO " "additionally includes proprietary device drivers, which may be required for " @@ -193,7 +188,7 @@ msgstr "" "іншого пристрою." #. type: Content of: <section><section><section><para> -#: en/netInstall-intro.xml:64 +#: en/netInstall-intro.xml:60 msgid "" "Both versions are available in the form of separate 32-bit and 64-bit ISO's. " "See here: <link xlink:href=\"https://www.mageia.org/downloads/\">https://www." @@ -204,12 +199,12 @@ msgstr "" "www.mageia.org/downloads/\">тут</link>" #. type: Content of: <section><section><section><title> -#: en/netInstall-intro.xml:70 +#: en/netInstall-intro.xml:66 msgid "Preparation" msgstr "Приготування" #. type: Content of: <section><section><section><para> -#: en/netInstall-intro.xml:72 +#: en/netInstall-intro.xml:68 msgid "" "After downloading the image, burn it to a CD/DVD or, if you prefer to put it " "on a USB stick, follow the instructions here: <link xlink:href=\"https://" @@ -222,22 +217,25 @@ msgstr "" "org/en/Installation_Media#Dump_Mageia_ISOs_on_an_USB_stick\">звідси</link>." #. type: Content of: <section><section><title> -#: en/netInstall-intro.xml:79 +#: en/netInstall-intro.xml:75 msgid "Installation Stages" msgstr "Етапи встановлення" #. type: Content of: <section><section><para> -#: en/netInstall-intro.xml:81 +#: en/netInstall-intro.xml:77 msgid "The installation is carried out in two stages:" msgstr "Встановлення виконується у два етапи:" #. type: Content of: <section><section><itemizedlist><listitem><para> -#: en/netInstall-intro.xml:85 +#: en/netInstall-intro.xml:81 +#, fuzzy msgid "" "<emphasis role=\"bold\">Stage 1</emphasis> This is the pre-Installation " "stage. You will need to provide the method and details for accessing the " "medium containing the files to be used for the installation. If the method " -"involves a server, then the network connection will be activated." +"involves a server, then the network connection will be activated. This " +"network can be a WiFi connection with WEP or WPA2 encryption (though please " +"be mindful of the Warning below regarding keyboard input)." msgstr "" "<emphasis role=\"bold\">Етап 1</emphasis> Це етап попереднього приготування. " "Вам слід визначити спосіб та параметри доступу до сховища файлів пакунків, " @@ -245,7 +243,7 @@ msgstr "" "певний сервер, буде задіяно параметри з'єднання із мережею." #. type: Content of: <section><section><itemizedlist><listitem><para> -#: en/netInstall-intro.xml:93 +#: en/netInstall-intro.xml:91 msgid "" "<emphasis role=\"bold\">Stage 2</emphasis> This is the actual Installation " "stage, which will automatically commence once a connection to the installer " @@ -256,7 +254,7 @@ msgstr "" "пакунків." #. type: Content of: <section><section><note><para> -#: en/netInstall-intro.xml:100 +#: en/netInstall-intro.xml:98 msgid "" "During Stage 1, nothing will be written to your Hard Disk, so it is safe to " "quit at any point during Stage 1 if you wish. You can do so by pressing " @@ -269,7 +267,7 @@ msgstr "" "keycap> <keycap>Del</keycap> </keycombo>." #. type: Content of: <section><section><tip><para> -#: en/netInstall-intro.xml:112 +#: en/netInstall-intro.xml:110 msgid "" "You can use <keycombo> <keycap>Alt</keycap> <keycap>F3</keycap> </keycombo> " "to read the logs and <keycombo> <keycap>Alt</keycap> <keycap>F1</keycap> </" @@ -281,14 +279,16 @@ msgstr "" "<keycap>F1</keycap> </keycombo>, щоб повернутися до екрана встановлення." #. type: Content of: <section><section><warning><para> -#: en/netInstall-intro.xml:124 +#: en/netInstall-intro.xml:122 +#, fuzzy msgid "" -"Unlike when installing from DVD or LiveCD, during the first part of the " -"installation (<emphasis role=\"bold\">Stage 1</emphasis>), you will be asked " -"to type things. During this stage, your keyboard will operate as per an " -"<link xlink:href=\"https://en.wikipedia.org/wiki/" -"Keyboard_layout#United_States\">American keyboard</link> layout. This can be " -"very confusing when you need to type names and paths." +"Unlike when installing from DVD or LiveCD, you will be asked to type things " +"during the first part of a Network installation (<emphasis role=\"bold" +"\">Stage 1</emphasis>). Throughout this stage, however, your keyboard will " +"operate as per an <link xlink:href=\"https://en.wikipedia.org/wiki/" +"Keyboard_layout#United_States\">American keyboard</link> layout. Please bear " +"this in mind to avoid confusion when entering things like names and paths " +"etc." msgstr "" "На відміну від встановлення з DVD або компакт-диска з портативною системою, " "під час першої частини встановлення, <emphasis role=\"bold\">Етапу 1</" @@ -852,3 +852,8 @@ msgstr "" "Всі сторінки, описані у цьому підручнику побачити одразу неможливо. Набір " "сторінок, які ви побачите залежить від набору обладнання у вашій системі та " "вибраного вами варіанта встановлення." + +#~ msgid "Installation via encrypted wifi or bluetooth is not supported." +#~ msgstr "" +#~ "Підтримки встановлення за допомогою зашифрованого каналу wifi або " +#~ "bluetooth не передбачено." diff --git a/docs/docs/stable/bootiso/zh_CN.po b/docs/docs/stable/bootiso/zh_CN.po index 0d56973c..ca01fc65 100644 --- a/docs/docs/stable/bootiso/zh_CN.po +++ b/docs/docs/stable/bootiso/zh_CN.po @@ -13,7 +13,7 @@ msgid "" msgstr "" "Project-Id-Version: Mageia Boot ISO Help 6.0\n" "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n" -"POT-Creation-Date: 2019-01-18 19:11+0200\n" +"POT-Creation-Date: 2020-12-20 15:06+0200\n" "PO-Revision-Date: 2017-04-04 18:35+0000\n" "Last-Translator: zwpwjwtz <zwpwjwtz@126.com>, 2019\n" "Language-Team: Chinese (China) (https://www.transifex.com/MageiaLinux/" @@ -94,72 +94,67 @@ msgid "Installing Mageia using a Tiny Boot Image" msgstr "" #. type: Content of: <section><title> -#: en/netInstall-intro.xml:11 +#: en/netInstall-intro.xml:12 msgid "Introduction" msgstr "简介" #. type: Content of: <section><section><title> -#: en/netInstall-intro.xml:14 +#: en/netInstall-intro.xml:15 msgid "NetInstall Media" msgstr "" #. type: Content of: <section><section><section><title> -#: en/netInstall-intro.xml:17 +#: en/netInstall-intro.xml:18 msgid "Description" msgstr "描述" #. type: Content of: <section><section><section><para> -#: en/netInstall-intro.xml:19 +#: en/netInstall-intro.xml:20 msgid "These minimal ISO's contain:" msgstr "" #. type: Content of: <section><section><section><itemizedlist><listitem><para> -#: en/netInstall-intro.xml:23 +#: en/netInstall-intro.xml:24 msgid "" -"less than 100 MB and are convenient if bandwidth is too low to download a " +"less than 120 MB and are convenient if bandwidth is too low to download a " "full DVD, or if you have a PC without a DVD drive or unable to boot from a " "USB stick." msgstr "" #. type: Content of: <section><section><section><itemizedlist><listitem><para> -#: en/netInstall-intro.xml:29 +#: en/netInstall-intro.xml:30 msgid "" -"no more than that which is needed to a) start the <literal>DrakX</literal> " -"installer and b) find <literal>DrakX-installer-stage2</literal> and other " +"no more than that which is needed to (a) start the <literal>DrakX</literal> " +"installer and (b) find <literal>DrakX-installer-stage2</literal> and other " "packages that are needed to continue and complete the install." msgstr "" #. type: Content of: <section><section><section><para> -#: en/netInstall-intro.xml:36 +#: en/netInstall-intro.xml:37 msgid "" "The required source packages may be on a PC hard disk, a local drive, a " "local network or on the Internet." msgstr "" -#. type: Content of: <section><section><section><note><para> -#: en/netInstall-intro.xml:40 -msgid "Installation via encrypted wifi or bluetooth is not supported." -msgstr "" - #. type: Content of: <section><section><section><title> -#: en/netInstall-intro.xml:46 +#: en/netInstall-intro.xml:42 msgid "Availability" msgstr "" #. type: Content of: <section><section><section><para> -#: en/netInstall-intro.xml:48 +#: en/netInstall-intro.xml:44 msgid "There a two versions of the NetInstall media:" msgstr "" #. type: Content of: <section><section><section><itemizedlist><listitem><para> -#: en/netInstall-intro.xml:52 +#: en/netInstall-intro.xml:48 msgid "" "<emphasis role=\"bold\">netinstall.iso</emphasis> For those who prefer not " "to use non-free software, this ISO contains only free software." msgstr "" #. type: Content of: <section><section><section><itemizedlist><listitem><para> -#: en/netInstall-intro.xml:58 +#: en/netInstall-intro.xml:54 msgid "" "<emphasis role=\"bold\">netinstall-nonfree.iso</emphasis> This ISO " "additionally includes proprietary device drivers, which may be required for " @@ -167,7 +162,7 @@ msgid "" msgstr "" #. type: Content of: <section><section><section><para> -#: en/netInstall-intro.xml:64 +#: en/netInstall-intro.xml:60 msgid "" "Both versions are available in the form of separate 32-bit and 64-bit ISO's. " "See here: <link xlink:href=\"https://www.mageia.org/downloads/\">https://www." @@ -175,12 +170,12 @@ msgid "" msgstr "" #. type: Content of: <section><section><section><title> -#: en/netInstall-intro.xml:70 +#: en/netInstall-intro.xml:66 msgid "Preparation" msgstr "准备工作" #. type: Content of: <section><section><section><para> -#: en/netInstall-intro.xml:72 +#: en/netInstall-intro.xml:68 msgid "" "After downloading the image, burn it to a CD/DVD or, if you prefer to put it " "on a USB stick, follow the instructions here: <link xlink:href=\"https://" @@ -190,26 +185,28 @@ msgid "" msgstr "" #. type: Content of: <section><section><title> -#: en/netInstall-intro.xml:79 +#: en/netInstall-intro.xml:75 msgid "Installation Stages" msgstr "" #. type: Content of: <section><section><para> -#: en/netInstall-intro.xml:81 +#: en/netInstall-intro.xml:77 msgid "The installation is carried out in two stages:" msgstr "" #. type: Content of: <section><section><itemizedlist><listitem><para> -#: en/netInstall-intro.xml:85 +#: en/netInstall-intro.xml:81 msgid "" "<emphasis role=\"bold\">Stage 1</emphasis> This is the pre-Installation " "stage. You will need to provide the method and details for accessing the " "medium containing the files to be used for the installation. If the method " -"involves a server, then the network connection will be activated." +"involves a server, then the network connection will be activated. This " +"network can be a WiFi connection with WEP or WPA2 encryption (though please " +"be mindful of the Warning below regarding keyboard input)." msgstr "" #. type: Content of: <section><section><itemizedlist><listitem><para> -#: en/netInstall-intro.xml:93 +#: en/netInstall-intro.xml:91 msgid "" "<emphasis role=\"bold\">Stage 2</emphasis> This is the actual Installation " "stage, which will automatically commence once a connection to the installer " @@ -217,7 +214,7 @@ msgid "" msgstr "" #. type: Content of: <section><section><note><para> -#: en/netInstall-intro.xml:100 +#: en/netInstall-intro.xml:98 msgid "" "During Stage 1, nothing will be written to your Hard Disk, so it is safe to " "quit at any point during Stage 1 if you wish. You can do so by pressing " @@ -226,7 +223,7 @@ msgid "" msgstr "" #. type: Content of: <section><section><tip><para> -#: en/netInstall-intro.xml:112 +#: en/netInstall-intro.xml:110 msgid "" "You can use <keycombo> <keycap>Alt</keycap> <keycap>F3</keycap> </keycombo> " "to read the logs and <keycombo> <keycap>Alt</keycap> <keycap>F1</keycap> </" @@ -234,14 +231,15 @@ msgid "" msgstr "" #. type: Content of: <section><section><warning><para> -#: en/netInstall-intro.xml:124 -msgid "" -"Unlike when installing from DVD or LiveCD, during the first part of the " -"installation (<emphasis role=\"bold\">Stage 1</emphasis>), you will be asked " -"to type things. During this stage, your keyboard will operate as per an " -"<link xlink:href=\"https://en.wikipedia.org/wiki/" -"Keyboard_layout#United_States\">American keyboard</link> layout. This can be " -"very confusing when you need to type names and paths." +#: en/netInstall-intro.xml:122 +msgid "" +"Unlike when installing from DVD or LiveCD, you will be asked to type things " +"during the first part of a Network installation (<emphasis role=\"bold" +"\">Stage 1</emphasis>). Throughout this stage, however, your keyboard will " +"operate as per an <link xlink:href=\"https://en.wikipedia.org/wiki/" +"Keyboard_layout#United_States\">American keyboard</link> layout. Please bear " +"this in mind to avoid confusion when entering things like names and paths " +"etc." msgstr "" #. type: Content of: <section><title> diff --git a/docs/docs/stable/bootiso/zh_TW.po b/docs/docs/stable/bootiso/zh_TW.po index 3f528b22..f75e8e81 100644 --- a/docs/docs/stable/bootiso/zh_TW.po +++ b/docs/docs/stable/bootiso/zh_TW.po @@ -13,7 +13,7 @@ msgid "" msgstr "" "Project-Id-Version: Mageia Boot ISO Help 6.0\n" "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n" -"POT-Creation-Date: 2019-01-18 19:11+0200\n" +"POT-Creation-Date: 2020-12-20 15:06+0200\n" "PO-Revision-Date: 2017-04-04 18:35+0000\n" "Last-Translator: You-Cheng Hsieh <yochenhsieh@gmail.com>, 2019\n" "Language-Team: Chinese (Taiwan) (https://www.transifex.com/MageiaLinux/" @@ -89,72 +89,67 @@ msgid "Installing Mageia using a Tiny Boot Image" msgstr "" #. type: Content of: <section><title> -#: en/netInstall-intro.xml:11 +#: en/netInstall-intro.xml:12 msgid "Introduction" msgstr "前言" #. type: Content of: <section><section><title> -#: en/netInstall-intro.xml:14 +#: en/netInstall-intro.xml:15 msgid "NetInstall Media" msgstr "" #. type: Content of: <section><section><section><title> -#: en/netInstall-intro.xml:17 +#: en/netInstall-intro.xml:18 msgid "Description" msgstr "描述" #. type: Content of: <section><section><section><para> -#: en/netInstall-intro.xml:19 +#: en/netInstall-intro.xml:20 msgid "These minimal ISO's contain:" msgstr "" #. type: Content of: <section><section><section><itemizedlist><listitem><para> -#: en/netInstall-intro.xml:23 +#: en/netInstall-intro.xml:24 msgid "" -"less than 100 MB and are convenient if bandwidth is too low to download a " +"less than 120 MB and are convenient if bandwidth is too low to download a " "full DVD, or if you have a PC without a DVD drive or unable to boot from a " "USB stick." msgstr "" #. type: Content of: <section><section><section><itemizedlist><listitem><para> -#: en/netInstall-intro.xml:29 +#: en/netInstall-intro.xml:30 msgid "" -"no more than that which is needed to a) start the <literal>DrakX</literal> " -"installer and b) find <literal>DrakX-installer-stage2</literal> and other " +"no more than that which is needed to (a) start the <literal>DrakX</literal> " +"installer and (b) find <literal>DrakX-installer-stage2</literal> and other " "packages that are needed to continue and complete the install." msgstr "" #. type: Content of: <section><section><section><para> -#: en/netInstall-intro.xml:36 +#: en/netInstall-intro.xml:37 msgid "" "The required source packages may be on a PC hard disk, a local drive, a " "local network or on the Internet." msgstr "" -#. type: Content of: <section><section><section><note><para> -#: en/netInstall-intro.xml:40 -msgid "Installation via encrypted wifi or bluetooth is not supported." -msgstr "" - #. type: Content of: <section><section><section><title> -#: en/netInstall-intro.xml:46 +#: en/netInstall-intro.xml:42 msgid "Availability" msgstr "" #. type: Content of: <section><section><section><para> -#: en/netInstall-intro.xml:48 +#: en/netInstall-intro.xml:44 msgid "There a two versions of the NetInstall media:" msgstr "" #. type: Content of: <section><section><section><itemizedlist><listitem><para> -#: en/netInstall-intro.xml:52 +#: en/netInstall-intro.xml:48 msgid "" "<emphasis role=\"bold\">netinstall.iso</emphasis> For those who prefer not " "to use non-free software, this ISO contains only free software." msgstr "" #. type: Content of: <section><section><section><itemizedlist><listitem><para> -#: en/netInstall-intro.xml:58 +#: en/netInstall-intro.xml:54 msgid "" "<emphasis role=\"bold\">netinstall-nonfree.iso</emphasis> This ISO " "additionally includes proprietary device drivers, which may be required for " @@ -162,7 +157,7 @@ msgid "" msgstr "" #. type: Content of: <section><section><section><para> -#: en/netInstall-intro.xml:64 +#: en/netInstall-intro.xml:60 msgid "" "Both versions are available in the form of separate 32-bit and 64-bit ISO's. " "See here: <link xlink:href=\"https://www.mageia.org/downloads/\">https://www." @@ -170,12 +165,12 @@ msgid "" msgstr "" #. type: Content of: <section><section><section><title> -#: en/netInstall-intro.xml:70 +#: en/netInstall-intro.xml:66 msgid "Preparation" msgstr "" #. type: Content of: <section><section><section><para> -#: en/netInstall-intro.xml:72 +#: en/netInstall-intro.xml:68 msgid "" "After downloading the image, burn it to a CD/DVD or, if you prefer to put it " "on a USB stick, follow the instructions here: <link xlink:href=\"https://" @@ -185,26 +180,28 @@ msgid "" msgstr "" #. type: Content of: <section><section><title> -#: en/netInstall-intro.xml:79 +#: en/netInstall-intro.xml:75 msgid "Installation Stages" msgstr "" #. type: Content of: <section><section><para> -#: en/netInstall-intro.xml:81 +#: en/netInstall-intro.xml:77 msgid "The installation is carried out in two stages:" msgstr "" #. type: Content of: <section><section><itemizedlist><listitem><para> -#: en/netInstall-intro.xml:85 +#: en/netInstall-intro.xml:81 msgid "" "<emphasis role=\"bold\">Stage 1</emphasis> This is the pre-Installation " "stage. You will need to provide the method and details for accessing the " "medium containing the files to be used for the installation. If the method " -"involves a server, then the network connection will be activated." +"involves a server, then the network connection will be activated. This " +"network can be a WiFi connection with WEP or WPA2 encryption (though please " +"be mindful of the Warning below regarding keyboard input)." msgstr "" #. type: Content of: <section><section><itemizedlist><listitem><para> -#: en/netInstall-intro.xml:93 +#: en/netInstall-intro.xml:91 msgid "" "<emphasis role=\"bold\">Stage 2</emphasis> This is the actual Installation " "stage, which will automatically commence once a connection to the installer " @@ -212,7 +209,7 @@ msgid "" msgstr "" #. type: Content of: <section><section><note><para> -#: en/netInstall-intro.xml:100 +#: en/netInstall-intro.xml:98 msgid "" "During Stage 1, nothing will be written to your Hard Disk, so it is safe to " "quit at any point during Stage 1 if you wish. You can do so by pressing " @@ -221,7 +218,7 @@ msgid "" msgstr "" #. type: Content of: <section><section><tip><para> -#: en/netInstall-intro.xml:112 +#: en/netInstall-intro.xml:110 msgid "" "You can use <keycombo> <keycap>Alt</keycap> <keycap>F3</keycap> </keycombo> " "to read the logs and <keycombo> <keycap>Alt</keycap> <keycap>F1</keycap> </" @@ -229,14 +226,15 @@ msgid "" msgstr "" #. type: Content of: <section><section><warning><para> -#: en/netInstall-intro.xml:124 -msgid "" -"Unlike when installing from DVD or LiveCD, during the first part of the " -"installation (<emphasis role=\"bold\">Stage 1</emphasis>), you will be asked " -"to type things. During this stage, your keyboard will operate as per an " -"<link xlink:href=\"https://en.wikipedia.org/wiki/" -"Keyboard_layout#United_States\">American keyboard</link> layout. This can be " -"very confusing when you need to type names and paths." +#: en/netInstall-intro.xml:122 +msgid "" +"Unlike when installing from DVD or LiveCD, you will be asked to type things " +"during the first part of a Network installation (<emphasis role=\"bold" +"\">Stage 1</emphasis>). Throughout this stage, however, your keyboard will " +"operate as per an <link xlink:href=\"https://en.wikipedia.org/wiki/" +"Keyboard_layout#United_States\">American keyboard</link> layout. Please bear " +"this in mind to avoid confusion when entering things like names and paths " +"etc." msgstr "" #. type: Content of: <section><title> -- cgit v1.2.1