Author: keichwa
Date: 2015-10-01 13:24:51 +0200 (Thu, 01 Oct 2015)
New Revision: 92958
Modified:
trunk/yast/mr/po/autoinst.mr.po
trunk/yast/mr/po/bootloader.mr.po
trunk/yast/mr/po/crowbar.mr.po
trunk/yast/mr/po/kdump.mr.po
trunk/yast/mr/po/ncurses-pkg.mr.po
trunk/yast/mr/po/qt-pkg.mr.po
trunk/yast/mr/po/registration.mr.po
trunk/yast/mr/po/storage.mr.po
trunk/yast/mr/po/vpn.mr.po
Log:
merged
Modified: trunk/yast/mr/po/autoinst.mr.po
===================================================================
--- trunk/yast/mr/po/autoinst.mr.po 2015-10-01 11:24:50 UTC (rev 92957)
+++ trunk/yast/mr/po/autoinst.mr.po 2015-10-01 11:24:51 UTC (rev 92958)
@@ -2,7 +2,7 @@
msgstr ""
"Project-Id-Version: @PACKAGE@\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:36+0200\n"
+"POT-Creation-Date: 2015-09-28 18:16+0200\n"
"PO-Revision-Date: 2005-07-29 15:37+0530\n"
"Last-Translator: Priyavert Sharma\n"
"Language-Team: AgreeYa Solutions \n"
@@ -27,7 +27,7 @@
#: src/clients/autoinst_test_clone.rb:16 src/clients/autoyast.rb:123
#: src/include/autoinstall/conftree.rb:622
-#: src/include/autoinstall/dialogs.rb:333 src/modules/Profile.rb:360
+#: src/include/autoinstall/dialogs.rb:333 src/modules/Profile.rb:352
msgid "This may take a while"
msgstr "ह्याला काही वेळ लागू शकेल"
@@ -49,12 +49,12 @@
#. command line options
#. Init variables
-#. We will have to set default entries which are defined
-#. in the import call of ServicesManager
+#. Import users configuration from the profile
+#.
#. Backup
#. Now check if there any classes defined in theis pre final control file
#: src/clients/autoyast.rb:114 src/clients/ayast_setup.rb:148
-#: src/clients/inst_autoinit.rb:188 src/clients/inst_autosetup.rb:389
+#: src/clients/inst_autoinit.rb:188 src/clients/inst_autosetup.rb:410
#: src/clients/inst_autosetup_upgrade.rb:484
#: src/modules/AutoInstallRules.rb:1001
msgid ""
@@ -520,88 +520,102 @@
#. Uwe Gansert
#.
#. $Id: inst_autosetup.ycp 61521 2010-03-29 09:10:07Z ug $
-#: src/clients/inst_autosetup.rb:50 src/clients/inst_autosetup_upgrade.rb:47
+#: src/clients/inst_autosetup.rb:53 src/clients/inst_autosetup_upgrade.rb:47
msgid "<P>Please wait while the system is prepared for autoinstallation.</P>"
msgstr "<P>स्थव-स्थापनेकरता यंत्रणा तयार होईपर्यंत कृपया प्रतिक्षा करा.</P>"
-#: src/clients/inst_autosetup.rb:54 src/clients/inst_autosetup_upgrade.rb:52
+#: src/clients/inst_autosetup.rb:57 src/clients/inst_autosetup_upgrade.rb:52
msgid "Execute pre-install user scripts"
msgstr "स्थापने पूर्वीच्या वापरायच्या स्क्रिप्ट्स अंमलबजावित करा"
-#: src/clients/inst_autosetup.rb:55 src/clients/inst_autosetup_upgrade.rb:51
+#: src/clients/inst_autosetup.rb:58 src/clients/inst_autosetup_upgrade.rb:51
msgid "Configure General Settings "
msgstr "साधारण बांधणी संरचित करा"
-#: src/clients/inst_autosetup.rb:56 src/clients/inst_autosetup_upgrade.rb:53
+#: src/clients/inst_autosetup.rb:59 src/clients/inst_autosetup_upgrade.rb:53
msgid "Set up language"
msgstr "भाषा नक्की करा"
-#: src/clients/inst_autosetup.rb:57
+#: src/clients/inst_autosetup.rb:60
msgid "Create partition plans"
msgstr "विभागणी ठराव निर्माण करा"
-#: src/clients/inst_autosetup.rb:58 src/clients/inst_autosetup_upgrade.rb:56
+#: src/clients/inst_autosetup.rb:61 src/clients/inst_autosetup_upgrade.rb:56
msgid "Configure Bootloader"
msgstr "बूट लोडर संरचित करा"
-#: src/clients/inst_autosetup.rb:59 src/clients/inst_autosetup_upgrade.rb:54
+#: src/clients/inst_autosetup.rb:62 src/clients/inst_autosetup_upgrade.rb:54
#, fuzzy
#| msgid "Registration Code"
msgid "Registration"
msgstr "नोंदणी कोड"
-#: src/clients/inst_autosetup.rb:60 src/clients/inst_autosetup_upgrade.rb:55
+#: src/clients/inst_autosetup.rb:63 src/clients/inst_autosetup_upgrade.rb:55
msgid "Configure Software selections"
msgstr "सॉफ्टवेअर निवडी संरचित करा"
-#: src/clients/inst_autosetup.rb:61
+#: src/clients/inst_autosetup.rb:64
msgid "Configure Systemd Default Target"
msgstr ""
-#: src/clients/inst_autosetup.rb:65 src/clients/inst_autosetup_upgrade.rb:61
+#: src/clients/inst_autosetup.rb:65
+#, fuzzy
+#| msgid "Configure Volume Groups"
+msgid "Configure users and groups"
+msgstr "ध्वनिचा गट संरचित करा"
+
+#: src/clients/inst_autosetup.rb:69 src/clients/inst_autosetup_upgrade.rb:61
msgid "Executing pre-install user scripts..."
msgstr "स्थापने पूर्वीच्या वापरायच्या स्क्रिप्ट्स अंमलबजावित करा"
-#: src/clients/inst_autosetup.rb:66 src/clients/inst_autosetup_upgrade.rb:60
+#: src/clients/inst_autosetup.rb:70 src/clients/inst_autosetup_upgrade.rb:60
msgid "Configuring general settings..."
msgstr "साधारण मांडणी संरचित करत आहे..."
-#: src/clients/inst_autosetup.rb:67 src/clients/inst_autosetup_upgrade.rb:62
+#: src/clients/inst_autosetup.rb:71 src/clients/inst_autosetup_upgrade.rb:62
#, fuzzy
#| msgid "Set up language"
msgid "Setting up language..."
msgstr "भाषा नक्की करा"
-#: src/clients/inst_autosetup.rb:68
+#: src/clients/inst_autosetup.rb:72
msgid "Creating partition plans..."
msgstr "विभागणी ठराव निर्माण करत आहे..."
-#: src/clients/inst_autosetup.rb:69 src/clients/inst_autosetup_upgrade.rb:65
+#: src/clients/inst_autosetup.rb:73 src/clients/inst_autosetup_upgrade.rb:65
msgid "Configuring Bootloader..."
msgstr "बूट लोडर संरचित करत आहे..."
-#: src/clients/inst_autosetup.rb:70 src/clients/inst_autosetup_upgrade.rb:63
+#: src/clients/inst_autosetup.rb:74 src/clients/inst_autosetup_upgrade.rb:63
#, fuzzy
#| msgid "Repairing file system..."
msgid "Registering the system..."
msgstr "फाईल यंत्रणा दुरूस्त होत आहे..."
-#: src/clients/inst_autosetup.rb:71 src/clients/inst_autosetup_upgrade.rb:64
+#: src/clients/inst_autosetup.rb:75 src/clients/inst_autosetup_upgrade.rb:64
msgid "Configuring Software selections..."
msgstr "सॉफ्टवेअर निवडी संरचित करत आहे..."
-#: src/clients/inst_autosetup.rb:72
+#: src/clients/inst_autosetup.rb:76
#, fuzzy
#| msgid "Configuring language..."
msgid "Configuring Systemd Default Target..."
msgstr "भाषा संरचित करा...."
-#: src/clients/inst_autosetup.rb:76 src/clients/inst_autosetup_upgrade.rb:69
+#: src/clients/inst_autosetup.rb:77
+msgid "Importing users and groups configuration..."
+msgstr ""
+
+#: src/clients/inst_autosetup.rb:81 src/clients/inst_autosetup_upgrade.rb:69
msgid "Preparing System for Automated Installation"
msgstr "ऑटोमेटेड स्थापनेकरता यंत्रणा तयार करत आहेत"
-#. configure general settings
-#: src/clients/inst_autosetup.rb:164
+#. Second stage of installation will not be called but a
+#. network configuration is available. So this will be written
+#. while the general inst_finish process at the end of the
+#. first stage. But for the installation workflow the linuxrc
+#. network settings will be taken. (bnc#944942)
+#: src/clients/inst_autosetup.rb:183
#, fuzzy
#| msgid "Signing the Add-On Product"
msgid "Handling Add-On Products..."
@@ -610,12 +624,12 @@
#. Set it in the Language module.
#.
#. Set it in the Language module.
-#: src/clients/inst_autosetup.rb:184 src/clients/inst_autosetup_upgrade.rb:149
+#: src/clients/inst_autosetup.rb:202 src/clients/inst_autosetup_upgrade.rb:149
msgid "Configuring language..."
msgstr "भाषा संरचित करा...."
#. Yes, do not set Storage testsuite here as we want really GUI with proposal
-#: src/clients/inst_autosetup.rb:273
+#: src/clients/inst_autosetup.rb:290
msgid ""
"Error while configuring partitions.\n"
"Try again.\n"
@@ -624,7 +638,7 @@
"पुन्हा प्रयत्न करा.\n"
#. Software
-#: src/clients/inst_autosetup.rb:331
+#: src/clients/inst_autosetup.rb:344
msgid ""
"Error while configuring software selections.\n"
"Try again.\n"
@@ -1652,7 +1666,7 @@
#. list<any> l = [ "key1",0,"key3" ];
#. m[ l ] = v;
#. @return [Hash]
-#: src/include/autoinstall/dialogs.rb:410 src/modules/Profile.rb:815
+#: src/include/autoinstall/dialogs.rb:410 src/modules/Profile.rb:807
msgid "Checking XML with RNG validation..."
msgstr "RNG वैधतेबरोबर XML तपासले जात आहे..."
@@ -1663,7 +1677,7 @@
msgstr "भाग %1 सापडत नाही."
#. jing validation -- validates complete xml profile
-#: src/include/autoinstall/dialogs.rb:459 src/modules/Profile.rb:827
+#: src/include/autoinstall/dialogs.rb:459 src/modules/Profile.rb:819
msgid "Checking XML with RNC validation..."
msgstr "RNC वैधतेबरोबर XML तपासले जात आहे..."
@@ -2408,7 +2422,7 @@
#. @param [String] result_profile the resulting control file path
#. @return [Boolean] true on success
#. autoyast has read the autoyast configuration file but something went wrong
-#: src/modules/AutoInstallRules.rb:909 src/modules/Profile.rb:746
+#: src/modules/AutoInstallRules.rb:909 src/modules/Profile.rb:738
msgid "The XML parser reported an error while parsing the autoyast profile. The error message is:\n"
msgstr "ऑटोयास्ट फाईल पार्स करताना XML पार्सरने चूक असा अहवाल दाखविला. चूक संदेश असा:\n"
@@ -2917,14 +2931,14 @@
#. Prepare Profile for saving and remove empty data structs
#. @return [void]
-#: src/modules/Profile.rb:359
+#: src/modules/Profile.rb:351
msgid "Collecting configuration data..."
msgstr "संरचना माहिती गोळा करत आहे..."
#. Save YCP data into XML
#. @param path to file
#. @return [Boolean] true on success
-#: src/modules/Profile.rb:462
+#: src/modules/Profile.rb:454
msgid "Encrypted AutoYaST profile. Enter the password twice."
msgstr ""
@@ -2932,7 +2946,7 @@
#.
#. @param [String] dir - directory to store section xml files in
#. @return - list of filenames
-#: src/modules/Profile.rb:536
+#: src/modules/Profile.rb:528
#, fuzzy
msgid "Could not write section %1 to file %2."
msgstr "फाईलबद्दल मत लिहू शकत नाही %1."
@@ -2940,7 +2954,7 @@
#. Read XML into YCP data
#. @param path to file
#. @return [Boolean]
-#: src/modules/Profile.rb:703 src/modules/ProfileLocation.rb:190
+#: src/modules/Profile.rb:695 src/modules/ProfileLocation.rb:190
msgid "Encrypted AutoYaST profile. Enter the correct password."
msgstr ""
@@ -3059,9 +3073,6 @@
#~ " याठिकाणी आपले व्हॉल्युम समुह निर्माण व संपादित करा. त्यानंतर भौतिक हार्ड डिस्कच्या पार्टिशन डायलॉगमधील या व्हॉल्यूम समुहाला भौतिक पार्टिशन्स नेमून द्या. त्या पार्टिशन्ससाठी ID to 0x8e ला पार्टिशन आयडी सेट करा.\n"
#~ "</P>\n"
-#~ msgid "Configure Volume Groups"
-#~ msgstr "ध्वनिचा गट संरचित करा"
-
#~ msgid "&Volume Group"
#~ msgstr "&ध्वनीचा गट"
Modified: trunk/yast/mr/po/bootloader.mr.po
===================================================================
--- trunk/yast/mr/po/bootloader.mr.po 2015-10-01 11:24:50 UTC (rev 92957)
+++ trunk/yast/mr/po/bootloader.mr.po 2015-10-01 11:24:51 UTC (rev 92958)
@@ -2,7 +2,7 @@
msgstr ""
"Project-Id-Version: @PACKAGE@\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:36+0200\n"
+"POT-Creation-Date: 2015-09-28 18:16+0200\n"
"PO-Revision-Date: 2005-07-29 15:37+0530\n"
"Last-Translator: Priyavert Sharma\n"
"Language-Team: AgreeYa Solutions \n"
@@ -402,7 +402,7 @@
msgstr ""
#. Title in tab
-#: src/include/bootloader/grub2/dialogs.rb:56
+#: src/include/bootloader/grub2/dialogs.rb:57
#, fuzzy
#| msgid "Boot Loader Options"
msgid "Boot Code Options"
@@ -482,31 +482,21 @@
msgid "<p><b>Protective MBR flag</b> is expert only settings, that is needed only on exotic hardware. For details see Protective MBR in GPT disks. Do not touch if you are not sure.</p>"
msgstr ""
-#: src/include/bootloader/grub2/helps.rb:35
-msgid "<p><b>Distributor</b> specifies name of distributor of kernel used to create boot entry name. </p>"
-msgstr ""
-
-#: src/include/bootloader/grub2/helps.rb:41
+#: src/include/bootloader/grub2/helps.rb:38
#, fuzzy
msgid "O&ptional Kernel Command Line Parameter"
msgstr "वैकल्पीत कर्नेल सूचना ओळ पॅरामीटर्स"
-#: src/include/bootloader/grub2/helps.rb:42
+#: src/include/bootloader/grub2/helps.rb:39
#, fuzzy
-#| msgid "Distribution:"
-msgid "D&istributor"
-msgstr " वाटप: "
-
-#: src/include/bootloader/grub2/helps.rb:43
-#, fuzzy
msgid "&Vga Mode"
msgstr "VGA मोड"
-#: src/include/bootloader/grub2/helps.rb:44
+#: src/include/bootloader/grub2/helps.rb:40
msgid "Probe Foreign OS"
msgstr ""
-#: src/include/bootloader/grub2/helps.rb:45
+#: src/include/bootloader/grub2/helps.rb:41
msgid "Protective MBR flag"
msgstr ""
@@ -608,7 +598,7 @@
#. F#300779 - Install diskless client (NFS-root)
#. kokso: additional warning that root partition is nfs type -> bootloader will not be installed
#. kokso: additional warning that root partition is nfs type -> bootloader will not be installed
-#: src/include/bootloader/routines/dialogs.rb:86 src/modules/Bootloader.rb:237
+#: src/include/bootloader/routines/dialogs.rb:86 src/modules/Bootloader.rb:239
#, fuzzy
msgid "The boot partition is of type NFS. Bootloader cannot be installed."
msgstr "विभाग पाडल्यामुळे, बूटलोडर नीट स्थापित करता येऊ शकत नाही."
@@ -986,7 +976,7 @@
"इतर कार्य प्रणाली बूट करण्यासाठी हे वापरले जाते.</p>"
#. part of summary, %1 is a list of hard disks device names
-#: src/include/bootloader/routines/lilolike.rb:101
+#: src/include/bootloader/routines/lilolike.rb:108
msgid "Order of Hard Disks: %1"
msgstr "हार्डडिस्कची आज्ञा: %1"
@@ -1179,49 +1169,49 @@
msgstr "बूटीग"
#. warning text in the summary richtext
-#: src/lib/bootloader/proposal_client.rb:178
+#: src/lib/bootloader/proposal_client.rb:174
msgid "No boot loader is selected for installation. Your system might not be bootable."
msgstr "स्थापनेकरता बूट लोडर निवडलेला नाही. यंत्रणा बुटेबल नाही"
#. error in the proposal
-#: src/lib/bootloader/proposal_client.rb:187
+#: src/lib/bootloader/proposal_client.rb:183
msgid "Because of the partitioning, the bootloader cannot be installed properly"
msgstr "विभाग पाडल्यामुळे, बूटलोडर नीट स्थापित करता येऊ शकत नाही."
#. FATE#303643 Enable one-click changes in bootloader proposal
#.
-#: src/modules/BootGRUB2.rb:194
+#: src/modules/BootGRUB2.rb:168
msgid "Install bootcode into MBR (do not install</a>)"
msgstr ""
-#: src/modules/BootGRUB2.rb:198
+#: src/modules/BootGRUB2.rb:172
msgid "Do not install bootcode into MBR (install</a>)"
msgstr ""
#. check for separated boot partition, use root otherwise
-#: src/modules/BootGRUB2.rb:211
+#: src/modules/BootGRUB2.rb:185
msgid "Install bootcode into /boot partition (do not install</a>)"
msgstr ""
-#: src/modules/BootGRUB2.rb:215
+#: src/modules/BootGRUB2.rb:189
msgid "Do not install bootcode into /boot partition (install</a>)"
msgstr ""
-#: src/modules/BootGRUB2.rb:221
+#: src/modules/BootGRUB2.rb:195
msgid "Install bootcode into \"/\" partition (do not install</a>)"
msgstr ""
-#: src/modules/BootGRUB2.rb:225
+#: src/modules/BootGRUB2.rb:199
msgid "Do not install bootcode into \"/\" partition (install</a>)"
msgstr ""
#. no location chosen, so warn user that it is problem unless he is sure
-#: src/modules/BootGRUB2.rb:235
+#: src/modules/BootGRUB2.rb:209
msgid "Warning: No location for bootloader stage1 selected.Unless you know what you are doing please select above location."
msgstr ""
#. TRANSLATORS: title for list of location proposals
-#: src/modules/BootGRUB2.rb:243
+#: src/modules/BootGRUB2.rb:217
#, fuzzy
msgid "Change Location: %s"
msgstr "स्थान: %1"
@@ -1230,22 +1220,22 @@
#. @return a list of summary lines
#. Display bootloader summary
#. @return a list of summary lines
-#: src/modules/BootGRUB2.rb:252 src/modules/BootGRUB2EFI.rb:100
+#: src/modules/BootGRUB2.rb:226 src/modules/BootGRUB2EFI.rb:100
msgid "Boot Loader Type: %1"
msgstr "बूट लोडर प्रकार: %1"
#. TRANSLATORS: extended is here for extended partition. Keep translation short.
-#: src/modules/BootGRUB2.rb:263
+#: src/modules/BootGRUB2.rb:237
msgid " (extended)"
msgstr ""
#. TRANSLATORS: MBR is acronym for Master Boot Record, if nothing locally specific
#. is used in your language, then keep it as it is.
-#: src/modules/BootGRUB2.rb:271
+#: src/modules/BootGRUB2.rb:245
msgid " (MBR)"
msgstr ""
-#: src/modules/BootGRUB2.rb:278
+#: src/modules/BootGRUB2.rb:252
#, fuzzy
msgid "Status Location: %1"
msgstr "स्थान: %1"
@@ -1284,81 +1274,95 @@
msgstr ""
#. if partitioning worked before upgrade, it will keep working (bnc#886604)
-#: src/modules/BootSupportCheck.rb:243
+#: src/modules/BootSupportCheck.rb:239
msgid "Missing ext partition for booting. Cannot install boot code."
msgstr ""
+#. activate set or there is already activate flag
+#: src/modules/BootSupportCheck.rb:248
+msgid "Activate flag is not set by installer. If it is not set at all, some BIOSes could refuse to boot."
+msgstr ""
+
+#: src/modules/BootSupportCheck.rb:255
+msgid "The installer will not modify the MBR of the disk. Unless it already contains boot code, the BIOS won't be able to boot disk."
+msgstr ""
+
#. progress stage, text in dialog (short, infinitiv)
-#: src/modules/Bootloader.rb:144
+#: src/modules/Bootloader.rb:146
msgid "Check boot loader"
msgstr "बूट लोडर तपासा"
#. progress stage, text in dialog (short, infinitiv)
-#: src/modules/Bootloader.rb:146
+#: src/modules/Bootloader.rb:148
msgid "Read partitioning"
msgstr "विभाजन वाचा"
#. progress stage, text in dialog (short, infinitiv)
-#: src/modules/Bootloader.rb:148
+#: src/modules/Bootloader.rb:150
msgid "Load boot loader settings"
msgstr "बूट लोडर मांडणी भरा"
#. progress step, text in dialog (short)
-#: src/modules/Bootloader.rb:152
+#: src/modules/Bootloader.rb:154
msgid "Checking boot loader..."
msgstr "बूट लोडर तपासला जात आहे..."
#. progress step, text in dialog (short)
-#: src/modules/Bootloader.rb:154
+#: src/modules/Bootloader.rb:156
msgid "Reading partitioning..."
msgstr "विभाजने वाचली जात आहे..."
#. progress step, text in dialog (short)
-#: src/modules/Bootloader.rb:156
+#: src/modules/Bootloader.rb:158
msgid "Loading boot loader settings..."
msgstr "बूट लोडर मांडणी भरली जात आहे..."
#. dialog header
-#: src/modules/Bootloader.rb:160
+#: src/modules/Bootloader.rb:162
msgid "Initializing Boot Loader Configuration"
msgstr "बूट लोडर संरचना सुरू होत आहे"
#. progress stage, text in dialog (short)
-#: src/modules/Bootloader.rb:279
+#: src/modules/Bootloader.rb:281
msgid "Create initrd"
msgstr "इनट्रीड निर्माण करा"
#. progress stage, text in dialog (short)
-#: src/modules/Bootloader.rb:281
+#: src/modules/Bootloader.rb:283
msgid "Save boot loader configuration files"
msgstr "बूट लोडर संरचना फाईल संग्रहीत करा"
#. progress stage, text in dialog (short)
-#: src/modules/Bootloader.rb:283
+#: src/modules/Bootloader.rb:285
msgid "Install boot loader"
msgstr "बूट लोडर स्थापा"
#. progress step, text in dialog (short)
-#: src/modules/Bootloader.rb:287
+#: src/modules/Bootloader.rb:289
msgid "Creating initrd..."
msgstr "इंड्रीड निर्माण करत आहे..."
#. progress step, text in dialog (short)
-#: src/modules/Bootloader.rb:289
+#: src/modules/Bootloader.rb:291
msgid "Saving boot loader configuration files..."
msgstr "बूट लोडर संरचना फाईल्स संग्रहीत करत आहे..."
#. progress step, text in dialog (short)
-#: src/modules/Bootloader.rb:291
+#: src/modules/Bootloader.rb:293
msgid "Installing boot loader..."
msgstr "बूट लोडर स्थापीत करत आहे..."
#. progress line
-#: src/modules/Bootloader.rb:297
+#: src/modules/Bootloader.rb:299
msgid "Saving Boot Loader Configuration"
msgstr "बूट लोडर संरचना संग्रहीत करत आहे"
#, fuzzy
+#~| msgid "Distribution:"
+#~ msgid "D&istributor"
+#~ msgstr " वाटप: "
+
+#, fuzzy
#~| msgid "<p><b>Optional Kernel Command Line Parameter</b> lets you define additional parameters to pass to the kernel.</p>"
#~ msgid "<p><b>Failsafe Kernel Command Line Parameter</b> lets you define failsafe parameters to pass to the kernel.</p>"
#~ msgstr "<p><b>ऑप्शनल केर्नेल कमांड लाईन पॅरामीटर </b> आपणास केर्नेलकडे पाठवण्यासाठी अतिरिक्त निकषांची व्याख्या करू देते </p>"
Modified: trunk/yast/mr/po/crowbar.mr.po
===================================================================
--- trunk/yast/mr/po/crowbar.mr.po 2015-10-01 11:24:50 UTC (rev 92957)
+++ trunk/yast/mr/po/crowbar.mr.po 2015-10-01 11:24:51 UTC (rev 92958)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:36+0200\n"
+"POT-Creation-Date: 2015-09-28 18:16+0200\n"
"PO-Revision-Date: 2005-07-29 15:37+0530\n"
"Last-Translator: \"( अमेय पाळंदे ) Ameya Palande\" <2ameya@gmail.com>\n"
"Language-Team: Marathi \n"
@@ -471,7 +471,7 @@
#. popup message %1 is FQDN
#: src/include/crowbar/complex.rb:1731
msgid ""
-"The SUSE Cloud Admin Server has been deployed. Changing the network is\n"
+"The Crowbar Admin Server has been deployed. Changing the network is\n"
"currently not supported.\n"
"\n"
"You can visit the Crowbar web UI on http://%1:3000/"
@@ -527,7 +527,7 @@
#: src/include/crowbar/helps.rb:49
msgid ""
"<p>\n"
-"See the SUSE Cloud deployment guide for details on the network\n"
+"See the product deployment guide for details on the network\n"
"configuration and on using this YaST module.\n"
"</p>"
msgstr ""
Modified: trunk/yast/mr/po/kdump.mr.po
===================================================================
--- trunk/yast/mr/po/kdump.mr.po 2015-10-01 11:24:50 UTC (rev 92957)
+++ trunk/yast/mr/po/kdump.mr.po 2015-10-01 11:24:51 UTC (rev 92958)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:36+0200\n"
+"POT-Creation-Date: 2015-09-28 18:16+0200\n"
"PO-Revision-Date: 2005-07-29 15:37+0530\n"
"Last-Translator: \"( अमेय पाळंदे ) Ameya Palande\" <2ameya@gmail.com>\n"
"Language-Team: Marathi \n"
@@ -343,13 +343,13 @@
msgid "Kdump immediate reboots: %1"
msgstr "केडम्पचे त्वरित रिबूट्स: %1"
-#: src/clients/kdump.rb:652 src/clients/kdump.rb:1259
+#: src/clients/kdump.rb:652 src/clients/kdump.rb:1262
#, fuzzy
#| msgid "enabled"
msgid "Enabled"
msgstr "कार्यान्वित करा"
-#: src/clients/kdump.rb:653 src/clients/kdump.rb:1260
+#: src/clients/kdump.rb:653 src/clients/kdump.rb:1263
#, fuzzy
#| msgid "disabled"
msgid "Disabled"
@@ -395,14 +395,17 @@
#. TRANSLATORS: CommandLine printed text
#: src/clients/kdump.rb:747
-msgid "Kernel option \"crashkernel\" includes ranges. They will be rewritten."
+msgid ""
+"Kernel option \"crashkernel\" includes ranges and/or redundant values.\n"
+"It will be rewritten."
msgstr ""
+#. Force value to false, so it's actually rewritten
#. TRANSLATORS: CommandLine printed text
-#. Popup::Message(crash_value);
-#. delete crashkernel paramter from bootloader
-#: src/clients/kdump.rb:752 src/clients/kdump.rb:757 src/modules/Kdump.rb:570
-#: src/modules/Kdump.rb:589
+#. start kdump at boot
+#. delete crashkernel parameter from bootloader
+#: src/clients/kdump.rb:755 src/clients/kdump.rb:760 src/modules/Kdump.rb:487
+#: src/modules/Kdump.rb:500
msgid "To apply changes a reboot is necessary."
msgstr "बदल लागू करण्यासाठी रिबूट आवश्यक आहे."
@@ -421,44 +424,44 @@
#. TRANSLATORS: CommandLine error message
#. TRANSLATORS: CommandLine error message
#. TRANSLATORS: CommandLine error message
-#: src/clients/kdump.rb:761 src/clients/kdump.rb:787 src/clients/kdump.rb:816
-#: src/clients/kdump.rb:1048 src/clients/kdump.rb:1065
-#: src/clients/kdump.rb:1082 src/clients/kdump.rb:1099
-#: src/clients/kdump.rb:1114 src/clients/kdump.rb:1130
-#: src/clients/kdump.rb:1153 src/clients/kdump.rb:1173
-#: src/clients/kdump.rb:1193 src/clients/kdump.rb:1207
-#: src/clients/kdump.rb:1230 src/clients/kdump.rb:1250
+#: src/clients/kdump.rb:764 src/clients/kdump.rb:790 src/clients/kdump.rb:819
+#: src/clients/kdump.rb:1051 src/clients/kdump.rb:1068
+#: src/clients/kdump.rb:1085 src/clients/kdump.rb:1102
+#: src/clients/kdump.rb:1117 src/clients/kdump.rb:1133
+#: src/clients/kdump.rb:1156 src/clients/kdump.rb:1176
+#: src/clients/kdump.rb:1196 src/clients/kdump.rb:1210
+#: src/clients/kdump.rb:1233 src/clients/kdump.rb:1253
#, fuzzy
msgid "Wrong options were used."
msgstr "सूचना: इन्क्रीप्शंन वापरले गेले नाही."
#. TRANSLATORS: CommandLine printed text
-#: src/clients/kdump.rb:778
+#: src/clients/kdump.rb:781
msgid "Dump level was set."
msgstr "डम्पचा स्तर सेट केला."
#. TRANSLATORS: CommandLine error message
#. TRANSLATORS: CommandLine error message
-#: src/clients/kdump.rb:782 src/clients/kdump.rb:807
+#: src/clients/kdump.rb:785 src/clients/kdump.rb:810
#, fuzzy
msgid "Wrong value of option."
msgstr "पर्यायी किंमत"
#. TRANSLATORS: CommandLine printed text
-#: src/clients/kdump.rb:803
+#: src/clients/kdump.rb:806
#, fuzzy
msgid "Dump format was set."
msgstr "फाईल पध्दती"
#. TRANSLATORS: CommandLine printed text help
-#: src/clients/kdump.rb:810
+#: src/clients/kdump.rb:813
#, fuzzy
#| msgid "Option can include only \"ELF\" or \"compressed\" value."
msgid "Option can include only \"none\", \"ELF\", \"compressed\" or \"lzo\" value."
msgstr "पर्यायामध्ये फक्त \"ELF\" किंवा \"compressed\" मूल्य अंतर्भूत असू शकते."
#. TRANSLATORS: CommandLine error message
-#: src/clients/kdump.rb:830
+#: src/clients/kdump.rb:833
msgid "File %1 does not exist."
msgstr "फाईल %1 अस्तित्वात नाही."
@@ -466,8 +469,8 @@
#. TRANSLATORS: CommandLine error message
#. TRANSLATORS: CommandLine error message
#. TRANSLATORS: CommandLine error message
-#: src/clients/kdump.rb:852 src/clients/kdump.rb:886 src/clients/kdump.rb:935
-#: src/clients/kdump.rb:969 src/clients/kdump.rb:1016
+#: src/clients/kdump.rb:855 src/clients/kdump.rb:889 src/clients/kdump.rb:938
+#: src/clients/kdump.rb:972 src/clients/kdump.rb:1019
msgid "Value for \"dir\" missing."
msgstr "\"dir\" चे मूल्य गायब."
@@ -475,53 +478,53 @@
#. TRANSLATORS: CommandLine error message
#. TRANSLATORS: CommandLine error message
#. TRANSLATORS: CommandLine error message
-#: src/clients/kdump.rb:866 src/clients/kdump.rb:916 src/clients/kdump.rb:957
-#: src/clients/kdump.rb:983
+#: src/clients/kdump.rb:869 src/clients/kdump.rb:919 src/clients/kdump.rb:960
+#: src/clients/kdump.rb:986
msgid "Value for \"server\" missing."
msgstr "\"server\" चे मूल्य गायब."
#. TRANSLATORS: CommandLine error message
-#: src/clients/kdump.rb:995
+#: src/clients/kdump.rb:998
msgid "Value for \"share\" missing."
msgstr "\"share\" चे मूल्य गायब."
#. TRANSLATORS: CommandLine error message
-#: src/clients/kdump.rb:1037
+#: src/clients/kdump.rb:1040
#, fuzzy
msgid "Wrong value for target."
msgstr "भाषेकरता नवीन किंमती सेट करा"
#. TRANSLATORS: CommandLine error message
-#: src/clients/kdump.rb:1148
+#: src/clients/kdump.rb:1151
#, fuzzy
msgid "Wrong value of options \"no\"."
msgstr "पर्यायी किंमत"
#. TRANSLATORS: CommandLine error message
-#: src/clients/kdump.rb:1168
+#: src/clients/kdump.rb:1171
#, fuzzy
msgid "Wrong value for option \"server\"."
msgstr "\"level\" पर्यायांसाठी चुकीचे मूल्य."
#. TRANSLATORS: CommandLine error message
-#: src/clients/kdump.rb:1188
+#: src/clients/kdump.rb:1191
#, fuzzy
msgid "Wrong value for option \"user\"."
msgstr "पर्यायी किंमत"
#. TRANSLATORS: CommandLine error message
#. TRANSLATORS: CommandLine error message
-#: src/clients/kdump.rb:1225 src/clients/kdump.rb:1245
+#: src/clients/kdump.rb:1228 src/clients/kdump.rb:1248
#, fuzzy
msgid "Wrong value for option \"email\"."
msgstr "\"level\" पर्यायांसाठी चुकीचे मूल्य."
-#: src/clients/kdump.rb:1257
+#: src/clients/kdump.rb:1260
msgid "Firmware-assisted dump: %{status}"
msgstr ""
#. TRANSLATORS: CommandLine error message
-#: src/clients/kdump.rb:1275
+#: src/clients/kdump.rb:1278
#, fuzzy
msgid "No option has been defined."
msgstr "सूचना: इन्क्रीप्शंन वापरले गेले नाही."
@@ -544,124 +547,111 @@
msgstr "अकार्यान्वित"
#. TRANSLATORS: RadioButtonGroup Label
-#: src/include/kdump/dialogs.rb:53
+#: src/include/kdump/dialogs.rb:57
#, fuzzy
msgid "Enable/Disable Kdump"
msgstr "कार्यान्वित किंवा अकार्यान्वित"
-#: src/include/kdump/dialogs.rb:58
+#: src/include/kdump/dialogs.rb:62
#, fuzzy
msgid "Enable Kd&ump"
msgstr "Enabled"
-#: src/include/kdump/dialogs.rb:59
+#: src/include/kdump/dialogs.rb:63
#, fuzzy
msgid "&Disable Kdump"
msgstr "अकार्यान्वित"
-#. "handle" : HandleEnableDisalbeKdump,
-#: src/include/kdump/dialogs.rb:79
-msgid "Total System Memory [MB]:"
-msgstr "प्रणालीची एकूण स्मृती [MB]:"
-
-#: src/include/kdump/dialogs.rb:86
-msgid "Usable Memory [MB]:"
-msgstr "वापरण्यायोग्य स्मृती [MB]:"
-
-#: src/include/kdump/dialogs.rb:95
-msgid "Kdump Memor&y [MB]"
-msgstr "केडम्प स्मृती [MB]"
-
#. ---------============ Dump Filtering screen=============------------
-#: src/include/kdump/dialogs.rb:134
+#: src/include/kdump/dialogs.rb:111
#, fuzzy
msgid "Include in Dumping"
msgstr "नोंदणी मधे समाविष्ट करा"
-#: src/include/kdump/dialogs.rb:141
+#: src/include/kdump/dialogs.rb:118
msgid "&Pages Filled with Zero"
msgstr "&Pages शून्याने भरलेली"
#. `VStretch ()
-#: src/include/kdump/dialogs.rb:147
+#: src/include/kdump/dialogs.rb:124
#, fuzzy
msgid "Cach&e Pages"
msgstr "पॅकेजेस"
-#: src/include/kdump/dialogs.rb:157
+#: src/include/kdump/dialogs.rb:134
#, fuzzy
msgid "Cache Priva&te Pages"
msgstr "GPG खाजगी कीज"
-#: src/include/kdump/dialogs.rb:162
+#: src/include/kdump/dialogs.rb:139
#, fuzzy
msgid "&User Data Pages"
msgstr "वापरकर्त्याविषयी माहिती"
-#: src/include/kdump/dialogs.rb:163
+#: src/include/kdump/dialogs.rb:140
#, fuzzy
msgid "&Free Pages"
msgstr "पहिले पान"
#. TRANSLATORS: TextEntry Label
-#: src/include/kdump/dialogs.rb:191
+#: src/include/kdump/dialogs.rb:168
#, fuzzy
msgid "&Dump Format"
msgstr "फाईल पध्दती"
-#: src/include/kdump/dialogs.rb:194
+#: src/include/kdump/dialogs.rb:171
#, fuzzy
msgid "&No Dump"
msgstr "MIDI आऊटपुटची संख्या."
-#: src/include/kdump/dialogs.rb:195
+#: src/include/kdump/dialogs.rb:172
#, fuzzy
msgid "&ELF Format"
msgstr "फाईल पध्दती"
-#: src/include/kdump/dialogs.rb:196
+#: src/include/kdump/dialogs.rb:173
#, fuzzy
msgid "C&ompressed Format"
msgstr "कमी पातळी फार्माट"
-#: src/include/kdump/dialogs.rb:197
+#: src/include/kdump/dialogs.rb:174
#, fuzzy
msgid "&LZO Compressed Format"
msgstr "कमी पातळी फार्माट"
#. ---------============ Dump Target screen=============------------
-#: src/include/kdump/dialogs.rb:217
+#: src/include/kdump/dialogs.rb:194
#, fuzzy
msgid "&Select Target"
msgstr "सिलेक्ट प्रकार"
-#: src/include/kdump/dialogs.rb:221
+#: src/include/kdump/dialogs.rb:198
msgid "Local Directory"
msgstr "स्थानिक संचिका"
-#: src/include/kdump/dialogs.rb:222 src/include/kdump/uifunctions.rb:106
+#: src/include/kdump/dialogs.rb:199 src/include/kdump/uifunctions.rb:106
msgid "FTP"
msgstr "FTP"
-#: src/include/kdump/dialogs.rb:223
+#: src/include/kdump/dialogs.rb:200
msgid "SSH"
msgstr "SSH"
-#: src/include/kdump/dialogs.rb:224
+#: src/include/kdump/dialogs.rb:201
msgid "SFTP"
msgstr ""
-#: src/include/kdump/dialogs.rb:225 src/include/kdump/uifunctions.rb:173
+#: src/include/kdump/dialogs.rb:202 src/include/kdump/uifunctions.rb:173
#, fuzzy
msgid "NFS"
msgstr "DNS"
-#: src/include/kdump/dialogs.rb:226 src/include/kdump/uifunctions.rb:188
+#: src/include/kdump/dialogs.rb:203 src/include/kdump/uifunctions.rb:188
msgid "CIFS (SMB)"
msgstr "सीआयएफएस (SMB)"
#. TRANSLATORS: TextEntry Label
-#: src/include/kdump/dialogs.rb:251
+#: src/include/kdump/dialogs.rb:228
#, fuzzy
msgid "&SMTP Server"
msgstr "NTP सेवा संगणक"
@@ -670,7 +660,7 @@
#. text entry
#. text entry
#. text entry
-#: src/include/kdump/dialogs.rb:263 src/include/kdump/uifunctions.rb:130
+#: src/include/kdump/dialogs.rb:240 src/include/kdump/uifunctions.rb:130
#: src/include/kdump/uifunctions.rb:160 src/include/kdump/uifunctions.rb:212
msgid "&User Name"
msgstr "वापरकर्ता"
@@ -679,132 +669,162 @@
#. password entry
#. password entry
#. password entry
-#: src/include/kdump/dialogs.rb:275 src/include/kdump/uifunctions.rb:133
+#: src/include/kdump/dialogs.rb:252 src/include/kdump/uifunctions.rb:133
#: src/include/kdump/uifunctions.rb:163 src/include/kdump/uifunctions.rb:215
msgid "&Password"
msgstr "&परवली शब्द"
#. TRANSLATORS: TextEntry Label
-#: src/include/kdump/dialogs.rb:287
+#: src/include/kdump/dialogs.rb:264
#, fuzzy
msgid "Notification &To"
msgstr "सुरक्षा घटना अधिसूचना"
#. TRANSLATORS: TextEntry Label
-#: src/include/kdump/dialogs.rb:303
+#: src/include/kdump/dialogs.rb:280
#, fuzzy
msgid "Notifica&tion CC"
msgstr "सुरक्षा घटना अधिसूचना"
#. TRANSLATORS: TextEntry Label
-#: src/include/kdump/dialogs.rb:320
+#: src/include/kdump/dialogs.rb:297
msgid "Custom Kdump &Kernel"
msgstr "कस्टम केडम्प &कर्नेल"
#. TRANSLATORS: TextEntry Label
-#: src/include/kdump/dialogs.rb:332
+#: src/include/kdump/dialogs.rb:309
msgid "Kdump Co&mmand Line"
msgstr "केडम्प Co&mmand ओळ"
#. TRANSLATORS: TextEntry Label
-#: src/include/kdump/dialogs.rb:344
+#: src/include/kdump/dialogs.rb:321
#, fuzzy
msgid "Kdump Command &Line Append"
msgstr "आदेश :"
#. TRANSLATORS: CheckBox Label
-#: src/include/kdump/dialogs.rb:361
+#: src/include/kdump/dialogs.rb:338
msgid "&Enable Immediate Reboot After Saving the Core"
msgstr "कोअर जतन केल्यावर त्वरित रिबूट &Enable करा"
#. TRANSLATORS: CheckBox Label
-#: src/include/kdump/dialogs.rb:375
+#: src/include/kdump/dialogs.rb:352
msgid "Enable Copy Ke&rnel into the Dump Directory"
msgstr ""
#. TRANSLATORS: CheckBox Label
-#: src/include/kdump/dialogs.rb:389
+#: src/include/kdump/dialogs.rb:366
#, fuzzy
msgid "Enable &Delete Old Dump Images"
msgstr "जुनी पॅकेज काढून टाका"
#. TRANSLATORS: IntField Label
-#: src/include/kdump/dialogs.rb:406
+#: src/include/kdump/dialogs.rb:383
#, fuzzy
msgid "N&umber of Old Dumps"
msgstr "जास्तीत जास्त जुना मागोवा"
#. "handle" :
-#: src/include/kdump/dialogs.rb:427
+#: src/include/kdump/dialogs.rb:408
#, fuzzy
msgid "Kdump Memory"
msgstr "मेमरी "
-#: src/include/kdump/dialogs.rb:432
+#: src/include/kdump/dialogs.rb:413
#, fuzzy
msgid "Kdump Start-Up"
msgstr "सुरू करा"
-#: src/include/kdump/dialogs.rb:433
+#: src/include/kdump/dialogs.rb:414
msgid "Start-Up"
msgstr "सुरू करा"
-#: src/include/kdump/dialogs.rb:448
+#: src/include/kdump/dialogs.rb:429
msgid "Kdump - Dump Filtering"
msgstr "केडम्प - डम्प फिल्टर करणे"
-#: src/include/kdump/dialogs.rb:449
+#: src/include/kdump/dialogs.rb:430
#, fuzzy
msgid "Dump Filtering"
msgstr "स्थानिक चाळणी करा"
-#: src/include/kdump/dialogs.rb:455
+#: src/include/kdump/dialogs.rb:436
msgid "Saving Target for Kdump Image"
msgstr "केडम्प प्रतिमेसाठी लक्ष्य जतन करत आहे"
-#: src/include/kdump/dialogs.rb:462 src/include/kdump/dialogs.rb:463
+#: src/include/kdump/dialogs.rb:443 src/include/kdump/dialogs.rb:444
#, fuzzy
msgid "Dump Target"
msgstr "इमेल लक्ष्य 1"
-#: src/include/kdump/dialogs.rb:469
+#: src/include/kdump/dialogs.rb:450
#, fuzzy
msgid "SMTP Server"
msgstr "NTP सेवा संगणक"
-#: src/include/kdump/dialogs.rb:479
+#: src/include/kdump/dialogs.rb:460
#, fuzzy
msgid "Notification Email Addresses"
msgstr "अदिसूचना अकार्यान्वित"
-#: src/include/kdump/dialogs.rb:487 src/include/kdump/dialogs.rb:488
+#: src/include/kdump/dialogs.rb:468 src/include/kdump/dialogs.rb:469
#, fuzzy
msgid "Email Notification"
msgstr "सुरक्षा घटना अधिसूचना"
-#: src/include/kdump/dialogs.rb:501
+#: src/include/kdump/dialogs.rb:482
msgid "Custom Kernel for Kdump"
msgstr "केडम्पसाठी कर्नेल कस्टम करा"
-#: src/include/kdump/dialogs.rb:506
+#: src/include/kdump/dialogs.rb:487
#, fuzzy
msgid "Command Line"
msgstr "आदेश :"
-#: src/include/kdump/dialogs.rb:514
+#: src/include/kdump/dialogs.rb:495
#, fuzzy
msgid "Dump Settings"
msgstr "एक्सपर्ट सेटिंग्ज"
-#: src/include/kdump/dialogs.rb:527
+#: src/include/kdump/dialogs.rb:508
#, fuzzy
msgid "Kdump Expert Settings"
msgstr "एक्सपर्ट सेटिंग्ज"
-#: src/include/kdump/dialogs.rb:528
+#: src/include/kdump/dialogs.rb:509
msgid "Expert Settings"
msgstr "एक्सपर्ट सेटिंग्ज"
+#: src/include/kdump/dialogs.rb:529
+#, fuzzy
+#| msgid "Kdump Memor&y [MB]"
+msgid "Kdump &Low Memory [MiB]"
+msgstr "केडम्प स्मृती [MB]"
+
+#: src/include/kdump/dialogs.rb:531
+#, fuzzy
+#| msgid "Kdump Memor&y [MB]"
+msgid "Kdump Memor&y [MiB]"
+msgstr "केडम्प स्मृती [MB]"
+
+#: src/include/kdump/dialogs.rb:537
+#, fuzzy
+#| msgid "Total System Memory [MB]:"
+msgid "Total System Memory [MiB]:"
+msgstr "प्रणालीची एकूण स्मृती [MB]:"
+
+#: src/include/kdump/dialogs.rb:544
+#, fuzzy
+#| msgid "Usable Memory [MB]:"
+msgid "Usable Memory [MiB]:"
+msgstr "वापरण्यायोग्य स्मृती [MB]:"
+
+#: src/include/kdump/dialogs.rb:567
+#, fuzzy
+#| msgid "Kdump Memor&y [MB]"
+msgid "Kdump &High Memory [MiB]"
+msgstr "केडम्प स्मृती [MB]"
+
#. Enable/Disable Kdump - RadioButtons 1/1
#: src/include/kdump/helps.rb:36
#, fuzzy
@@ -1293,159 +1313,163 @@
#. several ranges and ask user about rewritting
#.
#. "KdumpMemory"
-#: src/include/kdump/uifunctions.rb:1439
-msgid "Kernel option includes several ranges. Rewrite it?"
+#: src/include/kdump/uifunctions.rb:1449
+msgid "Kernel option includes several ranges or redundant values. Rewrite it?"
msgstr ""
#. T: Checkbox label
-#: src/include/kdump/uifunctions.rb:1467
+#: src/include/kdump/uifunctions.rb:1482
msgid "Use &Firmware-Assisted Dump"
msgstr ""
#. See FATE#315780
#. See https://www.suse.com/support/kb/doc.php?id=7012786
#. FIXME what about dracut?
-#: src/modules/Kdump.rb:495
+#: src/modules/Kdump.rb:412
msgid ""
"Error updating initrd while calling '%{cmd}'.\n"
"See %{log} for details."
msgstr ""
#. Kdump read dialog caption
-#: src/modules/Kdump.rb:605
+#: src/modules/Kdump.rb:514
#, fuzzy
msgid "Initializing kdump Configuration"
msgstr "मोडेम संरचना कार्यान्वित करा"
#. Progress stage 1/4
#. Progress step 1/4
-#: src/modules/Kdump.rb:614 src/modules/Kdump.rb:622
+#: src/modules/Kdump.rb:523 src/modules/Kdump.rb:531
#, fuzzy
msgid "Reading the config file..."
msgstr "संरचना वाचत आहे..."
#. Progress stage 3/4
-#: src/modules/Kdump.rb:616
+#: src/modules/Kdump.rb:525
#, fuzzy
msgid "Reading kernel boot options..."
msgstr "सर्वसामान्य मांडणी वाचू शकत नाही."
#. Progress stage 4/4
-#. Progress finished 3/4
-#: src/modules/Kdump.rb:618 src/modules/Kdump.rb:626
-#, fuzzy
-msgid "Reading available memory..."
-msgstr "उपलब्ध संदर्भ शोधले जात आहे..."
+#: src/modules/Kdump.rb:527
+msgid "Calculating memory limits..."
+msgstr ""
#. Progress step 2/4
-#: src/modules/Kdump.rb:624
+#: src/modules/Kdump.rb:533
#, fuzzy
msgid "Reading partitions of disks..."
msgstr "विभाजने वाचली जात आहे..."
+#. Progress finished 3/4
+#: src/modules/Kdump.rb:535
+#, fuzzy
+msgid "Reading available memory and calibrating usage..."
+msgstr "उपलब्ध संदर्भ शोधले जात आहे..."
+
#. Error message
-#: src/modules/Kdump.rb:638
+#: src/modules/Kdump.rb:547
msgid "Cannot read config file /etc/sysconfig/kdump"
msgstr "/etc/sysconfig/kdump ही कॉंफिग फाइल वाचू शकत नाही"
#. Error message
-#: src/modules/Kdump.rb:646
+#: src/modules/Kdump.rb:555
#, fuzzy
msgid "Cannot read kernel boot options."
msgstr "सर्वसामान्य मांडणी वाचू शकत नाही."
#. Error message
-#: src/modules/Kdump.rb:653
+#: src/modules/Kdump.rb:563
#, fuzzy
msgid "Cannot read available memory."
msgstr "%1फाईल वाचू शकत नाही"
#. Kdump read dialog caption
-#: src/modules/Kdump.rb:679
+#: src/modules/Kdump.rb:589
#, fuzzy
msgid "Saving kdump Configuration"
msgstr "मोडेम संरचना संग्रहीत करत आहे"
#. Progress stage 1/2
-#: src/modules/Kdump.rb:708
+#: src/modules/Kdump.rb:618
msgid "Write the settings"
msgstr "सेटिंग्ज लिहा"
#. Progress stage 2/2
-#: src/modules/Kdump.rb:710
+#: src/modules/Kdump.rb:620
#, fuzzy
msgid "Update boot options"
msgstr "अद्ययावत पर्याय"
#. Progress step 1/2
-#: src/modules/Kdump.rb:714
+#: src/modules/Kdump.rb:624
msgid "Writing the settings..."
msgstr "सेटिंग्ज लिहित आहे..."
#. Progress step 2/2
-#: src/modules/Kdump.rb:716
+#: src/modules/Kdump.rb:626
#, fuzzy
msgid "Updating boot options..."
msgstr "संरचना अद्ययावत करत आहे..."
#. Progress finished
-#: src/modules/Kdump.rb:718
+#: src/modules/Kdump.rb:628
msgid "Finished"
msgstr "॒०नॴन०ष"
#. Error message
-#: src/modules/Kdump.rb:728
+#: src/modules/Kdump.rb:638
msgid "Cannot write settings."
msgstr "सेटिंग्ज लिहू शकत नाही."
#. Error message
-#: src/modules/Kdump.rb:737
+#: src/modules/Kdump.rb:647
msgid "Adding crashkernel parameter to bootloader fault."
msgstr "क्रॅशकर्नेल निकष बूटलोडर फॉल्ट्मध्ये समाविष्ट करत आहे."
-#. Create a textual summary and a list of unconfigured cards
+#. Create a textual summary
#. @return summary of the current configuration
-#: src/modules/Kdump.rb:851
+#: src/modules/Kdump.rb:758
#, fuzzy
msgid "Kdump status: %1"
msgstr "रनलेव्हलमध्ये %1"
-#: src/modules/Kdump.rb:852
+#: src/modules/Kdump.rb:759
msgid "enabled"
msgstr "कार्यान्वित करा"
-#: src/modules/Kdump.rb:852
+#: src/modules/Kdump.rb:759
msgid "disabled"
msgstr "अकार्यान्वित करा"
-#: src/modules/Kdump.rb:859
+#: src/modules/Kdump.rb:766
#, fuzzy
-msgid "Value of crashkernel option: %1"
+msgid "Value(s) of crashkernel option: %1"
msgstr "पर्यायासाठी रिकामी किंमत: %1"
-#: src/modules/Kdump.rb:866
+#: src/modules/Kdump.rb:773
#, fuzzy
msgid "Dump format: %1"
msgstr "फाईल पध्दती"
-#: src/modules/Kdump.rb:873
+#: src/modules/Kdump.rb:780
#, fuzzy
msgid "Target of dumps: %1"
msgstr "जास्तीत जास्त जुना मागोवा"
-#: src/modules/Kdump.rb:880
+#: src/modules/Kdump.rb:787
#, fuzzy
msgid "Number of dumps: %1"
msgstr "जास्तीत जास्त जुना मागोवा"
#. TRANSLATORS: warning message in installation proposal,
#. do not translate %{requested} and %{available} - they are replaced with actual sizes later
-#: src/modules/Kdump.rb:972
+#: src/modules/Kdump.rb:879
msgid "Warning! There might not be enough free space. %{required} required, but only %{available} are available."
msgstr ""
#. Trying to use fadump on unsupported hardware
-#: src/modules/Kdump.rb:1065
+#: src/modules/Kdump.rb:974
msgid ""
"Cannot use Firmware-assisted dump.\n"
"It is not supported on this hardware."
Modified: trunk/yast/mr/po/ncurses-pkg.mr.po
===================================================================
--- trunk/yast/mr/po/ncurses-pkg.mr.po 2015-10-01 11:24:50 UTC (rev 92957)
+++ trunk/yast/mr/po/ncurses-pkg.mr.po 2015-10-01 11:24:51 UTC (rev 92958)
@@ -2,7 +2,7 @@
msgstr ""
"Project-Id-Version: @PACKAGE@\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:36+0200\n"
+"POT-Creation-Date: 2015-09-28 18:16+0200\n"
"PO-Revision-Date: 2005-07-29 15:37+0530\n"
"Last-Translator: Priyavert Sharma\n"
"Language-Team: AgreeYa Solutions \n"
@@ -84,14 +84,14 @@
#. add the Cancel button
#. begin: the label of the Cancel button
#: src/NCPackageSelector.cc:1717 src/NCPackageSelector.cc:1836
-#: src/NCPkgStrings.cc:684
+#: src/NCPkgStrings.cc:691
msgid "&Cancel"
msgstr "&रद्द करा"
#. add the OK button
#. the label of an Accept button
#: src/NCPackageSelector.cc:1722 src/NCPackageSelector.cc:1841
-#: src/NCPkgStrings.cc:698
+#: src/NCPkgStrings.cc:705
msgid "&Accept"
msgstr "&स्वीकारा"
@@ -1099,36 +1099,42 @@
msgid "&OK"
msgstr "&ठीक आहे"
+#. begin: the label of the Contiunue button
+#: src/NCPkgStrings.cc:684
+#, fuzzy
+msgid "C&ontinue"
+msgstr "कसेही पुढे चालू ठेवा"
+
#. the label of the Yes button
-#: src/NCPkgStrings.cc:691
+#: src/NCPkgStrings.cc:698
msgid "&Yes"
msgstr "&होय"
#. the label of the No button
-#: src/NCPkgStrings.cc:705
+#: src/NCPkgStrings.cc:712
msgid "&No"
msgstr "&नाही"
#. the label of the Solve button - 'try again' implies that user
#. has to make some action (#213602)
-#: src/NCPkgStrings.cc:713
+#: src/NCPkgStrings.cc:720
msgid "&OK -- Try Again"
msgstr "ठीक --परत प्रयत्न करा"
#. text for a Notify popup
-#: src/NCPkgStrings.cc:721
+#: src/NCPkgStrings.cc:728
#, fuzzy
msgid "<p>All changes in the package, patch or pattern selection will be lost.<br>Really exit?</p>"
msgstr "<p>रद्द बरोबर बाहेर आल्यावर सर्व तुमचे पर्याय फुकट जातील.<br>खरोखर बाहेर यायचे का?</p>"
#. the label of language table
-#: src/NCPkgStrings.cc:729
+#: src/NCPkgStrings.cc:736
#, fuzzy
msgid "Available Languages"
msgstr "बामीलेकी भाषा"
#. the label of language table
-#: src/NCPkgStrings.cc:736
+#: src/NCPkgStrings.cc:743
#, fuzzy
msgid "Available Repositories"
msgstr "उपलब्ध सुविधा"
@@ -1137,66 +1143,83 @@
#. (the list shows all patches which are needed)
#. static const std::string value = _( "Installable Patches" );
#. static const std::string value = _( "Relevant Patches" );
-#: src/NCPkgStrings.cc:746
+#: src/NCPkgStrings.cc:753
#, fuzzy
msgid "Needed Patches"
msgstr "नवीन ठिगळे"
#. A label for a list of YOU Patches - keep it short - max. 25 chars!
#. (the list shows all patches which are already installed)
-#: src/NCPkgStrings.cc:754
+#: src/NCPkgStrings.cc:761
msgid "Installed Patches"
msgstr "स्थापीत ठिगळे"
#. A common label for a list of YOU Patches - keep it short - max. 25 chars!
-#: src/NCPkgStrings.cc:762
+#: src/NCPkgStrings.cc:769
msgid "Online Update Patches"
msgstr "ऑनलाईन पॅचेस सुधारणा"
#. the label Filter: Update Problem ( keep it short - max. 25 chars )
-#: src/NCPkgStrings.cc:769
+#: src/NCPkgStrings.cc:776
msgid "Update Problem -- see help"
msgstr "अडचणी सुधारा -- मदत पाहा"
#. the label for Filter: Search results
-#: src/NCPkgStrings.cc:776
+#: src/NCPkgStrings.cc:783
msgid "Search Results"
msgstr "शोध परिणाम"
#. the headline of the dependency popup
-#: src/NCPkgStrings.cc:783
+#: src/NCPkgStrings.cc:790
msgid "Package Dependencies"
msgstr "पॅकेजची अवलंबिता"
#. help text package status
-#: src/NCPkgStrings.cc:790
+#: src/NCPkgStrings.cc:797
msgid "<b>Update Problem List</b><br><p>The packages in the list cannot be updated automatically.</p><p>Possible reasons:</p><p>They are obsoleted by other packages.</p><p>There is no newer version to which to update on any installation media.</p><p>They are third-party packages</p><p>Manually select what to do with them. The safest course of action is to delete them.</p>"
msgstr "<b>अडचणीची यादी अद्ययावत करा</b><br><p>यादीमधील पॅकेजेस आपोआप अद्ययावत करता येणार नाहीत.</p><p>शक्य कारणे:</p><p>इतर पॅकेजेसमुळे ती ना काम होतात.</p><p>कोणत्याही स्थापना साधनावर सुधारणेसाठी कोणतीही नवीन आवृत्ती नाही.</p><p>ती तिसऱ्या व्यक्तीची पॅकेजेस आहेत</p><p>स्वतः त्याचे काय करायचे ते ठरवा. सर्वात सोपा मार्ग म्हणजे तो काढून टाकणे.</p>"
#. column header source RPM installation (keep it short!)
-#: src/NCPkgStrings.cc:797
+#: src/NCPkgStrings.cc:804
msgid "Source"
msgstr "स्त्रोत"
#. menu entry Update List
-#: src/NCPkgStrings.cc:805
+#: src/NCPkgStrings.cc:812
msgid "&Update List"
msgstr "यादी सुधारा"
#. part of the patch description
-#: src/NCPkgStrings.cc:812
+#: src/NCPkgStrings.cc:819
msgid "<b>Patch: </b>"
msgstr "<b>ठिगळ: </b>"
#. info line is shown if YOU patch list is empty
-#: src/NCPkgStrings.cc:819
+#: src/NCPkgStrings.cc:826
msgid "No patches available"
msgstr "ठिगळ उपलब्ध नाहीत"
-#: src/NCPkgStrings.cc:825
+#: src/NCPkgStrings.cc:832
msgid "Script"
msgstr "लिपी"
+#: src/NCPkgStrings.cc:838
+#, fuzzy
+msgid "Incompatible Package Versions"
+msgstr "पॅकेजची वर्णने"
+
+#: src/NCPkgStrings.cc:845
+msgid "<p>You are trying to install multiversion-capable and non-multiversion-capable versions of this package at the same time.</p>"
+msgstr ""
+
+#: src/NCPkgStrings.cc:854
+msgid "<p>This version is multiversion-capable.</p><p>Press \"Continue\" to install this version and unselect the non-multiversion-capable version, \"Cancel\" to unselect this version and keep the other one.</p>"
+msgstr ""
+
+#: src/NCPkgStrings.cc:864
+msgid "<p>This version is not multiversion-capable.</p><p>Press \"Continue\" to install only this version and unselect all other versions, \"Cancel\" to unselect this version and keep the other ones.<p>"
+msgstr ""
+
#~ msgid "----- this patch is broken !!! -----"
#~ msgstr "---- हा पॅच तुटलेला आहे !!! -----"
Modified: trunk/yast/mr/po/qt-pkg.mr.po
===================================================================
--- trunk/yast/mr/po/qt-pkg.mr.po 2015-10-01 11:24:50 UTC (rev 92957)
+++ trunk/yast/mr/po/qt-pkg.mr.po 2015-10-01 11:24:51 UTC (rev 92958)
@@ -2,7 +2,7 @@
msgstr ""
"Project-Id-Version: @PACKAGE@\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:36+0200\n"
+"POT-Creation-Date: 2015-09-28 18:16+0200\n"
"PO-Revision-Date: 2005-07-29 15:37+0530\n"
"Last-Translator: Priyavert Sharma\n"
"Language-Team: AgreeYa Solutions \n"
@@ -48,7 +48,7 @@
msgstr "शोधा"
#. DEBUG
-#: src/YQPackageSelector.cc:429 src/YQPkgSearchFilterView.cc:113
+#: src/YQPackageSelector.cc:429 src/YQPkgSearchFilterView.cc:114
#, fuzzy
msgid "&Keywords"
msgstr "कीवर्ड्च"
@@ -89,8 +89,8 @@
#: src/YQPackageSelectorBase.cc:249 src/YQPackageSelectorBase.cc:305
#: src/YQPackageSelectorBase.cc:326 src/YQPatternSelector.cc:259
#: src/YQPkgConflictDialog.cc:163 src/YQPkgConflictDialog.cc:398
-#: src/YQPkgSearchFilterView.cc:245 src/YQPkgTextDialog.cc:258
-#: src/YQPkgVersionsView.cc:429 src/YQSimplePatchSelector.cc:219
+#: src/YQPkgSearchFilterView.cc:249 src/YQPkgTextDialog.cc:258
+#: src/YQPkgVersionsView.cc:413 src/YQSimplePatchSelector.cc:219
msgid "&Cancel"
msgstr "&रद्द करा"
@@ -394,7 +394,7 @@
msgstr "हाती केलेल्या निवडीबरोबरच, अवलंबित्वे सोडविण्यासाठी खालील बदलली आहेतः"
#: src/YQPackageSelectorBase.cc:305 src/YQPackageSelectorBase.cc:326
-#: src/YQPkgConflictDialog.cc:397 src/YQPkgVersionsView.cc:428
+#: src/YQPkgConflictDialog.cc:397 src/YQPkgVersionsView.cc:412
msgid "C&ontinue"
msgstr "सलग"
@@ -1382,15 +1382,11 @@
msgid "Unmaintained Packages"
msgstr "देखभाल नसलेलेी पॅकेज काढून टाका"
-#. horizontal
-#. vertical
-#: src/YQPkgRepoFilterView.cc:180
+#: src/YQPkgRepoFilterView.cc:177
msgid "Search"
msgstr "शोध"
-#. horizontal
-#. vertical
-#: src/YQPkgRepoFilterView.cc:199
+#: src/YQPkgRepoFilterView.cc:192
msgid "Installation Summary"
msgstr "सारांश संस्थापन"
@@ -1404,44 +1400,44 @@
msgstr "zzz ऑल"
#. Search button
-#: src/YQPkgSearchFilterView.cc:92
+#: src/YQPkgSearchFilterView.cc:93
msgid "&Search"
msgstr "शोधा"
#.
#. Where to search
#.
-#: src/YQPkgSearchFilterView.cc:105
+#: src/YQPkgSearchFilterView.cc:106
msgid "Search in"
msgstr "आत शोधा"
-#: src/YQPkgSearchFilterView.cc:111
+#: src/YQPkgSearchFilterView.cc:112
#, fuzzy
#| msgid "Name"
msgid "Nam&e"
msgstr "नाव"
-#: src/YQPkgSearchFilterView.cc:115
+#: src/YQPkgSearchFilterView.cc:116
msgid "Su&mmary"
msgstr "सारांश"
-#: src/YQPkgSearchFilterView.cc:117
+#: src/YQPkgSearchFilterView.cc:118
msgid "Descr&iption"
msgstr "वर्णन"
-#: src/YQPkgSearchFilterView.cc:122
+#: src/YQPkgSearchFilterView.cc:123
#, fuzzy
#| msgid "&Provides"
msgid "RPM \"P&rovides\""
msgstr "वाटप करणे"
-#: src/YQPkgSearchFilterView.cc:124
+#: src/YQPkgSearchFilterView.cc:125
#, fuzzy
#| msgid "Requires"
msgid "RPM \"Re&quires\""
msgstr "आवश्यक आहे"
-#: src/YQPkgSearchFilterView.cc:127
+#: src/YQPkgSearchFilterView.cc:128
#, fuzzy
msgid "File list"
msgstr "फाईलची यादी"
@@ -1449,40 +1445,40 @@
#.
#. Search mode
#.
-#: src/YQPkgSearchFilterView.cc:142
+#: src/YQPkgSearchFilterView.cc:143
msgid "Search &Mode:"
msgstr "मोड शोधा"
#. Caution: combo box items must be inserted in the same order as enum SearchMode!
-#: src/YQPkgSearchFilterView.cc:155
+#: src/YQPkgSearchFilterView.cc:156
msgid "Contains"
msgstr "समाविष्ट आहे"
-#: src/YQPkgSearchFilterView.cc:156
+#: src/YQPkgSearchFilterView.cc:157
msgid "Begins with"
msgstr "ने प्रारंभ"
-#: src/YQPkgSearchFilterView.cc:157
+#: src/YQPkgSearchFilterView.cc:158
msgid "Exact Match"
msgstr "अगदी सुयोग्य जोडी"
-#: src/YQPkgSearchFilterView.cc:158
+#: src/YQPkgSearchFilterView.cc:159
msgid "Use Wild Cards"
msgstr "वाईल्ड कार्ड्स वापरा"
-#: src/YQPkgSearchFilterView.cc:159
+#: src/YQPkgSearchFilterView.cc:160
msgid "Use Regular Expression"
msgstr "नियमित वर्णन वापरा"
-#: src/YQPkgSearchFilterView.cc:166
+#: src/YQPkgSearchFilterView.cc:167
msgid "Case Sensiti&ve"
msgstr "केस सेन्सिटिव्ह"
-#: src/YQPkgSearchFilterView.cc:244
+#: src/YQPkgSearchFilterView.cc:248
msgid "Searching..."
msgstr "शोधत आहे..."
-#: src/YQPkgSearchFilterView.cc:330
+#: src/YQPkgSearchFilterView.cc:334
msgid "No Results."
msgstr "निष्कर्ष नाही"
@@ -1491,7 +1487,7 @@
#. if it's a user error (e.g., syntax error in regular expression) or
#. an internal error. But there is a "Details" button that will return
#. the original (translated) error message.
-#: src/YQPkgSearchFilterView.cc:345
+#: src/YQPkgSearchFilterView.cc:349
#, fuzzy
msgid "Query Error"
msgstr "त्रुटी"
@@ -1605,14 +1601,14 @@
msgstr ""
#. Translators: Popup dialog text. Try to keep the lines about the same length.
-#: src/YQPkgVersionsView.cc:398
+#: src/YQPkgVersionsView.cc:382
msgid ""
"You are trying to install multiversion-capable\n"
"and non-multiversion-capable versions of this\n"
"package at the same time."
msgstr ""
-#: src/YQPkgVersionsView.cc:406
+#: src/YQPkgVersionsView.cc:390
msgid ""
"This version is multiversion-capable.\n"
"\n"
@@ -1621,7 +1617,7 @@
"\"Cancel\" to unselect this version and keep the other one."
msgstr ""
-#: src/YQPkgVersionsView.cc:415
+#: src/YQPkgVersionsView.cc:399
msgid ""
"This version is not multiversion-capable.\n"
"\n"
@@ -1631,7 +1627,7 @@
msgstr ""
#. Dialog heading
-#: src/YQPkgVersionsView.cc:423
+#: src/YQPkgVersionsView.cc:407
#, fuzzy
#| msgid "&Generate Package Descriptions"
msgid "Incompatible Package Versions"
@@ -1646,11 +1642,11 @@
#. 3.17.4-i386 from openSUSE-11.1 update repository with priority 20 and vendor openSUSE
#. ^^^^^^ ^^^^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ^^ ^^^^^^^^
#. %1 %2 %3 %4 %5
-#: src/YQPkgVersionsView.cc:549 src/YQPkgVersionsView.cc:586
+#: src/YQPkgVersionsView.cc:533 src/YQPkgVersionsView.cc:570
msgid "%1-%2 from %3 with priority %4 and vendor %5"
msgstr ""
-#: src/YQPkgVersionsView.cc:570
+#: src/YQPkgVersionsView.cc:554
msgid "This version is installed in your system."
msgstr "ही आवृत्ती तुमच्या सिसटीमवर स्थापित केलेली आहे.."
Modified: trunk/yast/mr/po/registration.mr.po
===================================================================
--- trunk/yast/mr/po/registration.mr.po 2015-10-01 11:24:50 UTC (rev 92957)
+++ trunk/yast/mr/po/registration.mr.po 2015-10-01 11:24:51 UTC (rev 92958)
@@ -2,7 +2,7 @@
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-27 10:52+0200\n"
+"POT-Creation-Date: 2015-09-28 18:17+0200\n"
"PO-Revision-Date: 2005-07-29 15:37+0530\n"
"Last-Translator: \"( अमेय पाळंदे ) Ameya Palande\" <2ameya@gmail.com>\n"
"Language-Team: Marathi \n"
@@ -57,7 +57,7 @@
#: src/clients/inst_scc.rb:186
#: src/lib/registration/ui/autoyast_config_dialog.rb:104
#: src/lib/registration/ui/base_system_registration_dialog.rb:48
-#: src/lib/registration/ui/migration_repos_workflow.rb:270
+#: src/lib/registration/ui/migration_repos_workflow.rb:287
#: src/lib/registration/ui/registered_system_dialog.rb:37
#: src/lib/registration/ui/registration_update_dialog.rb:41
#, fuzzy
@@ -98,8 +98,8 @@
#. %s is name of given product
#. then register the product(s)
#. %s is name of given product
-#: src/clients/scc_auto.rb:326 src/lib/registration/registration_ui.rb:247
-#: src/lib/registration/registration_ui.rb:277
+#: src/clients/scc_auto.rb:326 src/lib/registration/registration_ui.rb:281
+#: src/lib/registration/registration_ui.rb:311
#, fuzzy
#| msgid "Registration Code"
msgid "Registering %s ..."
@@ -346,24 +346,36 @@
msgid "Details: %s"
msgstr "तपशील..."
+#. TRANSLATORS: multiline error message - a SSL certificate has been
+#. imported but the registration server still cannot be accessed securely,
+#. user has to solve the certificate issue manually.
+#: src/lib/registration/connect_helpers.rb:226
+msgid ""
+"A certificate has been already imported\n"
+"but the server connection still cannot be trusted.\n"
+"\n"
+"Please fix the certificate issue manually, ensure that the server\n"
+"can be connected securely and start the YaST module again."
+msgstr ""
+
#. progress label
-#: src/lib/registration/connect_helpers.rb:222
+#: src/lib/registration/connect_helpers.rb:238
msgid "Importing the SSL certificate"
msgstr ""
-#: src/lib/registration/connect_helpers.rb:223
+#: src/lib/registration/connect_helpers.rb:239
msgid "Importing '%s' certificate..."
msgstr ""
#. try to use a translatable message first, if not found then use
#. the original error message from openSSL
-#: src/lib/registration/connect_helpers.rb:244
+#: src/lib/registration/connect_helpers.rb:260
msgid "Secure connection error: %s"
msgstr ""
#. TRANSLATORS: error message, %s is a server URL,
#. e.g. https://smt.example.com
-#: src/lib/registration/connect_helpers.rb:263
+#: src/lib/registration/connect_helpers.rb:279
msgid ""
"An old registration server was detected at\n"
"%s.\n"
@@ -401,50 +413,61 @@
#. FIXME: reused an existing message due to text freeze
#. (later use a better text, it's system update actually...)
#: src/lib/registration/registration_ui.rb:80
-#: src/lib/registration/registration_ui.rb:233
+#: src/lib/registration/registration_ui.rb:267
msgid "Registering the System..."
msgstr ""
#. updating base product registration, %s is a new base product name
+#. updating product registration, %s is a product name
#. updating registered addon/extension, %s is an extension name
+#. TRANSLATORS: Progress label
#: src/lib/registration/registration_ui.rb:106
-#: src/lib/registration/registration_ui.rb:312
+#: src/lib/registration/registration_ui.rb:146
+#: src/lib/registration/registration_ui.rb:346
+#: src/lib/registration/ui/migration_repos_workflow.rb:304
#, fuzzy
#| msgid "Updating boot options..."
msgid "Updating to %s ..."
msgstr "बूट पर्याय अपडेट करत आहे..."
+#. TRANSLATORS: progress label
+#: src/lib/registration/registration_ui.rb:163
+#, fuzzy
+#| msgid "Loading configuration %1..."
+msgid "Synchronizing Products..."
+msgstr "आकृतीबंध %1 लोड करत आहे..."
+
#. load available addons from SCC server
#. the result is cached to avoid reloading when going back and forth in the
#. installation workflow
#. @return [ArrayRegistration::Addon] available addons
#. download the addons from SCC, let the user select addons to install
#. @return [Symbol] the user input
-#: src/lib/registration/registration_ui.rb:143
-#: src/lib/registration/ui/autoyast_config_workflow.rb:109
+#: src/lib/registration/registration_ui.rb:177
+#: src/lib/registration/ui/autoyast_config_workflow.rb:106
#, fuzzy
msgid "Loading Available Extensions and Modules..."
msgstr "नोंदणी कोड"
-#: src/lib/registration/registration_ui.rb:157
+#: src/lib/registration/registration_ui.rb:191
#, fuzzy
#| msgid "Loading configuration %1..."
msgid "Loading Migration Products..."
msgstr "आकृतीबंध %1 लोड करत आहे..."
#. dialog title
-#: src/lib/registration/registration_ui.rb:174
+#: src/lib/registration/registration_ui.rb:208
#, fuzzy
msgid "Register Extensions and Modules"
msgstr "नोंदणी कोड"
#. help text
-#: src/lib/registration/registration_ui.rb:178
+#: src/lib/registration/registration_ui.rb:212
msgid "<p>Extensions and Modules are being registered.</p>"
msgstr ""
#. TRANSLATORS: updates popup question (1/2), multiline, max. ~60 chars/line
-#: src/lib/registration/registration_ui.rb:203
+#: src/lib/registration/registration_ui.rb:237
#, fuzzy
msgid ""
"The registration server offers update repositories.\n"
@@ -452,22 +475,26 @@
msgstr "नोंदणी कोड"
#. TRANSLATORS: updates popup question (2/2), multiline, max. ~60 chars/line
-#: src/lib/registration/registration_ui.rb:207
+#: src/lib/registration/registration_ui.rb:241
#, fuzzy
#| msgid ""
#| "Would you like to use these mount points\n"
#| "for your new installation?"
-msgid "Would you like to enable these repositories during installation\n"
+msgid ""
+"Would you like to enable these repositories during installation\n"
+"in order to receive the latest updates?"
msgstr ""
"आपल्या नवीन इन्स्टॉलेशनसाठी आपणाला हे \n"
"माउंट पॉईंट्स वापरायला आवडतील का?"
#. Yast::Mode.update
#. TRANSLATORS: updates popup question (2/2), multiline, max. ~60 chars/line
-#: src/lib/registration/registration_ui.rb:211
+#: src/lib/registration/registration_ui.rb:245
#, fuzzy
#| msgid "Would you like to open this profile in editing mode?"
-msgid "Would you like to enable these repositories during upgrade\n"
+msgid ""
+"Would you like to enable these repositories during upgrade\n"
+"in order to receive the latest updates?"
msgstr "ही अभिव्यक्ती संपादन पर्यायात उघडू इच्छिता का?"
#. indent size used in summary text
@@ -476,44 +503,55 @@
msgid "Certificate:"
msgstr "प्रमाणपत्र"
+#. TRANSLATORS: error popup, %s is a repository name, the popup is displayed
+#. when a migration repository cannot be accessed, there are [Skip]
+#. and [Abort] buttons displayed below the question
+#: src/lib/registration/sw_mgmt.rb:97
+msgid ""
+"Repository '%s'\n"
+"cannot be loaded.\n"
+"\n"
+"Skip the repository or abort?"
+msgstr ""
+
#. create UI label for a base product
#. @param base_product [Hash] Product (hash from pkg-bindings)
#. @return [String] UI Label
-#: src/lib/registration/sw_mgmt.rb:147
+#: src/lib/registration/sw_mgmt.rb:192
#, fuzzy
msgid "Unknown product"
msgstr "अनोळकी चूक सांकेतीक"
#. error message
#. error message
-#: src/lib/registration/sw_mgmt.rb:174 src/lib/registration/sw_mgmt.rb:248
+#: src/lib/registration/sw_mgmt.rb:219 src/lib/registration/sw_mgmt.rb:292
#, fuzzy
msgid "Saving repository configuration failed."
msgstr "स्थापना नक्की करा"
#. # error message
#. error message
-#: src/lib/registration/sw_mgmt.rb:212 src/lib/registration/sw_mgmt.rb:223
+#: src/lib/registration/sw_mgmt.rb:256 src/lib/registration/sw_mgmt.rb:267
msgid "Updating service '%s' failed."
msgstr ""
#. error message
-#: src/lib/registration/sw_mgmt.rb:218
+#: src/lib/registration/sw_mgmt.rb:262
msgid "Adding service '%s' failed."
msgstr ""
#. error message
-#: src/lib/registration/sw_mgmt.rb:230
+#: src/lib/registration/sw_mgmt.rb:274
msgid "Saving service '%s' failed."
msgstr ""
#. error message
-#: src/lib/registration/sw_mgmt.rb:235
+#: src/lib/registration/sw_mgmt.rb:279
msgid "Refreshing service '%s' failed."
msgstr ""
#. TRANSLATORS: %s is a product name
-#: src/lib/registration/sw_mgmt.rb:438
+#: src/lib/registration/sw_mgmt.rb:486
#, fuzzy
#| msgid "No product found in the catalog"
msgid ""
@@ -956,8 +994,17 @@
msgid "&Local Registration Server URL"
msgstr "नोंदणी कोड"
+#. TRANSLATORS: error message, %s are details
+#. TRANSLATORS: error message, %s are details
+#: src/lib/registration/ui/media_addon_workflow.rb:95
+#: src/lib/registration/ui/wizard_client.rb:57
+#, fuzzy
+#| msgid "Internal Zone"
+msgid "Internal error: %s"
+msgstr "अंत:स्थ भाग"
+
#. register the base system if not already registered
-#: src/lib/registration/ui/media_addon_workflow.rb:130
+#: src/lib/registration/ui/media_addon_workflow.rb:132
msgid ""
"The base system has to be registered in order to register the '%s' add-on.\n"
"Skip the base system and the add-on registration?"
@@ -965,10 +1012,8 @@
#. TRANSLATORS: dialog title
#: src/lib/registration/ui/migration_repos_selection_dialog.rb:47
-#, fuzzy
-#| msgid "Migration Details"
-msgid "Migration Repositories"
-msgstr "स्थलांतराचा तपशील"
+msgid "Repositories used for Migration"
+msgstr ""
#. TRANSLATORS: help text
#: src/lib/registration/ui/migration_repos_selection_dialog.rb:50
@@ -978,9 +1023,9 @@
#. TRANSLATORS: Multiselection widget label
#: src/lib/registration/ui/migration_repos_selection_dialog.rb:85
#, fuzzy
-#| msgid "Select the Mount Point"
-msgid "Select the Migration Repositories"
-msgstr " माऊंट पॉईंट निवडा"
+#| msgid "Select the boot loader before editing sections."
+msgid "Select the Repositories used for Migration"
+msgstr "विभाग सुधारण्याआधी बूट लोडर निवडा"
#. TRANSLATORS: Push button label, starts the repository management module
#: src/lib/registration/ui/migration_repos_selection_dialog.rb:89
@@ -1003,97 +1048,84 @@
msgid "Priority: %s"
msgstr "अदलाबदल &प्राधान्य"
-#. a dummy message which will be used later, just make sure we have it
-#. before the translation deadline...
-#. TRANSLATORS: popup question, confirm installing the available
-#. updates now
-#: src/lib/registration/ui/migration_repos_workflow.rb:50
+#. TRANSLATORS: a popup message with [Continue] [Cancel] buttons,
+#. pressing [Continue] starts the registration module, [Cancel] aborts
+#. the online migration
+#: src/lib/registration/ui/migration_repos_workflow.rb:145
msgid ""
-"Online updates are available for installation.\n"
-"It is recommended to install all updates before proceeding.\n"
-"\n"
-"Would you like to install the updates now?"
+"The system is not registered,\n"
+"to run the online migration you need\n"
+"to register the system first."
msgstr ""
-#. TRANSLATORS: error message, %s are details
-#: src/lib/registration/ui/migration_repos_workflow.rb:86
-#, fuzzy
-#| msgid "Internal Zone"
-msgid "Internal error: %s"
-msgstr "अंत:स्थ भाग"
-
#. TRANSLATORS: Error message
-#: src/lib/registration/ui/migration_repos_workflow.rb:170
+#: src/lib/registration/ui/migration_repos_workflow.rb:183
msgid "No installed product found."
msgstr ""
#. TRANSLATORS: Error message
-#: src/lib/registration/ui/migration_repos_workflow.rb:199
+#: src/lib/registration/ui/migration_repos_workflow.rb:212
msgid "No migration product found."
msgstr ""
-#. TRANSLATORS: Progress label
-#: src/lib/registration/ui/migration_repos_workflow.rb:246
-#, fuzzy
-#| msgid "Registration Code"
-msgid "Registering Migration Products..."
-msgstr "नोंदणी कोड"
-
#. TRANSLATORS: progress message
-#: src/lib/registration/ui/migration_repos_workflow.rb:272
+#: src/lib/registration/ui/migration_repos_workflow.rb:289
#, fuzzy
#| msgid "Importing repositories..."
msgid "Preparing Migration Repositories..."
msgstr "रिपॉझिटरीज आयात करत आहे..."
#. TRANSLATORS: dialog title
-#: src/lib/registration/ui/migration_selection_dialog.rb:61
+#: src/lib/registration/ui/migration_selection_dialog.rb:62
#, fuzzy
#| msgid "Select the Mount Point"
msgid "Select the Migration Target"
msgstr " माऊंट पॉईंट निवडा"
#. TRANSLATORS: help text (1/3)
-#: src/lib/registration/ui/migration_selection_dialog.rb:64
+#: src/lib/registration/ui/migration_selection_dialog.rb:65
msgid "<p>Here you can select the migration target products. The registrationserver may offer several possible migration to new products.</p>"
msgstr ""
#. TRANSLATORS: help text (2/3)
-#: src/lib/registration/ui/migration_selection_dialog.rb:67
+#: src/lib/registration/ui/migration_selection_dialog.rb:68
msgid "<p>Only one migration target from the list can be selected.</p>"
msgstr ""
#. TRANSLATORS: help text (3/3), %s is replaced by the (translated) check box label
-#: src/lib/registration/ui/migration_selection_dialog.rb:69
+#: src/lib/registration/ui/migration_selection_dialog.rb:70
#, fuzzy
#| msgid "<p>Use <b>Edit</b> to change selected image configuration or create the image.</p>"
msgid "<p>Use the <b>%s</b> check box to manually select the migration repositories later.</p>"
msgstr "<p> नवे प्रतिमा आकृतीबंध बदलण्यास वा प्रतिमा बनवण्यास <b>Edit</b> वापरा.</p>"
-#. TRANSLATORS: check button label
-#: src/lib/registration/ui/migration_selection_dialog.rb:70
-#: src/lib/registration/ui/migration_selection_dialog.rb:139
+#: src/lib/registration/ui/migration_selection_dialog.rb:71
#, fuzzy
#| msgid "&Manually Select Patches"
msgid "Manually Select Migration Repositories"
msgstr "व्यक्तिश: ठिगळे निवडा"
#. TRANSLATORS: error popup, no target migration is selected
-#: src/lib/registration/ui/migration_selection_dialog.rb:96
+#: src/lib/registration/ui/migration_selection_dialog.rb:97
#, fuzzy
#| msgid "Select the boot loader before editing sections."
msgid "Select the target migration."
msgstr "विभाग सुधारण्याआधी बूट लोडर निवडा"
+#. TRANSLATORS: check button label
+#: src/lib/registration/ui/migration_selection_dialog.rb:138
+msgid "Manually Adjust the Repositories for Migration"
+msgstr ""
+
#. TRANSLATORS: selection box label
-#: src/lib/registration/ui/migration_selection_dialog.rb:151
+#: src/lib/registration/ui/migration_selection_dialog.rb:153
#, fuzzy
#| msgid "P&ossible Solutions"
msgid "Possible Migration Targets"
msgstr "होऊ शकणारे मार्ग"
#. TRANSLATORS: RichText header (details for the selected item)
-#: src/lib/registration/ui/migration_selection_dialog.rb:189
+#: src/lib/registration/ui/migration_selection_dialog.rb:191
#, fuzzy
#| msgid "Configuration Summary"
msgid "Migration Summary"
@@ -1105,14 +1137,14 @@
#. using the selected migration.
#. %{url} is the URL of the registration server (SMT)
#. %{product} is a full product name, e.g. "SUSE Linux Enterprise Server 12"
-#: src/lib/registration/ui/migration_selection_dialog.rb:212
+#: src/lib/registration/ui/migration_selection_dialog.rb:214
msgid "ERROR: Product <b>%{product}</b> is not available at the registration server (%{url}). Make the product available to allow using this migration."
msgstr ""
#. this is rather a theoretical case, but anyway....
#. TRANSLATORS: Summary message, rich text format
#. %s is a product name, e.g. "SUSE Linux Enterprise Server 12 SP1 x86_64"
-#: src/lib/registration/ui/migration_selection_dialog.rb:223
+#: src/lib/registration/ui/migration_selection_dialog.rb:225
#, fuzzy
#| msgid "Package %1 will be installed."
msgid "%s <b>will be installed.</b>"
@@ -1120,25 +1152,25 @@
#. TRANSLATORS: Summary message, rich text format
#. %s is a product name, e.g. "SUSE Linux Enterprise Server 12"
-#: src/lib/registration/ui/migration_selection_dialog.rb:240
+#: src/lib/registration/ui/migration_selection_dialog.rb:242
msgid "%s <b>stays unchanged.</b>"
msgstr ""
#. TRANSLATORS: Summary message, rich text format
#. %{old_product} is a product name, e.g. "SUSE Linux Enterprise Server 12"
#. %{new_product} is a product name, e.g. "SUSE Linux Enterprise Server 12 SP1 x86_64"
-#: src/lib/registration/ui/migration_selection_dialog.rb:250
+#: src/lib/registration/ui/migration_selection_dialog.rb:252
msgid "%{old_product} <b>will be upgraded to</b> %{new_product}."
msgstr ""
#. TRANSLATORS: Summary message, rich text format
#. %{old_product} and %{new_product} are product names
-#: src/lib/registration/ui/migration_selection_dialog.rb:255
+#: src/lib/registration/ui/migration_selection_dialog.rb:257
msgid "%{old_product} <b>will be downgraded to</b> %{new_product}."
msgstr ""
#. TRANSLATORS: an error popup message
-#: src/lib/registration/ui/migration_selection_dialog.rb:285
+#: src/lib/registration/ui/migration_selection_dialog.rb:290
msgid ""
"The selected migration contains a product\n"
"which is not available at the registration server.\n"
@@ -1205,6 +1237,21 @@
msgstr "नोंदणी माहितीचा 1 आयटेम"
#, fuzzy
+#~| msgid "Migration Details"
+#~ msgid "Migration Repositories"
+#~ msgstr "स्थलांतराचा तपशील"
+
+#, fuzzy
+#~| msgid "Select the Mount Point"
+#~ msgid "Select the Migration Repositories"
+#~ msgstr " माऊंट पॉईंट निवडा"
+
+#, fuzzy
+#~| msgid "Registration Code"
+#~ msgid "Registering Migration Products..."
+#~ msgstr "नोंदणी कोड"
+
+#, fuzzy
#~| msgid "SMT Certificate"
#~ msgid "SSL Certificate"
#~ msgstr "SMT प्रमाणपत्र"
Modified: trunk/yast/mr/po/storage.mr.po
===================================================================
--- trunk/yast/mr/po/storage.mr.po 2015-10-01 11:24:50 UTC (rev 92957)
+++ trunk/yast/mr/po/storage.mr.po 2015-10-01 11:24:51 UTC (rev 92958)
@@ -2,7 +2,7 @@
msgstr ""
"Project-Id-Version: @PACKAGE@\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-27 10:53+0200\n"
+"POT-Creation-Date: 2015-09-28 18:17+0200\n"
"PO-Revision-Date: 2004-08-09 10:24+0200\n"
"Last-Translator: Priyavert Sharma\n"
"Language-Team: AgreeYa Solutions \n"
@@ -1056,7 +1056,7 @@
msgstr "प्रस्ताव प्रकार "
#. popup text
-#: src/include/partitioning/custom_part_check_generated.rb:246
+#: src/include/partitioning/custom_part_check_generated.rb:251
#, fuzzy
msgid ""
"You have not assigned a root partition for\n"
@@ -1070,7 +1070,7 @@
"विभाजनाला\"/\" मूळ माउंट पॉइंट निर्देशित करा.\n"
#. popup text
-#: src/include/partitioning/custom_part_check_generated.rb:259
+#: src/include/partitioning/custom_part_check_generated.rb:264
#, fuzzy
msgid ""
"You tried to mount a FAT partition to one of the following mount\n"
@@ -1084,7 +1084,7 @@
" ext2 किंवा reiserfs सारखी लिनक्स प्रणाली या माउंट पॉइंटसाठी वापरा.\n"
#. popup text
-#: src/include/partitioning/custom_part_check_generated.rb:272
+#: src/include/partitioning/custom_part_check_generated.rb:277
#, fuzzy
msgid ""
"You tried to mount a FAT partition to the\n"
@@ -1098,7 +1098,7 @@
" ext2 किंवा reiserfs सारखी लिनक्स प्रणाली या माउंट पॉइंटसाठी वापरा.\n"
#. popup text
-#: src/include/partitioning/custom_part_check_generated.rb:286
+#: src/include/partitioning/custom_part_check_generated.rb:291
#, fuzzy
msgid ""
"You have mounted a partition with Btrfs to the\n"
@@ -1111,8 +1111,19 @@
"जाड विभाजन माउंट करण्याचा प्रयत्न केलात: / /usr /गृह /opt /var.\n"
" ext2 किंवा reiserfs सारखी लिनक्स प्रणाली या माउंट पॉइंटसाठी वापरा.\n"
+#. A PReP/CHRP partition is not supposed to be mounted. So if we find any
+#. other /boot partition, we should warn the user.
+#: src/include/partitioning/custom_part_check_generated.rb:305
+msgid ""
+"Warning:\n"
+"Your system needs a boot partition with type 0x41 PReP/CHRP.\n"
+"Please, consider creating one.\n"
+"\n"
+"Really use this setup?\n"
+msgstr ""
+
#. popup text, %1 is a number
-#: src/include/partitioning/custom_part_check_generated.rb:301
+#: src/include/partitioning/custom_part_check_generated.rb:320
#, fuzzy
msgid ""
"Warning:\n"
@@ -1134,7 +1145,7 @@
"हे बदलू?\n"
#. popup text, %1 is a size
-#: src/include/partitioning/custom_part_check_generated.rb:321
+#: src/include/partitioning/custom_part_check_generated.rb:340
#, fuzzy
msgid ""
"Warning:\n"
@@ -1150,7 +1161,7 @@
"आपणास हे करायचे आहे?\n"
#. /////////////////////////// NO BOOT ///////////////////////////
-#: src/include/partitioning/custom_part_check_generated.rb:338
+#: src/include/partitioning/custom_part_check_generated.rb:357
msgid ""
"Warning: There is no partition of type bios_grub present.\n"
"Such a partition is recommended (required with Btrfs) when Grub2 is\n"
@@ -1162,14 +1173,13 @@
#. popup text
#. If the user chooses 'no' here, the system will not be able to
#. boot from the hard drive!
-#: src/include/partitioning/custom_part_check_generated.rb:360
+#: src/include/partitioning/custom_part_check_generated.rb:377
#, fuzzy
msgid ""
"Warning: There is no partition mounted as /boot.\n"
"To boot from your hard disk, a small /boot partition\n"
-"(approx. %1) is required. Consider creating one.\n"
-"Partitions assigned to /boot will automatically be changed to\n"
-"type 0x41 PReP/CHRP.\n"
+"(approx. %1) is required. Consider creating one\n"
+"with type 0x41 PReP/CHRP.\n"
"\n"
"Really use the setup without /boot partition?\n"
msgstr ""
@@ -1182,7 +1192,7 @@
"आपणास आपले सेटअप बदलायचे आहे का?\n"
#. popup text
-#: src/include/partitioning/custom_part_check_generated.rb:380
+#: src/include/partitioning/custom_part_check_generated.rb:396
#, fuzzy
msgid ""
"Warning: According to your setup, you intend to\n"
@@ -1203,7 +1213,7 @@
"\n"
"हे बदलू?\n"
-#: src/include/partitioning/custom_part_check_generated.rb:400
+#: src/include/partitioning/custom_part_check_generated.rb:416
msgid ""
"Warning: Some subvolumes of the root filesystem are shadowed by\n"
"mount points of other filesystem. This could lead to problems.\n"
@@ -1212,7 +1222,7 @@
msgstr ""
#. popup text
-#: src/include/partitioning/custom_part_check_generated.rb:417
+#: src/include/partitioning/custom_part_check_generated.rb:433
#, fuzzy
msgid ""
"Warning: With your current setup, your %1\n"
@@ -1230,7 +1240,7 @@
"हे बदलू?\n"
#. popup text
-#: src/include/partitioning/custom_part_check_generated.rb:435
+#: src/include/partitioning/custom_part_check_generated.rb:451
#, fuzzy
msgid ""
"Warning: With your current setup, your %2 installation\n"
@@ -1256,7 +1266,7 @@
"हे बदलू?\n"
#. popup text
-#: src/include/partitioning/custom_part_check_generated.rb:457
+#: src/include/partitioning/custom_part_check_generated.rb:473
#, fuzzy
msgid ""
"Warning: With your current setup, your %2 installation will\n"
@@ -1282,13 +1292,13 @@
"हे बदलू?\n"
#. popup text
-#: src/include/partitioning/custom_part_check_generated.rb:480
+#: src/include/partitioning/custom_part_check_generated.rb:496
#, fuzzy
msgid "Really use this setup?"
msgstr "हा यंत्रणासमूह खरंच काढून टाकू?"
#. popup text
-#: src/include/partitioning/custom_part_check_generated.rb:488
+#: src/include/partitioning/custom_part_check_generated.rb:504
#, fuzzy
msgid ""
"\n"
@@ -1311,7 +1321,7 @@
"हे आपणास बदलायचे आहे?\n"
#. popup text
-#: src/include/partitioning/custom_part_check_generated.rb:504
+#: src/include/partitioning/custom_part_check_generated.rb:520
#, fuzzy
msgid ""
"\n"
@@ -1327,7 +1337,7 @@
"विशेषतः खालील पैकी कोणत्याही गोष्टीमध्ये:\n"
#. continued popup text
-#: src/include/partitioning/custom_part_check_generated.rb:511
+#: src/include/partitioning/custom_part_check_generated.rb:527
msgid ""
"- if this is an existing ReiserFS partition\n"
"- if this partition already contains a Linux distribution that will be\n"
@@ -1340,7 +1350,7 @@
"- जर हे विभाजन अजूनही फाईल प्रणाली समाविष्ट करत नसेल \n"
#. continued popup text
-#: src/include/partitioning/custom_part_check_generated.rb:518
+#: src/include/partitioning/custom_part_check_generated.rb:534
#, fuzzy
#| msgid ""
#| "If in doubt, you might want to go back and mark this partition for\n"
@@ -1356,7 +1366,7 @@
"जसेकी /, /बूट, /usr, /opt, किंवा/var.\n"
#. continued popup text
-#: src/include/partitioning/custom_part_check_generated.rb:524
+#: src/include/partitioning/custom_part_check_generated.rb:540
#, fuzzy
msgid ""
"If you decide to format the partition, all data on it will be lost.\n"
@@ -1368,7 +1378,7 @@
"आपणास आपले सेटअप बदलायचे आहे का?\n"
#. popup text %1 is replaced by a raid name e.g. md0
-#: src/include/partitioning/custom_part_check_generated.rb:579
+#: src/include/partitioning/custom_part_check_generated.rb:595
msgid ""
"The selected device belongs to the RAID (%1).\n"
"Remove it from the RAID before editing it.\n"
@@ -1377,7 +1387,7 @@
"त्याचे संपादन करण्यापूर्वी ते RAID मधून काढा.\n"
#. popup text %1 is replaced by a name e.g. system
-#: src/include/partitioning/custom_part_check_generated.rb:590
+#: src/include/partitioning/custom_part_check_generated.rb:606
msgid ""
"The selected device belongs to a volume group (%1).\n"
"Remove it from the volume group before editing it.\n"
@@ -1386,7 +1396,7 @@
"त्याचे संपादन करण्यापूर्वी व्हॉल्यूम समूहातून काढा.\n"
#. popup text %1 is replaced by a name e.g. system
-#: src/include/partitioning/custom_part_check_generated.rb:600
+#: src/include/partitioning/custom_part_check_generated.rb:616
msgid ""
"The selected device is used by volume (%1).\n"
"Remove the volume before editing it.\n"
@@ -1395,7 +1405,7 @@
"त्याचे संपादन करण्यापूर्वी व्हॉल्यूम काढा.\n"
#. popup text %2 is a device name, %1 is the raid name
-#: src/include/partitioning/custom_part_check_generated.rb:633
+#: src/include/partitioning/custom_part_check_generated.rb:649
msgid ""
"The device (%2) belongs to the RAID (%1).\n"
"Remove it from the RAID before deleting it.\n"
@@ -1404,7 +1414,7 @@
"ते काढून टाकण्यापूर्वी RAID मधून काढा.\n"
#. popup text, %1 and %2 are device names
-#: src/include/partitioning/custom_part_check_generated.rb:644
+#: src/include/partitioning/custom_part_check_generated.rb:660
msgid ""
"The device (%2) is used by %1.\n"
"Remove %1 before deleting it.\n"
@@ -1412,13 +1422,13 @@
"साधन (%2) %1 कडून वापरात आहे.\n"
"ते काढून टाकण्यापूर्वी %1 काढा.\n"
-#: src/include/partitioning/custom_part_check_generated.rb:656
+#: src/include/partitioning/custom_part_check_generated.rb:672
#, fuzzy
msgid "It cannot be deleted while mounted."
msgstr "डिवाइस डिलिट केलेले आहे"
#. popup text, %1 is a device name
-#: src/include/partitioning/custom_part_check_generated.rb:692
+#: src/include/partitioning/custom_part_check_generated.rb:708
#, fuzzy
#| msgid ""
#| "The device (%1) cannot be removed\n"
@@ -1433,7 +1443,7 @@
"विभाजन उच्चक्रमाकासह वापरात आहे.\n"
#. popup text
-#: src/include/partitioning/custom_part_check_generated.rb:768
+#: src/include/partitioning/custom_part_check_generated.rb:784
#, fuzzy
#| msgid ""
#| "The selected extended partition contains partitions which are currently mounted:\n"
@@ -1452,7 +1462,7 @@
"आपण खरोखरच काय करत आहात हे माहीत नसेल तर कृपया निवडा रद्द करा. \n"
#. popup text, Do not translate LVM.
-#: src/include/partitioning/custom_part_check_generated.rb:786
+#: src/include/partitioning/custom_part_check_generated.rb:802
msgid ""
"\n"
"The selected extended partition contains at least one LVM partition\n"
@@ -1467,7 +1477,7 @@
"वाढीव विभाजन काढून टाकण्यापूर्वी.\n"
#. popup text, Do not translate RAID.
-#: src/include/partitioning/custom_part_check_generated.rb:797
+#: src/include/partitioning/custom_part_check_generated.rb:813
msgid ""
"\n"
"The selected extended partition contains at least one partition\n"
@@ -1482,7 +1492,7 @@
"वाढीव विभाजन काढून टाकण्यापूर्वी.\n"
#. popup text
-#: src/include/partitioning/custom_part_check_generated.rb:808
+#: src/include/partitioning/custom_part_check_generated.rb:824
msgid ""
"\n"
"The selected extended partition contains at least one partition\n"
@@ -1495,14 +1505,14 @@
"वापरलेला व्हॉल्यूम काढा.\n"
#. heading text
-#: src/include/partitioning/custom_part_dialogs.rb:71
+#: src/include/partitioning/custom_part_dialogs.rb:70
#, fuzzy
#| msgid "Enter your password for the encrypted file system."
msgid "Enter your Password for the Encrypted File System."
msgstr "एनक्रिप्टेड फाईल प्रणालीसाठी आपला संकेतशब्द लिहा."
#. label text
-#: src/include/partitioning/custom_part_dialogs.rb:75
+#: src/include/partitioning/custom_part_dialogs.rb:74
#: src/include/partitioning/ep-dialogs.rb:768
#: src/modules/StorageProposal.rb:6372
#, fuzzy
@@ -1510,20 +1520,20 @@
msgid "Do not forget what you enter here!"
msgstr "आपण जे इथे लिहीले ते विसरू नका"
-#: src/include/partitioning/custom_part_dialogs.rb:79
+#: src/include/partitioning/custom_part_dialogs.rb:78
#: src/include/partitioning/ep-dialogs.rb:771
#, fuzzy
msgid "Empty password allowed."
msgstr " रिक्त पर्यायाच्या स्ट्रिंग्जना अनुमती नाही."
#. heading text, %1 is replaced by device name (e.g. /dev/hda1)
-#: src/include/partitioning/custom_part_dialogs.rb:85
+#: src/include/partitioning/custom_part_dialogs.rb:84
msgid "Password for Encrypted File System on %1"
msgstr "एनक्रिप्टेड फाइल प्रणालीसाठीचा संकेतशब्द %1 चालू"
#. translator comment: %1 is the device name, %2 is a directory
#. example: "...password for device /dev/hda6 mounted on /var"
-#: src/include/partitioning/custom_part_dialogs.rb:106
+#: src/include/partitioning/custom_part_dialogs.rb:105
#, fuzzy
#| msgid ""
#| "Enter your crypt password for\n"
@@ -1536,7 +1546,7 @@
"आपला क्रिप्ट संकेतशब्द लिहा.\n"
#. heading text
-#: src/include/partitioning/custom_part_dialogs.rb:122
+#: src/include/partitioning/custom_part_dialogs.rb:121
#, fuzzy
#| msgid "Enter your password for the encrypted file system."
msgid "Enter your Password for the Encrypted File System"
@@ -1546,7 +1556,7 @@
#. Please use newline if label is longer than 40 characters
#. Label: get password for user root
#. Please use newline if label is longer than 40 characters
-#: src/include/partitioning/custom_part_dialogs.rb:137
+#: src/include/partitioning/custom_part_dialogs.rb:136
#: src/include/partitioning/ep-dialogs.rb:796
#, fuzzy
#| msgid "&Enter a password for your file system:"
@@ -1559,20 +1569,20 @@
#. Please use newline if label is longer than 40 characters
#. Label: get same password again for verification
#. Please use newline if label is longer than 40 characters
-#: src/include/partitioning/custom_part_dialogs.rb:148
-#: src/include/partitioning/ep-dialogs.rb:780 src/modules/Storage.rb:4001
+#: src/include/partitioning/custom_part_dialogs.rb:147
+#: src/include/partitioning/ep-dialogs.rb:780 src/modules/Storage.rb:4002
#, fuzzy
#| msgid "Reenter the password for &verification:"
msgid "Reenter the Password for &Verification:"
msgstr "&पडताळणीसाठी पुन्हा एकदा संकेतशब्द लिहा:"
#. Cancel button
-#: src/include/partitioning/custom_part_dialogs.rb:160
+#: src/include/partitioning/custom_part_dialogs.rb:159
msgid "&Skip"
msgstr "सोडा"
#. popup text
-#: src/include/partitioning/custom_part_dialogs.rb:189
+#: src/include/partitioning/custom_part_dialogs.rb:188
#, fuzzy
msgid ""
"The first and the second version\n"
@@ -1585,8 +1595,8 @@
#. popup text
#. popup text
-#: src/include/partitioning/custom_part_dialogs.rb:197
-#: src/modules/Storage.rb:3957
+#: src/include/partitioning/custom_part_dialogs.rb:196
+#: src/modules/Storage.rb:3958
msgid ""
"You did not enter a password.\n"
"Try again.\n"
@@ -1596,8 +1606,8 @@
#. popup text
#. popup text
-#: src/include/partitioning/custom_part_dialogs.rb:204
-#: src/modules/Storage.rb:3965
+#: src/include/partitioning/custom_part_dialogs.rb:203
+#: src/modules/Storage.rb:3966
msgid ""
"The password must have at least %1 characters.\n"
"Try again.\n"
@@ -1605,19 +1615,19 @@
"संकेतशब्द किमान %1 वर्णाचा असला पाहीजे.\n"
"पुन्हा प्रयत्न करा.\n"
-#: src/include/partitioning/custom_part_dialogs.rb:238
+#: src/include/partitioning/custom_part_dialogs.rb:237
#, fuzzy
#| msgid "Floating Point Unit"
msgid "No floating point number."
msgstr "दशांश अपूर्णाक एकक"
#. heading text
-#: src/include/partitioning/custom_part_dialogs.rb:362
+#: src/include/partitioning/custom_part_dialogs.rb:361
msgid "File system options:"
msgstr "फाईल प्रणाली विकल्प:"
#. popup text
-#: src/include/partitioning/custom_part_dialogs.rb:444
+#: src/include/partitioning/custom_part_dialogs.rb:443
msgid ""
"The character '/' is no longer permitted in a volume label.\n"
"Change your volume label so that it does not contain this character.\n"
@@ -1626,7 +1636,7 @@
"आपले व्हॉल्यूम लेबल बदला ज्यामूळे त्यात हा वर्ण राहणार नाही.\n"
#. help text, richtext format
-#: src/include/partitioning/custom_part_dialogs.rb:467
+#: src/include/partitioning/custom_part_dialogs.rb:466
#, fuzzy
msgid ""
"<p><b>Mount in /etc/fstab by:</b>\n"
@@ -1643,7 +1653,7 @@
"माउंट होऊ शकत नाहीत. जर विकल्प अक्षम केला तर हे शक्य नाही.\n"
#. help text, richtext format
-#: src/include/partitioning/custom_part_dialogs.rb:480
+#: src/include/partitioning/custom_part_dialogs.rb:479
#, fuzzy
msgid ""
"<p><b>Volume Label:</b>\n"
@@ -1657,47 +1667,47 @@
"व्हॉल्यूम लेबल मध्ये वर्ण किंवा / जागेचा समावेश असू शकत नाही.\n"
#. label text
-#: src/include/partitioning/custom_part_dialogs.rb:495
+#: src/include/partitioning/custom_part_dialogs.rb:494
msgid "Mount in /etc/fstab by"
msgstr "कडून in /इत्यादि/fstab माउंट"
#. label text
-#: src/include/partitioning/custom_part_dialogs.rb:502
+#: src/include/partitioning/custom_part_dialogs.rb:501
msgid "&Device Name"
msgstr "वस्तू नाव"
#. label text
#. label text
-#: src/include/partitioning/custom_part_dialogs.rb:509
-#: src/include/partitioning/custom_part_dialogs.rb:545
+#: src/include/partitioning/custom_part_dialogs.rb:508
+#: src/include/partitioning/custom_part_dialogs.rb:544
msgid "Volume &Label"
msgstr "व्हॉल्यूम &लेबल"
#. label text
-#: src/include/partitioning/custom_part_dialogs.rb:516
+#: src/include/partitioning/custom_part_dialogs.rb:515
#, fuzzy
msgid "&UUID"
msgstr "ओळख चिन्ह"
#. label text
-#: src/include/partitioning/custom_part_dialogs.rb:526
+#: src/include/partitioning/custom_part_dialogs.rb:525
msgid "Device &ID"
msgstr "साधन &ओळखपत्र"
#. label text
-#: src/include/partitioning/custom_part_dialogs.rb:533
+#: src/include/partitioning/custom_part_dialogs.rb:532
msgid "Device &Path"
msgstr "साधन &पथ"
#. heading text
-#: src/include/partitioning/custom_part_dialogs.rb:673
+#: src/include/partitioning/custom_part_dialogs.rb:672
#, fuzzy
#| msgid "Fs&tab Options"
msgid "Fstab Options:"
msgstr "Fs&tab विकल्प"
#. popup text %1 is a number
-#: src/include/partitioning/custom_part_dialogs.rb:847
+#: src/include/partitioning/custom_part_dialogs.rb:846
#, fuzzy
#| msgid ""
#| "\n"
@@ -1713,66 +1723,66 @@
" %1 आहे. आपले व्हॉल्यूम लेबल या आकाराचे केले आहे. \n"
#. popup text
-#: src/include/partitioning/custom_part_dialogs.rb:870
+#: src/include/partitioning/custom_part_dialogs.rb:869
msgid "Provide a volume label to mount by label."
msgstr "लेवलने माउंट करण्यासाठी एक व्हॉल्यूम लेबल पुरवा."
#. popup text
-#: src/include/partitioning/custom_part_dialogs.rb:881
+#: src/include/partitioning/custom_part_dialogs.rb:880
msgid "This volume label is already in use. Select a different one."
msgstr "This volume label is already in use. Select a different one."
#. label text
-#: src/include/partitioning/custom_part_dialogs.rb:1050
+#: src/include/partitioning/custom_part_dialogs.rb:1046
#, fuzzy
#| msgid "File System"
msgid "File &System"
msgstr "सिस्टम"
#. button text
-#: src/include/partitioning/custom_part_dialogs.rb:1057
+#: src/include/partitioning/custom_part_dialogs.rb:1053
#, fuzzy
msgid "O&ptions..."
msgstr "पर्याय"
#. button text
-#: src/include/partitioning/custom_part_dialogs.rb:1073
+#: src/include/partitioning/custom_part_dialogs.rb:1069
#, fuzzy
msgid "&Encrypt Device"
msgstr "इनक्रिप्शन"
#. label text
-#: src/include/partitioning/custom_part_dialogs.rb:1148
+#: src/include/partitioning/custom_part_dialogs.rb:1144
msgid "File system &ID:"
msgstr "फाईल प्रणाली &ओळखपत्र:"
#. label text
-#: src/include/partitioning/custom_part_dialogs.rb:1180
+#: src/include/partitioning/custom_part_dialogs.rb:1176
msgid "Format"
msgstr "फॉरमॅट"
#. button text
-#: src/include/partitioning/custom_part_dialogs.rb:1190
+#: src/include/partitioning/custom_part_dialogs.rb:1186
msgid "Do ¬ format"
msgstr "फॉरमट करू &नका"
#. button text
-#: src/include/partitioning/custom_part_dialogs.rb:1200
+#: src/include/partitioning/custom_part_dialogs.rb:1196
msgid "&Format"
msgstr "&फॉरमॅट"
#. button text
-#: src/include/partitioning/custom_part_dialogs.rb:1253
+#: src/include/partitioning/custom_part_dialogs.rb:1249
msgid "Fs&tab Options"
msgstr "Fs&tab विकल्प"
#. label text
-#: src/include/partitioning/custom_part_dialogs.rb:1260
+#: src/include/partitioning/custom_part_dialogs.rb:1256
msgid "&Mount Point"
msgstr "आरोहण बिंदू"
#. popup text %1 is a partition name, %2 a dirctory
-#: src/include/partitioning/custom_part_dialogs.rb:1272
+#: src/include/partitioning/custom_part_dialogs.rb:1268
#, fuzzy
#| msgid ""
#| "\n"
@@ -1809,7 +1819,7 @@
"चालू ठेवू?\n"
#. Popup text
-#: src/include/partitioning/custom_part_dialogs.rb:1301
+#: src/include/partitioning/custom_part_dialogs.rb:1297
#, fuzzy
msgid ""
"\n"
@@ -1821,7 +1831,7 @@
"फक्त fat, ext2, ext3, व reiser फाईल प्रणालीच्या आकुंचनाला अनुमती देतात."
#. Popup text
-#: src/include/partitioning/custom_part_dialogs.rb:1308
+#: src/include/partitioning/custom_part_dialogs.rb:1304
#, fuzzy
msgid ""
"\n"
@@ -1833,23 +1843,23 @@
"फक्त fat, ext2, ext3, व reiser फाईल प्रणालीच्या आकुंचनाला अनुमती देतात."
#. Popup text
-#: src/include/partitioning/custom_part_dialogs.rb:1320
+#: src/include/partitioning/custom_part_dialogs.rb:1316
#, fuzzy
msgid "You risk losing data if you shrink this partition."
msgstr "जर ह्या %1 चे आकुंचन केला तर आपला डेटा हरवण्याचा धोका आहे."
#. Popup text
-#: src/include/partitioning/custom_part_dialogs.rb:1326
+#: src/include/partitioning/custom_part_dialogs.rb:1322
#, fuzzy
msgid "You risk losing data if you shrink this logical volume."
msgstr "जर ह्या %1 चे आकुंचन केला तर आपला डेटा हरवण्याचा धोका आहे."
-#: src/include/partitioning/custom_part_dialogs.rb:1330
+#: src/include/partitioning/custom_part_dialogs.rb:1326
msgid "Continue?"
msgstr "चालू ठेवू?"
#. Popup text
-#: src/include/partitioning/custom_part_dialogs.rb:1346
+#: src/include/partitioning/custom_part_dialogs.rb:1342
#, fuzzy
msgid ""
"\n"
@@ -1861,7 +1871,7 @@
"फक्त fat, ext2, ext3, xfs, व reiser फाईलप्रणाली वाढवण्यास अनुमती देतात."
#. Popup text
-#: src/include/partitioning/custom_part_dialogs.rb:1353
+#: src/include/partitioning/custom_part_dialogs.rb:1349
#, fuzzy
msgid ""
"\n"
@@ -1872,21 +1882,21 @@
"निवडलेल्या %1 वरची फाईल प्रणाली YaST2 कडून वाढवता येत नाही.\n"
"फक्त fat, ext2, ext3, xfs, व reiser फाईलप्रणाली वाढवण्यास अनुमती देतात."
-#: src/include/partitioning/custom_part_dialogs.rb:1361
+#: src/include/partitioning/custom_part_dialogs.rb:1357
#, fuzzy
msgid "Continue resizing?"
msgstr " %1 चा पुनर्आकारित करणे चालू ठेवू?"
#. Popup text
-#: src/include/partitioning/custom_part_dialogs.rb:1378
+#: src/include/partitioning/custom_part_dialogs.rb:1374
msgid "You decreased a partition with a reiser file system on it."
msgstr ""
-#: src/include/partitioning/custom_part_dialogs.rb:1380
+#: src/include/partitioning/custom_part_dialogs.rb:1376
msgid "You decreased a logical volume with a reiser file system on it."
msgstr ""
-#: src/include/partitioning/custom_part_dialogs.rb:1387
+#: src/include/partitioning/custom_part_dialogs.rb:1383
#, fuzzy
msgid ""
"\n"
@@ -1903,7 +1913,7 @@
"आत्ता फाईल प्रणाली आकुंचित करू?"
#. popup text, %1 is replaced by device name
-#: src/include/partitioning/custom_part_dialogs.rb:1441
+#: src/include/partitioning/custom_part_dialogs.rb:1437
#, fuzzy
#| msgid ""
#| "The selected device contains partitions that are currently mounted:\n"
@@ -1922,7 +1932,7 @@
"आपण नक्की काय करत आहात हे माहीत नसेल तर रद्द करा निवडा.\n"
#. popup text, Do not translate LVM.
-#: src/include/partitioning/custom_part_dialogs.rb:1464
+#: src/include/partitioning/custom_part_dialogs.rb:1460
msgid ""
"\n"
"The selected device contains at least one LVM partition\n"
@@ -1932,7 +1942,7 @@
msgstr ""
#. popup text, Do not translate RAID.
-#: src/include/partitioning/custom_part_dialogs.rb:1475
+#: src/include/partitioning/custom_part_dialogs.rb:1471
#, fuzzy
msgid ""
"\n"
@@ -1948,7 +1958,7 @@
"विभाजने अनिर्देशित करा.\n"
#. popup text
-#: src/include/partitioning/custom_part_dialogs.rb:1486
+#: src/include/partitioning/custom_part_dialogs.rb:1482
msgid ""
"\n"
"The selected device contains at least one partition\n"
@@ -1957,7 +1967,7 @@
msgstr ""
#. help text, richtext format
-#: src/include/partitioning/custom_part_dialogs.rb:1547
+#: src/include/partitioning/custom_part_dialogs.rb:1543
#, fuzzy
#| msgid ""
#| "<p>\n"
@@ -1969,26 +1979,26 @@
"एनक्रिप्टेड फाईल प्रणाली निर्माण करा.\n"
"</p>\n"
-#: src/include/partitioning/custom_part_dialogs.rb:1552
+#: src/include/partitioning/custom_part_dialogs.rb:1548
msgid "<p>Enable automatic snapshots for a Btrfs filesystem with snapper.</p>"
msgstr ""
#. label text
-#: src/include/partitioning/custom_part_dialogs.rb:1566
+#: src/include/partitioning/custom_part_dialogs.rb:1562
#, fuzzy
#| msgid "&Existing Neighbours"
msgid "Existing Subvolumes:"
msgstr "&आस्तित्वात असलेले शेजारी"
#. label text
-#: src/include/partitioning/custom_part_dialogs.rb:1572
+#: src/include/partitioning/custom_part_dialogs.rb:1568
#, fuzzy
#| msgid "Store volume"
msgid "New Subvolume"
msgstr "धवनीपातळी संग्रहीत करा"
#. button text
-#: src/include/partitioning/custom_part_dialogs.rb:1578
+#: src/include/partitioning/custom_part_dialogs.rb:1574
#, fuzzy
#| msgid "Add new user"
msgid "Add new"
@@ -1996,46 +2006,46 @@
#. button text
#. push button text
-#: src/include/partitioning/custom_part_dialogs.rb:1584
+#: src/include/partitioning/custom_part_dialogs.rb:1580
#: src/modules/DualMultiSelectionBox.rb:147
msgid "Remove"
msgstr "कमी करा"
#. TRANSLATOR: checkbox text
#. TRANSLATORS: checkbox text
-#: src/include/partitioning/custom_part_dialogs.rb:1596
+#: src/include/partitioning/custom_part_dialogs.rb:1592
#: src/modules/StorageProposal.rb:6226
msgid "Enable Snapshots"
msgstr ""
#. heading text
#. button text
-#: src/include/partitioning/custom_part_dialogs.rb:1607
-#: src/include/partitioning/custom_part_lib.rb:420
+#: src/include/partitioning/custom_part_dialogs.rb:1603
+#: src/include/partitioning/custom_part_lib.rb:409
#, fuzzy
#| msgid "Signature Handling"
msgid "Subvolume Handling"
msgstr " स्वाक्षरीय हाताळणी "
-#: src/include/partitioning/custom_part_dialogs.rb:1670
+#: src/include/partitioning/custom_part_dialogs.rb:1666
#, fuzzy
#| msgid "Empty option strings are not allowed."
msgid "Empty subvolume name not allowed."
msgstr " रिक्त पर्यायाच्या स्ट्रिंग्जना अनुमती नाही."
-#: src/include/partitioning/custom_part_dialogs.rb:1674
+#: src/include/partitioning/custom_part_dialogs.rb:1670
msgid ""
"Only subvolume names starting with \"%1\" currently allowed!\n"
"Automatically prepending \"%1\" to name of subvolume."
msgstr ""
-#: src/include/partitioning/custom_part_dialogs.rb:1684
+#: src/include/partitioning/custom_part_dialogs.rb:1680
#, fuzzy
#| msgid "Provider name %1 already exists."
msgid "Subvolume name %1 already exists."
msgstr "पुरविणाऱ्याचे नाव %1 अगोदरच अस्तित्वात आहे."
-#: src/include/partitioning/custom_part_dialogs.rb:1713
+#: src/include/partitioning/custom_part_dialogs.rb:1709
msgid "Modifications done so far in this dialog will be lost."
msgstr ""
@@ -2232,17 +2242,17 @@
msgstr ""
#. error popup text
-#: src/include/partitioning/custom_part_lib.rb:62
+#: src/include/partitioning/custom_part_lib.rb:51
msgid "You cannot use the mount point \"%1\" for LVM.\n"
msgstr "आपण LVM साठी माउंट पॉईंट \"%1\" वापरू शकत नाही.\n"
#. error popup text
-#: src/include/partitioning/custom_part_lib.rb:89
+#: src/include/partitioning/custom_part_lib.rb:78
msgid "You cannot use the mount point %1 for RAID."
msgstr "आपण RAID साठी माउंट पॉईंट %1 वापरू शकत नाही."
#. error popup text
-#: src/include/partitioning/custom_part_lib.rb:108
+#: src/include/partitioning/custom_part_lib.rb:97
#, fuzzy
#| msgid ""
#| "You have selected not to mount automatically at start-up a file system\n"
@@ -2267,7 +2277,7 @@
"खरोखरच हे करू?\n"
#. error popup text
-#: src/include/partitioning/custom_part_lib.rb:131
+#: src/include/partitioning/custom_part_lib.rb:120
msgid ""
"You have assigned an encrypted file system to a partition\n"
"with one of the following mount points: \"/\", \"/usr\", \"/boot\",\n"
@@ -2280,7 +2290,7 @@
"फाईल प्रणाली वापरा.\n"
#. error popup text
-#: src/include/partitioning/custom_part_lib.rb:169
+#: src/include/partitioning/custom_part_lib.rb:158
#, fuzzy
#| msgid ""
#| "You have set the option to be mountable by users for a file system\n"
@@ -2308,29 +2318,29 @@
#. @param [Hash{String => map}] targetMap the TargetMap
#. @param mount mount point
#. @return [Boolean]
-#: src/include/partitioning/custom_part_lib.rb:216
+#: src/include/partitioning/custom_part_lib.rb:205
#, fuzzy
msgid "Mount point must not be empty."
msgstr "दूरध्वनी क्रमांक रिकामे असता कामा नयेत."
#. error popup
-#: src/include/partitioning/custom_part_lib.rb:221
+#: src/include/partitioning/custom_part_lib.rb:210
msgid "Swap devices must have swap as mount point."
msgstr ""
#. error popup
-#: src/include/partitioning/custom_part_lib.rb:225
+#: src/include/partitioning/custom_part_lib.rb:214
msgid "Only swap devices may have swap as mount point."
msgstr ""
#. && mount!="swap" )
#. error popup text
-#: src/include/partitioning/custom_part_lib.rb:240
+#: src/include/partitioning/custom_part_lib.rb:229
msgid "This mount point is already in use. Select a different one."
msgstr "हा माउंट पॉईंट याआधीच वापरात. दुसरा एखादा निवडा."
#. error popup text
-#: src/include/partitioning/custom_part_lib.rb:250
+#: src/include/partitioning/custom_part_lib.rb:239
msgid ""
"FAT filesystem used for system mount point (/, /usr, /opt, /var, /home).\n"
"This is not possible."
@@ -2339,13 +2349,13 @@
"हे शक्य नाही."
#. error popup text
-#: src/include/partitioning/custom_part_lib.rb:259
+#: src/include/partitioning/custom_part_lib.rb:248
#, fuzzy
msgid "Invalid character in mount point. Do not use \"`'!\"%#\" in a mount point."
msgstr "माउंट पॉईंटमध्ये अग्राह्य वर्ण. माउंटपॉईंटमध्ये \"`'!\"%#\" वापरु नका."
#. error popup text
-#: src/include/partitioning/custom_part_lib.rb:268
+#: src/include/partitioning/custom_part_lib.rb:257
#, fuzzy
#| msgid ""
#| "You cannot use any of the following mount points:\n"
@@ -2359,12 +2369,12 @@
"/proc, /dev, /lib, /bin, /etc, /sbin, /mnt, /var/adm/mnt, /हरवले+सापडले\n"
#. error popup text
-#: src/include/partitioning/custom_part_lib.rb:277
+#: src/include/partitioning/custom_part_lib.rb:266
msgid "Your mount point must start with a \"/\" "
msgstr "आपला माउंट पॉईंट \"/\" नेच सुरू झाला पाहीजे"
#. error popup text
-#: src/include/partitioning/custom_part_lib.rb:283
+#: src/include/partitioning/custom_part_lib.rb:272
msgid ""
"It is not allowed to assign the mount point swap\n"
"to a device without a swap file system."
@@ -2372,7 +2382,7 @@
#. warning message, %1 is replaced by fs name (e.g. Ext3)
#. %2 is prelaced by a size (e.g. 10 MB)
-#: src/include/partitioning/custom_part_lib.rb:310
+#: src/include/partitioning/custom_part_lib.rb:299
msgid ""
"Your partition is too small to use %1.\n"
"The minimum size for this file system is %2.\n"
@@ -2381,14 +2391,14 @@
"या प्रणालीसाठीचा किमान आकार %2 आहे.\n"
#. error popup text
-#: src/include/partitioning/custom_part_lib.rb:380
+#: src/include/partitioning/custom_part_lib.rb:369
msgid ""
"It is not allowed to assign a mount point\n"
"to a device with nonexistent or unknown file system."
msgstr ""
#. warning message, %1 is replaced by fs name (e.g. Ext3)
-#: src/include/partitioning/custom_part_lib.rb:502
+#: src/include/partitioning/custom_part_lib.rb:491
msgid ""
"\n"
"WARNING:\n"
@@ -2403,12 +2413,12 @@
#. //////////////////////////////////////////////
#. modify map new
-#: src/include/partitioning/custom_part_lib.rb:948
-#: src/include/partitioning/custom_part_lib.rb:975
+#: src/include/partitioning/custom_part_lib.rb:919
+#: src/include/partitioning/custom_part_lib.rb:946
msgid "The file system is currently mounted on %1."
msgstr ""
-#: src/include/partitioning/custom_part_lib.rb:953
+#: src/include/partitioning/custom_part_lib.rb:924
msgid ""
"You can try to unmount it now, continue without unmounting or cancel.\n"
"Click Cancel unless you know exactly what you are doing."
@@ -2416,32 +2426,32 @@
#. button text
#. button text
-#: src/include/partitioning/custom_part_lib.rb:964
-#: src/include/partitioning/custom_part_lib.rb:989
+#: src/include/partitioning/custom_part_lib.rb:935
+#: src/include/partitioning/custom_part_lib.rb:960
#, fuzzy
#| msgid "Mount"
msgid "Unmount"
msgstr "स्वार व्हा"
-#: src/include/partitioning/custom_part_lib.rb:980
+#: src/include/partitioning/custom_part_lib.rb:951
msgid ""
"You can try to unmount it now or cancel.\n"
"Click Cancel unless you know exactly what you are doing."
msgstr ""
-#: src/include/partitioning/custom_part_lib.rb:1026
+#: src/include/partitioning/custom_part_lib.rb:997
#, fuzzy
#| msgid "It is not possible to delete a NIS user."
msgid "It is not possible to shrink the file system while it is mounted."
msgstr "NIS वापरकर्ते काढून टाकणे शक्य नाही."
-#: src/include/partitioning/custom_part_lib.rb:1039
+#: src/include/partitioning/custom_part_lib.rb:1010
#, fuzzy
#| msgid "It is not possible to delete a NIS user."
msgid "It is not possible to extend the file system while it is mounted."
msgstr "NIS वापरकर्ते काढून टाकणे शक्य नाही."
-#: src/include/partitioning/custom_part_lib.rb:1050
+#: src/include/partitioning/custom_part_lib.rb:1021
#, fuzzy
#| msgid "It is not possible to create a partition on %1."
msgid "It is not possible to resize the file system while it is mounted."
@@ -3485,7 +3495,7 @@
#. error popup
#. TRANSLATORS: error popup
-#: src/include/partitioning/ep-hd-lib.rb:51 src/modules/Storage.rb:5211
+#: src/include/partitioning/ep-hd-lib.rb:51 src/modules/Storage.rb:5240
msgid "The disk is in use and cannot be modified."
msgstr ""
@@ -3996,20 +4006,29 @@
msgid "<p>No changes to partitioning.</p>"
msgstr "<h1>इशारा</h1>"
-#: src/include/partitioning/ep-lib.rb:485
+#: src/include/partitioning/ep-lib.rb:484
#, fuzzy
msgid "<p>Changes to partitioning:</p>"
msgstr "<h1>इशारा</h1>"
-#: src/include/partitioning/ep-lib.rb:490
+#: src/include/partitioning/ep-lib.rb:487
msgid "<p>No changes to storage settings.</p>"
msgstr ""
-#: src/include/partitioning/ep-lib.rb:493
+#: src/include/partitioning/ep-lib.rb:489
#, fuzzy
msgid "<p>Storage settings:</p>"
msgstr "साठवण उपकरण"
+#: src/include/partitioning/ep-lib.rb:498
+#, fuzzy
+msgid "<p>Packages to install:</p>"
+msgstr "साठवण उपकरण"
+
+#: src/include/partitioning/ep-lib.rb:500
+msgid "<p>No packages need to be installed.</p>"
+msgstr ""
+
#. heading
#. tree node label
#: src/include/partitioning/ep-log.rb:43
@@ -6326,7 +6345,7 @@
#. @param integer testsize
#. @param [Symbol] used_fs
#. @param [Boolean] verbose
-#: src/modules/Storage.rb:991
+#: src/modules/Storage.rb:992
msgid "Resize Not Possible:"
msgstr "पुनर्आकार शक्य नाही:"
@@ -6339,7 +6358,7 @@
#. mark swap-partitions with pseudo Mountpoint swap in targetMap
#. @param [Hash{String => map}] target Disk map
#. @return [Hash{String => map}] modified target
-#: src/modules/Storage.rb:2691 src/modules/Storage.rb:3914
+#: src/modules/Storage.rb:2692 src/modules/Storage.rb:3915
#, fuzzy
#| msgid ""
#| "Could not set encryption.\n"
@@ -6358,7 +6377,7 @@
"पुरविलेला क्रिप्ट संकेतशब्द चूक असू शकतो. \n"
#. popup text
-#: src/modules/Storage.rb:3945
+#: src/modules/Storage.rb:3946
#, fuzzy
msgid ""
"The first and the second version\n"
@@ -6370,7 +6389,7 @@
"कृपया पुन्हा प्रयत्न करा."
#. popup text
-#: src/modules/Storage.rb:3976
+#: src/modules/Storage.rb:3977
#, fuzzy
msgid ""
"The password may only contain the following characters:\n"
@@ -6383,29 +6402,29 @@
#. Label: get password for encrypted volume
#. Please use newline if label is longer than 40 characters
-#: src/modules/Storage.rb:4030
+#: src/modules/Storage.rb:4031
#, fuzzy
#| msgid "Enter Encryption Key"
msgid "&Enter Encryption Password:"
msgstr "इनक्रीप्शन कळ लिहा"
#. Clear password fields on every round.
-#: src/modules/Storage.rb:4089
+#: src/modules/Storage.rb:4090
#, fuzzy
#| msgid "Enter Provider Password"
msgid "Provide Password"
msgstr "पुरविणारा परवलीशब्द लिहा"
-#: src/modules/Storage.rb:4108
+#: src/modules/Storage.rb:4109
msgid "The following encrypted volumes are already available."
msgstr ""
-#: src/modules/Storage.rb:4123
+#: src/modules/Storage.rb:4124
#, fuzzy
msgid "Encrypted Volume Activation"
msgstr " व्हॉल्यूम समूह "
-#: src/modules/Storage.rb:4127
+#: src/modules/Storage.rb:4128
msgid ""
"The following volumes contain an encryption signature but the \n"
"passwords are not yet known.\n"
@@ -6413,14 +6432,14 @@
"during an update or if they contain an encrypted LVM physical volume."
msgstr ""
-#: src/modules/Storage.rb:4139
+#: src/modules/Storage.rb:4140
#, fuzzy
#| msgid "Do you want to retry?"
msgid "Do you want to provide encryption passwords?"
msgstr "आपल्याला परत प्रयत्न करायचा आहे?"
#. text in help field
-#: src/modules/Storage.rb:4196
+#: src/modules/Storage.rb:4197
msgid ""
"Enter encryption password for any of the\n"
"devices in the locked devices list.\n"
@@ -6428,98 +6447,111 @@
msgstr ""
#. header text
-#: src/modules/Storage.rb:4202
+#: src/modules/Storage.rb:4203
#, fuzzy
#| msgid "Enter Encryption Key"
msgid "Enter Encryption Password"
msgstr "इनक्रीप्शन कळ लिहा"
-#: src/modules/Storage.rb:4205
+#: src/modules/Storage.rb:4206
msgid "There are no encrypted volume to unlock."
msgstr ""
#. label text, multiple device names follow
-#: src/modules/Storage.rb:4218
+#: src/modules/Storage.rb:4219
#, fuzzy
#| msgid "YaST2 detected the following device"
msgid "Provide password for any of the following devices:"
msgstr "यास्ट2 ने पुढील उपकरण शोधले"
#. label text, one device name follows
-#: src/modules/Storage.rb:4221
+#: src/modules/Storage.rb:4222
#, fuzzy
#| msgid "YaST2 detected the following device"
msgid "Provide password for the following device:"
msgstr "यास्ट2 ने पुढील उपकरण शोधले"
-#: src/modules/Storage.rb:4234
+#: src/modules/Storage.rb:4235
msgid "Trying to unlock encrypted volumes..."
msgstr ""
-#: src/modules/Storage.rb:4258
+#: src/modules/Storage.rb:4259
msgid "Password did not unlock any volume."
msgstr ""
-#: src/modules/Storage.rb:4344
+#: src/modules/Storage.rb:4345
#, fuzzy
#| msgid "DASD Disks"
msgid "IDE Disk"
msgstr "DASD तबकडी"
-#: src/modules/Storage.rb:4350
+#: src/modules/Storage.rb:4351
#, fuzzy
#| msgid "DASD Disks"
msgid "SCSI Disk"
msgstr "DASD तबकडी"
-#: src/modules/Storage.rb:4356
+#: src/modules/Storage.rb:4357
msgid "Disk"
msgstr "चकती"
-#: src/modules/Storage.rb:4384
+#: src/modules/Storage.rb:4385
#, fuzzy
msgid "DM RAID"
msgstr "R&AID:"
-#: src/modules/Storage.rb:4397
+#: src/modules/Storage.rb:4398
#, fuzzy
msgid "MD RAID"
msgstr "R&AID:"
+#. TODO: more informative error message, but the Package module does
+#. not provide anything
#. TRANSLATORS: error popup
-#: src/modules/Storage.rb:5223
+#: src/modules/Storage.rb:4893
+msgid "Installing required packages failed."
+msgstr ""
+
+#: src/modules/Storage.rb:4894 src/modules/StorageClients.rb:159
+#, fuzzy
+#| msgid "Continue resizing the %1?"
+msgid "Continue despite the error?"
+msgstr " %1 चा पुनर्आकारित करणे चालू ठेवू?"
+
+#. TRANSLATORS: error popup
+#: src/modules/Storage.rb:5252
msgid "Partitions cannot be created since other partitions on the disk are used."
msgstr ""
-#: src/modules/Storage.rb:5249
+#: src/modules/Storage.rb:5278
msgid ""
"\n"
"Device %1 cannot be modified because it contains activated swap\n"
"that is needed to run the installation.\n"
msgstr ""
-#: src/modules/Storage.rb:5263
+#: src/modules/Storage.rb:5292
msgid ""
"\n"
"Device %1 cannot be modified because it contains the installation\n"
"data needed to perform the installation.\n"
msgstr ""
-#: src/modules/Storage.rb:5292
+#: src/modules/Storage.rb:5321
msgid ""
"\n"
"Device %1 cannot be removed because it contains activated swap\n"
"that is needed to run the installation.\n"
msgstr ""
-#: src/modules/Storage.rb:5301
+#: src/modules/Storage.rb:5330
msgid ""
"\n"
"Device %1 cannot be removed because it contains the installation\n"
"data needed to perform the installation.\n"
msgstr ""
-#: src/modules/Storage.rb:5330
+#: src/modules/Storage.rb:5359
msgid ""
"\n"
"Device %1 cannot be removed because this would indirectly change\n"
@@ -6527,7 +6559,7 @@
"the installation.\n"
msgstr ""
-#: src/modules/Storage.rb:5341
+#: src/modules/Storage.rb:5370
msgid ""
"\n"
"Device %1 cannot be removed because this would indirectly change\n"
@@ -6535,7 +6567,7 @@
msgstr ""
#. the check for verbose is needed for calls from StorageProposal (see bnc#871779)
-#: src/modules/Storage.rb:5363
+#: src/modules/Storage.rb:5392
msgid ""
"\n"
"Partition %1 cannot be removed since other partitions on the\n"
@@ -6543,20 +6575,20 @@
msgstr ""
#. FIXME: please, add description of the list that is returned by this function.
-#: src/modules/Storage.rb:5452
+#: src/modules/Storage.rb:5481
#, fuzzy
#| msgid "Set global root filesystem"
msgid "Nothing assigned as root filesystem!"
msgstr "ग्लोबल रुट फाईलप्रणाली निश्चित करा."
-#: src/modules/Storage.rb:5453
+#: src/modules/Storage.rb:5482
msgid "Installation will most certainly fail fatally!"
msgstr ""
#. Set rather than Add, there might be some packs left over
#. from previous 'MakeProposal' we don't need now
#. This also covers the case when AddPackagesList returns [] or nil
-#: src/modules/Storage.rb:6003
+#: src/modules/Storage.rb:6032
msgid "Adding the following resolvables failed: %1"
msgstr ""
@@ -6579,12 +6611,6 @@
msgid "System error code was: %1"
msgstr ""
-#: src/modules/StorageClients.rb:159
-#, fuzzy
-#| msgid "Continue resizing the %1?"
-msgid "Continue despite the error?"
-msgstr " %1 चा पुनर्आकारित करणे चालू ठेवू?"
-
#. Label: get password for device
#. Please use newline if label is longer than 40 characters
#: src/modules/StorageClients.rb:199
Modified: trunk/yast/mr/po/vpn.mr.po
===================================================================
--- trunk/yast/mr/po/vpn.mr.po 2015-10-01 11:24:50 UTC (rev 92957)
+++ trunk/yast/mr/po/vpn.mr.po 2015-10-01 11:24:51 UTC (rev 92958)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:37+0200\n"
+"POT-Creation-Date: 2015-09-28 18:17+0200\n"
"PO-Revision-Date: 2005-07-29 15:37+0530\n"
"Last-Translator: \"( अमेय पाळंदे ) Ameya Palande\" <2ameya@gmail.com>\n"
"Language-Team: Marathi \n"
@@ -206,36 +206,43 @@
msgid "Client - Certificate"
msgstr "ग्राहक प्रमाणपत्र"
+#. Load parameters from connections of known scenarios
+#: src/lib/vpn/ipsec.rb:239
+msgid ""
+"ipsec.conf and ipsec.secrets have been manipulated outside of this module.\n"
+"Continue using the module will remove your customisation."
+msgstr ""
+
#. Create a new connection, by default it is a site-to-site client. Return true if successful.
-#: src/lib/vpn/ipsec.rb:303
+#: src/lib/vpn/ipsec.rb:310
#, fuzzy
#| msgid "Configuration name '%1' is already in use"
msgid "The connection name is already used."
msgstr "आकृतीबंधाचे ‘%1’ नाव आधीच वापरात आहे"
#. Find an unused gateway scenario
-#: src/lib/vpn/ipsec.rb:320
+#: src/lib/vpn/ipsec.rb:327
msgid ""
"You may only have one gateway connection per scenario.\n"
"All of gateway scenarios are already used."
msgstr ""
#. Warn against duplicated configuration
-#: src/lib/vpn/ipsec.rb:337
+#: src/lib/vpn/ipsec.rb:344
msgid ""
"The scenario is already configured with another gateway.\n"
"You may not have two gateways operating under one scenario."
msgstr ""
#. Create the user (:xauth or :eap). Return true if successful.
-#: src/lib/vpn/ipsec.rb:432
+#: src/lib/vpn/ipsec.rb:439
#, fuzzy
#| msgid "Specified queue name %1 is already used."
msgid "The user name is already used."
msgstr "हे ठराविक रांगेचे नाव %1 आधीच वापरले आहे."
#. Set client certificate/key for a connection to remote gateway. Return true if successful, otherwise false.
-#: src/lib/vpn/ipsec.rb:496
+#: src/lib/vpn/ipsec.rb:503
msgid "Cannot find a matching client connection."
msgstr ""