diff options
| author | Yuri Chornoivan <yurchor@ukr.net> | 2020-06-08 10:28:35 +0300 |
|---|---|---|
| committer | Yuri Chornoivan <yurchor@ukr.net> | 2020-06-08 10:28:35 +0300 |
| commit | f304a0cf5d2fef806947823a88b5a33e62f216dc (patch) | |
| tree | b3a386a06dfd6b1904a2ca23f6550e316f0db244 | |
| parent | b837e57b3a52ece28a9d56de60f35574692e0dd5 (diff) | |
| download | tools-f304a0cf5d2fef806947823a88b5a33e62f216dc.tar tools-f304a0cf5d2fef806947823a88b5a33e62f216dc.tar.gz tools-f304a0cf5d2fef806947823a88b5a33e62f216dc.tar.bz2 tools-f304a0cf5d2fef806947823a88b5a33e62f216dc.tar.xz tools-f304a0cf5d2fef806947823a88b5a33e62f216dc.zip | |
Update Hindi translation
18 files changed, 464 insertions, 240 deletions
diff --git a/docs/docs/stable/installer/hi.po b/docs/docs/stable/installer/hi.po index 209b8fb3..52d5f34c 100644 --- a/docs/docs/stable/installer/hi.po +++ b/docs/docs/stable/installer/hi.po @@ -3,13 +3,13 @@ # This file is distributed under the same license as the Mageia Installer Help package. # # Translators: -# Panwar108 <caspian7pena@gmail.com>, 2018 +# Panwar108 <caspian7pena@gmail.com>, 2018,2020 msgid "" msgstr "" "Project-Id-Version: Mageia\n" "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n" "POT-Creation-Date: 2019-09-08 15:58+0300\n" -"PO-Revision-Date: 2019-01-19 19:25+0000\n" +"PO-Revision-Date: 2020-06-08 06:21+0000\n" "Last-Translator: Panwar108 <caspian7pena@gmail.com>\n" "Language-Team: Hindi (http://www.transifex.com/MageiaLinux/mageia/language/" "hi/)\n" @@ -22,7 +22,7 @@ msgstr "" #. type: Content of: <section><info><title> #: en/acceptLicense.xml:31 msgid "License and Release Notes" -msgstr "" +msgstr "लाइसेंस व प्रकाशन नोट्स" #. type: Content of: <section><mediaobject> #: en/acceptLicense.xml:35 @@ -42,7 +42,7 @@ msgstr "" #. type: Content of: <section><section><info><title> #: en/acceptLicense.xml:46 msgid "License Agreement" -msgstr "" +msgstr "लाइसेंस अनुबंध" #. type: Content of: <section><section><itemizedlist><listitem><para> #: en/acceptLicense.xml:51 @@ -102,6 +102,9 @@ msgid "" "png\" xml:id=\"dx2-add_supplemental_media-im1\" align=\"center\" revision=" "\"1\"/> </imageobject>" msgstr "" +"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-add_supplemental_media." +"png\" xml:id=\"dx2-add_supplemental_media-im1\" align=\"center\" revision=" +"\"1\"/> </imageobject>" #. type: Content of: <section><para> #: en/add_supplemental_media.xml:23 @@ -146,7 +149,7 @@ msgstr "" #. type: Content of: <section><info><title> #: en/addUser.xml:9 msgid "User Management" -msgstr "" +msgstr "उपयोक्ता प्रबंधन" #. Lebarhon: 20170210 updated for Mageia 6 (umask) #. 2018/02/12 apb: Text and Typography. @@ -158,22 +161,21 @@ msgstr "" #. 2019/08/11 apb: [1] Reword 1.1 (including Note) [2] Reword 1.2 Password text. #. type: Content of: <section><mediaobject> #: en/addUser.xml:28 -#, fuzzy msgid "" "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref=" "\"dx2-setRootPassword.png\" format=\"PNG\" revision=\"1\" xml:id=" "\"setRootPassword-im1\"/> </imageobject> <imageobject condition=\"live\"> " "<imagedata fileref=\"live-user1.png\" format=\"PNG\"/> </imageobject>" msgstr "" -"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" fileref=" -"\"dx2-setRootPassword.png\" align=\"center\" revision=\"1\" xml:id=" -"\"setRootPassword-im1\"/> </imageobject> <imageobject> <imagedata format=" -"\"PNG\" fileref=\"live-user1.png\"/> </imageobject>" +"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref=" +"\"dx2-setRootPassword.png\" format=\"PNG\" revision=\"1\" xml:id=" +"\"setRootPassword-im1\"/> </imageobject> <imageobject condition=\"live\"> " +"<imagedata fileref=\"live-user1.png\" format=\"PNG\"/> </imageobject>" #. type: Content of: <section><section><info><title> #: en/addUser.xml:40 msgid "Set Administrator (root) Password:" -msgstr "" +msgstr "प्रशासक (रुट) कूटशब्द सेट करें :" #. type: Content of: <section><section><para> #: en/addUser.xml:44 @@ -202,7 +204,7 @@ msgstr "" #. type: Content of: <section><section><info><title> #: en/addUser.xml:63 msgid "Enter a user" -msgstr "" +msgstr "उपयोक्ता दर्ज करें" #. type: Content of: <section><section><para> #: en/addUser.xml:66 @@ -216,7 +218,7 @@ msgstr "" #. type: Content of: <section><section><itemizedlist><listitem><para> #: en/addUser.xml:73 msgid "<emphasis role=\"bold\">Icon</emphasis>" -msgstr "" +msgstr "<emphasis role=\"bold\">आइकन</emphasis>" #. type: Content of: <section><section><itemizedlist><listitem><para> #: en/addUser.xml:75 @@ -226,7 +228,7 @@ msgstr "" #. type: Content of: <section><section><itemizedlist><listitem><para> #: en/addUser.xml:80 msgid "<emphasis role=\"bold\">Real Name</emphasis>" -msgstr "" +msgstr "<emphasis role=\"bold\">वास्तविक नाम</emphasis>" #. type: Content of: <section><section><itemizedlist><listitem><para> #: en/addUser.xml:82 @@ -236,7 +238,7 @@ msgstr "" #. type: Content of: <section><section><itemizedlist><listitem><para> #: en/addUser.xml:86 msgid "<emphasis role=\"bold\">Login Name</emphasis>" -msgstr "" +msgstr "<emphasis role=\"bold\">लॉगिन नाम</emphasis>" #. type: Content of: <section><section><itemizedlist><listitem><para> #: en/addUser.xml:88 @@ -257,7 +259,7 @@ msgstr "" #. type: Content of: <section><section><section><itemizedlist><listitem><para> #: en/addUser.xml:102 en/setupBootloader.xml:182 msgid "<emphasis role=\"bold\">Password</emphasis>" -msgstr "" +msgstr "<emphasis role=\"bold\">कूटशब्द</emphasis>" #. type: Content of: <section><section><itemizedlist><listitem><para> #: en/addUser.xml:104 @@ -294,7 +296,7 @@ msgstr "" #. type: Content of: <section><section><info><title> #: en/addUser.xml:128 msgid "User Management (advanced)" -msgstr "" +msgstr "उपयोक्ता प्रबंधन (विस्तृत)" #. type: Content of: <section><section><para> #: en/addUser.xml:131 @@ -353,6 +355,11 @@ msgid "" "<imagedata align=\"center\" fileref=\"live-chooseMountpoints.png\" format=" "\"PNG\" revision=\"1\" xml:id=\"live-chooseMountPoints-im1\"/> </imageobject>" msgstr "" +"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref=" +"\"dx2-chooseMountpoints.png\" format=\"PNG\" revision=\"1\" xml:id=" +"\"chooseMountPoints-im1\"/> </imageobject> <imageobject condition=\"live\"> " +"<imagedata align=\"center\" fileref=\"live-chooseMountpoints.png\" format=" +"\"PNG\" revision=\"1\" xml:id=\"live-chooseMountPoints-im1\"/> </imageobject>" #. type: Content of: <section><para> #: en/ask_mntpoint_s.xml:49 @@ -424,6 +431,8 @@ msgid "" "<imageobject> <imagedata format=\"PNG\" align=\"center\" fileref=\"live-" "bestTime.png\" revision=\"1\" xml:id=\"bestTime-im1\"/> </imageobject>" msgstr "" +"<imageobject> <imagedata format=\"PNG\" align=\"center\" fileref=\"live-" +"bestTime.png\" revision=\"1\" xml:id=\"bestTime-im1\"/> </imageobject>" #. type: Content of: <section><para> #: en/bestTime.xml:12 @@ -490,13 +499,12 @@ msgstr "" #. type: Content of: <section><section><mediaobject> #: en/bootLive.xml:42 -#, fuzzy msgid "" "<imageobject> <imagedata fileref=\"../live-bootCSM.png\" align=\"center\"/> " "</imageobject>" msgstr "" -"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-choosePackagesTree.png" -"\" align=\"center\"/> </imageobject>" +"<imageobject> <imagedata fileref=\"../live-bootCSM.png\" align=\"center\"/> " +"</imageobject>" #. type: Content of: <section><section><mediaobject><caption><para> #: en/bootLive.xml:46 @@ -507,7 +515,7 @@ msgstr "" #: en/bootLive.xml:50 en/bootLive.xml:104 en/installer.xml:108 #: en/installer.xml:156 msgid "Menu" -msgstr "" +msgstr "मेन्यू" #. type: Content of: <section><section><itemizedlist><listitem><para> #: en/bootLive.xml:52 en/bootLive.xml:106 @@ -568,7 +576,7 @@ msgstr "" #. type: Content of: <section><section><itemizedlist><listitem><para> #: en/bootLive.xml:84 en/bootLive.xml:116 msgid "<emphasis role=\"bold\"> F2 Language</emphasis>" -msgstr "" +msgstr "<emphasis role=\"bold\"> F2 भाषा</emphasis>" #. type: Content of: <section><section><itemizedlist><listitem><para> #: en/bootLive.xml:85 en/bootLive.xml:117 @@ -585,13 +593,12 @@ msgstr "" #. type: Content of: <section><section><mediaobject> #: en/bootLive.xml:96 -#, fuzzy msgid "" "<imageobject> <imagedata format=\"PNG\" fileref=\"../live-bootUEFI.png\" " "align=\"center\" xml:id=\"bootUEFI-im1\" revision=\"1\"/> </imageobject>" msgstr "" -"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-choosePackagesTree.png" -"\" align=\"center\"/> </imageobject>" +"<imageobject> <imagedata format=\"PNG\" fileref=\"../live-bootUEFI.png\" " +"align=\"center\" xml:id=\"bootUEFI-im1\" revision=\"1\"/> </imageobject>" #. type: Content of: <section><section><mediaobject><caption><para> #: en/bootLive.xml:100 @@ -638,6 +645,8 @@ msgid "" "<imageobject> <imagedata align=\"center\" fileref=\"dx2-chooseDesktop.png\" " "format=\"PNG\"/> </imageobject>" msgstr "" +"<imageobject> <imagedata align=\"center\" fileref=\"dx2-chooseDesktop.png\" " +"format=\"PNG\"/> </imageobject>" #. type: Content of: <section><itemizedlist><listitem><para> #: en/chooseDesktop.xml:38 @@ -806,6 +815,11 @@ msgid "" "condition=\"live\"> <imagedata format=\"png\" fileref=\"live-timeZone.png\" " "align=\"center\"/> </imageobject>" msgstr "" +"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" xml:id=" +"\"configureTimezoneUTC-im1\" align=\"center\" fileref=\"dx2-" +"configureTimezoneUTC.png\" revision=\"1\"/> </imageobject> <imageobject " +"condition=\"live\"> <imagedata format=\"png\" fileref=\"live-timeZone.png\" " +"align=\"center\"/> </imageobject>" #. type: Content of: <section><itemizedlist><listitem><para> #: en/configureTimezoneUTC.xml:26 @@ -840,6 +854,9 @@ msgid "" "png\" format=\"PNG\" revision=\"1\" xml:id=\"configureX_card_list-im1\"/> </" "imageobject>" msgstr "" +"<imageobject> <imagedata align=\"center\" fileref=\"dx2-configureX_card_list." +"png\" format=\"PNG\" revision=\"1\" xml:id=\"configureX_card_list-im1\"/> </" +"imageobject>" #. type: Content of: <section><para> #: en/configureX_card_list.xml:38 @@ -911,6 +928,9 @@ msgid "" "png\" format=\"PNG\" revision=\"1\" xml:id=\"configureX_chooser-im1\"/> </" "imageobject>" msgstr "" +"<imageobject> <imagedata align=\"center\" fileref=\"dx2-configureX_chooser." +"png\" format=\"PNG\" revision=\"1\" xml:id=\"configureX_chooser-im1\"/> </" +"imageobject>" #. type: Content of: <section><para> #: en/configureX_chooser.xml:34 @@ -987,7 +1007,7 @@ msgstr "" #. type: Content of: <section><itemizedlist><listitem><para> #: en/configureX_chooser.xml:87 msgid "<emphasis role=\"bold\">Options</emphasis>" -msgstr "" +msgstr "<emphasis role=\"bold\">विकल्प</emphasis>" #. type: Content of: <section><itemizedlist><listitem><para> #: en/configureX_chooser.xml:90 @@ -1031,6 +1051,9 @@ msgid "" "png\" format=\"PNG\" revision=\"1\" xml:id=\"configureX_monitor-im1\"/> </" "imageobject>" msgstr "" +"<imageobject> <imagedata align=\"center\" fileref=\"dx2-configureX_monitor." +"png\" format=\"PNG\" revision=\"1\" xml:id=\"configureX_monitor-im1\"/> </" +"imageobject>" #. type: Content of: <section><variablelist><varlistentry><term> #: en/configureX_monitor.xml:50 @@ -1111,6 +1134,9 @@ msgid "" "\"dx2-diskdrake.png\"/> </imageobject> <imageobject condition=\"live\"> " "<imagedata align=\"center\" fileref=\"live-diskdrake.png\"/> </imageobject>" msgstr "" +"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref=" +"\"dx2-diskdrake.png\"/> </imageobject> <imageobject condition=\"live\"> " +"<imagedata align=\"center\" fileref=\"live-diskdrake.png\"/> </imageobject>" #. type: Content of: <section><itemizedlist><listitem><para> #: en/diskdrake.xml:40 @@ -1187,11 +1213,14 @@ msgid "" "\"dx2-diskdrake2.png\"/> </imageobject> <imageobject condition=\"live\"> " "<imagedata align=\"center\" fileref=\"live-diskdrake2.png\"/> </imageobject>" msgstr "" +"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref=" +"\"dx2-diskdrake2.png\"/> </imageobject> <imageobject condition=\"live\"> " +"<imagedata align=\"center\" fileref=\"live-diskdrake2.png\"/> </imageobject>" #. type: Content of: <section><figure> #: en/diskdrake.xml:105 en/diskdrake.xml:119 msgid "<placeholder type=\"mediaobject\" id=\"0\"/>" -msgstr "" +msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>" #. type: Content of: <section><figure><title> #: en/diskdrake.xml:117 @@ -1206,6 +1235,10 @@ msgid "" "\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks3.png\"/> </" "imageobject>" msgstr "" +"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref=" +"\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition=\"live" +"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks3.png\"/> </" +"imageobject>" #. type: Attribute 'xml:lang' of: <section> #: en/diskPartitioning.xml:1 @@ -1244,11 +1277,15 @@ msgid "" "\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks.png\"/> </" "imageobject>" msgstr "" +"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref=" +"\"dx2-doPartitionDisks.png\"/> </imageobject> <imageobject condition=\"live" +"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks.png\"/> </" +"imageobject>" #. type: Content of: <section><itemizedlist><title> #: en/doPartitionDisks.xml:53 msgid "Main Options" -msgstr "" +msgstr "मुख्य विकल्प" #. type: Content of: <section><itemizedlist><listitem><para> #: en/doPartitionDisks.xml:56 @@ -1296,6 +1333,10 @@ msgid "" "\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks2.png\"/> </" "imageobject>" msgstr "" +"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref=" +"\"dx2-doPartitionDisks2.png\"/> </imageobject> <imageobject condition=\"live" +"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks2.png\"/> </" +"imageobject>" #. type: Content of: <section><itemizedlist><listitem><para> #: en/doPartitionDisks.xml:82 @@ -1443,17 +1484,16 @@ msgstr "" #. type: Content of: <section><mediaobject> #: en/doPartitionDisks.xml:216 -#, fuzzy msgid "" "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref=" "\"dx2-doPartitionDisks4.png\"/> </imageobject> <imageobject condition=\"live" "\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks4.png\"/> </" "imageobject>" msgstr "" -"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" fileref=" -"\"dx2-setRootPassword.png\" align=\"center\" revision=\"1\" xml:id=" -"\"setRootPassword-im1\"/> </imageobject> <imageobject> <imagedata format=" -"\"PNG\" fileref=\"live-user1.png\"/> </imageobject>" +"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref=" +"\"dx2-doPartitionDisks4.png\"/> </imageobject> <imageobject condition=\"live" +"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks4.png\"/> </" +"imageobject>" #. type: Content of: <section><important><para> #: en/doPartitionDisks.xml:226 @@ -1492,33 +1532,34 @@ msgstr "" #. type: Content of: <article><info><title> #: en/DrakLive-cover.xml:15 en/DrakLive-cover.xml:54 en/DrakLive.xml:16 msgid "Installation from LIVE medium" -msgstr "" +msgstr "लाइव मीडिया के माध्यम से इंस्टॉल" #. type: Content of: <book><info> #: en/DrakLive-cover.xml:17 en/DrakX-cover.xml:15 msgid "<publisher> <publishername>Mageia.org</publishername> </publisher>" -msgstr "" +msgstr "<publisher> <publishername>Mageia.org</publishername> </publisher>" #. type: Content of: <book><info><revhistory><revision><date> #: en/DrakLive-cover.xml:23 msgid "March 2016" -msgstr "" +msgstr "मार्च 2016" #. type: Content of: <book><info><revhistory><revision><revremark> #: en/DrakLive-cover.xml:25 msgid "Mageia 5" -msgstr "" +msgstr "मजिया 5" #. type: Content of: <book><info><cover><para> #: en/DrakLive-cover.xml:30 en/DrakX-cover.xml:28 msgid "The Official Documentation for Mageia" -msgstr "" +msgstr "मजिया हेतु आधिकारिक प्रलेखन" #. type: Content of: <book><info><cover><mediaobject> #: en/DrakLive-cover.xml:33 en/DrakX-cover.xml:31 msgid "" "<imageobject> <imagedata fileref=\"../mageia-2013.png\"/> </imageobject>" msgstr "" +"<imageobject> <imagedata fileref=\"../mageia-2013.png\"/> </imageobject>" #. type: Content of: <article><info><cover><para> #: en/DrakLive-cover.xml:38 en/DrakLive.xml:25 en/DrakX-cover.xml:36 @@ -1551,7 +1592,7 @@ msgstr "" #: en/DrakLive-cover.xml:56 en/DrakLive.xml:19 en/DrakX-cover.xml:66 #: en/DrakX-inline.xml:6 en/DrakX.xml:39 en/selectKeyboard.xml:49 msgid "<note>" -msgstr "" +msgstr "<note>" #. type: Content of: <article><info><cover><para><note><para> #: en/DrakLive-cover.xml:57 en/DrakLive.xml:20 en/DrakX-cover.xml:67 @@ -1566,7 +1607,7 @@ msgstr "" #: en/DrakLive-cover.xml:60 en/DrakLive.xml:23 en/DrakX-cover.xml:70 #: en/DrakX-inline.xml:10 en/DrakX.xml:43 en/selectKeyboard.xml:56 msgid "</note>" -msgstr "" +msgstr "</note>" #. type: Content of: <article><info><cover><para> #: en/DrakLive.xml:33 @@ -1585,12 +1626,12 @@ msgstr "" #. type: Content of: <book><info><revhistory><revision><date> #: en/DrakX-cover.xml:21 msgid "February 2014" -msgstr "" +msgstr "फरवरी 2014" #. type: Content of: <book><info><revhistory><revision><revremark> #: en/DrakX-cover.xml:23 msgid "Mageia 4" -msgstr "" +msgstr "मजिया 4" #. type: Content of: <section><info><title> #: en/exitInstall.xml:3 @@ -1606,6 +1647,8 @@ msgid "" "<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-exitInstall.png\" " "align=\"center\" revision=\"1\" xml:id=\"exitInstall-im1\"/> </imageobject>" msgstr "" +"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-exitInstall.png\" " +"align=\"center\" revision=\"1\" xml:id=\"exitInstall-im1\"/> </imageobject>" #. type: Content of: <section><para> #: en/exitInstall.xml:18 @@ -1631,7 +1674,7 @@ msgstr "" #. type: Content of: <section><para> #: en/exitInstall.xml:30 msgid "Enjoy!" -msgstr "" +msgstr "आनंद लें!" #. type: Content of: <section><para> #: en/exitInstall.xml:32 @@ -1643,7 +1686,7 @@ msgstr "" #. type: Content of: <section><info><title> #: en/firewall.xml:16 msgid "Firewall" -msgstr "अग्नि-भीतिका" +msgstr "फ़ायरवॉल" #. type: Content of: <section><para> #: en/firewall.xml:19 @@ -1656,13 +1699,12 @@ msgstr "" #. type: Content of: <section><mediaobject> #: en/firewall.xml:26 -#, fuzzy msgid "" "<imageobject> <imagedata align=\"center\" fileref=\"dx2-firewall.png\"/> </" "imageobject>" msgstr "" -"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-choosePackagesTree.png" -"\" align=\"center\"/> </imageobject>" +"<imageobject> <imagedata align=\"center\" fileref=\"dx2-firewall.png\"/> </" +"imageobject>" #. type: Content of: <section><para> #: en/firewall.xml:31 @@ -1688,7 +1730,7 @@ msgstr "" #. type: Content of: <section><para> #: en/firewall.xml:44 msgid "<emphasis role=\"bold\">Advanced</emphasis>" -msgstr "" +msgstr "<emphasis role=\"bold\">विस्तृत</emphasis>" #. type: Content of: <section><para> #: en/firewall.xml:46 @@ -1752,6 +1794,11 @@ msgid "" "<imagedata align=\"center\" fileref=\"live-formatPartitions.png\" format=" "\"PNG\" revision=\"1\" xml:id=\"live-formatPartitions-im1\"/> </imageobject>" msgstr "" +"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref=" +"\"dx2-formatPartitions.png\" format=\"PNG\" revision=\"1\" xml:id=" +"\"formatPartitions-im1\"/> </imageobject> <imageobject condition=\"live\"> " +"<imagedata align=\"center\" fileref=\"live-formatPartitions.png\" format=" +"\"PNG\" revision=\"1\" xml:id=\"live-formatPartitions-im1\"/> </imageobject>" #. type: Content of: <section><para> #: en/formatPartitions.xml:35 @@ -1884,6 +1931,8 @@ msgid "" "<imageobject> <imagedata align=\"center\" fileref=\"dx-welcome.png\"/> </" "imageobject>" msgstr "" +"<imageobject> <imagedata align=\"center\" fileref=\"dx-welcome.png\"/> </" +"imageobject>" #. type: Content of: <section><section><section><itemizedlist><listitem><para> #: en/installer.xml:113 @@ -1907,7 +1956,7 @@ msgstr "" #. type: Content of: <section><section><section><itemizedlist><listitem><para> #: en/installer.xml:134 msgid "<emphasis role=\"bold\">F2: Language</emphasis>" -msgstr "" +msgstr "<emphasis role=\"bold\"> F2: भाषा</emphasis>" #. type: Content of: <section><section><section><itemizedlist><listitem><para> #: en/installer.xml:136 @@ -1933,6 +1982,8 @@ msgid "" "<imageobject> <imagedata align=\"center\" fileref=\"dx-welcome2.png\"/> </" "imageobject>" msgstr "" +"<imageobject> <imagedata align=\"center\" fileref=\"dx-welcome2.png\"/> </" +"imageobject>" #. type: Content of: <section><section><section><itemizedlist><listitem><para> #: en/installer.xml:159 @@ -2049,6 +2100,9 @@ msgid "" "align=\"center\" revision=\"1\" xml:id=\"installUpdates-im1\"/> </" "imageobject>" msgstr "" +"<imageobject> <imagedata format=\"png\" fileref=\"dx2-installUpdates.png\" " +"align=\"center\" revision=\"1\" xml:id=\"installUpdates-im1\"/> </" +"imageobject>" #. type: Content of: <section><para> #: en/installUpdates.xml:25 @@ -2091,6 +2145,8 @@ msgid "" "<imageobject> <imagedata format=\"PNG\" xml:id=\"login-im1\" fileref=\"live-" "login.png\" align=\"center\" revision=\"1\"/> </imageobject>" msgstr "" +"<imageobject> <imagedata format=\"PNG\" xml:id=\"login-im1\" fileref=\"live-" +"login.png\" align=\"center\" revision=\"1\"/> </imageobject>" #. type: Content of: <section><mediaobject><caption><para> #: en/login.xml:11 @@ -2136,6 +2192,9 @@ msgid "" "\" format=\"PNG\" revision=\"1\" xml:id=\"media_selection-im1\"/> </" "imageobject>" msgstr "" +"<imageobject> <imagedata align=\"center\" fileref=\"dx2-media_selection.png" +"\" format=\"PNG\" revision=\"1\" xml:id=\"media_selection-im1\"/> </" +"imageobject>" #. type: Content of: <section><para> #: en/media_selection.xml:32 @@ -2235,6 +2294,9 @@ msgid "" "\"center\" fileref=\"dx2-minimal-install.png\" revision=\"1\"/> </" "imageobject>" msgstr "" +"<imageobject> <imagedata format=\"PNG\" xml:id=\"minimal-install-im1\" align=" +"\"center\" fileref=\"dx2-minimal-install.png\" revision=\"1\"/> </" +"imageobject>" #. type: Content of: <section><info><title> #: en/misc-params.xml:3 @@ -2253,6 +2315,8 @@ msgid "" "<imageobject> <imagedata fileref=\"dx2-summaryTop.png\" align=\"center\"/> </" "imageobject>" msgstr "" +"<imageobject> <imagedata fileref=\"dx2-summaryTop.png\" align=\"center\"/> </" +"imageobject>" #. type: Content of: <section><para> #: en/misc-params.xml:24 @@ -2436,6 +2500,8 @@ msgid "" "<imageobject> <imagedata format=\"PNG\" xml:id=\"summaryBottom-im1\" align=" "\"center\" fileref=\"dx2-summaryBottom.png\" revision=\"1\"/> </imageobject>" msgstr "" +"<imageobject> <imagedata format=\"PNG\" xml:id=\"summaryBottom-im1\" align=" +"\"center\" fileref=\"dx2-summaryBottom.png\" revision=\"1\"/> </imageobject>" #. type: Content of: <section><section><info><title> #: en/misc-params.xml:163 @@ -2561,6 +2627,8 @@ msgid "" "<imageobject> <imagedata align=\"center\" fileref=\"live-reboot2.png\"/> </" "imageobject>" msgstr "" +"<imageobject> <imagedata align=\"center\" fileref=\"live-reboot2.png\"/> </" +"imageobject>" #. type: Content of: <section><simpara> #: en/reboot.xml:16 @@ -2581,6 +2649,8 @@ msgid "" "<imageobject> <imagedata format=\"PNG\" xml:id=\"reboot-im1\" fileref=\"live-" "reboot.png\" align=\"center\" revision=\"1\"/> </imageobject>" msgstr "" +"<imageobject> <imagedata format=\"PNG\" xml:id=\"reboot-im1\" fileref=\"live-" +"reboot.png\" align=\"center\" revision=\"1\"/> </imageobject>" #. type: Content of: <section><info><title> #: en/resizeFATChoose.xml:16 @@ -2611,6 +2681,8 @@ msgid "" "<imageobject> <imagedata align=\"center\" fileref=\"dx2-securityLevel.png\" " "format=\"PNG\" revision=\"1\" xml:id=\"securityLevel-im1\"/> </imageobject>" msgstr "" +"<imageobject> <imagedata align=\"center\" fileref=\"dx2-securityLevel.png\" " +"format=\"PNG\" revision=\"1\" xml:id=\"securityLevel-im1\"/> </imageobject>" #. type: Content of: <section><para> #: en/securityLevel.xml:26 @@ -2964,6 +3036,8 @@ msgid "" "<imageobject> <imagedata align=\"center\" fileref=\"Checking.png\"/> </" "imageobject>" msgstr "" +"<imageobject> <imagedata align=\"center\" fileref=\"Checking.png\"/> </" +"imageobject>" #. type: Content of: <section><section><section><para> #: en/SelectAndUseISOs2.xml:222 @@ -2976,6 +3050,8 @@ msgid "" "<imageobject> <imagedata align=\"center\" fileref=\"Download.png\"/> </" "imageobject>" msgstr "" +"<imageobject> <imagedata align=\"center\" fileref=\"Download.png\"/> </" +"imageobject>" #. type: Content of: <section><section><section><para> #: en/SelectAndUseISOs2.xml:229 @@ -3037,6 +3113,8 @@ msgid "" "<imageobject> <imagedata align=\"center\" fileref=\"Md5sum.png\"/> </" "imageobject>" msgstr "" +"<imageobject> <imagedata align=\"center\" fileref=\"Md5sum.png\"/> </" +"imageobject>" #. type: Content of: <section><section><section><para> #: en/SelectAndUseISOs2.xml:265 @@ -3173,6 +3251,8 @@ msgid "" "<imageobject> <imagedata align=\"center\" fileref=\"Root.png\"/> </" "imageobject>" msgstr "" +"<imageobject> <imagedata align=\"center\" fileref=\"Root.png\"/> </" +"imageobject>" #. type: Content of: <section><section><section><section><orderedlist><listitem><para> #: en/SelectAndUseISOs2.xml:338 @@ -3192,6 +3272,8 @@ msgid "" "<imageobject> <imagedata align=\"center\" fileref=\"Fdisk.png\"/> </" "imageobject>" msgstr "" +"<imageobject> <imagedata align=\"center\" fileref=\"Fdisk.png\"/> </" +"imageobject>" #. type: Content of: <section><section><section><section><orderedlist><listitem><para> #: en/SelectAndUseISOs2.xml:351 @@ -3293,6 +3375,8 @@ msgid "" "<imageobject> <imagedata format=\"PNG\" xml:id=\"selectCountry-im1\" align=" "\"center\" fileref=\"dx2-selectCountry.png\" revision=\"1\"/> </imageobject>" msgstr "" +"<imageobject> <imagedata format=\"PNG\" xml:id=\"selectCountry-im1\" align=" +"\"center\" fileref=\"dx2-selectCountry.png\" revision=\"1\"/> </imageobject>" #. type: Content of: <section><itemizedlist><listitem><para> #: en/selectCountry.xml:20 @@ -3353,6 +3437,8 @@ msgid "" "<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectInstallClass." "png\" format=\"PNG\"/> </imageobject>" msgstr "" +"<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectInstallClass." +"png\" format=\"PNG\"/> </imageobject>" #. type: Content of: <section><itemizedlist><listitem><para> #: en/selectInstallClass.xml:41 @@ -3412,6 +3498,9 @@ msgid "" "\" format=\"PNG\" revision=\"1\" xml:id=\"selectKeyboardLive-im1\"/> </" "imageobject>" msgstr "" +"<imageobject> <imagedata align=\"center\" fileref=\"live-selectKeyboard.png" +"\" format=\"PNG\" revision=\"1\" xml:id=\"selectKeyboardLive-im1\"/> </" +"imageobject>" #. type: Content of: <section><para> #: en/selectKeyboardLive.xml:24 @@ -3443,6 +3532,8 @@ msgid "" "<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectKeyboard.png\"/" "> </imageobject>" msgstr "" +"<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectKeyboard.png\"/" +"> </imageobject>" #. type: Content of: <section><itemizedlist><listitem><para> #: en/selectKeyboard.xml:35 @@ -3517,6 +3608,10 @@ msgid "" "condition=\"live\"> <imagedata align=\"center\" fileref=\"live-language.png" "\" format=\"PNG\"/> </imageobject>" msgstr "" +"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref=" +"\"dx2-selectLanguage.png\" format=\"PNG\"/> </imageobject> <imageobject " +"condition=\"live\"> <imagedata align=\"center\" fileref=\"live-language.png" +"\" format=\"PNG\"/> </imageobject>" #. type: Content of: <section><important><para> #: en/selectLanguage.xml:68 @@ -3567,6 +3662,8 @@ msgid "" "<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectMouse.png\" " "format=\"PNG\"/> </imageobject>" msgstr "" +"<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectMouse.png\" " +"format=\"PNG\"/> </imageobject>" #. type: Content of: <section><para> #: en/selectMouse.xml:29 @@ -3617,9 +3714,8 @@ msgstr "बूटलोडर" #. type: Content of: <section><section><title> #: en/setupBootloader.xml:36 -#, fuzzy msgid "Available Bootloaders" -msgstr "बूटलोडर" +msgstr "" #. type: Content of: <section><section><section><title> #: en/setupBootloader.xml:39 @@ -3717,6 +3813,10 @@ msgid "" "\"> <imagedata fileref=\"live-setupBootloader.png\" xml:id=\"setupBootloader-" "im1\"/> </imageobject>" msgstr "" +"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref=" +"\"dx2-setupBootloader.png\"/> </imageobject> <imageobject condition=\"live" +"\"> <imagedata fileref=\"live-setupBootloader.png\" xml:id=\"setupBootloader-" +"im1\"/> </imageobject>" #. type: Content of: <section><section><section><itemizedlist><listitem><para> #: en/setupBootloader.xml:125 @@ -3880,17 +3980,16 @@ msgstr "" #. type: Content of: <section><section><section><mediaobject> #: en/setupBootloader.xml:243 -#, fuzzy msgid "" "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref=" "\"rEFIndLoaderConfig.png\"/> </imageobject> <imageobject condition=\"live\"> " "<imagedata align=\"center\" fileref=\"live-rEFIndLoaderConfig.png\"/> </" "imageobject>" msgstr "" -"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" fileref=" -"\"dx2-setRootPassword.png\" align=\"center\" revision=\"1\" xml:id=" -"\"setRootPassword-im1\"/> </imageobject> <imageobject> <imagedata format=" -"\"PNG\" fileref=\"live-user1.png\"/> </imageobject>" +"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref=" +"\"rEFIndLoaderConfig.png\"/> </imageobject> <imageobject condition=\"live\"> " +"<imagedata align=\"center\" fileref=\"live-rEFIndLoaderConfig.png\"/> </" +"imageobject>" #. type: Content of: <section><section><section><itemizedlist><para> #: en/setupBootloader.xml:253 @@ -3934,6 +4033,10 @@ msgid "" "\"> <imagedata align=\"center\" fileref=\"live-setupBootloader3.png\"/> </" "imageobject>" msgstr "" +"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref=" +"\"dx2-setupBootloader3.png\"/> </imageobject> <imageobject condition=\"live" +"\"> <imagedata align=\"center\" fileref=\"live-setupBootloader3.png\"/> </" +"imageobject>" #. type: Content of: <section><section><section><itemizedlist><listitem><para> #: en/setupBootloader.xml:286 @@ -3978,6 +4081,10 @@ msgid "" "\"> <imagedata align=\"center\" fileref=\"live-setupBootloader4.png\"/> </" "imageobject>" msgstr "" +"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref=" +"\"dx2-setupBootloader4.png\"/> </imageobject> <imageobject condition=\"live" +"\"> <imagedata align=\"center\" fileref=\"live-setupBootloader4.png\"/> </" +"imageobject>" #. type: Content of: <section><section><section><itemizedlist><listitem><para> #: en/setupBootloader.xml:322 @@ -4021,6 +4128,8 @@ msgid "" "<imageobject> <imagedata align=\"center\" fileref=\"live-setupBootloader5.png" "\"/> </imageobject>" msgstr "" +"<imageobject> <imagedata align=\"center\" fileref=\"live-setupBootloader5.png" +"\"/> </imageobject>" #. type: Content of: <section><section><title> #: en/setupBootloader.xml:356 @@ -4077,6 +4186,8 @@ msgid "" "<imageobject> <imagedata align=\"center\" fileref=\"dx2-setupSCSI.png\" " "format=\"PNG\" revision=\"1\" xml:id=\"setupSCSI-im1\"/> </imageobject>" msgstr "" +"<imageobject> <imagedata align=\"center\" fileref=\"dx2-setupSCSI.png\" " +"format=\"PNG\" revision=\"1\" xml:id=\"setupSCSI-im1\"/> </imageobject>" #. type: Content of: <section><para> #: en/setupSCSI.xml:39 @@ -4107,7 +4218,7 @@ msgstr "" #. type: Content of: <section><info><title> #: en/soundConfig.xml:10 msgid "Sound Configuration" -msgstr "" +msgstr "ध्वनि विन्यास" #. Lebarhon 20170209 updated SC #. 2018/02/13 apb: Text and typography. @@ -4118,6 +4229,8 @@ msgid "" "<imageobject> <imagedata align=\"center\" fileref=\"dx2-soundConfig.png\" " "format=\"PNG\" revision=\"1\" xml:id=\"soundConfig-im1\"/> </imageobject>" msgstr "" +"<imageobject> <imagedata align=\"center\" fileref=\"dx2-soundConfig.png\" " +"format=\"PNG\" revision=\"1\" xml:id=\"soundConfig-im1\"/> </imageobject>" #. type: Content of: <section><para> #: en/soundConfig.xml:26 @@ -4164,6 +4277,10 @@ msgid "" "condition=\"live\"> <imagedata align=\"center\" fileref=\"live-" "takeOverHdConfirm.png\" format=\"PNG\"/> </imageobject>" msgstr "" +"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref=" +"\"dx2-takeOverHdConfirm.png\" format=\"PNG\"/> </imageobject> <imageobject " +"condition=\"live\"> <imagedata align=\"center\" fileref=\"live-" +"takeOverHdConfirm.png\" format=\"PNG\"/> </imageobject>" #. type: Content of: <section><itemizedlist><listitem><para> #: en/takeOverHdConfirm.xml:42 @@ -4202,6 +4319,7 @@ msgstr "" #: en/testing.xml:23 msgid "<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>" msgstr "" +"<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>" #. type: Content of: <section><section><section><info><title> #: en/testing.xml:30 @@ -4275,6 +4393,8 @@ msgid "" "<imageobject> <imagedata fileref=\"live-liveMode-install.png\"/> </" "imageobject>" msgstr "" +"<imageobject> <imagedata fileref=\"live-liveMode-install.png\"/> </" +"imageobject>" #. type: Content of: <section><info><title> #: en/uninstall-Mageia.xml:10 @@ -4341,6 +4461,8 @@ msgid "" "<imageobject> <imagedata format=\"PNG\" xml:id=\"unused-im1\" fileref=\"live-" "unused.png\" align=\"center\" revision=\"1\"/> </imageobject>" msgstr "" +"<imageobject> <imagedata format=\"PNG\" xml:id=\"unused-im1\" fileref=\"live-" +"unused.png\" align=\"center\" revision=\"1\"/> </imageobject>" #. type: Content of: <section><para> #: en/unused.xml:14 @@ -4370,6 +4492,8 @@ msgid "" "<imageobject> <imagedata fileref=\"../live-unused-InstallationProgress.png\"/" "> </imageobject>" msgstr "" +"<imageobject> <imagedata fileref=\"../live-unused-InstallationProgress.png\"/" +"> </imageobject>" #. type: Content of: <section><para> #: en/unused.xml:31 diff --git a/docs/docs/stable/installer/hi/DrakLive-cover.xml b/docs/docs/stable/installer/hi/DrakLive-cover.xml index 715d5d52..dd277980 100644 --- a/docs/docs/stable/installer/hi/DrakLive-cover.xml +++ b/docs/docs/stable/installer/hi/DrakLive-cover.xml @@ -14,20 +14,20 @@ <info> <!--2018/02/19 apb: Disabled setupBootloaderAddEntry.xml because I have included it at the end of setupBootloader.xml--> <!--2018/03/24 apb: Disabled doPartitionDisks.xml, ask_mntpoint_s.xml, takeOverHdConfirm.xml, diskdrake.xml and formatPartitions.xml because I have grouped them together under diskPartitioning.xml (as per DrakX)--> -<title>Installation from LIVE medium</title> +<title>लाइव मीडिया के माध्यम से इंस्टॉल</title> <publisher> <publishername>Mageia.org</publishername> </publisher> <revhistory> <revision> - <date>March 2016</date> + <date>मार्च 2016</date> - <revremark>Mageia 5</revremark> + <revremark>मजिया 5</revremark> </revision> </revhistory> <cover> - <para role="tagline">The Official Documentation for Mageia</para> + <para role="tagline">मजिया हेतु आधिकारिक प्रलेखन</para> <mediaobject> <imageobject> <imagedata fileref="../mageia-2013.png"/> </imageobject></mediaobject> @@ -47,7 +47,7 @@ Team</link>, if you would like to help improve this manual.</para> </info> <article> - <title>Installation from LIVE medium</title> + <title>लाइव मीडिया के माध्यम से इंस्टॉल</title> <para><note> <para>No one will see all the installer screens that you see in this manual. Which diff --git a/docs/docs/stable/installer/hi/DrakLive.xml b/docs/docs/stable/installer/hi/DrakLive.xml index 4aa3f7e9..846a80d8 100644 --- a/docs/docs/stable/installer/hi/DrakLive.xml +++ b/docs/docs/stable/installer/hi/DrakLive.xml @@ -15,7 +15,7 @@ <!--2018/02/16 apb: Comment-out setupBootloaderAddEntry because I have incorporated it at the end of setupBootloader--> <!--2018/03/23 apb: a) Using diskPartitioning.xml to group doPartitionDisks.xml ask_mntpoint_s.xml takeOverHdConfirm.xml diskdrake.xml and formatPartitions.xml b) Disabled doPartitionDisks.xml ask_mntpoint_s.xml takeOverHdConfirm.xml diskdrake.xml and formatPartitions.xml This is to reflect same arrangement in DrakX--> -<title>Installation from LIVE medium</title> +<title>लाइव मीडिया के माध्यम से इंस्टॉल</title> <cover> <para><note> diff --git a/docs/docs/stable/installer/hi/DrakX-cover.xml b/docs/docs/stable/installer/hi/DrakX-cover.xml index ba51f97b..e6967975 100644 --- a/docs/docs/stable/installer/hi/DrakX-cover.xml +++ b/docs/docs/stable/installer/hi/DrakX-cover.xml @@ -17,14 +17,14 @@ <revhistory> <revision> - <date>February 2014</date> + <date>फरवरी 2014</date> - <revremark>Mageia 4</revremark> + <revremark>मजिया 4</revremark> </revision> </revhistory> <cover> - <para role="tagline">The Official Documentation for Mageia</para> + <para role="tagline">मजिया हेतु आधिकारिक प्रलेखन</para> <mediaobject> <imageobject> <imagedata fileref="../mageia-2013.png"/> </imageobject></mediaobject> diff --git a/docs/docs/stable/installer/hi/acceptLicense.xml b/docs/docs/stable/installer/hi/acceptLicense.xml index f85179fa..c2e44409 100644 --- a/docs/docs/stable/installer/hi/acceptLicense.xml +++ b/docs/docs/stable/installer/hi/acceptLicense.xml @@ -40,7 +40,7 @@ <!--2018/02/15 apb: Text and typography.--> <!--2018/02/19 apb: Updated dx2-license.png to Mga6.--> <!--2018/02/25 apb: Slight reword to '..thanks for looking' sentence.--> -<title xml:id="acceptLicense-ti1">License and Release Notes</title> +<title xml:id="acceptLicense-ti1">लाइसेंस व प्रकाशन नोट्स</title> </info> <mediaobject> @@ -52,7 +52,7 @@ align="center" condition="live"/> </imageobject></mediaobject> <section xml:id="license"> <info> - <title xml:id="license-ti1">License Agreement</title> + <title xml:id="license-ti1">लाइसेंस अनुबंध</title> </info> <itemizedlist> diff --git a/docs/docs/stable/installer/hi/addUser.xml b/docs/docs/stable/installer/hi/addUser.xml index 8e50d76d..18c58571 100644 --- a/docs/docs/stable/installer/hi/addUser.xml +++ b/docs/docs/stable/installer/hi/addUser.xml @@ -6,7 +6,7 @@ xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook"> <info> - <title xml:id="addUser-ti1">User Management</title> + <title xml:id="addUser-ti1">उपयोक्ता प्रबंधन</title> </info> @@ -19,6 +19,10 @@ + + + + <mediaobject> <!-- Lebarhon: 20170210 updated for Mageia 6 (umask)--> <!--2018/02/12 apb: Text and Typography.--> @@ -26,25 +30,29 @@ <!--2018/02/21 apb: Changed title from 'User and Superuser Management' to 'User Management'. Docteam approved (plus, the SC title is User Management). Also changed 'Advanced User Management' to 'User Management (advanced)'.--> <!--2018/02/24 apb: Changed list style.--> +<!--2019/08/10 apb: Added missing 'condition' profile for live-user1.png.--> +<!--2019/08/11 apb: [1] Reword 1.1 (including Note) [2] Reword 1.2 Password text.--> <imageobject condition="classical"> <imagedata align="center" fileref="dx2-setRootPassword.png" format="PNG" revision="1" -xml:id="setRootPassword-im1"/> </imageobject> <imageobject> <imagedata -fileref="live-user1.png" format="PNG"/> </imageobject></mediaobject> +xml:id="setRootPassword-im1"/> </imageobject> <imageobject condition="live"> +<imagedata fileref="live-user1.png" format="PNG"/> </imageobject></mediaobject> <section xml:id="root-password"> <info> - <title xml:id="root-password-ti2">Set Administrator (root) Password:</title> + <title xml:id="root-password-ti2">प्रशासक (रुट) कूटशब्द सेट करें :</title> </info> <para>It is advisable for all Mageia installations to set a <literal>superuser</literal> (Administrator) password, usually called the -<emphasis>root </emphasis>password in Linux. As you type a password into the -top box a shield will change from red-to-yellow-to-green depending on the -strength of the password. A green shield shows you are using a strong -password. You need to repeat the same password in the box underneath, to -check that the first entry was not mistyped.</para> +<emphasis>root </emphasis>password in Linux. You need to repeat the same +password in the box underneath, to check that the first entry was not +mistyped.</para> <note xml:id="givePassword"> + <para>As you type a password into the top box a shield will change from +red-to-yellow-to-green depending on the strength of the password. A green +shield shows you are using a strong password.</para> + <para>All passwords are case-sensitive. It is best to use a mixture of letters (upper and lower case), numbers and other characters in a password.</para> </note> @@ -52,7 +60,7 @@ check that the first entry was not mistyped.</para> <section xml:id="enterUser"> <info> - <title xml:id="enterUser-ti3">Enter a user</title> + <title xml:id="enterUser-ti3">उपयोक्ता दर्ज करें</title> </info> <para>Add a User here. A regular user has fewer privileges than the @@ -62,30 +70,35 @@ computer for.</para> <itemizedlist> <listitem> - <para><emphasis role="bold">Icon</emphasis></para> + <para><emphasis role="bold">आइकन</emphasis></para> <para>Click on this button if you want to change the user's icon</para> </listitem> <listitem> - <para><emphasis role="bold">Real Name</emphasis></para> + <para><emphasis role="bold">वास्तविक नाम</emphasis></para> <para>Insert the user's real name into this text box</para> </listitem> <listitem> - <para><emphasis role="bold">Login Name</emphasis></para> + <para><emphasis role="bold">लॉगिन नाम</emphasis></para> <para>Enter the user login name or let DrakX use a version of the user's real name. <emphasis role="bold">The login name is case-sensitive.</emphasis></para> + + <caution condition="live"> + <simpara>The login entered here should be different to any login currently in use for +your <filename>/home</filename> directory. Some user parameters will be +written in the user space, and some can overwrite actual data such as +Firefox, Thunderbird or Kmail data...</simpara> + </caution> </listitem> <listitem> - <para><emphasis role="bold">Password</emphasis></para> + <para><emphasis role="bold">कूटशब्द</emphasis></para> - <para>Type in the user password. There is a shield at the end of the text box that -indicates the strength of the password. (See also <xref -linkend="givePassword"/>)</para> + <para>Type in the user password (remembering the advice in the Note above).</para> <para><emphasis role="bold">Password (again):</emphasis> Retype the user password. DrakX will check that you have not mistyped the password.</para> @@ -106,7 +119,7 @@ management</emphasis>.</para> <section condition="classical" xml:id="addUserAdvanced"> <info> - <title xml:id="addUserAdvanced-ti3">User Management (advanced)</title> + <title xml:id="addUserAdvanced-ti3">उपयोक्ता प्रबंधन (विस्तृत)</title> </info> <para>The <emphasis>Advanced</emphasis> option allows you to edit further settings diff --git a/docs/docs/stable/installer/hi/bootLive.xml b/docs/docs/stable/installer/hi/bootLive.xml index 6f80dc29..4c4cbd4b 100644 --- a/docs/docs/stable/installer/hi/bootLive.xml +++ b/docs/docs/stable/installer/hi/bootLive.xml @@ -1,24 +1,11 @@ -<?xml version="1.0" encoding="utf-8"?> -<section version="5.0" xml:lang="hi" xmlns="http://docbook.org/ns/docbook" - xmlns:ns6="http://www.w3.org/1999/xlink" - xmlns:ns5="http://www.w3.org/1999/xhtml" - xmlns:ns4="http://www.w3.org/2000/svg" - xmlns:ns3="http://www.w3.org/1998/Math/MathML" - xmlns:ns="http://docbook.org/ns/docbook"> +<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns="http://docbook.org/ns/docbook" xmlns:ns3="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns6="http://www.w3.org/1999/xlink" version="5.0" xml:lang="hi"> - - - - - - - <info> <!--2018/03/01 apb: a) center-align live-bootCSM.png b) Redo/expand text.--> <!--2018/02/02 apb: a) update live-bootCSM.png and redo corresponding text.--> @@ -30,20 +17,16 @@ DVD.--> <title xml:id="bootLive-ti1">Boot Mageia as Live system</title> </info> - <section xml:id="bootLive-1"> <info> <title xml:id="bootLive1-ti1">Booting the medium</title> </info> - <para>You can boot directly from a Live DVD or USB. Usually, you just need to plug the USB device in or place the DVD in the drive and restart the computer.</para> - <para>If the computer does not automatically boot from the USB or DVD you may need to reconfigure your BIOS Boot Disk priority. Alternatively, you might try accessing the boot device menu to select a device from which the computer will boot.</para> - <tip> <para>To access the BIOS or boot menu when the computer is starting, you can try pressing either <keycap>F2</keycap>, <keycap>Del</keycap> or @@ -52,125 +35,96 @@ pressing either <keycap>F2</keycap>, <keycap>Del</keycap> or boot device menu. These (fairly common) keys are just a selection of possible options though.</para> </tip> - <note> <para>The actual screen that you will first see when booting from the Live media will depend on whether your computer motherboard is of the Legacy (BIOS) or UEFI type.</para> </note> </section> - <section xml:id="biosmode"> <info> <title xml:id="biosmode-ti1">In BIOS/CSM/Legacy mode</title> </info> - <mediaobject> - <imageobject> <imagedata align="center" fileref="live-bootCSM.png"/> + <imageobject> <imagedata fileref="../live-bootCSM.png" align="center"/> </imageobject> - <caption> <para>First screen while booting in BIOS mode</para> </caption> </mediaobject> - <itemizedlist> - <title>Menu</title> - + <title>मेन्यू</title> <listitem> <para><emphasis role="bold">Boot Mageia</emphasis></para> - <para>This option will boot the Mageia Live system from the connected DVD/USB media (expect a very slow system compared to an installed OS).</para> - <para>Once the boot is done, you can proceed to the installation.</para> - <itemizedlist> <listitem> <para><emphasis role="bold">+ use non-free video drivers (slower to boot)</emphasis></para> - <para>Boot the Mageia Live system using non-free video drivers</para> </listitem> </itemizedlist> </listitem> - <listitem> <para><emphasis role="bold">Install Mageia</emphasis></para> - <para>This option will install Mageia to a hard disk.</para> - <itemizedlist> <listitem> <para><emphasis role="bold">+ use non-free video drivers (slower to boot)</emphasis></para> - <para>Install Mageia using non-free video drivers</para> </listitem> </itemizedlist> </listitem> - <listitem> <para><emphasis role="bold">Memory Test</emphasis></para> - <para>Test the installed RAM by performing multiple read and write operations. Reboot to end the test.</para> </listitem> - <listitem> - <para><emphasis role="bold"> F2 Language</emphasis></para> - + <para><emphasis role="bold"> F2 भाषा</emphasis></para> <para>Press <keycap>F2</keycap> to have the installer use a specific language during the installation. Use the arrow keys to select the language then press <keycap>Enter</keycap>.</para> </listitem> </itemizedlist> </section> - <section xml:id="uefimode"> <info> <title xml:id="uefimode-ti1">In UEFI mode</title> </info> - <mediaobject condition="live"> - <imageobject> <imagedata align="center" fileref="live-bootUEFI.png" -format="PNG" revision="1" xml:id="bootUEFI-im1"/> </imageobject> - + <imageobject> <imagedata format="PNG" fileref="../live-bootUEFI.png" +align="center" xml:id="bootUEFI-im1" revision="1"/> </imageobject> <caption> <para>First screen while booting in UEFI mode</para> </caption> </mediaobject> - <itemizedlist> - <title>Menu</title> - + <title>मेन्यू</title> <listitem> <para><emphasis role="bold">Boot Mageia</emphasis></para> - <para>This option will boot the Mageia Live system from the connected DVD/USB media (expect a very slow system compared to an installed OS). Once the boot is done, you can proceed to the installation</para> </listitem> - <listitem> <para><emphasis role="bold">Install Mageia</emphasis></para> - <para>This option will install Mageia to a hard disk.</para> </listitem> - <listitem> - <para><emphasis role="bold"> F2 Language</emphasis></para> - + <para><emphasis role="bold"> F2 भाषा</emphasis></para> <para>Press <keycap>F2</keycap> to have the installer use a specific language during the installation. Use the arrow keys to select the language then press <keycap>Enter</keycap>.</para> </listitem> </itemizedlist> - <note> <para>If you booted from a USB stick, you will see the above menu options duplicated, and in this case, you should choose from the menu pair that will be suffixed with "USB".</para> </note> </section> -</section> +</section>
\ No newline at end of file diff --git a/docs/docs/stable/installer/hi/configureX_card_list.xml b/docs/docs/stable/installer/hi/configureX_card_list.xml index 815c644b..bd809522 100644 --- a/docs/docs/stable/installer/hi/configureX_card_list.xml +++ b/docs/docs/stable/installer/hi/configureX_card_list.xml @@ -1,6 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> -<section version="5.0" xml:lang="hi" xml:id="configureX_card_list" - xmlns="http://docbook.org/ns/docbook" +<section version="5.0" xml:lang="hi" + xreflabel="Choose an X Server (Configure your Graphic Card)" + xml:id="configureX_card_list" xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns4="http://www.w3.org/1998/Math/MathML" xmlns:ns3="http://www.w3.org/2000/svg" @@ -20,6 +21,8 @@ + + <info> <!-- Initiated by Marja 2012-08-08 --> <!-- Further text JohnR 2012-08-29 --> @@ -28,6 +31,7 @@ <!-- Done corrections accordind to tmb remarks. Papoteur --> <!--2018/02/15 apb: Text and typography.--> <!--2018/02/21 apb: Merge last 2 paras + slight reword.--> +<!--2019/08/10 apb: Added xreflabel--> <title xml:id="configureX_card_list-ti1">Choose an X Server (Configure your Graphic Card)</title> </info> @@ -42,7 +46,7 @@ correctly identify your video device.</para> <para>If the installer has not correctly detected your graphic card and you know which one you have, you can select it from the tree by: <itemizedlist> <listitem> - <para>Vendor</para> + <para>विक्रेता</para> </listitem> <listitem> diff --git a/docs/docs/stable/installer/hi/configureX_chooser.xml b/docs/docs/stable/installer/hi/configureX_chooser.xml index 9794630e..5789b55a 100644 --- a/docs/docs/stable/installer/hi/configureX_chooser.xml +++ b/docs/docs/stable/installer/hi/configureX_chooser.xml @@ -1,15 +1,13 @@ <?xml version="1.0" encoding="utf-8"?> -<section version="5.0" xml:lang="hi" xml:id="configureX_chooser" - xmlns="http://docbook.org/ns/docbook" +<section version="5.0" xml:lang="hi" xreflabel="Graphics Card and Monitor Configuration" + xml:id="configureX_chooser" xmlns="http://docbook.org/ns/docbook" xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook"> - <info> - <title xml:id="configureX_chooser-ti1">Graphic Card and Monitor Configuration</title> - </info> + @@ -21,12 +19,17 @@ - <mediaobject> -<!-- Marja 2012-08-10, copied setupX.xml to this file and replaced all "setupX" in the code by "configureX_chooser", because this is the correct filename for this page--> + <info> + <!-- Marja 2012-08-10, copied setupX.xml to this file and replaced all "setupX" in the code by "configureX_chooser", because this is the correct filename for this page--> <!--2018/02/15 apb: Some text and typography.--> <!--2018/02/21 apb: a) Changed main options list style. b) Slight reword of 'wrong refresh rates' warning.--> <!--2018/02/23 apb: Typo.--> <!--2019/01/06 apb: Slight reword, split 1st para in two.--> +<!--2019/08/10 apb: [1] Added xreflabel. [2] Changed all instances of 'Graphic Card' to Graphics Card--> +<title xml:id="configureX_chooser-ti1">Graphics Card and Monitor Configuration</title> + </info> + + <mediaobject> <imageobject> <imagedata align="center" fileref="dx2-configureX_chooser.png" format="PNG" revision="1" xml:id="configureX_chooser-im1"/> </imageobject></mediaobject> @@ -42,7 +45,7 @@ incorrect, or if none are shown.</para> <itemizedlist> <listitem> - <para revision="1" xml:id="configureX_chooser-pa2"><emphasis role="bold">Graphic Card</emphasis></para> + <para revision="1" xml:id="configureX_chooser-pa2"><emphasis role="bold">Graphics Card</emphasis></para> <para>If you need to, you can select a specific card from this expandable list. See <xref linkend="configureX_card_list"/>.</para> @@ -77,7 +80,7 @@ settings are on the safe side.</para> </listitem> <listitem> - <para revision="1" xml:id="configureX_chooser-pa6"><emphasis role="bold">Options</emphasis></para> + <para revision="1" xml:id="configureX_chooser-pa6"><emphasis role="bold">विकल्प</emphasis></para> <para>Here you can choose to enable or disable various options.</para> </listitem> diff --git a/docs/docs/stable/installer/hi/configureX_monitor.xml b/docs/docs/stable/installer/hi/configureX_monitor.xml index 1e7a307b..375b33fb 100644 --- a/docs/docs/stable/installer/hi/configureX_monitor.xml +++ b/docs/docs/stable/installer/hi/configureX_monitor.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> -<section version="5.0" xml:lang="hi" xml:id="configureX_monitor" - xmlns="http://docbook.org/ns/docbook" +<section version="5.0" xml:lang="hi" xreflabel="Choosing your Monitor" + xml:id="configureX_monitor" xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns4="http://www.w3.org/1998/Math/MathML" xmlns:ns3="http://www.w3.org/2000/svg" @@ -18,6 +18,10 @@ + + + + <info> <!-- Initiated by Marga 2012-8-09 --> <!-- Further text JohnR 2012-08-30 --> @@ -25,6 +29,8 @@ <!----> <!--2018/02/12 apb: Text and typography--> <!--2018/02/22 apb: Change list style.--> +<!--2019/01/06 apb: Slight rewording.--> +<!--2019/08/10 apb: Added xreflabel.--> <title xml:id="configureX_monitor-ti1">Choosing your Monitor</title> </info> @@ -44,7 +50,7 @@ format="PNG" revision="1" xml:id="configureX_monitor-im1"/> </imageobject></medi <variablelist spacing="compact"> <varlistentry> - <term revision="1" xml:id="configureX_monitor-pa2">Custom</term> + <term revision="1" xml:id="configureX_monitor-pa2">इच्छानुसार</term> <listitem> <para revision="1" xml:id="configureX_monitor-pa3">This option allows you to set two critical parameters: the vertical refresh @@ -60,7 +66,7 @@ consult your monitor documentation.</para> </varlistentry> <varlistentry> - <term revision="1" xml:id="configureX_monitor-pa5">Plug'n Play</term> + <term revision="1" xml:id="configureX_monitor-pa5">प्लग और प्ले</term> <listitem> <para revision="1" xml:id="configureX_monitor-pa6">This is the default option and automatically tries to determine the monitor @@ -69,11 +75,11 @@ type from the monitor database.</para> </varlistentry> <varlistentry> - <term revision="1" xml:id="configureX_monitor-pa7">Vendor</term> + <term revision="1" xml:id="configureX_monitor-pa7">विक्रेता</term> <listitem> <para revision="1" xml:id="configureX_monitor-pa8">If the installer has not correctly detected your monitor and you know which -one you have, you can select it from the tree by selecting:</para> +one you have, you can choose it from the options by selecting:</para> </listitem> </varlistentry> </variablelist> @@ -90,14 +96,15 @@ one you have, you can select it from the tree by selecting:</para> <variablelist spacing="compact"> <varlistentry> - <term revision="1" xml:id="configureX_monitor-pa9">Generic</term> + <term revision="1" xml:id="configureX_monitor-pa9">सामान्य</term> <listitem> - <para revision="1" xml:id="configureX_monitor-pa10">Selecting this group will list nearly 30 display configurations such as -1024x768 @ 60Hz and includes flat-panel displays as used in laptops. This is -often a good monitor selection group if you need to use the VESA card driver -when your video hardware cannot be determined automatically. Once again it -may be wise to be conservative in your selections.</para> + <para revision="1" xml:id="configureX_monitor-pa10">Selecting this group will list approximately 30 display configurations such +as 1024x768 @ 60Hz and includes flat-panel displays as used in laptops. +This is often a good monitor selection group if you need to use the VESA +card driver when your video hardware cannot be determined +automatically. Once again, it may be wise to be conservative in your +selections.</para> </listitem> </varlistentry> </variablelist> diff --git a/docs/docs/stable/installer/hi/diskPartitioning.xml b/docs/docs/stable/installer/hi/diskPartitioning.xml index 837d012a..2f675cc8 100644 --- a/docs/docs/stable/installer/hi/diskPartitioning.xml +++ b/docs/docs/stable/installer/hi/diskPartitioning.xml @@ -2,7 +2,7 @@ <!--2018/02/27 apb: Created this XML to group the Partitioning-related elements.--> -<title>Partitioning</title> +<title>विभाजनीकरण</title> <xi:include href="doPartitionDisks.xml"/> diff --git a/docs/docs/stable/installer/hi/diskdrake.xml b/docs/docs/stable/installer/hi/diskdrake.xml index c876498c..eeb78e6f 100644 --- a/docs/docs/stable/installer/hi/diskdrake.xml +++ b/docs/docs/stable/installer/hi/diskdrake.xml @@ -13,8 +13,10 @@ - - + + + + <info> <!-- Lebarhon 2016 12 16 updated for Mageia 6 @@ -23,7 +25,8 @@ Lebarhon 20170902 added SC--> <!--2018/02/12 apb: Text and typography.--> <!--2018/02/17 apb: Fix a couple of tags that were out of place + added 'xreflabel="DiskDrake" at start of doc.--> <!--2018/02/27 apb: Reformat the text and add titles for the boot partition SC's.--> -<!--2018/02/27 apb: Slight reword to 1st bullet-point.--> +<!--2019/01/05 apb: Slight reword to 1st bullet-point.--> +<!--2019/08/06 apb: Slight reword to 2nd bullet-point (was mentioning sda & sdb tabs in previous SC version).--> <title xml:id="diskdrake-ti1">Custom Disk Partitioning with DiskDrake</title> </info> @@ -41,8 +44,8 @@ before you start.</para> <listitem> <para revision="1" xml:id="diskdrake-pa4">There is a tab at the top for every detected hard disk (or other storage -device, like a USB key). In the screenshot above there are two available -devices: <filename>sda </filename>and <filename>sdb</filename>.</para> +device, like a USB key), for example: <filename>sda</filename>, +<filename>sdb</filename>, <filename>sdc</filename> etc.</para> </listitem> <listitem> diff --git a/docs/docs/stable/installer/hi/doPartitionDisks.xml b/docs/docs/stable/installer/hi/doPartitionDisks.xml index fd6e7142..70f0a3c3 100644 --- a/docs/docs/stable/installer/hi/doPartitionDisks.xml +++ b/docs/docs/stable/installer/hi/doPartitionDisks.xml @@ -20,6 +20,10 @@ + + + + <info> <!--lebarhon 20161216 updated for Mageia 6 @@ -31,6 +35,8 @@ lebarhon 20170209 added SC--> <!--2018/02/21 apb: Changed list styles.--> <!--2018/02/24 apb: Changed list styles.--> <!--2019/01/11 apb: Auto allocation of drive space rules: small edits for style consistency.--> +<!--2019/07/06 apb: Added live-doPartitionDisksk.png, as it was previously sharing the DrakX screenshot.--> +<!--2019/08/23 apb: Moved 'Important' note from 'Erase and Use Entire Disk' to 'Use Free Space on a Windows Partition'. Slight text tweak to to first para, 'Warning' and 'Important' --> <title xml:id="doPartitionDisks-ti1">Suggested Partitioning</title> </info> @@ -47,7 +53,7 @@ condition="live"> <imagedata align="center" fileref="live-doPartitionDisks.png"/> </imageobject></mediaobject> <itemizedlist> - <title>Main Options</title> + <title>मुख्य विकल्प</title> <listitem> <para revision="1" xml:id="doPartitionDisks-pa4"><emphasis role="bold">Use Existing Partitions</emphasis></para> @@ -68,14 +74,30 @@ your new Mageia installation.</para> <para revision="1" xml:id="suggestedPartitioning-pa9">If you have unused space on an existing Windows partition, the installer may offer to use it. This can be a useful way of making room for your new Mageia -installation, but is a risky operation so you should make sure you have -backed up all important files!</para> +installation but see the warning below.</para> <para>With this option, the installer displays the remaining Windows partition in light blue and the proposed Mageia partition in dark blue with their intended sizes just underneath. You have the option to modify these sizes by clicking and dragging the gap between both partitions. See the following -screenshot:</para> +screenshot:<mediaobject> +<imageobject condition="classical"> <imagedata align="center" +fileref="dx2-doPartitionDisks2.png"/> </imageobject> <imageobject +condition="live"> <imagedata align="center" +fileref="live-doPartitionDisks2.png"/> </imageobject></mediaobject></para> + + <warning> + <para>This involves shrinking the size of the Windows partition, and therefore is +a risky operation, so you should make sure you have backed up all important +files before proceeding.</para> + </warning> + + <important> + <para revision="3" xml:id="doPartitionDisks-pa11">The partition must be "clean", meaning that Windows must have closed down +correctly the last time it was used. It must also have been defragmented, +although this is not a guarantee that all files in the partition have been +moved out of the area that is about to be used for Mageia.</para> + </important> </listitem> <listitem> @@ -88,15 +110,6 @@ screenshot:</para> intend to use part of the disk for something else, or you already have data on the drive that you are not prepared to lose, then do not use this option.</para> </warning> - - <important> - <para revision="3" xml:id="doPartitionDisks-pa11">Note that this involves shrinking the size of the Windows partition. The -partition must be "clean", meaning that Windows must have closed down -correctly the last time it was used. It must also have been defragmented, -although this is not a guarantee that all files in the partition have been -moved out of the area that is about to be used. It is highly recommended to -back up your personal files.</para> - </important> </listitem> <listitem> @@ -107,12 +120,6 @@ hard drive(s).</para> </listitem> </itemizedlist> - <mediaobject> -<imageobject condition="classical"> <imagedata align="center" -fileref="dx2-doPartitionDisks2.png"/> </imageobject> <imageobject -condition="live"> <imagedata align="center" -fileref="live-doPartitionDisks2.png"/> </imageobject></mediaobject> - <para>If you are not using the <emphasis>Custom disk partitioning</emphasis> option, then the installer will allocate the available space according to the following rules:</para> @@ -185,8 +192,10 @@ condition="live"> <imagedata align="center" fileref="live-doPartitionDisks3.png"/> </imageobject></mediaobject> <mediaobject> -<imageobject> <imagedata align="center" -fileref="dx2-doPartitionDisks4.png"/> </imageobject></mediaobject> +<imageobject condition="classical"> <imagedata align="center" +fileref="dx2-doPartitionDisks4.png"/> </imageobject> <imageobject +condition="live"> <imagedata align="center" +fileref="live-doPartitionDisks4.png"/> </imageobject></mediaobject> <important> <para>Some newer drives are now using 4096 byte logical sectors, instead of the diff --git a/docs/docs/stable/installer/hi/exitInstall.xml b/docs/docs/stable/installer/hi/exitInstall.xml index dc899d2e..76394fde 100644 --- a/docs/docs/stable/installer/hi/exitInstall.xml +++ b/docs/docs/stable/installer/hi/exitInstall.xml @@ -25,7 +25,7 @@ system to start (if there are more than one on your computer).</para> <para xml:id="exitInstall-pa3" revision="1">If you didn't adjust the settings for the bootloader, your Mageia install will be automatically selected and started.</para> - <para xml:id="exitInstall-pa4" revision="1">Enjoy!</para> + <para xml:id="exitInstall-pa4" revision="1">आनंद लें!</para> <para xml:id="exitInstall-pa5" revision="1">Visit <link ns4:href="http://www.mageia.org/en/">www.mageia.org/en/</link> if you have any questions or want to contribute to Mageia</para> diff --git a/docs/docs/stable/installer/hi/firewall.xml b/docs/docs/stable/installer/hi/firewall.xml index 90145a6d..a5a53451 100644 --- a/docs/docs/stable/installer/hi/firewall.xml +++ b/docs/docs/stable/installer/hi/firewall.xml @@ -1,4 +1,13 @@ -<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="firewall" version="5.0" xml:lang="hi" xreflabel="Firewall"> +<?xml version="1.0" encoding="utf-8"?> +<section version="5.0" xml:lang="hi" xreflabel="Firewall" xml:id="firewall" + xmlns="http://docbook.org/ns/docbook" + xmlns:ns5="http://www.w3.org/1998/Math/MathML" + xmlns:ns4="http://www.w3.org/2000/svg" + xmlns:ns3="http://www.w3.org/1999/xhtml" + xmlns:ns2="http://www.w3.org/1999/xlink" + xmlns:ns="http://docbook.org/ns/docbook"> + + @@ -6,14 +15,19 @@ <info> <!--2018/02/15 apb: Text and typography.--> <!--2018/02/25 apb: Added xreflabel for this section.--> -<title xml:id="firewall-ti1">अग्नि-भीतिका</title> +<!--2019/07/23 apb: Added dx2-firewall.png for this section.--> +<title xml:id="firewall-ti1">फ़ायरवॉल</title> </info> - <para xml:id="firewall-pa1" revision="1">This section allows you to configure some simple firewall rules: they + <para revision="1" xml:id="firewall-pa1">This section allows you to configure some simple firewall rules: they determine which type of message from the Internet will be accepted by the target system. This, in turn, allows the corresponding services on the system to be accessible from the Internet.</para> + <mediaobject> +<imageobject> <imagedata align="center" fileref="dx2-firewall.png"/> +</imageobject></mediaobject> + <para>In the default setting (no button is checked), no service of the system is accessible from the network. The <emphasis>Everything (no firewall)</emphasis> option enables access to all services of the machine - @@ -27,21 +41,21 @@ debugging purposes.</para> enable the CUPS server if you want printers on your machine to be accessible from the network.</para> - <para><emphasis role="bold">Advanced</emphasis></para> + <para><emphasis role="bold">विस्तृत</emphasis></para> <para>The <emphasis>Advanced</emphasis> option opens a window where you can enable a series of services by typing a list of <quote>couples</quote> (blank separated)</para> - <para><emphasis><port-number>/<protocol></emphasis></para> + <para><emphasis><port-number>/<protocol></emphasis></para> <simplelist> - <member>- <emphasis><port-number></emphasis> is the value of the port assigned to -the service you want to enable (e.g. 873 for the RSYNC service) as defined -in <emphasis>RFC-433</emphasis>;</member> + <member>- <emphasis><port-number></emphasis> is the value of the port assigned +to the service you want to enable (e.g. 873 for the RSYNC service) as +defined in <emphasis>RFC-433</emphasis>;</member> - <member>- <emphasis><protocol></emphasis> is one of <emphasis>TCP</emphasis> or -<emphasis>UDP</emphasis> - the internet protocol that is used by the + <member>- <emphasis><protocol></emphasis> is one of <emphasis>TCP</emphasis> +or <emphasis>UDP</emphasis> - the internet protocol that is used by the service.</member> </simplelist> @@ -50,4 +64,4 @@ is <emphasis>873/tcp</emphasis>.</para> <para>In case a service is implemented to use both protocols, you specify 2 couples for the same port.</para> -</section>
\ No newline at end of file +</section> diff --git a/docs/docs/stable/installer/hi/installer.xml b/docs/docs/stable/installer/hi/installer.xml index 65fa63e4..66a7cff7 100644 --- a/docs/docs/stable/installer/hi/installer.xml +++ b/docs/docs/stable/installer/hi/installer.xml @@ -26,6 +26,8 @@ + + <info> <!--2018/02/11 apb: Text and typography. F6 Default option needs to be better defined.--> <!--2018/02/17 apb: Removed instances of surplus para tags from before and after some itemizedlist tags. These were present in the import from Mga6 WS. @@ -39,6 +41,7 @@ <!--2018/03/16 apb: Fixed incorrect value for title installer-ti1 (leading to output error since last year in Documentation Workspace - and inherited here, when imported).--> <!--2019/01/02 apb: 1.2 Typo. 1.2.1: Update dx-welcome.png (BIOS Welcome screen) to Mga7 and strip text for the options which have been removed from the Mga7 Welcome screen.--> <!--2019/01/08 apb: 1.2.2: Update dx-welcome2.png (UEFI Welcome screen) to Mga7 and add text for F2 Languages option.--> +<!--2019/07/17 apb: Force dx-welcome.png and dx-welcome2.png to be 800px wide.--> <title xml:id="installer-ti1">DrakX, the Mageia Installer</title> </info> @@ -100,7 +103,7 @@ start the installer, and is normally all that you will need.</para> </imageobject></mediaobject> <itemizedlist> - <title>Menu</title> + <title>मेन्यू</title> <listitem> <para><emphasis role="bold">Install Mageia</emphasis></para> @@ -124,7 +127,7 @@ operations. Reboot to end the test.</para> </listitem> <listitem> - <para><emphasis role="bold">F2: Language</emphasis></para> + <para><emphasis role="bold"> F2: भाषा</emphasis></para> <para>Press F2 for alternative languages.</para> </listitem> @@ -143,7 +146,7 @@ to quit without saving or press <keycap>F10</keycap> to save and quit.</para> </imageobject></mediaobject> <itemizedlist> - <title>Menu</title> + <title>मेन्यू</title> <listitem> <para><emphasis role="bold">Install:</emphasis> Start the Install process</para> diff --git a/docs/docs/stable/installer/hi/setupBootloader.xml b/docs/docs/stable/installer/hi/setupBootloader.xml index 4c167574..a850adf3 100644 --- a/docs/docs/stable/installer/hi/setupBootloader.xml +++ b/docs/docs/stable/installer/hi/setupBootloader.xml @@ -1,6 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <section version="5.0" xml:lang="hi" xreflabel="Bootloader" xml:id="setupBootloader" xmlns="http://docbook.org/ns/docbook" + xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" @@ -22,6 +23,10 @@ + + + + <info> <!--Lebarhon 2015 07 04 Project for Mageia 5. The UEFI and BIOS systems are so different I think it is better to split the page Lebarhon 2016 12 16 updated for Mageia 6. 20170209 updated SC--> @@ -32,44 +37,71 @@ Lebarhon 2016 12 16 updated for Mageia 6. 20170209 updated SC--> <!--2018/02/25 apb: Added xreflabel to this section.--> <!--2019/01/06 apb: Typo.--> <!--2019/01/06 apb: Use 'xi:include' for setupBootloaderAddEntry.xml, as that is how it is called by the inline-help drakx/perl routine.--> -<title xml:id="setupBootloader-ti1">Bootloader</title> +<!--2019/07/18 apb: Rewrite 1.1, to accomodate inclusion of rEFInd option, and modify 1.2.1, 1.2.2 accordingly.--> +<!--2019/08/01 apb: 1.1.1 reworded to: GRUB2-efi or rEFInd may be used as the bootloader for a UEFI system. Added warning text for 1.2.2 Do not Touch MBR/ESP part.--> +<title xml:id="setupBootloader-ti1">बूटलोडर</title> </info> <section> - <title>Grub2</title> + <title>Available Bootloaders</title> + + <section> + <title>Grub2</title> - <itemizedlist> - <title>Grub2 on Legacy MBR/GPT systems</title> + <itemizedlist> + <para><emphasis role="bold">Grub2 on Legacy MBR/GPT systems</emphasis></para> - <listitem> - <para>GRUB2 (with or without graphical menu) will be used exclusively as the + <listitem> + <para>GRUB2 (with or without graphical menu) will be used exclusively as the bootloader for a Legacy/MBR or Legacy/GPT system.</para> - </listitem> + </listitem> - <listitem> - <para>By default, a new bootloader will be written into either the MBR (Master + <listitem> + <para>By default, a new bootloader will be written into either the MBR (Master Boot Record) of your first hard drive or in the BIOS boot partition.</para> - </listitem> - </itemizedlist> + </listitem> + </itemizedlist> - <itemizedlist> - <title>Grub2-efi on UEFI systems</title> + <itemizedlist> + <para><emphasis role="bold">Grub2-efi on UEFI systems</emphasis></para> - <listitem> - <para>GRUB2-efi will be used exclusively as the bootloader for a UEFI system.</para> - </listitem> + <listitem> + <para>GRUB2-efi or rEFInd may be used as the bootloader for a UEFI system.</para> + </listitem> - <listitem> - <para>By default, a new bootloader (Grub2-efi) will be written into the ESP (EFI + <listitem> + <para>By default, a new bootloader (Grub2-efi) will be written into the ESP (EFI System Partition).</para> - <para>If there are already UEFI-based operating systems installed on your computer + <para>If there are already UEFI-based operating systems installed on your computer (Windows 8 for example), the Mageia installer will detect the existing ESP -created by Windows and add grub2-efi to it. If no ESP exists, then one will +created by Windows and add grub2-efi to it. If no ESP exists, then one will be created. Although it is possible to have several ESPs, only one is required, whatever the number of operating systems you have.</para> - </listitem> - </itemizedlist> + </listitem> + </itemizedlist> + </section> + + <section> + <title>rEFInd</title> + + <itemizedlist> + <para><emphasis role="bold">rEFInd on UEFI systems</emphasis></para> + + <listitem> + <para>rEFInd has a nice graphical set of options, and can auto-detect installed +EFI bootloaders. See: http://www.rodsbooks.com/refind/</para> + </listitem> + </itemizedlist> + + <note> + <para>Please note that in order to be able to use the <literal>rEFInd</literal> +option, an installed EFI System Partition must match your system +architecture: if you have a 32bit EFI System Partition installed on a 64bit +machine for instance, then the rEFInd option will not be displayed/available +to you.</para> + </note> + </section> </section> <section> @@ -90,14 +122,34 @@ xml:id="setupBootloader-im1"/> </imageobject></mediaobject> <listitem> <para><emphasis role="bold">Bootloader to use</emphasis></para> - <para>This feature is only available to Legacy MBR/BIOS systems. Users of UEFI -systems will not see this option here.</para> + <itemizedlist> + <listitem> + <para><guimenuitem>GRUB2</guimenuitem> (with either a graphical or a text menu), +can be chosen for both <literal>Legacy MBR/BIOS</literal> systems and +<literal>UEFI</literal> systems.</para> + </listitem> + + <listitem> + <para><guimenuitem>rEFInd</guimenuitem> (with a graphical menu) is an alternative +option solely for use with <literal>UEFI</literal> systems.</para> + </listitem> + </itemizedlist> </listitem> <listitem> <para><emphasis role="bold">Boot device</emphasis></para> - <para>Don't change this unless you really know what you are doing</para> + <warning> + <para>Don't change this unless you really know what you are doing.</para> + </warning> + + <note> + <para>There is no option to write GRUB to the boot sector of a partition (e.g: +<filename>sda1</filename>), as this method is considered unreliable.</para> + </note> + + <para>When using UEFI mode, then the <guilabel>Boot device</guilabel> will be +listed as <guimenuitem>EFI System Partition</guimenuitem>.</para> </listitem> <listitem> @@ -118,7 +170,7 @@ password is the one chosen hereafter.</para> </listitem> <listitem> - <para><emphasis role="bold">Password</emphasis></para> + <para><emphasis role="bold">कूटशब्द</emphasis></para> <para>Choose a password for the bootloader (optional)</para> </listitem> @@ -171,6 +223,38 @@ specific processor in an SMP system</para> <section> <title>Bootloader Configuration</title> + <para>If, in the previous section you selected <literal>rEFInd</literal> as the +bootloader to use, you would then be presented with the options shown in the +screenshot directly below. Otherwise, please instead move on to the +subsequent screenshot for your options.</para> + + <mediaobject> +<imageobject condition="classical"> <imagedata align="center" +fileref="rEFIndLoaderConfig.png"/> </imageobject> <imageobject +condition="live"> <imagedata align="center" +fileref="live-rEFIndLoaderConfig.png"/> </imageobject></mediaobject> + + <itemizedlist> + <para>Your rEFInd configuration options:</para> + + <listitem> + <para><guimenuitem>Install or update rEFInd in the EFI system +partition.</guimenuitem></para> + </listitem> + + <listitem> + <para><guimenuitem>Install in EFI/Boot partition (workaround for some +BIOS's).</guimenuitem></para> + + <para>With some BIOS's, the newly written bootloader for Mageia at end of the +installation will not be recognized. In that case, you can use this option +as a workaround for the issue.</para> + </listitem> + </itemizedlist> + + <para>If you did not select rEFInd as the bootloader to use in the previous +section, then your bootloader configurations are shown below:</para> + <mediaobject> <imageobject condition="classical"> <imagedata align="center" fileref="dx2-setupBootloader3.png"/> </imageobject> <imageobject @@ -196,7 +280,7 @@ give you more information as it boots.</para> <para>If you already have other operating systems installed, Mageia attempts to add them to your new Mageia boot menu. If you don't want this behaviour, -then untick the Probe Foreign OS option.</para> +then untick the <guimenuitem>Probe Foreign OS</guimenuitem> option.</para> </listitem> </itemizedlist> @@ -222,8 +306,15 @@ options.</para> <para>Select this option if you don't want a bootable Mageia, but would rather chain-load it from another OS. You will get a warning that the bootloader is -missing. Click<emphasis> Ok</emphasis> if you are sure you understand the -implications, and wish to proceed.</para> +missing. Click <guimenuitem>Ok </guimenuitem>only if you are sure you +understand the implications, and wish to proceed.</para> + + <warning> + <para>Chain-loading via legacy bootloaders (GRUB Legacy and LiLo) is no longer +supported by Mageia as it is likely to fail when attempting to boot this +resulting installation of Mageia. If you use anything other than GRUB2 or +rEFInd for this purpose, then you do so at your own risk!</para> + </warning> </listitem> </itemizedlist> @@ -234,7 +325,7 @@ fileref="live-setupBootloader5.png"/> </imageobject></mediaobject> </section> <section> - <title>Other Options</title> + <title>अन्य विकल्प</title> <section> <title>Using an existing bootloader</title> @@ -255,7 +346,6 @@ doing, as without some form of bootloader your operating system will be unable to start.</para> </section> - <xi:include href="setupBootloaderAddEntry.xml" - xmlns:xi="http://www.w3.org/2001/XInclude"/> + <xi:include href="setupBootloaderAddEntry.xml"/> </section> </section> diff --git a/docs/docs/stable/installer/hi/soundConfig.xml b/docs/docs/stable/installer/hi/soundConfig.xml index 683d6978..ecaea886 100644 --- a/docs/docs/stable/installer/hi/soundConfig.xml +++ b/docs/docs/stable/installer/hi/soundConfig.xml @@ -7,7 +7,7 @@ xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook"> <info> - <title xml:id="soundConfig-ti1">Sound Configuration</title> + <title xml:id="soundConfig-ti1">ध्वनि विन्यास</title> </info> |