[opensuse-translation-commit] r92603 - trunk/yast/en_GB/po

Author: keichwa Date: 2015-09-09 10:19:44 +0200 (Wed, 09 Sep 2015) New Revision: 92603 Added: trunk/yast/en_GB/po/docker.en_GB.po trunk/yast/en_GB/po/fonts.en_GB.po trunk/yast/en_GB/po/journal.en_GB.po trunk/yast/en_GB/po/vpn.en_GB.po Modified: trunk/yast/en_GB/po/add-on-creator.en_GB.po trunk/yast/en_GB/po/add-on.en_GB.po trunk/yast/en_GB/po/audit-laf.en_GB.po trunk/yast/en_GB/po/auth-client.en_GB.po trunk/yast/en_GB/po/auth-server.en_GB.po trunk/yast/en_GB/po/autoinst.en_GB.po trunk/yast/en_GB/po/base.en_GB.po trunk/yast/en_GB/po/bootloader.en_GB.po trunk/yast/en_GB/po/ca-management.en_GB.po trunk/yast/en_GB/po/cio.en_GB.po trunk/yast/en_GB/po/cluster.en_GB.po trunk/yast/en_GB/po/control-center.en_GB.po trunk/yast/en_GB/po/control.en_GB.po trunk/yast/en_GB/po/country.en_GB.po trunk/yast/en_GB/po/crowbar.en_GB.po trunk/yast/en_GB/po/dhcp-server.en_GB.po trunk/yast/en_GB/po/dns-server.en_GB.po trunk/yast/en_GB/po/drbd.en_GB.po trunk/yast/en_GB/po/fcoe-client.en_GB.po trunk/yast/en_GB/po/firewall-services.en_GB.po trunk/yast/en_GB/po/firewall.en_GB.po trunk/yast/en_GB/po/firstboot.en_GB.po trunk/yast/en_GB/po/ftp-server.en_GB.po trunk/yast/en_GB/po/geo-cluster.en_GB.po trunk/yast/en_GB/po/gtk.en_GB.po trunk/yast/en_GB/po/http-server.en_GB.po trunk/yast/en_GB/po/inetd.en_GB.po trunk/yast/en_GB/po/installation.en_GB.po trunk/yast/en_GB/po/instserver.en_GB.po trunk/yast/en_GB/po/iplb.en_GB.po trunk/yast/en_GB/po/iscsi-client.en_GB.po trunk/yast/en_GB/po/iscsi-lio-server.en_GB.po trunk/yast/en_GB/po/isns.en_GB.po trunk/yast/en_GB/po/kdump.en_GB.po trunk/yast/en_GB/po/languages_db.en_GB.po trunk/yast/en_GB/po/ldap-client.en_GB.po trunk/yast/en_GB/po/ldap.en_GB.po trunk/yast/en_GB/po/live-installer.en_GB.po trunk/yast/en_GB/po/mail.en_GB.po trunk/yast/en_GB/po/multipath.en_GB.po trunk/yast/en_GB/po/ncurses-pkg.en_GB.po trunk/yast/en_GB/po/ncurses.en_GB.po trunk/yast/en_GB/po/network.en_GB.po trunk/yast/en_GB/po/nfs.en_GB.po trunk/yast/en_GB/po/nfs_server.en_GB.po trunk/yast/en_GB/po/nis.en_GB.po trunk/yast/en_GB/po/nis_server.en_GB.po trunk/yast/en_GB/po/ntp-client.en_GB.po trunk/yast/en_GB/po/oneclickinstall.en_GB.po trunk/yast/en_GB/po/online-update-configuration.en_GB.po trunk/yast/en_GB/po/online-update.en_GB.po trunk/yast/en_GB/po/opensuse_mirror.en_GB.po trunk/yast/en_GB/po/packager.en_GB.po trunk/yast/en_GB/po/pam.en_GB.po trunk/yast/en_GB/po/pkg-bindings.en_GB.po trunk/yast/en_GB/po/printer.en_GB.po trunk/yast/en_GB/po/product-creator.en_GB.po trunk/yast/en_GB/po/proxy.en_GB.po trunk/yast/en_GB/po/qt-pkg.en_GB.po trunk/yast/en_GB/po/qt.en_GB.po trunk/yast/en_GB/po/rdp.en_GB.po trunk/yast/en_GB/po/rear.en_GB.po trunk/yast/en_GB/po/registration.en_GB.po trunk/yast/en_GB/po/reipl.en_GB.po trunk/yast/en_GB/po/relocation-server.en_GB.po trunk/yast/en_GB/po/samba-client.en_GB.po trunk/yast/en_GB/po/samba-server.en_GB.po trunk/yast/en_GB/po/samba-users.en_GB.po trunk/yast/en_GB/po/scanner.en_GB.po trunk/yast/en_GB/po/security.en_GB.po trunk/yast/en_GB/po/services-manager.en_GB.po trunk/yast/en_GB/po/slp-server.en_GB.po trunk/yast/en_GB/po/snapper.en_GB.po trunk/yast/en_GB/po/sound.en_GB.po trunk/yast/en_GB/po/squid.en_GB.po trunk/yast/en_GB/po/sshd.en_GB.po trunk/yast/en_GB/po/storage.en_GB.po trunk/yast/en_GB/po/sudo.en_GB.po trunk/yast/en_GB/po/support.en_GB.po trunk/yast/en_GB/po/sysconfig.en_GB.po trunk/yast/en_GB/po/tftp-server.en_GB.po trunk/yast/en_GB/po/timezone_db.en_GB.po trunk/yast/en_GB/po/tune.en_GB.po trunk/yast/en_GB/po/update.en_GB.po trunk/yast/en_GB/po/users.en_GB.po trunk/yast/en_GB/po/vm.en_GB.po trunk/yast/en_GB/po/wol.en_GB.po trunk/yast/en_GB/po/yast2-apparmor.en_GB.po Log: merged Modified: trunk/yast/en_GB/po/add-on-creator.en_GB.po =================================================================== --- trunk/yast/en_GB/po/add-on-creator.en_GB.po 2015-09-09 08:18:21 UTC (rev 92602) +++ trunk/yast/en_GB/po/add-on-creator.en_GB.po 2015-09-09 08:19:44 UTC (rev 92603) @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: add-on-creator\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-04 15:51+0200\n" +"POT-Creation-Date: 2015-08-25 18:36+0200\n" "PO-Revision-Date: 2008-03-27 19:10+0000\n" "Last-Translator: Benjamin Weber \n" "Language-Team: \n" Modified: trunk/yast/en_GB/po/add-on.en_GB.po =================================================================== --- trunk/yast/en_GB/po/add-on.en_GB.po 2015-09-09 08:18:21 UTC (rev 92602) +++ trunk/yast/en_GB/po/add-on.en_GB.po 2015-09-09 08:19:44 UTC (rev 92603) @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: add-on\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-04 15:51+0200\n" +"POT-Creation-Date: 2015-08-25 18:35+0200\n" "PO-Revision-Date: 2008-03-27 19:11+0000\n" "Last-Translator: Benjamin Weber \n" "Language-Team: \n" @@ -65,21 +65,21 @@ #. this is a heading #. Cleanup UI - Prepare it for progress callbacks #: src/clients/add-on.rb:105 src/clients/add-on_proposal.rb:76 -#: src/include/add-on/add-on-workflow.rb:1877 +#: src/include/add-on/add-on-workflow.rb:1873 msgid "Add-On Products" msgstr "Add-On Products" #. busy message (dialog) #. TRANSLATORS: dialog content - a very simple label #: src/clients/add-on.rb:107 src/clients/inst_language_add-on.rb:155 -#: src/include/add-on/add-on-workflow.rb:1878 +#: src/include/add-on/add-on-workflow.rb:1874 msgid "Initializing..." msgstr "Initialising..." #. help #. TRANSLATORS: help text #: src/clients/add-on.rb:109 src/clients/inst_language_add-on.rb:157 -#: src/include/add-on/add-on-workflow.rb:1879 +#: src/include/add-on/add-on-workflow.rb:1875 msgid "<p>Initializing add-on products...</p>" msgstr "<p>Initialising add-on products...</p>" @@ -105,10 +105,10 @@ #. placeholder for unknown path #. placeholder for unknown URL #: src/clients/add-on_proposal.rb:35 src/clients/add-on_proposal.rb:41 -#: src/include/add-on/add-on-workflow.rb:371 -#: src/include/add-on/add-on-workflow.rb:381 -#: src/include/add-on/add-on-workflow.rb:937 -#: src/include/add-on/add-on-workflow.rb:946 +#: src/include/add-on/add-on-workflow.rb:369 +#: src/include/add-on/add-on-workflow.rb:379 +#: src/include/add-on/add-on-workflow.rb:935 +#: src/include/add-on/add-on-workflow.rb:944 msgid "Unknown" msgstr "Unknown" @@ -133,7 +133,7 @@ #. main screen heading #: src/clients/inst_language_add-on.rb:153 #: src/clients/inst_language_add-on.rb:212 -#: src/include/add-on/add-on-workflow.rb:909 +#: src/include/add-on/add-on-workflow.rb:907 msgid "Add-On Product Installation" msgstr "Add-On Product Installation" @@ -248,36 +248,36 @@ #. ], #. ... #. ] -#: src/include/add-on/add-on-workflow.rb:163 -#: src/include/add-on/add-on-workflow.rb:582 -#: src/include/add-on/add-on-workflow.rb:1592 -#: src/include/add-on/add-on-workflow.rb:1604 +#: src/include/add-on/add-on-workflow.rb:161 +#: src/include/add-on/add-on-workflow.rb:580 +#: src/include/add-on/add-on-workflow.rb:1588 +#: src/include/add-on/add-on-workflow.rb:1600 #, fuzzy #| msgid "No product found in the repository" msgid "No product found in the repository." msgstr "No product found in the repository" #. error report -#: src/include/add-on/add-on-workflow.rb:316 +#: src/include/add-on/add-on-workflow.rb:314 msgid "No software repository found on medium." msgstr "No software repository found on medium." #. busy message -#: src/include/add-on/add-on-workflow.rb:335 +#: src/include/add-on/add-on-workflow.rb:333 msgid "Initializing new source..." msgstr "Initialising new source..." -#: src/include/add-on/add-on-workflow.rb:376 +#: src/include/add-on/add-on-workflow.rb:374 msgid "URL: %1, Directory: %2" msgstr "URL: %1, Directory: %2" #. dialog caption -#: src/include/add-on/add-on-workflow.rb:389 +#: src/include/add-on/add-on-workflow.rb:387 msgid "Software Repository Selection" msgstr "Software Repository Selection" #. help text -#: src/include/add-on/add-on-workflow.rb:391 +#: src/include/add-on/add-on-workflow.rb:389 #, fuzzy msgid "" "<p><big><b>Software Repository Selection</b></big><br>\n" @@ -288,7 +288,7 @@ "There were multiple repositories found on the selected medium.\n" "Select the repository to use.</p>\n" -#: src/include/add-on/add-on-workflow.rb:401 +#: src/include/add-on/add-on-workflow.rb:399 msgid "Repositories &Found" msgstr "Repositories &Found" @@ -300,33 +300,33 @@ #. else #. { #. yes-no popup -#: src/include/add-on/add-on-workflow.rb:413 -#: src/include/add-on/add-on-workflow.rb:740 +#: src/include/add-on/add-on-workflow.rb:411 +#: src/include/add-on/add-on-workflow.rb:738 msgid "Really abort add-on product installation?" msgstr "Really abort add-on product installation?" #. popup message -#: src/include/add-on/add-on-workflow.rb:424 +#: src/include/add-on/add-on-workflow.rb:422 msgid "Select a repository." msgstr "Select a repository." #. message popup -#: src/include/add-on/add-on-workflow.rb:629 +#: src/include/add-on/add-on-workflow.rb:627 msgid "Dependencies of the add-on product cannot be fulfilled." msgstr "Dependencies of the add-on product cannot be fulfilled." #. dialog caption -#: src/include/add-on/add-on-workflow.rb:710 +#: src/include/add-on/add-on-workflow.rb:708 msgid "Product Selection" msgstr "Product Selection" #. multi selection list -#: src/include/add-on/add-on-workflow.rb:716 +#: src/include/add-on/add-on-workflow.rb:714 msgid "Available Products" msgstr "Available Products" #. help text -#: src/include/add-on/add-on-workflow.rb:722 +#: src/include/add-on/add-on-workflow.rb:720 #, fuzzy msgid "" "<p><b><big>Product Selection</big></b><br/>\n" @@ -338,12 +338,12 @@ "to install.</p>\n" #. message popup -#: src/include/add-on/add-on-workflow.rb:790 +#: src/include/add-on/add-on-workflow.rb:788 msgid "Dependencies of the selected add-on products cannot be fulfilled." msgstr "Dependencies of the selected add-on products cannot be fulfilled." #. Help for add-on products -#: src/include/add-on/add-on-workflow.rb:912 +#: src/include/add-on/add-on-workflow.rb:910 #, fuzzy #| msgid "" #| "<p><big><b>Add-On Product Installation</b></big></br>\n" @@ -362,97 +362,97 @@ "select it and click <b>Delete</b>.</p>" #. table cell, %1 is URL, %2 is directory name -#: src/include/add-on/add-on-workflow.rb:941 +#: src/include/add-on/add-on-workflow.rb:939 msgid "%1, Directory: %2" msgstr "%1, Directory: %2" #. table header -#: src/include/add-on/add-on-workflow.rb:967 +#: src/include/add-on/add-on-workflow.rb:965 msgid "Product" msgstr "Product" #. table header -#: src/include/add-on/add-on-workflow.rb:969 +#: src/include/add-on/add-on-workflow.rb:967 msgid "Media" msgstr "Media" #. message report -#: src/include/add-on/add-on-workflow.rb:1124 +#: src/include/add-on/add-on-workflow.rb:1120 msgid "Select a product to delete." msgstr "Select a product to delete." #. TRANSLATORS: busy message -#: src/include/add-on/add-on-workflow.rb:1132 +#: src/include/add-on/add-on-workflow.rb:1128 msgid "Removing selected add-on..." msgstr "Removing selected add-on..." #. TRANSLATORS: dialog caption -#: src/include/add-on/add-on-workflow.rb:1259 +#: src/include/add-on/add-on-workflow.rb:1255 #, fuzzy msgid "Installed Add-on Products" msgstr "Add-On Products" #. TRANSLATORS: table header item -#: src/include/add-on/add-on-workflow.rb:1266 +#: src/include/add-on/add-on-workflow.rb:1262 #, fuzzy msgid "Add-on Product" msgstr "Add-On Products" #. TRANSLATORS: table header item -#: src/include/add-on/add-on-workflow.rb:1268 +#: src/include/add-on/add-on-workflow.rb:1264 msgid "URL" msgstr "URL" #. TRANSLATORS: push button -#: src/include/add-on/add-on-workflow.rb:1282 +#: src/include/add-on/add-on-workflow.rb:1278 #, fuzzy msgid "Run &Software Manager..." msgstr "Pac&kage Manager" #. TRANSLATORS: dialog help adp/1 -#: src/include/add-on/add-on-workflow.rb:1286 +#: src/include/add-on/add-on-workflow.rb:1282 #, fuzzy msgid "<p>All add-on products installed on your system are displayed.</p>" msgstr "<p>Here, see the list of TV stations defined for your system.</p>" #. TRANSLATORS: dialog help adp/2 -#: src/include/add-on/add-on-workflow.rb:1288 +#: src/include/add-on/add-on-workflow.rb:1284 #, fuzzy msgid "<p>Click <b>Add</b> to add a new add-on product, or <b>Delete</b> to remove an add-on which is in use.</p>" msgstr "<p>Use <b>New</b> to create a new pattern or <b>Import</b> to import an existing one.</p>" #. no items -#: src/include/add-on/add-on-workflow.rb:1341 +#: src/include/add-on/add-on-workflow.rb:1337 #, fuzzy msgid "<b>Vendor:</b> %1<br>" msgstr "<b>Summary:</b> %1<br>" -#: src/include/add-on/add-on-workflow.rb:1342 +#: src/include/add-on/add-on-workflow.rb:1338 #, fuzzy msgid "Unknown vendor" msgstr "unknown vendor" -#: src/include/add-on/add-on-workflow.rb:1345 +#: src/include/add-on/add-on-workflow.rb:1341 #, fuzzy msgid "<b>Version:</b> %1<br>" msgstr "<b>Version: </b>" -#: src/include/add-on/add-on-workflow.rb:1346 +#: src/include/add-on/add-on-workflow.rb:1342 #, fuzzy msgid "Unknown version" msgstr "Unknown error" -#: src/include/add-on/add-on-workflow.rb:1349 +#: src/include/add-on/add-on-workflow.rb:1345 #, fuzzy msgid "<b>Repository URL:</b> %1<br>" msgstr "<b>Summary:</b> %1<br>" -#: src/include/add-on/add-on-workflow.rb:1355 +#: src/include/add-on/add-on-workflow.rb:1351 #, fuzzy msgid "Unknown repository URL" msgstr "&Repository URL" -#: src/include/add-on/add-on-workflow.rb:1362 +#: src/include/add-on/add-on-workflow.rb:1358 #, fuzzy msgid "<b>Repository Alias:</b> %1<br>" msgstr "<b>Summary:</b> %1<br>" @@ -460,17 +460,17 @@ #. Removes the currently selected Add-On #. #. @return [Boolean] whether something has changed its state -#: src/include/add-on/add-on-workflow.rb:1642 -#: src/include/add-on/add-on-workflow.rb:1695 +#: src/include/add-on/add-on-workflow.rb:1638 +#: src/include/add-on/add-on-workflow.rb:1691 msgid "Unknown product" msgstr "Unknown product" -#: src/include/add-on/add-on-workflow.rb:1645 +#: src/include/add-on/add-on-workflow.rb:1641 #, fuzzy msgid "Unknown URL" msgstr "Unknown" -#: src/include/add-on/add-on-workflow.rb:1701 +#: src/include/add-on/add-on-workflow.rb:1697 msgid "" "Deleting the add-on product %1 may result in removing all the packages\n" "installed from this add-on.\n" @@ -479,7 +479,7 @@ msgstr "" #. TRANSLATORS: busy popup message -#: src/include/add-on/add-on-workflow.rb:1718 +#: src/include/add-on/add-on-workflow.rb:1714 #, fuzzy msgid "Removing product dependencies..." msgstr "Updating kernel module dependencies..." Modified: trunk/yast/en_GB/po/audit-laf.en_GB.po =================================================================== --- trunk/yast/en_GB/po/audit-laf.en_GB.po 2015-09-09 08:18:21 UTC (rev 92602) +++ trunk/yast/en_GB/po/audit-laf.en_GB.po 2015-09-09 08:19:44 UTC (rev 92603) @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-10-29 16:20+0100\n" +"POT-Creation-Date: 2015-08-25 18:36+0200\n" "PO-Revision-Date: 2001-07-17 16:27+0200\n" "Last-Translator: James Ogley \n" "Language-Team: English \n" Modified: trunk/yast/en_GB/po/auth-client.en_GB.po =================================================================== --- trunk/yast/en_GB/po/auth-client.en_GB.po 2015-09-09 08:18:21 UTC (rev 92602) +++ trunk/yast/en_GB/po/auth-client.en_GB.po 2015-09-09 08:19:44 UTC (rev 92603) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: opensuse-i 18n\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-10-29 16:20+0100\n" +"POT-Creation-Date: 2015-08-25 18:36+0200\n" "PO-Revision-Date: 2014-05-19 09:34+0200\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" @@ -18,147 +18,120 @@ "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. translators: command line help text for authentication client module -#: src/clients/auth-client.rb:49 +#: src/clients/auth-client.rb:46 msgid "Authentication client configuration module" msgstr "Authentication client configuration module" #. translators: command line help text for summary action -#: src/clients/auth-client.rb:59 +#: src/clients/auth-client.rb:56 msgid "Configuration summary of the authentication client" msgstr "Configuration summary of the authentication client" #. translators: command line help text for summary action -#: src/clients/auth-client.rb:64 +#: src/clients/auth-client.rb:61 msgid "Create autoyast rnc from @parameters" msgstr "Create autoyast rnc from @parameters" -#. the auth configuration -#: src/include/dialogs.rb:33 -msgid "Do you really want to delete the domain '%1'?" -msgstr "Do you really want to delete the domain '%1'?" +#. Create parameter editor controls (label, input, help text) and return them. +#: src/lib/yauthclient/initial_customisation_dialog.rb:70 +#, fuzzy +#| msgid "None" +msgid "None." +msgstr "None" -#: src/include/dialogs.rb:49 -msgid "There is no help for this parameter." -msgstr "There is no help for this parameter." +#. Render controls for editing parameter values, according to parameter data type. +#: src/lib/yauthclient/initial_customisation_dialog.rb:105 +#, fuzzy +#| msgid "Modem Parameters" +msgid "Mandatory Parameters" +msgstr "Modem Parameters" -#: src/include/dialogs.rb:55 -msgid "Default value: " -msgstr "Default value: " +#: src/lib/yauthclient/initial_customisation_dialog.rb:112 +#, fuzzy +#| msgid "Optional Parameter File" +msgid "Optional Parameters" +msgstr "Optional Parameter File" -#: src/include/dialogs.rb:59 -msgid "Available values: " -msgstr "Available values: " +#. Check that all mandatory parameters are set +#: src/lib/yauthclient/initial_customisation_dialog.rb:138 +msgid "Please complete all of the following mandatory parameters:\n" +msgstr "" -#. No we open the dialog -#: src/include/dialogs.rb:146 -msgid "Set Parameter Value in Section '%1'" -msgstr "Set Parameter Value in Section '%1'" +#. Render overview and edit buttons on left side, config editor on right side. +#: src/lib/yauthclient/main_dialog.rb:55 +#, fuzzy +#| msgid "Authentication Key" +msgid "Authentication Client Config" +msgstr "Authentication Key" -#: src/include/dialogs.rb:148 src/include/dialogs.rb:220 -#: src/include/dialogs.rb:310 src/include/dialogs.rb:371 -msgid "Cancel" -msgstr "Cancel" +#. Overview of all config sections +#: src/lib/yauthclient/main_dialog.rb:62 +msgid "Global Configuration" +msgstr "Global Configuration" -#: src/include/dialogs.rb:149 src/include/dialogs.rb:222 -#: src/include/dialogs.rb:313 src/include/dialogs.rb:373 -msgid "OK" -msgstr "OK" +#: src/lib/yauthclient/main_dialog.rb:65 +msgid "Create Home Directory on Login" +msgstr "Create Home Directory on Login" -#. Waiting for response -#. Waiting for response -#: src/include/dialogs.rb:168 src/include/dialogs.rb:338 -msgid "Value for parameter '%1' is invalid." -msgstr "Value for parameter '%1' is invalid." +#: src/lib/yauthclient/main_dialog.rb:68 +#, fuzzy +#| msgid "Enable the NTP daemon" +msgid "Enable SSSD daemon" +msgstr "Enable the NTP daemon" -#: src/include/dialogs.rb:200 -msgid "Section '%1' has no attributes." -msgstr "Section '%1' has no attributes." +#: src/lib/yauthclient/main_dialog.rb:73 +#, fuzzy +#| msgid "Selections" +msgid "Sections" +msgstr "Selections" -#. No we open the dialog -#: src/include/dialogs.rb:212 -msgid "Select new Parameter for section '%1'" -msgstr "Select new Parameter for section '%1'" +#: src/lib/yauthclient/main_dialog.rb:76 +#, fuzzy +#| msgid "Network Services" +msgid "New Service/Domain" +msgstr "Network Services" -#: src/include/dialogs.rb:215 -msgid "New Parameter" -msgstr "New Parameter" +#: src/lib/yauthclient/main_dialog.rb:77 +#, fuzzy +#| msgid "Selected Service" +msgid "Delete Service/Domain" +msgstr "Selected Service" -#: src/include/dialogs.rb:221 src/include/dialogs.rb:311 -#: src/include/dialogs.rb:372 -msgid "Help" -msgstr "Help" +#. For the currently selection config section, render customised parameters and values in a table. +#: src/lib/yauthclient/main_dialog.rb:112 +msgid "Customisation - %s" +msgstr "" -#. No we open the dialog -#: src/include/dialogs.rb:306 -msgid "Edit sssd section '%1'" -msgstr "Edit sssd section '%1'" +#: src/lib/yauthclient/main_dialog.rb:116 +#: src/lib/yauthclient/main_dialog.rb:141 +msgid "Name" +msgstr "Name" -#: src/include/dialogs.rb:312 -msgid "New" -msgstr "New" +#: src/lib/yauthclient/main_dialog.rb:116 +msgid "Value" +msgstr "Value" -#: src/include/dialogs.rb:356 -msgid "Add New Domain" -msgstr "Add New Domain" +#: src/lib/yauthclient/main_dialog.rb:116 +#: src/lib/yauthclient/main_dialog.rb:141 +msgid "Description" +msgstr "Description" -#: src/include/dialogs.rb:358 -msgid "Name:" -msgstr "Name:" +#. For the currently selected config section, render list of additional parameters for customisation. +#: src/lib/yauthclient/main_dialog.rb:135 +#, fuzzy +#| msgid "Modem Parameters" +msgid "More Parameters" +msgstr "Modem Parameters" -#: src/include/dialogs.rb:359 -msgid "Activate Domain" -msgstr "Activate Domain" +#: src/lib/yauthclient/main_dialog.rb:138 +#, fuzzy +#| msgid "Filter:" +msgid "Name filter:" +msgstr "Filter:" -#: src/include/dialogs.rb:361 -msgid "The identification provider used for the domain" -msgstr "The identification provider used for the domain" - -#: src/include/dialogs.rb:365 -msgid "The authentication provider used for the domain" -msgstr "The authentication provider used for the domain" - -#. TODO -#: src/include/dialogs.rb:387 -msgid "Help for creating new domain" -msgstr "Help for creating new domain" - -#: src/include/dialogs.rb:391 -msgid "You have to provide a domain name!" -msgstr "You have to provide a domain name!" - -#. The default ldap schema rfc2307 is deprecated use rfc2307bis -#: src/include/dialogs.rb:421 -msgid "Basic Settings:" -msgstr "Basic Settings:" - -#: src/include/dialogs.rb:423 -msgid "Services:" -msgstr "Services:" - -#. Count of active domains -#: src/include/dialogs.rb:463 +#. Check system environment for the proper operation of SSSD +#: src/lib/yauthclient/main_dialog.rb:167 msgid "" -"There are no activated domains in the [sssd] section.\n" -"sssd will not be started. Only local authentication will be available.\n" -"Do you want to write this configuration?" -msgstr "" -"There are no activated domains in the [sssd] section.\n" -"sssd will not be started. Only local authentication will be available.\n" -"Do you want to write this configuration?" - -#. TRANSLATORS: %s stands for list of inactive domains -#: src/include/dialogs.rb:471 -msgid "" -"There are some domains you have not activated:\n" -"%s \n" -"Do you want to write this configuration?" -msgstr "" -"There are some domains you have not activated:\n" -"%s \n" -"Do you want to write this configuration?" - -#: src/include/dialogs.rb:486 -msgid "" "Your system is configured for using nss_ldap.\n" "This module is designed to configure your system via sssd.\n" "If you continue, your nss_ldap configuration will be removed.\n" @@ -169,7 +142,7 @@ "If you continue, your nss_ldap configuration will be removed.\n" "Do you want to continue?" -#: src/include/dialogs.rb:496 +#: src/lib/yauthclient/main_dialog.rb:177 msgid "" "Your system is configured as OES client.\n" "This module is designed to configure your system via sssd.\n" @@ -181,937 +154,1171 @@ "If you continue, your OES client configuration will be deactivated.\n" "Do you want to continue?" -#. Main dialog contents -#: src/include/dialogs.rb:512 +#. Delete the chosen section (domain or service) +#: src/lib/yauthclient/main_dialog.rb:221 #, fuzzy -#| msgid "Authentication Key" -msgid "Authentication Client" -msgstr "Authentication Key" +#| msgid "You cannot delete the active profile." +msgid "You may not delete section SSSD." +msgstr "You cannot delete the active profile." -#: src/include/dialogs.rb:526 src/include/dialogs.rb:599 -#: src/include/dialogs.rb:605 -msgid "Configured Authentication Domains" -msgstr "Configured Authentication Domains" +#: src/lib/yauthclient/main_dialog.rb:223 +#, fuzzy +#| msgid "Do you really want to delete partition %1?" +msgid "Do you really wish to delete section %s?" +msgstr "Do you really want to delete partition %1?" -#: src/include/dialogs.rb:538 -msgid "Add" -msgstr "Add" +#. Forbid removal of mandatory parameters +#: src/lib/yauthclient/main_dialog.rb:267 +msgid "This is a mandatory parameter and it may not be deleted." +msgstr "" -#: src/include/dialogs.rb:539 -msgid "Edit" -msgstr "Edit" +#. Warn against removal of important parameters +#: src/lib/yauthclient/main_dialog.rb:272 +#, fuzzy +#| msgid "Modem parameter details" +msgid "Confirm parameter removal: " +msgstr "Modem parameter details" -#: src/include/dialogs.rb:540 -msgid "Delete" -msgstr "Delete" +#: src/lib/yauthclient/main_dialog.rb:273 +msgid "" +"The parameter is important. Removal of the parameter may cause SSSD startup failure.\n" +"Please consult SSSD manual page before moving on.\n" +"Do you still wish to continue?" +msgstr "" -#. Inetd configure dialog caption -#: src/include/dialogs.rb:547 -msgid "Authentication Client Configuration (sssd)" -msgstr "Authentication Client Configuration (sssd)" +#. Save settings - validate +#: src/lib/yauthclient/main_dialog.rb:303 +#, fuzzy +#| msgid "Logging enabled" +msgid "No domain enabled" +msgstr "Logging enabled" -#. initialize GUI -#: src/include/dialogs.rb:553 -msgid "SSSD provides a set of daemons to manage access to remote directories and authentication mechanisms.<br>You have to confiugre at least one authentication domain.<br>The first you have to set for a authentication domain is the identification and auth provider used for the domain.<br>In the next step you have to set some mandatory parameter for the selected providers.You can select later all parameters available for the selected identification and auth provider.SSSD provides following id_provider:<br><b>proxy</b>: Support a legacy NSS provider.<br><b>local</b>: SSSD internal provider for local users.<br><b>ldap</b>: LDAP provider. See sssd-ldap(5) for more information on configuring LDAP.<br><b>ipa</b>: FreeIPA and Red Hat Enterprise Identity Management provider.<br><b>ad</b>: Active Directory provider.<br>Supported auth providers are:<br><b>ldap</b> for native LDAP authentication.<br><b>krb5</b> for Kerberos authentication.<br><b>ipa</b> FreeIPA and Red Hat Enterprise Identity Management provider.<br><b>ad</b> Active Directory provider.<br><b>proxy</b> for relaying authentication to some other PAM target.<br><b>none</b> disables authentication explicitly.<br>The default auth provider is the id_provider.<br>" +#: src/lib/yauthclient/main_dialog.rb:304 +#, fuzzy +#| msgid "" +#| "There are no activated domains in the [sssd] section.\n" +#| "sssd will not be started. Only local authentication will be available.\n" +#| "Do you want to write this configuration?" +msgid "" +"No domain has been enabled in [sssd] \"domains\" parameter.\n" +"SSSD will not start, and only local authentication will be available.\n" +"Do you still wish to proceed?" msgstr "" +"There are no activated domains in the [sssd] section.\n" +"sssd will not be started. Only local authentication will be available.\n" +"Do you want to write this configuration?" +#. user must correct the mistake +#: src/lib/yauthclient/main_dialog.rb:321 +msgid "Inactive domain(s) found" +msgstr "" + +#. Render input box and dropdowns for service/domain creation +#: src/lib/yauthclient/new_section_dialog.rb:49 +#, fuzzy +#| msgid "Would you like to enable access to the profile repository?" +msgid "Would you like to enable another service or join a domain?" +msgstr "Would you like to enable access to the profile repository?" + +#. New service +#: src/lib/yauthclient/new_section_dialog.rb:54 +msgid "Service" +msgstr "Service" + +#. New domain and provider types +#: src/lib/yauthclient/new_section_dialog.rb:58 +msgid "Domain" +msgstr "Domain" + +#: src/lib/yauthclient/new_section_dialog.rb:61 +msgid "Domain name (example.com):" +msgstr "" + +#: src/lib/yauthclient/new_section_dialog.rb:64 +#, fuzzy +#| msgid "Identification:" +msgid "Identification provider:" +msgstr "Identification:" + +#: src/lib/yauthclient/new_section_dialog.rb:69 +#, fuzzy +#| msgid "&Authentication Mode" +msgid "Authentication provider:" +msgstr "&Authentication Mode" + +#: src/lib/yauthclient/new_section_dialog.rb:72 +msgid "Activate Domain" +msgstr "Activate Domain" + +#. Create new service +#: src/lib/yauthclient/new_section_dialog.rb:105 +#, fuzzy +#| msgid "These services will be enabled" +msgid "There are no more services to be enabled." +msgstr "These services will be enabled" + +#. Create new domain +#: src/lib/yauthclient/new_section_dialog.rb:123 +#, fuzzy +#| msgid "Enter a name for the new profile." +msgid "Please enter a name for the new domain." +msgstr "Enter a name for the new profile." + +#: src/lib/yauthclient/new_section_dialog.rb:126 +#, fuzzy +#| msgid "This domain is already defined." +msgid "The domain name is already in-use." +msgstr "This domain is already defined." + #. Define Global Parameters -#: src/include/sssd-parameters.rb:17 +#: src/lib/yauthclient/params.rb:108 msgid "Indicates what is the syntax of the config file." msgstr "Indicates what is the syntax of the config file." -#: src/include/sssd-parameters.rb:21 +#: src/lib/yauthclient/params.rb:114 msgid "Comma separated list of services that are started when sssd itself starts." msgstr "Comma separated list of services that are started when sssd itself starts." -#: src/include/sssd-parameters.rb:26 src/include/sssd-parameters.rb:79 +#: src/lib/yauthclient/params.rb:115 +msgid "" +"\n" +"Supported services: nss, pam, sudo, autofs, ssh" +msgstr "" + +#: src/lib/yauthclient/params.rb:120 src/lib/yauthclient/params.rb:174 msgid "Number of times services should attempt to reconnect in the event of a Data Provider crash or restart before they give up" msgstr "Number of times services should attempt to reconnect in the event of a Data Provider crash or restart before they give up" -#: src/include/sssd-parameters.rb:30 +#: src/lib/yauthclient/params.rb:125 msgid "SSSD can use more domains at the same time, but at least one must be configured or SSSD won't start." msgstr "SSSD can use more domains at the same time, but at least one must be configured or SSSD won't start." -#: src/include/sssd-parameters.rb:31 +#: src/lib/yauthclient/params.rb:126 msgid "This parameter contains the list of domains in the order these will be queried." msgstr "This parameter contains the list of domains in the order these will be queried." -#: src/include/sssd-parameters.rb:35 +#: src/lib/yauthclient/params.rb:130 msgid "Default regular expression that describes how to parse the string containing user name and domain into these components" msgstr "Default regular expression that describes how to parse the string containing user name and domain into these components" -#: src/include/sssd-parameters.rb:39 +#: src/lib/yauthclient/params.rb:134 msgid "The default printf(3)-compatible format that describes how to translate a (name, domain) tuple into a fully qualified name." msgstr "The default printf(3)-compatible format that describes how to translate a (name, domain) tuple into a fully qualified name." -#: src/include/sssd-parameters.rb:43 +#: src/lib/yauthclient/params.rb:138 msgid "SSSD monitors the state of resolv.conf to identify when it needs to update its internal DNS resolver." msgstr "SSSD monitors the state of resolv.conf to identify when it needs to update its internal DNS resolver." -#: src/include/sssd-parameters.rb:44 +#: src/lib/yauthclient/params.rb:139 msgid "By default, we will attempt to use inotify for this, and will fall back to polling resolv.conf every five seconds if inotify cannot be used." msgstr "By default, we will attempt to use inotify for this, and will fall back to polling resolv.conf every five seconds if inotify cannot be used." -#: src/include/sssd-parameters.rb:48 +#: src/lib/yauthclient/params.rb:143 msgid "Directory on the filesystem where SSSD should store Kerberos replay cache files." msgstr "Directory on the filesystem where SSSD should store Kerberos replay cache files." -#: src/include/sssd-parameters.rb:52 +#: src/lib/yauthclient/params.rb:147 msgid "This string will be used as a default domain name for all names without a domain name component." msgstr "This string will be used as a default domain name for all names without a domain name component." #. Define Global Services Parameters -#: src/include/sssd-parameters.rb:59 +#: src/lib/yauthclient/params.rb:154 msgid "Bit mask that indicates which debug levels will be visible. 0x0010 is the default value as well as the lowest allowed value, 0xFFF0 is the most verbose mode." msgstr "Bit mask that indicates which debug levels will be visible. 0x0010 is the default value as well as the lowest allowed value, 0xFFF0 is the most verbose mode." -#: src/include/sssd-parameters.rb:64 +#: src/lib/yauthclient/params.rb:159 msgid "Add a timestamp to the debug messages" msgstr "Add a timestamp to the debug messages" -#: src/include/sssd-parameters.rb:69 +#: src/lib/yauthclient/params.rb:164 msgid "Add microseconds to the timestamp in debug messages" msgstr "Add microseconds to the timestamp in debug messages" -#: src/include/sssd-parameters.rb:74 +#: src/lib/yauthclient/params.rb:169 msgid "Timeout in seconds between heartbeats for this service." msgstr "Timeout in seconds between heartbeats for this service." -#: src/include/sssd-parameters.rb:84 +#: src/lib/yauthclient/params.rb:179 msgid "This option specifies the maximum number of file descriptors that may be opened at one time by this SSSD process." msgstr "This option specifies the maximum number of file descriptors that may be opened at one time by this SSSD process." -#: src/include/sssd-parameters.rb:89 +#: src/lib/yauthclient/params.rb:184 msgid "This option specifies the number of seconds that a client of an SSSD process can hold onto a file descriptor without communicating on it." msgstr "This option specifies the number of seconds that a client of an SSSD process can hold onto a file descriptor without communicating on it." -#: src/include/sssd-parameters.rb:94 +#: src/lib/yauthclient/params.rb:189 msgid "If a service is not responding to ping checks (see the “timeout” option), it is first sent the SIGTERM signal that instructs it to quit gracefully." msgstr "If a service is not responding to ping checks (see the “timeout” option), it is first sent the SIGTERM signal that instructs it to quit gracefully." #. NSS configuration options -#: src/include/sssd-parameters.rb:102 +#: src/lib/yauthclient/params.rb:197 msgid "How many seconds should cache nss_sss enumerations (requests for info about all users)?" msgstr "How many seconds should cache nss_sss enumerations (requests for info about all users)?" -#: src/include/sssd-parameters.rb:107 +#: src/lib/yauthclient/params.rb:202 msgid "The entry cache can be set to automatically update entries in the background if they are requested beyond a percentage of the entry_cache_timeout value for the domain." msgstr "The entry cache can be set to automatically update entries in the background if they are requested beyond a percentage of the entry_cache_timeout value for the domain." -#: src/include/sssd-parameters.rb:112 +#: src/lib/yauthclient/params.rb:207 msgid "Specifies for how many seconds nss_sss should cache negative cache hits (that is, queries for invalid database entries, like nonexistent ones) before asking the back end again." msgstr "Specifies for how many seconds nss_sss should cache negative cache hits (that is, queries for invalid database entries, like nonexistent ones) before asking the back end again." -#: src/include/sssd-parameters.rb:117 -msgid "Exclude certain users from being fetched from the sss NSS database." +#: src/lib/yauthclient/params.rb:213 +#, fuzzy +#| msgid "Exclude certain users from being fetched from the sss NSS database." +msgid "Exclude certain users from being fetched by SSS backend" msgstr "Exclude certain users from being fetched from the sss NSS database." -#: src/include/sssd-parameters.rb:122 -msgid "Exclude certain groups from being fetched from the sss NSS database." +#: src/lib/yauthclient/params.rb:219 +#, fuzzy +#| msgid "Exclude certain groups from being fetched from the sss NSS database." +msgid "Exclude certain groups from being fetched by SSS backend" msgstr "Exclude certain groups from being fetched from the sss NSS database." -#: src/include/sssd-parameters.rb:127 +#: src/lib/yauthclient/params.rb:224 msgid "If you want filtered user to still be group members set this option to false." msgstr "If you want filtered user to still be group members set this option to false." -#: src/include/sssd-parameters.rb:131 +#: src/lib/yauthclient/params.rb:228 msgid "Override the user's home directory. You can either provide an absolute value or a template." msgstr "Override the user's home directory. You can either provide an absolute value or a template." -#: src/include/sssd-parameters.rb:135 src/include/sssd-parameters.rb:1101 +#: src/lib/yauthclient/params.rb:232 src/lib/yauthclient/params.rb:1185 msgid "Set a default template for a user's home directory if one is not specified explicitly by the domain's data provider." msgstr "Set a default template for a user's home directory if one is not specified explicitly by the domain's data provider." -#: src/include/sssd-parameters.rb:139 +#: src/lib/yauthclient/params.rb:236 msgid "Override the login shell for all users." msgstr "Override the login shell for all users." -#: src/include/sssd-parameters.rb:143 +#: src/lib/yauthclient/params.rb:240 msgid "Restrict user shell to one of the listed values." msgstr "Restrict user shell to one of the listed values." -#: src/include/sssd-parameters.rb:147 +#: src/lib/yauthclient/params.rb:244 msgid "Replace any instance of these shells with the shell_fallback" msgstr "Replace any instance of these shells with the shell_fallback" -#: src/include/sssd-parameters.rb:152 +#: src/lib/yauthclient/params.rb:249 msgid "The default shell to use if an allowed shell is not installed on the machine." msgstr "The default shell to use if an allowed shell is not installed on the machine." -#: src/include/sssd-parameters.rb:156 src/include/sssd-parameters.rb:1105 +#: src/lib/yauthclient/params.rb:253 src/lib/yauthclient/params.rb:1189 msgid "The default shell to use if the provider does not return one during lookup." msgstr "The default shell to use if the provider does not return one during lookup." -#: src/include/sssd-parameters.rb:161 src/include/sssd-parameters.rb:204 +#: src/lib/yauthclient/params.rb:258 src/lib/yauthclient/params.rb:301 msgid "Specifies time in seconds for which the list of subdomains will be considered valid." msgstr "Specifies time in seconds for which the list of subdomains will be considered valid." -#: src/include/sssd-parameters.rb:166 +#: src/lib/yauthclient/params.rb:263 msgid "Specifies time in seconds for which records in the in-memory cache will be valid." msgstr "Specifies time in seconds for which records in the in-memory cache will be valid." #. PAM configuration options -#: src/include/sssd-parameters.rb:174 +#: src/lib/yauthclient/params.rb:271 msgid "If the authentication provider is offline, how long we should allow cached logins (in days since the last successful online login)." msgstr "If the authentication provider is offline, how long we should allow cached logins (in days since the last successful online login)." -#: src/include/sssd-parameters.rb:179 src/include/sssd-parameters.rb:184 +#: src/lib/yauthclient/params.rb:276 src/lib/yauthclient/params.rb:281 msgid "The time in minutes which has to pass after offline_failed_login_attempts has been reached before a new login attempt is possible." msgstr "The time in minutes which has to pass after offline_failed_login_attempts has been reached before a new login attempt is possible." -#: src/include/sssd-parameters.rb:189 +#: src/lib/yauthclient/params.rb:286 msgid "Controls what kind of messages are shown to the user during authentication." msgstr "Controls what kind of messages are shown to the user during authentication." -#: src/include/sssd-parameters.rb:194 +#: src/lib/yauthclient/params.rb:291 msgid "For any PAM request while SSSD is online, the SSSD will attempt to immediately update the cached identity information for the user in order to ensure that authentication takes place with the latest information." msgstr "For any PAM request while SSSD is online, the SSSD will attempt to immediately update the cached identity information for the user in order to ensure that authentication takes place with the latest information." #. The kerberos domain section -#: src/include/sssd-parameters.rb:199 src/include/sssd-parameters.rb:691 -#: src/include/sssd-parameters.rb:988 +#: src/lib/yauthclient/params.rb:296 src/lib/yauthclient/params.rb:788 +#: src/lib/yauthclient/params.rb:1073 msgid "Display a warning N days before the password expires." msgstr "Display a warning N days before the password expires." #. SUDO configuration options -#: src/include/sssd-parameters.rb:212 +#: src/lib/yauthclient/params.rb:309 msgid "Whether or not to evaluate the sudoNotBefore and sudoNotAfter attributes that implement time-dependent sudoers entries." msgstr "Whether or not to evaluate the sudoNotBefore and sudoNotAfter attributes that implement time-dependent sudoers entries." #. AUTOFS configuration options -#: src/include/sssd-parameters.rb:220 +#: src/lib/yauthclient/params.rb:317 msgid "Specifies for how many seconds the autofs responder should cache negative hits before asking the back end again." msgstr "Specifies for how many seconds the autofs responder should cache negative hits before asking the back end again." #. SSH configuration options -#: src/include/sssd-parameters.rb:228 +#: src/lib/yauthclient/params.rb:325 msgid "Whether or not to hash host names and addresses in the managed known_hosts file." msgstr "Whether or not to hash host names and addresses in the managed known_hosts file." -#: src/include/sssd-parameters.rb:233 +#: src/lib/yauthclient/params.rb:330 msgid "How many seconds to keep a host in the managed known_hosts file after its host keys were requested." msgstr "How many seconds to keep a host in the managed known_hosts file after its host keys were requested." #. DOMAIN SECTIONS #. These configuration options can be present in a domain configuration section, that is, in a section called “[domain/NAME]” -#: src/include/sssd-parameters.rb:242 src/include/sssd-parameters.rb:247 +#: src/lib/yauthclient/params.rb:339 src/lib/yauthclient/params.rb:344 msgid "UID and GID limits for the domain. If a domain contains an entry that is outside these limits, it is ignored." msgstr "UID and GID limits for the domain. If a domain contains an entry that is outside these limits, it is ignored." -#: src/include/sssd-parameters.rb:252 -msgid "Determines if a domain can be enumerated." -msgstr "Determines if a domain can be enumerated." +#: src/lib/yauthclient/params.rb:350 +msgid "Read all entities from backend database (increase server load)" +msgstr "" -#: src/include/sssd-parameters.rb:257 +#: src/lib/yauthclient/params.rb:355 msgid "If the service does not terminate after “force_timeout” seconds, the monitor will forcibly shut it down by sending a SIGKILL signal." msgstr "If the service does not terminate after “force_timeout” seconds, the monitor will forcibly shut it down by sending a SIGKILL signal." -#: src/include/sssd-parameters.rb:262 +#: src/lib/yauthclient/params.rb:360 #, fuzzy #| msgid "How many seconds nss_sss schould consider entries valid before asking the backend again." msgid "How many seconds nss_sss should consider entries valid before asking the backend again." msgstr "How many seconds nss_sss schould consider entries valid before asking the backend again." -#: src/include/sssd-parameters.rb:267 +#: src/lib/yauthclient/params.rb:365 #, fuzzy #| msgid "How many seconds nss_sss schould consider user entries valid before asking the backend again." msgid "How many seconds nss_sss should consider user entries valid before asking the backend again." msgstr "How many seconds nss_sss schould consider user entries valid before asking the backend again." -#: src/include/sssd-parameters.rb:272 +#: src/lib/yauthclient/params.rb:370 #, fuzzy #| msgid "How many seconds nss_sss schould consider group entries valid before asking the backend again." msgid "How many seconds nss_sss should consider group entries valid before asking the backend again." msgstr "How many seconds nss_sss schould consider group entries valid before asking the backend again." -#: src/include/sssd-parameters.rb:277 +#: src/lib/yauthclient/params.rb:375 #, fuzzy #| msgid "How many seconds nss_sss schould consider netgroup entries valid before asking the backend again." msgid "How many seconds nss_sss should consider netgroup entries valid before asking the backend again." msgstr "How many seconds nss_sss schould consider netgroup entries valid before asking the backend again." -#: src/include/sssd-parameters.rb:282 +#: src/lib/yauthclient/params.rb:380 #, fuzzy #| msgid "How many seconds nss_sss schould consider service entries valid before asking the backend again." msgid "How many seconds nss_sss should consider service entries valid before asking the backend again." msgstr "How many seconds nss_sss schould consider service entries valid before asking the backend again." -#: src/include/sssd-parameters.rb:287 +#: src/lib/yauthclient/params.rb:385 msgid "How many seconds sudo should consider rules valid before asking the backend again." msgstr "How many seconds sudo should consider rules valid before asking the backend again." -#: src/include/sssd-parameters.rb:292 +#: src/lib/yauthclient/params.rb:390 msgid "How many seconds the autofs service should consider automounter maps valid before asking the backend again." msgstr "How many seconds the autofs service should consider automounter maps valid before asking the backend again." -#: src/include/sssd-parameters.rb:297 -msgid "Determines if user credentials are also cached in the local LDB cache." -msgstr "Determines if user credentials are also cached in the local LDB cache." +#: src/lib/yauthclient/params.rb:396 +msgid "Cache credentials for offline use" +msgstr "" -#: src/include/sssd-parameters.rb:302 +#: src/lib/yauthclient/params.rb:401 msgid "Number of days entries are left in cache after last successful login before being removed during a cleanup of the cache." msgstr "Number of days entries are left in cache after last successful login before being removed during a cleanup of the cache." -#: src/include/sssd-parameters.rb:307 +#: src/lib/yauthclient/params.rb:408 msgid "The identification provider used for the domain." msgstr "The identification provider used for the domain." -#: src/include/sssd-parameters.rb:312 +#: src/lib/yauthclient/params.rb:413 msgid "Use the full name and domain (as formatted by the domain's full_name_format) as the user's login name reported to NSS." msgstr "Use the full name and domain (as formatted by the domain's full_name_format) as the user's login name reported to NSS." -#: src/include/sssd-parameters.rb:318 -msgid "The authentication provider used for the domain." -msgstr "The authentication provider used for the domain." +#: src/lib/yauthclient/params.rb:420 +msgid "The authentication provider used for the domain" +msgstr "The authentication provider used for the domain" -#: src/include/sssd-parameters.rb:324 +#: src/lib/yauthclient/params.rb:426 msgid "The access control provider used for the domain." msgstr "The access control provider used for the domain." -#: src/include/sssd-parameters.rb:330 +#: src/lib/yauthclient/params.rb:431 msgid "The provider which should handle change password operations for the domain." msgstr "The provider which should handle change password operations for the domain." -#: src/include/sssd-parameters.rb:336 +#: src/lib/yauthclient/params.rb:437 msgid "The SUDO provider used for the domain." msgstr "The SUDO provider used for the domain." -#: src/include/sssd-parameters.rb:342 +#: src/lib/yauthclient/params.rb:443 msgid "The provider which should handle loading of selinux settings." msgstr "The provider which should handle loading of selinux settings." -#: src/include/sssd-parameters.rb:348 +#: src/lib/yauthclient/params.rb:449 msgid "The provider which should handle fetching of subdomains." msgstr "The provider which should handle fetching of subdomains." -#: src/include/sssd-parameters.rb:354 +#: src/lib/yauthclient/params.rb:455 msgid "The autofs provider used for the domain." msgstr "The autofs provider used for the domain." -#: src/include/sssd-parameters.rb:360 +#: src/lib/yauthclient/params.rb:461 msgid "The provider used for retrieving host identity information." msgstr "The provider used for retrieving host identity information." -#: src/include/sssd-parameters.rb:365 +#: src/lib/yauthclient/params.rb:466 msgid "Regular expression for this domain that describes how to parse the string containing user name and domain into these components." msgstr "Regular expression for this domain that describes how to parse the string containing user name and domain into these components." -#: src/include/sssd-parameters.rb:370 +#: src/lib/yauthclient/params.rb:471 msgid "A printf(3)-compatible format that describes how to translate a (name, domain) tuple for this domain into a fully qualified name." msgstr "A printf(3)-compatible format that describes how to translate a (name, domain) tuple for this domain into a fully qualified name." -#: src/include/sssd-parameters.rb:376 +#: src/lib/yauthclient/params.rb:477 msgid "Provides the ability to select preferred address family to use when performing DNS lookups." msgstr "Provides the ability to select preferred address family to use when performing DNS lookups." -#: src/include/sssd-parameters.rb:381 +#: src/lib/yauthclient/params.rb:482 msgid "Defines the amount of time (in seconds) to wait for a reply from the DNS resolver before assuming that it is unreachable." msgstr "Defines the amount of time (in seconds) to wait for a reply from the DNS resolver before assuming that it is unreachable." -#: src/include/sssd-parameters.rb:385 -msgid "Use the domain part of machine's hostname." -msgstr "Use the domain part of machine's hostname." - -#: src/include/sssd-parameters.rb:386 +#: src/lib/yauthclient/params.rb:486 msgid "If service discovery is used in the back end, specifies the domain part of the service discovery DNS query." msgstr "If service discovery is used in the back end, specifies the domain part of the service discovery DNS query." -#: src/include/sssd-parameters.rb:390 +#: src/lib/yauthclient/params.rb:490 msgid "Override the primary GID value with the one specified." msgstr "Override the primary GID value with the one specified." -#: src/include/sssd-parameters.rb:395 +#: src/lib/yauthclient/params.rb:495 msgid "Treat user and group names as case sensitive." msgstr "Treat user and group names as case sensitive." -#: src/include/sssd-parameters.rb:400 +#: src/lib/yauthclient/params.rb:500 msgid "When a user or group is looked up by name in the proxy provider, a second lookup by ID is performed to 'canonicalize' the name in case the requested name was an alias." msgstr "When a user or group is looked up by name in the proxy provider, a second lookup by ID is performed to 'canonicalize' the name in case the requested name was an alias." -#: src/include/sssd-parameters.rb:405 +#: src/lib/yauthclient/params.rb:505 msgid "Use this homedir as default value for all subdomains within this domain." msgstr "Use this homedir as default value for all subdomains within this domain." #. Following options will be provided by SSSD's 'simple' access-control provider -#: src/include/sssd-parameters.rb:411 +#: src/lib/yauthclient/params.rb:511 msgid "Comma separated list of users who are allowed to log in." msgstr "Comma separated list of users who are allowed to log in." -#: src/include/sssd-parameters.rb:416 +#: src/lib/yauthclient/params.rb:516 msgid "Comma separated list of groups who are allowed to log in. This applies only to groups within this SSSD domain." msgstr "Comma separated list of groups who are allowed to log in. This applies only to groups within this SSSD domain." -#: src/include/sssd-parameters.rb:421 -msgid "Comma separated list of users who are explicitly denied access." -msgstr "Comma separated list of users who are explicitly denied access." - -#: src/include/sssd-parameters.rb:426 +#: src/lib/yauthclient/params.rb:521 msgid "Comma separated list of groups that are explicitly denied access. This applies only to groups within this SSSD domain." msgstr "Comma separated list of groups that are explicitly denied access. This applies only to groups within this SSSD domain." -#: src/include/sssd-parameters.rb:432 -msgid "The default base DN to use for performing LDAP sudo rules." -msgstr "The default base DN to use for performing LDAP sudo rules." - #. The local domain section #. This section contains settings for domain that stores users and groups in SSSD native database, that is, a domain that uses id_provider=local. -#: src/include/sssd-parameters.rb:441 +#: src/lib/yauthclient/params.rb:530 msgid "The tools append the login name to base_directory and use that as the home directory." msgstr "The tools append the login name to base_directory and use that as the home directory." -#: src/include/sssd-parameters.rb:446 +#: src/lib/yauthclient/params.rb:535 msgid "Indicate if a home directory should be created by default for new users." msgstr "Indicate if a home directory should be created by default for new users." -#: src/include/sssd-parameters.rb:451 +#: src/lib/yauthclient/params.rb:540 msgid "Indicate if a home directory should be removed by default for deleted users." msgstr "Indicate if a home directory should be removed by default for deleted users." -#: src/include/sssd-parameters.rb:456 +#: src/lib/yauthclient/params.rb:545 msgid "Used by sss_useradd(8) to specify the default permissions on a newly created home directory." msgstr "Used by sss_useradd(8) to specify the default permissions on a newly created home directory." -#: src/include/sssd-parameters.rb:461 +#: src/lib/yauthclient/params.rb:550 msgid "The skeleton directory, which contains files and directories to be copied in the user's home directory, when the home directory is created by sss_useradd(8)" msgstr "The skeleton directory, which contains files and directories to be copied in the user's home directory, when the home directory is created by sss_useradd(8)" -#: src/include/sssd-parameters.rb:466 +#: src/lib/yauthclient/params.rb:555 msgid "The mail spool directory." msgstr "The mail spool directory." -#: src/include/sssd-parameters.rb:470 +#: src/lib/yauthclient/params.rb:559 msgid "The command that is run after a user is removed." msgstr "The command that is run after a user is removed." #. The ldap domain section -#: src/include/sssd-parameters.rb:479 src/include/sssd-parameters.rb:484 +#: src/lib/yauthclient/params.rb:568 +msgid "URIs (ldap://) of LDAP servers (comma separated)" +msgstr "" + +#: src/lib/yauthclient/params.rb:574 +msgid "The default base DN to use for performing LDAP sudo rules." +msgstr "The default base DN to use for performing LDAP sudo rules." + +#: src/lib/yauthclient/params.rb:579 msgid "Specifies the comma-separated list of URIs of the LDAP servers to which SSSD should connect in the order of preference." msgstr "Specifies the comma-separated list of URIs of the LDAP servers to which SSSD should connect in the order of preference." -#: src/include/sssd-parameters.rb:490 src/include/sssd-parameters.rb:496 +#: src/lib/yauthclient/params.rb:585 src/lib/yauthclient/params.rb:591 msgid "Specifies the comma-separated list of URIs of the LDAP servers to which SSSD should connect in the order of preference to change the password of a user." msgstr "Specifies the comma-separated list of URIs of the LDAP servers to which SSSD should connect in the order of preference to change the password of a user." -#: src/include/sssd-parameters.rb:501 -msgid "The default base DN to use for performing LDAP user operations." -msgstr "The default base DN to use for performing LDAP user operations." +#: src/lib/yauthclient/params.rb:597 +#, fuzzy +#| msgid "Base DN for the database" +msgid "Base DN for LDAP search" +msgstr "Base DN for the database" -#: src/include/sssd-parameters.rb:507 -msgid "Specifies the Schema Type in use on the target LDAP server." -msgstr "Specifies the Schema Type in use on the target LDAP server." +#: src/lib/yauthclient/params.rb:604 +#, fuzzy +#| msgid "LDAP secure port" +msgid "LDAP schema type" +msgstr "LDAP secure port" -#: src/include/sssd-parameters.rb:511 +#: src/lib/yauthclient/params.rb:608 msgid "The default bind DN to use for performing LDAP operations." msgstr "The default bind DN to use for performing LDAP operations." -#: src/include/sssd-parameters.rb:517 +#: src/lib/yauthclient/params.rb:614 msgid "The type of the authentication token of the default bind DN." msgstr "The type of the authentication token of the default bind DN." -#: src/include/sssd-parameters.rb:521 +#: src/lib/yauthclient/params.rb:618 msgid "The authentication token of the default bind DN." msgstr "The authentication token of the default bind DN." -#: src/include/sssd-parameters.rb:526 +#: src/lib/yauthclient/params.rb:623 msgid "The object class of a user entry in LDAP." msgstr "The object class of a user entry in LDAP." -#: src/include/sssd-parameters.rb:531 +#: src/lib/yauthclient/params.rb:628 msgid "The LDAP attribute that corresponds to the user's login name." msgstr "The LDAP attribute that corresponds to the user's login name." -#: src/include/sssd-parameters.rb:536 +#: src/lib/yauthclient/params.rb:633 msgid "The LDAP attribute that corresponds to the user's id." msgstr "The LDAP attribute that corresponds to the user's id." -#: src/include/sssd-parameters.rb:541 +#: src/lib/yauthclient/params.rb:638 msgid "The LDAP attribute that corresponds to the user's primary group id." msgstr "The LDAP attribute that corresponds to the user's primary group id." -#: src/include/sssd-parameters.rb:546 +#: src/lib/yauthclient/params.rb:643 msgid "The LDAP attribute that corresponds to the user's gecos field." msgstr "The LDAP attribute that corresponds to the user's gecos field." -#: src/include/sssd-parameters.rb:551 +#: src/lib/yauthclient/params.rb:648 msgid " The LDAP attribute that contains the name of the user's home directory." msgstr " The LDAP attribute that contains the name of the user's home directory." -#: src/include/sssd-parameters.rb:556 +#: src/lib/yauthclient/params.rb:653 msgid "The LDAP attribute that contains the path to the user's default shell." msgstr "The LDAP attribute that contains the path to the user's default shell." -#: src/include/sssd-parameters.rb:561 +#: src/lib/yauthclient/params.rb:658 msgid "The LDAP attribute that contains the UUID/GUID of an LDAP user object." msgstr "The LDAP attribute that contains the UUID/GUID of an LDAP user object." -#: src/include/sssd-parameters.rb:566 +#: src/lib/yauthclient/params.rb:663 msgid "The LDAP attribute that contains the objectSID of an LDAP user object." msgstr "The LDAP attribute that contains the objectSID of an LDAP user object." -#: src/include/sssd-parameters.rb:571 src/include/sssd-parameters.rb:776 +#: src/lib/yauthclient/params.rb:668 src/lib/yauthclient/params.rb:873 msgid "The LDAP attribute that contains timestamp of the last modification of the parent object." msgstr "The LDAP attribute that contains timestamp of the last modification of the parent object." -#: src/include/sssd-parameters.rb:576 +#: src/lib/yauthclient/params.rb:673 msgid "When using ldap_pwd_policy=shadow, this parameter contains the name of an LDAP attribute corresponding to its shadow(5) counterpart (date of the last password change)." msgstr "When using ldap_pwd_policy=shadow, this parameter contains the name of an LDAP attribute corresponding to its shadow(5) counterpart (date of the last password change)." -#: src/include/sssd-parameters.rb:581 +#: src/lib/yauthclient/params.rb:678 msgid "When using ldap_pwd_policy=shadow, this parameter contains the name of an LDAP attribute corresponding to its shadow(5) counterpart (minimum password age)." msgstr "When using ldap_pwd_policy=shadow, this parameter contains the name of an LDAP attribute corresponding to its shadow(5) counterpart (minimum password age)." -#: src/include/sssd-parameters.rb:586 +#: src/lib/yauthclient/params.rb:683 msgid "When using ldap_pwd_policy=shadow, this parameter contains the name of an LDAP attribute corresponding to its shadow(5) counterpart (maximum password age)." msgstr "When using ldap_pwd_policy=shadow, this parameter contains the name of an LDAP attribute corresponding to its shadow(5) counterpart (maximum password age)." -#: src/include/sssd-parameters.rb:591 +#: src/lib/yauthclient/params.rb:688 msgid "When using ldap_pwd_policy=shadow, this parameter contains the name of an LDAP attribute corresponding to its shadow(5) counterpart (password warning period)." msgstr "When using ldap_pwd_policy=shadow, this parameter contains the name of an LDAP attribute corresponding to its shadow(5) counterpart (password warning period)." -#: src/include/sssd-parameters.rb:596 +#: src/lib/yauthclient/params.rb:693 msgid "When using ldap_pwd_policy=shadow, this parameter contains the name of an LDAP attribute corresponding to its shadow(5) counterpart (password inactivity period)." msgstr "When using ldap_pwd_policy=shadow, this parameter contains the name of an LDAP attribute corresponding to its shadow(5) counterpart (password inactivity period)." -#: src/include/sssd-parameters.rb:601 +#: src/lib/yauthclient/params.rb:698 msgid "When using ldap_pwd_policy=shadow or ldap_account_expire_policy=shadow, this parameter contains the name of an LDAP attribute corresponding to its shadow(5) counterpart (account expiration date)." msgstr "When using ldap_pwd_policy=shadow or ldap_account_expire_policy=shadow, this parameter contains the name of an LDAP attribute corresponding to its shadow(5) counterpart (account expiration date)." -#: src/include/sssd-parameters.rb:606 +#: src/lib/yauthclient/params.rb:703 msgid "When using ldap_pwd_policy=mit_kerberos, this parameter contains the name of an LDAP attribute storing the date and time of last password change in kerberos." msgstr "When using ldap_pwd_policy=mit_kerberos, this parameter contains the name of an LDAP attribute storing the date and time of last password change in kerberos." -#: src/include/sssd-parameters.rb:611 +#: src/lib/yauthclient/params.rb:708 msgid "When using ldap_pwd_policy=mit_kerberos, this parameter contains the name of an LDAP attribute storing the date and time when current password expires." msgstr "When using ldap_pwd_policy=mit_kerberos, this parameter contains the name of an LDAP attribute storing the date and time when current password expires." -#: src/include/sssd-parameters.rb:616 +#: src/lib/yauthclient/params.rb:713 msgid "When using ldap_account_expire_policy=ad, this parameter contains the name of an LDAP attribute storing the expiration time of the account." msgstr "When using ldap_account_expire_policy=ad, this parameter contains the name of an LDAP attribute storing the expiration time of the account." -#: src/include/sssd-parameters.rb:621 +#: src/lib/yauthclient/params.rb:718 msgid "When using ldap_account_expire_policy=ad, this parameter contains the name of an LDAP attribute storing the user account control bit field." msgstr "When using ldap_account_expire_policy=ad, this parameter contains the name of an LDAP attribute storing the user account control bit field." -#: src/include/sssd-parameters.rb:626 +#: src/lib/yauthclient/params.rb:723 msgid "When using ldap_account_expire_policy=rhds or equivalent, this parameter determines if access is allowed or not." msgstr "When using ldap_account_expire_policy=rhds or equivalent, this parameter determines if access is allowed or not." -#: src/include/sssd-parameters.rb:631 +#: src/lib/yauthclient/params.rb:728 msgid "When using ldap_account_expire_policy=nds, this attribute determines if access is allowed or not." msgstr "When using ldap_account_expire_policy=nds, this attribute determines if access is allowed or not." -#: src/include/sssd-parameters.rb:636 +#: src/lib/yauthclient/params.rb:733 msgid "When using ldap_account_expire_policy=nds, this attribute determines until which date access is granted." msgstr "When using ldap_account_expire_policy=nds, this attribute determines until which date access is granted." -#: src/include/sssd-parameters.rb:641 +#: src/lib/yauthclient/params.rb:738 msgid "When using ldap_account_expire_policy=nds, this attribute determines the hours of a day in a week when access is granted." msgstr "When using ldap_account_expire_policy=nds, this attribute determines the hours of a day in a week when access is granted." -#: src/include/sssd-parameters.rb:646 +#: src/lib/yauthclient/params.rb:743 msgid "The LDAP attribute that contains the user's Kerberos User Principal Name (UPN)." msgstr "The LDAP attribute that contains the user's Kerberos User Principal Name (UPN)." -#: src/include/sssd-parameters.rb:650 +#: src/lib/yauthclient/params.rb:747 msgid "The LDAP attribute that contains the user's SSH public keys." msgstr "The LDAP attribute that contains the user's SSH public keys." -#: src/include/sssd-parameters.rb:655 +#: src/lib/yauthclient/params.rb:752 msgid "Some directory servers, for example Active Directory, might deliver the realm part of the UPN in lower case, which might cause the authentication to fail." msgstr "Some directory servers, for example Active Directory, might deliver the realm part of the UPN in lower case, which might cause the authentication to fail." -#: src/include/sssd-parameters.rb:656 +#: src/lib/yauthclient/params.rb:753 msgid "Set this option to true if you want to use an upper-case realm." msgstr "Set this option to true if you want to use an upper-case realm." -#: src/include/sssd-parameters.rb:661 +#: src/lib/yauthclient/params.rb:758 msgid "Specifies how many seconds SSSD has to wait before refreshing its cache of enumerated records." msgstr "Specifies how many seconds SSSD has to wait before refreshing its cache of enumerated records." -#: src/include/sssd-parameters.rb:666 +#: src/lib/yauthclient/params.rb:763 msgid "Determine how often to check the cache for inactive entries (such as groups with no members and users who have never logged in) and remove them to save space." msgstr "Determine how often to check the cache for inactive entries (such as groups with no members and users who have never logged in) and remove them to save space." -#: src/include/sssd-parameters.rb:671 +#: src/lib/yauthclient/params.rb:768 msgid "The LDAP attribute that corresponds to the user's full name." msgstr "The LDAP attribute that corresponds to the user's full name." -#: src/include/sssd-parameters.rb:676 +#: src/lib/yauthclient/params.rb:773 msgid "The LDAP attribute that lists the user's group memberships." msgstr "The LDAP attribute that lists the user's group memberships." -#: src/include/sssd-parameters.rb:681 +#: src/lib/yauthclient/params.rb:778 msgid "If access_provider=ldap and ldap_access_order=authorized_service, SSSD will use the presence of the authorizedService attribute in the user's LDAP entry to determine access privilege." msgstr "If access_provider=ldap and ldap_access_order=authorized_service, SSSD will use the presence of the authorizedService attribute in the user's LDAP entry to determine access privilege." -#: src/include/sssd-parameters.rb:686 +#: src/lib/yauthclient/params.rb:783 msgid "If access_provider=ldap and ldap_access_order=host, SSSD will use the presence of the host attribute in the user's LDAP entry to determine access privilege." msgstr "If access_provider=ldap and ldap_access_order=host, SSSD will use the presence of the host attribute in the user's LDAP entry to determine access privilege." -#: src/include/sssd-parameters.rb:696 +#: src/lib/yauthclient/params.rb:793 msgid "The object class of a group entry in LDAP." msgstr "The object class of a group entry in LDAP." -#: src/include/sssd-parameters.rb:701 +#: src/lib/yauthclient/params.rb:798 msgid "The LDAP attribute that corresponds to the group name." msgstr "The LDAP attribute that corresponds to the group name." -#: src/include/sssd-parameters.rb:706 +#: src/lib/yauthclient/params.rb:803 msgid "The LDAP attribute that corresponds to the group's id." msgstr "The LDAP attribute that corresponds to the group's id." -#: src/include/sssd-parameters.rb:711 +#: src/lib/yauthclient/params.rb:808 msgid "The LDAP attribute that contains the names of the group's members." msgstr "The LDAP attribute that contains the names of the group's members." -#: src/include/sssd-parameters.rb:716 +#: src/lib/yauthclient/params.rb:813 msgid "The LDAP attribute that contains the UUID/GUID of an LDAP group object." msgstr "The LDAP attribute that contains the UUID/GUID of an LDAP group object." -#: src/include/sssd-parameters.rb:721 +#: src/lib/yauthclient/params.rb:818 msgid "The LDAP attribute that contains the objectSID of an LDAP group object." msgstr "The LDAP attribute that contains the objectSID of an LDAP group object." -#: src/include/sssd-parameters.rb:726 +#: src/lib/yauthclient/params.rb:823 msgid " The LDAP attribute that contains timestamp of the last modification of the parent object." msgstr " The LDAP attribute that contains timestamp of the last modification of the parent object." -#: src/include/sssd-parameters.rb:732 +#: src/lib/yauthclient/params.rb:829 msgid "If ldap_schema is set to a schema format that supports nested groups (e.g. RFC2307bis), then this option controls how many levels of nesting SSSD will follow." msgstr "If ldap_schema is set to a schema format that supports nested groups (e.g. RFC2307bis), then this option controls how many levels of nesting SSSD will follow." -#: src/include/sssd-parameters.rb:738 +#: src/lib/yauthclient/params.rb:835 msgid "This option tells SSSD to take advantage of an Active Directory-specific feature which may speed up group lookup operations on deployments with complex or deep nested groups." msgstr "This option tells SSSD to take advantage of an Active Directory-specific feature which may speed up group lookup operations on deployments with complex or deep nested groups." -#: src/include/sssd-parameters.rb:744 +#: src/lib/yauthclient/params.rb:841 msgid "This option tells SSSD to take advantage of an Active Directory-specific feature which might speed up initgroups operations (most notably when dealing with complex or deep nested groups)." msgstr "This option tells SSSD to take advantage of an Active Directory-specific feature which might speed up initgroups operations (most notably when dealing with complex or deep nested groups)." -#: src/include/sssd-parameters.rb:750 +#: src/lib/yauthclient/params.rb:847 msgid " The object class of a netgroup entry in LDAP." msgstr " The object class of a netgroup entry in LDAP." -#: src/include/sssd-parameters.rb:756 +#: src/lib/yauthclient/params.rb:853 msgid "The LDAP attribute that corresponds to the netgroup name." msgstr "The LDAP attribute that corresponds to the netgroup name." -#: src/include/sssd-parameters.rb:761 +#: src/lib/yauthclient/params.rb:858 msgid "The LDAP attribute that contains the names of the netgroup's members." msgstr "The LDAP attribute that contains the names of the netgroup's members." -#: src/include/sssd-parameters.rb:766 +#: src/lib/yauthclient/params.rb:863 msgid "The LDAP attribute that contains the (host, user, domain) netgroup triples." msgstr "The LDAP attribute that contains the (host, user, domain) netgroup triples." -#: src/include/sssd-parameters.rb:771 +#: src/lib/yauthclient/params.rb:868 msgid "The LDAP attribute that contains the UUID/GUID of an LDAP netgroup object." msgstr "The LDAP attribute that contains the UUID/GUID of an LDAP netgroup object." -#: src/include/sssd-parameters.rb:781 +#: src/lib/yauthclient/params.rb:878 msgid "The object class of a service entry in LDAP." msgstr "The object class of a service entry in LDAP." -#: src/include/sssd-parameters.rb:786 +#: src/lib/yauthclient/params.rb:883 msgid "The LDAP attribute that contains the name of service attributes and their aliases." msgstr "The LDAP attribute that contains the name of service attributes and their aliases." -#: src/include/sssd-parameters.rb:791 +#: src/lib/yauthclient/params.rb:888 msgid "The LDAP attribute that contains the port managed by this service." msgstr "The LDAP attribute that contains the port managed by this service." -#: src/include/sssd-parameters.rb:796 +#: src/lib/yauthclient/params.rb:893 msgid "The LDAP attribute that contains the protocols understood by this service." msgstr "The LDAP attribute that contains the protocols understood by this service." -#: src/include/sssd-parameters.rb:802 +#: src/lib/yauthclient/params.rb:899 msgid "An optional base DN, search scope and LDAP filter to restrict LDAP searches for this attribute type." msgstr "An optional base DN, search scope and LDAP filter to restrict LDAP searches for this attribute type." -#: src/include/sssd-parameters.rb:807 +#: src/lib/yauthclient/params.rb:904 msgid " Specifies the timeout (in seconds) that ldap searches are allowed to run before they are cancelled and cached results are returned (and offline mode is entered)." msgstr " Specifies the timeout (in seconds) that ldap searches are allowed to run before they are cancelled and cached results are returned (and offline mode is entered)." -#: src/include/sssd-parameters.rb:812 +#: src/lib/yauthclient/params.rb:909 msgid "Specifies the timeout (in seconds) that ldap searches for user and group enumerations are allowed to run before they are cancelled and cached results are returned (and offline mode is entered)." msgstr "Specifies the timeout (in seconds) that ldap searches for user and group enumerations are allowed to run before they are cancelled and cached results are returned (and offline mode is entered)." -#: src/include/sssd-parameters.rb:817 +#: src/lib/yauthclient/params.rb:914 msgid "Specifies the timeout (in seconds) after which the poll(2)/select(2) following a connect(2) returns in case of no activity." msgstr "Specifies the timeout (in seconds) after which the poll(2)/select(2) following a connect(2) returns in case of no activity." -#: src/include/sssd-parameters.rb:822 +#: src/lib/yauthclient/params.rb:919 msgid "Specifies a timeout (in seconds) after which calls to synchronous LDAP APIs will abort if no response is received." msgstr "Specifies a timeout (in seconds) after which calls to synchronous LDAP APIs will abort if no response is received." -#: src/include/sssd-parameters.rb:827 +#: src/lib/yauthclient/params.rb:924 msgid "Specifies a timeout (in seconds) that a connection to an LDAP server will be maintained." msgstr "Specifies a timeout (in seconds) that a connection to an LDAP server will be maintained." -#: src/include/sssd-parameters.rb:832 +#: src/lib/yauthclient/params.rb:929 msgid "Specify the number of records to retrieve from LDAP in a single request. Some LDAP servers enforce a maximum limit per-request." msgstr "Specify the number of records to retrieve from LDAP in a single request. Some LDAP servers enforce a maximum limit per-request." -#: src/include/sssd-parameters.rb:837 +#: src/lib/yauthclient/params.rb:934 msgid "Disable the LDAP paging control." msgstr "Disable the LDAP paging control." -#: src/include/sssd-parameters.rb:842 +#: src/lib/yauthclient/params.rb:938 msgid "When communicating with an LDAP server using SASL, specify the minimum security level necessary to establish the connection." msgstr "When communicating with an LDAP server using SASL, specify the minimum security level necessary to establish the connection." -#: src/include/sssd-parameters.rb:847 +#: src/lib/yauthclient/params.rb:943 msgid "Specify the number of group members that must be missing from the internal cache in order to trigger a dereference lookup." msgstr "Specify the number of group members that must be missing from the internal cache in order to trigger a dereference lookup." -#: src/include/sssd-parameters.rb:853 -msgid "Specifies what checks to perform on server certificates in a TLS session, if any." -msgstr "Specifies what checks to perform on server certificates in a TLS session, if any." +#: src/lib/yauthclient/params.rb:950 +msgid "Validate server certification in LDAP TLS session" +msgstr "" -#: src/include/sssd-parameters.rb:858 +#: src/lib/yauthclient/params.rb:954 msgid "Specifies the file that contains certificates for all of the Certificate Authorities that sssd will recognize." msgstr "Specifies the file that contains certificates for all of the Certificate Authorities that sssd will recognize." -#: src/include/sssd-parameters.rb:863 +#: src/lib/yauthclient/params.rb:958 msgid "Specifies the path of a directory that contains Certificate Authority certificates in separate individual files." msgstr "Specifies the path of a directory that contains Certificate Authority certificates in separate individual files." -#: src/include/sssd-parameters.rb:867 +#: src/lib/yauthclient/params.rb:962 msgid "Specifies the file that contains the certificate for the client's key." msgstr "Specifies the file that contains the certificate for the client's key." -#: src/include/sssd-parameters.rb:871 +#: src/lib/yauthclient/params.rb:966 msgid "Specifies the file that contains the client's key." msgstr "Specifies the file that contains the client's key." -#: src/include/sssd-parameters.rb:876 +#: src/lib/yauthclient/params.rb:971 msgid "Specifies acceptable cipher suites." msgstr "Specifies acceptable cipher suites." -#: src/include/sssd-parameters.rb:881 +#: src/lib/yauthclient/params.rb:976 msgid "Specifies that the id_provider connection must also use tls to protect the channel." msgstr "Specifies that the id_provider connection must also use tls to protect the channel." -#: src/include/sssd-parameters.rb:886 +#: src/lib/yauthclient/params.rb:981 msgid "Specifies that SSSD should attempt to map user and group IDs from the ldap_user_objectsid and ldap_group_objectsid attributes instead of relying on ldap_user_uid_number and ldap_group_gid_number." msgstr "Specifies that SSSD should attempt to map user and group IDs from the ldap_user_objectsid and ldap_group_objectsid attributes instead of relying on ldap_user_uid_number and ldap_group_gid_number." -#: src/include/sssd-parameters.rb:890 +#: src/lib/yauthclient/params.rb:985 msgid "Specify the SASL mechanism to use." msgstr "Specify the SASL mechanism to use." -#: src/include/sssd-parameters.rb:895 +#: src/lib/yauthclient/params.rb:990 msgid "Specify the SASL authorization id to use." msgstr "Specify the SASL authorization id to use." -#: src/include/sssd-parameters.rb:900 +#: src/lib/yauthclient/params.rb:995 msgid "Specify the SASL realm to use." msgstr "Specify the SASL realm to use." -#: src/include/sssd-parameters.rb:905 +#: src/lib/yauthclient/params.rb:1000 msgid "If set to true, the LDAP library would perform a reverse lookup to canonicalize the host name during a SASL bind." msgstr "If set to true, the LDAP library would perform a reverse lookup to canonicalize the host name during a SASL bind." -#: src/include/sssd-parameters.rb:910 +#: src/lib/yauthclient/params.rb:1005 msgid "Specify the keytab to use when using SASL/GSSAPI." msgstr "Specify the keytab to use when using SASL/GSSAPI." -#: src/include/sssd-parameters.rb:915 +#: src/lib/yauthclient/params.rb:1010 msgid "Specifies that the id_provider should init Kerberos credentials (TGT)." msgstr "Specifies that the id_provider should init Kerberos credentials (TGT)." -#: src/include/sssd-parameters.rb:920 +#: src/lib/yauthclient/params.rb:1015 msgid "Specifies the lifetime in seconds of the TGT if GSSAPI is used." msgstr "Specifies the lifetime in seconds of the TGT if GSSAPI is used." -#: src/include/sssd-parameters.rb:925 +#: src/lib/yauthclient/params.rb:1020 msgid "Select the policy to evaluate the password expiration on the client side." msgstr "Select the policy to evaluate the password expiration on the client side." -#: src/include/sssd-parameters.rb:930 +#: src/lib/yauthclient/params.rb:1025 msgid "Specifies whether automatic referral chasing should be enabled." msgstr "Specifies whether automatic referral chasing should be enabled." -#: src/include/sssd-parameters.rb:935 +#: src/lib/yauthclient/params.rb:1030 msgid "Specifies the service name to use when service discovery is enabled." msgstr "Specifies the service name to use when service discovery is enabled." -#: src/include/sssd-parameters.rb:939 +#: src/lib/yauthclient/params.rb:1034 msgid "Specifies the service name to use to find an LDAP server which allows password changes when service discovery is enabled." msgstr "Specifies the service name to use to find an LDAP server which allows password changes when service discovery is enabled." -#: src/include/sssd-parameters.rb:944 +#: src/lib/yauthclient/params.rb:1039 msgid "Specifies whether to update the ldap_user_shadow_last_change attribute with days since the Epoch after a password change operation." msgstr "Specifies whether to update the ldap_user_shadow_last_change attribute with days since the Epoch after a password change operation." -#: src/include/sssd-parameters.rb:949 +#: src/lib/yauthclient/params.rb:1044 msgid "If using access_provider = ldap and ldap_access_order = filter (default), this option is mandatory. It specifies an LDAP search filter criterion that must be met for the user to be granted access on this host." msgstr "If using access_provider = ldap and ldap_access_order = filter (default), this option is mandatory. It specifies an LDAP search filter criterion that must be met for the user to be granted access on this host." -#: src/include/sssd-parameters.rb:954 +#: src/lib/yauthclient/params.rb:1049 msgid " With this option a client side evaluation of access control attributes can be enabled." msgstr " With this option a client side evaluation of access control attributes can be enabled." -#: src/include/sssd-parameters.rb:960 +#: src/lib/yauthclient/params.rb:1055 msgid "Comma separated list of access control options." msgstr "Comma separated list of access control options." -#: src/include/sssd-parameters.rb:965 +#: src/lib/yauthclient/params.rb:1060 msgid "Specifies how alias dereferencing is done when performing a search." msgstr "Specifies how alias dereferencing is done when performing a search." -#: src/include/sssd-parameters.rb:970 +#: src/lib/yauthclient/params.rb:1065 msgid "Allows to retain local users as members of an LDAP group for servers that use the RFC2307 schema." msgstr "Allows to retain local users as members of an LDAP group for servers that use the RFC2307 schema." -#: src/include/sssd-parameters.rb:993 src/include/sssd-parameters.rb:997 +#: src/lib/yauthclient/params.rb:1078 +#, fuzzy +#| msgid "The IP address (or hostname) of the host with a fixed address" +msgid "IP address or host names of Kerberos servers (comma separated)" +msgstr "The IP address (or hostname) of the host with a fixed address" + +#: src/lib/yauthclient/params.rb:1082 msgid "Specifies the comma-separated list of IP addresses or hostnames of the Kerberos servers to which SSSD should connect, in the order of preference." msgstr "Specifies the comma-separated list of IP addresses or hostnames of the Kerberos servers to which SSSD should connect, in the order of preference." -#: src/include/sssd-parameters.rb:1002 -msgid "The name of the Kerberos realm." -msgstr "The name of the Kerberos realm." +#: src/lib/yauthclient/params.rb:1087 +msgid "Kerberos realm (e.g. EXAMPLE.COM)" +msgstr "" -#: src/include/sssd-parameters.rb:1007 src/include/sssd-parameters.rb:1012 +#: src/lib/yauthclient/params.rb:1091 src/lib/yauthclient/params.rb:1096 msgid "If the change password service is not running on the KDC, alternative servers can be defined here." msgstr "If the change password service is not running on the KDC, alternative servers can be defined here." -#: src/include/sssd-parameters.rb:1017 +#: src/lib/yauthclient/params.rb:1101 msgid "Directory to store credential caches." msgstr "Directory to store credential caches." -#: src/include/sssd-parameters.rb:1022 +#: src/lib/yauthclient/params.rb:1106 msgid "Location of the user's credential cache." msgstr "Location of the user's credential cache." -#: src/include/sssd-parameters.rb:1027 +#: src/lib/yauthclient/params.rb:1111 msgid " Timeout in seconds after an online authentication request or change password request is aborted." msgstr " Timeout in seconds after an online authentication request or change password request is aborted." -#: src/include/sssd-parameters.rb:1032 +#: src/lib/yauthclient/params.rb:1116 msgid "Verify with the help of krb5_keytab that the TGT obtained has not been spoofed." msgstr "Verify with the help of krb5_keytab that the TGT obtained has not been spoofed." -#: src/include/sssd-parameters.rb:1037 +#: src/lib/yauthclient/params.rb:1121 msgid "The location of the keytab to use when validating credentials obtained from KDCs." msgstr "The location of the keytab to use when validating credentials obtained from KDCs." -#: src/include/sssd-parameters.rb:1042 +#: src/lib/yauthclient/params.rb:1126 msgid "Store the password of the user if the provider is offline and use it to request a TGT when the provider comes online again." msgstr "Store the password of the user if the provider is offline and use it to request a TGT when the provider comes online again." -#: src/include/sssd-parameters.rb:1046 +#: src/lib/yauthclient/params.rb:1130 msgid "Request a renewable ticket with a total lifetime, given as an integer immediately followed by a time unit." msgstr "Request a renewable ticket with a total lifetime, given as an integer immediately followed by a time unit." -#: src/include/sssd-parameters.rb:1050 +#: src/lib/yauthclient/params.rb:1134 msgid "Request ticket with a with a lifetime, given as an integer immediately followed by a time unit." msgstr "Request ticket with a with a lifetime, given as an integer immediately followed by a time unit." -#: src/include/sssd-parameters.rb:1054 +#: src/lib/yauthclient/params.rb:1138 msgid "The time in seconds between two checks if the TGT should be renewed." msgstr "The time in seconds between two checks if the TGT should be renewed." -#: src/include/sssd-parameters.rb:1059 +#: src/lib/yauthclient/params.rb:1143 msgid "Enables flexible authentication secure tunneling (FAST) for Kerberos pre-authentication." msgstr "Enables flexible authentication secure tunneling (FAST) for Kerberos pre-authentication." -#: src/include/sssd-parameters.rb:1063 +#: src/lib/yauthclient/params.rb:1147 msgid "Specifies the server principal to use for FAST." msgstr "Specifies the server principal to use for FAST." -#: src/include/sssd-parameters.rb:1068 +#: src/lib/yauthclient/params.rb:1152 msgid "Specifies if the host and user principal should be canonicalized." msgstr "Specifies if the host and user principal should be canonicalized." #. The Active Directory domain section -#: src/include/sssd-parameters.rb:1081 +#: src/lib/yauthclient/params.rb:1164 msgid "Specifies the name of the Active Directory domain." msgstr "Specifies the name of the Active Directory domain." -#: src/include/sssd-parameters.rb:1085 src/include/sssd-parameters.rb:1089 +#: src/lib/yauthclient/params.rb:1169 +msgid "IP addresses or host names of AD servers (comma separated)" +msgstr "" + +#: src/lib/yauthclient/params.rb:1173 msgid "The comma-separated list of IP addresses or hostnames of the AD servers to which SSSD should connect in order of preference." msgstr "The comma-separated list of IP addresses or hostnames of the AD servers to which SSSD should connect in order of preference." -#: src/include/sssd-parameters.rb:1093 +#: src/lib/yauthclient/params.rb:1177 msgid "Optional. May be set on machines where the hostname(5) does not reflect the fully qualified name used in the Active Directory domain to identify this host." msgstr "Optional. May be set on machines where the hostname(5) does not reflect the fully qualified name used in the Active Directory domain to identify this host." -#: src/include/sssd-parameters.rb:1097 +#: src/lib/yauthclient/params.rb:1181 msgid "Override the user's home directory." msgstr "Override the user's home directory." -#: src/include/sssd-parameters.rb:1110 +#: src/lib/yauthclient/params.rb:1194 msgid " Specifies the lower bound of the range of POSIX IDs to use for mapping Active Directory user and group SIDs." msgstr " Specifies the lower bound of the range of POSIX IDs to use for mapping Active Directory user and group SIDs." -#: src/include/sssd-parameters.rb:1115 +#: src/lib/yauthclient/params.rb:1199 msgid "Specifies the upper bound of the range of POSIX IDs to use for mapping Active Directory user and group SIDs." msgstr "Specifies the upper bound of the range of POSIX IDs to use for mapping Active Directory user and group SIDs." -#: src/include/sssd-parameters.rb:1120 +#: src/lib/yauthclient/params.rb:1204 msgid "Specifies the number of IDs available for each slice." msgstr "Specifies the number of IDs available for each slice." -#: src/include/sssd-parameters.rb:1124 +#: src/lib/yauthclient/params.rb:1208 msgid "Specify the domain SID of the default domain." msgstr "Specify the domain SID of the default domain." -#: src/include/sssd-parameters.rb:1128 +#: src/lib/yauthclient/params.rb:1212 msgid "Specify the name of the default domain." msgstr "Specify the name of the default domain." -#: src/include/sssd-parameters.rb:1133 +#: src/lib/yauthclient/params.rb:1217 msgid "Changes the behavior of the ID-mapping algorithm to behave more similarly to winbind's “idmap_autorid” algorithm." msgstr "Changes the behavior of the ID-mapping algorithm to behave more similarly to winbind's “idmap_autorid” algorithm." #. The Active Directory domain section -#: src/include/sssd-parameters.rb:1145 +#: src/lib/yauthclient/params.rb:1229 msgid "Specifies the name of the IPA domain." msgstr "Specifies the name of the IPA domain." -#: src/include/sssd-parameters.rb:1149 -msgid "The comma-separated list of IP addresses or hostnames of the IPA servers to which SSSD should connect in the order of preference." -msgstr "The comma-separated list of IP addresses or hostnames of the IPA servers to which SSSD should connect in the order of preference." +#: src/lib/yauthclient/params.rb:1234 +msgid "IP addresses or host names of IPA servers (comma separated)" +msgstr "" -#: src/include/sssd-parameters.rb:1153 +#: src/lib/yauthclient/params.rb:1238 msgid "May be set on machines where the hostname(5) does not reflect the fully qualified name." msgstr "May be set on machines where the hostname(5) does not reflect the fully qualified name." -#: src/include/sssd-parameters.rb:1158 +#: src/lib/yauthclient/params.rb:1243 +#, fuzzy +#| msgid "The configuration of the NIS client will be saved.\n" +msgid "The automounter location this IPA client will be using." +msgstr "The configuration of the NIS client will be saved.\n" + +#: src/lib/yauthclient/params.rb:1248 msgid "This option tells SSSD to automatically update the DNS server built into FreeIPA v2 with the IP address of this client." msgstr "This option tells SSSD to automatically update the DNS server built into FreeIPA v2 with the IP address of this client." -#: src/include/sssd-parameters.rb:1163 +#: src/lib/yauthclient/params.rb:1253 msgid "The TTL to apply to the client DNS record when updating it." msgstr "The TTL to apply to the client DNS record when updating it." -#: src/include/sssd-parameters.rb:1167 +#: src/lib/yauthclient/params.rb:1257 msgid "Choose the interface whose IP address should be used for dynamic DNS updates." msgstr "Choose the interface whose IP address should be used for dynamic DNS updates." +#. autofs may only start after sssd is started +#: src/modules/AuthClient.rb:230 +msgid "Failed to enable %s service. Please use system journal to diagnose." +msgstr "" + +#: src/modules/AuthClient.rb:232 +msgid "Failed to start %s service. Please use system journal (journalctl -n -u %s) to diagnose." +msgstr "" + #. end Export #. ################################################################ #. ################################################################ #. Summary() #. returns html formated configuration summary #. @return summary -#: src/modules/AuthClient.rb:336 +#: src/modules/AuthClient.rb:345 msgid "System is configured for using nss_ldap.\n" msgstr "System is configured for using nss_ldap.\n" -#: src/modules/AuthClient.rb:339 +#: src/modules/AuthClient.rb:348 msgid "System is configured for using sssd.\n" msgstr "System is configured for using sssd.\n" -#: src/modules/AuthClient.rb:345 +#: src/modules/AuthClient.rb:354 msgid "System is configured for using OES.\n" msgstr "System is configured for using OES.\n" -#: src/modules/AuthClient.rb:348 +#: src/modules/AuthClient.rb:357 msgid "System is configured for using /etc/passwd only.\n" msgstr "System is configured for using /etc/passwd only.\n" +#~ msgid "Do you really want to delete the domain '%1'?" +#~ msgstr "Do you really want to delete the domain '%1'?" + +#~ msgid "There is no help for this parameter." +#~ msgstr "There is no help for this parameter." + +#~ msgid "Default value: " +#~ msgstr "Default value: " + +#~ msgid "Available values: " +#~ msgstr "Available values: " + +#~ msgid "Set Parameter Value in Section '%1'" +#~ msgstr "Set Parameter Value in Section '%1'" + +#~ msgid "Cancel" +#~ msgstr "Cancel" + +#~ msgid "OK" +#~ msgstr "OK" + +#~ msgid "Value for parameter '%1' is invalid." +#~ msgstr "Value for parameter '%1' is invalid." + +#~ msgid "Section '%1' has no attributes." +#~ msgstr "Section '%1' has no attributes." + +#~ msgid "Select new Parameter for section '%1'" +#~ msgstr "Select new Parameter for section '%1'" + +#~ msgid "New Parameter" +#~ msgstr "New Parameter" + +#~ msgid "Help" +#~ msgstr "Help" + +#~ msgid "Edit sssd section '%1'" +#~ msgstr "Edit sssd section '%1'" + +#~ msgid "New" +#~ msgstr "New" + +#~ msgid "Add New Domain" +#~ msgstr "Add New Domain" + +#~ msgid "Name:" +#~ msgstr "Name:" + +#~ msgid "The identification provider used for the domain" +#~ msgstr "The identification provider used for the domain" + +#~ msgid "Help for creating new domain" +#~ msgstr "Help for creating new domain" + +#~ msgid "You have to provide a domain name!" +#~ msgstr "You have to provide a domain name!" + +#~ msgid "Basic Settings:" +#~ msgstr "Basic Settings:" + +#~ msgid "Services:" +#~ msgstr "Services:" + +#~ msgid "" +#~ "There are some domains you have not activated:\n" +#~ "%s \n" +#~ "Do you want to write this configuration?" +#~ msgstr "" +#~ "There are some domains you have not activated:\n" +#~ "%s \n" +#~ "Do you want to write this configuration?" + +#~ msgid "Configured Authentication Domains" +#~ msgstr "Configured Authentication Domains" + +#~ msgid "Add" +#~ msgstr "Add" + +#~ msgid "Edit" +#~ msgstr "Edit" + +#~ msgid "Delete" +#~ msgstr "Delete" + +#~ msgid "Authentication Client Configuration (sssd)" +#~ msgstr "Authentication Client Configuration (sssd)" + +#~ msgid "Determines if a domain can be enumerated." +#~ msgstr "Determines if a domain can be enumerated." + +#~ msgid "Determines if user credentials are also cached in the local LDB cache." +#~ msgstr "Determines if user credentials are also cached in the local LDB cache." + +#~ msgid "The authentication provider used for the domain." +#~ msgstr "The authentication provider used for the domain." + +#~ msgid "Use the domain part of machine's hostname." +#~ msgstr "Use the domain part of machine's hostname." + +#~ msgid "Comma separated list of users who are explicitly denied access." +#~ msgstr "Comma separated list of users who are explicitly denied access." + +#~ msgid "The default base DN to use for performing LDAP user operations." +#~ msgstr "The default base DN to use for performing LDAP user operations." + +#~ msgid "Specifies the Schema Type in use on the target LDAP server." +#~ msgstr "Specifies the Schema Type in use on the target LDAP server." + +#~ msgid "Specifies what checks to perform on server certificates in a TLS session, if any." +#~ msgstr "Specifies what checks to perform on server certificates in a TLS session, if any." + +#~ msgid "The name of the Kerberos realm." +#~ msgstr "The name of the Kerberos realm." + +#~ msgid "The comma-separated list of IP addresses or hostnames of the IPA servers to which SSSD should connect in the order of preference." +#~ msgstr "The comma-separated list of IP addresses or hostnames of the IPA servers to which SSSD should connect in the order of preference." + #~ msgid "SPAM Prevention" #~ msgstr "SPAM Prevention" Modified: trunk/yast/en_GB/po/auth-server.en_GB.po =================================================================== --- trunk/yast/en_GB/po/auth-server.en_GB.po 2015-09-09 08:18:21 UTC (rev 92602) +++ trunk/yast/en_GB/po/auth-server.en_GB.po 2015-09-09 08:19:44 UTC (rev 92603) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: opensuse-i 18n\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-10-29 16:20+0100\n" +"POT-Creation-Date: 2015-08-25 18:36+0200\n" "PO-Revision-Date: 2014-05-19 09:34+0200\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" Modified: trunk/yast/en_GB/po/autoinst.en_GB.po =================================================================== --- trunk/yast/en_GB/po/autoinst.en_GB.po 2015-09-09 08:18:21 UTC (rev 92602) +++ trunk/yast/en_GB/po/autoinst.en_GB.po 2015-09-09 08:19:44 UTC (rev 92603) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: autoinst\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-10-29 16:20+0100\n" +"POT-Creation-Date: 2015-08-25 18:36+0200\n" "PO-Revision-Date: 2008-03-27 19:11+0000\n" "Last-Translator: Benjamin Weber \n" "Language-Team: \n" @@ -31,8 +31,8 @@ msgstr "Reading configuration data..." #: src/clients/autoinst_test_clone.rb:16 src/clients/autoyast.rb:123 -#: src/include/autoinstall/conftree.rb:613 -#: src/include/autoinstall/dialogs.rb:333 src/modules/Profile.rb:339 +#: src/include/autoinstall/conftree.rb:622 +#: src/include/autoinstall/dialogs.rb:333 src/modules/Profile.rb:360 msgid "This may take a while" msgstr "This may take a while" @@ -54,13 +54,14 @@ #. command line options #. Init variables -#. AutoInstall::PXELocalBoot(); +#. We will have to set default entries which are defined +#. in the import call of ServicesManager #. 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:403 -#: src/clients/inst_autosetup_upgrade.rb:482 -#: src/modules/AutoInstallRules.rb:1006 +#: src/clients/inst_autoinit.rb:188 src/clients/inst_autosetup.rb:389 +#: src/clients/inst_autosetup_upgrade.rb:484 +#: src/modules/AutoInstallRules.rb:1001 msgid "" "Error while parsing the control file.\n" "Check the log files for more details or fix the\n" @@ -70,7 +71,7 @@ "Check the log files for more details or fix the\n" "control file and try again.\n" -#: src/clients/autoyast.rb:122 src/include/autoinstall/conftree.rb:612 +#: src/clients/autoyast.rb:122 src/include/autoinstall/conftree.rb:621 #: src/include/autoinstall/dialogs.rb:332 msgid "Reading configuration data" msgstr "Reading configuration data" @@ -116,7 +117,7 @@ msgid "enable/disable all package handling" msgstr "Enable/disable chrooting." -#: src/clients/ayast_setup.rb:87 src/clients/clone_system.rb:81 +#: src/clients/ayast_setup.rb:87 src/clients/clone_system.rb:101 #, fuzzy msgid "Empty parameter list" msgstr "Some parameter missing" @@ -129,36 +130,36 @@ msgstr "Path to AutoYaST Profile" #. if we get no argument or map of options we are not in command line -#: src/clients/clone_system.rb:46 +#: src/clients/clone_system.rb:66 #, fuzzy msgid "Client for creating an AutoYaST profile based on the currently running system" msgstr "Saving configuration data on target system." -#: src/clients/clone_system.rb:56 +#: src/clients/clone_system.rb:76 #, fuzzy #| msgid "Unknown mode" msgid "known modules: %1" msgstr "Unknown mode" -#: src/clients/clone_system.rb:63 +#: src/clients/clone_system.rb:83 #, fuzzy #| msgid "Comma-separated list of modules to enable" msgid "comma separated list of modules to clone" msgstr "Comma-separated list of modules to enable" #. TRANSLATORS: Warning that an already existing autoyast configuration file will be overwritten. -#: src/clients/clone_system.rb:94 +#: src/clients/clone_system.rb:114 #, fuzzy #| msgid "%1 exists! Really overwrite?" msgid "File %s exists! Really overwrite?" msgstr "%1 exists! Really overwrite?" -#: src/clients/clone_system.rb:98 +#: src/clients/clone_system.rb:118 msgid "Cloning the system..." msgstr "Cloning the system..." #. TRANSLATORS: %s is path where profile can be found -#: src/clients/clone_system.rb:100 +#: src/clients/clone_system.rb:120 #, fuzzy #| msgid "The resulting autoyast profile can be found in /root/autoinst.xml." msgid "The resulting autoyast profile can be found in %s." @@ -231,7 +232,7 @@ "name and the contents of the file.\n" #. OPEN -#: src/clients/files_auto.rb:273 src/include/autoinstall/conftree.rb:596 +#: src/clients/files_auto.rb:273 src/include/autoinstall/conftree.rb:605 #: src/include/autoinstall/script_dialogs.rb:397 msgid "Select a file to load." msgstr "Select a file to load." @@ -274,7 +275,7 @@ msgstr "Select a file from the table first." #. Help text for last dialog of base installation -#: src/clients/inst_autoconfigure.rb:32 +#: src/clients/inst_autoconfigure.rb:35 msgid "" "<p>\n" "Please wait while the system is being configured.\n" @@ -285,49 +286,75 @@ "</p>" #. Progress bar that displays overall progress in this dialog -#: src/clients/inst_autoconfigure.rb:53 +#: src/clients/inst_autoconfigure.rb:60 msgid "Progress" msgstr "Progress" #. Dialog title for autoyast dialog -#: src/clients/inst_autoconfigure.rb:62 +#: src/clients/inst_autoconfigure.rb:69 msgid "Configuring System according to auto-install settings" msgstr "Configuring System according to auto-install settings" +#. TRANSLATORS: Error message, %s is replaced by newline-separated +#. list of unsupported sections of the profile +#. Do not translate words in brackets +#: src/clients/inst_autoconfigure.rb:88 +msgid "" +"These sections of AutoYaST profile are not supported anymore:\n" +"\n" +"%s\n" +"\n" +"Please, use, e.g., <scripts/> or <files/> to change the configuration." +msgstr "" + +#. TRANSLATORS: Error message, %s is replaced by newline-separated +#. list of unknown sections of the profile +#. Do not translate words in brackets +#: src/clients/inst_autoconfigure.rb:103 +msgid "" +"These sections of AutoYaST profile cannot be processed on this system:\n" +"\n" +"%s\n" +"\n" +"Maybe they were misspelled or your profile does not contain all the needed YaST packages in <software/> section." +msgstr "" + #. determine name of client, if not use default name #. Call::Function(module_auto, ["Import", eval(Profile::current[resource]:$[]) ]); -#: src/clients/inst_autoconfigure.rb:157 src/clients/inst_autoconfigure.rb:186 -#: src/clients/inst_autoconfigure.rb:199 +#: src/clients/inst_autoconfigure.rb:192 src/clients/inst_autoconfigure.rb:221 +#: src/clients/inst_autoconfigure.rb:234 msgid "Configuring %1" msgstr "Configuring %1" -#: src/clients/inst_autoconfigure.rb:159 src/clients/inst_autoconfigure.rb:188 -#: src/clients/inst_autoconfigure.rb:201 +#: src/clients/inst_autoconfigure.rb:194 src/clients/inst_autoconfigure.rb:223 +#: src/clients/inst_autoconfigure.rb:236 msgid "Not Configuring %1" msgstr "Not Configuring %1" #. online update -#: src/clients/inst_autoconfigure.rb:253 +#: src/clients/inst_autoconfigure.rb:288 msgid "Executing Post-Scripts" msgstr "Executing Post-Scripts" -#: src/clients/inst_autoconfigure.rb:268 +#. Do not restart dbus. Otherwise some services will hang. +#. bnc#937900 +#: src/clients/inst_autoconfigure.rb:304 #, fuzzy #| msgid "Determine running services" msgid "Restarting all running services" msgstr "Determine running services" -#: src/clients/inst_autoconfigure.rb:288 +#: src/clients/inst_autoconfigure.rb:327 msgid "Activating systemd default target" msgstr "" #. Just in case, remove this file to avoid reconfiguring... -#: src/clients/inst_autoconfigure.rb:301 +#: src/clients/inst_autoconfigure.rb:342 msgid "Finishing Configuration" msgstr "Finishing Configuration" #. NetworkInterfaces::Write( ".*" ); -#: src/clients/inst_autoconfigure.rb:404 +#: src/clients/inst_autoconfigure.rb:448 #, fuzzy msgid "Processing resource %1" msgstr "Reading resources..." @@ -501,86 +528,86 @@ #. Uwe Gansert #. #. $Id: inst_autosetup.ycp 61521 2010-03-29 09:10:07Z ug $ -#: src/clients/inst_autosetup.rb:49 src/clients/inst_autosetup_upgrade.rb:47 +#: src/clients/inst_autosetup.rb:50 src/clients/inst_autosetup_upgrade.rb:47 msgid "<P>Please wait while the system is prepared for autoinstallation.</P>" msgstr "<P>Please wait while the system is prepared for autoinstallation.</P>" -#: src/clients/inst_autosetup.rb:53 src/clients/inst_autosetup_upgrade.rb:52 +#: src/clients/inst_autosetup.rb:54 src/clients/inst_autosetup_upgrade.rb:52 msgid "Execute pre-install user scripts" msgstr "Execute pre-install user scripts" -#: src/clients/inst_autosetup.rb:54 src/clients/inst_autosetup_upgrade.rb:51 +#: src/clients/inst_autosetup.rb:55 src/clients/inst_autosetup_upgrade.rb:51 msgid "Configure General Settings " msgstr "Configure General Settings " -#: src/clients/inst_autosetup.rb:55 src/clients/inst_autosetup_upgrade.rb:53 +#: src/clients/inst_autosetup.rb:56 src/clients/inst_autosetup_upgrade.rb:53 msgid "Set up language" msgstr "Set up language" -#: src/clients/inst_autosetup.rb:56 +#: src/clients/inst_autosetup.rb:57 msgid "Create partition plans" msgstr "Create partition plans" -#: src/clients/inst_autosetup.rb:57 src/clients/inst_autosetup_upgrade.rb:56 +#: src/clients/inst_autosetup.rb:58 src/clients/inst_autosetup_upgrade.rb:56 msgid "Configure Bootloader" msgstr "Configure Bootloader" -#: src/clients/inst_autosetup.rb:58 src/clients/inst_autosetup_upgrade.rb:54 +#: src/clients/inst_autosetup.rb:59 src/clients/inst_autosetup_upgrade.rb:54 msgid "Registration" msgstr "Registration" -#: src/clients/inst_autosetup.rb:59 src/clients/inst_autosetup_upgrade.rb:55 +#: src/clients/inst_autosetup.rb:60 src/clients/inst_autosetup_upgrade.rb:55 msgid "Configure Software selections" msgstr "Configure Software selections" -#: src/clients/inst_autosetup.rb:60 +#: src/clients/inst_autosetup.rb:61 msgid "Configure Systemd Default Target" msgstr "" -#: src/clients/inst_autosetup.rb:64 src/clients/inst_autosetup_upgrade.rb:61 +#: src/clients/inst_autosetup.rb:65 src/clients/inst_autosetup_upgrade.rb:61 msgid "Executing pre-install user scripts..." msgstr "Executing pre-install user scripts..." -#: src/clients/inst_autosetup.rb:65 src/clients/inst_autosetup_upgrade.rb:60 +#: src/clients/inst_autosetup.rb:66 src/clients/inst_autosetup_upgrade.rb:60 msgid "Configuring general settings..." msgstr "Configuring general settings..." -#: src/clients/inst_autosetup.rb:66 src/clients/inst_autosetup_upgrade.rb:62 +#: src/clients/inst_autosetup.rb:67 src/clients/inst_autosetup_upgrade.rb:62 #, fuzzy #| msgid "Set up language" msgid "Setting up language..." msgstr "Set up language" -#: src/clients/inst_autosetup.rb:67 +#: src/clients/inst_autosetup.rb:68 msgid "Creating partition plans..." msgstr "Creating partition plans..." -#: src/clients/inst_autosetup.rb:68 src/clients/inst_autosetup_upgrade.rb:65 +#: src/clients/inst_autosetup.rb:69 src/clients/inst_autosetup_upgrade.rb:65 msgid "Configuring Bootloader..." msgstr "Configuring Bootloader..." -#: src/clients/inst_autosetup.rb:69 src/clients/inst_autosetup_upgrade.rb:63 +#: src/clients/inst_autosetup.rb:70 src/clients/inst_autosetup_upgrade.rb:63 #, fuzzy #| msgid "Repairing file system..." msgid "Registering the system..." msgstr "Repairing file system..." -#: src/clients/inst_autosetup.rb:70 src/clients/inst_autosetup_upgrade.rb:64 +#: src/clients/inst_autosetup.rb:71 src/clients/inst_autosetup_upgrade.rb:64 msgid "Configuring Software selections..." msgstr "Configuring Software selections..." -#: src/clients/inst_autosetup.rb:71 +#: src/clients/inst_autosetup.rb:72 #, fuzzy #| msgid "Configuring language..." msgid "Configuring Systemd Default Target..." msgstr "Configuring language..." -#: src/clients/inst_autosetup.rb:75 src/clients/inst_autosetup_upgrade.rb:69 +#: src/clients/inst_autosetup.rb:76 src/clients/inst_autosetup_upgrade.rb:69 msgid "Preparing System for Automated Installation" msgstr "Preparing System for Automated Installation" #. configure general settings -#: src/clients/inst_autosetup.rb:163 +#: src/clients/inst_autosetup.rb:164 #, fuzzy #| msgid "Signing the Add-On Product" msgid "Handling Add-On Products..." @@ -589,12 +616,12 @@ #. Set it in the Language module. #. #. Set it in the Language module. -#: src/clients/inst_autosetup.rb:183 src/clients/inst_autosetup_upgrade.rb:149 +#: src/clients/inst_autosetup.rb:184 src/clients/inst_autosetup_upgrade.rb:149 msgid "Configuring language..." msgstr "Configuring language..." #. Yes, do not set Storage testsuite here as we want really GUI with proposal -#: src/clients/inst_autosetup.rb:272 +#: src/clients/inst_autosetup.rb:273 msgid "" "Error while configuring partitions.\n" "Try again.\n" @@ -603,7 +630,7 @@ "Try again.\n" #. Software -#: src/clients/inst_autosetup.rb:328 +#: src/clients/inst_autosetup.rb:331 msgid "" "Error while configuring software selections.\n" "Try again.\n" @@ -943,11 +970,11 @@ msgstr "Advanced" #. user selected this partition to be part of volgroup -#: src/include/autoinstall/PartitionDialog.rb:589 +#: src/include/autoinstall/PartitionDialog.rb:592 msgid "Size \"auto\" is only valid if mount point \"/boot\" or \"swap\" is selected." msgstr "" -#: src/include/autoinstall/PartitionDialog.rb:597 +#: src/include/autoinstall/PartitionDialog.rb:600 msgid "Size \"auto\" is invalid for physical volumes." msgstr "" @@ -1028,7 +1055,7 @@ msgid "System Profile Location" msgstr "System Profile Location" -#: src/include/autoinstall/autoinst_dialogs.rb:44 +#: src/include/autoinstall/autoinst_dialogs.rb:45 msgid "&Profile Location:" msgstr "&Profile Location:" @@ -1036,11 +1063,11 @@ #. Below this label, all targets are listed that can be used as #. installation target #. heading text -#: src/include/autoinstall/autoinst_dialogs.rb:115 +#: src/include/autoinstall/autoinst_dialogs.rb:117 msgid "Choose a hard disk" msgstr "Choose a hard disk" -#: src/include/autoinstall/autoinst_dialogs.rb:122 +#: src/include/autoinstall/autoinst_dialogs.rb:124 msgid "No disks found." msgstr "No disks found." @@ -1049,7 +1076,7 @@ #. "Preparing Hard Disk - Step 1" is the description of the dialog what to #. do while the following locale is the help description #. help part 1 of 1 -#: src/include/autoinstall/autoinst_dialogs.rb:130 +#: src/include/autoinstall/autoinst_dialogs.rb:132 msgid "" "<p>\n" "All hard disks automatically detected on your system\n" @@ -1062,13 +1089,13 @@ "</p>" #. force help text width -#: src/include/autoinstall/autoinst_dialogs.rb:152 +#: src/include/autoinstall/autoinst_dialogs.rb:154 msgid "Hard Disk Selection" msgstr "Hard Disk Selection" #. there is a selection from that one option has to be #. chosen - at the moment no option is chosen -#: src/include/autoinstall/autoinst_dialogs.rb:175 +#: src/include/autoinstall/autoinst_dialogs.rb:177 msgid "Select one of the options to continue." msgstr "Select one of the options to continue." @@ -1270,19 +1297,19 @@ #. SAVE #: src/include/autoinstall/conftree.rb:35 -#: src/include/autoinstall/conftree.rb:688 +#: src/include/autoinstall/conftree.rb:697 msgid "Save as..." msgstr "Save as..." #: src/include/autoinstall/conftree.rb:42 -#: src/include/autoinstall/conftree.rb:700 +#: src/include/autoinstall/conftree.rb:709 msgid "File %1 was saved successfully." msgstr "File %1 was saved successfully." #. Profile::checkProfile(); #. Profile::checkProfile(); #: src/include/autoinstall/conftree.rb:55 -#: src/include/autoinstall/conftree.rb:707 +#: src/include/autoinstall/conftree.rb:716 #, fuzzy #| msgid "An error occured while saving the file." msgid "An error occurred while saving the file." @@ -1430,37 +1457,36 @@ msgid "Source" msgstr "Source" -#. Menu interface -#. @param list menu items -#. @return [Symbol] -#: src/include/autoinstall/conftree.rb:565 +#. Some configuration modules removes/exchange the menu bar. +#. So we have to reset. (bnc#872711) +#: src/include/autoinstall/conftree.rb:569 msgid "Do you really want to apply the settings of the module '%1' to your current system?" msgstr "" #. opening/parsing the xml file failed -#: src/include/autoinstall/conftree.rb:635 +#: src/include/autoinstall/conftree.rb:644 #, fuzzy #| msgid "An error occured while opening/parsing the XML file." msgid "An error occurred while opening/parsing the XML file." msgstr "An error occured while opening/parsing the XML file." #. NEW -#: src/include/autoinstall/conftree.rb:725 +#: src/include/autoinstall/conftree.rb:734 #, fuzzy msgid "Available Modules" msgstr "Available modules" #. FIXME: sucks sucks sucks sucks sucks -#: src/include/autoinstall/conftree.rb:740 +#: src/include/autoinstall/conftree.rb:749 msgid "Do you really want to apply the settings of the profile to your current system?" msgstr "" #. EXIT -#: src/include/autoinstall/conftree.rb:781 +#: src/include/autoinstall/conftree.rb:790 msgid "Control file changed." msgstr "Control file changed." -#: src/include/autoinstall/conftree.rb:782 +#: src/include/autoinstall/conftree.rb:791 msgid "Save the changes to %1?" msgstr "Save the changes to %1?" @@ -1631,7 +1657,7 @@ #. list<any> l = [ "key1",0,"key3" ]; #. m[ l ] = v; #. @return [Hash] -#: src/include/autoinstall/dialogs.rb:410 src/modules/Profile.rb:794 +#: src/include/autoinstall/dialogs.rb:410 src/modules/Profile.rb:815 msgid "Checking XML with RNG validation..." msgstr "Checking XML with RNG validation..." @@ -1642,7 +1668,7 @@ msgstr "Section %1 not found." #. jing validation -- validates complete xml profile -#: src/include/autoinstall/dialogs.rb:459 src/modules/Profile.rb:806 +#: src/include/autoinstall/dialogs.rb:459 src/modules/Profile.rb:827 msgid "Checking XML with RNC validation..." msgstr "Checking XML with RNC validation..." @@ -1684,7 +1710,7 @@ msgstr "Turn Off the Machine after the First Stage" #: src/include/autoinstall/general_dialogs.rb:90 -#: src/modules/AutoinstGeneral.rb:121 +#: src/modules/AutoinstGeneral.rb:126 msgid "Signature Handling" msgstr "Signature Handling" @@ -2033,40 +2059,40 @@ "</p>\n" #. autoyast tried to read a file but had no success. -#: src/include/autoinstall/io.rb:122 +#: src/include/autoinstall/io.rb:123 msgid "Cannot find URL '%1' via protocol HTTP(S). Server returned code %2." msgstr "Cannot find URL '%1' via protocol HTTP(S). Server returned code %2." #. autoyast tried to read a file but had no success. -#: src/include/autoinstall/io.rb:142 +#: src/include/autoinstall/io.rb:143 msgid "Cannot find URL '%1' via protocol FTP. Server returned code %2." msgstr "Cannot find URL '%1' via protocol FTP. Server returned code %2." #. FIXME: I have doubts this will ever work. Too early. -#: src/include/autoinstall/io.rb:158 +#: src/include/autoinstall/io.rb:159 msgid "Reading file on %1/%2 failed.\n" msgstr "Reading file on %1/%2 failed.\n" -#: src/include/autoinstall/io.rb:174 +#: src/include/autoinstall/io.rb:175 msgid "Reading file on %1 failed.\n" msgstr "Reading file on %1 failed.\n" #. autoyast tried to mount the CD but had no success. #. autoyast tried to mount a NFS directory which failed #. autoyast tried to mount a NFS directory which failed -#: src/include/autoinstall/io.rb:234 src/include/autoinstall/io.rb:290 -#: src/include/autoinstall/io.rb:334 +#: src/include/autoinstall/io.rb:237 src/include/autoinstall/io.rb:293 +#: src/include/autoinstall/io.rb:337 msgid "Mounting %1 failed." msgstr "Mounting %1 failed." #. autoyast tried to read a file but had no success. -#: src/include/autoinstall/io.rb:265 +#: src/include/autoinstall/io.rb:268 msgid "Reading a file on CD failed. Path: %1/%2." msgstr "Reading a file on CD failed. Path: %1/%2." #. autoyast tried to copy a file via NFS which failed #. autoyast tried to copy a file via NFS which failed -#: src/include/autoinstall/io.rb:313 src/include/autoinstall/io.rb:357 +#: src/include/autoinstall/io.rb:316 src/include/autoinstall/io.rb:360 msgid "Remote file %1 cannot be retrieved" msgstr "Remote file %1 cannot be retrieved" @@ -2074,22 +2100,22 @@ #. because of changes in autoyast startup this code is now #. called much sooner (before Storage stuff is initialized) #. call dummy method to trigger Storage initialization -#: src/include/autoinstall/io.rb:482 +#: src/include/autoinstall/io.rb:485 msgid "%1 is not mounted and mount failed" msgstr "" #. autoyast tried to copy a file but that file can't be found -#: src/include/autoinstall/io.rb:502 +#: src/include/autoinstall/io.rb:505 msgid "File %1 cannot be found" msgstr "File %1 cannot be found" #. Device -#: src/include/autoinstall/io.rb:524 +#: src/include/autoinstall/io.rb:527 msgid "Cannot find URL '%1' via protocol TFTP." msgstr "Cannot find URL '%1' via protocol TFTP." #. the user wanted autoyast to fetch it's profile via an unknown protocol -#: src/include/autoinstall/io.rb:531 +#: src/include/autoinstall/io.rb:534 msgid "Unknown protocol %1." msgstr "Unknown protocol %1." @@ -2370,7 +2396,7 @@ #. Read rules file #. @return [void] -#: src/modules/AutoInstallRules.rb:453 +#: src/modules/AutoInstallRules.rb:448 msgid "Parsing the rules file failed. XML parser reports:\n" msgstr "Parsing the rules file failed. XML parser reports:\n" @@ -2378,12 +2404,12 @@ #. @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:914 src/modules/Profile.rb:725 +#: src/modules/AutoInstallRules.rb:909 src/modules/Profile.rb:746 msgid "The XML parser reported an error while parsing the autoyast profile. The error message is:\n" msgstr "The XML parser reported an error while parsing the autoyast profile. The error message is:\n" #. backdoor for merging problems. -#: src/modules/AutoInstallRules.rb:1059 +#: src/modules/AutoInstallRules.rb:1054 msgid "" "\n" "User-defined classes could not be retrieved. Make sure all classes \n" @@ -2399,46 +2425,46 @@ #. The line above needs to be fixed when we have more attributes #. comment will look like this: "(description=BLA BLA)" -#: src/modules/AutoinstConfig.rb:273 +#: src/modules/AutoinstConfig.rb:278 #, fuzzy msgid "Choose Profile" msgstr "&Use Profile" #. SetProtocolMessage () #. @return [void] -#: src/modules/AutoinstConfig.rb:329 +#: src/modules/AutoinstConfig.rb:334 msgid "Retrieving control file from floppy." msgstr "Retrieving control file from floppy." -#: src/modules/AutoinstConfig.rb:332 +#: src/modules/AutoinstConfig.rb:337 msgid "Retrieving control file (%1) from TFTP server: %2." msgstr "Retrieving control file (%1) from TFTP server: %2." -#: src/modules/AutoinstConfig.rb:338 +#: src/modules/AutoinstConfig.rb:343 msgid "Retrieving control file (%1) from NFS server: %2." msgstr "Retrieving control file (%1) from NFS server: %2." -#: src/modules/AutoinstConfig.rb:344 +#: src/modules/AutoinstConfig.rb:349 msgid "Retrieving control file (%1) from HTTP server: %2." msgstr "Retrieving control file (%1) from HTTP server: %2." -#: src/modules/AutoinstConfig.rb:350 +#: src/modules/AutoinstConfig.rb:355 msgid "Retrieving control file (%1) from FTP server: %2." msgstr "Retrieving control file (%1) from FTP server: %2." -#: src/modules/AutoinstConfig.rb:356 +#: src/modules/AutoinstConfig.rb:361 msgid "Copying control file from file: %1." msgstr "Copying control file from file: %1." -#: src/modules/AutoinstConfig.rb:361 +#: src/modules/AutoinstConfig.rb:366 msgid "Copying control file from device: /dev/%1." msgstr "Copying control file from device: /dev/%1." -#: src/modules/AutoinstConfig.rb:365 +#: src/modules/AutoinstConfig.rb:370 msgid "Copying control file from default location." msgstr "Copying control file from default location." -#: src/modules/AutoinstConfig.rb:367 +#: src/modules/AutoinstConfig.rb:372 msgid "Source unknown." msgstr "Source unknown." @@ -2448,7 +2474,7 @@ #. { #. local_rules_file = (string)WFM::Args(1); #. } -#: src/modules/AutoinstConfig.rb:447 +#: src/modules/AutoinstConfig.rb:452 msgid "" "<h3>AutoYaST Configuration Management System</h3>\n" "<p>Almost all resources of the control file can be\n" @@ -2458,7 +2484,7 @@ "<p>Almost all resources of the control file can be\n" "configured using the configuration management system.</p>\n" -#: src/modules/AutoinstConfig.rb:452 +#: src/modules/AutoinstConfig.rb:457 #, fuzzy msgid "" "<p>Most of the modules used to create the configuration are identical to those available\n" @@ -2473,7 +2499,7 @@ "install another system using AutoYaST.\n" "</p>\n" -#: src/modules/AutoinstConfig.rb:459 +#: src/modules/AutoinstConfig.rb:464 msgid "" "<p>In addition to the existing and familiar modules,\n" "new interfaces were created for special and complex configurations, including\n" @@ -2509,81 +2535,105 @@ #. string language_name = ""; #. string keyboard_name = ""; -#: src/modules/AutoinstGeneral.rb:85 +#: src/modules/AutoinstGeneral.rb:90 msgid "Confirm installation?" msgstr "Confirm installation?" -#: src/modules/AutoinstGeneral.rb:88 src/modules/AutoinstGeneral.rb:94 -#: src/modules/AutoinstGeneral.rb:103 src/modules/AutoinstGeneral.rb:110 -#: src/modules/AutoinstGeneral.rb:117 +#: src/modules/AutoinstGeneral.rb:93 src/modules/AutoinstGeneral.rb:99 +#: src/modules/AutoinstGeneral.rb:108 src/modules/AutoinstGeneral.rb:115 +#: src/modules/AutoinstGeneral.rb:122 msgid "Yes" msgstr "Yes" -#: src/modules/AutoinstGeneral.rb:88 src/modules/AutoinstGeneral.rb:94 -#: src/modules/AutoinstGeneral.rb:103 +#: src/modules/AutoinstGeneral.rb:93 src/modules/AutoinstGeneral.rb:99 +#: src/modules/AutoinstGeneral.rb:108 msgid "No" msgstr "No" -#: src/modules/AutoinstGeneral.rb:91 +#: src/modules/AutoinstGeneral.rb:96 msgid "Second Stage of AutoYaST" msgstr "Second Stage of AutoYaST" -#: src/modules/AutoinstGeneral.rb:99 +#: src/modules/AutoinstGeneral.rb:104 msgid "Halting the machine after stage one" msgstr "Halting the machine after stage one" -#: src/modules/AutoinstGeneral.rb:108 +#: src/modules/AutoinstGeneral.rb:113 #, fuzzy msgid "Halting the machine after stage two" msgstr "Halting the machine after stage one" -#: src/modules/AutoinstGeneral.rb:115 +#: src/modules/AutoinstGeneral.rb:120 #, fuzzy msgid "Reboot the machine after stage two" msgstr "Halting the machine after stage one" -#: src/modules/AutoinstGeneral.rb:125 +#: src/modules/AutoinstGeneral.rb:130 msgid "Accepting unsigned files" msgstr "Accepting unsigned files" -#: src/modules/AutoinstGeneral.rb:126 +#: src/modules/AutoinstGeneral.rb:131 msgid "Not accepting unsigned files" msgstr "Not accepting unsigned files" -#: src/modules/AutoinstGeneral.rb:135 +#: src/modules/AutoinstGeneral.rb:140 msgid "Accepting files without a checksum" msgstr "Accepting files without a checksum" -#: src/modules/AutoinstGeneral.rb:136 +#: src/modules/AutoinstGeneral.rb:141 msgid "Not accepting files without a checksum" msgstr "Not accepting files without a checksum" -#: src/modules/AutoinstGeneral.rb:145 +#: src/modules/AutoinstGeneral.rb:150 msgid "Accepting failed verifications" msgstr "Accepting failed verifications" -#: src/modules/AutoinstGeneral.rb:146 +#: src/modules/AutoinstGeneral.rb:151 msgid "Not accepting failed verifications" msgstr "Not accepting failed verifications" -#: src/modules/AutoinstGeneral.rb:151 +#: src/modules/AutoinstGeneral.rb:156 msgid "Accepting unknown GPG keys" msgstr "Accepting unknown GPG keys" -#: src/modules/AutoinstGeneral.rb:152 +#: src/modules/AutoinstGeneral.rb:157 msgid "Not accepting unknown GPG Keys" msgstr "Not accepting unknown GPG Keys" -#: src/modules/AutoinstGeneral.rb:157 +#: src/modules/AutoinstGeneral.rb:162 msgid "Importing new GPG keys" msgstr "Importing new GPG keys" -#: src/modules/AutoinstGeneral.rb:158 +#: src/modules/AutoinstGeneral.rb:163 msgid "Not importing new GPG Keys" msgstr "Not importing new GPG Keys" +#. NTP syncing +#: src/modules/AutoinstGeneral.rb:414 +#, fuzzy +#| msgid "Syncing server..." +msgid "Syncing time..." +msgstr "Syncing server..." + +#. TRANSLATORS: %s is the name of the ntp server +#: src/modules/AutoinstGeneral.rb:416 +msgid "Syncing time with %s." +msgstr "" + +#: src/modules/AutoinstGeneral.rb:420 +#, fuzzy +#| msgid "Parsing failed." +msgid "Time syncing failed." +msgstr "Parsing failed." + +#: src/modules/AutoinstGeneral.rb:424 +#, fuzzy +#| msgid "Cannot mount file system." +msgid "Cannot update system time." +msgstr "Cannot mount file system." + #. look for VGs to reuse -#: src/modules/AutoinstLVM.rb:111 +#: src/modules/AutoinstLVM.rb:113 #, fuzzy msgid "Cannot reuse volume group %1. The volume group does not exist." msgstr "can't reuse volume group %1. The volume group does not exist" @@ -2600,16 +2650,22 @@ #. @return [String] configuration summary dialog #. return Summary of configuration #. @return [String] configuration summary dialog -#: src/modules/AutoinstPartPlan.rb:682 src/modules/AutoinstStorage.rb:912 +#: src/modules/AutoinstPartPlan.rb:682 src/modules/AutoinstStorage.rb:913 msgid "Drives" msgstr "Drives" -#: src/modules/AutoinstPartPlan.rb:686 src/modules/AutoinstStorage.rb:916 +#. We are counting harddisks only (type CT_DISK) +#: src/modules/AutoinstPartPlan.rb:688 +msgid "%s drive in total" +msgid_plural "%s drives in total" +msgstr[0] "" +msgstr[1] "" + +#: src/modules/AutoinstPartPlan.rb:707 #, fuzzy -#| msgid "Total of %1 drive" -#| msgid_plural "Total of %1 drives" -msgid "Total of %1 drive" -msgstr "Total of %1 drive" +#| msgid "Not detected." +msgid "Not yet cloned." +msgstr "Not detected." #. Return Summary #. @return [String] summary @@ -2663,7 +2719,7 @@ msgstr "Unknown" #. warning text during the installation. %1 is a list of package names -#: src/modules/AutoinstSoftware.rb:169 +#: src/modules/AutoinstSoftware.rb:172 #, fuzzy msgid "" "These packages could not be found in the software repositories:\n" @@ -2674,29 +2730,29 @@ #. 4 means "already exists" #. Add add-ons -#: src/modules/AutoinstSoftware.rb:315 src/modules/AutoinstSoftware.rb:335 +#: src/modules/AutoinstSoftware.rb:327 src/modules/AutoinstSoftware.rb:347 #, fuzzy #| msgid "Reading file on %1 failed.\n" msgid "Adding repo %1 failed" msgstr "Reading file on %1 failed.\n" #. Install -#: src/modules/AutoinstSoftware.rb:363 +#: src/modules/AutoinstSoftware.rb:375 msgid "Image creation failed while pattern installation. Please check /tmp/ay_image.log" msgstr "" -#: src/modules/AutoinstSoftware.rb:371 +#: src/modules/AutoinstSoftware.rb:383 #, fuzzy #| msgid "Checking installed packages..." msgid "Creating Image - installing packages" msgstr "Checking installed packages..." -#: src/modules/AutoinstSoftware.rb:381 +#: src/modules/AutoinstSoftware.rb:393 msgid "Image creation failed while package installation. Please check /tmp/ay_image.log" msgstr "" #. Popup::Message( _("in the next file dialog you have to choose the target directory to save the image") ); -#: src/modules/AutoinstSoftware.rb:392 +#: src/modules/AutoinstSoftware.rb:404 #, fuzzy #| msgid "Retrieving image file..." msgid "Store image to ..." @@ -2704,60 +2760,60 @@ #. Compress image: #. tar cfz /srv/www/htdocs/image.tar.gz --exclude="proc*" . -#: src/modules/AutoinstSoftware.rb:421 +#: src/modules/AutoinstSoftware.rb:433 msgid "" "You can do changes to the image now in %1/\n" "If you press the ok-button, the image will be compressed and can't be changed anymore." msgstr "" -#: src/modules/AutoinstSoftware.rb:435 +#: src/modules/AutoinstSoftware.rb:447 msgid "Image compressing failed in '%1'. Please check /tmp/ay_image.log" msgstr "" -#: src/modules/AutoinstSoftware.rb:442 +#: src/modules/AutoinstSoftware.rb:454 #, fuzzy #| msgid "Archive created successfully" msgid "Image created successfully" msgstr "Archive created successfully" #. copy a directory (ends with / in directory.yast) -#: src/modules/AutoinstSoftware.rb:478 +#: src/modules/AutoinstSoftware.rb:490 msgid "" "can not get the directory.yast file at `%1`.\n" "You can create that file with 'ls -F > directory.yast' if it's missing." msgstr "" #. don't copy subdirs. They have to be mentioned explicit. Copy only files from that dir. -#: src/modules/AutoinstSoftware.rb:512 +#: src/modules/AutoinstSoftware.rb:524 #, fuzzy #| msgid "Cannot read configuration file." msgid "can not read '%1'. Try again?" msgstr "Cannot read configuration file." #. copy a file -#: src/modules/AutoinstSoftware.rb:530 +#: src/modules/AutoinstSoftware.rb:542 #, fuzzy #| msgid "Cannot read configuration file." msgid "can not read '%1'. ISO creation failed" msgstr "Cannot read configuration file." #. we will have the image.tar.gz and autoinst.xml on the root of the DVD/CD -#: src/modules/AutoinstSoftware.rb:560 +#: src/modules/AutoinstSoftware.rb:572 #, fuzzy #| msgid "Creating ISO image directory..." msgid "Preparing ISO Filestructure ..." msgstr "Creating ISO image directory..." #. prepare and save isolinux.cfg boot menu of the media -#: src/modules/AutoinstSoftware.rb:609 +#: src/modules/AutoinstSoftware.rb:621 msgid "boot config for the DVD" msgstr "" -#: src/modules/AutoinstSoftware.rb:613 +#: src/modules/AutoinstSoftware.rb:625 msgid "Ok" msgstr "Ok" -#: src/modules/AutoinstSoftware.rb:616 +#: src/modules/AutoinstSoftware.rb:628 msgid "" "You can do changes to the ISO now in %1, like adding a complete different AutoYaST XML file.\n" "If you press the ok-button, the iso will be created." @@ -2765,19 +2821,19 @@ #. create the actual ISO file #. Popup::Message( _("Please choose a place where you want to save the ISO file in the next dialog") ); -#: src/modules/AutoinstSoftware.rb:635 +#: src/modules/AutoinstSoftware.rb:647 #, fuzzy #| msgid "Creating ISO image..." msgid "Store ISO image to ..." msgstr "Creating ISO image..." -#: src/modules/AutoinstSoftware.rb:636 +#: src/modules/AutoinstSoftware.rb:648 #, fuzzy #| msgid "Creating ISO image..." msgid "Creating ISO File ..." msgstr "Creating ISO image..." -#: src/modules/AutoinstSoftware.rb:657 +#: src/modules/AutoinstSoftware.rb:669 #, fuzzy #| msgid "Successfully Tested %1" msgid "ISO successfully created at %1" @@ -2785,29 +2841,29 @@ #. Summary #. @return Html formatted configuration summary -#: src/modules/AutoinstSoftware.rb:733 +#: src/modules/AutoinstSoftware.rb:745 msgid "Selected Patterns" msgstr "Selected Patterns" -#: src/modules/AutoinstSoftware.rb:743 +#: src/modules/AutoinstSoftware.rb:755 msgid "Individually Selected Packages" msgstr "Individually Selected Packages" -#: src/modules/AutoinstSoftware.rb:749 +#: src/modules/AutoinstSoftware.rb:761 msgid "Packages to Remove" msgstr "Packages to Remove" -#: src/modules/AutoinstSoftware.rb:756 +#: src/modules/AutoinstSoftware.rb:768 msgid "Force Kernel Package" msgstr "Force Kernel Package" #. set SoftLock to avoid the installation of recommended patterns (#159466) -#: src/modules/AutoinstSoftware.rb:846 +#: src/modules/AutoinstSoftware.rb:858 msgid "Could not set patterns: %1." msgstr "Could not set patterns: %1." #. Solve dependencies -#: src/modules/AutoinstSoftware.rb:907 +#: src/modules/AutoinstSoftware.rb:919 msgid "The package resolver run failed. Please check your software section in the autoyast profile." msgstr "The package resolver run failed. Please check your software section in the autoyast profile." @@ -2817,24 +2873,31 @@ msgid "The partition plan configured in your XML profile does not fit on the hard disk. %1MB missing" msgstr "The partition plan configured in your XML profile does not fit on the harddisk. %1MB missing" -#: src/modules/AutoinstStorage.rb:922 +#: src/modules/AutoinstStorage.rb:917 +#, fuzzy +#| msgid "Total of %1 drive" +#| msgid_plural "Total of %1 drives" +msgid "Total of %1 drive" +msgstr "Total of %1 drive" + +#: src/modules/AutoinstStorage.rb:923 msgid "No specific device configured" msgstr "No specific device configured" #. Handle /etc/fstab usage #. @return [Boolean] -#: src/modules/AutoinstStorage.rb:1017 +#: src/modules/AutoinstStorage.rb:1018 msgid "Evaluating root partition. One moment please..." msgstr "Evaluating root partition. One moment please..." #. a popup -#: src/modules/AutoinstStorage.rb:1025 +#: src/modules/AutoinstStorage.rb:1026 msgid "No Linux root partition found." msgstr "No Linux root partition found." #. We must only change RootPart::selectedRootPartition if booting #. is inevitable. -#: src/modules/AutoinstStorage.rb:1038 +#: src/modules/AutoinstStorage.rb:1039 msgid "" "Multiple root partitions found, but you did not configure\n" "which root partition should be used. Automatic installation not possible.\n" @@ -2843,20 +2906,20 @@ "which root partition should be used. Automatic installation not possible.\n" #. return list of available devices -#: src/modules/AutoinstStorage.rb:1121 +#: src/modules/AutoinstStorage.rb:1122 msgid "device '%1' not found by storage backend" msgstr "" #. Prepare Profile for saving and remove empty data structs #. @return [void] -#: src/modules/Profile.rb:338 +#: src/modules/Profile.rb:359 msgid "Collecting configuration data..." msgstr "Collecting configuration data..." #. Save YCP data into XML #. @param path to file #. @return [Boolean] true on success -#: src/modules/Profile.rb:441 +#: src/modules/Profile.rb:462 msgid "Encrypted AutoYaST profile. Enter the password twice." msgstr "" @@ -2864,7 +2927,7 @@ #. #. @param [String] dir - directory to store section xml files in #. @return - list of filenames -#: src/modules/Profile.rb:515 +#: src/modules/Profile.rb:536 #, fuzzy msgid "Could not write section %1 to file %2." msgstr "Cannot write comment to file %1." @@ -2872,7 +2935,7 @@ #. Read XML into YCP data #. @param path to file #. @return [Boolean] -#: src/modules/Profile.rb:682 src/modules/ProfileLocation.rb:190 +#: src/modules/Profile.rb:703 src/modules/ProfileLocation.rb:190 msgid "Encrypted AutoYaST profile. Enter the correct password." msgstr "" Modified: trunk/yast/en_GB/po/base.en_GB.po =================================================================== --- trunk/yast/en_GB/po/base.en_GB.po 2015-09-09 08:18:21 UTC (rev 92602) +++ trunk/yast/en_GB/po/base.en_GB.po 2015-09-09 08:19:44 UTC (rev 92603) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: base\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-10-29 16:22+0100\n" +"POT-Creation-Date: 2015-08-25 18:37+0200\n" "PO-Revision-Date: 2008-03-27 19:13+0000\n" "Last-Translator: Benjamin Weber \n" "Language-Team: \n" @@ -28,129 +28,129 @@ msgstr "" #. translators: help for 'help' option on command line -#: library/commandline/src/modules/CommandLine.rb:55 +#: library/commandline/src/modules/CommandLine.rb:54 msgid "Print the help for this module" msgstr "Print the help for this module" #. translators: help for 'longhelp' option on command line -#: library/commandline/src/modules/CommandLine.rb:61 +#: library/commandline/src/modules/CommandLine.rb:60 msgid "Print a long version of help for this module" msgstr "Print a long version of help for this module" #. translators: help for 'xmlhelp' option on command line -#: library/commandline/src/modules/CommandLine.rb:67 +#: library/commandline/src/modules/CommandLine.rb:66 msgid "Print a long version of help for this module in XML format" msgstr "Print a long version of help for this module in XML format" #. translators: help for 'interactive' option on command line -#: library/commandline/src/modules/CommandLine.rb:73 +#: library/commandline/src/modules/CommandLine.rb:72 msgid "Start interactive shell to control the module" msgstr "Start interactive shell to control the module" #. translators: help for 'exit' command line interactive mode -#: library/commandline/src/modules/CommandLine.rb:79 +#: library/commandline/src/modules/CommandLine.rb:78 msgid "Exit interactive mode and save the changes" msgstr "Exit interactive mode and save the changes" #. translators: help for 'abort' command line interactive mode -#: library/commandline/src/modules/CommandLine.rb:85 +#: library/commandline/src/modules/CommandLine.rb:84 msgid "Abort interactive mode without saving the changes" msgstr "Abort interactive mode without saving the changes" #. translators: command line "help" option -#: library/commandline/src/modules/CommandLine.rb:93 +#: library/commandline/src/modules/CommandLine.rb:92 msgid "Print the help for this command" msgstr "Print the help for this command" #. translators: command line "verbose" option -#: library/commandline/src/modules/CommandLine.rb:99 +#: library/commandline/src/modules/CommandLine.rb:98 msgid "Show progress information" msgstr "Show progress information" #. translators: command line "xmlfile" option -#: library/commandline/src/modules/CommandLine.rb:105 +#: library/commandline/src/modules/CommandLine.rb:104 msgid "Where to store the XML output" msgstr "Where to store the XML output" #. string: command line interface is not supported -#: library/commandline/src/modules/CommandLine.rb:146 +#: library/commandline/src/modules/CommandLine.rb:144 msgid "This YaST2 module does not support the command line interface." msgstr "This YaST2 module does not support the command line interface." #. translators: default error message for command line -#: library/commandline/src/modules/CommandLine.rb:328 +#: library/commandline/src/modules/CommandLine.rb:324 msgid "Use 'help' for a complete list of available commands." msgstr "Use 'help' for a complete list of available commands." #. translators: default error message for command line -#: library/commandline/src/modules/CommandLine.rb:333 +#: library/commandline/src/modules/CommandLine.rb:329 msgid "Use 'yast2 %1 help' for a complete list of available commands." msgstr "Use 'yast2 %1 help' for a complete list of available commands." #. translators: error message in command line interface -#: library/commandline/src/modules/CommandLine.rb:371 +#: library/commandline/src/modules/CommandLine.rb:367 msgid "Unknown Command: %1" msgstr "Unknown Command: %1" #. translators: error message - user did not provide a value for option %1 on the command line -#: library/commandline/src/modules/CommandLine.rb:409 +#: library/commandline/src/modules/CommandLine.rb:405 msgid "Option '%1' is missing value." msgstr "Option '%1' is missing value." #. translators: error message, %1 is a command, %2 is the wrong option given by the user -#: library/commandline/src/modules/CommandLine.rb:445 +#: library/commandline/src/modules/CommandLine.rb:440 msgid "Unknown option for command '%1': %2" msgstr "Unknown option for command '%1': %2" #. translators: error message, %2 is the value given #. translators: error message, %2 is the value given #. translators: error message, %2 is the value given -#: library/commandline/src/modules/CommandLine.rb:466 -#: library/commandline/src/modules/CommandLine.rb:478 -#: library/commandline/src/modules/CommandLine.rb:488 +#: library/commandline/src/modules/CommandLine.rb:461 +#: library/commandline/src/modules/CommandLine.rb:473 +#: library/commandline/src/modules/CommandLine.rb:483 msgid "Invalid value for option '%1': %2" msgstr "Invalid value for option '%1': %2" #. translators: error message, %2 is expected type, %3 is the value given -#: library/commandline/src/modules/CommandLine.rb:506 +#: library/commandline/src/modules/CommandLine.rb:501 msgid "Invalid value for option '%1' -- expected '%2', received %3" msgstr "Invalid value for option '%1' -- expected '%2', received %3" #. translators: error message if option has a value, but cannot have one -#: library/commandline/src/modules/CommandLine.rb:527 +#: library/commandline/src/modules/CommandLine.rb:522 msgid "Option '%1' cannot have a value. Given value: %2" msgstr "Option '%1' cannot have a value. Given value: %2" #. translators: error message, how to get command line help for interactive mode #. %1 is the module name, %2 is the action name -#: library/commandline/src/modules/CommandLine.rb:546 +#: library/commandline/src/modules/CommandLine.rb:541 msgid "Use '%1 %2 help' for a complete list of available options." msgstr "Use '%1 %2 help' for a complete list of available options." #. translators: error message, how to get command line help for non-interactive mode #. %1 is the module name, %2 is the action name -#: library/commandline/src/modules/CommandLine.rb:556 +#: library/commandline/src/modules/CommandLine.rb:551 msgid "Use 'yast2 %1 %2 help' for a complete list of available options." msgstr "Use 'yast2 %1 %2 help' for a complete list of available options." #. translators: command line interface header, %1 is identification of the module -#: library/commandline/src/modules/CommandLine.rb:574 +#: library/commandline/src/modules/CommandLine.rb:569 msgid "YaST Configuration Module %1\n" msgstr "YaST Configuration Module %1\n" #. translators: the command does not provide any help -#: library/commandline/src/modules/CommandLine.rb:598 +#: library/commandline/src/modules/CommandLine.rb:593 msgid "No help available" msgstr "No help available" #. Process <command> "help" #. translators: %1 is the command name -#: library/commandline/src/modules/CommandLine.rb:602 +#: library/commandline/src/modules/CommandLine.rb:597 msgid "Command '%1'" msgstr "Command '%1'" #. translators: command line options -#: library/commandline/src/modules/CommandLine.rb:622 +#: library/commandline/src/modules/CommandLine.rb:617 msgid "" "\n" " Options:" @@ -159,7 +159,7 @@ " Options:" #. additional help for using command line -#: library/commandline/src/modules/CommandLine.rb:712 +#: library/commandline/src/modules/CommandLine.rb:706 msgid "" "\n" " Options of the [string] type must be written in the form 'option=value'." @@ -168,7 +168,7 @@ " Options of the [string] type must be written in the form 'option=value'." #. translators: example title for command line -#: library/commandline/src/modules/CommandLine.rb:719 +#: library/commandline/src/modules/CommandLine.rb:713 msgid "" "\n" " Example:" @@ -177,139 +177,139 @@ " Example:" #. translators: default module description if none is provided by the module itself -#: library/commandline/src/modules/CommandLine.rb:749 +#: library/commandline/src/modules/CommandLine.rb:743 #, fuzzy #| msgid "This is a YaST2 module." msgid "This is a YaST module." msgstr "This is a YaST module." #. translators: short help title for command line -#: library/commandline/src/modules/CommandLine.rb:754 +#: library/commandline/src/modules/CommandLine.rb:748 msgid "Basic Syntax:" msgstr "Basic Syntax:" #. translators: module command line help, %1 is the module name #. translate <command> and [options] only! -#: library/commandline/src/modules/CommandLine.rb:769 +#: library/commandline/src/modules/CommandLine.rb:763 msgid " yast2 %1 <command> [verbose] [options]" msgstr " yast2 %1 <command> [verbose] [options]" #. translators: module command line help, %1 is the module name #. translate <command> only! -#: library/commandline/src/modules/CommandLine.rb:796 +#: library/commandline/src/modules/CommandLine.rb:790 msgid " yast2 %1 <command> help" msgstr " yast2 %1 <command> help" #. translators: module command line help #. translate <command> and [options] only! -#: library/commandline/src/modules/CommandLine.rb:803 +#: library/commandline/src/modules/CommandLine.rb:797 msgid " <command> [options]" msgstr " <command> [options]" #. translators: module command line help #. translate <command> only! -#: library/commandline/src/modules/CommandLine.rb:806 +#: library/commandline/src/modules/CommandLine.rb:800 msgid " <command> help" msgstr " <command> help" #. translators: command line title: list of available commands -#: library/commandline/src/modules/CommandLine.rb:818 +#: library/commandline/src/modules/CommandLine.rb:812 msgid "Commands:" msgstr "Commands:" #. translators: error message: module does not provide any help messages -#: library/commandline/src/modules/CommandLine.rb:834 +#: library/commandline/src/modules/CommandLine.rb:828 msgid "No help available." msgstr "No help available." #. fallback message - invalid help has been provided by the yast module -#: library/commandline/src/modules/CommandLine.rb:870 +#: library/commandline/src/modules/CommandLine.rb:864 msgid "" msgstr "" #. translators: module command line help, %1 is the module name -#: library/commandline/src/modules/CommandLine.rb:880 +#: library/commandline/src/modules/CommandLine.rb:874 msgid "Run 'yast2 %1 <command> help' for a list of available options." msgstr "Run 'yast2 %1 <command> help' for a list of available options." #. error message - command line option xmlfile is missing -#: library/commandline/src/modules/CommandLine.rb:944 +#: library/commandline/src/modules/CommandLine.rb:938 msgid "Target file name ('xmlfile' option) is missing. Use xmlfile= command line option." msgstr "Target file name ('xmlfile' option) is missing. Use xmlfile= command line option." #. error message - command line option xmlfile is missing -#: library/commandline/src/modules/CommandLine.rb:956 +#: library/commandline/src/modules/CommandLine.rb:950 msgid "Target file name ('xmlfile' option) is empty. Use xmlfile= command line option." msgstr "Target file name ('xmlfile' option) is empty. Use xmlfile= command line option." #. translators: fallback name for a module at command line -#: library/commandline/src/modules/CommandLine.rb:1096 +#: library/commandline/src/modules/CommandLine.rb:1087 msgid "unknown" msgstr "unknown" #. translators: the last command %1 in a list of unique commands -#: library/commandline/src/modules/CommandLine.rb:1470 +#: library/commandline/src/modules/CommandLine.rb:1461 msgid "or '%1'" msgstr "or '%1'" #. translators: error message - missing unique command for command line execution -#: library/commandline/src/modules/CommandLine.rb:1478 +#: library/commandline/src/modules/CommandLine.rb:1469 msgid "Specify the command '%1'." msgstr "Specify the command '%1'." #. translators: error message - missing unique command for command line execution -#: library/commandline/src/modules/CommandLine.rb:1485 +#: library/commandline/src/modules/CommandLine.rb:1476 msgid "Specify one of the commands: %1." msgstr "Specify one of the commands: %1." #. size( unique_options ) == 1 here does not make sense -#: library/commandline/src/modules/CommandLine.rb:1495 +#: library/commandline/src/modules/CommandLine.rb:1486 msgid "Specify only one of the commands: %1." msgstr "Specify only one of the commands: %1." #. translators: error message - the module does not provide command line interface -#: library/commandline/src/modules/CommandLine.rb:1581 +#: library/commandline/src/modules/CommandLine.rb:1531 msgid "There is no user interface available for this module." msgstr "There is no user interface available for this module." #. translators: progress message - command line interface ready -#: library/commandline/src/modules/CommandLine.rb:1619 +#: library/commandline/src/modules/CommandLine.rb:1560 msgid "Ready" msgstr "Ready" #. non-GUI handling -#: library/commandline/src/modules/CommandLine.rb:1643 +#: library/commandline/src/modules/CommandLine.rb:1574 msgid "Initializing" msgstr "Initialising" #. translators: Progress message - the command line interface is about to finish -#: library/commandline/src/modules/CommandLine.rb:1690 +#: library/commandline/src/modules/CommandLine.rb:1610 msgid "Finishing" msgstr "Finishing" #. translators: The command line interface is finished -#: library/commandline/src/modules/CommandLine.rb:1707 +#: library/commandline/src/modules/CommandLine.rb:1617 msgid "Done" msgstr "Done" #. translators: The command line interface is finished without writing the changes -#: library/commandline/src/modules/CommandLine.rb:1710 +#: library/commandline/src/modules/CommandLine.rb:1620 msgid "Quitting (without changes)" msgstr "Quitting (without changes)" #. prompt message displayed in the commandline mode #. when user is asked to replay "yes" or "no" (localized) -#: library/commandline/src/modules/CommandLine.rb:1724 +#: library/commandline/src/modules/CommandLine.rb:1634 msgid "yes or no?" msgstr "yes or no?" #. yes - used in the command line mode as input text for yes/no confirmation -#: library/commandline/src/modules/CommandLine.rb:1729 +#: library/commandline/src/modules/CommandLine.rb:1639 msgid "yes" msgstr "yes" #. no - used in the command line mode as input text for yes/no confirmation -#: library/commandline/src/modules/CommandLine.rb:1732 +#: library/commandline/src/modules/CommandLine.rb:1642 msgid "no" msgstr "no" @@ -376,7 +376,7 @@ #. %1 - link to our bugzilla #. %2 - directory where YaST logs are stored #. %3 - link to the Yast Bug Reporting HOWTO Web page -#: library/control/src/modules/InstError.rb:155 +#: library/control/src/modules/InstError.rb:157 msgid "" "This is worth reporting a bug at %1.\n" "Please, attach also all YaST logs stored in the '%2' directory.\n" @@ -389,13 +389,13 @@ #. link to the Yast Bug Reporting HOWTO #. for translators: use the localized page for your language if it exists, #. check the combo box "In other laguages" on top of the page -#: library/control/src/modules/InstError.rb:165 -#: library/control/src/modules/ProductControl.rb:1481 +#: library/control/src/modules/InstError.rb:167 +#: library/control/src/modules/ProductControl.rb:1444 msgid "http://en.opensuse.org/Bugs/YaST" msgstr "" #. FIXME: BNC #422612, Use `opt(`noSanityCheck) later -#: library/control/src/modules/InstError.rb:176 +#: library/control/src/modules/InstError.rb:178 #, fuzzy msgid "&Save YaST Logs..." msgstr "Save Log as..." @@ -404,17 +404,39 @@ #. from YaST logs. #. #. @param [String] error_text (e.g., "Client inst_abc returned invalid data.") -#: library/control/src/modules/InstError.rb:223 +#: library/control/src/modules/InstError.rb:226 msgid "Installation Error" msgstr "Installation Error" +#. Load a rpm package from the media into the inst-sys and ensure its +#. unloading after end of block. +#. @param [String] package to load +#. @param [Proc] Block to be yield +#. @raises [RuntimeError] when package loading failed +#. +#. @example +#. InstExtensionImage.with_extension("snapper") do +#. WFM.Execute(path(".local.bash"), "snapper magic") +#. end +#: library/control/src/modules/InstExtensionImage.rb:352 +#, fuzzy +#| msgid "Loading packages list..." +msgid "Loading to memory package '%s'" +msgstr "Loading packages list..." + +#: library/control/src/modules/InstExtensionImage.rb:358 +#, fuzzy +#| msgid "Removing Packages..." +msgid "Removing from memory package '%s'" +msgstr "Removing Packages..." + #. error report -#: library/control/src/modules/ProductControl.rb:1289 +#: library/control/src/modules/ProductControl.rb:1253 msgid "No workflow defined for this installation mode." msgstr "No workflow defined for this installation mode." #. last part of the question (variable) -#: library/control/src/modules/ProductProfile.rb:182 +#: library/control/src/modules/ProductProfile.rb:180 #, fuzzy #| msgid "" #| "Do you really want\n" @@ -426,20 +448,20 @@ #. button label #. Button that will continue with the installation -#: library/control/src/modules/ProductProfile.rb:185 -#: library/general/src/modules/Popup.rb:837 +#: library/control/src/modules/ProductProfile.rb:183 +#: library/general/src/modules/Popup.rb:744 msgid "&Continue Installation" msgstr "&Continue Installation" #. button label #. Button that will really abort the installation -#: library/control/src/modules/ProductProfile.rb:187 -#: library/general/src/modules/Popup.rb:835 +#: library/control/src/modules/ProductProfile.rb:185 +#: library/general/src/modules/Popup.rb:742 msgid "&Abort Installation" msgstr "&Abort Installation" #. last part of the question (variable) -#: library/control/src/modules/ProductProfile.rb:192 +#: library/control/src/modules/ProductProfile.rb:190 #, fuzzy #| msgid "Do you want to retry?" msgid "Do you want to add new product anyway?" @@ -447,13 +469,13 @@ #. popup dialog caption #. this string is usually used as headline of a popup -#: library/control/src/modules/ProductProfile.rb:199 +#: library/control/src/modules/ProductProfile.rb:197 #: library/general/src/modules/Label.rb:256 msgid "Warning" msgstr "Warning" #. popup message, %1 is list of problems -#: library/control/src/modules/ProductProfile.rb:202 +#: library/control/src/modules/ProductProfile.rb:200 msgid "" "The profile does not allow you to run the products on this system.\n" "Proceeding to run this installation will leave you in an unsupported state\n" @@ -468,7 +490,7 @@ #. make sure that every workflow is merged only once #. bugzilla #332436 -#: library/control/src/modules/WorkflowManager.rb:1319 +#: library/control/src/modules/WorkflowManager.rb:1315 #, fuzzy #| msgid "An internal error occured when integrating additional workflow." msgid "An internal error occurred when integrating additional workflow." @@ -480,7 +502,7 @@ msgstr "The value of %1 is invalid." #. service status - label -#: library/cwm/src/modules/CWMServiceStart.rb:68 +#: library/cwm/src/modules/CWMServiceStart.rb:67 msgid "Unavailable" msgstr "Unavailable" @@ -489,7 +511,7 @@ #. %1 is eg. "On -- Start Service when Booting" #. %2 is eg. "Off -- Start Service Manually" #. (both without quotes) -#: library/cwm/src/modules/CWMServiceStart.rb:227 +#: library/cwm/src/modules/CWMServiceStart.rb:225 msgid "" "<p><b><big>Service Start</big></b><br>\n" "To start the service every time your computer is booted, set\n" @@ -505,7 +527,7 @@ #. %2 is eg. "Off -- Start Service Manually" #. %3 is eg. "Start Service via xinetd" #. (both without quotes) -#: library/cwm/src/modules/CWMServiceStart.rb:243 +#: library/cwm/src/modules/CWMServiceStart.rb:241 msgid "" "<p><b><big>Service Start</big></b><br>\n" "To start the service every time your computer is booted, set\n" @@ -520,43 +542,43 @@ #. part of help text - radio button label, NO SHORTCUT!!! #. part of help text - radio button label, NO SHORTCUT!!! #. radio button -#: library/cwm/src/modules/CWMServiceStart.rb:257 -#: library/cwm/src/modules/CWMServiceStart.rb:269 -#: library/cwm/src/modules/CWMServiceStart.rb:317 +#: library/cwm/src/modules/CWMServiceStart.rb:255 +#: library/cwm/src/modules/CWMServiceStart.rb:267 +#: library/cwm/src/modules/CWMServiceStart.rb:315 msgid "During Boot" msgstr "During Boot" #. part of help text - radio button label, NO SHORTCUT!!! #. part of help text - radio button label, NO SHORTCUT!!! #. radio button -#: library/cwm/src/modules/CWMServiceStart.rb:259 -#: library/cwm/src/modules/CWMServiceStart.rb:271 -#: library/cwm/src/modules/CWMServiceStart.rb:324 +#: library/cwm/src/modules/CWMServiceStart.rb:257 +#: library/cwm/src/modules/CWMServiceStart.rb:269 +#: library/cwm/src/modules/CWMServiceStart.rb:322 msgid "Manually" msgstr "Manually" #. part of help text - radio button label, NO SHORTCUT!!! -#: library/cwm/src/modules/CWMServiceStart.rb:273 +#: library/cwm/src/modules/CWMServiceStart.rb:271 msgid "Via xinetd" msgstr "Via xinetd" #. radio button -#: library/cwm/src/modules/CWMServiceStart.rb:331 +#: library/cwm/src/modules/CWMServiceStart.rb:329 msgid "Via &xinetd" msgstr "Via &xinetd" #. frame -#: library/cwm/src/modules/CWMServiceStart.rb:376 +#: library/cwm/src/modules/CWMServiceStart.rb:374 msgid "Service Start" msgstr "Service Start" #. service status - label -#: library/cwm/src/modules/CWMServiceStart.rb:467 +#: library/cwm/src/modules/CWMServiceStart.rb:465 msgid "Service is running" msgstr "Service is running" #. service status - label -#: library/cwm/src/modules/CWMServiceStart.rb:473 +#: library/cwm/src/modules/CWMServiceStart.rb:471 msgid "Service is not running" msgstr "Service is not running" @@ -565,7 +587,7 @@ #. %1 is eg. "Start the Service Now" #. %2 is eg. "Stop the Service Now" #. (both without quotes) -#: library/cwm/src/modules/CWMServiceStart.rb:506 +#: library/cwm/src/modules/CWMServiceStart.rb:504 msgid "" "<p><b><big>Switch On or Off</big></b><br>\n" "To start or stop the service immediately, use \n" @@ -579,7 +601,7 @@ #. %3 is push button label, eg. "Save Changes and Restart Service Now" #. (without quotes) #. note: %3 is correct, do not replace with %1!!! -#: library/cwm/src/modules/CWMServiceStart.rb:518 +#: library/cwm/src/modules/CWMServiceStart.rb:516 msgid "" "<p>To save all changes and restart the\n" "service immediately, use <b>%3</b>.</p>\n" @@ -588,32 +610,32 @@ "service immediately, use <b>%3</b>.</p>\n" #. part of help text - push button label, NO SHORTCUT!!! -#: library/cwm/src/modules/CWMServiceStart.rb:533 +#: library/cwm/src/modules/CWMServiceStart.rb:531 msgid "Start the Service Now" msgstr "Start the Service Now" #. part of help text - push button label, NO SHORTCUT!!! -#: library/cwm/src/modules/CWMServiceStart.rb:535 +#: library/cwm/src/modules/CWMServiceStart.rb:533 msgid "Stop the Service Now" msgstr "Stop the Service Now" #. part of help text - push button label, NO SHORTCUT!!! -#: library/cwm/src/modules/CWMServiceStart.rb:537 +#: library/cwm/src/modules/CWMServiceStart.rb:535 msgid "Save Changes and Restart Service Now" msgstr "Save Changes and Restart Service Now" #. push button for immediate service starting -#: library/cwm/src/modules/CWMServiceStart.rb:579 +#: library/cwm/src/modules/CWMServiceStart.rb:577 msgid "&Start the Service Now" msgstr "&Start the Service Now" #. push button for immediate service stopping -#: library/cwm/src/modules/CWMServiceStart.rb:586 +#: library/cwm/src/modules/CWMServiceStart.rb:584 msgid "S&top the Service Now" msgstr "S&top the Service Now" #. push button for immediate saving of the settings and service starting -#: library/cwm/src/modules/CWMServiceStart.rb:593 +#: library/cwm/src/modules/CWMServiceStart.rb:591 msgid "S&ave Changes and Restart Service Now" msgstr "S&ave Changes and Restart Service Now" @@ -629,7 +651,7 @@ #. help text for LDAP enablement widget #. %1 is button label, eg. "LDAP Support Active" (without quotes) -#: library/cwm/src/modules/CWMServiceStart.rb:731 +#: library/cwm/src/modules/CWMServiceStart.rb:730 msgid "" "<p><b><big>LDAP Support</big></b><br>\n" "To store the settings in LDAP instead of native configuration files,\n" @@ -640,38 +662,38 @@ "set <b>%1</b>.</p>" #. part of help text - check box label, NO SHORTCUT!!! -#: library/cwm/src/modules/CWMServiceStart.rb:744 +#: library/cwm/src/modules/CWMServiceStart.rb:743 msgid "LDAP Support Active" msgstr "LDAP Support Active" #. check box -#: library/cwm/src/modules/CWMServiceStart.rb:773 +#: library/cwm/src/modules/CWMServiceStart.rb:772 msgid "&LDAP Support Active" msgstr "&LDAP Support Active" #. Fallback label for a tab if no is defined -#: library/cwm/src/modules/CWMTab.rb:49 +#: library/cwm/src/modules/CWMTab.rb:48 msgid "Tab" msgstr "Tab" #. push button #. push button #. Button label -#: library/cwm/src/modules/CWMTable.rb:368 -#: library/cwm/src/modules/TablePopup.rb:943 +#: library/cwm/src/modules/CWMTable.rb:370 +#: library/cwm/src/modules/TablePopup.rb:940 #: library/general/src/modules/Label.rb:166 msgid "&Up" msgstr "&Up" #. push button #. push button -#: library/cwm/src/modules/CWMTable.rb:370 -#: library/cwm/src/modules/TablePopup.rb:945 +#: library/cwm/src/modules/CWMTable.rb:372 +#: library/cwm/src/modules/TablePopup.rb:942 msgid "&Down" msgstr "&Down" #. popup message -#: library/cwm/src/modules/CWMTsigKeys.rb:306 +#: library/cwm/src/modules/CWMTsigKeys.rb:302 msgid "" "The selected TSIG key cannot be deleted,\n" "because it is in use.\n" @@ -682,37 +704,37 @@ "Stop using it in the configuration first." #. popup title -#: library/cwm/src/modules/CWMTsigKeys.rb:312 +#: library/cwm/src/modules/CWMTsigKeys.rb:308 msgid "Cannot delete TSIG key." msgstr "Cannot delete TSIG key." #. popup headline -#: library/cwm/src/modules/CWMTsigKeys.rb:322 +#: library/cwm/src/modules/CWMTsigKeys.rb:318 msgid "Select File with the Authentication Key" msgstr "Select File with the Authentication Key" #. popup headline -#: library/cwm/src/modules/CWMTsigKeys.rb:337 +#: library/cwm/src/modules/CWMTsigKeys.rb:333 msgid "Select File for the Authentication Key" msgstr "Select File for the Authentication Key" #. error report -#: library/cwm/src/modules/CWMTsigKeys.rb:357 +#: library/cwm/src/modules/CWMTsigKeys.rb:353 msgid "Specified filename is an existing directory." msgstr "Specified filename is an existing directory." #. yes-no popup -#: library/cwm/src/modules/CWMTsigKeys.rb:362 +#: library/cwm/src/modules/CWMTsigKeys.rb:358 msgid "Specified file exists. Rewrite it?" msgstr "Specified file exists. Rewrite it?" #. error report -#: library/cwm/src/modules/CWMTsigKeys.rb:372 +#: library/cwm/src/modules/CWMTsigKeys.rb:368 msgid "The TSIG key ID was not specified." msgstr "The TSIG key ID was not specified." #. yes-no popup -#: library/cwm/src/modules/CWMTsigKeys.rb:379 +#: library/cwm/src/modules/CWMTsigKeys.rb:375 msgid "" "The key with the specified ID exists and is used.\n" "Remove it?" @@ -721,7 +743,7 @@ "Remove it?" #. yes-no popup -#: library/cwm/src/modules/CWMTsigKeys.rb:399 +#: library/cwm/src/modules/CWMTsigKeys.rb:395 msgid "" "A key with the specified ID was found\n" "on your disk. Remove it?" @@ -730,27 +752,27 @@ "on your disk. Remove it?" #. yes-no popup -#: library/cwm/src/modules/CWMTsigKeys.rb:424 +#: library/cwm/src/modules/CWMTsigKeys.rb:420 msgid "The key will be created now. Continue?" msgstr "The key will be created now. Continue?" #. error report -#: library/cwm/src/modules/CWMTsigKeys.rb:440 +#: library/cwm/src/modules/CWMTsigKeys.rb:436 msgid "Creating the TSIG key failed." msgstr "Creating the TSIG key failed." #. message popup -#: library/cwm/src/modules/CWMTsigKeys.rb:450 +#: library/cwm/src/modules/CWMTsigKeys.rb:446 msgid "The specified file does not exist." msgstr "The specified file does not exist." #. message popup -#: library/cwm/src/modules/CWMTsigKeys.rb:456 +#: library/cwm/src/modules/CWMTsigKeys.rb:452 msgid "The specified file does not contain any TSIG key." msgstr "The specified file does not contain any TSIG key." #. yes-no popup -#: library/cwm/src/modules/CWMTsigKeys.rb:466 +#: library/cwm/src/modules/CWMTsigKeys.rb:462 msgid "" "The specified file contains a TSIG key with the same\n" "identifier as some of already present keys.\n" @@ -761,7 +783,7 @@ "Old keys will be removed. Continue?" #. tsig keys management dialog help 1/4 -#: library/cwm/src/modules/CWMTsigKeys.rb:570 +#: library/cwm/src/modules/CWMTsigKeys.rb:565 msgid "" "<p><big><b>TSIG Key Management</b></big><br>\n" "Use this dialog to manage the TSIG keys.</p>\n" @@ -770,7 +792,7 @@ "Use this dialogue to manage the TSIG keys.</p>\n" #. tsig keys management dialog help 2/4 -#: library/cwm/src/modules/CWMTsigKeys.rb:574 +#: library/cwm/src/modules/CWMTsigKeys.rb:569 msgid "" "<p><big><b>Adding an Existing TSIG Key</b></big><br>\n" "To add an already created TSIG key, select a <b>Filename</b> of the file\n" @@ -781,7 +803,7 @@ "containing the key and click <b>Add</b>.</p>\n" #. tsig keys management dialog help 3/4 -#: library/cwm/src/modules/CWMTsigKeys.rb:580 +#: library/cwm/src/modules/CWMTsigKeys.rb:575 msgid "" "<p><big><b>Creating a New TSIG Key</b></big><br>\n" "To create a new TSIG key, set the <b>Filename</b> of the file in which to\n" @@ -794,7 +816,7 @@ "<b>Generate</b>.</p>\n" #. tsig keys management dialog help 4/4 -#: library/cwm/src/modules/CWMTsigKeys.rb:587 +#: library/cwm/src/modules/CWMTsigKeys.rb:582 msgid "" "<p><big><b>Removing a TSIG Key</b></big><br>\n" "To remove a configured TSIG key, select it and click <b>Delete</b>.\n" @@ -811,27 +833,27 @@ "in the configuration first.</p>\n" #. Frame label - adding a created server key -#: library/cwm/src/modules/CWMTsigKeys.rb:599 +#: library/cwm/src/modules/CWMTsigKeys.rb:594 msgid "Add an Existing TSIG Key" msgstr "Add an Existing TSIG Key" #. Frame label - creating a new server key -#: library/cwm/src/modules/CWMTsigKeys.rb:648 +#: library/cwm/src/modules/CWMTsigKeys.rb:643 msgid "Create a New TSIG Key" msgstr "Create a New TSIG Key" #. text entry -#: library/cwm/src/modules/CWMTsigKeys.rb:660 +#: library/cwm/src/modules/CWMTsigKeys.rb:655 msgid "&Key ID" msgstr "&Key ID" #. push button -#: library/cwm/src/modules/CWMTsigKeys.rb:692 +#: library/cwm/src/modules/CWMTsigKeys.rb:687 msgid "&Generate" msgstr "&Generate" #. Table header - in fact label -#: library/cwm/src/modules/CWMTsigKeys.rb:704 +#: library/cwm/src/modules/CWMTsigKeys.rb:699 msgid "Current TSIG Keys" msgstr "Current TSIG Keys" @@ -839,54 +861,54 @@ #. table header - GPG key ID #. table header - GPG key ID #. GnuPG key ID used as "Key ID: 1144AAAA444" -#: library/cwm/src/modules/CWMTsigKeys.rb:712 -#: library/gpg/src/modules/GPGWidgets.rb:193 -#: library/gpg/src/modules/GPGWidgets.rb:225 +#: library/cwm/src/modules/CWMTsigKeys.rb:707 +#: library/gpg/src/modules/GPGWidgets.rb:192 +#: library/gpg/src/modules/GPGWidgets.rb:224 #: library/packages/src/modules/SignatureCheckDialogs.rb:57 msgid "Key ID" msgstr "Key ID" #. Table header item - DNS key listing -#: library/cwm/src/modules/CWMTsigKeys.rb:714 +#: library/cwm/src/modules/CWMTsigKeys.rb:709 msgid "Filename" msgstr "Filename" #. combobox header -#: library/cwm/src/modules/TablePopup.rb:490 +#: library/cwm/src/modules/TablePopup.rb:487 msgid "&Selected Option" msgstr "&Selected Option" #. heading / label -#: library/cwm/src/modules/TablePopup.rb:539 +#: library/cwm/src/modules/TablePopup.rb:536 msgid "Current Option: " msgstr "Current Option: " #. error report -#: library/cwm/src/modules/TablePopup.rb:726 +#: library/cwm/src/modules/TablePopup.rb:720 msgid "The selected option is already present." msgstr "The selected option is already present." #. table header, shortcut for changed, keep very short -#: library/cwm/src/modules/TablePopup.rb:887 +#: library/cwm/src/modules/TablePopup.rb:882 msgid "Ch." msgstr "Ch." #. table header #. table header -#: library/cwm/src/modules/TablePopup.rb:889 -#: library/cwm/src/modules/TablePopup.rb:895 +#: library/cwm/src/modules/TablePopup.rb:884 +#: library/cwm/src/modules/TablePopup.rb:891 msgid "Option" msgstr "Option" #. table header #. table header -#: library/cwm/src/modules/TablePopup.rb:891 -#: library/cwm/src/modules/TablePopup.rb:897 +#: library/cwm/src/modules/TablePopup.rb:886 +#: library/cwm/src/modules/TablePopup.rb:893 msgid "Value" msgstr "Value" #. help 1/4 -#: library/cwm/src/modules/TablePopup.rb:902 +#: library/cwm/src/modules/TablePopup.rb:899 msgid "" "<p><b><big>Editing the Settings</big></b><br>\n" "To edit the settings, choose the appropriate\n" @@ -897,7 +919,7 @@ "entry of the table then click <b>Edit</b>.</p>" #. help 2/4, optional -#: library/cwm/src/modules/TablePopup.rb:911 +#: library/cwm/src/modules/TablePopup.rb:908 msgid "" "<p>To add a new option, click <b>Add</b>. To remove\n" "an option, select it and click <b>Delete</b>.</p>" @@ -906,7 +928,7 @@ "an option, select it and click <b>Delete</b>.</p>" #. help 3/4, optional -#: library/cwm/src/modules/TablePopup.rb:921 +#: library/cwm/src/modules/TablePopup.rb:918 msgid "" "<P>The <B>Ch.</B> column of the table shows \n" "whether the option was changed.</P>" @@ -915,7 +937,7 @@ "whether the option was changed.</P>" #. help 4/4, optional -#: library/cwm/src/modules/TablePopup.rb:931 +#: library/cwm/src/modules/TablePopup.rb:928 msgid "" "<p>To reorder the options, select an option\n" "and use <b>Up</b> and <b>Down</b> to move it up or down\n" @@ -926,42 +948,42 @@ "in the list.</p>" #. menu button -#: library/cwm/src/modules/WizardHW.rb:214 +#: library/cwm/src/modules/WizardHW.rb:209 msgid "&Other" msgstr "&Other" #. translators: message for hardware configuration without any configured #. device -#: library/cwm/src/modules/WizardHW.rb:525 +#: library/cwm/src/modules/WizardHW.rb:509 msgid "The device is not configured" msgstr "The device is not configured" #. translators: message for hardware configuration without any configured #. device -#: library/cwm/src/modules/WizardHW.rb:528 +#: library/cwm/src/modules/WizardHW.rb:512 msgid "Press <B>Edit</B> to configure" msgstr "Press <B>Edit</B> to configure" #. Message shown while loading modules information -#: library/desktop/src/clients/menu.rb:198 +#: library/desktop/src/clients/menu.rb:197 msgid "Loading modules, please wait ..." msgstr "Loading modules, please wait ..." #. Heading for NCurses Control Center -#: library/desktop/src/clients/menu.rb:226 +#: library/desktop/src/clients/menu.rb:224 #, fuzzy #| msgid "YaST2 Control Center" msgid "YaST Control Center" msgstr "YaST Control Center" -#: library/desktop/src/clients/menu.rb:264 +#: library/desktop/src/clients/menu.rb:262 #, fuzzy #| msgid "Rundi" msgid "Run" msgstr "Rundi" #. show popup when running as non-root -#: library/desktop/src/clients/menu.rb:275 +#: library/desktop/src/clients/menu.rb:273 #, fuzzy msgid "" "YaST2 Control Center is not running as root.\n" @@ -971,14 +993,14 @@ "You will only see modules which do not require root privileges." #. NCurses (textmode) Control Center headline -#: library/desktop/src/clients/menu.rb:323 +#: library/desktop/src/clients/menu.rb:320 #, fuzzy #| msgid "Controlling YaST2 ncurses with the Keyboard" msgid "Controlling YaST ncurses with the Keyboard" msgstr "Controlling YaST ncurses with the Keyboard" #. NCurses Control Center help 1/ -#: library/desktop/src/clients/menu.rb:326 +#: library/desktop/src/clients/menu.rb:323 msgid "" "<p>1) <i>General</i><br>\n" "Navigate through the dialog elements with [TAB] to go to\n" @@ -993,12 +1015,12 @@ "Some elements use arrow keys (e.g., to scroll in lists).</p>" #. NCurses Control Center help 2/10 -#: library/desktop/src/clients/menu.rb:334 +#: library/desktop/src/clients/menu.rb:331 msgid "<p>Tree navigation is also done by arrow keys. To open or close a branch use [SPACE]. For modules showing a tree (might look like a list) of configuration items on the left side use [ENTER] to get corresponding dialog on the right.</p>" msgstr "" #. NCurses Control Center help 3/10 -#: library/desktop/src/clients/menu.rb:341 +#: library/desktop/src/clients/menu.rb:338 msgid "" "<p>Buttons are equipped with shortcut keys (the highlighted\n" "letter). Use [ALT] and the letter to activate the button.</p>" @@ -1007,7 +1029,7 @@ "letter). Use [ALT] and the letter to activate the button.</p>" #. NCurses Control Center help 4/10 -#: library/desktop/src/clients/menu.rb:345 +#: library/desktop/src/clients/menu.rb:342 msgid "" "<p>Press [ESC] to close selection pop-ups (e.g., from\n" "menu buttons) without choosing anything.</p>\n" @@ -1016,7 +1038,7 @@ "menu buttons) without choosing anything.</p>\n" #. NCurses Control Center help 5/10 -#: library/desktop/src/clients/menu.rb:349 +#: library/desktop/src/clients/menu.rb:346 msgid "" "<p>2) <i>Substitution of Keystrokes</i><br>\n" "<p>Because the environment can affect the use of the keyboard,\n" @@ -1031,7 +1053,7 @@ "move focus forward with [CTRL] + [F] and backward with [CTRL] + [B].</p>" #. NCurses Control Center help 6/10 -#: library/desktop/src/clients/menu.rb:357 +#: library/desktop/src/clients/menu.rb:354 msgid "" "<p>If [ALT] + [letter] does not work,\n" "try [ESC] + [letter]. Example: [ESC] + [H] for [ALT] + [H].\n" @@ -1042,7 +1064,7 @@ "[ESC] + [TAB] is also a substitute for [ALT] + [TAB].</p>" #. NCurses Control Center help 7/10 -#: library/desktop/src/clients/menu.rb:363 +#: library/desktop/src/clients/menu.rb:360 #, fuzzy #| msgid "" #| "<p>3) <i>Function Keys</i><br>\n" @@ -1057,12 +1079,12 @@ "Press F1 to get the function key bindings for the current dialogue.</p>" #. NCurses Control Center help 8/10 -#: library/desktop/src/clients/menu.rb:370 +#: library/desktop/src/clients/menu.rb:367 msgid "<p>The F keys are usually connected to a certain action:</p>" msgstr "<p>The F keys are usually connected to a certain action:</p>" #. NCurses Control Center help 9/10 -#: library/desktop/src/clients/menu.rb:372 +#: library/desktop/src/clients/menu.rb:369 msgid "" "F1 = Help<br>\n" "F2 = Info or Description<br>\n" @@ -1087,7 +1109,7 @@ "F10 = OK, Next, Finish, or Accept<br>" #. NCurses Control Center help 10/10 -#: library/desktop/src/clients/menu.rb:385 +#: library/desktop/src/clients/menu.rb:382 msgid "" "<p>In some environments, all or some\n" "F keys are not available.</p>" @@ -1097,7 +1119,7 @@ #. TRANSLATORS: popup question (with continue / cancel buttons) #. %1 is the filesystem path -#: library/general/src/modules/FileUtils.rb:295 +#: library/general/src/modules/FileUtils.rb:292 msgid "" "Although the path %1 exists, it is not a directory.\n" "Continue or cancel the operation?\n" @@ -1107,7 +1129,7 @@ #. TRANSLATORS: question popup (with yes / no buttons). A user entered non-existent path #. for a share, %1 is entered path -#: library/general/src/modules/FileUtils.rb:309 +#: library/general/src/modules/FileUtils.rb:306 msgid "" "The path %1 does not exist.\n" "Create it now?\n" @@ -1117,7 +1139,7 @@ #. TRANSLATORS: popup question (with continue / cancel buttons) #. %1 is the name (path) of the directory -#: library/general/src/modules/FileUtils.rb:328 +#: library/general/src/modules/FileUtils.rb:325 msgid "" "Failed to create the directory %1.\n" "Continue or cancel the current operation?\n" @@ -1295,8 +1317,8 @@ #. this media (CD) so no packages from this media will be installed #. PushButton label #: library/general/src/modules/Label.rb:250 -#: library/packages/src/modules/PackageCallbacks.rb:889 -#: library/wizard/src/modules/Confirm.rb:127 +#: library/packages/src/modules/PackageCallbacks.rb:664 +#: library/wizard/src/modules/Confirm.rb:126 msgid "&Skip" msgstr "&Skip" @@ -1318,7 +1340,7 @@ #. TextEntry Label #. textentry label #: library/general/src/modules/Label.rb:319 -#: library/packages/src/modules/PackageCallbacks.rb:2581 +#: library/packages/src/modules/PackageCallbacks.rb:2230 msgid "&Password" msgstr "&Password" @@ -1536,34 +1558,34 @@ #. #. @param [String] directory containing the installed system (/ in installed system) #. @return [String] the release information -#: library/general/src/modules/OSRelease.rb:63 +#: library/general/src/modules/OSRelease.rb:62 #, fuzzy #| msgid "listen value to delete not found" msgid "Release file %{file} not found" msgstr "listen value to delete not found" #. Confirm user request to abort installation -#: library/general/src/modules/Popup.rb:833 +#: library/general/src/modules/Popup.rb:740 msgid "Really abort the installation?" msgstr "Really abort the installation?" #. Confirm user request to abort System Repair -#: library/general/src/modules/Popup.rb:844 +#: library/general/src/modules/Popup.rb:749 msgid "Really abort YaST System Repair?" msgstr "Really abort YaST System Repair?" #. Button that will really abort the repair -#: library/general/src/modules/Popup.rb:846 +#: library/general/src/modules/Popup.rb:751 msgid "Abort System Repair" msgstr "Abort System Repair" #. Button that will continue with the repair -#: library/general/src/modules/Popup.rb:848 +#: library/general/src/modules/Popup.rb:753 msgid "&Continue System Repair" msgstr "&Continue System Repair" #. Warning text for aborting an installation before anything is installed -#: library/general/src/modules/Popup.rb:851 +#: library/general/src/modules/Popup.rb:756 msgid "" "If you abort the installation now,\n" "Linux will not be installed.\n" @@ -1576,7 +1598,7 @@ #. Warning text for aborting an installation during the install process #. - After some installation steps have been performed - e.g. #. disks formatted / some packages already installed -#: library/general/src/modules/Popup.rb:862 +#: library/general/src/modules/Popup.rb:766 msgid "" "If you abort the installation now, you will\n" "have an incomplete Linux system\n" @@ -1590,7 +1612,7 @@ #. Warning text for aborting an installation during the install process #. right in the middle of some critical process (e.g. formatting) -#: library/general/src/modules/Popup.rb:871 +#: library/general/src/modules/Popup.rb:775 msgid "" "If you abort the installation now,\n" "Linux will be unusable.\n" @@ -1601,29 +1623,29 @@ "You will need to reinstall." #. Confirm aborting the program -#: library/general/src/modules/Popup.rb:927 +#: library/general/src/modules/Popup.rb:829 msgid "Really abort?" msgstr "Really abort?" #. Additional hint when trying to abort program in spite of changes -#: library/general/src/modules/Popup.rb:935 +#: library/general/src/modules/Popup.rb:837 msgid "All changes will be lost!" msgstr "All changes will be lost!" #. FIXME: BNC #422612, Use `opt(`noSanityCheck) later #. button label -#: library/general/src/modules/Popup.rb:966 +#: library/general/src/modules/Popup.rb:867 msgid "&Details..." msgstr "&Details..." #. translators: summary header for messages generated through autoinstallation -#: library/general/src/modules/Report.rb:105 +#: library/general/src/modules/Report.rb:101 msgid "Messages" msgstr "Messages" #. Report configuration - will be normal messages displayed? #. '%1' will be replaced by translated string "Yes" or "No" -#: library/general/src/modules/Report.rb:113 +#: library/general/src/modules/Report.rb:109 msgid "Display Messages: %1" msgstr "Display Messages: %1" @@ -1633,91 +1655,89 @@ #. translators: summary if the warnings should be written to log file #. translators: summary if the errors should be displayed #. translators: summary if the errors should be written to log file -#. human text for Boolean value -#: library/general/src/modules/Report.rb:116 -#: library/general/src/modules/Report.rb:134 -#: library/general/src/modules/Report.rb:150 -#: library/general/src/modules/Report.rb:168 -#: library/general/src/modules/Report.rb:184 -#: library/general/src/modules/Report.rb:202 -#: library/network/src/modules/NetworkPopup.rb:84 -#: library/types/src/modules/String.rb:113 +#. TRANSLATORS: human text for Boolean value +#: library/general/src/modules/Report.rb:111 +#: library/general/src/modules/Report.rb:127 +#: library/general/src/modules/Report.rb:141 +#: library/general/src/modules/Report.rb:157 +#: library/general/src/modules/Report.rb:171 +#: library/general/src/modules/Report.rb:187 +#: library/network/src/modules/NetworkPopup.rb:86 +#: library/types/src/modules/String.rb:101 msgid "Yes" msgstr "Yes" -#. translators: summary if the errors should be written to log file -#. human text for Boolean value -#: library/general/src/modules/Report.rb:117 -#: library/general/src/modules/Report.rb:135 -#: library/general/src/modules/Report.rb:151 -#: library/general/src/modules/Report.rb:169 -#: library/general/src/modules/Report.rb:185 -#: library/general/src/modules/Report.rb:204 -#: library/network/src/modules/NetworkPopup.rb:83 -#: library/types/src/modules/String.rb:116 +#: library/general/src/modules/Report.rb:111 +#: library/general/src/modules/Report.rb:127 +#: library/general/src/modules/Report.rb:141 +#: library/general/src/modules/Report.rb:157 +#: library/general/src/modules/Report.rb:171 +#: library/general/src/modules/Report.rb:187 +#: library/network/src/modules/NetworkPopup.rb:85 +#: library/types/src/modules/String.rb:101 msgid "No" msgstr "No" #. Report configuration - will have normal messages timeout? #. '%1' will be replaced by number of seconds -#: library/general/src/modules/Report.rb:124 +#: library/general/src/modules/Report.rb:118 msgid "Time-out Messages: %1" msgstr "Time-out Messages: %1" #. Report configuration - will be normal messages logged to file? #. '%1' will be replaced by translated string "Yes" or "No" -#: library/general/src/modules/Report.rb:131 +#: library/general/src/modules/Report.rb:125 msgid "Log Messages: %1" msgstr "Log Messages: %1" #. translators: summary header for warnings generated through autoinstallation -#: library/general/src/modules/Report.rb:140 +#: library/general/src/modules/Report.rb:132 msgid "Warnings" msgstr "Warnings" #. Report configuration - will be warning messages displayed? #. '%1' will be replaced by translated string "Yes" or "No" -#: library/general/src/modules/Report.rb:147 +#: library/general/src/modules/Report.rb:139 msgid "Display Warnings: %1" msgstr "Display Warnings: %1" #. Report configuration - will have warning messages timeout? #. '%1' will be replaced by number of seconds -#: library/general/src/modules/Report.rb:158 +#: library/general/src/modules/Report.rb:148 msgid "Time-out Warnings: %1" msgstr "Time-out Warnings: %1" #. Report configuration - will be warning messages logged to file? #. '%1' will be replaced by translated string "Yes" or "No" -#: library/general/src/modules/Report.rb:165 +#: library/general/src/modules/Report.rb:155 msgid "Log Warnings: %1" msgstr "Log Warnings: %1" #. translators: summary header for errors generated through autoinstallation -#: library/general/src/modules/Report.rb:174 +#: library/general/src/modules/Report.rb:162 msgid "Errors" msgstr "Errors" #. Report configuration - will be error messages displayed? #. '%1' will be replaced by translated string "Yes" or "No" -#: library/general/src/modules/Report.rb:181 +#: library/general/src/modules/Report.rb:169 msgid "Display Errors: %1" msgstr "Display Errors: %1" #. Report configuration - will have error messages timeout? #. '%1' will be replaced by number of seconds -#: library/general/src/modules/Report.rb:192 +#: library/general/src/modules/Report.rb:178 msgid "Time-out Errors: %1" msgstr "Time-out Errors: %1" #. Report configuration - will be error messages logged to file? #. '%1' will be replaced by translated string "Yes" or "No" -#: library/general/src/modules/Report.rb:199 +#: library/general/src/modules/Report.rb:185 msgid "Log Errors: %1" msgstr "Log Errors: %1" #. translators: warnings summary header -#: library/general/src/modules/Report.rb:702 +#: library/general/src/modules/Report.rb:662 #, fuzzy #| msgid "Warning:" #| msgid_plural "Warnings:" @@ -1725,7 +1745,7 @@ msgstr "Warning:" #. translators: errors summary header -#: library/general/src/modules/Report.rb:720 +#: library/general/src/modules/Report.rb:679 #, fuzzy #| msgid "Error:" #| msgid_plural "Errors:" @@ -1734,8 +1754,8 @@ #. translators: message summary header #. translators: message summary header -#: library/general/src/modules/Report.rb:738 -#: library/general/src/modules/Report.rb:756 +#: library/general/src/modules/Report.rb:696 +#: library/general/src/modules/Report.rb:713 #, fuzzy #| msgid "Message:" #| msgid_plural "Messages:" @@ -1791,26 +1811,26 @@ msgstr "De&lete" #. translators: Tree header -#: library/general/src/modules/ValueBrowser.rb:154 +#: library/general/src/modules/ValueBrowser.rb:153 msgid "&Variable" msgstr "&Variable" -#. TODO FIXME -#: library/gpg/src/modules/GPG.rb:242 +#. FIXME: do it +#: library/gpg/src/modules/GPG.rb:234 #, fuzzy msgid "Xterm is missing, install xterm package." msgstr "Xterm is missing, install xterm package" #. Get widget description map #. @return widget description map -#: library/gpg/src/modules/GPGWidgets.rb:188 +#: library/gpg/src/modules/GPGWidgets.rb:187 msgid "GPG Private Keys" msgstr "GPG Private Keys" #. table header - GPG key user ID #. table header - GPG key user ID -#: library/gpg/src/modules/GPGWidgets.rb:195 -#: library/gpg/src/modules/GPGWidgets.rb:227 +#: library/gpg/src/modules/GPGWidgets.rb:194 +#: library/gpg/src/modules/GPGWidgets.rb:226 msgid "User ID" msgstr "User ID" @@ -1819,14 +1839,14 @@ #. lazy #. Standard text strings #. GnuPG fingerprint used as "Fingerprint: AAA BBB CCC" -#: library/gpg/src/modules/GPGWidgets.rb:197 -#: library/gpg/src/modules/GPGWidgets.rb:229 +#: library/gpg/src/modules/GPGWidgets.rb:196 +#: library/gpg/src/modules/GPGWidgets.rb:228 #: library/packages/src/modules/SignatureCheckDialogs.rb:55 msgid "Fingerprint" msgstr "Fingerprint" #. fill up the widget in init handler -#: library/gpg/src/modules/GPGWidgets.rb:208 +#: library/gpg/src/modules/GPGWidgets.rb:207 msgid "" "<p><big><b>GPG Private Key</b></big><br>\n" "The table contains list of the private GPG keys.</p>" @@ -1836,12 +1856,12 @@ #. Get widget description map #. @return widget description map -#: library/gpg/src/modules/GPGWidgets.rb:220 +#: library/gpg/src/modules/GPGWidgets.rb:219 msgid "GPG Public Keys" msgstr "GPG Public Keys" #. fill up the widget in init handler -#: library/gpg/src/modules/GPGWidgets.rb:240 +#: library/gpg/src/modules/GPGWidgets.rb:239 msgid "" "<p><big><b>GPG Public Key</b></big><br>\n" "The table contains list of the public GPG keys.</p>" @@ -1851,11 +1871,11 @@ #. Get widget description map #. @return widget description map -#: library/gpg/src/modules/GPGWidgets.rb:283 +#: library/gpg/src/modules/GPGWidgets.rb:282 msgid "&Create a new GPG key..." msgstr "&Create a new GPG key..." -#: library/gpg/src/modules/GPGWidgets.rb:286 +#: library/gpg/src/modules/GPGWidgets.rb:285 msgid "" "<p><big><b>Create a new GPG key</b></big><br>\n" "<tt>gpg --gen-key</tt> is started, see <tt>gpg</tt> manual pager for more information.\n" @@ -1868,12 +1888,12 @@ "</p>" #. text entry -#: library/gpg/src/modules/GPGWidgets.rb:326 +#: library/gpg/src/modules/GPGWidgets.rb:325 msgid "&Passphrase for GPG Key %1" msgstr "&Passphrase for GPG Key %1" #. help text -#: library/gpg/src/modules/GPGWidgets.rb:334 +#: library/gpg/src/modules/GPGWidgets.rb:333 msgid "" "<p><big><b>Passphrase</b></big><br>\n" "Enter passphrase to unlock the GPG key." @@ -1883,18 +1903,18 @@ #. Create a popup window term with the passphrase widget. #. @return [Yast::Term] definition of the popup -#: library/gpg/src/modules/GPGWidgets.rb:351 +#: library/gpg/src/modules/GPGWidgets.rb:350 msgid "Enter Passphrase" msgstr "Enter Passphrase" #. ask for the passphrase in the commandline (interactive) mode -#: library/gpg/src/modules/GPGWidgets.rb:381 +#: library/gpg/src/modules/GPGWidgets.rb:380 msgid "Enter Passphrase to Unlock GPG Key %1: " msgstr "Enter Passphrase to Unlock GPG Key %1: " #. Prompt the user for a message to describe the changes #. that she did using YaST, logs it using {#Note} -#: library/log/src/modules/ALog.rb:107 +#: library/log/src/modules/ALog.rb:105 #, fuzzy msgid "Enter a log message that describes the changes you made." msgstr "Enter a changelog for the changes for " @@ -1958,102 +1978,101 @@ #. @param [Hash{String => Object}] glob_param a map of global parameters of the log widget #. @param [Array Object>}] log_maps a list of maps describing all the logs #. @return [Yast::Term] the widget with buttons -#. menubutton -#: library/log/src/modules/LogView.rb:178 -#: library/log/src/modules/LogView.rb:279 -#: library/log/src/modules/LogView.rb:313 -#: library/log/src/modules/LogView.rb:553 +#: library/log/src/modules/LogView.rb:177 +#: library/log/src/modules/LogView.rb:277 +#: library/log/src/modules/LogView.rb:308 msgid "Ad&vanced" msgstr "Ad&vanced" #. combo box entry (only used as fallback in case #. of error in the YaST code) -#: library/log/src/modules/LogView.rb:232 +#: library/log/src/modules/LogView.rb:231 msgid "Log" msgstr "Log" #. logview caption #. logview caption -#: library/log/src/modules/LogView.rb:239 -#: library/log/src/modules/LogView.rb:354 -#: library/log/src/modules/LogView.rb:474 -#: library/log/src/modules/LogView.rb:554 +#. menubutton +#: library/log/src/modules/LogView.rb:238 +#: library/log/src/modules/LogView.rb:349 +#: library/log/src/modules/LogView.rb:468 +#: library/log/src/modules/LogView.rb:545 msgid "&Log" msgstr "&Log" #. menubutton entry -#: library/log/src/modules/LogView.rb:257 +#: library/log/src/modules/LogView.rb:255 msgid "&Save Log" msgstr "&Save Log" #. popup caption, save into home directory by default (bnc#653601) -#: library/log/src/modules/LogView.rb:395 +#: library/log/src/modules/LogView.rb:390 msgid "Save Log as..." msgstr "Save Log as..." #. flag indicating if background process is (or should be) running -#: library/log/src/modules/LogViewCore.rb:72 +#: library/log/src/modules/LogViewCore.rb:67 msgid "Error occurred while reading the log." msgstr "Error occurred while reading the log." #. label -#: library/network/src/modules/CWMFirewallInterfaces.rb:111 +#: library/network/src/modules/CWMFirewallInterfaces.rb:109 msgid "Firewall cannot be adjusted during first stage installation." msgstr "" #. label -#: library/network/src/modules/CWMFirewallInterfaces.rb:116 +#: library/network/src/modules/CWMFirewallInterfaces.rb:114 #, fuzzy msgid "Firewall package is not installed." msgstr "Firewall is not installed" #. label -#: library/network/src/modules/CWMFirewallInterfaces.rb:120 +#: library/network/src/modules/CWMFirewallInterfaces.rb:118 msgid "Firewall is disabled" msgstr "Firewall is disabled" #. label -#: library/network/src/modules/CWMFirewallInterfaces.rb:123 +#: library/network/src/modules/CWMFirewallInterfaces.rb:121 msgid "Firewall port is closed" msgstr "Firewall port is closed" #. label -#: library/network/src/modules/CWMFirewallInterfaces.rb:126 +#: library/network/src/modules/CWMFirewallInterfaces.rb:124 msgid "Firewall port is open on all interfaces" msgstr "Firewall port is open on all interfaces" #. label -#: library/network/src/modules/CWMFirewallInterfaces.rb:129 +#: library/network/src/modules/CWMFirewallInterfaces.rb:127 msgid "Firewall port is open on selected interfaces" msgstr "Firewall port is open on selected interfaces" #. label -#: library/network/src/modules/CWMFirewallInterfaces.rb:132 +#: library/network/src/modules/CWMFirewallInterfaces.rb:130 msgid "No network interfaces are configured" msgstr "No network interfaces are configured" #. BNC #483455: Interface zone name -#: library/network/src/modules/CWMFirewallInterfaces.rb:157 +#: library/network/src/modules/CWMFirewallInterfaces.rb:155 #, fuzzy #| msgid "No interfaces assigned to this zone." msgid "Interface is not assigned to any zone" msgstr "No interfaces assigned to this zone." #. transaltors: selection box title -#: library/network/src/modules/CWMFirewallInterfaces.rb:418 +#: library/network/src/modules/CWMFirewallInterfaces.rb:412 msgid "&Network Interfaces with Open Port in Firewall" msgstr "&Network Interfaces with Open Port in Firewall" #. Check the INT zone, it's not protected by default #. See bnc #382686 -#: library/network/src/modules/CWMFirewallInterfaces.rb:511 +#: library/network/src/modules/CWMFirewallInterfaces.rb:499 msgid "" "These network interfaces assigned to internal network cannot be deselected:\n" "%1\n" msgstr "" #. question popup -#: library/network/src/modules/CWMFirewallInterfaces.rb:532 +#: library/network/src/modules/CWMFirewallInterfaces.rb:520 msgid "" "No interface is selected. Service will not\n" "be available for other computers.\n" @@ -2066,7 +2085,7 @@ "Continue?" #. yes-no popup -#: library/network/src/modules/CWMFirewallInterfaces.rb:562 +#: library/network/src/modules/CWMFirewallInterfaces.rb:550 msgid "" "Because of SuSE Firewall settings, the port\n" "on the following interfaces will additionally be open:\n" @@ -2082,8 +2101,8 @@ #. yes-no popup #. yes-no popup -#: library/network/src/modules/CWMFirewallInterfaces.rb:581 -#: library/network/src/modules/CWMFirewallInterfaces.rb:635 +#: library/network/src/modules/CWMFirewallInterfaces.rb:569 +#: library/network/src/modules/CWMFirewallInterfaces.rb:623 msgid "" "Because of SuSE Firewall settings, the port\n" "on the following interfaces cannot be opened:\n" @@ -2098,29 +2117,29 @@ "Continue?" #. translators: selection box title -#: library/network/src/modules/CWMFirewallInterfaces.rb:725 +#: library/network/src/modules/CWMFirewallInterfaces.rb:713 msgid "Network &Interfaces with Open Port in Firewall" msgstr "Network &Interfaces with Open Port in Firewall" #. push button to select all network intefaces for firewall -#: library/network/src/modules/CWMFirewallInterfaces.rb:737 +#: library/network/src/modules/CWMFirewallInterfaces.rb:725 msgid "Select &All" msgstr "Select &All" #. push button to deselect all network intefaces for firewall -#: library/network/src/modules/CWMFirewallInterfaces.rb:745 +#: library/network/src/modules/CWMFirewallInterfaces.rb:733 msgid "Select &None" msgstr "Select &None" #. TRANSLATORS: Error message, do not translate %{details} -#: library/network/src/modules/CWMFirewallInterfaces.rb:842 +#: library/network/src/modules/CWMFirewallInterfaces.rb:828 msgid "" "Error checking service status:\n" "%{details}" msgstr "" #. TRANSLATORS: Error message, do not translate %{details} -#: library/network/src/modules/CWMFirewallInterfaces.rb:877 +#: library/network/src/modules/CWMFirewallInterfaces.rb:862 msgid "" "Error setting service status:\n" "%{details}" @@ -2128,7 +2147,7 @@ #. help text for firewall settings widget 1/3, #. %1 is check box label, eg. "Open Port in Firewall" (without quotes) -#: library/network/src/modules/CWMFirewallInterfaces.rb:1013 +#: library/network/src/modules/CWMFirewallInterfaces.rb:998 msgid "" "<p><b><big>Firewall Settings</big></b><br>\n" "To open the firewall to allow access to the service from remote computers,\n" @@ -2141,7 +2160,7 @@ #. help text for firewall port openning widget 2/3, optional #. %1 is push button label, eg. "Firewall &Details" (without quotes) #. note: %2 is correct, do not replace with %1!!! -#: library/network/src/modules/CWMFirewallInterfaces.rb:1024 +#: library/network/src/modules/CWMFirewallInterfaces.rb:1009 msgid "" "To select interfaces on which to open the port,\n" "click <b>%2</b>.<br>" @@ -2150,7 +2169,7 @@ "click <b>%2</b>.<br>" #. help text for firewall settings widget 3/3, -#: library/network/src/modules/CWMFirewallInterfaces.rb:1032 +#: library/network/src/modules/CWMFirewallInterfaces.rb:1017 msgid "" "This option is available only if the firewall\n" "is enabled.</p>" @@ -2159,47 +2178,47 @@ "is enabled.</p>" #. part of help text - check box label, NO SHORTCUT!!! -#: library/network/src/modules/CWMFirewallInterfaces.rb:1044 +#: library/network/src/modules/CWMFirewallInterfaces.rb:1029 msgid "Open Port in Firewall" msgstr "Open Port in Firewall" #. part of help text - push button label, NO SHORTCUT!!! -#: library/network/src/modules/CWMFirewallInterfaces.rb:1046 +#: library/network/src/modules/CWMFirewallInterfaces.rb:1031 msgid "Firewall Details" msgstr "Firewall Details" #. check box -#: library/network/src/modules/CWMFirewallInterfaces.rb:1078 +#: library/network/src/modules/CWMFirewallInterfaces.rb:1063 msgid "Open Port in &Firewall" msgstr "Open Port in &Firewall" #. push button -#: library/network/src/modules/CWMFirewallInterfaces.rb:1085 +#: library/network/src/modules/CWMFirewallInterfaces.rb:1070 #, fuzzy msgid "Firewall &Details..." msgstr "Firewall &Details" -#: library/network/src/modules/CWMFirewallInterfaces.rb:1113 +#: library/network/src/modules/CWMFirewallInterfaces.rb:1098 msgid "Firewall Settings" msgstr "Firewall Settings" #. label text -#: library/network/src/modules/CWMFirewallInterfaces.rb:1120 +#: library/network/src/modules/CWMFirewallInterfaces.rb:1105 msgid "Firewall is open" msgstr "Firewall is open" #. pppN must be tried before pN, modem before netcard #. Device type label #. Device type label -#: library/network/src/modules/NetworkInterfaces.rb:405 -#: library/network/src/modules/NetworkInterfaces.rb:1206 -#: library/network/src/modules/NetworkInterfaces.rb:1217 +#: library/network/src/modules/NetworkInterfaces.rb:406 +#: library/network/src/modules/NetworkInterfaces.rb:1201 +#: library/network/src/modules/NetworkInterfaces.rb:1212 #: library/system/src/include/hwinfo/classnames.rb:108 #: library/system/src/include/hwinfo/classnames.rb:198 msgid "Modem" msgstr "Modem" -#: library/network/src/modules/NetworkInterfaces.rb:410 +#: library/network/src/modules/NetworkInterfaces.rb:411 msgid "Network Card" msgstr "Network Card" @@ -2207,27 +2226,27 @@ #. Device type label #. Device type label #. Device type label -#: library/network/src/modules/NetworkInterfaces.rb:415 -#: library/network/src/modules/NetworkInterfaces.rb:1151 -#: library/network/src/modules/NetworkInterfaces.rb:1189 -#: library/network/src/modules/NetworkInterfaces.rb:1195 -#: library/network/src/modules/NetworkInterfaces.rb:1210 +#: library/network/src/modules/NetworkInterfaces.rb:416 +#: library/network/src/modules/NetworkInterfaces.rb:1146 +#: library/network/src/modules/NetworkInterfaces.rb:1184 +#: library/network/src/modules/NetworkInterfaces.rb:1190 +#: library/network/src/modules/NetworkInterfaces.rb:1205 msgid "ISDN" msgstr "ISDN" #. Device type label -#: library/network/src/modules/NetworkInterfaces.rb:420 -#: library/network/src/modules/NetworkInterfaces.rb:1158 +#: library/network/src/modules/NetworkInterfaces.rb:421 +#: library/network/src/modules/NetworkInterfaces.rb:1153 msgid "DSL" msgstr "DSL" -#: library/network/src/modules/NetworkInterfaces.rb:422 -#: library/packages/src/modules/SignatureCheckDialogs.rb:485 -#: library/packages/src/modules/SignatureCheckDialogs.rb:486 -#: library/packages/src/modules/SignatureCheckDialogs.rb:746 -#: library/packages/src/modules/SignatureCheckDialogs.rb:747 -#: library/packages/src/modules/SignatureCheckDialogs.rb:976 -#: library/packages/src/modules/SignatureCheckDialogs.rb:978 +#: library/network/src/modules/NetworkInterfaces.rb:423 +#: library/packages/src/modules/SignatureCheckDialogs.rb:487 +#: library/packages/src/modules/SignatureCheckDialogs.rb:488 +#: library/packages/src/modules/SignatureCheckDialogs.rb:760 +#: library/packages/src/modules/SignatureCheckDialogs.rb:761 +#: library/packages/src/modules/SignatureCheckDialogs.rb:996 +#: library/packages/src/modules/SignatureCheckDialogs.rb:998 msgid "Unknown" msgstr "Unknown" @@ -2237,331 +2256,331 @@ #. are represented as its sub-interfaces. #. And also we frequently confuse "device" and "interface" #. :-( -#: library/network/src/modules/NetworkInterfaces.rb:1127 +#: library/network/src/modules/NetworkInterfaces.rb:1122 msgid "Additional Address" msgstr "Additional Address" #. Device type label -#: library/network/src/modules/NetworkInterfaces.rb:1132 +#: library/network/src/modules/NetworkInterfaces.rb:1127 msgid "ARCnet" msgstr "ARCnet" -#: library/network/src/modules/NetworkInterfaces.rb:1132 +#: library/network/src/modules/NetworkInterfaces.rb:1127 msgid "ARCnet Network Card" msgstr "ARCnet Network Card" #. Device type label -#: library/network/src/modules/NetworkInterfaces.rb:1135 +#: library/network/src/modules/NetworkInterfaces.rb:1130 msgid "ATM" msgstr "ATM" -#: library/network/src/modules/NetworkInterfaces.rb:1136 +#: library/network/src/modules/NetworkInterfaces.rb:1131 msgid "Asynchronous Transfer Mode (ATM)" msgstr "Asynchronous Transfer Mode (ATM)" #. Device type label -#: library/network/src/modules/NetworkInterfaces.rb:1140 +#: library/network/src/modules/NetworkInterfaces.rb:1135 msgid "Bluetooth" msgstr "Bluetooth" -#: library/network/src/modules/NetworkInterfaces.rb:1141 +#: library/network/src/modules/NetworkInterfaces.rb:1136 msgid "Bluetooth Connection" msgstr "Bluetooth Connection" #. Device type label -#: library/network/src/modules/NetworkInterfaces.rb:1144 +#: library/network/src/modules/NetworkInterfaces.rb:1139 msgid "Bond" msgstr "Bond" -#: library/network/src/modules/NetworkInterfaces.rb:1144 +#: library/network/src/modules/NetworkInterfaces.rb:1139 msgid "Bond Network" msgstr "Bond Network" #. Device type label -#: library/network/src/modules/NetworkInterfaces.rb:1147 +#: library/network/src/modules/NetworkInterfaces.rb:1142 msgid "CLAW" msgstr "CLAW" -#: library/network/src/modules/NetworkInterfaces.rb:1148 +#: library/network/src/modules/NetworkInterfaces.rb:1143 msgid "Common Link Access for Workstation (CLAW)" msgstr "Common Link Access for Workstation (CLAW)" -#: library/network/src/modules/NetworkInterfaces.rb:1151 +#: library/network/src/modules/NetworkInterfaces.rb:1146 msgid "ISDN Card" msgstr "ISDN Card" #. Device type label -#: library/network/src/modules/NetworkInterfaces.rb:1154 +#: library/network/src/modules/NetworkInterfaces.rb:1149 #: library/system/src/include/hwinfo/classnames.rb:223 msgid "CTC" msgstr "CTC" -#: library/network/src/modules/NetworkInterfaces.rb:1155 +#: library/network/src/modules/NetworkInterfaces.rb:1150 msgid "Channel to Channel Interface (CTC)" msgstr "Channel to Channel Interface (CTC)" -#: library/network/src/modules/NetworkInterfaces.rb:1158 +#: library/network/src/modules/NetworkInterfaces.rb:1153 msgid "DSL Connection" msgstr "DSL Connection" #. Device type label -#: library/network/src/modules/NetworkInterfaces.rb:1160 +#: library/network/src/modules/NetworkInterfaces.rb:1155 msgid "Dummy" msgstr "Dummy" -#: library/network/src/modules/NetworkInterfaces.rb:1160 +#: library/network/src/modules/NetworkInterfaces.rb:1155 msgid "Dummy Network Device" msgstr "Dummy Network Device" #. Device type label -#: library/network/src/modules/NetworkInterfaces.rb:1163 +#: library/network/src/modules/NetworkInterfaces.rb:1158 #: library/system/src/include/hwinfo/classnames.rb:227 msgid "ESCON" msgstr "ESCON" -#: library/network/src/modules/NetworkInterfaces.rb:1164 +#: library/network/src/modules/NetworkInterfaces.rb:1159 msgid "Enterprise System Connector (ESCON)" msgstr "Enterprise System Connector (ESCON)" #. Device type label -#: library/network/src/modules/NetworkInterfaces.rb:1168 +#: library/network/src/modules/NetworkInterfaces.rb:1163 #: library/system/src/include/hwinfo/classnames.rb:220 msgid "Ethernet" msgstr "Ethernet" -#: library/network/src/modules/NetworkInterfaces.rb:1169 +#: library/network/src/modules/NetworkInterfaces.rb:1164 msgid "Ethernet Network Card" msgstr "Ethernet Network Card" #. Device type label -#: library/network/src/modules/NetworkInterfaces.rb:1172 +#: library/network/src/modules/NetworkInterfaces.rb:1167 #: library/system/src/include/hwinfo/classnames.rb:222 msgid "FDDI" msgstr "FDDI" -#: library/network/src/modules/NetworkInterfaces.rb:1172 +#: library/network/src/modules/NetworkInterfaces.rb:1167 msgid "FDDI Network Card" msgstr "FDDI Network Card" #. Device type label -#: library/network/src/modules/NetworkInterfaces.rb:1175 +#: library/network/src/modules/NetworkInterfaces.rb:1170 msgid "FICON" msgstr "FICON" -#: library/network/src/modules/NetworkInterfaces.rb:1176 +#: library/network/src/modules/NetworkInterfaces.rb:1171 msgid "Fiberchannel System Connector (FICON)" msgstr "Fibrechannel System Connector (FICON)" #. Device type label -#: library/network/src/modules/NetworkInterfaces.rb:1180 +#: library/network/src/modules/NetworkInterfaces.rb:1175 msgid "HIPPI" msgstr "HIPPI" -#: library/network/src/modules/NetworkInterfaces.rb:1181 +#: library/network/src/modules/NetworkInterfaces.rb:1176 msgid "HIgh Performance Parallel Interface (HIPPI)" msgstr "HIgh Performance Parallel Interface (HIPPI)" #. Device type label -#: library/network/src/modules/NetworkInterfaces.rb:1185 +#: library/network/src/modules/NetworkInterfaces.rb:1180 msgid "Hipersockets" msgstr "Hipersockets" -#: library/network/src/modules/NetworkInterfaces.rb:1186 +#: library/network/src/modules/NetworkInterfaces.rb:1181 msgid "Hipersockets Interface (HSI)" msgstr "Hipersockets Interface (HSI)" -#: library/network/src/modules/NetworkInterfaces.rb:1189 -#: library/network/src/modules/NetworkInterfaces.rb:1195 -#: library/network/src/modules/NetworkInterfaces.rb:1210 +#: library/network/src/modules/NetworkInterfaces.rb:1184 +#: library/network/src/modules/NetworkInterfaces.rb:1190 +#: library/network/src/modules/NetworkInterfaces.rb:1205 msgid "ISDN Connection" msgstr "ISDN Connection" #. Device type label #. Device type label -#: library/network/src/modules/NetworkInterfaces.rb:1191 -#: library/network/src/modules/NetworkInterfaces.rb:1193 +#: library/network/src/modules/NetworkInterfaces.rb:1186 +#: library/network/src/modules/NetworkInterfaces.rb:1188 msgid "IrDA" msgstr "IrDA" -#: library/network/src/modules/NetworkInterfaces.rb:1191 +#: library/network/src/modules/NetworkInterfaces.rb:1186 msgid "Infrared Network Device" msgstr "Infrared Network Device" -#: library/network/src/modules/NetworkInterfaces.rb:1193 +#: library/network/src/modules/NetworkInterfaces.rb:1188 msgid "Infrared Device" msgstr "Infrared Device" #. Device type label -#: library/network/src/modules/NetworkInterfaces.rb:1198 +#: library/network/src/modules/NetworkInterfaces.rb:1193 #: library/system/src/include/hwinfo/classnames.rb:224 msgid "IUCV" msgstr "IUCV" -#: library/network/src/modules/NetworkInterfaces.rb:1199 +#: library/network/src/modules/NetworkInterfaces.rb:1194 msgid "Inter User Communication Vehicle (IUCV)" msgstr "Inter User Communication Vehicle (IUCV)" #. Device type label -#: library/network/src/modules/NetworkInterfaces.rb:1202 +#: library/network/src/modules/NetworkInterfaces.rb:1197 msgid "OSA LCS" msgstr "OSA LCS" -#: library/network/src/modules/NetworkInterfaces.rb:1202 +#: library/network/src/modules/NetworkInterfaces.rb:1197 msgid "OSA LCS Network Card" msgstr "OSA LCS Network Card" #. Device type label -#: library/network/src/modules/NetworkInterfaces.rb:1204 +#: library/network/src/modules/NetworkInterfaces.rb:1199 #: library/system/src/include/hwinfo/classnames.rb:219 msgid "Loopback" msgstr "Loopback" -#: library/network/src/modules/NetworkInterfaces.rb:1204 +#: library/network/src/modules/NetworkInterfaces.rb:1199 msgid "Loopback Device" msgstr "Loopback Device" #. Device type label -#: library/network/src/modules/NetworkInterfaces.rb:1208 +#: library/network/src/modules/NetworkInterfaces.rb:1203 #: library/system/src/include/hwinfo/classnames.rb:228 msgid "Myrinet" msgstr "Myrinet" -#: library/network/src/modules/NetworkInterfaces.rb:1208 +#: library/network/src/modules/NetworkInterfaces.rb:1203 msgid "Myrinet Network Card" msgstr "Myrinet Network Card" #. Device type label -#: library/network/src/modules/NetworkInterfaces.rb:1213 +#: library/network/src/modules/NetworkInterfaces.rb:1208 msgid "Parallel Line" msgstr "Parallel Line" -#: library/network/src/modules/NetworkInterfaces.rb:1214 +#: library/network/src/modules/NetworkInterfaces.rb:1209 msgid "Parallel Line Connection" msgstr "Parallel Line Connection" #. Device type label -#: library/network/src/modules/NetworkInterfaces.rb:1220 +#: library/network/src/modules/NetworkInterfaces.rb:1215 #: library/system/src/include/hwinfo/classnames.rb:226 msgid "QETH" msgstr "QETH" -#: library/network/src/modules/NetworkInterfaces.rb:1221 +#: library/network/src/modules/NetworkInterfaces.rb:1216 msgid "OSA-Express or QDIO Device (QETH)" msgstr "OSA-Express or QDIO Device (QETH)" #. Device type label -#: library/network/src/modules/NetworkInterfaces.rb:1225 +#: library/network/src/modules/NetworkInterfaces.rb:1220 msgid "IPv6-in-IPv4" msgstr "IPv6-in-IPv4" -#: library/network/src/modules/NetworkInterfaces.rb:1226 +#: library/network/src/modules/NetworkInterfaces.rb:1221 msgid "IPv6-in-IPv4 Encapsulation Device" msgstr "IPv6-in-IPv4 Encapsulation Device" #. Device type label -#: library/network/src/modules/NetworkInterfaces.rb:1230 +#: library/network/src/modules/NetworkInterfaces.rb:1225 msgid "Serial Line" msgstr "Serial Line" -#: library/network/src/modules/NetworkInterfaces.rb:1231 +#: library/network/src/modules/NetworkInterfaces.rb:1226 msgid "Serial Line Connection" msgstr "Serial Line Connection" #. Device type label -#: library/network/src/modules/NetworkInterfaces.rb:1235 +#: library/network/src/modules/NetworkInterfaces.rb:1230 msgid "Token Ring" msgstr "Token Ring" -#: library/network/src/modules/NetworkInterfaces.rb:1236 +#: library/network/src/modules/NetworkInterfaces.rb:1231 msgid "Token Ring Network Card" msgstr "Token Ring Network Card" #. Device type label -#: library/network/src/modules/NetworkInterfaces.rb:1239 +#: library/network/src/modules/NetworkInterfaces.rb:1234 msgid "USB" msgstr "USB" -#: library/network/src/modules/NetworkInterfaces.rb:1239 +#: library/network/src/modules/NetworkInterfaces.rb:1234 msgid "USB Network Device" msgstr "USB Network Device" #. Device type label -#: library/network/src/modules/NetworkInterfaces.rb:1241 +#: library/network/src/modules/NetworkInterfaces.rb:1236 msgid "VMWare" msgstr "VMWare" -#: library/network/src/modules/NetworkInterfaces.rb:1241 +#: library/network/src/modules/NetworkInterfaces.rb:1236 msgid "VMWare Network Device" msgstr "VMWare Network Device" #. Device type label -#: library/network/src/modules/NetworkInterfaces.rb:1244 +#: library/network/src/modules/NetworkInterfaces.rb:1239 msgid "Wireless" msgstr "Wireless" -#: library/network/src/modules/NetworkInterfaces.rb:1245 +#: library/network/src/modules/NetworkInterfaces.rb:1240 msgid "Wireless Network Card" msgstr "Wireless Network Card" #. Device type label -#: library/network/src/modules/NetworkInterfaces.rb:1248 +#: library/network/src/modules/NetworkInterfaces.rb:1243 msgid "XPNET" msgstr "XPNET" -#: library/network/src/modules/NetworkInterfaces.rb:1248 +#: library/network/src/modules/NetworkInterfaces.rb:1243 msgid "XP Network" msgstr "XP Network" #. Device type label -#: library/network/src/modules/NetworkInterfaces.rb:1250 +#: library/network/src/modules/NetworkInterfaces.rb:1245 msgid "VLAN" msgstr "VLAN" -#: library/network/src/modules/NetworkInterfaces.rb:1250 +#: library/network/src/modules/NetworkInterfaces.rb:1245 msgid "Virtual LAN" msgstr "Virtual LAN" #. Device type label -#: library/network/src/modules/NetworkInterfaces.rb:1252 +#: library/network/src/modules/NetworkInterfaces.rb:1247 #: library/system/src/include/hwinfo/classnames.rb:89 #: library/system/src/include/hwinfo/classnames.rb:101 msgid "Bridge" msgstr "Bridge" -#: library/network/src/modules/NetworkInterfaces.rb:1252 +#: library/network/src/modules/NetworkInterfaces.rb:1247 #, fuzzy msgid "Network Bridge" msgstr "Network Card" #. Device type label -#: library/network/src/modules/NetworkInterfaces.rb:1254 +#: library/network/src/modules/NetworkInterfaces.rb:1249 #, fuzzy msgid "TUN" msgstr "LUN" -#: library/network/src/modules/NetworkInterfaces.rb:1254 +#: library/network/src/modules/NetworkInterfaces.rb:1249 #, fuzzy msgid "Network TUNnel" msgstr "Network Mode" #. Device type label -#: library/network/src/modules/NetworkInterfaces.rb:1256 +#: library/network/src/modules/NetworkInterfaces.rb:1251 #, fuzzy msgid "TAP" msgstr "TCP" -#: library/network/src/modules/NetworkInterfaces.rb:1256 +#: library/network/src/modules/NetworkInterfaces.rb:1251 #, fuzzy msgid "Network TAP" msgstr "Network Card" #. Device type label -#: library/network/src/modules/NetworkInterfaces.rb:1258 +#: library/network/src/modules/NetworkInterfaces.rb:1253 #: library/system/src/include/hwinfo/classnames.rb:152 msgid "InfiniBand" msgstr "InfiniBand" -#: library/network/src/modules/NetworkInterfaces.rb:1258 +#: library/network/src/modules/NetworkInterfaces.rb:1253 #, fuzzy msgid "InfiniBand Device" msgstr "Infrared Device" @@ -2577,55 +2596,55 @@ msgstr "DHCP address" #. TRANSLATORS: table item, informing that device has no IP address -#: library/network/src/modules/NetworkPopup.rb:81 +#: library/network/src/modules/NetworkPopup.rb:83 msgid "No IP address assigned" msgstr "No IP address assigned" #. translators: table header - details about the network device -#: library/network/src/modules/NetworkPopup.rb:103 +#: library/network/src/modules/NetworkPopup.rb:105 msgid "Device Type" msgstr "Device Type" -#: library/network/src/modules/NetworkPopup.rb:104 +#: library/network/src/modules/NetworkPopup.rb:106 msgid "Device Name" msgstr "Device Name" -#: library/network/src/modules/NetworkPopup.rb:105 +#: library/network/src/modules/NetworkPopup.rb:107 msgid "IP Address" msgstr "IP Address" -#: library/network/src/modules/NetworkPopup.rb:106 +#: library/network/src/modules/NetworkPopup.rb:108 msgid "Device ID" msgstr "Device ID" -#: library/network/src/modules/NetworkPopup.rb:107 +#: library/network/src/modules/NetworkPopup.rb:109 msgid "Connected" msgstr "Connected" #. label message #. label message -#: library/network/src/modules/NetworkPopup.rb:193 -#: library/network/src/modules/NetworkPopup.rb:224 +#: library/network/src/modules/NetworkPopup.rb:191 +#: library/network/src/modules/NetworkPopup.rb:222 msgid "Scanning for hosts on this LAN..." msgstr "Scanning for hosts on this LAN..." #. selection box label -#: library/network/src/modules/NetworkPopup.rb:212 +#: library/network/src/modules/NetworkPopup.rb:210 msgid "&NFS Servers" msgstr "&NFS Servers" #. selection box label -#: library/network/src/modules/NetworkPopup.rb:236 +#: library/network/src/modules/NetworkPopup.rb:234 msgid "Re&mote Hosts" msgstr "Re&mote Hosts" #. selection box label -#: library/network/src/modules/NetworkPopup.rb:256 +#: library/network/src/modules/NetworkPopup.rb:254 msgid "&Exported Directories" msgstr "&Exported Directories" #. TRANSLATORS: pop-up question when reading the service configuration -#: library/network/src/modules/NetworkService.rb:281 +#: library/network/src/modules/NetworkService.rb:280 msgid "" "Your network interfaces are currently controlled by NetworkManager\n" "but the service to configure might not work well with it.\n" @@ -2640,7 +2659,7 @@ #. If there is network running, return true. #. Otherwise show error popup depending on Stage and return false #. @return true if network running -#: library/network/src/modules/NetworkService.rb:349 +#: library/network/src/modules/NetworkService.rb:348 #, fuzzy #| msgid "Restart installation and configure network in Linuxrc" msgid "" @@ -2649,7 +2668,7 @@ "or continue without network." msgstr "Restart installation and configure network in Linuxrc" -#: library/network/src/modules/NetworkService.rb:355 +#: library/network/src/modules/NetworkService.rb:354 #, fuzzy msgid "" "No running network detected.\n" @@ -2672,47 +2691,47 @@ "No spaces are allowed.\n" #. TRANSLATORS: Firewall zone name - used in combo box or dialog title -#: library/network/src/modules/SuSEFirewall.rb:114 +#: library/network/src/modules/SuSEFirewall.rb:115 msgid "External Zone" msgstr "External Zone" #. TRANSLATORS: Firewall zone name - used in combo box or dialog title -#: library/network/src/modules/SuSEFirewall.rb:118 +#: library/network/src/modules/SuSEFirewall.rb:119 msgid "Internal Zone" msgstr "Internal Zone" #. TRANSLATORS: Firewall zone name - used in combo box or dialog title -#: library/network/src/modules/SuSEFirewall.rb:122 +#: library/network/src/modules/SuSEFirewall.rb:123 msgid "Demilitarized Zone" msgstr "Demilitarized Zone" #. protocol name -#: library/network/src/modules/SuSEFirewall.rb:243 +#: library/network/src/modules/SuSEFirewall.rb:246 msgid "TCP" msgstr "TCP" #. protocol name -#: library/network/src/modules/SuSEFirewall.rb:245 +#: library/network/src/modules/SuSEFirewall.rb:248 msgid "UDP" msgstr "UDP" #. protocol name -#: library/network/src/modules/SuSEFirewall.rb:247 +#: library/network/src/modules/SuSEFirewall.rb:250 msgid "RPC" msgstr "RPC" #. protocol name -#: library/network/src/modules/SuSEFirewall.rb:249 +#: library/network/src/modules/SuSEFirewall.rb:252 msgid "IP" msgstr "IP" #. TRANSLATORS: Firewall zone full-name, used as combo box item or dialog title -#: library/network/src/modules/SuSEFirewall.rb:1157 +#: library/network/src/modules/SuSEFirewall.rb:1158 msgid "Unknown Zone" msgstr "Unknown Zone" #. TRANSLATORS: Error message, %1 = interface name (like eth0) -#: library/network/src/modules/SuSEFirewall.rb:1504 +#: library/network/src/modules/SuSEFirewall.rb:1506 msgid "" "Interface '%1' is included in multiple firewall zones.\n" "Continuing with configuration can produce errors.\n" @@ -2728,7 +2747,7 @@ #. TRANSLATORS: Error message, %1 = interface name (like eth0) #. TRANSLATORS: Error message, %1 = interface name (like eth0) -#: library/network/src/modules/SuSEFirewall.rb:1970 +#: library/network/src/modules/SuSEFirewall.rb:1971 #: library/network/src/modules/SuSEFirewall.rb:2047 msgid "" "Interface '%1' is not assigned to any firewall zone.\n" @@ -2773,82 +2792,82 @@ msgstr "Checking possibly conflicting services..." #. TRANSLATORS: Dialog caption -#: library/network/src/modules/SuSEFirewall.rb:2655 +#: library/network/src/modules/SuSEFirewall.rb:2648 msgid "Writing Firewall Configuration" msgstr "Writing Firewall Configuration" #. TRANSLATORS: Progress step -#: library/network/src/modules/SuSEFirewall.rb:2663 +#: library/network/src/modules/SuSEFirewall.rb:2656 msgid "Write firewall settings" msgstr "Write firewall settings" #. TRANSLATORS: Progress step -#: library/network/src/modules/SuSEFirewall.rb:2665 +#: library/network/src/modules/SuSEFirewall.rb:2658 msgid "Adjust firewall service" msgstr "Adjust firewall service" #. TRANSLATORS: Progress step -#: library/network/src/modules/SuSEFirewall.rb:2669 +#: library/network/src/modules/SuSEFirewall.rb:2662 msgid "Writing firewall settings..." msgstr "Writing firewall settings..." #. TRANSLATORS: Progress step -#: library/network/src/modules/SuSEFirewall.rb:2671 +#: library/network/src/modules/SuSEFirewall.rb:2664 msgid "Adjusting firewall service..." msgstr "Adjusting firewall service..." #. TRANSLATORS: a popup error message -#: library/network/src/modules/SuSEFirewall.rb:2690 +#: library/network/src/modules/SuSEFirewall.rb:2683 msgid "Writing settings failed" msgstr "Writing settings failed" #. table item, %1 stands for the buggy protocol name -#: library/network/src/modules/SuSEFirewall.rb:3488 +#: library/network/src/modules/SuSEFirewall.rb:3476 msgid "Unknown protocol (%1)" msgstr "Unknown protocol (%1)" #. TRANSLATORS: Warning in installation proposal, %1 is a device name (eth0, sl0, ...) -#: library/network/src/modules/SuSEFirewallProposal.rb:169 +#: library/network/src/modules/SuSEFirewallProposal.rb:167 msgid "New network device '%1' found; added as an internal firewall interface" msgstr "New network device '%1' found; added as an internal firewall interface" #. TRANSLATORS: Warning in installation proposal, %1 is a device name (eth0, sl0, ...) -#: library/network/src/modules/SuSEFirewallProposal.rb:180 +#: library/network/src/modules/SuSEFirewallProposal.rb:178 msgid "New network device '%1' found; added as an external firewall interface" msgstr "New network device '%1' found; added as an external firewall interface" #. TRANSLATORS: Proposal informative text -#: library/network/src/modules/SuSEFirewallProposal.rb:564 +#: library/network/src/modules/SuSEFirewallProposal.rb:547 msgid "SuSEfirewall2 package is not installed, firewall will be disabled." msgstr "SuSEfirewall2 package is not installed, firewall will be disabled." #. TRANSLATORS: Proposal informative text "Firewall is enabled (disable)" with link around #. IMPORTANT: Please, do not change the HTML link <a href="...">...</a>, only visible text -#: library/network/src/modules/SuSEFirewallProposal.rb:582 +#: library/network/src/modules/SuSEFirewallProposal.rb:565 msgid "Firewall is enabled (disable</a>)" msgstr "Firewall is enabled (disable</a>)" #. TRANSLATORS: Proposal informative text "Firewall is disabled (enable)" with link around #. IMPORTANT: Please, do not change the HTML link <a href="...">...</a>, only visible text -#: library/network/src/modules/SuSEFirewallProposal.rb:587 +#: library/network/src/modules/SuSEFirewallProposal.rb:571 msgid "Firewall is disabled (enable</a>)" msgstr "Firewall is disabled (enable</a>)" #. TRANSLATORS: Network proposal informative text with link around #. IMPORTANT: Please, do not change the HTML link <a href="...">...</a>, only visible text -#: library/network/src/modules/SuSEFirewallProposal.rb:621 +#: library/network/src/modules/SuSEFirewallProposal.rb:606 msgid "SSH port is open (close</a>)" msgstr "SSH port is open (close</a>)" #. TRANSLATORS: Network proposal informative text with link around #. IMPORTANT: Please, do not change the HTML link <a href="...">...</a>, only visible text -#: library/network/src/modules/SuSEFirewallProposal.rb:626 +#: library/network/src/modules/SuSEFirewallProposal.rb:612 msgid "SSH port is blocked (open</a>)" msgstr "SSH port is blocked (open</a>)" #. TRANSLATORS: Network proposal informative text with link around #. IMPORTANT: Please, do not change the HTML link <a href="...">...</a>, only visible text -#: library/network/src/modules/SuSEFirewallProposal.rb:646 +#: library/network/src/modules/SuSEFirewallProposal.rb:633 #, fuzzy #| msgid "SSH port is open (close</a>), but there are still no network interfaces configured" msgid "" @@ -2857,43 +2876,43 @@ msgstr "SSH port is open (close</a>), but there are still no network interfaces configured" #. TRANSLATORS: This is a warning message. Installation over SSH without SSH allowed on firewall -#: library/network/src/modules/SuSEFirewallProposal.rb:661 +#: library/network/src/modules/SuSEFirewallProposal.rb:648 msgid "You are installing a system over SSH, but you have not opened the SSH port on the firewall." msgstr "You are installing a system over SSH, but you have not opened the SSH port on the firewall." #. TRANSLATORS: Network proposal informative text "Remote Administration (VNC) is enabled" with link around #. IMPORTANT: Please, do not change the HTML link <a href="...">...</a>, only visible text -#: library/network/src/modules/SuSEFirewallProposal.rb:703 +#: library/network/src/modules/SuSEFirewallProposal.rb:690 msgid "Remote Administration (VNC) ports are open (close</a>)" msgstr "Remote Administration (VNC) ports are open (close</a>)" #. TRANSLATORS: Network proposal informative text "Remote Administration (VNC) is disabled" with link around #. IMPORTANT: Please, do not change the HTML link <a href="...">...</a>, only visible text -#: library/network/src/modules/SuSEFirewallProposal.rb:708 +#: library/network/src/modules/SuSEFirewallProposal.rb:696 msgid "Remote Administration (VNC) ports are blocked (open</a>)" msgstr "Remote Administration (VNC) ports are blocked (open</a>)" #. TRANSLATORS: This is a warning message. Installation over VNC without VNC allowed on firewall -#: library/network/src/modules/SuSEFirewallProposal.rb:718 +#: library/network/src/modules/SuSEFirewallProposal.rb:707 msgid "You are installing a system using remote administration (VNC), but you have not opened the VNC ports on the firewall." msgstr "You are installing a system using remote administration (VNC), but you have not opened the VNC ports on the firewall." #. TRANSLATORS: Network proposal informative text -#: library/network/src/modules/SuSEFirewallProposal.rb:736 +#: library/network/src/modules/SuSEFirewallProposal.rb:725 #, fuzzy #| msgid "iSCSI Target Daemon" msgid "iSCSI Target ports are open" msgstr "iSCSI Target Daemon" #. TRANSLATORS: Network proposal informative text -#: library/network/src/modules/SuSEFirewallProposal.rb:738 +#: library/network/src/modules/SuSEFirewallProposal.rb:728 #, fuzzy #| msgid "iSCSI Target Daemon" msgid "iSCSI Target ports are blocked" msgstr "iSCSI Target Daemon" #. TRANSLATORS: This is a warning message. Installation to iSCSI without iSCSI allowed on firewall -#: library/network/src/modules/SuSEFirewallProposal.rb:746 +#: library/network/src/modules/SuSEFirewallProposal.rb:737 #, fuzzy #| msgid "You are installing a system over SSH, but you have not opened the SSH port on the firewall." msgid "You are installing a system using iSCSI Target, but you have not opened the needed ports on the firewall." @@ -2932,90 +2951,73 @@ #. "broadcast_ports" : [ ], #. ] #. ); -#: library/network/src/modules/SuSEFirewallServices.rb:355 -#: library/network/src/modules/SuSEFirewallServices.rb:638 +#: library/network/src/modules/SuSEFirewallServices.rb:354 +#: library/network/src/modules/SuSEFirewallServices.rb:637 msgid "Service with name '%{service_name}' does not exist" msgstr "" #. Fallback for presented service -#: library/network/src/modules/SuSEFirewallServices.rb:431 +#: library/network/src/modules/SuSEFirewallServices.rb:430 #, fuzzy #| msgid "Service: %1" msgid "Service: %{filename}" msgstr "Service: %1" #. TRANSLATORS: Name of unknown service. %1 is a requested service id like nis-server -#: library/network/src/modules/SuSEFirewallServices.rb:504 +#: library/network/src/modules/SuSEFirewallServices.rb:503 msgid "Unknown service '%1'" msgstr "Unknown service '%1'" #. the message is followed by list of required packages #. Popup Text #: library/packages/src/include/packages/common.rb:107 -#: library/packages/src/include/packages/common.rb:132 +#: library/packages/src/include/packages/common.rb:135 msgid "These packages need to be installed:" msgstr "These packages need to be installed:" #. Popup Text -#: library/packages/src/include/packages/common.rb:108 -#: library/packages/src/include/packages/common.rb:134 +#: library/packages/src/include/packages/common.rb:109 +#: library/packages/src/include/packages/common.rb:137 msgid "These packages need to be removed:" msgstr "These packages need to be removed:" #. labels changed for bug #215195 #. Label::ContinueButton (), Label::CancelButton (), #. push button label -#: library/packages/src/include/packages/common.rb:156 +#: library/packages/src/include/packages/common.rb:158 msgid "&Uninstall" msgstr "&Uninstall" -#. popup heading -#: library/packages/src/modules/PackageCallbacks.rb:207 -#: library/packages/src/modules/PackageCallbacks.rb:1727 -msgid "Package: " -msgstr "Package: " - -#: library/packages/src/modules/PackageCallbacks.rb:208 -msgid "Size: " -msgstr "Size: " - -#: library/packages/src/modules/PackageCallbacks.rb:231 -msgid "Remaining time to automatic retry: %1" -msgstr "" - +#. -------------------------------------------------------------------------- +#. defaults #. at start of file providal -#: library/packages/src/modules/PackageCallbacks.rb:244 -#: library/packages/src/modules/PackageCallbacks.rb:252 +#: library/packages/src/modules/PackageCallbacks.rb:149 +#: library/packages/src/modules/PackageCallbacks.rb:157 msgid "Downloading package %1 (%2)..." msgstr "Downloading package %1 (%2)..." #. popup heading -#: library/packages/src/modules/PackageCallbacks.rb:256 +#: library/packages/src/modules/PackageCallbacks.rb:161 msgid "Downloading Package" msgstr "Downloading Package" -#. check box -#: library/packages/src/modules/PackageCallbacks.rb:314 -msgid "Show &details" -msgstr "Show &details" - #. error message, %1 is a package name -#: library/packages/src/modules/PackageCallbacks.rb:380 +#: library/packages/src/modules/PackageCallbacks.rb:220 #, fuzzy msgid "Package %1 is broken, integrity check has failed." msgstr "File integrity check failed: " #. command line mode - ask user whether installation of the failed package should be retried #. command line mode - ask user whether installation of the failed package should be retried -#: library/packages/src/modules/PackageCallbacks.rb:393 -#: library/packages/src/modules/PackageCallbacks.rb:610 +#: library/packages/src/modules/PackageCallbacks.rb:232 +#: library/packages/src/modules/PackageCallbacks.rb:447 msgid "Retry installation of the package?" msgstr "Retry installation of the package?" #. command line mode - ask user whether the installation should be aborted #. command line mode - ask user whether the installation should be aborted -#: library/packages/src/modules/PackageCallbacks.rb:401 -#: library/packages/src/modules/PackageCallbacks.rb:618 +#: library/packages/src/modules/PackageCallbacks.rb:240 +#: library/packages/src/modules/PackageCallbacks.rb:455 msgid "Abort the installation?" msgstr "Abort the installation?" @@ -3024,58 +3026,58 @@ #. detail string is appended to the end #. error message, %1 is code of the error, #. detail string is appended to the end -#: library/packages/src/modules/PackageCallbacks.rb:429 -#: library/packages/src/modules/PackageCallbacks.rb:463 -#: library/packages/src/modules/PackageCallbacks.rb:2493 +#: library/packages/src/modules/PackageCallbacks.rb:268 +#: library/packages/src/modules/PackageCallbacks.rb:302 +#: library/packages/src/modules/PackageCallbacks.rb:2143 #, fuzzy msgid "Error: %1:" msgstr "Error: " #. TODO: add "Don't show again" checkbox #. a warning popup displayed after pressing [Ignore] after a download error -#: library/packages/src/modules/PackageCallbacks.rb:486 +#: library/packages/src/modules/PackageCallbacks.rb:326 msgid "" "Ignoring a download failure may result in a broken system.\n" "Verify the system later by running the Software Management module.\n" msgstr "" #. At start of package install. -#: library/packages/src/modules/PackageCallbacks.rb:526 +#: library/packages/src/modules/PackageCallbacks.rb:364 msgid "Uninstalling package %1 (%2)..." msgstr "Uninstalling package %1 (%2)..." -#: library/packages/src/modules/PackageCallbacks.rb:527 +#: library/packages/src/modules/PackageCallbacks.rb:366 msgid "Installing package %1 (%2)..." msgstr "Installing package %1 (%2)..." -#: library/packages/src/modules/PackageCallbacks.rb:534 +#: library/packages/src/modules/PackageCallbacks.rb:374 msgid "Uninstalling Package" msgstr "Uninstalling Package" -#: library/packages/src/modules/PackageCallbacks.rb:534 +#: library/packages/src/modules/PackageCallbacks.rb:374 msgid "Installing Package" msgstr "Installing Package" #. error popup during package installation, %1 is the name of the package -#: library/packages/src/modules/PackageCallbacks.rb:595 +#: library/packages/src/modules/PackageCallbacks.rb:430 msgid "Removal of package %1 failed." msgstr "Removal of package %1 failed." #. error popup during package installation, %1 is the name of the package -#: library/packages/src/modules/PackageCallbacks.rb:597 +#: library/packages/src/modules/PackageCallbacks.rb:433 msgid "Installation of package %1 failed." msgstr "Installation of package %1 failed." #. TODO: add "Don't show again" checkbox #. a warning popup displayed after pressing [Ignore] after a package installation error -#: library/packages/src/modules/PackageCallbacks.rb:669 +#: library/packages/src/modules/PackageCallbacks.rb:506 msgid "" "Ignoring a package failure may result in a broken system.\n" "The system should be later verified by running the Software Management module." msgstr "" #. error report -#: library/packages/src/modules/PackageCallbacks.rb:792 +#: library/packages/src/modules/PackageCallbacks.rb:575 #, fuzzy msgid "" "<p>The repository at the specified URL now provides a different media ID.\n" @@ -3091,29 +3093,29 @@ #. media is double sided, we want the user to insert the 'Side A' of the media #. the complete string will be "<product> <media> <number>, <side>" #. e.g. "'SuSE Linux 9.0' DVD 1, Side A" -#: library/packages/src/modules/PackageCallbacks.rb:807 +#: library/packages/src/modules/PackageCallbacks.rb:590 msgid "Side A" msgstr "Side A" #. media is double sided, we want the user to insert the 'Side B' of the media -#: library/packages/src/modules/PackageCallbacks.rb:810 +#: library/packages/src/modules/PackageCallbacks.rb:593 msgid "Side B" msgstr "Side B" #. label for a repository - %1 product name (e.g. openSUSE 10.2), %2 medium number (e.g. 2) -#: library/packages/src/modules/PackageCallbacks.rb:824 +#: library/packages/src/modules/PackageCallbacks.rb:608 #, fuzzy msgid "%1 (Disc %2)" msgstr "%1 (%2)" #. label for a repository - %1 product name (e.g. openSUSE 10.2), %2 medium number (e.g. 2) -#: library/packages/src/modules/PackageCallbacks.rb:826 +#: library/packages/src/modules/PackageCallbacks.rb:611 #, fuzzy msgid "%1 (Medium %2)" msgstr "Medium: %1" #. prompt to insert product (%1 == "SuSE Linux version 9.2 CD 2") -#: library/packages/src/modules/PackageCallbacks.rb:831 +#: library/packages/src/modules/PackageCallbacks.rb:617 msgid "" "Insert\n" "'%1'" @@ -3122,7 +3124,7 @@ "'%1'" #. report error while accessing local directory with product (%1 = URL, %2 = "SuSE Linux ...") -#: library/packages/src/modules/PackageCallbacks.rb:836 +#: library/packages/src/modules/PackageCallbacks.rb:622 #, fuzzy msgid "" "Cannot access installation media\n" @@ -3135,7 +3137,7 @@ "Check that the directory is accessible." #. report error while accessing network media of product (%1 = URL, %2 = "SuSE Linux ...") -#: library/packages/src/modules/PackageCallbacks.rb:848 +#: library/packages/src/modules/PackageCallbacks.rb:634 #, fuzzy msgid "" "Cannot access installation media \n" @@ -3147,62 +3149,56 @@ "%1.\n" "Check that the server is accessible." -#. currently unused -#: library/packages/src/modules/PackageCallbacks.rb:860 -#, fuzzy -msgid "The correct repository medium could not be mounted." -msgstr "The correct source medium could not be mounted." - #. wrong media id, offer "Ignore" #. push button label -#: library/packages/src/modules/PackageCallbacks.rb:881 -#: library/packages/src/modules/PackageCallbacks.rb:2170 +#: library/packages/src/modules/PackageCallbacks.rb:659 +#: library/packages/src/modules/PackageCallbacks.rb:1838 #, fuzzy msgid "Skip Autorefresh" msgstr "&Skip Refresh" #. menu button label - used for more then one device #. push button label - in the media change popup, user can eject the CD/DVD -#: library/packages/src/modules/PackageCallbacks.rb:904 -#: library/packages/src/modules/PackageCallbacks.rb:909 +#: library/packages/src/modules/PackageCallbacks.rb:678 +#: library/packages/src/modules/PackageCallbacks.rb:681 msgid "&Eject" msgstr "&Eject" -#: library/packages/src/modules/PackageCallbacks.rb:921 +#: library/packages/src/modules/PackageCallbacks.rb:688 #, fuzzy msgid "A&utomatically Eject CD or DVD Medium" msgstr "Read &CD or DVD Medium" #. command line mode - ask user whether installation of the failed package should be retried -#: library/packages/src/modules/PackageCallbacks.rb:989 +#: library/packages/src/modules/PackageCallbacks.rb:755 msgid "Retry the installation?" msgstr "Retry the installation?" #. command line mode - ask user whether the installation should be aborted -#: library/packages/src/modules/PackageCallbacks.rb:997 +#: library/packages/src/modules/PackageCallbacks.rb:763 msgid "Skip the medium?" msgstr "Skip the medium?" #. otherwise ignore the medium -#: library/packages/src/modules/PackageCallbacks.rb:1004 +#: library/packages/src/modules/PackageCallbacks.rb:770 msgid "Ignoring the bad medium..." msgstr "Ignoring the bad medium..." #. TextEntry label #. TextEntry label -#: library/packages/src/modules/PackageCallbacks.rb:1025 -#: library/packages/src/modules/PackageCallbacks.rb:1086 +#: library/packages/src/modules/PackageCallbacks.rb:791 +#: library/packages/src/modules/PackageCallbacks.rb:847 msgid "&URL" msgstr "&URL" #. popup label (%1 is repository URL) -#: library/packages/src/modules/PackageCallbacks.rb:1333 +#: library/packages/src/modules/PackageCallbacks.rb:1039 #, fuzzy msgid "Creating Repository %1" msgstr "Probing repository " #. error message - a label followed by a richtext with details -#: library/packages/src/modules/PackageCallbacks.rb:1366 +#: library/packages/src/modules/PackageCallbacks.rb:1072 #, fuzzy msgid "An error occurred while creating the repository." msgstr "Error occurred while reading the log." @@ -3210,9 +3206,9 @@ #. error message - a label followed by a richtext with details #. error message - a label followed by a richtext with details #. error message - a label followed by a richtext with details -#: library/packages/src/modules/PackageCallbacks.rb:1370 -#: library/packages/src/modules/PackageCallbacks.rb:1501 -#: library/packages/src/modules/PackageCallbacks.rb:1613 +#: library/packages/src/modules/PackageCallbacks.rb:1076 +#: library/packages/src/modules/PackageCallbacks.rb:1203 +#: library/packages/src/modules/PackageCallbacks.rb:1313 #, fuzzy msgid "Unable to retrieve the remote repository description." msgstr "Unable to retrieve the remote source description." @@ -3220,24 +3216,24 @@ #. error message - a label followed by a richtext with details #. error message - a label followed by a richtext with details #. error message - a label followed by a richtext with details -#: library/packages/src/modules/PackageCallbacks.rb:1373 -#: library/packages/src/modules/PackageCallbacks.rb:1504 -#: library/packages/src/modules/PackageCallbacks.rb:1616 +#: library/packages/src/modules/PackageCallbacks.rb:1079 +#: library/packages/src/modules/PackageCallbacks.rb:1206 +#: library/packages/src/modules/PackageCallbacks.rb:1316 msgid "An error occurred while retrieving the new metadata." msgstr "An error occurred while retrieving the new metadata." #. error message - a label followed by a richtext with details #. error message - a label followed by a richtext with details #. error message - a label followed by a richtext with details -#: library/packages/src/modules/PackageCallbacks.rb:1376 -#: library/packages/src/modules/PackageCallbacks.rb:1507 -#: library/packages/src/modules/PackageCallbacks.rb:1619 +#: library/packages/src/modules/PackageCallbacks.rb:1082 +#: library/packages/src/modules/PackageCallbacks.rb:1209 +#: library/packages/src/modules/PackageCallbacks.rb:1319 #, fuzzy msgid "The repository is not valid." msgstr "The entered URL is not valid." #. error message - a label followed by a richtext with details -#: library/packages/src/modules/PackageCallbacks.rb:1379 +#: library/packages/src/modules/PackageCallbacks.rb:1085 #, fuzzy msgid "The repository metadata is invalid." msgstr "The host name is invalid." @@ -3246,113 +3242,107 @@ #. command line mode - ask user whether the repository refreshment should be retried #. command line mode - ask user whether the repository refreshment should be retried #. command line mode - ask user whether target initializatin can be restarted -#: library/packages/src/modules/PackageCallbacks.rb:1392 -#: library/packages/src/modules/PackageCallbacks.rb:1526 -#: library/packages/src/modules/PackageCallbacks.rb:1632 -#: library/packages/src/modules/PackageCallbacks.rb:2447 +#: library/packages/src/modules/PackageCallbacks.rb:1098 +#: library/packages/src/modules/PackageCallbacks.rb:1228 +#: library/packages/src/modules/PackageCallbacks.rb:1332 +#: library/packages/src/modules/PackageCallbacks.rb:2097 #, fuzzy msgid "Retry?" msgstr "Retry" #. popup label (%1 is repository URL) -#: library/packages/src/modules/PackageCallbacks.rb:1440 -#: library/packages/src/modules/PackageCallbacks.rb:1448 +#: library/packages/src/modules/PackageCallbacks.rb:1144 +#: library/packages/src/modules/PackageCallbacks.rb:1152 #, fuzzy msgid "Probing Repository %1" msgstr "Probing repository " #. error message - a label followed by a richtext with details -#: library/packages/src/modules/PackageCallbacks.rb:1497 +#: library/packages/src/modules/PackageCallbacks.rb:1199 #, fuzzy msgid "Error occurred while probing the repository." msgstr "Error occurred while reading the log." #. error message - a label followed by a richtext with details -#: library/packages/src/modules/PackageCallbacks.rb:1510 +#: library/packages/src/modules/PackageCallbacks.rb:1212 #, fuzzy msgid "Repository probing details." msgstr "Repository Configuration" #. error message - a label followed by a richtext with details -#: library/packages/src/modules/PackageCallbacks.rb:1513 +#: library/packages/src/modules/PackageCallbacks.rb:1215 #, fuzzy msgid "Repository metadata is invalid." msgstr "Host name is invalid." #. error message - a label followed by a richtext with details -#: library/packages/src/modules/PackageCallbacks.rb:1609 +#: library/packages/src/modules/PackageCallbacks.rb:1309 #, fuzzy msgid "Repository %1" msgstr "Repository: " #. at start of delta providal -#: library/packages/src/modules/PackageCallbacks.rb:1697 +#: library/packages/src/modules/PackageCallbacks.rb:1397 #, fuzzy msgid "Downloading delta RPM package %1 (%2)..." msgstr "Downloading package %1 (%2)..." #. popup heading -#: library/packages/src/modules/PackageCallbacks.rb:1705 +#: library/packages/src/modules/PackageCallbacks.rb:1405 #, fuzzy msgid "Downloading Delta RPM package" msgstr "Downloading delta RPM %1" #. at start of delta application -#: library/packages/src/modules/PackageCallbacks.rb:1718 +#: library/packages/src/modules/PackageCallbacks.rb:1418 #, fuzzy msgid "Applying delta RPM package %1..." msgstr "Applying delta RPM: %1" #. popup heading -#: library/packages/src/modules/PackageCallbacks.rb:1725 +#: library/packages/src/modules/PackageCallbacks.rb:1425 #, fuzzy msgid "Applying delta RPM package" msgstr "Applying delta RPM: %1" -#. at start of patch providal -#: library/packages/src/modules/PackageCallbacks.rb:1746 -#, fuzzy -msgid "Downloading patch RPM package %1 (%2)..." -msgstr "Downloading package %1 (%2)..." - #. popup heading -#: library/packages/src/modules/PackageCallbacks.rb:1754 -#, fuzzy -msgid "Downloading Patch RPM Package" -msgstr "Downloading patch RPM %1" +#: library/packages/src/modules/PackageCallbacks.rb:1427 +#: library/packages/src/modules/PackageCallbacks.rb:3075 +msgid "Package: " +msgstr "Package: " #. close popup -#: library/packages/src/modules/PackageCallbacks.rb:1824 +#: library/packages/src/modules/PackageCallbacks.rb:1493 #, fuzzy msgid "Starting script %1 (patch %2)..." msgstr "Starting script %1" #. popup heading -#: library/packages/src/modules/PackageCallbacks.rb:1833 +#: library/packages/src/modules/PackageCallbacks.rb:1502 #, fuzzy msgid "Running Script" msgstr "Running scripts..." #. label, patch name follows -#: library/packages/src/modules/PackageCallbacks.rb:1838 +#: library/packages/src/modules/PackageCallbacks.rb:1507 #, fuzzy msgid "Patch: " msgstr "Patch" #. label, script name follows -#: library/packages/src/modules/PackageCallbacks.rb:1845 +#: library/packages/src/modules/PackageCallbacks.rb:1516 #, fuzzy msgid "Script: " msgstr "Script" #. label -#: library/packages/src/modules/PackageCallbacks.rb:1851 +#: library/packages/src/modules/PackageCallbacks.rb:1522 #, fuzzy msgid "Output of the Script" msgstr "The Output of the Script mkinitrd" #. label, %1 is patch name with version and architecture -#: library/packages/src/modules/PackageCallbacks.rb:1939 +#: library/packages/src/modules/PackageCallbacks.rb:1610 #, fuzzy msgid "" "Patch: %1\n" @@ -3362,7 +3352,7 @@ "\n" #. a popup question with "Continue", "Skip" and "Abort" buttons -#: library/packages/src/modules/PackageCallbacks.rb:1956 +#: library/packages/src/modules/PackageCallbacks.rb:1627 msgid "" "The repositories are being refreshed.\n" "Continue with refreshing?\n" @@ -3372,45 +3362,37 @@ msgstr "" #. push button label -#: library/packages/src/modules/PackageCallbacks.rb:1971 +#: library/packages/src/modules/PackageCallbacks.rb:1642 msgid "&Skip Refresh" msgstr "&Skip Refresh" #. heading of popup -#. heading of popup -#: library/packages/src/modules/PackageCallbacks.rb:2005 -#: library/packages/src/modules/PackageCallbacks.rb:2047 +#: library/packages/src/modules/PackageCallbacks.rb:1676 #, fuzzy msgid "Downloading" msgstr "&Downloading" #. message in a progress popup #. progress bar label, %1 is URL with optional download rate -#: library/packages/src/modules/PackageCallbacks.rb:2055 -#: library/packages/src/modules/PackageCallbacks.rb:2103 +#: library/packages/src/modules/PackageCallbacks.rb:1723 +#: library/packages/src/modules/PackageCallbacks.rb:1771 msgid "Downloading: %1" msgstr "Downloading: %1" #. heading of popup #. heading of popup -#: library/packages/src/modules/PackageCallbacks.rb:2208 -#: library/packages/src/modules/PackageCallbacks.rb:2283 +#: library/packages/src/modules/PackageCallbacks.rb:1875 +#: library/packages/src/modules/PackageCallbacks.rb:1941 msgid "Checking Package Database" msgstr "Checking Package Database" #. message in a progress popup -#: library/packages/src/modules/PackageCallbacks.rb:2211 +#: library/packages/src/modules/PackageCallbacks.rb:1878 msgid "Rebuilding package database. This process can take some time." msgstr "Rebuilding package database. This process can take some time." -#. progress bar label -#: library/packages/src/modules/PackageCallbacks.rb:2216 -#: library/packages/src/modules/PackageCallbacks.rb:2299 -msgid "Status" -msgstr "Status" - #. error message, %1 is the cause for the error -#: library/packages/src/modules/PackageCallbacks.rb:2249 +#: library/packages/src/modules/PackageCallbacks.rb:1911 msgid "" "Rebuilding of package database failed:\n" "%1" @@ -3419,12 +3401,16 @@ "%1" #. message in a progress popup -#: library/packages/src/modules/PackageCallbacks.rb:2286 +#: library/packages/src/modules/PackageCallbacks.rb:1944 msgid "Converting package database. This process can take some time." msgstr "Converting package database. This process can take some time." +#: library/packages/src/modules/PackageCallbacks.rb:1957 +msgid "Status" +msgstr "Status" + #. error message, %1 is the cause for the error -#: library/packages/src/modules/PackageCallbacks.rb:2325 +#: library/packages/src/modules/PackageCallbacks.rb:1981 msgid "" "Conversion of package database failed:\n" "%1" @@ -3433,13 +3419,13 @@ "%1" #. progress message (command line mode) -#: library/packages/src/modules/PackageCallbacks.rb:2365 +#: library/packages/src/modules/PackageCallbacks.rb:2017 #, fuzzy msgid "Reading RPM database..." msgstr "Reading the database..." #. popup heading -#: library/packages/src/modules/PackageCallbacks.rb:2375 +#: library/packages/src/modules/PackageCallbacks.rb:2027 #, fuzzy msgid "Reading Installed Packages" msgstr "Verify Installed Packages" @@ -3451,30 +3437,30 @@ #. `Label(""), #. `PushButton(`id(`abort), Label::AbortButton()) #. ) -#: library/packages/src/modules/PackageCallbacks.rb:2381 -#: library/packages/src/modules/PackageCallbacks.rb:2397 +#: library/packages/src/modules/PackageCallbacks.rb:2033 +#: library/packages/src/modules/PackageCallbacks.rb:2049 #, fuzzy msgid "Scanning RPM database..." msgstr "Writing SCPM database..." #. error message, could not read RPM database -#: library/packages/src/modules/PackageCallbacks.rb:2436 +#: library/packages/src/modules/PackageCallbacks.rb:2086 #, fuzzy msgid "Initialization of the target failed." msgstr "Initialising the target directory failed" #. status message (command line mode) -#: library/packages/src/modules/PackageCallbacks.rb:2527 +#: library/packages/src/modules/PackageCallbacks.rb:2178 #, fuzzy msgid "RPM database read" msgstr "MySQL database admin" #. heading in a popup window -#: library/packages/src/modules/PackageCallbacks.rb:2563 +#: library/packages/src/modules/PackageCallbacks.rb:2212 msgid "User Authentication" msgstr "User Authentication" -#: library/packages/src/modules/PackageCallbacks.rb:2569 +#: library/packages/src/modules/PackageCallbacks.rb:2218 #, fuzzy msgid "" "URL: %1\n" @@ -3483,10 +3469,23 @@ msgstr "URL: %1" #. textentry label -#: library/packages/src/modules/PackageCallbacks.rb:2578 +#: library/packages/src/modules/PackageCallbacks.rb:2227 msgid "&User Name" msgstr "&User Name" +#. check box +#: library/packages/src/modules/PackageCallbacks.rb:3010 +msgid "Show &details" +msgstr "Show &details" + +#: library/packages/src/modules/PackageCallbacks.rb:3076 +msgid "Size: " +msgstr "Size: " + +#: library/packages/src/modules/PackageCallbacks.rb:3099 +msgid "Remaining time to automatic retry: %1" +msgstr "" + #. ask to send quit signal to PackageKit #: library/packages/src/modules/PackageLock.rb:58 msgid "" @@ -3494,7 +3493,7 @@ "Ask PackageKit to quit again?" msgstr "" -#: library/packages/src/modules/PackageLock.rb:61 +#: library/packages/src/modules/PackageLock.rb:62 msgid "" "PackageKit is blocking software management.\n" "This happens when the updater applet or another software management\n" @@ -3506,16 +3505,16 @@ #. TRANSLATORS: a popup headline #. TRANSLATORS: a popup headline #. TRANSLATORS: a popup headline -#: library/packages/src/modules/PackageLock.rb:106 -#: library/packages/src/modules/PackageLock.rb:157 -#: library/packages/src/modules/PackageLock.rb:181 +#: library/packages/src/modules/PackageLock.rb:108 +#: library/packages/src/modules/PackageLock.rb:159 +#: library/packages/src/modules/PackageLock.rb:183 #, fuzzy #| msgid "Accessing the Package Management Failed" msgid "Accessing the Software Management Failed" msgstr "Accessing the Package Management Failed" #. TRANSLATORS: an error message with question -#: library/packages/src/modules/PackageLock.rb:110 +#: library/packages/src/modules/PackageLock.rb:112 #, fuzzy msgid "" "Would you like to continue without having access\n" @@ -3528,7 +3527,7 @@ "to the package management or retry to access it?\n" #. TRANSLATORS: an error message with question -#: library/packages/src/modules/PackageLock.rb:161 +#: library/packages/src/modules/PackageLock.rb:163 #, fuzzy msgid "" "Would you like to retry accessing the software manager,\n" @@ -3542,15 +3541,15 @@ "to the package management or retry to access it?\n" #. TRANSLATORS: an error message with question -#: library/packages/src/modules/PackageLock.rb:185 +#: library/packages/src/modules/PackageLock.rb:187 #, fuzzy msgid "Would you like to abort or try again?\n" msgstr "Would you like to change the CD and retry ?" #. print the question #. popup heading, with rich text widget and Yes/No buttons -#: library/packages/src/modules/PackageSystem.rb:187 -#: library/packages/src/modules/PackageSystem.rb:193 +#: library/packages/src/modules/PackageSystem.rb:188 +#: library/packages/src/modules/PackageSystem.rb:194 #, fuzzy #| msgid "Do you accept this license agreement?" #| msgid_plural "Do you accept these license agreements?" @@ -3558,7 +3557,7 @@ msgstr "Do you accept this licence agreement?" #. error message, after pressing [OK] the package manager is displayed -#: library/packages/src/modules/PackageSystem.rb:223 +#: library/packages/src/modules/PackageSystem.rb:224 msgid "" "There are unresolved dependencies which need\n" "to be solved manually in the software manager." @@ -3595,17 +3594,17 @@ "packages, YaST may not work properly.\n" #. dialog heading, %1 is package name -#: library/packages/src/modules/PackagesUI.rb:153 +#: library/packages/src/modules/PackagesUI.rb:152 msgid "Confirm Package License: %1" msgstr "Confirm Package License: %1" #. push button -#: library/packages/src/modules/PackagesUI.rb:160 +#: library/packages/src/modules/PackagesUI.rb:159 msgid "I &Agree" msgstr "I &Agree" #. push button -#: library/packages/src/modules/PackagesUI.rb:162 +#: library/packages/src/modules/PackagesUI.rb:161 msgid "I &Disagree" msgstr "I &Disagree" @@ -3633,7 +3632,7 @@ "their licenses, click <b>I Disagree with All</b>.</p>" #. Help text for software patterns / selections dialog -#: library/packages/src/modules/PackagesUI.rb:331 +#: library/packages/src/modules/PackagesUI.rb:326 msgid "" "<p>\n" "\t\t This dialog allows you to define this system's tasks and what software to install.\n" @@ -3642,7 +3641,7 @@ "\t\t </p>" msgstr "" -#: library/packages/src/modules/PackagesUI.rb:338 +#: library/packages/src/modules/PackagesUI.rb:333 msgid "" "<p>\n" "\t\t Change the status of an item by clicking its status icon\n" @@ -3651,7 +3650,7 @@ "\t\t </p>" msgstr "" -#: library/packages/src/modules/PackagesUI.rb:345 +#: library/packages/src/modules/PackagesUI.rb:340 msgid "" "<p>\n" "\t\t <b>Details</b> opens the detailed software package selection\n" @@ -3659,7 +3658,7 @@ "\t\t </p>" msgstr "" -#: library/packages/src/modules/PackagesUI.rb:351 +#: library/packages/src/modules/PackagesUI.rb:346 msgid "" "<p>\n" "\t\t The disk usage display in the lower right corner shows the remaining disk space\n" @@ -3672,151 +3671,151 @@ #. Dialog title #. Hint for German translation: "Softwareauswahl und Einsatzzweck des Systems" -#: library/packages/src/modules/PackagesUI.rb:372 +#: library/packages/src/modules/PackagesUI.rb:367 msgid "Software Selection and System Tasks" msgstr "Software Selection and System Tasks" #. don't get all the way out - the user might just have #. been scared of the gory details. -#: library/packages/src/modules/PackagesUI.rb:412 +#: library/packages/src/modules/PackagesUI.rb:408 #, fuzzy msgid "(more)" msgstr "more..." -#: library/packages/src/modules/PackagesUI.rb:428 +#: library/packages/src/modules/PackagesUI.rb:424 #, fuzzy msgid "Installation Successfully Finished" msgstr "Installation finished.\n" -#: library/packages/src/modules/PackagesUI.rb:429 +#: library/packages/src/modules/PackagesUI.rb:426 #, fuzzy msgid "Package Installation Failed" msgstr "Package Installation" -#: library/packages/src/modules/PackagesUI.rb:440 +#: library/packages/src/modules/PackagesUI.rb:438 #, fuzzy msgid "Error Message: %1" msgstr "Error Message" -#: library/packages/src/modules/PackagesUI.rb:457 +#: library/packages/src/modules/PackagesUI.rb:455 #, fuzzy msgid "Failed Packages: %1" msgstr "Affected Packages: %1" -#: library/packages/src/modules/PackagesUI.rb:476 +#: library/packages/src/modules/PackagesUI.rb:474 #, fuzzy msgid "Installed Packages: %1" msgstr "Installed &Packages" -#: library/packages/src/modules/PackagesUI.rb:495 +#: library/packages/src/modules/PackagesUI.rb:493 #, fuzzy msgid "Updated Packages: %1" msgstr "Affected Packages: %1" -#: library/packages/src/modules/PackagesUI.rb:514 +#: library/packages/src/modules/PackagesUI.rb:512 #, fuzzy msgid "Removed Packages: %1" msgstr "Remove packages" -#: library/packages/src/modules/PackagesUI.rb:536 +#: library/packages/src/modules/PackagesUI.rb:534 #, fuzzy msgid "Not Installed Packages: %1" msgstr "Number of Installed Packages: " #. Table headings for CD statistics during installation -#: library/packages/src/modules/PackagesUI.rb:552 -#: library/packages/src/modules/SlideShow.rb:545 +#: library/packages/src/modules/PackagesUI.rb:550 +#: library/packages/src/modules/SlideShow.rb:533 msgid "Packages" msgstr "Packages" #. reset the items list -#: library/packages/src/modules/PackagesUI.rb:563 +#: library/packages/src/modules/PackagesUI.rb:561 #, fuzzy msgid "Elapsed Time: %1" msgstr "Default Lease Time: %1" -#: library/packages/src/modules/PackagesUI.rb:573 +#: library/packages/src/modules/PackagesUI.rb:571 #, fuzzy msgid "Total Installed Size: %1" msgstr "Installed Size:" -#: library/packages/src/modules/PackagesUI.rb:583 +#: library/packages/src/modules/PackagesUI.rb:581 #, fuzzy msgid "Total Downloaded Size: %1" msgstr "Total Download Size: " -#: library/packages/src/modules/PackagesUI.rb:592 +#: library/packages/src/modules/PackagesUI.rb:590 #, fuzzy msgid "Statistics" msgstr "Backup statistics:" #. display installation log -#: library/packages/src/modules/PackagesUI.rb:605 -#: library/packages/src/modules/PackagesUI.rb:694 +#: library/packages/src/modules/PackagesUI.rb:603 +#: library/packages/src/modules/PackagesUI.rb:691 #, fuzzy msgid "Installation log" msgstr "Installation Mode" -#: library/packages/src/modules/PackagesUI.rb:612 +#: library/packages/src/modules/PackagesUI.rb:610 msgid "Details" msgstr "Details" #. open a new wizard dialog if needed -#: library/packages/src/modules/PackagesUI.rb:661 +#: library/packages/src/modules/PackagesUI.rb:658 #, fuzzy #| msgid "Installing Package" msgid "After Installing Packages" msgstr "Installing Package" -#: library/packages/src/modules/PackagesUI.rb:662 +#: library/packages/src/modules/PackagesUI.rb:659 msgid "Show This Report" msgstr "" -#: library/packages/src/modules/PackagesUI.rb:663 +#: library/packages/src/modules/PackagesUI.rb:660 #, fuzzy #| msgid "&Finish" msgid "Finish" msgstr "&Finish" -#: library/packages/src/modules/PackagesUI.rb:664 +#: library/packages/src/modules/PackagesUI.rb:661 #, fuzzy #| msgid "Accessing the Package Management Failed" msgid "Continue in the Software Manager" msgstr "Accessing the Package Management Failed" -#: library/packages/src/modules/PackagesUI.rb:669 +#: library/packages/src/modules/PackagesUI.rb:666 #, fuzzy msgid "<P><BIG><B>Installation Report</B></BIG><BR>Here is a summary of installed or removed packages.</P>" msgstr "<P><BIG><B>Loading Installed Packages</B></BIG></P><P>The package manager is reading installed packages...</P>" -#: library/packages/src/modules/PackagesUI.rb:677 +#: library/packages/src/modules/PackagesUI.rb:674 #, fuzzy #| msgid "Installation Error" msgid "Installation Report" msgstr "Installation Error" -#: library/packages/src/modules/PackagesUI.rb:699 +#: library/packages/src/modules/PackagesUI.rb:696 #, fuzzy msgid "Installed Packages" msgstr "Installed &Packages" -#: library/packages/src/modules/PackagesUI.rb:704 +#: library/packages/src/modules/PackagesUI.rb:701 #, fuzzy msgid "Updated Packages" msgstr "Changed Packages" -#: library/packages/src/modules/PackagesUI.rb:709 +#: library/packages/src/modules/PackagesUI.rb:706 #, fuzzy msgid "Removed Packages" msgstr "Remove packages" -#: library/packages/src/modules/PackagesUI.rb:714 +#: library/packages/src/modules/PackagesUI.rb:711 #, fuzzy msgid "Remaining Packages" msgstr "Removing Packages..." #. disabling installation report dialog, inform the user how to enable it back -#: library/packages/src/modules/PackagesUI.rb:735 +#: library/packages/src/modules/PackagesUI.rb:732 msgid "" "If you want to show this report dialog again edit\n" "\n" @@ -3848,7 +3847,7 @@ #. popup question, %1 stands for the filename #. %2 is a repository name #. %3 is URL of the repository -#: library/packages/src/modules/SignatureCheckDialogs.rb:475 +#: library/packages/src/modules/SignatureCheckDialogs.rb:476 #, fuzzy msgid "" "The file %1 from repository %2\n" @@ -3866,18 +3865,18 @@ "Use it anyway?" #. popup heading -#: library/packages/src/modules/SignatureCheckDialogs.rb:498 +#: library/packages/src/modules/SignatureCheckDialogs.rb:500 #, fuzzy msgid "Unsigned Package" msgstr "Changed Packages" -#: library/packages/src/modules/SignatureCheckDialogs.rb:499 +#: library/packages/src/modules/SignatureCheckDialogs.rb:502 #, fuzzy msgid "Unsigned File" msgstr "Accept &Unsigned Files" #. popup question, %1 stands for the package name -#: library/packages/src/modules/SignatureCheckDialogs.rb:547 +#: library/packages/src/modules/SignatureCheckDialogs.rb:551 #, fuzzy msgid "" "No checksum for package %1 was found in the repository.\n" @@ -3895,7 +3894,7 @@ "Install it anyway?" #. popup question, %1 stands for the filename -#: library/packages/src/modules/SignatureCheckDialogs.rb:556 +#: library/packages/src/modules/SignatureCheckDialogs.rb:561 #, fuzzy msgid "" "No checksum for file %1 was found in the repository.\n" @@ -3913,70 +3912,70 @@ "Use it anyway?" #. popup heading -#: library/packages/src/modules/SignatureCheckDialogs.rb:573 +#: library/packages/src/modules/SignatureCheckDialogs.rb:579 msgid "No Checksum Found" msgstr "No Checksum Found" #. Part of the GnuPG key description in popup, %1 is a GnuPG key ID #. Part of the GnuPG key description in popup, %1 is a GnuPG key ID -#: library/packages/src/modules/SignatureCheckDialogs.rb:616 -#: library/packages/src/modules/SignatureCheckDialogs.rb:815 +#: library/packages/src/modules/SignatureCheckDialogs.rb:622 +#: library/packages/src/modules/SignatureCheckDialogs.rb:833 msgid "ID: %1" msgstr "ID: %1" #. Part of the GnuPG key description in popup, %1 is a GnuPG key fingerprint -#: library/packages/src/modules/SignatureCheckDialogs.rb:624 +#: library/packages/src/modules/SignatureCheckDialogs.rb:631 msgid "Fingerprint: %1" msgstr "Fingerprint: %1" #. Part of the GnuPG key description in popup, %1 is a GnuPG key name -#: library/packages/src/modules/SignatureCheckDialogs.rb:629 +#: library/packages/src/modules/SignatureCheckDialogs.rb:637 msgid "Name: %1" msgstr "Name: %1" -#: library/packages/src/modules/SignatureCheckDialogs.rb:635 +#: library/packages/src/modules/SignatureCheckDialogs.rb:643 #, fuzzy msgid "Created: %1" msgstr "Create Image: %1" -#: library/packages/src/modules/SignatureCheckDialogs.rb:645 +#: library/packages/src/modules/SignatureCheckDialogs.rb:655 #, fuzzy msgid "Expires: %1" msgstr "Expired" #. GPG key property -#: library/packages/src/modules/SignatureCheckDialogs.rb:659 +#: library/packages/src/modules/SignatureCheckDialogs.rb:671 #, fuzzy #| msgid "ID: %1" msgid "ID: " msgstr "ID: %1" #. GPG key property -#: library/packages/src/modules/SignatureCheckDialogs.rb:665 +#: library/packages/src/modules/SignatureCheckDialogs.rb:677 #, fuzzy #| msgid "Name: %1" msgid "Name: " msgstr "Name: %1" #. GPG key property -#: library/packages/src/modules/SignatureCheckDialogs.rb:678 +#: library/packages/src/modules/SignatureCheckDialogs.rb:690 msgid "Fingerprint: " msgstr "Fingerprint: " #. GPG key property -#: library/packages/src/modules/SignatureCheckDialogs.rb:689 +#: library/packages/src/modules/SignatureCheckDialogs.rb:701 #, fuzzy msgid "Created: " msgstr "Create Image: %1" #. GPG key property -#: library/packages/src/modules/SignatureCheckDialogs.rb:700 +#: library/packages/src/modules/SignatureCheckDialogs.rb:712 #, fuzzy msgid "Expires: " msgstr "Expired" #. popup question, %1 stands for the package name, %2 for the complete description of the GnuPG key (multiline) -#: library/packages/src/modules/SignatureCheckDialogs.rb:722 +#: library/packages/src/modules/SignatureCheckDialogs.rb:734 #, fuzzy msgid "" "Package %1 from repository %2\n" @@ -3998,7 +3997,7 @@ "Install it anyway?" #. popup question, %1 stands for the filename, %2 for the complete description of the GnuPG key (multiline) -#: library/packages/src/modules/SignatureCheckDialogs.rb:734 +#: library/packages/src/modules/SignatureCheckDialogs.rb:747 #, fuzzy msgid "" "File %1 from repository %2\n" @@ -4021,12 +4020,12 @@ "Use it anyway?" #. popup heading -#: library/packages/src/modules/SignatureCheckDialogs.rb:757 +#: library/packages/src/modules/SignatureCheckDialogs.rb:771 msgid "Validation Check Failed" msgstr "Validation Check Failed" #. popup question, %1 stands for the package name, %2 for the complex multiline description of the GnuPG key -#: library/packages/src/modules/SignatureCheckDialogs.rb:787 +#: library/packages/src/modules/SignatureCheckDialogs.rb:801 msgid "" "The package %1 is digitally signed\n" "with the following unknown GnuPG key: %2.\n" @@ -4047,7 +4046,7 @@ "Install it anyway?" #. popup question, %1 stands for the filename, %2 for the complex multiline description of the GnuPG key -#: library/packages/src/modules/SignatureCheckDialogs.rb:798 +#: library/packages/src/modules/SignatureCheckDialogs.rb:813 msgid "" "The file %1\n" "is digitally signed with the following unknown GnuPG key: %2.\n" @@ -4068,12 +4067,12 @@ "Use it anyway?" #. popup heading -#: library/packages/src/modules/SignatureCheckDialogs.rb:825 +#: library/packages/src/modules/SignatureCheckDialogs.rb:843 msgid "Unknown GnuPG Key" msgstr "Unknown GnuPG Key" #. popup question, %1 stands for the package name, %2 for the key ID, %3 for the key name -#: library/packages/src/modules/SignatureCheckDialogs.rb:876 +#: library/packages/src/modules/SignatureCheckDialogs.rb:894 #, fuzzy msgid "" "The package %1 is digitally signed\n" @@ -4099,7 +4098,7 @@ "to skip the package." #. popup question, %1 stands for the filename, %2 for the key ID, %3 for the key name -#: library/packages/src/modules/SignatureCheckDialogs.rb:888 +#: library/packages/src/modules/SignatureCheckDialogs.rb:907 #, fuzzy msgid "" "The file %1 is digitally signed\n" @@ -4125,17 +4124,17 @@ "to skip it." #. popup heading -#: library/packages/src/modules/SignatureCheckDialogs.rb:910 +#: library/packages/src/modules/SignatureCheckDialogs.rb:930 msgid "Signed with Untrusted Public Key" msgstr "Signed with Untrusted Public Key" #. push button -#: library/packages/src/modules/SignatureCheckDialogs.rb:919 +#: library/packages/src/modules/SignatureCheckDialogs.rb:939 msgid "&Trust and Import the Key" msgstr "" #. additional Richtext (HTML) warning text (kind of help), 1/2 -#: library/packages/src/modules/SignatureCheckDialogs.rb:953 +#: library/packages/src/modules/SignatureCheckDialogs.rb:973 msgid "" "<p>The owner of the key may distribute updates,\n" "packages, and package repositories that your system will trust and offer\n" @@ -4150,7 +4149,7 @@ "to have a certain amount of control over the software on your system.</p>" #. additional Richtext (HTML) warning text (kind of help), 2/2 -#: library/packages/src/modules/SignatureCheckDialogs.rb:961 +#: library/packages/src/modules/SignatureCheckDialogs.rb:981 #, fuzzy #| msgid "" #| "<p>A warning dialog opens for every package that\n" @@ -4166,7 +4165,7 @@ "packages created by the owner of key <tt>%1</tt> show this warning.</p>" #. popup message - label, part 1, %1 stands for repository name, %2 for its URL -#: library/packages/src/modules/SignatureCheckDialogs.rb:971 +#: library/packages/src/modules/SignatureCheckDialogs.rb:991 msgid "" "The following GnuPG key has been found in repository\n" "%1\n" @@ -4174,7 +4173,7 @@ msgstr "" #. popup message - label, part 2 -#: library/packages/src/modules/SignatureCheckDialogs.rb:982 +#: library/packages/src/modules/SignatureCheckDialogs.rb:1002 #, fuzzy #| msgid "" #| "The GnuPG key %1\n" @@ -4199,17 +4198,17 @@ "the key really belongs to that owner before importing it." #. warning label - the key to import is expired -#: library/packages/src/modules/SignatureCheckDialogs.rb:994 +#: library/packages/src/modules/SignatureCheckDialogs.rb:1014 msgid "WARNING: The key has expired!" msgstr "" #. popup heading -#: library/packages/src/modules/SignatureCheckDialogs.rb:1020 +#: library/packages/src/modules/SignatureCheckDialogs.rb:1042 msgid "Import Untrusted GnuPG Key" msgstr "Import Untrusted GnuPG Key" #. push button -#: library/packages/src/modules/SignatureCheckDialogs.rb:1036 +#: library/packages/src/modules/SignatureCheckDialogs.rb:1058 #, fuzzy #| msgid "Trust" msgid "&Trust" @@ -4217,7 +4216,7 @@ #. popup question, %1 stands for the filename, %2 is expected checksum #. %3 is the current checksum (e.g. "803a8ff00d00c9075a1bd223a480bcf92d2481c1") -#: library/packages/src/modules/SignatureCheckDialogs.rb:1113 +#: library/packages/src/modules/SignatureCheckDialogs.rb:1134 #, fuzzy msgid "" "The expected checksum of file %1\n" @@ -4240,13 +4239,13 @@ "Use it anyway?" #. dialog heading - displayed in a big bold font -#: library/packages/src/modules/SignatureCheckDialogs.rb:1130 +#: library/packages/src/modules/SignatureCheckDialogs.rb:1151 #, fuzzy msgid "Wrong Digest" msgstr "Warnings" #. popup question, %1 stands for the filename, %2 is expected digest, %3 is the current digest -#: library/packages/src/modules/SignatureCheckDialogs.rb:1149 +#: library/packages/src/modules/SignatureCheckDialogs.rb:1170 #, fuzzy msgid "" "The checksum of file %1\n" @@ -4265,7 +4264,7 @@ "Use it anyway?" #. dialog heading - displayed in a big bold font -#: library/packages/src/modules/SignatureCheckDialogs.rb:1163 +#: library/packages/src/modules/SignatureCheckDialogs.rb:1184 #, fuzzy msgid "Unknown Digest" msgstr "Unknown file system" @@ -4277,83 +4276,83 @@ #. translators: default global progress bar label #: library/packages/src/modules/SlideShow.rb:151 #: library/packages/src/modules/SlideShow.rb:152 -#: library/packages/src/modules/SlideShow.rb:326 -#: library/packages/src/modules/SlideShow.rb:347 +#: library/packages/src/modules/SlideShow.rb:323 +#: library/packages/src/modules/SlideShow.rb:344 #, fuzzy msgid "Installing..." msgstr "Installing driver..." #. Table headings for CD statistics during installation -#: library/packages/src/modules/SlideShow.rb:541 +#: library/packages/src/modules/SlideShow.rb:529 msgid "Media" msgstr "Media" #. Table headings for CD statistics during installation - keep as short as possible! -#: library/packages/src/modules/SlideShow.rb:543 +#: library/packages/src/modules/SlideShow.rb:531 #, fuzzy msgid "Remaining" msgstr "Removing Packages..." #. Table headings for CD statistics during installation -#: library/packages/src/modules/SlideShow.rb:547 +#: library/packages/src/modules/SlideShow.rb:535 msgid "Time" msgstr "Time" #. Construct widgets for the "details" page #. #. @return A term describing the widgets -#: library/packages/src/modules/SlideShow.rb:563 +#: library/packages/src/modules/SlideShow.rb:551 #, fuzzy msgid "Actions performed:" msgstr "Actions Allowed for Users:\n" #. Help text while software packages are being installed (displayed only in rare cases) -#: library/packages/src/modules/SlideShow.rb:647 +#: library/packages/src/modules/SlideShow.rb:633 #, fuzzy msgid "<p>Packages are being installed.</p>" msgstr "<p>Please wait while packages are installed.</p>" -#: library/packages/src/modules/SlideShow.rb:648 +#: library/packages/src/modules/SlideShow.rb:634 msgid "<P><B>Aborting Installation</B> Package installation can be aborted using the <B>Abort</B> button. However, the system then can be in an inconsistent or unusable state or it may not boot if the basic system component is not installed.</P>" msgstr "" #. Translators: Tab name, keep short, %s is product name, e.g. SLES -#: library/packages/src/modules/SlideShow.rb:666 +#: library/packages/src/modules/SlideShow.rb:652 #, fuzzy msgid "%s Release Notes" msgstr "Release Notes" #. tab -#: library/packages/src/modules/SlideShow.rb:678 +#: library/packages/src/modules/SlideShow.rb:664 msgid "Slide Sho&w" msgstr "Slide Sho&w" #. tab -#: library/packages/src/modules/SlideShow.rb:680 +#: library/packages/src/modules/SlideShow.rb:666 msgid "&Details" msgstr "&Details" #. Dialog heading - software packages are being upgraded -#: library/packages/src/modules/SlideShow.rb:719 +#: library/packages/src/modules/SlideShow.rb:705 #, fuzzy #| msgid "Perform Update" msgid "Performing Upgrade" msgstr "Perform Update" #. Dialog heading - software packages are being installed -#: library/packages/src/modules/SlideShow.rb:722 +#: library/packages/src/modules/SlideShow.rb:708 #, fuzzy #| msgid "Perform Installation" msgid "Performing Installation" msgstr "Perform Installation" #. Dialog heading while software packages are being installed -#: library/packages/src/modules/SlideShow.rb:759 +#: library/packages/src/modules/SlideShow.rb:743 msgid "Package Installation" msgstr "Package Installation" #. popup yes-no -#: library/packages/src/modules/SlideShow.rb:835 +#: library/packages/src/modules/SlideShow.rb:815 msgid "" "Do you really want\n" "to quit the installation?" @@ -4362,17 +4361,18 @@ "to quit the installation?" #. Mode::update (), Stage::cont () -#: library/packages/src/modules/SlideShow.rb:847 +#: library/packages/src/modules/SlideShow.rb:827 msgid "Aborted" msgstr "Aborted" -#. read file content -#: library/system/src/clients/view_anymsg.rb:187 +#. remove remaining ASCII control characters (ASCII 0-31 and 127 (DEL)) +#. except new line (LF = 0xa) and carriage return (CR = 0xd) +#: library/system/src/clients/view_anymsg.rb:196 msgid "File not found." msgstr "File not found." #. Fill the LogView with file content -#: library/system/src/clients/view_anymsg.rb:199 +#: library/system/src/clients/view_anymsg.rb:202 msgid "System Log (%1)" msgstr "System Log (%1)" @@ -4957,7 +4957,7 @@ msgstr "Bluetooth device" #. Continue/Cancel question, %1 is a file name -#: library/system/src/modules/FileChanges.rb:174 +#: library/system/src/modules/FileChanges.rb:175 #, fuzzy #| msgid "" #| "File %1 has been changed manually.\n" @@ -4970,7 +4970,7 @@ "YaST might lose some of the changes" #. Continue/Cancel question, %1 is a coma separated list of file names -#: library/system/src/modules/FileChanges.rb:179 +#: library/system/src/modules/FileChanges.rb:180 msgid "" "Files %1 have been changed manually.\n" "YaST might lose some of the changes" @@ -4978,18 +4978,44 @@ "Files %1 have been changed manually.\n" "YaST might lose some of the changes" -#: library/system/src/modules/FileChanges.rb:192 +#: library/system/src/modules/FileChanges.rb:193 #, fuzzy msgid "Do not show this message anymore" msgstr "Do not show this message again." +#. Continue/Cancel question, %s is a file name +#: library/system/src/modules/FileChanges.rb:236 +#, fuzzy +#| msgid "" +#| "File %1 has been changed manually.\n" +#| "YaST might lose some of the changes" +msgid "" +"File %s has been created manually.\n" +"YaST might lose this file." +msgstr "" +"File %1 has been changed manually.\n" +"YaST might lose some of the changes" + +#. Continue/Cancel question, %s is a comma separated list of file names +#: library/system/src/modules/FileChanges.rb:239 +#, fuzzy +#| msgid "" +#| "Files %1 have been changed manually.\n" +#| "YaST might lose some of the changes" +msgid "" +"Files %s have been created manually.\n" +"YaST might lose these files." +msgstr "" +"Files %1 have been changed manually.\n" +"YaST might lose some of the changes" + #. error report -#: library/system/src/modules/Initrd.rb:416 +#: library/system/src/modules/Initrd.rb:415 msgid "An error occurred during initrd creation." msgstr "An error occurred during initrd creation." #. inform the user that he/she has to reboot to activate new kernel -#: library/system/src/modules/Kernel.rb:659 +#: library/system/src/modules/Kernel.rb:665 msgid "" "Reboot your system\n" "to activate the new kernel.\n" @@ -4998,19 +5024,19 @@ "to activate the new kernel.\n" #. bnc #421002 -#: library/system/src/modules/ModuleLoading.rb:179 +#: library/system/src/modules/ModuleLoading.rb:177 msgid "Confirm driver activation" msgstr "Confirm driver activation" #. This is in information message. Next come the #. vendor and device information strings as stored #. in the hardware-probing database. -#: library/system/src/modules/ModuleLoading.rb:186 +#: library/system/src/modules/ModuleLoading.rb:184 msgid "YaST2 detected the following device" msgstr "YaST2 detected the following device" #. Caption for Textentry with module information -#: library/system/src/modules/ModuleLoading.rb:195 +#: library/system/src/modules/ModuleLoading.rb:193 msgid "&Driver/Module to load" msgstr "&Driver/Module to load" @@ -5024,7 +5050,7 @@ "digits separated by colons." #. Translators: dot: ".", hyphen: "-" -#: library/types/src/modules/Hostname.rb:53 +#: library/types/src/modules/Hostname.rb:55 msgid "" "A valid domain name consists of components separated by dots.\n" "Each component contains letters, digits, and hyphens. A hyphen may not\n" @@ -5035,7 +5061,7 @@ "start or end a component and the last component may not begin with a digit." #. Translators: hyphen: "-" -#: library/types/src/modules/Hostname.rb:64 +#: library/types/src/modules/Hostname.rb:66 msgid "" "A valid host name consists of letters, digits, and hyphens.\n" "A host name may not begin or end with a hyphen.\n" @@ -5044,7 +5070,7 @@ "A host name may not begin or end with a hyphen.\n" #. Translators: dot: "." -#: library/types/src/modules/IP.rb:53 +#: library/types/src/modules/IP.rb:56 #, fuzzy #| msgid "" #| "A valid IP address consists of four integers\n" @@ -5057,7 +5083,7 @@ "in the range 0-255 separated by dots." #. Translators: colon: ":" -#: library/types/src/modules/IP.rb:71 +#: library/types/src/modules/IP.rb:74 #, fuzzy #| msgid "" #| "A valid IP address consists of four integers\n" @@ -5071,7 +5097,7 @@ "in the range 0-255 separated by dots." #. TRANSLATORS: description of the valid network definition -#: library/types/src/modules/IP.rb:138 +#: library/types/src/modules/IP.rb:128 #, fuzzy #| msgid "" #| "A valid network definition can contain the IP,\n" @@ -5099,56 +5125,56 @@ "IP/Netmask_Bits: 192.168.0.0/24 or 192.168.0.1/32\n" #. Byte abbreviated -#: library/types/src/modules/String.rb:144 +#: library/types/src/modules/String.rb:127 #, fuzzy msgid "B" msgstr "kB" #. KiloByte abbreviated -#: library/types/src/modules/String.rb:146 +#: library/types/src/modules/String.rb:129 msgid "KiB" msgstr "KiB" #. MegaByte abbreviated -#: library/types/src/modules/String.rb:148 +#: library/types/src/modules/String.rb:131 #, fuzzy #| msgid "MB" msgid "MiB" msgstr "MB" #. GigaByte abbreviated -#: library/types/src/modules/String.rb:150 +#: library/types/src/modules/String.rb:133 #, fuzzy #| msgid "GB" msgid "GiB" msgstr "GB" #. TeraByte abbreviated -#: library/types/src/modules/String.rb:152 +#: library/types/src/modules/String.rb:135 #, fuzzy #| msgid "TB" msgid "TiB" msgstr "TB" -#. covert a number to download rate string -#. %1 is string - size in bytes, B, KiB, MiB, GiB or TiB -#: library/types/src/modules/String.rb:238 -msgid "%1/s" -msgstr "%1/s" - #. format download rate message: %1 = the current download rate (e.g. "242.6kB/s") #. %2 is the average download rate (e.g. "228.3kB/s") #. to translators: keep translation of "on average" as short as possible -#: library/types/src/modules/String.rb:261 +#: library/types/src/modules/String.rb:201 msgid "%1 (on average %2)" msgstr "%1 (on average %2)" #. ellipsis - used to replace part of text to make it shorter #. example: "/really/very/long/file/name", "/.../file/name") -#: library/types/src/modules/String.rb:1258 +#: library/types/src/modules/String.rb:738 msgid "..." msgstr "..." +#. covert a number to download rate string +#. %1 is string - size in bytes, B, KiB, MiB, GiB or TiB +#: library/types/src/modules/String.rb:855 +msgid "%1/s" +msgstr "%1/s" + #. Popup-Box for manual hardware detection. #. If the user selects 'manual installation' when #. booting from CD, YaST2 does not load any modules @@ -5160,20 +5186,20 @@ #. the suggested load command #. #. This is the heading of the popup box -#: library/wizard/src/modules/Confirm.rb:103 +#: library/wizard/src/modules/Confirm.rb:102 msgid "Confirm Hardware Detection" msgstr "Confirm Hardware Detection" #. This is in information message. Next come the #. hardware class name (network cards). -#: library/wizard/src/modules/Confirm.rb:108 +#: library/wizard/src/modules/Confirm.rb:107 #, fuzzy #| msgid "YaST2 will detect the following hardware:" msgid "YaST will detect the following hardware:" msgstr "YaST will detect the following hardware:" #. Message in a continue/cancel popup -#: library/wizard/src/modules/Confirm.rb:183 +#: library/wizard/src/modules/Confirm.rb:182 msgid "" "This module must be run as root.\n" "If you continue now, the module may not function properly.\n" @@ -5186,35 +5212,35 @@ "and it is unlikely that settings can be written.\n" #. Popup headline -#: library/wizard/src/modules/Confirm.rb:191 +#: library/wizard/src/modules/Confirm.rb:190 msgid "Root Privileges Needed" msgstr "Root Privileges Needed" #. Popup question -#: library/wizard/src/modules/Confirm.rb:208 +#: library/wizard/src/modules/Confirm.rb:207 msgid "Really delete selected entry?" msgstr "Really delete selected entry?" #. Popup question, %1 is an item to delete (or filename, etc.) -#: library/wizard/src/modules/Confirm.rb:222 +#: library/wizard/src/modules/Confirm.rb:221 msgid "Really delete '%1'?" msgstr "Really delete '%1'?" #. button text #. Open a dialog with "Accept", "Cancel" #. and set the keyboard focus to "Accept". -#: library/wizard/src/modules/Wizard.rb:266 -#: library/wizard/src/modules/Wizard.rb:534 +#: library/wizard/src/modules/Wizard.rb:259 +#: library/wizard/src/modules/Wizard.rb:508 msgid "&Apply" msgstr "&Apply" #. translators: dialog title to appear before any content is initialized -#: library/wizard/src/modules/Wizard.rb:294 +#: library/wizard/src/modules/Wizard.rb:286 msgid "Initializing ..." msgstr "Initialising ..." #. translators: dialog title to appear before any content is initialized -#: library/wizard/src/modules/Wizard.rb:348 +#: library/wizard/src/modules/Wizard.rb:339 #, fuzzy #| msgid "" #| "YaST2\n" @@ -5227,14 +5253,14 @@ "Initialising ..." #. Heading for help popup window -#: library/wizard/src/modules/Wizard.rb:386 +#: library/wizard/src/modules/Wizard.rb:375 msgid "Help" msgstr "Help" #. fallback name for the dialog title #. fallback name for the dialog title -#: library/wizard/src/modules/Wizard.rb:1228 -#: library/wizard/src/modules/Wizard.rb:1277 +#: library/wizard/src/modules/Wizard.rb:1139 +#: library/wizard/src/modules/Wizard.rb:1193 #, fuzzy #| msgid "Modules" msgid "Module" @@ -6023,6 +6049,78 @@ "There is no reverse zone for %1 administered by your DNS server.\n" "Hostname %2 cannot be added." +#: src/lib/ui/srv_status_component.rb:60 +#, fuzzy +#| msgid "Service Start" +msgid "Service Status" +msgstr "Service Start" + +#. Content for the help +#: src/lib/ui/srv_status_component.rb:114 +msgid "" +"<p><b><big>Current status</big></b><br>\n" +"Displays the current status of the service. The status will remain the same after saving the settings, independently of the value of 'start service during boot'.</p>\n" +"<p><b><big>Reload After Saving Settings</big></b><br>\n" +"Only applicable if the service is currently running. Ensures the running service reloads the new configuration after saving it (via 'ok' or 'save' buttons).</p>\n" +"<p><b><big>Start During System Boot</big></b><br>\n" +"Check this field to enable the service at system boot. Un-check it to disable the service. This does not affect the current status of the service in the already running system.</p>\n" +msgstr "" + +#. Widget displaying the status and associated buttons +#: src/lib/ui/srv_status_component.rb:181 +msgid "Current status:" +msgstr "Current status:" + +#. Widget to configure the status on boot +#: src/lib/ui/srv_status_component.rb:194 +#, fuzzy +#| msgid "Activate During Boot" +msgid "Start During System Boot" +msgstr "Activate During Boot" + +#. Widget to configure reloading of the running service +#: src/lib/ui/srv_status_component.rb:208 +#, fuzzy +#| msgid "Masquerading Settings:" +msgid "Reload After Saving Settings" +msgstr "Masquerading Settings:" + +#. TRANSLATORS: status of a service +#: src/lib/ui/srv_status_component.rb:218 +#, fuzzy +#| msgid "Running" +msgid "running" +msgstr "Running" + +#: src/lib/ui/srv_status_component.rb:220 +#, fuzzy +#| msgid "S&top now ..." +msgid "Stop now" +msgstr "S&top now ..." + +#. TRANSLATORS: status of a service +#: src/lib/ui/srv_status_component.rb:225 +msgid "stopped" +msgstr "" + +#: src/lib/ui/srv_status_component.rb:227 +#, fuzzy +#| msgid "&Start now ..." +msgid "Start now" +msgstr "&Start now ..." + +#, fuzzy +#~ msgid "The correct repository medium could not be mounted." +#~ msgstr "The correct source medium could not be mounted." + +#, fuzzy +#~ msgid "Downloading patch RPM package %1 (%2)..." +#~ msgstr "Downloading package %1 (%2)..." + +#, fuzzy +#~ msgid "Downloading Patch RPM Package" +#~ msgstr "Downloading patch RPM %1" + #~ msgid "Read dynamic definitions of installed services" #~ msgstr "Read dynamic definitions of installed services" Modified: trunk/yast/en_GB/po/bootloader.en_GB.po =================================================================== --- trunk/yast/en_GB/po/bootloader.en_GB.po 2015-09-09 08:18:21 UTC (rev 92602) +++ trunk/yast/en_GB/po/bootloader.en_GB.po 2015-09-09 08:19:44 UTC (rev 92603) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: bootloader\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-10-29 16:20+0100\n" +"POT-Creation-Date: 2015-08-25 18:36+0200\n" "PO-Revision-Date: 2008-03-27 19:13+0000\n" "Last-Translator: Benjamin Weber \n" "Language-Team: \n" @@ -56,70 +56,27 @@ msgstr "The value of the option" #. command line error report -#: src/clients/bootloader.rb:154 +#: src/clients/bootloader.rb:152 msgid "Value was not specified." msgstr "Value was not specified." #. command line error report -#: src/clients/bootloader.rb:176 +#: src/clients/bootloader.rb:174 msgid "Option was not specified." msgstr "Option was not specified." #. command line, %1 is the value of bootloader option -#: src/clients/bootloader.rb:182 +#: src/clients/bootloader.rb:180 #, fuzzy #| msgid "Value: %1" msgid "Value: %s" msgstr "Value: %1" #. command line error report -#: src/clients/bootloader.rb:185 +#: src/clients/bootloader.rb:183 msgid "Specified option does not exist." msgstr "Specified option does not exist." -#. progress step title -#: src/clients/bootloader_finish.rb:52 -msgid "Saving bootloader configuration..." -msgstr "Saving bootloader configuration..." - -#. TRANSLATORS: reboot message -#. %1 is replaced with additional message from reIPL -#: src/clients/bootloader_finish.rb:133 -msgid "" -"\n" -"Your system will now shut down.%1\n" -"For details, read the related chapter \n" -"in the documentation. \n" -msgstr "" - -#. Final message after all packages from CD1 are installed -#. and we're ready to start (boot into) the installed system -#. Message that will be displayed along with information -#. how the boot loader was installed -#: src/clients/bootloader_finish.rb:146 -msgid "The system will reboot now..." -msgstr "The system will reboot now..." - -#. warning text in the summary richtext -#: src/clients/bootloader_proposal.rb:115 -msgid "No boot loader is selected for installation. Your system might not be bootable." -msgstr "No boot loader is selected for installation. Your system might not be bootable." - -#. error in the proposal -#: src/clients/bootloader_proposal.rb:125 -msgid "Because of the partitioning, the bootloader cannot be installed properly" -msgstr "Because of the partitioning, the bootloader cannot be installed properly" - -#. proposal part - bootloader label -#: src/clients/bootloader_proposal.rb:224 -msgid "Booting" -msgstr "Booting" - -#. menubutton entry -#: src/clients/bootloader_proposal.rb:226 -msgid "&Booting" -msgstr "&Booting" - #. encoding: utf-8 #. File: #. include/bootloader/grup/helps.ycp @@ -257,9 +214,16 @@ "for a serial console. Please see the grub documentation (<code>info grub</code>) for details.</p>" #: src/include/bootloader/grub/helps.rb:68 +#, fuzzy +#| msgid "" +#| "<p><b>Terminal Definition</b></p><br>\n" +#| "Defines the type of terminal you want to use. For a serial terminal (eg. a serial console),\n" +#| "you have to specify <code>serial</code>. You can also pass <code>console</code> to the\n" +#| "command, as <code>serial console</code>. In this case, a terminal in which you\n" +#| "press any key will be selected as a GRUB terminal.</p>" msgid "" "<p><b>Terminal Definition</b></p><br>\n" -"Defines the type of terminal you want to use. For a serial terminal (eg. a serial console),\n" +"Defines the type of terminal you want to use. For a serial terminal (e.g. a serial console),\n" "you have to specify <code>serial</code>. You can also pass <code>console</code> to the\n" "command, as <code>serial console</code>. In this case, a terminal in which you\n" "press any key will be selected as a GRUB terminal.</p>" @@ -287,15 +251,14 @@ #, fuzzy msgid "" "<p><b>Protect Boot Loader with Password</b><br>\n" -"Define the password that will be required to access the boot menu. YaST will only accept the password if you repeat\n" -"it in <b>Retype Password</b>.</p>" +"At boot time, modifying or even booting any entry will require the password. If <b>Protect Entry Modification Only</b> is checked then booting any entry is not restricted but modifying entries requires the password (which is the way GRUB 1 behaved).<br>YaST will only accept the password if you repeat it in <b>Retype Password</b>.</p>" msgstr "" "<p><b>Password for the Menu Interface</b><br>\n" "Define the password that will be required to access the boot menu. YaST will only accept the password if you repeat\n" "it in <b>Retype Password</b>.</p>" #. help text 1/5 -#: src/include/bootloader/grub/helps.rb:88 +#: src/include/bootloader/grub/helps.rb:91 #, fuzzy msgid "" "<p><big><b>Disks Order</b></big><br>\n" @@ -308,73 +271,73 @@ "To specify the order of the disks according to the order in BIOS, use\n" "the <b>Up</b> and <b>Down</b> buttons to reorder the disks.</p>" -#: src/include/bootloader/grub/helps.rb:99 +#: src/include/bootloader/grub/helps.rb:101 msgid "Boot Loader Locations" msgstr "Boot Loader Locations" -#: src/include/bootloader/grub/helps.rb:100 +#: src/include/bootloader/grub/helps.rb:102 #, fuzzy msgid "Set &active Flag in Partition Table for Boot Partition" msgstr "Set active Flag in Partition Table for Boot Partition" -#: src/include/bootloader/grub/helps.rb:103 -#: src/include/bootloader/routines/common_helps.rb:29 +#: src/include/bootloader/grub/helps.rb:105 +#: src/include/bootloader/routines/common_helps.rb:28 #, fuzzy msgid "&Timeout in Seconds" msgstr "Timeout in Seconds" -#: src/include/bootloader/grub/helps.rb:104 +#: src/include/bootloader/grub/helps.rb:106 #, fuzzy msgid "&Default Boot Section" msgstr "Default Boot Section" -#: src/include/bootloader/grub/helps.rb:105 +#: src/include/bootloader/grub/helps.rb:107 #, fuzzy msgid "Write &generic Boot Code to MBR" msgstr "Write generic Boot Code to MBR" -#: src/include/bootloader/grub/helps.rb:106 +#: src/include/bootloader/grub/helps.rb:108 msgid "Custom Boot Partition" msgstr "Custom Boot Partition" -#: src/include/bootloader/grub/helps.rb:107 +#: src/include/bootloader/grub/helps.rb:109 msgid "Boot from Master Boot Record" msgstr "Boot from Master Boot Record" -#: src/include/bootloader/grub/helps.rb:108 +#: src/include/bootloader/grub/helps.rb:110 msgid "Boot from Root Partition" msgstr "Boot from Root Partition" -#: src/include/bootloader/grub/helps.rb:109 +#: src/include/bootloader/grub/helps.rb:111 msgid "Boot from Boot Partition" msgstr "Boot from Boot Partition" -#: src/include/bootloader/grub/helps.rb:110 +#: src/include/bootloader/grub/helps.rb:112 #, fuzzy msgid "Boot from Extended Partition" msgstr "Boot from Root Partition" -#: src/include/bootloader/grub/helps.rb:111 +#: src/include/bootloader/grub/helps.rb:113 #, fuzzy msgid "Serial Connection &Parameters" msgstr "Serial Connection Parameters" -#: src/include/bootloader/grub/helps.rb:112 +#: src/include/bootloader/grub/helps.rb:114 #, fuzzy msgid "Fallback Sections if Default fails" msgstr "Fallback Sections if default Fails" -#: src/include/bootloader/grub/helps.rb:113 +#: src/include/bootloader/grub/helps.rb:115 #, fuzzy msgid "&Hide Menu on Boot" msgstr "Hide Menu on Boot" -#: src/include/bootloader/grub/helps.rb:114 +#: src/include/bootloader/grub/helps.rb:116 #, fuzzy msgid "Pa&ssword for the Menu Interface" msgstr "Password for the Menu Interface" -#: src/include/bootloader/grub/helps.rb:115 +#: src/include/bootloader/grub/helps.rb:117 #, fuzzy msgid "Debugg&ing Flag" msgstr "Debugging Flag" @@ -387,103 +350,108 @@ msgid "Prot&ect Boot Loader with Password" msgstr "Prot&ect Boot Loader with Password" +#. TRANSLATORS: checkbox entry +#: src/include/bootloader/grub/options.rb:79 +msgid "P&rotect Entry Modification Only" +msgstr "" + #. text entry -#: src/include/bootloader/grub/options.rb:78 +#: src/include/bootloader/grub/options.rb:85 msgid "&Password" msgstr "&Password" #. text entry -#: src/include/bootloader/grub/options.rb:81 +#: src/include/bootloader/grub/options.rb:88 msgid "Re&type Password" msgstr "Re&type Password" #. Create Frame "Boot Loader Location" #. #. @return [Yast::Term] with widgets -#: src/include/bootloader/grub/options.rb:217 +#: src/include/bootloader/grub/options.rb:222 #, fuzzy msgid "Boot from &Root Partition" msgstr "Boot from Root Partition" -#: src/include/bootloader/grub/options.rb:218 +#: src/include/bootloader/grub/options.rb:224 #, fuzzy msgid "Boo&t from Boot Partition" msgstr "Boot from Boot Partition" -#: src/include/bootloader/grub/options.rb:228 +#: src/include/bootloader/grub/options.rb:235 #, fuzzy msgid "C&ustom Boot Partition" msgstr "Custom Boot Partition" -#: src/include/bootloader/grub/options.rb:243 -#: src/include/bootloader/grub/options.rb:271 -#: src/include/bootloader/grub/options.rb:292 +#: src/include/bootloader/grub/options.rb:250 +#: src/include/bootloader/grub/options.rb:280 +#: src/include/bootloader/grub/options.rb:301 msgid "Boot Loader Location" msgstr "Boot Loader Location" -#: src/include/bootloader/grub/options.rb:249 -#: src/include/bootloader/grub/options.rb:277 -#: src/include/bootloader/grub/options.rb:298 +#: src/include/bootloader/grub/options.rb:256 +#: src/include/bootloader/grub/options.rb:286 +#: src/include/bootloader/grub/options.rb:307 #, fuzzy msgid "Boot from &Master Boot Record" msgstr "Boot from Master Boot Record" -#: src/include/bootloader/grub/options.rb:256 +#: src/include/bootloader/grub/options.rb:263 #, fuzzy msgid "Boot from &Extended Partition" msgstr "Boot from Root Partition" -#: src/include/bootloader/grub/options.rb:303 +#: src/include/bootloader/grub/options.rb:312 msgid "Enable Red&undancy for MD Array" msgstr "" #. Title in tab -#: src/include/bootloader/grub2/dialogs.rb:57 +#: src/include/bootloader/grub2/dialogs.rb:56 #, fuzzy #| msgid "Boot Loader Options" msgid "Boot Code Options" msgstr "Boot Loader Options" #. Title in tab -#: src/include/bootloader/grub2/dialogs.rb:82 +#: src/include/bootloader/grub2/dialogs.rb:84 #, fuzzy #| msgid "Other Kernel &Parameters" msgid "Kernel Parameters" msgstr "Other Kernel &Parameters" #. Title in tab -#: src/include/bootloader/grub2/dialogs.rb:102 +#: src/include/bootloader/grub2/dialogs.rb:103 #, fuzzy #| msgid "Boot Loader Options" msgid "Bootloader Options" msgstr "Boot Loader Options" #. Window title -#: src/include/bootloader/grub2/dialogs.rb:143 +#: src/include/bootloader/grub2/dialogs.rb:149 msgid "Boot Loader Options" msgstr "Boot Loader Options" -#: src/include/bootloader/grub2/dialogs.rb:183 +#: src/include/bootloader/grub2/dialogs.rb:190 #, fuzzy #| msgid "Secure" msgid "Secure Boot" msgstr "Secure" -#: src/include/bootloader/grub2/dialogs.rb:189 +#: src/include/bootloader/grub2/dialogs.rb:196 #, fuzzy #| msgid "Enable &Quota Support" msgid "Enable &Secure Boot Support" msgstr "Enable &Quota Support" #. TRANSLATORS: place where boot code is installed -#: src/include/bootloader/grub2/dialogs.rb:240 +#: src/include/bootloader/grub2/dialogs.rb:247 #, fuzzy #| msgid "Boot Loader Location" msgid "Boot &Loader Location" msgstr "Boot Loader Location" #. help text -#: src/include/bootloader/grub2/dialogs.rb:259 +#: src/include/bootloader/grub2/dialogs.rb:266 msgid "Choose partition where is boot sequence installed." msgstr "" @@ -512,48 +480,38 @@ msgstr "<p><b>Vga Mode</b> defines the VGA mode for the <i>console</i> the kernel should set when booting</p>" #: src/include/bootloader/grub2/helps.rb:29 -#, fuzzy -msgid "<p><b>Failsafe Kernel Command Line Parameter</b> lets you define failsafe parameters to pass to the kernel.</p>" -msgstr "<p><b>Optional Kernel Command Line Parameter</b> lets you define additional parameters to pass to the kernel</p>" - -#: src/include/bootloader/grub2/helps.rb:32 msgid "<p><b>Probe Foreign OS</b> by means of os-prober for multiboot with other foreign distribution </p>" msgstr "" -#: src/include/bootloader/grub2/helps.rb:35 +#: src/include/bootloader/grub2/helps.rb:32 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:38 +#: 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:44 +#: src/include/bootloader/grub2/helps.rb:41 #, fuzzy msgid "O&ptional Kernel Command Line Parameter" msgstr "Optional Kernel Command Line Parameter" -#: src/include/bootloader/grub2/helps.rb:45 +#: src/include/bootloader/grub2/helps.rb:42 #, fuzzy #| msgid "Distribution:" msgid "D&istributor" msgstr "Distribution:" -#: src/include/bootloader/grub2/helps.rb:46 +#: src/include/bootloader/grub2/helps.rb:43 #, fuzzy msgid "&Vga Mode" msgstr "Vga Mode" -#: src/include/bootloader/grub2/helps.rb:47 -#, fuzzy -msgid "&Failsafe Kernel Command Line Parameter" -msgstr "Optional Kernel Command Line Parameter" - -#: src/include/bootloader/grub2/helps.rb:48 +#: src/include/bootloader/grub2/helps.rb:44 msgid "Probe Foreign OS" msgstr "" -#: src/include/bootloader/grub2/helps.rb:49 +#: src/include/bootloader/grub2/helps.rb:45 msgid "Protective MBR flag" msgstr "" @@ -605,7 +563,7 @@ #. Init function for console #. @param [String] widget -#: src/include/bootloader/grub2/options.rb:174 +#: src/include/bootloader/grub2/options.rb:173 #, fuzzy #| msgid "Autodetected card" msgid "Autodetect by grub2" @@ -613,72 +571,71 @@ #. FATE: #110038: Serial console #. add or remove console key with value for sections -#: src/include/bootloader/grub2/options.rb:249 +#: src/include/bootloader/grub2/options.rb:246 #, fuzzy msgid "Choose new graphical theme file" msgstr "Graphical Menu File" -#: src/include/bootloader/grub2/options.rb:261 +#: src/include/bootloader/grub2/options.rb:258 #, fuzzy msgid "Use &graphical console" msgstr "Serial Console" -#: src/include/bootloader/grub2/options.rb:268 +#: src/include/bootloader/grub2/options.rb:265 #, fuzzy #| msgid "Conflict Resolution:" msgid "&Console resolution" msgstr "Conflict Resolution:" -#: src/include/bootloader/grub2/options.rb:276 +#: src/include/bootloader/grub2/options.rb:273 #, fuzzy msgid "&Console theme" msgstr "invalid arguments" -#: src/include/bootloader/grub2/options.rb:295 +#: src/include/bootloader/grub2/options.rb:292 #, fuzzy msgid "Use &serial console" msgstr "Serial Console" -#: src/include/bootloader/grub2/options.rb:302 +#: src/include/bootloader/grub2/options.rb:299 #, fuzzy msgid "&Console arguments" msgstr "invalid arguments" -#. FIXME this should be better handled by exception and show it properly, but it require too big change now -#: src/include/bootloader/routines/autoinstall.rb:132 +#. FIXME: this should be better handled by exception and show it properly, but it require too big change now +#: src/include/bootloader/routines/autoinstall.rb:131 msgid "Unsupported bootloader '%s'. Adapt your AutoYaST profile accordingly." msgstr "" #. file open popup caption -#: src/include/bootloader/routines/common_options.rb:102 +#: src/include/bootloader/routines/common_options.rb:98 msgid "Select File" msgstr "Select File" #. F#300779 - Install diskless client (NFS-root) #. kokso: additional warning that root partition is nfs type -> bootloader will not be installed -#. F#300779 - Install diskless client (NFS-root) #. kokso: additional warning that root partition is nfs type -> bootloader will not be installed -#: src/include/bootloader/routines/dialogs.rb:85 src/modules/Bootloader.rb:256 +#: src/include/bootloader/routines/dialogs.rb:86 src/modules/Bootloader.rb:237 msgid "The boot partition is of type NFS. Bootloader cannot be installed." msgstr "The boot partition is of type NFS. Bootloader cannot be installed." #. dialog caption -#: src/include/bootloader/routines/dialogs.rb:115 +#: src/include/bootloader/routines/dialogs.rb:114 msgid "Boot Loader Settings" msgstr "Boot Loader Settings" #. message -#: src/include/bootloader/routines/dialogs.rb:143 +#: src/include/bootloader/routines/dialogs.rb:142 msgid "There are no options to set for the current boot loader." msgstr "There are no options to set for the current boot loader." #. combo box -#: src/include/bootloader/routines/global_widgets.rb:114 +#: src/include/bootloader/routines/global_widgets.rb:109 msgid "&Boot Loader" msgstr "&Boot Loader" #. popup - Continue/Cancel -#: src/include/bootloader/routines/global_widgets.rb:144 +#: src/include/bootloader/routines/global_widgets.rb:138 msgid "" "\n" "If you do not install any boot loader, the system\n" @@ -693,63 +650,63 @@ "Proceed?\n" #. menu button entry -#: src/include/bootloader/routines/global_widgets.rb:181 +#: src/include/bootloader/routines/global_widgets.rb:175 msgid "E&dit Configuration Files" msgstr "E&dit Configuration Files" #. menubutton item, keep as short as possible -#: src/include/bootloader/routines/global_widgets.rb:188 +#: src/include/bootloader/routines/global_widgets.rb:182 msgid "&Propose New Configuration" msgstr "&Propose New Configuration" #. menubutton item, keep as short as possible -#: src/include/bootloader/routines/global_widgets.rb:195 +#: src/include/bootloader/routines/global_widgets.rb:189 msgid "&Start from Scratch" msgstr "&Start from Scratch" #. menubutton item, keep as short as possible -#: src/include/bootloader/routines/global_widgets.rb:203 +#: src/include/bootloader/routines/global_widgets.rb:197 msgid "&Reread Configuration from Disk" msgstr "&Reread Configuration from Disk" #. menubutton item, keep as short as possible -#: src/include/bootloader/routines/global_widgets.rb:220 +#: src/include/bootloader/routines/global_widgets.rb:214 msgid "Restore MBR of Hard Disk" msgstr "Restore MBR of Hard Disk" #. menubutton item, keep as short as possible -#: src/include/bootloader/routines/global_widgets.rb:228 +#: src/include/bootloader/routines/global_widgets.rb:222 msgid "Write bootloader boot code to disk" msgstr "Write bootloader boot code to disk" #. menu button -#: src/include/bootloader/routines/global_widgets.rb:236 +#: src/include/bootloader/routines/global_widgets.rb:230 msgid "Other" msgstr "Other" #. message popup -#: src/include/bootloader/routines/global_widgets.rb:260 +#: src/include/bootloader/routines/global_widgets.rb:254 msgid "MBR restored successfully." msgstr "MBR restored successfully." #. message popup -#: src/include/bootloader/routines/global_widgets.rb:263 +#: src/include/bootloader/routines/global_widgets.rb:257 msgid "Failed to restore MBR." msgstr "Failed to restore MBR." #. Bootloader::blSave (false, false, false); -#: src/include/bootloader/routines/global_widgets.rb:286 +#: src/include/bootloader/routines/global_widgets.rb:280 #, fuzzy msgid "Writing bootloader settings failed." msgstr "Writing network settings failed." #. push button -#: src/include/bootloader/routines/global_widgets.rb:340 +#: src/include/bootloader/routines/global_widgets.rb:329 msgid "Boot &Loader Options" msgstr "Boot &Loader Options" #. push button -#: src/include/bootloader/routines/global_widgets.rb:353 +#: src/include/bootloader/routines/global_widgets.rb:342 msgid "Boot Loader Installation &Details" msgstr "Boot Loader Installation &Details" @@ -794,7 +751,7 @@ "manually, click <B>Edit Configuration Files</B>.</P>" #. help 1/4 -#: src/include/bootloader/routines/helps.rb:77 +#: src/include/bootloader/routines/helps.rb:76 msgid "" "<P> In the table, each section represents one item\n" "in the boot menu.</P>" @@ -803,7 +760,7 @@ "in the boot menu.</P>" #. help 2/4 -#: src/include/bootloader/routines/helps.rb:81 +#: src/include/bootloader/routines/helps.rb:80 msgid "" "<P> Press <B>Edit</B> to display the properties of the\n" "selected section.</P>" @@ -812,7 +769,7 @@ "selected section.</P>" #. help 3/4 -#: src/include/bootloader/routines/helps.rb:85 +#: src/include/bootloader/routines/helps.rb:84 msgid "" "<P> By pressing <b>Set as Default</b>, mark the selected \n" "section as default. When booting, the boot loader will provide \n" @@ -829,7 +786,7 @@ "menu can be changed using the <B>Up</B> and <B>Down</B> buttons.</P>" #. help 4/4 -#: src/include/bootloader/routines/helps.rb:94 +#: src/include/bootloader/routines/helps.rb:93 msgid "" "<P>Press <B>Add</B> to create a new boot loader section\n" "or <B>Delete</B> to delete the selected section.</P>" @@ -840,7 +797,7 @@ #. help text for the custom boot manager installation, 1 of 7 #. %1 = name of boot loader (e.g. "LILO") #. this should be per architecture -#: src/include/bootloader/routines/helps.rb:109 +#: src/include/bootloader/routines/helps.rb:107 msgid "" "<p><big><b>Boot Loader Location</b></big><br>\n" "The boot manager (%1) can be installed in the following ways:</p>" @@ -849,7 +806,7 @@ "The boot manager (%1) can be installed in the following ways:</p>" #. custom bootloader help text, 2 of 7 -#: src/include/bootloader/routines/helps.rb:118 +#: src/include/bootloader/routines/helps.rb:116 msgid "" "<p>- In the <b>Master Boot Record</b> (MBR).\n" "This is not recommended if there is another operating system installed\n" @@ -860,7 +817,7 @@ "on the computer.</p>" #. custom bootloader help text, 3 of 7 -#: src/include/bootloader/routines/helps.rb:128 +#: src/include/bootloader/routines/helps.rb:126 msgid "" "<p>\n" "- In the <b>Boot Sector</b> of the <tt>/boot</tt> or <tt>/</tt> (root) \n" @@ -881,7 +838,7 @@ "to start &product;.</p>" #. custom bootloader help text, 5 of 7 -#: src/include/bootloader/routines/helps.rb:143 +#: src/include/bootloader/routines/helps.rb:141 msgid "" "<p>\n" "- In some <b>Other</b> partition. Consider your system's restrictions\n" @@ -892,7 +849,7 @@ "when selecting this option.</p>" #. optional part, only inserted on x86 architectures. 6 of 7 -#: src/include/bootloader/routines/helps.rb:153 +#: src/include/bootloader/routines/helps.rb:151 msgid "" "<p>For example, most PCs have a BIOS\n" "limit that restricts booting to\n" @@ -905,7 +862,7 @@ "you may or may not be able to boot from a logical partition.</p>" #. custom bootloader help text, 7 of 7 -#: src/include/bootloader/routines/helps.rb:165 +#: src/include/bootloader/routines/helps.rb:163 msgid "" "<p>\n" "Enter the device name of the partition (for example, <tt>/dev/hda3</tt> or\n" @@ -916,7 +873,7 @@ "<tt>/dev/sdb</tt>) in the input field.</p>" #. help text 1/1 -#: src/include/bootloader/routines/helps.rb:178 +#: src/include/bootloader/routines/helps.rb:176 #, fuzzy msgid "" "<p><b>Boot Loader Installation Details</b><br>\n" @@ -928,7 +885,7 @@ "mapping), click <b>Boot Loader Installation Details</b>.</p>" #. help text 1/1 -#: src/include/bootloader/routines/helps.rb:189 +#: src/include/bootloader/routines/helps.rb:187 #, fuzzy msgid "" "<p><b>Boot Loader Type</b><br>\n" @@ -940,7 +897,7 @@ "use <b>Boot Loader</b>.</p>" #. help text 1/1 -#: src/include/bootloader/routines/helps.rb:201 +#: src/include/bootloader/routines/helps.rb:198 #, fuzzy msgid "" "<p><b>Boot Loader Options</b><br>\n" @@ -952,7 +909,7 @@ "<b>Boot Loader Options</b>.</p>" #. help text 1/1 -#: src/include/bootloader/routines/helps.rb:212 +#: src/include/bootloader/routines/helps.rb:209 msgid "" "<P><B>Expert Manual Configuration</B><BR>\n" "Here, manually edit the boot loader configuration.</P>\n" @@ -963,7 +920,7 @@ "<P>Note: The final configuration file may have different indenting.</P>" #. help text 1/1 -#: src/include/bootloader/routines/helps.rb:223 +#: src/include/bootloader/routines/helps.rb:220 #, fuzzy msgid "" "<p><b>Section Name</b><br>\n" @@ -975,7 +932,7 @@ "name must be unique.</p>" #. help text 1/5 -#: src/include/bootloader/routines/helps.rb:234 +#: src/include/bootloader/routines/helps.rb:231 msgid "" "<p><big><b>Type of the New Section</b></big><br>\n" "Select the type of the new section to create.</p>" @@ -984,7 +941,7 @@ "Select the type of the new section to create.</p>" #. help text 2/5 -#: src/include/bootloader/routines/helps.rb:238 +#: src/include/bootloader/routines/helps.rb:235 msgid "" "<p>Select <b>Clone Selected Section</b> to clone the currently selected\n" "section. Then modify the options that should differ from the\n" @@ -995,7 +952,7 @@ "selected section.</p>" #. help text 3/5 -#: src/include/bootloader/routines/helps.rb:244 +#: src/include/bootloader/routines/helps.rb:241 #, fuzzy msgid "" "<p>Select <b>Image Section</b> to add a new Linux kernel or other image\n" @@ -1005,7 +962,7 @@ "to load and start.</p>" #. help text 4/5 -#: src/include/bootloader/routines/helps.rb:248 +#: src/include/bootloader/routines/helps.rb:245 #, fuzzy msgid "" "<p>Select <b>Xen Section</b> to add a new Linux kernel or other image,\n" @@ -1015,7 +972,7 @@ "but to start it in a XEN environment.</p>" #. help text 5/5 -#: src/include/bootloader/routines/helps.rb:252 +#: src/include/bootloader/routines/helps.rb:249 msgid "" "<p>Select <b>Other System (Chainloader)</b> to add a section that \n" "loads and starts a boot sector of a partition of the disk. This is used for\n" @@ -1025,7 +982,7 @@ "loads and starts a boot sector of a partition of the disk. This is used for\n" "booting other operating systems.</p>" -#: src/include/bootloader/routines/helps.rb:257 +#: src/include/bootloader/routines/helps.rb:254 #, fuzzy msgid "" "<p>Select <b>Menu Section</b> to add a section that \n" @@ -1037,7 +994,7 @@ "booting other operating systems.</p>" #. part of summary, %1 is a list of hard disks device names -#: src/include/bootloader/routines/lilolike.rb:266 +#: src/include/bootloader/routines/lilolike.rb:101 msgid "Order of Hard Disks: %1" msgstr "Order of Hard Disks: %1" @@ -1047,27 +1004,27 @@ msgstr "Do not install any boot loader" #. combo box item -#: src/include/bootloader/routines/misc.rb:53 +#: src/include/bootloader/routines/misc.rb:54 msgid "Do Not Install Any Boot Loader" msgstr "Do Not Install Any Boot Loader" #. summary string -#: src/include/bootloader/routines/misc.rb:58 +#: src/include/bootloader/routines/misc.rb:60 msgid "Install the default boot loader" msgstr "Install the default boot loader" #. combo box item -#: src/include/bootloader/routines/misc.rb:60 +#: src/include/bootloader/routines/misc.rb:63 msgid "Install Default Boot Loader" msgstr "Install Default Boot Loader" #. summary string -#: src/include/bootloader/routines/misc.rb:64 +#: src/include/bootloader/routines/misc.rb:68 msgid "Boot loader" msgstr "Boot loader" #. combo box item -#: src/include/bootloader/routines/misc.rb:66 +#: src/include/bootloader/routines/misc.rb:71 msgid "Boot Loader" msgstr "Boot Loader" @@ -1165,46 +1122,121 @@ "Because of the partitioning, the boot loader\n" "cannot be installed properly." +#. Represents dialog for modification of device map +#: src/lib/bootloader/device_map_dialog.rb:53 +#, fuzzy +msgid "Device map must contain at least one device" +msgstr "A class must contain at least one printer." + +#. we just go back to original dialog +#: src/lib/bootloader/device_map_dialog.rb:96 +#, fuzzy +msgid "Disk order settings" +msgstr "Filter settings" + +#: src/lib/bootloader/device_map_dialog.rb:101 +msgid "D&isks" +msgstr "D&isks" + +#. textentry header +#: src/lib/bootloader/device_map_dialog.rb:146 +msgid "&Device" +msgstr "&Device" + +#. TRANSLATORS: %s stands for partition +#: src/lib/bootloader/disk_change_detector.rb:47 +msgid "Selected custom bootloader partition %s is not available any more." +msgstr "" + +#. TRANSLATORS the %{path} is path where bootloader stage1 is selected to install and +#. the %{device} is device where it should be, but isn't +#: src/lib/bootloader/disk_change_detector.rb:61 +msgid "Selected bootloader location %{path} is not on %{device} any more." +msgstr "" + +#. Finish client for bootloader configuration +#: src/lib/bootloader/finish_client.rb:28 +msgid "Saving bootloader configuration..." +msgstr "Saving bootloader configuration..." + +#. TRANSLATORS: reboot message +#. %1 is replaced with additional message from reIPL +#: src/lib/bootloader/finish_client.rb:145 +msgid "" +"\n" +"Your system will now shut down.%1\n" +"For details, read the related chapter \n" +"in the documentation. \n" +msgstr "" + +#. Final message after all packages from CD1 are installed +#. and we're ready to start (boot into) the installed system +#. Message that will be displayed along with information +#. how the boot loader was installed +#: src/lib/bootloader/finish_client.rb:158 +msgid "The system will reboot now..." +msgstr "The system will reboot now..." + +#. proposal part - bootloader label +#: src/lib/bootloader/proposal_client.rb:94 +msgid "Booting" +msgstr "Booting" + +#. menubutton entry +#: src/lib/bootloader/proposal_client.rb:96 +msgid "&Booting" +msgstr "&Booting" + +#. warning text in the summary richtext +#: src/lib/bootloader/proposal_client.rb:178 +msgid "No boot loader is selected for installation. Your system might not be bootable." +msgstr "No boot loader is selected for installation. Your system might not be bootable." + +#. error in the proposal +#: src/lib/bootloader/proposal_client.rb:187 +msgid "Because of the partitioning, the bootloader cannot be installed properly" +msgstr "Because of the partitioning, the bootloader cannot be installed properly" + #. FATE#303643 Enable one-click changes in bootloader proposal #. -#: src/modules/BootGRUB2.rb:193 +#: src/modules/BootGRUB2.rb:194 #, fuzzy msgid "Install bootcode into MBR (do not install</a>)" msgstr "Firewall is enabled (disable</a>)" -#: src/modules/BootGRUB2.rb:197 +#: src/modules/BootGRUB2.rb:198 #, fuzzy msgid "Do not install bootcode into MBR (install</a>)" msgstr "Firewall is disabled (enable</a>)" #. check for separated boot partition, use root otherwise -#: src/modules/BootGRUB2.rb:210 +#: src/modules/BootGRUB2.rb:211 #, fuzzy msgid "Install bootcode into /boot partition (do not install</a>)" msgstr "Firewall is enabled (disable</a>)" -#: src/modules/BootGRUB2.rb:214 +#: src/modules/BootGRUB2.rb:215 #, fuzzy msgid "Do not install bootcode into /boot partition (install</a>)" msgstr "Firewall is enabled (disable</a>)" -#: src/modules/BootGRUB2.rb:220 +#: src/modules/BootGRUB2.rb:221 #, fuzzy msgid "Install bootcode into \"/\" partition (do not install</a>)" msgstr "Firewall is enabled (disable</a>)" -#: src/modules/BootGRUB2.rb:224 +#: src/modules/BootGRUB2.rb:225 #, fuzzy msgid "Do not install bootcode into \"/\" partition (install</a>)" msgstr "Firewall is disabled (enable</a>)" #. no location chosen, so warn user that it is problem unless he is sure -#: src/modules/BootGRUB2.rb:234 +#: src/modules/BootGRUB2.rb:235 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:242 +#: src/modules/BootGRUB2.rb:243 #, fuzzy msgid "Change Location: %s" msgstr "Location: %1" @@ -1213,7 +1245,7 @@ #. @return a list of summary lines #. Display bootloader summary #. @return a list of summary lines -#: src/modules/BootGRUB2.rb:252 src/modules/BootGRUB2EFI.rb:96 +#: src/modules/BootGRUB2.rb:252 src/modules/BootGRUB2EFI.rb:100 msgid "Boot Loader Type: %1" msgstr "Boot Loader Type: %1" @@ -1233,114 +1265,122 @@ msgid "Status Location: %1" msgstr "Location: %1" -#: src/modules/BootGRUB2EFI.rb:104 +#: src/modules/BootGRUB2EFI.rb:108 #, fuzzy #| msgid "Enable &GSS Security" msgid "Enable Secure Boot: %1" msgstr "Enable &GSS Security" #. Check that bootloader is known and supported -#: src/modules/BootSupportCheck.rb:70 +#: src/modules/BootSupportCheck.rb:65 #, fuzzy msgid "Unknown bootloader: %1" msgstr "Unknown Model: %1" #. grub2 is sooo cool... -#: src/modules/BootSupportCheck.rb:101 +#: src/modules/BootSupportCheck.rb:99 msgid "Unsupported combination of hardware platform %1 and bootloader %2" msgstr "" #. TRANSLATORS: description of technical problem. Do not translate technical terms unless native language have well known translation. -#: src/modules/BootSupportCheck.rb:140 +#: src/modules/BootSupportCheck.rb:139 msgid "Boot from MBR does not work together with btrfs filesystem and GPT disk label without bios_grub partition.To fix this issue, create bios_grub partition or use any ext filesystem for boot partition or do not install stage 1 to MBR." msgstr "" #. check if boot device is on raid0 -#: src/modules/BootSupportCheck.rb:168 +#: src/modules/BootSupportCheck.rb:167 #, fuzzy msgid "The boot device is on raid type: %1. System will not boot." msgstr "No boot device was found" #. bnc#501043 added check for valid configuration -#: src/modules/BootSupportCheck.rb:188 +#: src/modules/BootSupportCheck.rb:187 msgid "The boot device is on software RAID1. Select other bootloader location, e.g. Master Boot Record" msgstr "" #. if partitioning worked before upgrade, it will keep working (bnc#886604) -#: src/modules/BootSupportCheck.rb:244 +#: src/modules/BootSupportCheck.rb:243 msgid "Missing ext partition for booting. Cannot install boot code." msgstr "" #. progress stage, text in dialog (short, infinitiv) -#: src/modules/Bootloader.rb:159 +#: src/modules/Bootloader.rb:144 msgid "Check boot loader" msgstr "Check boot loader" #. progress stage, text in dialog (short, infinitiv) -#: src/modules/Bootloader.rb:161 +#: src/modules/Bootloader.rb:146 msgid "Read partitioning" msgstr "Read partitioning" #. progress stage, text in dialog (short, infinitiv) -#: src/modules/Bootloader.rb:163 +#: src/modules/Bootloader.rb:148 msgid "Load boot loader settings" msgstr "Load boot loader settings" #. progress step, text in dialog (short) -#: src/modules/Bootloader.rb:167 +#: src/modules/Bootloader.rb:152 msgid "Checking boot loader..." msgstr "Checking boot loader..." #. progress step, text in dialog (short) -#: src/modules/Bootloader.rb:169 +#: src/modules/Bootloader.rb:154 msgid "Reading partitioning..." msgstr "Reading partitioning..." #. progress step, text in dialog (short) -#: src/modules/Bootloader.rb:171 +#: src/modules/Bootloader.rb:156 msgid "Loading boot loader settings..." msgstr "Loading boot loader settings..." #. dialog header -#: src/modules/Bootloader.rb:175 +#: src/modules/Bootloader.rb:160 msgid "Initializing Boot Loader Configuration" msgstr "Initialising Boot Loader Configuration" #. progress stage, text in dialog (short) -#: src/modules/Bootloader.rb:322 +#: src/modules/Bootloader.rb:279 msgid "Create initrd" msgstr "Create initrd" #. progress stage, text in dialog (short) -#: src/modules/Bootloader.rb:324 +#: src/modules/Bootloader.rb:281 msgid "Save boot loader configuration files" msgstr "Save boot loader configuration files" #. progress stage, text in dialog (short) -#: src/modules/Bootloader.rb:326 +#: src/modules/Bootloader.rb:283 msgid "Install boot loader" msgstr "Install boot loader" #. progress step, text in dialog (short) -#: src/modules/Bootloader.rb:330 +#: src/modules/Bootloader.rb:287 msgid "Creating initrd..." msgstr "Creating initrd..." #. progress step, text in dialog (short) -#: src/modules/Bootloader.rb:332 +#: src/modules/Bootloader.rb:289 msgid "Saving boot loader configuration files..." msgstr "Saving boot loader configuration files..." #. progress step, text in dialog (short) -#: src/modules/Bootloader.rb:334 +#: src/modules/Bootloader.rb:291 msgid "Installing boot loader..." msgstr "Installing boot loader..." #. progress line -#: src/modules/Bootloader.rb:340 +#: src/modules/Bootloader.rb:297 msgid "Saving Boot Loader Configuration" msgstr "Saving Boot Loader Configuration" +#, fuzzy +#~ msgid "<p><b>Failsafe Kernel Command Line Parameter</b> lets you define failsafe parameters to pass to the kernel.</p>" +#~ msgstr "<p><b>Optional Kernel Command Line Parameter</b> lets you define additional parameters to pass to the kernel</p>" + +#, fuzzy +#~ msgid "&Failsafe Kernel Command Line Parameter" +#~ msgstr "Optional Kernel Command Line Parameter" + #~ msgid "Delete a global option or option of a section" #~ msgstr "Delete a global option or option of a section" @@ -1359,10 +1399,6 @@ #~ msgid "Disk Order" #~ msgstr "Disk Order" -#, fuzzy -#~ msgid "Disk order settings" -#~ msgstr "Filter settings" - #~ msgid "Boot Menu" #~ msgstr "Boot Menu" @@ -1381,16 +1417,6 @@ #~ msgid "Enable Acoustic &Signals" #~ msgstr "&Enable Authentication" -#~ msgid "&Device" -#~ msgstr "&Device" - -#, fuzzy -#~ msgid "Device map must contain at least one device" -#~ msgstr "A class must contain at least one printer." - -#~ msgid "D&isks" -#~ msgstr "D&isks" - #~ msgid "&Up" #~ msgstr "&Up" Modified: trunk/yast/en_GB/po/ca-management.en_GB.po =================================================================== --- trunk/yast/en_GB/po/ca-management.en_GB.po 2015-09-09 08:18:21 UTC (rev 92602) +++ trunk/yast/en_GB/po/ca-management.en_GB.po 2015-09-09 08:19:44 UTC (rev 92603) @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: ca-management\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-04 15:52+0200\n" +"POT-Creation-Date: 2015-08-25 18:36+0200\n" "PO-Revision-Date: 2008-03-27 19:15+0000\n" "Last-Translator: Benjamin Weber \n" "Language-Team: \n" @@ -2572,8 +2572,8 @@ #: src/modules/YaPI/CaManagement.pm:676 src/modules/YaPI/CaManagement.pm:1357 #: src/modules/YaPI/CaManagement.pm:1849 src/modules/YaPI/CaManagement.pm:2124 #: src/modules/YaPI/CaManagement.pm:2880 src/modules/YaPI/CaManagement.pm:2978 -#: src/modules/YaPI/CaManagement.pm:4429 src/modules/YaPI/CaManagement.pm:7305 -#: src/modules/YaPI/CaManagement.pm:7428 +#: src/modules/YaPI/CaManagement.pm:4429 src/modules/YaPI/CaManagement.pm:7306 +#: src/modules/YaPI/CaManagement.pm:7429 msgid "Missing value 'caName'." msgstr "Missing value 'caName'." @@ -2612,7 +2612,7 @@ msgid "Missing parameter 'certType'." msgstr "Missing parameter 'certType'." -#: src/modules/YaPI/CaManagement.pm:1260 src/modules/YaPI/CaManagement.pm:7243 +#: src/modules/YaPI/CaManagement.pm:1260 src/modules/YaPI/CaManagement.pm:7244 msgid "Getting defaults failed." msgstr "Getting defaults failed." @@ -2626,11 +2626,11 @@ #: src/modules/YaPI/CaManagement.pm:3322 src/modules/YaPI/CaManagement.pm:3614 #: src/modules/YaPI/CaManagement.pm:3788 src/modules/YaPI/CaManagement.pm:4122 #: src/modules/YaPI/CaManagement.pm:4487 src/modules/YaPI/CaManagement.pm:6127 -#: src/modules/YaPI/CaManagement.pm:6812 src/modules/YaPI/CaManagement.pm:7326 +#: src/modules/YaPI/CaManagement.pm:6813 src/modules/YaPI/CaManagement.pm:7327 msgid "Initializing the CA failed." msgstr "Initialising the CA failed." -#: src/modules/YaPI/CaManagement.pm:1635 src/modules/YaPI/CaManagement.pm:7369 +#: src/modules/YaPI/CaManagement.pm:1635 src/modules/YaPI/CaManagement.pm:7370 msgid "Writing the defaults failed." msgstr "Writing the defaults failed." @@ -2641,16 +2641,16 @@ #: src/modules/YaPI/CaManagement.pm:4070 src/modules/YaPI/CaManagement.pm:4251 #: src/modules/YaPI/CaManagement.pm:4822 src/modules/YaPI/CaManagement.pm:5078 #: src/modules/YaPI/CaManagement.pm:5867 src/modules/YaPI/CaManagement.pm:6098 -#: src/modules/YaPI/CaManagement.pm:6528 src/modules/YaPI/CaManagement.pm:6894 -#: src/modules/YaPI/CaManagement.pm:6982 src/modules/YaPI/CaManagement.pm:7088 -#: src/modules/YaPI/CaManagement.pm:7193 +#: src/modules/YaPI/CaManagement.pm:6529 src/modules/YaPI/CaManagement.pm:6895 +#: src/modules/YaPI/CaManagement.pm:6983 src/modules/YaPI/CaManagement.pm:7089 +#: src/modules/YaPI/CaManagement.pm:7194 msgid "Invalid value for parameter 'caName'." msgstr "Invalid value for parameter 'caName'." #. parameter check failed #: src/modules/YaPI/CaManagement.pm:1704 src/modules/YaPI/CaManagement.pm:2768 #: src/modules/YaPI/CaManagement.pm:3123 src/modules/YaPI/CaManagement.pm:5465 -#: src/modules/YaPI/CaManagement.pm:6536 +#: src/modules/YaPI/CaManagement.pm:6537 msgid "Invalid value for parameter 'type'." msgstr "Invalid value for parameter 'type'." @@ -2674,7 +2674,7 @@ #. parameter check failed #: src/modules/YaPI/CaManagement.pm:2135 src/modules/YaPI/CaManagement.pm:2887 #: src/modules/YaPI/CaManagement.pm:2984 src/modules/YaPI/CaManagement.pm:4446 -#: src/modules/YaPI/CaManagement.pm:7006 +#: src/modules/YaPI/CaManagement.pm:7007 msgid "Missing value 'caPasswd'." msgstr "Missing value 'caPasswd'." @@ -2685,7 +2685,7 @@ #. parameter check failed #: src/modules/YaPI/CaManagement.pm:2547 src/modules/YaPI/CaManagement.pm:2652 -#: src/modules/YaPI/CaManagement.pm:6663 src/modules/YaPI/CaManagement.pm:6769 +#: src/modules/YaPI/CaManagement.pm:6664 src/modules/YaPI/CaManagement.pm:6770 msgid "Missing parameter 'caName'." msgstr "Missing parameter 'caName'." @@ -2700,7 +2700,7 @@ #. parameter check failed #: src/modules/YaPI/CaManagement.pm:2658 src/modules/YaPI/CaManagement.pm:3303 #: src/modules/YaPI/CaManagement.pm:3566 src/modules/YaPI/CaManagement.pm:3727 -#: src/modules/YaPI/CaManagement.pm:4077 src/modules/YaPI/CaManagement.pm:7095 +#: src/modules/YaPI/CaManagement.pm:4077 src/modules/YaPI/CaManagement.pm:7096 msgid "Invalid value for parameter 'caPasswd'." msgstr "Invalid value for parameter 'caPasswd'." @@ -2738,7 +2738,7 @@ msgid "Missing value 'days'." msgstr "Missing value 'days'." -#: src/modules/YaPI/CaManagement.pm:3041 src/modules/YaPI/CaManagement.pm:7358 +#: src/modules/YaPI/CaManagement.pm:3041 src/modules/YaPI/CaManagement.pm:7359 msgid "Modifying CRLGenerationData failed." msgstr "Modifying CRLGenerationData failed." @@ -2792,8 +2792,8 @@ msgstr "Parameter 'P12Password' missing." #. parameter check failed -#: src/modules/YaPI/CaManagement.pm:3572 src/modules/YaPI/CaManagement.pm:6543 -#: src/modules/YaPI/CaManagement.pm:6901 +#: src/modules/YaPI/CaManagement.pm:3572 src/modules/YaPI/CaManagement.pm:6544 +#: src/modules/YaPI/CaManagement.pm:6902 msgid "Invalid value for parameter 'request'." msgstr "Invalid value for parameter 'request'." @@ -3005,101 +3005,101 @@ msgid "Importing the certificate failed." msgstr "Importing the certificate failed." -#: src/modules/YaPI/CaManagement.pm:6320 +#: src/modules/YaPI/CaManagement.pm:6321 msgid "Missing parameter 'inFile'." msgstr "Missing parameter 'inFile'." -#: src/modules/YaPI/CaManagement.pm:6325 +#: src/modules/YaPI/CaManagement.pm:6326 msgid "File not found." msgstr "File not found." -#: src/modules/YaPI/CaManagement.pm:6331 +#: src/modules/YaPI/CaManagement.pm:6332 msgid "Missing parameter 'type'." msgstr "Missing parameter 'type'." -#: src/modules/YaPI/CaManagement.pm:6335 +#: src/modules/YaPI/CaManagement.pm:6336 #, perl-format msgid "Invalid value '%s' in 'type'." msgstr "Invalid value '%s' in 'type'." -#: src/modules/YaPI/CaManagement.pm:6342 +#: src/modules/YaPI/CaManagement.pm:6343 msgid "Missing parameter 'datatype'." msgstr "Missing parameter 'datatype'." -#: src/modules/YaPI/CaManagement.pm:6346 +#: src/modules/YaPI/CaManagement.pm:6347 #, perl-format msgid "Unknown value '%s' in 'datatype'." msgstr "Unknown value '%s' in 'datatype'." -#: src/modules/YaPI/CaManagement.pm:6352 +#: src/modules/YaPI/CaManagement.pm:6353 msgid "Missing parameter 'inForm'." msgstr "Missing parameter 'inForm'." -#: src/modules/YaPI/CaManagement.pm:6356 +#: src/modules/YaPI/CaManagement.pm:6357 #, perl-format msgid "Unknown value '%s' in 'inForm'." msgstr "Unknown value '%s' in 'inForm'." -#: src/modules/YaPI/CaManagement.pm:6461 +#: src/modules/YaPI/CaManagement.pm:6462 msgid "Parsing failed." msgstr "Parsing failed." -#: src/modules/YaPI/CaManagement.pm:6589 +#: src/modules/YaPI/CaManagement.pm:6590 msgid "Parsing the request failed." msgstr "Parsing the request failed." -#: src/modules/YaPI/CaManagement.pm:6703 +#: src/modules/YaPI/CaManagement.pm:6704 msgid "Getting the request list failed." msgstr "Getting the request list failed." -#: src/modules/YaPI/CaManagement.pm:6778 +#: src/modules/YaPI/CaManagement.pm:6779 #, perl-format msgid "Request not found in %s." msgstr "Request not found in %s." -#: src/modules/YaPI/CaManagement.pm:6785 +#: src/modules/YaPI/CaManagement.pm:6786 msgid "Cannot read the request." msgstr "Cannot read the request." -#: src/modules/YaPI/CaManagement.pm:6791 +#: src/modules/YaPI/CaManagement.pm:6792 msgid "No request data found." msgstr "No request data found." -#: src/modules/YaPI/CaManagement.pm:6834 +#: src/modules/YaPI/CaManagement.pm:6835 msgid "Importing the request failed." msgstr "Importing the request failed." -#: src/modules/YaPI/CaManagement.pm:6925 +#: src/modules/YaPI/CaManagement.pm:6926 msgid "Deleting the request failed." msgstr "Deleting the request failed." -#: src/modules/YaPI/CaManagement.pm:6988 +#: src/modules/YaPI/CaManagement.pm:6989 msgid "Invalid value for parameter 'caCertificate'." msgstr "Invalid value for parameter 'caCertificate'." -#: src/modules/YaPI/CaManagement.pm:6993 +#: src/modules/YaPI/CaManagement.pm:6994 msgid "Invalid value for parameter 'caKey'." msgstr "Invalid value for parameter 'caKey'." -#: src/modules/YaPI/CaManagement.pm:7000 +#: src/modules/YaPI/CaManagement.pm:7001 #, perl-format msgid "CA key not available in %s." msgstr "CA key not available in %s." -#: src/modules/YaPI/CaManagement.pm:7029 +#: src/modules/YaPI/CaManagement.pm:7030 msgid "Importing the CA failed." msgstr "Importing the CA failed." -#: src/modules/YaPI/CaManagement.pm:7126 +#: src/modules/YaPI/CaManagement.pm:7127 msgid "Deleting the CA failed." msgstr "Deleting the CA failed." -#: src/modules/YaPI/CaManagement.pm:7466 src/modules/YaPI/CaManagement.pm:7482 +#: src/modules/YaPI/CaManagement.pm:7467 src/modules/YaPI/CaManagement.pm:7483 #, fuzzy msgid "Keyfile does not exist." msgstr "File does not exist." -#: src/modules/YaPI/CaManagement.pm:7501 +#: src/modules/YaPI/CaManagement.pm:7502 #, fuzzy msgid "Password change failed." msgstr "Password validation failed." Modified: trunk/yast/en_GB/po/cio.en_GB.po =================================================================== --- trunk/yast/en_GB/po/cio.en_GB.po 2015-09-09 08:18:21 UTC (rev 92602) +++ trunk/yast/en_GB/po/cio.en_GB.po 2015-09-09 08:19:44 UTC (rev 92603) @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-04 15:52+0200\n" +"POT-Creation-Date: 2015-08-25 18:36+0200\n" "PO-Revision-Date: 2001-07-17 16:27+0200\n" "Last-Translator: James Ogley \n" "Language-Team: English \n" @@ -46,13 +46,13 @@ msgstr "Used" #: src/lib/iochannel/channels_dialog.rb:142 +msgid "yes" +msgstr "yes" + +#: src/lib/iochannel/channels_dialog.rb:142 msgid "no" msgstr "no" -#: src/lib/iochannel/channels_dialog.rb:142 -msgid "yes" -msgstr "yes" - #. filter can be empty if dialog is not yet created #: src/lib/iochannel/channels_dialog.rb:160 #, fuzzy Modified: trunk/yast/en_GB/po/cluster.en_GB.po =================================================================== --- trunk/yast/en_GB/po/cluster.en_GB.po 2015-09-09 08:18:21 UTC (rev 92602) +++ trunk/yast/en_GB/po/cluster.en_GB.po 2015-09-09 08:19:44 UTC (rev 92603) @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-10-29 16:20+0100\n" +"POT-Creation-Date: 2015-08-25 18:36+0200\n" "PO-Revision-Date: 2001-07-17 16:27+0200\n" "Last-Translator: James Ogley \n" "Language-Team: English \n" @@ -91,318 +91,306 @@ msgstr "Configure CUPS" #. return `cancel or a string -#: src/include/cluster/dialogs.rb:85 src/include/cluster/dialogs.rb:120 +#: src/include/cluster/dialogs.rb:87 src/include/cluster/dialogs.rb:122 msgid "OK" msgstr "OK" -#: src/include/cluster/dialogs.rb:86 src/include/cluster/dialogs.rb:121 +#: src/include/cluster/dialogs.rb:88 src/include/cluster/dialogs.rb:123 msgid "Cancel" msgstr "Cancel" #. BNC#871970, change member address struct -#: src/include/cluster/dialogs.rb:111 +#: src/include/cluster/dialogs.rb:113 #, fuzzy #| msgid "Remote Address:" msgid "IP Address" msgstr "Remote Address:" -#: src/include/cluster/dialogs.rb:113 +#: src/include/cluster/dialogs.rb:115 #, fuzzy #| msgid "Remote Address:" msgid "Redundant IP Address" msgstr "Remote Address:" -#: src/include/cluster/dialogs.rb:115 src/include/cluster/dialogs.rb:499 +#: src/include/cluster/dialogs.rb:117 src/include/cluster/dialogs.rb:501 #, fuzzy #| msgid "Node List" msgid "Node ID" msgstr "Node List" #. Set need to require 'set' -#: src/include/cluster/dialogs.rb:163 +#: src/include/cluster/dialogs.rb:165 msgid "Node ID has to be fulfilled with a positive integer" msgstr "" -#: src/include/cluster/dialogs.rb:170 +#: src/include/cluster/dialogs.rb:172 #, fuzzy #| msgid "The hardware address must be unique." msgid "Node ID must be unique" msgstr "The hardware address must be unique." #. BNC#871970, change member address struct -#: src/include/cluster/dialogs.rb:191 src/include/cluster/dialogs.rb:245 +#: src/include/cluster/dialogs.rb:193 src/include/cluster/dialogs.rb:247 #, fuzzy #| msgid "Network &Address:" msgid "The Bind Network Address has to be fulfilled" msgstr "Network &Address:" -#: src/include/cluster/dialogs.rb:197 +#: src/include/cluster/dialogs.rb:199 msgid "The cluster name has to be fulfilled" msgstr "" -#: src/include/cluster/dialogs.rb:214 +#: src/include/cluster/dialogs.rb:216 #, fuzzy #| msgid "The hardware address must be defined." msgid "The Member Address has to be fulfilled" msgstr "The hardware address must be defined." #. BNC#880242, expected_votes must have value when "udp" -#: src/include/cluster/dialogs.rb:220 +#: src/include/cluster/dialogs.rb:222 #, fuzzy #| msgid "Play the test sound when the card is configured" -msgid "The Expected Votes has to be fulfilled when udp is configured" +msgid "The Expected Votes has to be fulfilled when multicast transport is configured" msgstr "Play the test sound when the card is configured" -#: src/include/cluster/dialogs.rb:226 src/include/cluster/dialogs.rb:254 -#: src/include/cluster/dialogs.rb:1463 +#: src/include/cluster/dialogs.rb:228 src/include/cluster/dialogs.rb:256 +#: src/include/cluster/dialogs.rb:1427 msgid "The Multicast Address has to be fulfilled" msgstr "" -#: src/include/cluster/dialogs.rb:236 src/include/cluster/dialogs.rb:264 +#: src/include/cluster/dialogs.rb:238 src/include/cluster/dialogs.rb:266 #, fuzzy #| msgid "The value for pos must be a positive integer." msgid "The Multicast port must be a positive integer" msgstr "The value for pos must be a positive integer." -#: src/include/cluster/dialogs.rb:270 +#: src/include/cluster/dialogs.rb:272 msgid "Only passive or active can be chosen if multiple interface used. Set to passive." msgstr "" #. BNC#871970, change member address struct to memberaddr -#: src/include/cluster/dialogs.rb:439 +#: src/include/cluster/dialogs.rb:441 #, fuzzy #| msgid "Transport" msgid "Transport:" msgstr "Transport" -#: src/include/cluster/dialogs.rb:447 +#: src/include/cluster/dialogs.rb:449 msgid "Channel" msgstr "Channel" -#: src/include/cluster/dialogs.rb:452 src/include/cluster/dialogs.rb:473 +#: src/include/cluster/dialogs.rb:454 src/include/cluster/dialogs.rb:475 #, fuzzy #| msgid "Network &Address:" msgid "Bind Network Address:" msgstr "Network &Address:" -#: src/include/cluster/dialogs.rb:458 src/include/cluster/dialogs.rb:476 -#: src/include/cluster/dialogs.rb:1399 +#: src/include/cluster/dialogs.rb:460 src/include/cluster/dialogs.rb:478 +#: src/include/cluster/dialogs.rb:1363 #, fuzzy #| msgid "Last IP Address:" msgid "Multicast Address:" msgstr "Last IP Address:" -#: src/include/cluster/dialogs.rb:460 src/include/cluster/dialogs.rb:477 +#: src/include/cluster/dialogs.rb:462 src/include/cluster/dialogs.rb:479 #, fuzzy #| msgid "Multicast" msgid "Multicast Port:" msgstr "Multicast" -#: src/include/cluster/dialogs.rb:467 +#: src/include/cluster/dialogs.rb:469 #, fuzzy #| msgid "R&ead Channel" msgid "Redundant Channel" msgstr "R&ead Channel" -#: src/include/cluster/dialogs.rb:483 +#: src/include/cluster/dialogs.rb:485 #, fuzzy #| msgid "Clustering" msgid "Cluster Name:" msgstr "Clustering" -#: src/include/cluster/dialogs.rb:484 +#: src/include/cluster/dialogs.rb:486 #, fuzzy #| msgid "Expected MD5: %1" msgid "Expected Votes:" msgstr "Expected MD5: %1" -#: src/include/cluster/dialogs.rb:488 +#: src/include/cluster/dialogs.rb:490 msgid "rrp mode:" msgstr "" -#: src/include/cluster/dialogs.rb:493 +#: src/include/cluster/dialogs.rb:495 msgid "Auto Generate Node ID" msgstr "" -#: src/include/cluster/dialogs.rb:498 +#: src/include/cluster/dialogs.rb:500 #, fuzzy #| msgid "Remote Address:" msgid "Member Address:" msgstr "Remote Address:" -#: src/include/cluster/dialogs.rb:499 +#: src/include/cluster/dialogs.rb:501 msgid "IP" msgstr "IP" -#: src/include/cluster/dialogs.rb:499 +#: src/include/cluster/dialogs.rb:501 #, fuzzy #| msgid "Remote Address:" msgid "Redundant IP" msgstr "Remote Address:" #. BNC#879596, check the corosync.conf format -#: src/include/cluster/dialogs.rb:539 +#: src/include/cluster/dialogs.rb:541 msgid "" " NOTICE: Detected old corosync configuration.\n" " Please reconfigure the member list and confirm all other settings." msgstr "" #. Notice, current could be "nil" if the list is empty. -#: src/include/cluster/dialogs.rb:690 -msgid "Number of threads must be integer" -msgstr "" - -#: src/include/cluster/dialogs.rb:696 -msgid "Number of threads must larger then 0" -msgstr "" - -#: src/include/cluster/dialogs.rb:734 +#: src/include/cluster/dialogs.rb:715 #, fuzzy #| msgid "Enable &GSS Security" msgid "Enable Security Auth" msgstr "Enable &GSS Security" -#: src/include/cluster/dialogs.rb:737 -msgid "Threads:" -msgstr "" - -#: src/include/cluster/dialogs.rb:740 +#: src/include/cluster/dialogs.rb:719 msgid "For a newly created cluster, push the button below to generate /etc/corosync/authkey." msgstr "" -#: src/include/cluster/dialogs.rb:745 +#: src/include/cluster/dialogs.rb:724 msgid "To join an existing cluster, please copy /etc/corosync/authkey from other nodes manually." msgstr "" -#: src/include/cluster/dialogs.rb:773 +#: src/include/cluster/dialogs.rb:750 msgid "Failed to create /etc/corosync/authkey" msgstr "" -#: src/include/cluster/dialogs.rb:775 +#: src/include/cluster/dialogs.rb:752 msgid "Create /etc/corosync/authkey succeeded" msgstr "" -#: src/include/cluster/dialogs.rb:850 src/include/cluster/dialogs.rb:920 +#: src/include/cluster/dialogs.rb:813 src/include/cluster/dialogs.rb:883 msgid "Running" msgstr "Running" -#: src/include/cluster/dialogs.rb:852 +#: src/include/cluster/dialogs.rb:815 msgid "Not running" msgstr "Not running" #. servie:cluster is the name of /etc/sysconfig/SuSEfirewall2.d/services/cluster -#: src/include/cluster/dialogs.rb:888 +#: src/include/cluster/dialogs.rb:851 msgid "Booting" msgstr "Booting" -#: src/include/cluster/dialogs.rb:898 +#: src/include/cluster/dialogs.rb:861 #, fuzzy #| msgid "On -- Start Service when Booting" msgid "On -- Start pacemaker during boot" msgstr "On -- Start Service when Booting" -#: src/include/cluster/dialogs.rb:905 +#: src/include/cluster/dialogs.rb:868 #, fuzzy #| msgid "Off -- Start Service Manually" msgid "Off -- Start pacemaker manually" msgstr "Off -- Start Service Manually" -#: src/include/cluster/dialogs.rb:914 +#: src/include/cluster/dialogs.rb:877 msgid "Switch On and Off" msgstr "Switch On and Off" -#: src/include/cluster/dialogs.rb:919 +#: src/include/cluster/dialogs.rb:882 msgid "Current Status: " msgstr "Current Status: " -#: src/include/cluster/dialogs.rb:928 +#: src/include/cluster/dialogs.rb:891 #, fuzzy #| msgid "Start Squid Now" msgid "Start pacemaker Now" msgstr "Start Squid Now" -#: src/include/cluster/dialogs.rb:929 +#: src/include/cluster/dialogs.rb:892 #, fuzzy #| msgid "Stop Firewall Now" msgid "Stop pacemaker Now" msgstr "Stop Firewall Now" #. BNC#874563,stop pacemaker could stop corosync since BNC#872651 is fixed -#: src/include/cluster/dialogs.rb:1027 +#: src/include/cluster/dialogs.rb:990 #, fuzzy #| msgid "Main Host" msgid "Sync Host" msgstr "Main Host" -#: src/include/cluster/dialogs.rb:1031 src/include/cluster/dialogs.rb:1043 +#: src/include/cluster/dialogs.rb:994 src/include/cluster/dialogs.rb:1006 msgid "Add" msgstr "Add" -#: src/include/cluster/dialogs.rb:1032 src/include/cluster/dialogs.rb:1044 +#: src/include/cluster/dialogs.rb:995 src/include/cluster/dialogs.rb:1007 #, fuzzy #| msgid "Delay" msgid "Del" msgstr "Delay" -#: src/include/cluster/dialogs.rb:1033 src/include/cluster/dialogs.rb:1045 +#: src/include/cluster/dialogs.rb:996 src/include/cluster/dialogs.rb:1008 msgid "Edit" msgstr "Edit" -#: src/include/cluster/dialogs.rb:1039 +#: src/include/cluster/dialogs.rb:1002 #, fuzzy #| msgid "Select File" msgid "Sync File" msgstr "Select File" -#: src/include/cluster/dialogs.rb:1046 +#: src/include/cluster/dialogs.rb:1009 #, fuzzy #| msgid "Suggested fstab Lines" msgid "Add Suggested Files" msgstr "Suggested fstab Lines" -#: src/include/cluster/dialogs.rb:1055 +#: src/include/cluster/dialogs.rb:1018 msgid "Generate Pre-Shared-Keys" msgstr "" #. remove duplicated elements -#: src/include/cluster/dialogs.rb:1179 +#: src/include/cluster/dialogs.rb:1143 msgid "Csync2 Status Unknown" msgstr "" -#: src/include/cluster/dialogs.rb:1182 +#: src/include/cluster/dialogs.rb:1146 msgid "Turn csync2 ON" msgstr "" -#: src/include/cluster/dialogs.rb:1185 +#: src/include/cluster/dialogs.rb:1149 msgid "Turn csync2 OFF" msgstr "" -#: src/include/cluster/dialogs.rb:1215 +#: src/include/cluster/dialogs.rb:1179 #, fuzzy #| msgid "Enter a user name." msgid "Enter a hostname" msgstr "Enter a user name." -#: src/include/cluster/dialogs.rb:1229 +#: src/include/cluster/dialogs.rb:1193 #, fuzzy #| msgid "Write hostname" msgid "Edit the hostname" msgstr "Write hostname" -#: src/include/cluster/dialogs.rb:1243 +#: src/include/cluster/dialogs.rb:1207 #, fuzzy #| msgid "Enter a new name for the %1 profile." msgid "Enter a filename to synchronize" msgstr "Enter a new name for the %1 profile." -#: src/include/cluster/dialogs.rb:1258 +#: src/include/cluster/dialogs.rb:1222 #, fuzzy #| msgid "Enter the file name" msgid "Edit the filename" msgstr "Enter the file name" #. key file exist -#: src/include/cluster/dialogs.rb:1290 +#: src/include/cluster/dialogs.rb:1254 #, fuzzy #| msgid "" #| "File %1 already exists.\n" @@ -415,50 +403,50 @@ "Do you wish to overwrite it?" #. remove exist key file -#: src/include/cluster/dialogs.rb:1300 +#: src/include/cluster/dialogs.rb:1264 #, fuzzy #| msgid "Parsing the key file failed." msgid "Delete key file %1 failed." msgstr "Parsing the key file failed." #. generate key file -#: src/include/cluster/dialogs.rb:1314 +#: src/include/cluster/dialogs.rb:1278 msgid "" "Key file %1 is generated.\n" "Clicking \"Add Suggested Files\" button adds it to sync list." msgstr "" -#: src/include/cluster/dialogs.rb:1321 +#: src/include/cluster/dialogs.rb:1285 #, fuzzy #| msgid "Image creation failed." msgid "Key generation failed." msgstr "Image creation failed." #. SaveCsync2(); -#: src/include/cluster/dialogs.rb:1383 +#: src/include/cluster/dialogs.rb:1347 msgid "" "Conntrackd is a daemon which helps to duplicate firewall status between cluster nodes.\n" "YaST can help to configure some basic aspects of conntrackd.\n" "You need to start it with the ocf:heartbeat:conntrackd." msgstr "" -#: src/include/cluster/dialogs.rb:1394 +#: src/include/cluster/dialogs.rb:1358 msgid "Dedicated Interface:" msgstr "" -#: src/include/cluster/dialogs.rb:1397 +#: src/include/cluster/dialogs.rb:1361 msgid "IP:" msgstr "" -#: src/include/cluster/dialogs.rb:1400 +#: src/include/cluster/dialogs.rb:1364 msgid "Group Number:" msgstr "" -#: src/include/cluster/dialogs.rb:1404 +#: src/include/cluster/dialogs.rb:1368 msgid "Generate /etc/conntrackd/conntrackd.conf" msgstr "" -#: src/include/cluster/dialogs.rb:1471 +#: src/include/cluster/dialogs.rb:1435 #, fuzzy #| msgid "The value for pos must be a positive integer." msgid "The Group Number must be a positive integer" @@ -473,18 +461,17 @@ "<p><b><big>Member Address</big></b><br>This list specifies all the nodes in the cluster by IP address. This could be configurable when using udpu(Unicast). <br></p>\n" "<p><b><big>Node ID</big></b><br>This configuration option is optional when using IPv4 and required when using IPv6. This is a 32 bit value specifying the node identifier delivered to the cluster membership service. If this is not specified with IPv4, the node id will be determined from the 32 bit IP address the system to which the system is bound with ring identifier of 0. The node identifier value of zero is reserved and should not be used.<br></p>\n" "<p><b><big>rrp_mode</big></b><br>This specifies the mode of redundant ring, which may be none, active, or passive. Active replication offers slightly lower latency from transmit to delivery in faulty network environments but with less performance. Passive replication may nearly double the speed of the totem protocol if the protocol doesn't become cpu bound. The final option is none, in which case only one network interface will be used to operate the totem protocol. If only one interface directive is specified, none is automatically chosen. If multiple interface directives are specified, only active or passive may be chosen.<br></p>\n" -"<p><b><big>Expected votes</big></b><br>Expect vote number for voting quorum. Will be automatically calculated when the nodelist {} section is present in corosync.conf or can be specified in the quorum {} section.<br></p>\n" +"<p><b><big>Expected votes</big></b><br>Expect vote number for voting quorum. Will be automatically calculated when the nodelist {} section is present in corosync.conf (the list will be generated when using unicast transport) or can be specified in the quorum {} section (Expect votes should use the total node numble of the cluster). If Expected votes presents in unicast transport, the value will override the one automatically calculated.<br></p>\n" "<p><b><big>Auto Generate Node ID</big></b><br>Nodeid is required when using IPv6. Auto node ID enabled will generate nodeid automatically.<br></p>\n" msgstr "" #: src/include/cluster/helps.rb:45 msgid "" "\n" -"<p><b><big>Threads</big></b><br>This directive controls how many threads are used to encrypt and send multicast messages. If secauth is off, the protocol will never use threaded sending. If secauth is on, this directive allows systems to be configured to use multiple threads to encrypt and send multicast messages. A thread directive of 0 indicates that no threaded send should be used. This mode offers best performance for non-SMP systems. The default is 0. <br></p>\n" "<p><b><big>Enable Security Auth</big></b><br>This specifies that HMAC/SHA1 authentication should be used to authenticate all messages. It further specifies that all data should be encrypted with the sober128 encryption algorithm to protect data from eavesdropping. Enabling this option adds a 36 byte header to every message sent by totem which reduces total throughput. Encryption and authentication consume 75% of CPU cycles in aisexec as measured with gprof when enabled. For 100Mbit networks with 1500 MTU frame transmissions: A throughput of 9Mb/s is possible with 100% cpu utilization when this option is enabled on 3GHz cpus. A throughput of 10Mb/s is possible wth 20% cpu utilization when this option is disabled on 3GHz cpus. For gig-e networks with large frame transmissions: A throughput of 20Mb/s is possible when this option is enabled on 3GHz cpus. A throughput of 60Mb/s is possible when this option is disabled on 3GHz cpus. The default is on. <b r></p>\n" msgstr "" -#: src/include/cluster/helps.rb:50 +#: src/include/cluster/helps.rb:49 msgid "" "\n" "\t\t\t<p><b><big>Booting</big></b><br>Starting corosync service during boot or not</p>\n" @@ -492,7 +479,7 @@ "\t\t\t" msgstr "" -#: src/include/cluster/helps.rb:56 +#: src/include/cluster/helps.rb:55 msgid "" "\n" "\t\t<p><b><big>Sync Host</big></b><br>The hostnames used here must be the local hostnames of the cluster nodes. That means you must use exactly the same string as printed out by the hostname command.</p>\n" @@ -501,7 +488,7 @@ "\t" msgstr "" -#: src/include/cluster/helps.rb:63 +#: src/include/cluster/helps.rb:62 msgid "" "\n" "\t\t<p><b><big>Dedicated Interface</big></b><br>A dedicated network interface for syncing. The interface must support multicast, and is UP for using. You may have to have it pre-configured. </p>\n" @@ -512,7 +499,7 @@ msgstr "" #. Read dialog help 1/2 -#: src/include/cluster/helps.rb:72 +#: src/include/cluster/helps.rb:71 #, fuzzy #| msgid "" #| "<p><b><big>Initializing DHCP Server Configuration</big></b><br>\n" @@ -525,7 +512,7 @@ "Please wait...</p>" #. Read dialog help 2/2 -#: src/include/cluster/helps.rb:76 +#: src/include/cluster/helps.rb:75 msgid "" "<p><b><big>Aborting Initialization:</big></b><br>\n" "Safely abort the configuration utility by pressing <b>Abort</b> now.</p>\n" @@ -534,7 +521,7 @@ "Safely abort the configuration utility by pressing <b>Abort</b> now.</p>\n" #. Write dialog help 1/2 -#: src/include/cluster/helps.rb:80 +#: src/include/cluster/helps.rb:79 #, fuzzy #| msgid "" #| "<p><b><big>NFS Server Configuration</big></b><br>\n" @@ -547,7 +534,7 @@ "</p>" #. Write dialog help 2/2 -#: src/include/cluster/helps.rb:84 +#: src/include/cluster/helps.rb:83 msgid "" "<p><b><big>Aborting Saving:</big></b><br>\n" "Abort the save procedure by pressing <b>Abort</b>.\n" @@ -572,41 +559,41 @@ msgstr "Initialising..." #. Cluster read dialog caption -#: src/modules/Cluster.rb:395 +#: src/modules/Cluster.rb:390 #, fuzzy #| msgid "Initializing Printer Configuration" msgid "Initializing cluster Configuration" msgstr "Initialising Printer Configuration" #. Progress stage 1/3 -#: src/modules/Cluster.rb:411 +#: src/modules/Cluster.rb:406 msgid "Read the database" msgstr "Read the database" #. Progress stage 2/3 -#: src/modules/Cluster.rb:413 +#: src/modules/Cluster.rb:408 msgid "Read the previous settings" msgstr "Read the previous settings" #. Progress stage 3/3 -#: src/modules/Cluster.rb:415 +#: src/modules/Cluster.rb:410 #, fuzzy #| msgid "Read firewall settings" msgid "Read SuSEFirewall Settings" msgstr "Read firewall settings" #. Progress step 1/3 -#: src/modules/Cluster.rb:419 +#: src/modules/Cluster.rb:414 msgid "Reading the database..." msgstr "Reading the database..." #. Progress step 2/3 -#: src/modules/Cluster.rb:421 +#: src/modules/Cluster.rb:416 msgid "Reading the previous settings..." msgstr "Reading the previous settings..." #. Progress step 3/3 -#: src/modules/Cluster.rb:423 +#: src/modules/Cluster.rb:418 #, fuzzy #| msgid "Reading firewall settings..." msgid "Reading SuSEFirewall settings..." @@ -614,71 +601,71 @@ #. Progress finished #. Progress finished -#: src/modules/Cluster.rb:425 src/modules/Cluster.rb:527 +#: src/modules/Cluster.rb:420 src/modules/Cluster.rb:522 msgid "Finished" msgstr "Finished" -#: src/modules/Cluster.rb:440 +#: src/modules/Cluster.rb:435 #, fuzzy #| msgid "Cannot install required packages." msgid "Cannot install required package" msgstr "Cannot install required packages." #. read database -#: src/modules/Cluster.rb:449 +#: src/modules/Cluster.rb:444 #, fuzzy #| msgid "Change existing configuration" msgid "Cannot load existing configuration" msgstr "Change existing configuration" #. Error message -#: src/modules/Cluster.rb:460 +#: src/modules/Cluster.rb:455 msgid "Cannot read database1." msgstr "Cannot read database1." #. Error message -#: src/modules/Cluster.rb:468 +#: src/modules/Cluster.rb:463 msgid "Cannot read database2." msgstr "Cannot read database2." #. Error message -#: src/modules/Cluster.rb:484 +#: src/modules/Cluster.rb:479 msgid "Cannot detect devices." msgstr "Cannot detect devices." #. Cluster read dialog caption -#: src/modules/Cluster.rb:502 +#: src/modules/Cluster.rb:497 #, fuzzy #| msgid "Saving the Configuration" msgid "Saving cluster Configuration" msgstr "Saving the Configuration" #. Progress stage 1/2 -#: src/modules/Cluster.rb:517 +#: src/modules/Cluster.rb:512 msgid "Write the settings" msgstr "Write the settings" #. Progress stage 2/2 -#: src/modules/Cluster.rb:519 +#: src/modules/Cluster.rb:514 #, fuzzy #| msgid "Save changes to the Profile" msgid "Save changes to SuSEFirewall" msgstr "Save changes to the Profile" #. Progress step 1/2 -#: src/modules/Cluster.rb:523 +#: src/modules/Cluster.rb:518 msgid "Writing the settings..." msgstr "Writing the settings..." #. Progress step 2/2 -#: src/modules/Cluster.rb:525 +#: src/modules/Cluster.rb:520 #, fuzzy #| msgid "Saving changes to the files..." msgid "Saving changes to SuSEFirewall..." msgstr "Saving changes to the files..." #. Error message -#: src/modules/Cluster.rb:537 +#: src/modules/Cluster.rb:532 msgid "Cannot write settings." msgstr "Cannot write settings." Modified: trunk/yast/en_GB/po/control-center.en_GB.po =================================================================== --- trunk/yast/en_GB/po/control-center.en_GB.po 2015-09-09 08:18:21 UTC (rev 92602) +++ trunk/yast/en_GB/po/control-center.en_GB.po 2015-09-09 08:19:44 UTC (rev 92603) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: control-center\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-04 15:52+0200\n" +"POT-Creation-Date: 2015-08-25 18:36+0200\n" "PO-Revision-Date: 2007-08-16 16:26+0100\n" "Last-Translator: Benjamin Weber \n" "Language-Team: \n" Modified: trunk/yast/en_GB/po/control.en_GB.po =================================================================== --- trunk/yast/en_GB/po/control.en_GB.po 2015-09-09 08:18:21 UTC (rev 92602) +++ trunk/yast/en_GB/po/control.en_GB.po 2015-09-09 08:19:44 UTC (rev 92603) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: control\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-10-29 16:21+0100\n" +"POT-Creation-Date: 2015-08-25 18:37+0200\n" "PO-Revision-Date: 2008-03-27 19:15+0000\n" "Last-Translator: Benjamin Weber \n" "Language-Team: \n" Modified: trunk/yast/en_GB/po/country.en_GB.po =================================================================== --- trunk/yast/en_GB/po/country.en_GB.po 2015-09-09 08:18:21 UTC (rev 92602) +++ trunk/yast/en_GB/po/country.en_GB.po 2015-09-09 08:19:44 UTC (rev 92603) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: country\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-04 15:52+0200\n" +"POT-Creation-Date: 2015-08-25 18:36+0200\n" "PO-Revision-Date: 2008-03-27 19:17+0000\n" "Last-Translator: Benjamin Weber \n" "Language-Team: \n" @@ -18,38 +18,38 @@ "X-Generator: KBabel 1.11.4\n" #. translators: command line help text for Securoty module -#: keyboard/src/clients/keyboard.rb:58 +#: keyboard/src/clients/keyboard.rb:59 msgid "Keyboard configuration." msgstr "Keyboard configuration." #. command line help text for 'summary' action -#: keyboard/src/clients/keyboard.rb:71 +#: keyboard/src/clients/keyboard.rb:72 msgid "Keyboard configuration summary." msgstr "Keyboard configuration summary." #. command line help text for 'set' action -#: keyboard/src/clients/keyboard.rb:78 +#: keyboard/src/clients/keyboard.rb:79 msgid "Set new values for keyboard configuration." msgstr "Set new values for keyboard configuration." #. command line help text for 'list' action -#: keyboard/src/clients/keyboard.rb:85 +#: keyboard/src/clients/keyboard.rb:86 msgid "List all available keyboard layouts." msgstr "List all available keyboard layouts." #. command line help text for 'set layout' option -#: keyboard/src/clients/keyboard.rb:93 +#: keyboard/src/clients/keyboard.rb:94 msgid "New keyboard layout" msgstr "New keyboard layout" #. summary label #. summary label -#: keyboard/src/clients/keyboard.rb:155 keyboard/src/modules/Keyboard.rb:1390 +#: keyboard/src/clients/keyboard.rb:160 keyboard/src/modules/Keyboard.rb:1402 msgid "Current Keyboard Layout: %1" msgstr "Current Keyboard Layout: %1" #. error message (%1 is given layout); do not translate 'list' -#: keyboard/src/clients/keyboard.rb:179 +#: keyboard/src/clients/keyboard.rb:184 msgid "Keyboard layout '%1' is invalid. Use a 'list' command to see possible values." msgstr "Keyboard layout '%1' is invalid. Use a 'list' command to see possible values." @@ -224,7 +224,7 @@ #. 2 radio-buttons follow this label. #. Such keyboard layout is used only for the time of the update, #. it is not saved to the system. -#: keyboard/src/modules/Keyboard.rb:1315 +#: keyboard/src/modules/Keyboard.rb:1313 msgid "" "You are currently using a keyboard layout\n" "different from the one in the system to update.\n" @@ -234,6 +234,12 @@ "different from the one in the system to update.\n" "Select the layout to use during update:" +#. Executes the command to set the keyboard in X11, reporting +#. any error to the user +#: keyboard/src/modules/Keyboard.rb:1513 +msgid "Failed to set X11 keyboard to '%s'" +msgstr "" + #. summary label <%1>-<%2> are HTML tags, leave untouched #: language/src/clients/country_simple_proposal.rb:45 msgid "<%1>Keyboard Layout<%2>: %3" @@ -328,24 +334,24 @@ msgstr "Updating translations in boot loader menu..." #. help for write dialog -#: language/src/clients/language.rb:235 +#: language/src/clients/language.rb:233 msgid "<p><b>Saving Configuration</b><br>Please wait...</p>" msgstr "<p><b>Saving Configuration</b><br>Please wait...</p>" #. summary label -#: language/src/clients/language.rb:254 +#: language/src/clients/language.rb:252 msgid "Current Language: %1 (%2)" msgstr "Current Language: %1 (%2)" #. summary label #. summary label -#: language/src/clients/language.rb:268 language/src/modules/Language.rb:793 +#: language/src/clients/language.rb:266 language/src/modules/Language.rb:793 #: language/src/modules/Language.rb:827 msgid "Additional Languages: %1" msgstr "Additional Languages: %1" #. error message (%1 is given layout); do not translate 'list' -#: language/src/clients/language.rb:303 +#: language/src/clients/language.rb:301 msgid "%1 is not a valid language. Use the list command to see possible values." msgstr "%1 is not a valid language. Use the list command to see possible values." @@ -695,8 +701,8 @@ #. label text (Clock setting) #. AutoYaST interface function: Return the summary of Timezone configuration as a map. #. @return summary string (html) -#: timezone/src/clients/timezone.rb:184 timezone/src/modules/Timezone.rb:732 -#: timezone/src/modules/Timezone.rb:968 +#: timezone/src/clients/timezone.rb:184 timezone/src/modules/Timezone.rb:733 +#: timezone/src/modules/Timezone.rb:969 msgid "UTC" msgstr "UTC" @@ -711,7 +717,7 @@ msgstr "Current Time and Date:\t%1" #. error text, %1 is output of 'date' command -#: timezone/src/clients/timezone_proposal.rb:49 +#: timezone/src/clients/timezone_proposal.rb:39 msgid "" "Time %1 is in the past.\n" "Set a correct time before starting installation." @@ -720,12 +726,12 @@ "Set a correct time before starting installation." #. summary item -#: timezone/src/clients/timezone_proposal.rb:95 +#: timezone/src/clients/timezone_proposal.rb:85 msgid "Time Zone" msgstr "Time Zone" #. menue label text -#: timezone/src/clients/timezone_proposal.rb:97 +#: timezone/src/clients/timezone_proposal.rb:87 msgid "&Time Zone" msgstr "&Time Zone" @@ -864,7 +870,7 @@ #. frame label #. frame label #: timezone/src/include/timezone/dialogs.rb:613 -#: timezone/src/include/timezone/dialogs.rb:930 +#: timezone/src/include/timezone/dialogs.rb:910 #, fuzzy msgid "Date and Time (NTP is configured)" msgstr "NTP is not configured" @@ -872,8 +878,8 @@ #. frame label #. frame label #: timezone/src/include/timezone/dialogs.rb:615 -#: timezone/src/include/timezone/dialogs.rb:701 -#: timezone/src/include/timezone/dialogs.rb:932 +#: timezone/src/include/timezone/dialogs.rb:693 +#: timezone/src/include/timezone/dialogs.rb:912 #, fuzzy msgid "Date and Time" msgstr "Change Date and Time" @@ -887,28 +893,22 @@ #. label text #. label text #: timezone/src/include/timezone/dialogs.rb:650 -#: timezone/src/include/timezone/dialogs.rb:688 +#: timezone/src/include/timezone/dialogs.rb:684 msgid "&Region" msgstr "&Region" -#. title for combo box 'timezone' -#. title for selection box 'timezone' -#. label text -#. label text -#: timezone/src/include/timezone/dialogs.rb:660 -#: timezone/src/include/timezone/dialogs.rb:695 -#: timezone/src/include/timezone/dialogs.rb:768 -#: timezone/src/include/timezone/dialogs.rb:775 +#: timezone/src/include/timezone/dialogs.rb:657 +#: timezone/src/include/timezone/dialogs.rb:688 msgid "Time &Zone" msgstr "Time &Zone" -#: timezone/src/include/timezone/dialogs.rb:673 +#: timezone/src/include/timezone/dialogs.rb:669 #, fuzzy msgid "Date and Time:" msgstr "Change Date and Time" #. help for timezone screen -#: timezone/src/include/timezone/dialogs.rb:812 +#: timezone/src/include/timezone/dialogs.rb:791 msgid "" "\n" "<p><b><big>Time Zone and Clock Settings</big></b></p>" @@ -917,7 +917,7 @@ "<p><b><big>Time Zone and Clock Settings</big></b></p>" #. help for timezone screen -#: timezone/src/include/timezone/dialogs.rb:814 +#: timezone/src/include/timezone/dialogs.rb:793 msgid "" "<p>\n" "To select the time zone to use in your system, first select the <b>Region</b>.\n" @@ -932,7 +932,7 @@ "</p>\n" #. general help trailer -#: timezone/src/include/timezone/dialogs.rb:831 +#: timezone/src/include/timezone/dialogs.rb:810 msgid "" "<p>\n" "If the current time is not correct, use <b>Change</b> to adjust it.\n" @@ -943,35 +943,35 @@ "</p>" #. Screen title for timezone screen -#: timezone/src/include/timezone/dialogs.rb:841 +#: timezone/src/include/timezone/dialogs.rb:820 msgid "Clock and Time Zone" msgstr "Clock and Time Zone" #. popup text -#: timezone/src/include/timezone/dialogs.rb:965 +#: timezone/src/include/timezone/dialogs.rb:945 msgid "Select a valid time zone." msgstr "Select a valid time zone." #. label text, Clock setting: local time (not UTC) #. label text, Clock setting: local time (not UTC) -#: timezone/src/modules/Timezone.rb:736 timezone/src/modules/Timezone.rb:972 +#: timezone/src/modules/Timezone.rb:737 timezone/src/modules/Timezone.rb:973 msgid "Local Time" msgstr "Local Time" #. label text #. label text -#: timezone/src/modules/Timezone.rb:740 timezone/src/modules/Timezone.rb:976 +#: timezone/src/modules/Timezone.rb:741 timezone/src/modules/Timezone.rb:977 msgid "Hardware Clock Set To" msgstr "Hardware Clock Set To" #. summary label -#: timezone/src/modules/Timezone.rb:754 +#: timezone/src/modules/Timezone.rb:755 #, fuzzy msgid "NTP configured" msgstr "Not configured" #. summary label -#: timezone/src/modules/Timezone.rb:980 +#: timezone/src/modules/Timezone.rb:981 msgid "Current Time Zone: %1" msgstr "Current Time Zone: %1" @@ -1021,197 +1021,197 @@ msgstr "Canadian (Multilingual)" #. keyboard layout -#: keyboard/src/data/keyboard_raw.ycp:146 +#: keyboard/src/data/keyboard_raw.ycp:145 msgid "Spanish" msgstr "Spanish" #. keyboard layout -#: keyboard/src/data/keyboard_raw.ycp:158 +#: keyboard/src/data/keyboard_raw.ycp:157 msgid "Spanish (Latin America)" msgstr "Spanish (Latin America)" #. keyboard layout -#: keyboard/src/data/keyboard_raw.ycp:170 +#: keyboard/src/data/keyboard_raw.ycp:169 msgid "Spanish (CP 850)" msgstr "Spanish (CP 850)" #. keyboard layout -#: keyboard/src/data/keyboard_raw.ycp:182 +#: keyboard/src/data/keyboard_raw.ycp:181 msgid "Italian" msgstr "Italian" #. keyboard layout -#: keyboard/src/data/keyboard_raw.ycp:194 +#: keyboard/src/data/keyboard_raw.ycp:193 msgid "Portuguese" msgstr "Portuguese" #. keyboard layout -#: keyboard/src/data/keyboard_raw.ycp:206 +#: keyboard/src/data/keyboard_raw.ycp:205 msgid "Portuguese (Brazil)" msgstr "Portuguese (Brazil)" #. keyboard layout -#: keyboard/src/data/keyboard_raw.ycp:218 +#: keyboard/src/data/keyboard_raw.ycp:217 msgid "Portuguese (Brazil -- US accents)" msgstr "Portuguese (Brazil -- US accents)" #. keyboard layout -#: keyboard/src/data/keyboard_raw.ycp:230 +#: keyboard/src/data/keyboard_raw.ycp:229 msgid "Greek" msgstr "Greek" #. keyboard layout -#: keyboard/src/data/keyboard_raw.ycp:242 +#: keyboard/src/data/keyboard_raw.ycp:241 msgid "Dutch" msgstr "Dutch" #. keyboard layout -#: keyboard/src/data/keyboard_raw.ycp:254 +#: keyboard/src/data/keyboard_raw.ycp:253 msgid "Danish" msgstr "Danish" #. keyboard layout -#: keyboard/src/data/keyboard_raw.ycp:266 +#: keyboard/src/data/keyboard_raw.ycp:265 msgid "Norwegian" msgstr "Norwegian" #. keyboard layout -#: keyboard/src/data/keyboard_raw.ycp:278 +#: keyboard/src/data/keyboard_raw.ycp:277 msgid "Swedish" msgstr "Swedish" #. keyboard layout -#: keyboard/src/data/keyboard_raw.ycp:290 +#: keyboard/src/data/keyboard_raw.ycp:289 msgid "Finnish" msgstr "Finnish" #. keyboard layout -#: keyboard/src/data/keyboard_raw.ycp:302 +#: keyboard/src/data/keyboard_raw.ycp:301 msgid "Czech" msgstr "Czech" #. keyboard layout -#: keyboard/src/data/keyboard_raw.ycp:317 +#: keyboard/src/data/keyboard_raw.ycp:316 msgid "Czech (qwerty)" msgstr "Czech (qwerty)" #. keyboard layout -#: keyboard/src/data/keyboard_raw.ycp:332 +#: keyboard/src/data/keyboard_raw.ycp:331 msgid "Slovak" msgstr "Slovak" #. keyboard layout -#: keyboard/src/data/keyboard_raw.ycp:347 +#: keyboard/src/data/keyboard_raw.ycp:346 msgid "Slovak (qwerty)" msgstr "Slovak (qwerty)" #. keyboard layout -#: keyboard/src/data/keyboard_raw.ycp:362 +#: keyboard/src/data/keyboard_raw.ycp:361 msgid "Slovene" msgstr "Slovene" #. keyboard layout -#: keyboard/src/data/keyboard_raw.ycp:377 +#: keyboard/src/data/keyboard_raw.ycp:375 msgid "Hungarian" msgstr "Hungarian" #. keyboard layout -#: keyboard/src/data/keyboard_raw.ycp:392 +#: keyboard/src/data/keyboard_raw.ycp:389 msgid "Polish" msgstr "Polish" #. keyboard layout -#: keyboard/src/data/keyboard_raw.ycp:407 +#: keyboard/src/data/keyboard_raw.ycp:403 msgid "Russian" msgstr "Russian" #. keyboard layout -#: keyboard/src/data/keyboard_raw.ycp:421 +#: keyboard/src/data/keyboard_raw.ycp:417 msgid "Serbian" msgstr "Serbian" #. keyboard layout -#: keyboard/src/data/keyboard_raw.ycp:433 +#: keyboard/src/data/keyboard_raw.ycp:429 msgid "Estonian" msgstr "Estonian" #. keyboard layout -#: keyboard/src/data/keyboard_raw.ycp:445 +#: keyboard/src/data/keyboard_raw.ycp:441 msgid "Lithuanian" msgstr "Lithuanian" #. keyboard layout -#: keyboard/src/data/keyboard_raw.ycp:457 +#: keyboard/src/data/keyboard_raw.ycp:453 msgid "Turkish" msgstr "Turkish" #. keyboard layout -#: keyboard/src/data/keyboard_raw.ycp:468 +#: keyboard/src/data/keyboard_raw.ycp:464 msgid "Croatian" msgstr "Croatian" #. keyboard layout -#: keyboard/src/data/keyboard_raw.ycp:491 +#: keyboard/src/data/keyboard_raw.ycp:486 msgid "Japanese" msgstr "Japanese" #. keyboard layout -#: keyboard/src/data/keyboard_raw.ycp:503 +#: keyboard/src/data/keyboard_raw.ycp:498 msgid "Belgian" msgstr "Belgian" #. keyboard layout -#: keyboard/src/data/keyboard_raw.ycp:515 +#: keyboard/src/data/keyboard_raw.ycp:510 msgid "Dvorak" msgstr "Dvorak" #. keyboard layout -#: keyboard/src/data/keyboard_raw.ycp:527 +#: keyboard/src/data/keyboard_raw.ycp:522 msgid "Icelandic" msgstr "Icelandic" #. keyboard layout -#: keyboard/src/data/keyboard_raw.ycp:539 +#: keyboard/src/data/keyboard_raw.ycp:534 msgid "Ukrainian" msgstr "Ukrainian" #. keyboard layout -#: keyboard/src/data/keyboard_raw.ycp:561 +#: keyboard/src/data/keyboard_raw.ycp:556 msgid "Khmer" msgstr "Khmer" #. keyboard layout -#: keyboard/src/data/keyboard_raw.ycp:583 +#: keyboard/src/data/keyboard_raw.ycp:578 msgid "Korean" msgstr "Korean" #. keyboard layout -#: keyboard/src/data/keyboard_raw.ycp:605 +#: keyboard/src/data/keyboard_raw.ycp:600 msgid "Arabic" msgstr "Arabic" #. keyboard layout -#: keyboard/src/data/keyboard_raw.ycp:626 +#: keyboard/src/data/keyboard_raw.ycp:621 msgid "Tajik" msgstr "Tajik" #. keyboard layout -#: keyboard/src/data/keyboard_raw.ycp:640 +#: keyboard/src/data/keyboard_raw.ycp:635 msgid "Traditional Chinese" msgstr "Traditional Chinese" #. keyboard layout -#: keyboard/src/data/keyboard_raw.ycp:662 +#: keyboard/src/data/keyboard_raw.ycp:657 msgid "Simplified Chinese" msgstr "Simplified Chinese" #. keyboard layout -#: keyboard/src/data/keyboard_raw.ycp:684 +#: keyboard/src/data/keyboard_raw.ycp:679 msgid "Romanian" msgstr "Romanian" #. keyboard layout -#: keyboard/src/data/keyboard_raw.ycp:705 +#: keyboard/src/data/keyboard_raw.ycp:700 #, fuzzy #| msgid "Internal Zone" msgid "US International" Modified: trunk/yast/en_GB/po/crowbar.en_GB.po =================================================================== --- trunk/yast/en_GB/po/crowbar.en_GB.po 2015-09-09 08:18:21 UTC (rev 92602) +++ trunk/yast/en_GB/po/crowbar.en_GB.po 2015-09-09 08:19:44 UTC (rev 92603) @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-10-29 16:20+0100\n" +"POT-Creation-Date: 2015-08-25 18:36+0200\n" "PO-Revision-Date: 2001-07-17 16:27+0200\n" "Last-Translator: James Ogley \n" "Language-Team: English \n" @@ -19,35 +19,40 @@ "Plural-Forms: nplurals=2; plural=n != 1;\n" #. Command line help text for the Xcrowbar module -#: src/clients/crowbar.rb:56 +#: src/clients/crowbar.rb:51 #, fuzzy #| msgid "Configuration of CD creator" msgid "Configuration of crowbar" msgstr "Configuration of CD creator" -#. table header -#: src/include/crowbar/complex.rb:96 -#, fuzzy -#| msgid "Repository &Name:" -msgid "Repository Name" -msgstr "Repository &Name:" +#. radio button item: target repository is common for all available platform +#: src/include/crowbar/complex.rb:90 +msgid "Common for All" +msgstr "" -#: src/include/crowbar/complex.rb:96 -msgid "URL" -msgstr "URL" +#. target platform name +#: src/include/crowbar/complex.rb:92 +msgid "SLES 11 SP3" +msgstr "" -#: src/include/crowbar/complex.rb:96 +#. target platform name +#: src/include/crowbar/complex.rb:94 +msgid "SLES 12" +msgstr "" + +#. combobox label +#: src/include/crowbar/complex.rb:106 #, fuzzy -#| msgid "User Found Error" -msgid "Ask On Error" -msgstr "User Found Error" +#| msgid "&Location of Printer" +msgid "&Location of Repositories" +msgstr "&Location of Printer" -#. help text -#: src/include/crowbar/complex.rb:106 +#: src/include/crowbar/complex.rb:109 msgid "" "<p>Here you can edit the location of your <b>Update Repositories</b>.</p>\n" "<p>\n" -"Some examples of how the URL could look like:\n" +"If repositories are stored at SMT server or SUSE Manager server, it's enought to enter server's URL and the paths\n" +" to repositories will be filled automatically.</p>It is also possible to use custom paths. Some examples of how the URL could look like:\n" "</p><p>\n" "<ul>\n" "<li><i>http://smt.example.com/repo/$RCE/SLES11-SP3-Pool/sle-11-x86_64/</i> for SMT server\n" @@ -57,62 +62,48 @@ "</p>" msgstr "" -#. textentry label -#: src/include/crowbar/complex.rb:122 -#, fuzzy -#| msgid "&Repository URL" -msgid "Repository &URL" -msgstr "&Repository URL" - -#. textentry label -#: src/include/crowbar/complex.rb:135 -#, fuzzy -#| msgid "User Found Error" -msgid "&Ask On Error" -msgstr "User Found Error" - #. table header -#: src/include/crowbar/complex.rb:155 +#: src/include/crowbar/complex.rb:148 #, fuzzy #| msgid "Administrator DN" msgid "Administrator Name" msgstr "Administrator DN" #. help text -#: src/include/crowbar/complex.rb:165 +#: src/include/crowbar/complex.rb:158 #, fuzzy #| msgid "U&se this password for system administrator" msgid "<p>Manage user names and passwords for Crowbar administrators.</p>" msgstr "U&se this password for system administrator" #. textentry label -#: src/include/crowbar/complex.rb:201 +#: src/include/crowbar/complex.rb:194 #, fuzzy #| msgid "&Model" msgid "&Mode" msgstr "&Model" #. help text for the Network mode tab (do not translate bastion) -#: src/include/crowbar/complex.rb:203 +#: src/include/crowbar/complex.rb:196 msgid "" "<p>Here, define a <b>Network Mode</b> with relevant <b>Bonding Policy</b>.</p>\n" "<p>You can also specify interface names for the bastion network conduits as space-separated list.</p>" msgstr "" #. textentry label -#: src/include/crowbar/complex.rb:213 +#: src/include/crowbar/complex.rb:206 #, fuzzy #| msgid "Cooling Policy" msgid "Bonding &Policy" msgstr "Cooling Policy" #. textentry label -#: src/include/crowbar/complex.rb:222 +#: src/include/crowbar/complex.rb:215 msgid "P&hysical interfaces mapping for bastion network" msgstr "" #. help text for conduit if list -#: src/include/crowbar/complex.rb:231 +#: src/include/crowbar/complex.rb:224 msgid "" "<p>Each physical interface definition needs to fit the pattern\n" "<tt>[Quantifier][Speed][Order]</tt>.\n" @@ -120,111 +111,215 @@ msgstr "" #. table header -#: src/include/crowbar/complex.rb:265 +#: src/include/crowbar/complex.rb:254 msgid "Network" msgstr "Network" -#: src/include/crowbar/complex.rb:266 +#: src/include/crowbar/complex.rb:255 #, fuzzy #| msgid "Sender Address" msgid "Subnet Address" msgstr "Sender Address" -#: src/include/crowbar/complex.rb:267 +#: src/include/crowbar/complex.rb:256 msgid "Network Mask" msgstr "Network Mask" -#: src/include/crowbar/complex.rb:268 +#: src/include/crowbar/complex.rb:257 msgid "VLAN" msgstr "VLAN" #. checkbox label -#: src/include/crowbar/complex.rb:286 +#: src/include/crowbar/complex.rb:275 #, fuzzy #| msgid "&Use LDAP" msgid "Use &VLAN" msgstr "&Use LDAP" #. textentry label -#: src/include/crowbar/complex.rb:296 +#: src/include/crowbar/complex.rb:285 #, fuzzy #| msgid "VLAN" msgid "VLAN &ID" msgstr "VLAN" #. textentry label -#: src/include/crowbar/complex.rb:306 +#: src/include/crowbar/complex.rb:295 msgid "Rou&ter" msgstr "" #. textentry label -#: src/include/crowbar/complex.rb:328 +#: src/include/crowbar/complex.rb:317 #, fuzzy #| msgid "&Preferences" msgid "Router pre&ference" msgstr "&Preferences" #. textentry label -#: src/include/crowbar/complex.rb:338 +#: src/include/crowbar/complex.rb:327 msgid "&Subnet" msgstr "&Subnet" #. textentry label -#: src/include/crowbar/complex.rb:361 +#: src/include/crowbar/complex.rb:350 msgid "Net&mask" msgstr "Net&mask" -#: src/include/crowbar/complex.rb:383 +#: src/include/crowbar/complex.rb:372 #, fuzzy #| msgid "Broadcast" msgid "Broa&dcast" msgstr "Broadcast" #. checkbox label -#: src/include/crowbar/complex.rb:393 +#: src/include/crowbar/complex.rb:382 #, fuzzy #| msgid "Bridge" msgid "&Add Bridge" msgstr "Bridge" #. push button label& -#: src/include/crowbar/complex.rb:402 +#: src/include/crowbar/complex.rb:391 #, fuzzy #| msgid "&Edit Zone..." msgid "Edit Ran&ges..." msgstr "&Edit Zone..." #. checkbox label -#: src/include/crowbar/complex.rb:413 +#: src/include/crowbar/complex.rb:402 #, fuzzy #| msgid "Bond Network" msgid "Add &Bastion Network" msgstr "Bond Network" #. textentry label -#: src/include/crowbar/complex.rb:425 +#: src/include/crowbar/complex.rb:414 msgid "&IP Address" msgstr "&IP Address" #. text entry label -#: src/include/crowbar/complex.rb:585 +#: src/include/crowbar/complex.rb:520 +msgid "Name" +msgstr "Name" + +#. text entry label +#: src/include/crowbar/complex.rb:522 src/include/crowbar/complex.rb:695 +msgid "URL" +msgstr "URL" + +#. text entry label +#: src/include/crowbar/complex.rb:526 src/include/crowbar/complex.rb:696 +#, fuzzy +#| msgid "User Found Error" +msgid "Ask On Error" +msgstr "User Found Error" + +#. frame label +#: src/include/crowbar/complex.rb:531 src/include/crowbar/complex.rb:697 +#: src/include/crowbar/complex.rb:715 +#, fuzzy +#| msgid "Target Name" +msgid "Target Platform" +msgstr "Target Name" + +#. error popup +#: src/include/crowbar/complex.rb:580 +#, fuzzy +#| msgid "" +#| "Hardware configuration %1 already exists.\n" +#| "Choose a different one." +msgid "" +"Repository '%1' already exists.\n" +"Choose a different name." +msgstr "" +"Hardware configuration %1 already exists.\n" +"Choose a different one." + +#. text entry label +#: src/include/crowbar/complex.rb:676 +#, fuzzy +#| msgid "LDAP Server &URL" +msgid "Server &URL" +msgstr "LDAP Server &URL" + +#. table header +#: src/include/crowbar/complex.rb:694 +#, fuzzy +#| msgid "Repository &Name:" +msgid "Repository Name" +msgstr "Repository &Name:" + +#. checkbox label +#: src/include/crowbar/complex.rb:701 +#, fuzzy +#| msgid "User Found Error" +msgid "&Ask On Error" +msgstr "User Found Error" + +#. text entry label +#: src/include/crowbar/complex.rb:707 +#, fuzzy +#| msgid "&Repository URL" +msgid "Repository &URL" +msgstr "&Repository URL" + +#. label (hint for user) +#: src/include/crowbar/complex.rb:710 +msgid "Empty URL means that default value will be used." +msgstr "" + +#. push button label +#: src/include/crowbar/complex.rb:726 +#, fuzzy +#| msgid "Repository" +msgid "A&dd Repository" +msgstr "Repository" + +#. combobox item +#: src/include/crowbar/complex.rb:793 +#, fuzzy +#| msgid "Remote WINS Server" +msgid "Remote SMT Server" +msgstr "Remote WINS Server" + +#. combobox item +#: src/include/crowbar/complex.rb:795 +#, fuzzy +#| msgid "Master Server" +msgid "SUSE Manager Server" +msgstr "Master Server" + +#. combobox item +#: src/include/crowbar/complex.rb:797 +msgid "Custom" +msgstr "Custom" + +#. text entry label +#: src/include/crowbar/complex.rb:866 msgid "User Name" msgstr "User Name" #. text entry label -#: src/include/crowbar/complex.rb:587 +#: src/include/crowbar/complex.rb:868 msgid "Password" msgstr "Password" #. text entry label -#: src/include/crowbar/complex.rb:589 +#: src/include/crowbar/complex.rb:870 #, fuzzy #| msgid "Reenter the &Password" msgid "Repeat the Password" msgstr "Reenter the &Password" #. error popup -#: src/include/crowbar/complex.rb:627 +#: src/include/crowbar/complex.rb:900 +#, fuzzy +#| msgid "Server name cannot be empty." +msgid "User name cannot be empty." +msgstr "Server name cannot be empty." + +#. error popup +#: src/include/crowbar/complex.rb:907 msgid "" "The passwords do not match.\n" "Try again." @@ -233,7 +328,7 @@ "Try again." #. error popup -#: src/include/crowbar/complex.rb:636 +#: src/include/crowbar/complex.rb:915 #, fuzzy #| msgid "" #| "Hardware configuration %1 already exists.\n" @@ -246,19 +341,19 @@ "Choose a different one." #. error popup -#: src/include/crowbar/complex.rb:781 +#: src/include/crowbar/complex.rb:1018 #, fuzzy #| msgid "The entered URL '%1' is invalid" msgid "The interface format '%1' is not valid" msgstr "The entered URL '%1' is invalid" -#. table entry (VLAN status) -#: src/include/crowbar/complex.rb:861 +#. Returns broadcast address. Based on current netmask and subnet +#: src/include/crowbar/complex.rb:1076 msgid "disabled" msgstr "disabled" #. error popup -#: src/include/crowbar/complex.rb:986 +#: src/include/crowbar/complex.rb:1173 #, fuzzy #| msgid "The subnet mask is invalid." msgid "" @@ -268,7 +363,7 @@ #. error popup #. error popup -#: src/include/crowbar/complex.rb:999 src/include/crowbar/complex.rb:1036 +#: src/include/crowbar/complex.rb:1184 src/include/crowbar/complex.rb:1216 #, fuzzy #| msgid "The IP address is invalid." msgid "" @@ -277,7 +372,7 @@ msgstr "The IP address is invalid." #. error popup -#: src/include/crowbar/complex.rb:1011 +#: src/include/crowbar/complex.rb:1194 #, fuzzy #| msgid "The remote IP address is invalid." msgid "" @@ -286,14 +381,14 @@ msgstr "The remote IP address is invalid." #. error popup -#: src/include/crowbar/complex.rb:1023 +#: src/include/crowbar/complex.rb:1203 #, fuzzy #| msgid "The format of server address '%1' is not correct." msgid "The router address '%1' is not part of network '%2'." msgstr "The format of server address '%1' is not correct." #. error popup -#: src/include/crowbar/complex.rb:1047 +#: src/include/crowbar/complex.rb:1225 #, fuzzy #| msgid "" #| "IP address %1 does not match\n" @@ -304,27 +399,27 @@ "the current network %2/%3.\n" #. popup message -#: src/include/crowbar/complex.rb:1068 +#: src/include/crowbar/complex.rb:1246 msgid "" "Some address ranges are not part of network '%1'.\n" "Adapt them using 'Edit ranges' button." msgstr "" #. inputfield label -#: src/include/crowbar/complex.rb:1173 +#: src/include/crowbar/complex.rb:1335 #, fuzzy #| msgid "Min&imum IP Address" msgid "Min IP Address" msgstr "Min&imum IP Address" #. inputfield label -#: src/include/crowbar/complex.rb:1180 +#: src/include/crowbar/complex.rb:1342 #, fuzzy #| msgid "Ma&ximum IP Address" msgid "Max IP Address" msgstr "Ma&ximum IP Address" -#: src/include/crowbar/complex.rb:1247 +#: src/include/crowbar/complex.rb:1395 #, fuzzy #| msgid "" #| "IP address %1 does not match\n" @@ -335,61 +430,56 @@ "the current network %2/%3.\n" #. error message -#: src/include/crowbar/complex.rb:1263 +#: src/include/crowbar/complex.rb:1407 msgid "The lowest address must be lower than the highest one." msgstr "The lowest address must be lower than the highest one." #. error message -#: src/include/crowbar/complex.rb:1296 +#: src/include/crowbar/complex.rb:1431 msgid "Ranges '%1' and '%2' are overlapping." msgstr "" #. tab header -#: src/include/crowbar/complex.rb:1373 +#: src/include/crowbar/complex.rb:1499 #, fuzzy #| msgid "User Settings" msgid "&User Settings" msgstr "User Settings" #. label (hint for user) -#: src/include/crowbar/complex.rb:1385 +#: src/include/crowbar/complex.rb:1511 msgid "If no user is present, user 'crowbar' with default password will be used." msgstr "" #. tab header -#: src/include/crowbar/complex.rb:1403 +#: src/include/crowbar/complex.rb:1527 #, fuzzy #| msgid "Network Mode" msgid "N&etwork Mode" msgstr "Network Mode" -#: src/include/crowbar/complex.rb:1411 +#: src/include/crowbar/complex.rb:1535 #, fuzzy #| msgid "Bond Network" msgid "Bastion Network" msgstr "Bond Network" #. tab header -#: src/include/crowbar/complex.rb:1454 +#: src/include/crowbar/complex.rb:1578 #, fuzzy #| msgid "Network" msgid "Net&works" msgstr "Network" #. tab header -#: src/include/crowbar/complex.rb:1490 +#: src/include/crowbar/complex.rb:1614 #, fuzzy #| msgid "Repositories" msgid "Re&positories" msgstr "Repositories" -#. label (hint for user) -#: src/include/crowbar/complex.rb:1501 -msgid "Empty URL means that default value will be used." -msgstr "" - #. popup message %1 is FQDN -#: src/include/crowbar/complex.rb:1653 +#: src/include/crowbar/complex.rb:1731 msgid "" "The SUSE Cloud Admin Server has been deployed. Changing the network is\n" "currently not supported.\n" @@ -398,7 +488,7 @@ msgstr "" #. default dialog caption -#: src/include/crowbar/complex.rb:1671 +#: src/include/crowbar/complex.rb:1749 #, fuzzy #| msgid "CD Creator Configuration Overview" msgid "Crowbar Configuration Overview" @@ -449,56 +539,56 @@ msgstr "" #. Initialization dialog caption -#: src/include/crowbar/wizards.rb:89 +#: src/include/crowbar/wizards.rb:87 #, fuzzy #| msgid "Controller Configuration" msgid "Crowbar Configuration" msgstr "Controller Configuration" #. Initialization dialog contents -#: src/include/crowbar/wizards.rb:91 +#: src/include/crowbar/wizards.rb:89 msgid "Initializing..." msgstr "Initialising..." #. Crowbar read dialog caption -#: src/modules/Crowbar.rb:144 +#: src/modules/Crowbar.rb:142 #, fuzzy #| msgid "Initializing Scanner Configuration" msgid "Initializing crowbar Configuration" msgstr "Initialising Scanner Configuration" #. Progress stage -#: src/modules/Crowbar.rb:155 +#: src/modules/Crowbar.rb:153 #, fuzzy #| msgid "Read the configuration" msgid "Read the configuraton" msgstr "Read the configuration" #. Progress step -#: src/modules/Crowbar.rb:159 +#: src/modules/Crowbar.rb:157 msgid "Reading the configuration..." msgstr "Reading the configuration..." #. Progress finished #. Progress finished -#: src/modules/Crowbar.rb:161 src/modules/Crowbar.rb:255 +#: src/modules/Crowbar.rb:159 src/modules/Crowbar.rb:249 msgid "Finished" msgstr "Finished" #. Crowbar read dialog caption -#: src/modules/Crowbar.rb:238 +#: src/modules/Crowbar.rb:232 #, fuzzy #| msgid "Saving Proxy Configuration" msgid "Saving crowbar Configuration" msgstr "Saving Proxy Configuration" #. Progress stage 1/2 -#: src/modules/Crowbar.rb:249 +#: src/modules/Crowbar.rb:243 msgid "Write the settings" msgstr "Write the settings" #. Progress step 1/2 -#: src/modules/Crowbar.rb:253 +#: src/modules/Crowbar.rb:247 msgid "Writing the settings..." msgstr "Writing the settings..." Modified: trunk/yast/en_GB/po/dhcp-server.en_GB.po =================================================================== --- trunk/yast/en_GB/po/dhcp-server.en_GB.po 2015-09-09 08:18:21 UTC (rev 92602) +++ trunk/yast/en_GB/po/dhcp-server.en_GB.po 2015-09-09 08:19:44 UTC (rev 92603) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: dhcp-server\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-08-18 12:43+0000\n" +"POT-Creation-Date: 2015-08-25 18:36+0200\n" "PO-Revision-Date: 2008-03-27 19:18+0000\n" "Last-Translator: Benjamin Weber \n" "Language-Team: \n" @@ -2561,57 +2561,57 @@ msgstr "DHCP Server &Expert Configuration..." #. Dhcp-server read dialog caption -#: src/modules/DhcpServer.pm:1387 +#: src/modules/DhcpServer.pm:1388 msgid "Initializing DHCP Server Configuration" msgstr "Initialising DHCP Server Configuration" #. progress stage -#: src/modules/DhcpServer.pm:1391 +#: src/modules/DhcpServer.pm:1392 msgid "Check the environment" msgstr "Check the environment" #. progress stage -#: src/modules/DhcpServer.pm:1393 +#: src/modules/DhcpServer.pm:1394 msgid "Read firewall settings" msgstr "Read firewall settings" #. progress stage -#: src/modules/DhcpServer.pm:1395 +#: src/modules/DhcpServer.pm:1396 msgid "Read DHCP server settings" msgstr "Read DHCP server settings" #. progress stage -#: src/modules/DhcpServer.pm:1397 +#: src/modules/DhcpServer.pm:1398 msgid "Read DNS server settings" msgstr "Read DNS server settings" #. progress step -#: src/modules/DhcpServer.pm:1401 +#: src/modules/DhcpServer.pm:1402 msgid "Checking the environment..." msgstr "Checking the environment..." #. progress step -#: src/modules/DhcpServer.pm:1403 +#: src/modules/DhcpServer.pm:1404 msgid "Reading firewall settings..." msgstr "Reading firewall settings..." #. progress step -#: src/modules/DhcpServer.pm:1405 +#: src/modules/DhcpServer.pm:1406 msgid "Reading DHCP server settings..." msgstr "Reading DHCP server settings..." #. progress step -#: src/modules/DhcpServer.pm:1407 +#: src/modules/DhcpServer.pm:1408 msgid "Reading DNS server settings..." msgstr "Reading DNS server settings..." #. progress step -#: src/modules/DhcpServer.pm:1409 src/modules/DhcpServer.pm:1637 +#: src/modules/DhcpServer.pm:1410 src/modules/DhcpServer.pm:1638 msgid "Finished" msgstr "Finished" #. TRANSLATORS: error report popup -#: src/modules/DhcpServer.pm:1439 +#: src/modules/DhcpServer.pm:1440 msgid "" "This server needs at least one\n" "configured network device (besides loopback) to\n" @@ -2628,7 +2628,7 @@ "Aborting now." #. error report -#: src/modules/DhcpServer.pm:1474 +#: src/modules/DhcpServer.pm:1475 msgid "" "Cannot determine hostname. LDAP-based configuration of \n" "DHCP server will not be available." @@ -2637,7 +2637,7 @@ "DHCP server will not be available." #. yes-no popup -#: src/modules/DhcpServer.pm:1542 +#: src/modules/DhcpServer.pm:1543 msgid "" "The DHCP server does not seem to have been\n" "configured yet. Create a new configuration?" @@ -2646,87 +2646,87 @@ "configured yet. Create a new configuration?" #. Dhcp-server read dialog caption */ -#: src/modules/DhcpServer.pm:1615 +#: src/modules/DhcpServer.pm:1616 msgid "Saving DHCP Server Configuration" msgstr "Saving DHCP Server Configuration" #. progress stage -#: src/modules/DhcpServer.pm:1620 +#: src/modules/DhcpServer.pm:1621 msgid "Write DHCP server settings" msgstr "Write DHCP server settings" #. progress stage -#: src/modules/DhcpServer.pm:1622 +#: src/modules/DhcpServer.pm:1623 msgid "Write firewall settings" msgstr "Write firewall settings" #. progress stage -#: src/modules/DhcpServer.pm:1624 +#: src/modules/DhcpServer.pm:1625 msgid "Restart DHCP server" msgstr "Restart DHCP server" #. progress stage -#: src/modules/DhcpServer.pm:1626 +#: src/modules/DhcpServer.pm:1627 msgid "Write DNS server settings" msgstr "Write DNS server settings" #. progress step -#: src/modules/DhcpServer.pm:1629 +#: src/modules/DhcpServer.pm:1630 msgid "Writing DHCP server settings..." msgstr "Writing DHCP server settings..." #. progress step -#: src/modules/DhcpServer.pm:1631 +#: src/modules/DhcpServer.pm:1632 msgid "Writing firewall settings..." msgstr "Writing firewall settings..." #. progress step -#: src/modules/DhcpServer.pm:1633 +#: src/modules/DhcpServer.pm:1634 msgid "Restarting DHCP server..." msgstr "Restarting DHCP server..." #. progress step -#: src/modules/DhcpServer.pm:1635 +#: src/modules/DhcpServer.pm:1636 msgid "Writing DNS server settings..." msgstr "Writing DNS server settings..." #. error report -#: src/modules/DhcpServer.pm:1748 +#: src/modules/DhcpServer.pm:1749 msgid "Error occurred while restarting the DHCP daemon." msgstr "Error occurred while restarting the DHCP daemon." #. summary string -#: src/modules/DhcpServer.pm:1887 +#: src/modules/DhcpServer.pm:1888 msgid "The DHCP server is started at boot time" msgstr "The DHCP server is started at boot time" #. summary string -#: src/modules/DhcpServer.pm:1892 +#: src/modules/DhcpServer.pm:1893 msgid "The DHCP server is not started at boot time" msgstr "The DHCP server is not started at boot time" #. summary string, %1 is list of network interfaces -#: src/modules/DhcpServer.pm:1900 +#: src/modules/DhcpServer.pm:1901 msgid "Listen On: %1" msgstr "Listen On: %1" #. summary string, %1 is IP address range -#: src/modules/DhcpServer.pm:1919 +#: src/modules/DhcpServer.pm:1920 msgid "Dynamic Address Range: %1" msgstr "Dynamic Address Range: %1" #. error message -#: src/modules/DhcpServer.pm:2312 +#: src/modules/DhcpServer.pm:2313 msgid "Invalid LDAP configuration. Cannot use LDAP." msgstr "Invalid LDAP configuration. Cannot use LDAP." #. error report -#: src/modules/DhcpServer.pm:2552 src/modules/DhcpServer.pm:2593 +#: src/modules/DhcpServer.pm:2553 src/modules/DhcpServer.pm:2594 msgid "Support for multiple dhcpServiceDN not implemented." msgstr "Support for multiple dhcpServiceDN not implemented." #. error report -#: src/modules/DhcpServer.pm:2558 +#: src/modules/DhcpServer.pm:2559 msgid "DHCP service DN is not defined." msgstr "DHCP service DN is not defined." @@ -2734,23 +2734,23 @@ #. Error report, %1 is LDAP record key #. Error report #. error report, %1 is LDAP record key -#: src/modules/DhcpServer.pm:2673 src/modules/DhcpServer.pm:2707 -#: src/modules/DhcpServer.pm:2771 src/modules/DhcpServer.pm:2846 +#: src/modules/DhcpServer.pm:2674 src/modules/DhcpServer.pm:2708 +#: src/modules/DhcpServer.pm:2772 src/modules/DhcpServer.pm:2847 msgid "Error occurred while creating %1." msgstr "Error occurred while creating %1." #. error report, %1 is LDAP record key -#: src/modules/DhcpServer.pm:2738 +#: src/modules/DhcpServer.pm:2739 msgid "Error occurred while updating %1." msgstr "Error occurred while updating %1." #. error report, %1=ldap domain, %2=dhcp server -#: src/modules/DhcpServer.pm:2809 +#: src/modules/DhcpServer.pm:2810 msgid "Error occurred while creating cn=%2,ou=DHCP,%1." msgstr "Error occurred while creating cn=%2,ou=DHCP,%1." #. error report, /etc/dhcpd.conf is filename -#: src/modules/DhcpServer.pm:2906 +#: src/modules/DhcpServer.pm:2907 msgid "Error occurred while writing /etc/dhcpd.conf." msgstr "Error occurred while writing /etc/dhcpd.conf." Modified: trunk/yast/en_GB/po/dns-server.en_GB.po =================================================================== --- trunk/yast/en_GB/po/dns-server.en_GB.po 2015-09-09 08:18:21 UTC (rev 92602) +++ trunk/yast/en_GB/po/dns-server.en_GB.po 2015-09-09 08:19:44 UTC (rev 92603) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: dns-server\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-04 15:52+0200\n" +"POT-Creation-Date: 2015-08-25 18:36+0200\n" "PO-Revision-Date: 2007-08-16 16:32+0100\n" "Last-Translator: Benjamin Weber \n" "Language-Team: \n" @@ -17,15 +17,242 @@ "Content-Transfer-Encoding: 8bit\n" "X-Generator: KBabel 1.11.4\n" +#. TRANSLATORS: commandline general name of the module in help +#: src/include/dns-server/cmdline.rb:24 +msgid "DNS server configuration" +msgstr "DNS server configuration" + +#: src/include/dns-server/cmdline.rb:32 +msgid "Start-up settings" +msgstr "Start-up settings" + +#. TRANSLATORS: commandline short help for command +#: src/include/dns-server/cmdline.rb:38 +msgid "DNS forwarders" +msgstr "DNS forwarders" + +#. TRANSLATORS: commandline short help for command +#: src/include/dns-server/cmdline.rb:50 +msgid "Logging settings" +msgstr "Logging settings" + +#. TRANSLATORS: commandline short help for command +#: src/include/dns-server/cmdline.rb:63 +msgid "DNS zones" +msgstr "DNS zones" + +#. TRANSLATORS: commandline short help for command +#: src/include/dns-server/cmdline.rb:79 +msgid "Access control lists" +msgstr "Access control lists" + +#. TRANSLATORS: commandline short help for command +#: src/include/dns-server/cmdline.rb:87 +msgid "Zone transport rules" +msgstr "Zone transport rules" + +#. TRANSLATORS: commandline short help for command, base cmdline command +#: src/include/dns-server/cmdline.rb:102 +msgid "Zone name servers" +msgstr "Zone name servers" + +#. TRANSLATORS: commandline short help for command, base cmdline command +#: src/include/dns-server/cmdline.rb:119 +msgid "Zone mail servers" +msgstr "Zone mail servers" + +#. TRANSLATORS: commandline short help for command, base cmdline command +#: src/include/dns-server/cmdline.rb:133 +msgid "Start of authority (SOA)" +msgstr "Start of authority (SOA)" + +#. TRANSLATORS: commandline short help for command, base cmdline command +#: src/include/dns-server/cmdline.rb:148 +msgid "Zone resource records, such as A, CNAME, NS, MX, or PTR" +msgstr "Zone resource records, such as A, CNAME, NS, MX, or PTR" + +#. TRANSLATORS: commandline short help for command, base cmdline command, A is record type +#: src/include/dns-server/cmdline.rb:166 +msgid "Handles A and corresponding PTR record at once" +msgstr "Handles A and corresponding PTR record at once" + +#. TRANSLATORS: commandline short help for command +#: src/include/dns-server/cmdline.rb:180 +msgid "Show current settings" +msgstr "Show current settings" + +#. TRANSLATORS: commandline short help for command +#: src/include/dns-server/cmdline.rb:186 +msgid "Start DNS server in the boot process" +msgstr "Start DNS server in the boot process" + +#. TRANSLATORS: commandline short help for command +#: src/include/dns-server/cmdline.rb:192 +msgid "Start DNS server manually" +msgstr "Start DNS server manually" + +#. TRANSLATORS: commandline short help for command +#: src/include/dns-server/cmdline.rb:198 +msgid "Add a new record" +msgstr "Add a new record" + +#. TRANSLATORS: commandline short help for command +#: src/include/dns-server/cmdline.rb:204 +msgid "Remove a record" +msgstr "Remove a record" + +#. TRANSLATORS: commandline short help for command +#: src/include/dns-server/cmdline.rb:211 +msgid "IPv4 address" +msgstr "IPv4 address" + +#. TRANSLATORS: commandline short help for command +#: src/include/dns-server/cmdline.rb:218 +msgid "Logging destination (syslog|file)" +msgstr "Logging destination (syslog|file)" + +#. TRANSLATORS: commandline short help for command +#: src/include/dns-server/cmdline.rb:224 +msgid "Set option" +msgstr "Set option" + +#. TRANSLATORS: commandline short help for command +#: src/include/dns-server/cmdline.rb:231 +msgid "Filename for logging (full path)" +msgstr "Filename for logging (full path)" + +#. TRANSLATORS: commandline short help for command +#: src/include/dns-server/cmdline.rb:238 +msgid "Maximum log size [0-9]+(KMG)*" +msgstr "Maximum log size [0-9]+(KMG)*" + +#. TRANSLATORS: commandline short help for command +#: src/include/dns-server/cmdline.rb:245 +msgid "Maximum number of versions for rotation, '0' means no rotation" +msgstr "Maximum number of versions for rotation, '0' means no rotation" + +#. TRANSLATORS: commandline short help for command +#. TRANSLATORS: commandline short help for command +#: src/include/dns-server/cmdline.rb:252 src/include/dns-server/cmdline.rb:273 +msgid "Zone name" +msgstr "Zone name" + +#. TRANSLATORS: commandline short help for command +#: src/include/dns-server/cmdline.rb:259 +msgid "Zone type, master or slave" +msgstr "Zone type, master or slave" + +#. TRANSLATORS: commandline short help for command +#: src/include/dns-server/cmdline.rb:266 +msgid "DNS zone master server" +msgstr "DNS zone master server" + +#. TRANSLATORS: commandline short help for command +#: src/include/dns-server/cmdline.rb:280 +msgid "Enable option" +msgstr "Enable option" + +#. TRANSLATORS: commandline short help for command +#: src/include/dns-server/cmdline.rb:287 +msgid "Disable option" +msgstr "Disable option" + +#. TRANSLATORS: commandline short help for command +#: src/include/dns-server/cmdline.rb:294 +msgid "Name server (in fully qualified format finished with a dot or relative name)" +msgstr "Name server (in fully qualified format finished with a dot or relative name)" + +#. TRANSLATORS: commandline short help for command +#: src/include/dns-server/cmdline.rb:301 +msgid "Mail server (in fully qualified format finished with a dot or relative name)" +msgstr "Mail server (in fully qualified format finished with a dot or relative name)" + +#. TRANSLATORS: commandline short help for command +#: src/include/dns-server/cmdline.rb:308 +msgid "Mail server priority (number from 0 to 65535)" +msgstr "Mail server priority (number from 0 to 65535)" + +#. TRANSLATORS: commandline short help for command +#: src/include/dns-server/cmdline.rb:315 +msgid "Serial number of zone update" +msgstr "Serial number of zone update" + +#. TRANSLATORS: commandline short help for command +#: src/include/dns-server/cmdline.rb:322 +msgid "General time to live of records in zone" +msgstr "General time to live of records in zone" + +#. TRANSLATORS: commandline short help for command +#: src/include/dns-server/cmdline.rb:329 +msgid "An interval before the zone records should be refreshed" +msgstr "An interval before the zone records should be refreshed" + +#. TRANSLATORS: commandline short help for command +#: src/include/dns-server/cmdline.rb:336 +#, fuzzy +#| msgid "An interval between retries of failed refresh" +msgid "Interval between retries of failed refresh" +msgstr "An interval between retries of failed refresh" + +#. TRANSLATORS: commandline short help for command +#: src/include/dns-server/cmdline.rb:343 +#, fuzzy +#| msgid "An interval after which zone records are no longer authoritative" +msgid "Interval after which zone records are no longer authoritative" +msgstr "An interval after which zone records are no longer authoritative" + +#. TRANSLATORS: commandline short help for command, TTL is DNS-Specific (Time to Live), shouldn't be translated +#: src/include/dns-server/cmdline.rb:350 +msgid "Minimum TTL that should be exported with records in this zone" +msgstr "Minimum TTL that should be exported with records in this zone" + +#. TRANSLATORS: commandline short help for command, Types are DNS-Specific, cannot be translated +#: src/include/dns-server/cmdline.rb:357 +msgid "DNS resource record type, such as A, CNAME, NS, MX, or PTR" +msgstr "DNS resource record type, such as A, CNAME, NS, MX, or PTR" + +#. TRANSLATORS: commandline short help for command, DNS query is a question for value when we have a /key/ and type, ('A' record for 'example.org'? -> 192.0.34.166) +#: src/include/dns-server/cmdline.rb:364 +msgid "DNS query, such as example.org for A record" +msgstr "DNS query, such as example.org for A record" + +#. TRANSLATORS: commandline short help for command +#: src/include/dns-server/cmdline.rb:371 +msgid "DNS resource record value, such as 192.0.34.166 for example.org's A record" +msgstr "DNS resource record value, such as 192.0.34.166 for example.org's A record" + +#. TRANSLATORS: commandline short help for command +#: src/include/dns-server/cmdline.rb:378 +msgid "Hostname for the DNS record" +msgstr "Hostname for the DNS record" + +#. TRANSLATORS: commandline short help for command, %1 are possible untranlatable parameters "(yes|no)" +#: src/include/dns-server/cmdline.rb:386 +msgid "Log named queries %1" +msgstr "Log named queries %1" + +#. TRANSLATORS: commandline short help for command, %1 are possible untranlatable parameters "(yes|no)" +#: src/include/dns-server/cmdline.rb:394 +msgid "Log zone updates %1" +msgstr "Log zone updates %1" + +#. TRANSLATORS: commandline short help for command, %1 are possible untranlatable parameters "(yes|no)" +#: src/include/dns-server/cmdline.rb:402 +msgid "Log zone transfers %1" +msgstr "Log zone transfers %1" + +#. TRANSLATORS: commandline short help for command +#: src/include/dns-server/cmdline.rb:409 +msgid "Comma-separated list of zone forwarders" +msgstr "Comma-separated list of zone forwarders" + #. TRANSLATORS: command line error message, %1 is a missing required parameter -#. TRANSLATORS: command line error message, %1 is a missing required parameter -#: src/clients/dns-server.rb:58 src/include/dns-server/cmdline.rb:494 +#: src/include/dns-server/cmdline.rb:494 msgid "Parameter %1 is required." msgstr "Parameter %1 is required." #. TRANSLATORS: command line error message, %1 is a parameter name -#. TRANSLATORS: command line error message, %1 is a parameter name -#: src/clients/dns-server.rb:71 src/include/dns-server/cmdline.rb:507 +#: src/include/dns-server/cmdline.rb:507 msgid "Unknown value for parameter %1." msgstr "Unknown value for parameter %1." @@ -33,72 +260,54 @@ #. TRANSLATORS: commandline section header #. TRANSLATORS: commandline section header #. TRANSLATORS: commandline section header -#. TRANSLATORS: commandline section header -#. TRANSLATORS: commandline section header -#. TRANSLATORS: commandline section header -#. TRANSLATORS: commandline section header -#: src/clients/dns-server.rb:86 src/clients/dns-server.rb:93 -#: src/clients/dns-server.rb:103 src/clients/dns-server.rb:120 #: src/include/dns-server/cmdline.rb:521 src/include/dns-server/cmdline.rb:528 #: src/include/dns-server/cmdline.rb:538 src/include/dns-server/cmdline.rb:555 msgid "Start-Up Settings:" msgstr "Start-Up Settings:" #. TRANSLATORS: commandline error message -#. TRANSLATORS: commandline error message -#: src/clients/dns-server.rb:88 src/include/dns-server/cmdline.rb:523 +#: src/include/dns-server/cmdline.rb:523 msgid "Only one parameter is allowed." msgstr "Only one parameter is allowed." #. TRANSLATORS: commandline progress information -#. TRANSLATORS: commandline progress information -#: src/clients/dns-server.rb:95 src/include/dns-server/cmdline.rb:530 +#: src/include/dns-server/cmdline.rb:530 msgid "Enabling DNS server in the boot process..." msgstr "Enabling DNS server in the boot process..." #. TRANSLATORS: commandline progress information -#. TRANSLATORS: commandline progress information -#: src/clients/dns-server.rb:105 src/include/dns-server/cmdline.rb:540 +#: src/include/dns-server/cmdline.rb:540 msgid "Removing DNS server from the boot process..." msgstr "Removing DNS server from the boot process..." #. TRANSLATORS: commandline DNS service status information -#. TRANSLATORS: commandline DNS service status information -#: src/clients/dns-server.rb:114 src/include/dns-server/cmdline.rb:549 +#: src/include/dns-server/cmdline.rb:549 #, fuzzy #| msgid "DNS server is enabled in the boot process" msgid "DNS server is enabled in the boot process." msgstr "DNS server is enabled in the boot process" #. TRANSLATORS: commandline DNS service status information -#. TRANSLATORS: commandline DNS service status information -#: src/clients/dns-server.rb:117 src/include/dns-server/cmdline.rb:552 +#: src/include/dns-server/cmdline.rb:552 #, fuzzy #| msgid "DNS server needs manual starting" msgid "DNS server needs manual starting." msgstr "DNS server needs manual starting" #. TRANSLATORS: commandline section header, -#. TRANSLATORS: commandline section header, -#: src/clients/dns-server.rb:138 src/include/dns-server/cmdline.rb:573 +#: src/include/dns-server/cmdline.rb:573 msgid "Forwarding:" msgstr "Forwarding:" #. TRANSLATORS: commandline table header item -#. TRANSLATORS: commandline table header item -#: src/clients/dns-server.rb:140 src/include/dns-server/cmdline.rb:575 +#: src/include/dns-server/cmdline.rb:575 msgid "Forwarder IP" msgstr "Forwarder IP" #. TRANSLATORS: commandline error message #. Both Add and Remove defined => Error! -#. TRANSLATORS: commandline error message -#. Both Add and Remove defined => Error! -#: src/clients/dns-server.rb:146 src/clients/dns-server.rb:439 -#: src/clients/dns-server.rb:574 src/clients/dns-server.rb:625 -#: src/clients/dns-server.rb:685 src/clients/dns-server.rb:822 -#: src/clients/dns-server.rb:882 src/include/dns-server/cmdline.rb:580 -#: src/include/dns-server/cmdline.rb:867 src/include/dns-server/cmdline.rb:999 +#: src/include/dns-server/cmdline.rb:580 src/include/dns-server/cmdline.rb:867 +#: src/include/dns-server/cmdline.rb:999 #: src/include/dns-server/cmdline.rb:1049 #: src/include/dns-server/cmdline.rb:1108 #: src/include/dns-server/cmdline.rb:1244 @@ -108,70 +317,57 @@ #. TRANSLATORS: commandline table item #. TRANSLATORS: commandline table item -#. TRANSLATORS: commandline table item -#. TRANSLATORS: commandline table item -#: src/clients/dns-server.rb:220 src/clients/dns-server.rb:230 #: src/include/dns-server/cmdline.rb:651 src/include/dns-server/cmdline.rb:661 msgid "Logging destination" msgstr "Logging destination" #. TRANSLATORS: commandline table item -#. TRANSLATORS: commandline table item -#: src/clients/dns-server.rb:222 src/include/dns-server/cmdline.rb:653 +#: src/include/dns-server/cmdline.rb:653 msgid "System log" msgstr "System log" #. TRANSLATORS: commandline table item -#. TRANSLATORS: commandline table item -#: src/clients/dns-server.rb:232 src/include/dns-server/cmdline.rb:663 +#: src/include/dns-server/cmdline.rb:663 msgid "File" msgstr "File" #. TRANSLATORS: commandline table item -#. TRANSLATORS: commandline table item -#: src/clients/dns-server.rb:240 src/include/dns-server/cmdline.rb:671 +#: src/include/dns-server/cmdline.rb:671 msgid "Filename" msgstr "Filename" #. TRANSLATORS: commandline table item -#. TRANSLATORS: commandline table item -#: src/clients/dns-server.rb:248 src/include/dns-server/cmdline.rb:679 +#: src/include/dns-server/cmdline.rb:679 msgid "Maximum size" msgstr "Maximum size" #. TRANSLATORS: commandline table item -#. TRANSLATORS: commandline table item -#: src/clients/dns-server.rb:256 src/include/dns-server/cmdline.rb:687 +#: src/include/dns-server/cmdline.rb:687 msgid "Maximum versions" msgstr "Maximum versions" #. TRANSLATORS: commandline table item, do not translate named -#. TRANSLATORS: commandline table item, do not translate named -#: src/clients/dns-server.rb:269 src/include/dns-server/cmdline.rb:700 +#: src/include/dns-server/cmdline.rb:700 msgid "Log named queries" msgstr "Log named queries" #. TRANSLATORS: commandline table item -#. TRANSLATORS: commandline table item -#: src/clients/dns-server.rb:277 src/include/dns-server/cmdline.rb:708 +#: src/include/dns-server/cmdline.rb:708 msgid "Log zone updates" msgstr "Log zone updates" #. TRANSLATORS: commandline table item -#. TRANSLATORS: commandline table item -#: src/clients/dns-server.rb:285 src/include/dns-server/cmdline.rb:716 +#: src/include/dns-server/cmdline.rb:716 msgid "Log zone transfers" msgstr "Log zone transfers" #. TRANSLATORS: commandline section header -#. TRANSLATORS: commandline section header -#: src/clients/dns-server.rb:292 src/include/dns-server/cmdline.rb:723 +#: src/include/dns-server/cmdline.rb:723 msgid "Logging Settings:" msgstr "Logging Settings:" #. TRANSLATORS: commandline table header item -#. TRANSLATORS: commandline table header item -#: src/clients/dns-server.rb:298 src/include/dns-server/cmdline.rb:729 +#: src/include/dns-server/cmdline.rb:729 msgid "Setting" msgstr "Setting" @@ -179,99 +375,79 @@ #. TRANSLATORS: commandline table header item #. TRANSLATORS: commandline table header item #. TRANSLATORS: commandline table header item -#. TRANSLATORS: commandline table header item -#. TRANSLATORS: commandline table header item -#. TRANSLATORS: commandline table header item -#. TRANSLATORS: commandline table header item #. Table header item - basic-options listing #. Table header item - ACL-options #. Table menu item - Records listing -#: src/clients/dns-server.rb:300 src/clients/dns-server.rb:312 -#: src/clients/dns-server.rb:519 src/clients/dns-server.rb:734 #: src/include/dns-server/cmdline.rb:731 src/include/dns-server/cmdline.rb:743 #: src/include/dns-server/cmdline.rb:944 #: src/include/dns-server/cmdline.rb:1157 -#: src/include/dns-server/dialog-main.rb:1220 -#: src/include/dns-server/dialog-main.rb:1813 +#: src/include/dns-server/dialog-main.rb:1032 +#: src/include/dns-server/dialog-main.rb:1625 #: src/include/dns-server/dialog-masterzone.rb:1419 msgid "Value" msgstr "Value" #. TRANSLATORS: commandline table header item -#. TRANSLATORS: commandline table header item -#: src/clients/dns-server.rb:310 src/include/dns-server/cmdline.rb:741 +#: src/include/dns-server/cmdline.rb:741 msgid "Logging Rule" msgstr "Logging Rule" #. TRANSLATORS: commandline section header, -#. TRANSLATORS: commandline section header, -#: src/clients/dns-server.rb:406 src/include/dns-server/cmdline.rb:835 +#: src/include/dns-server/cmdline.rb:835 msgid "DNS Zones:" msgstr "DNS Zones:" #. TRANSLATORS: commandline table header item #. TRANSLATORS: commandline table header item -#. TRANSLATORS: commandline table header item -#. TRANSLATORS: commandline table header item #. Textentry - DNS adding zone - Name -#: src/clients/dns-server.rb:411 src/clients/dns-server.rb:515 #: src/include/dns-server/cmdline.rb:840 src/include/dns-server/cmdline.rb:940 -#: src/include/dns-server/dialog-main.rb:2047 +#: src/include/dns-server/dialog-main.rb:1859 msgid "Name" msgstr "Name" #. TRANSLATORS: commandline table header item #. TRANSLATORS: commandline table header item -#. TRANSLATORS: commandline table header item -#. TRANSLATORS: commandline table header item #. Combobox - DNS adding zone - Type #. Table header item - DNS listing zones #. Table menu item - Records listing -#: src/clients/dns-server.rb:413 src/clients/dns-server.rb:517 #: src/include/dns-server/cmdline.rb:842 src/include/dns-server/cmdline.rb:942 -#: src/include/dns-server/dialog-main.rb:2053 -#: src/include/dns-server/dialog-main.rb:2095 +#: src/include/dns-server/dialog-main.rb:1865 +#: src/include/dns-server/dialog-main.rb:1907 #: src/include/dns-server/dialog-masterzone.rb:1417 msgid "Type" msgstr "Type" #. TRANSLATORS: commandline table header item -#. TRANSLATORS: commandline table header item -#: src/clients/dns-server.rb:415 src/include/dns-server/cmdline.rb:844 +#: src/include/dns-server/cmdline.rb:844 msgid "Master Server" msgstr "Master Server" #. TRANSLATORS: commandline table header item -#. TRANSLATORS: commandline table header item #. Dialog Label - DNS - expert settings #. Tree Menu Item - DNS - expert settings -#: src/clients/dns-server.rb:417 src/include/dns-server/cmdline.rb:846 -#: src/include/dns-server/dialog-main.rb:490 -#: src/include/dns-server/dialog-main.rb:493 +#: src/include/dns-server/cmdline.rb:846 +#: src/include/dns-server/dialog-main.rb:443 +#: src/include/dns-server/dialog-main.rb:446 msgid "Forwarders" msgstr "Forwarders" #. TRANSLATORS: table item - ACL type -#. TRANSLATORS: table item - ACL type -#: src/clients/dns-server.rb:500 src/include/dns-server/cmdline.rb:925 +#: src/include/dns-server/cmdline.rb:925 msgid "Predefined" msgstr "Predefined" #. TRANSLATORS: table item - ACL type -#. TRANSLATORS: table item - ACL type -#: src/clients/dns-server.rb:502 src/include/dns-server/cmdline.rb:927 +#: src/include/dns-server/cmdline.rb:927 msgid "Custom" msgstr "Custom" #. TRANSLATORS: commandline section header -#. TRANSLATORS: commandline section header -#: src/clients/dns-server.rb:510 src/include/dns-server/cmdline.rb:935 +#: src/include/dns-server/cmdline.rb:935 msgid "ACLs:" msgstr "ACLs:" #. TRANSLATORS: commandline section header -#. TRANSLATORS: commandline section header -#: src/clients/dns-server.rb:550 src/include/dns-server/cmdline.rb:975 +#: src/include/dns-server/cmdline.rb:975 msgid "Zone Transport:" msgstr "Zone Transport:" @@ -280,390 +456,92 @@ #. TRANSLATORS: commandline table header item #. TRANSLATORS: commandline table header item #. TRANSLATORS: commandline table header item -#. TRANSLATORS: commandline table header item -#. TRANSLATORS: commandline table header item -#. TRANSLATORS: commandline table header item -#. TRANSLATORS: commandline table header item -#. TRANSLATORS: commandline table header item #. Table header item - DNS listing zones -#: src/clients/dns-server.rb:555 src/clients/dns-server.rb:607 -#: src/clients/dns-server.rb:665 src/clients/dns-server.rb:797 -#: src/clients/dns-server.rb:862 src/include/dns-server/cmdline.rb:980 +#: src/include/dns-server/cmdline.rb:980 #: src/include/dns-server/cmdline.rb:1032 #: src/include/dns-server/cmdline.rb:1089 #: src/include/dns-server/cmdline.rb:1220 #: src/include/dns-server/cmdline.rb:1284 -#: src/include/dns-server/dialog-main.rb:2093 +#: src/include/dns-server/dialog-main.rb:1905 msgid "Zone" msgstr "Zone" #. TRANSLATORS: commandline table header item -#. TRANSLATORS: commandline table header item -#: src/clients/dns-server.rb:557 src/include/dns-server/cmdline.rb:982 +#: src/include/dns-server/cmdline.rb:982 msgid "Enabled ACL" msgstr "Enabled ACL" #. TRANSLATORS: commandline section header -#. TRANSLATORS: commandline section header -#: src/clients/dns-server.rb:602 src/include/dns-server/cmdline.rb:1027 +#: src/include/dns-server/cmdline.rb:1027 msgid "Name Servers:" msgstr "Name Servers:" #. TRANSLATORS: commandline table header item -#. TRANSLATORS: commandline table header item -#: src/clients/dns-server.rb:609 src/include/dns-server/cmdline.rb:1034 +#: src/include/dns-server/cmdline.rb:1034 msgid "Name Server" msgstr "Name Server" #. TRANSLATORS: commandline section header #. TRANSLATORS: commandline section header -#. TRANSLATORS: commandline section header -#. TRANSLATORS: commandline section header -#: src/clients/dns-server.rb:660 src/clients/dns-server.rb:792 #: src/include/dns-server/cmdline.rb:1084 #: src/include/dns-server/cmdline.rb:1215 msgid "Mail Servers:" msgstr "Mail Servers:" #. TRANSLATORS: commandline table header item -#. TRANSLATORS: commandline table header item #. Table header item - listing mail servers -#: src/clients/dns-server.rb:667 src/include/dns-server/cmdline.rb:1091 +#: src/include/dns-server/cmdline.rb:1091 #: src/include/dns-server/dialog-masterzone.rb:739 msgid "Mail Server" msgstr "Mail Server" #. TRANSLATORS: commandline table header item -#. TRANSLATORS: commandline table header item #. Table header item - listing mail servers -#: src/clients/dns-server.rb:669 src/include/dns-server/cmdline.rb:1093 +#: src/include/dns-server/cmdline.rb:1093 #: src/include/dns-server/dialog-masterzone.rb:741 msgid "Priority" msgstr "Priority" #. TRANSLATORS: commandline section header -#. TRANSLATORS: commandline section header -#: src/clients/dns-server.rb:727 src/include/dns-server/cmdline.rb:1150 +#: src/include/dns-server/cmdline.rb:1150 msgid "Start of Authority (SOA):" msgstr "Start of Authority (SOA):" #. TRANSLATORS: commandline table header item -#. TRANSLATORS: commandline table header item -#: src/clients/dns-server.rb:732 src/include/dns-server/cmdline.rb:1155 +#: src/include/dns-server/cmdline.rb:1155 msgid "Key" msgstr "Key" #. TRANSLATORS: commandline table header item -#. TRANSLATORS: commandline table header item -#: src/clients/dns-server.rb:799 src/include/dns-server/cmdline.rb:1222 +#: src/include/dns-server/cmdline.rb:1222 msgid "Record Query" msgstr "Record Query" #. TRANSLATORS: commandline table header item -#. TRANSLATORS: commandline table header item -#: src/clients/dns-server.rb:801 src/include/dns-server/cmdline.rb:1224 +#: src/include/dns-server/cmdline.rb:1224 msgid "Record Type" msgstr "Record Type" #. TRANSLATORS: commandline table header item -#. TRANSLATORS: commandline table header item -#: src/clients/dns-server.rb:803 src/include/dns-server/cmdline.rb:1226 +#: src/include/dns-server/cmdline.rb:1226 msgid "Record Value" msgstr "Record Value" #. TRANSLATORS: commandline section header -#. TRANSLATORS: commandline section header -#: src/clients/dns-server.rb:857 src/include/dns-server/cmdline.rb:1279 +#: src/include/dns-server/cmdline.rb:1279 msgid "Hostname Record:" msgstr "Hostname Record:" #. TRANSLATORS: commandline table header item -#. TRANSLATORS: commandline table header item -#: src/clients/dns-server.rb:864 src/include/dns-server/cmdline.rb:1286 +#: src/include/dns-server/cmdline.rb:1286 msgid "Hostname" msgstr "Hostname" #. TRANSLATORS: commandline table header item -#. TRANSLATORS: commandline table header item -#: src/clients/dns-server.rb:866 src/include/dns-server/cmdline.rb:1288 +#: src/include/dns-server/cmdline.rb:1288 msgid "IP" msgstr "IP" -#. TRANSLATORS: commandline general name of the module in help -#. TRANSLATORS: commandline general name of the module in help -#: src/clients/dns-server.rb:904 src/include/dns-server/cmdline.rb:24 -msgid "DNS server configuration" -msgstr "DNS server configuration" - -#: src/clients/dns-server.rb:912 src/include/dns-server/cmdline.rb:32 -msgid "Start-up settings" -msgstr "Start-up settings" - -#. TRANSLATORS: commandline short help for command -#. TRANSLATORS: commandline short help for command -#: src/clients/dns-server.rb:921 src/include/dns-server/cmdline.rb:38 -msgid "DNS forwarders" -msgstr "DNS forwarders" - -#. TRANSLATORS: commandline short help for command -#. TRANSLATORS: commandline short help for command -#: src/clients/dns-server.rb:933 src/include/dns-server/cmdline.rb:50 -msgid "Logging settings" -msgstr "Logging settings" - -#. TRANSLATORS: commandline short help for command -#. TRANSLATORS: commandline short help for command -#: src/clients/dns-server.rb:946 src/include/dns-server/cmdline.rb:63 -msgid "DNS zones" -msgstr "DNS zones" - -#. TRANSLATORS: commandline short help for command -#. TRANSLATORS: commandline short help for command -#: src/clients/dns-server.rb:962 src/include/dns-server/cmdline.rb:79 -msgid "Access control lists" -msgstr "Access control lists" - -#. TRANSLATORS: commandline short help for command -#. TRANSLATORS: commandline short help for command -#: src/clients/dns-server.rb:973 src/include/dns-server/cmdline.rb:87 -msgid "Zone transport rules" -msgstr "Zone transport rules" - -#. TRANSLATORS: commandline short help for command, base cmdline command -#. TRANSLATORS: commandline short help for command, base cmdline command -#: src/clients/dns-server.rb:988 src/include/dns-server/cmdline.rb:102 -msgid "Zone name servers" -msgstr "Zone name servers" - -#. TRANSLATORS: commandline short help for command, base cmdline command -#. TRANSLATORS: commandline short help for command, base cmdline command -#: src/clients/dns-server.rb:1005 src/include/dns-server/cmdline.rb:119 -msgid "Zone mail servers" -msgstr "Zone mail servers" - -#. TRANSLATORS: commandline short help for command, base cmdline command -#. TRANSLATORS: commandline short help for command, base cmdline command -#: src/clients/dns-server.rb:1019 src/include/dns-server/cmdline.rb:133 -msgid "Start of authority (SOA)" -msgstr "Start of authority (SOA)" - -#. TRANSLATORS: commandline short help for command, base cmdline command -#. TRANSLATORS: commandline short help for command, base cmdline command -#: src/clients/dns-server.rb:1034 src/include/dns-server/cmdline.rb:148 -msgid "Zone resource records, such as A, CNAME, NS, MX, or PTR" -msgstr "Zone resource records, such as A, CNAME, NS, MX, or PTR" - -#. TRANSLATORS: commandline short help for command, base cmdline command, A is record type -#. TRANSLATORS: commandline short help for command, base cmdline command, A is record type -#: src/clients/dns-server.rb:1052 src/include/dns-server/cmdline.rb:166 -msgid "Handles A and corresponding PTR record at once" -msgstr "Handles A and corresponding PTR record at once" - -#. TRANSLATORS: commandline short help for command -#. TRANSLATORS: commandline short help for command -#: src/clients/dns-server.rb:1066 src/include/dns-server/cmdline.rb:180 -msgid "Show current settings" -msgstr "Show current settings" - -#. TRANSLATORS: commandline short help for command -#. TRANSLATORS: commandline short help for command -#: src/clients/dns-server.rb:1072 src/include/dns-server/cmdline.rb:186 -msgid "Start DNS server in the boot process" -msgstr "Start DNS server in the boot process" - -#. TRANSLATORS: commandline short help for command -#. TRANSLATORS: commandline short help for command -#: src/clients/dns-server.rb:1078 src/include/dns-server/cmdline.rb:192 -msgid "Start DNS server manually" -msgstr "Start DNS server manually" - -#. TRANSLATORS: commandline short help for command -#. TRANSLATORS: commandline short help for command -#: src/clients/dns-server.rb:1084 src/include/dns-server/cmdline.rb:198 -msgid "Add a new record" -msgstr "Add a new record" - -#. TRANSLATORS: commandline short help for command -#. TRANSLATORS: commandline short help for command -#: src/clients/dns-server.rb:1090 src/include/dns-server/cmdline.rb:204 -msgid "Remove a record" -msgstr "Remove a record" - -#. TRANSLATORS: commandline short help for command -#. TRANSLATORS: commandline short help for command -#: src/clients/dns-server.rb:1097 src/include/dns-server/cmdline.rb:211 -msgid "IPv4 address" -msgstr "IPv4 address" - -#. TRANSLATORS: commandline short help for command -#. TRANSLATORS: commandline short help for command -#: src/clients/dns-server.rb:1104 src/include/dns-server/cmdline.rb:218 -msgid "Logging destination (syslog|file)" -msgstr "Logging destination (syslog|file)" - -#. TRANSLATORS: commandline short help for command -#. TRANSLATORS: commandline short help for command -#: src/clients/dns-server.rb:1110 src/include/dns-server/cmdline.rb:224 -msgid "Set option" -msgstr "Set option" - -#. TRANSLATORS: commandline short help for command -#. TRANSLATORS: commandline short help for command -#: src/clients/dns-server.rb:1117 src/include/dns-server/cmdline.rb:231 -msgid "Filename for logging (full path)" -msgstr "Filename for logging (full path)" - -#. TRANSLATORS: commandline short help for command -#. TRANSLATORS: commandline short help for command -#: src/clients/dns-server.rb:1124 src/include/dns-server/cmdline.rb:238 -msgid "Maximum log size [0-9]+(KMG)*" -msgstr "Maximum log size [0-9]+(KMG)*" - -#. TRANSLATORS: commandline short help for command -#. TRANSLATORS: commandline short help for command -#: src/clients/dns-server.rb:1131 src/include/dns-server/cmdline.rb:245 -msgid "Maximum number of versions for rotation, '0' means no rotation" -msgstr "Maximum number of versions for rotation, '0' means no rotation" - -#. TRANSLATORS: commandline short help for command -#. TRANSLATORS: commandline short help for command -#. TRANSLATORS: commandline short help for command -#. TRANSLATORS: commandline short help for command -#: src/clients/dns-server.rb:1138 src/clients/dns-server.rb:1159 -#: src/include/dns-server/cmdline.rb:252 src/include/dns-server/cmdline.rb:273 -msgid "Zone name" -msgstr "Zone name" - -#. TRANSLATORS: commandline short help for command -#. TRANSLATORS: commandline short help for command -#: src/clients/dns-server.rb:1145 src/include/dns-server/cmdline.rb:259 -msgid "Zone type, master or slave" -msgstr "Zone type, master or slave" - -#. TRANSLATORS: commandline short help for command -#. TRANSLATORS: commandline short help for command -#: src/clients/dns-server.rb:1152 src/include/dns-server/cmdline.rb:266 -msgid "DNS zone master server" -msgstr "DNS zone master server" - -#. TRANSLATORS: commandline short help for command -#. TRANSLATORS: commandline short help for command -#: src/clients/dns-server.rb:1166 src/include/dns-server/cmdline.rb:280 -msgid "Enable option" -msgstr "Enable option" - -#. TRANSLATORS: commandline short help for command -#. TRANSLATORS: commandline short help for command -#: src/clients/dns-server.rb:1173 src/include/dns-server/cmdline.rb:287 -msgid "Disable option" -msgstr "Disable option" - -#. TRANSLATORS: commandline short help for command -#. TRANSLATORS: commandline short help for command -#: src/clients/dns-server.rb:1180 src/include/dns-server/cmdline.rb:294 -msgid "Name server (in fully qualified format finished with a dot or relative name)" -msgstr "Name server (in fully qualified format finished with a dot or relative name)" - -#. TRANSLATORS: commandline short help for command -#. TRANSLATORS: commandline short help for command -#: src/clients/dns-server.rb:1187 src/include/dns-server/cmdline.rb:301 -msgid "Mail server (in fully qualified format finished with a dot or relative name)" -msgstr "Mail server (in fully qualified format finished with a dot or relative name)" - -#. TRANSLATORS: commandline short help for command -#. TRANSLATORS: commandline short help for command -#: src/clients/dns-server.rb:1194 src/include/dns-server/cmdline.rb:308 -msgid "Mail server priority (number from 0 to 65535)" -msgstr "Mail server priority (number from 0 to 65535)" - -#. TRANSLATORS: commandline short help for command -#. TRANSLATORS: commandline short help for command -#: src/clients/dns-server.rb:1201 src/include/dns-server/cmdline.rb:315 -msgid "Serial number of zone update" -msgstr "Serial number of zone update" - -#. TRANSLATORS: commandline short help for command -#. TRANSLATORS: commandline short help for command -#: src/clients/dns-server.rb:1208 src/include/dns-server/cmdline.rb:322 -msgid "General time to live of records in zone" -msgstr "General time to live of records in zone" - -#. TRANSLATORS: commandline short help for command -#. TRANSLATORS: commandline short help for command -#: src/clients/dns-server.rb:1215 src/include/dns-server/cmdline.rb:329 -msgid "An interval before the zone records should be refreshed" -msgstr "An interval before the zone records should be refreshed" - -#. TRANSLATORS: commandline short help for command -#. TRANSLATORS: commandline short help for command -#: src/clients/dns-server.rb:1222 src/include/dns-server/cmdline.rb:336 -#, fuzzy -#| msgid "An interval between retries of failed refresh" -msgid "Interval between retries of failed refresh" -msgstr "An interval between retries of failed refresh" - -#. TRANSLATORS: commandline short help for command -#. TRANSLATORS: commandline short help for command -#: src/clients/dns-server.rb:1229 src/include/dns-server/cmdline.rb:343 -#, fuzzy -#| msgid "An interval after which zone records are no longer authoritative" -msgid "Interval after which zone records are no longer authoritative" -msgstr "An interval after which zone records are no longer authoritative" - -#. TRANSLATORS: commandline short help for command, TTL is DNS-Specific (Time to Live), shouldn't be translated -#. TRANSLATORS: commandline short help for command, TTL is DNS-Specific (Time to Live), shouldn't be translated -#: src/clients/dns-server.rb:1236 src/include/dns-server/cmdline.rb:350 -msgid "Minimum TTL that should be exported with records in this zone" -msgstr "Minimum TTL that should be exported with records in this zone" - -#. TRANSLATORS: commandline short help for command, Types are DNS-Specific, cannot be translated -#. TRANSLATORS: commandline short help for command, Types are DNS-Specific, cannot be translated -#: src/clients/dns-server.rb:1243 src/include/dns-server/cmdline.rb:357 -msgid "DNS resource record type, such as A, CNAME, NS, MX, or PTR" -msgstr "DNS resource record type, such as A, CNAME, NS, MX, or PTR" - -#. TRANSLATORS: commandline short help for command, DNS query is a question for value when we have a /key/ and type, ('A' record for 'example.org'? -> 192.0.34.166) -#. TRANSLATORS: commandline short help for command, DNS query is a question for value when we have a /key/ and type, ('A' record for 'example.org'? -> 192.0.34.166) -#: src/clients/dns-server.rb:1250 src/include/dns-server/cmdline.rb:364 -msgid "DNS query, such as example.org for A record" -msgstr "DNS query, such as example.org for A record" - -#. TRANSLATORS: commandline short help for command -#. TRANSLATORS: commandline short help for command -#: src/clients/dns-server.rb:1257 src/include/dns-server/cmdline.rb:371 -msgid "DNS resource record value, such as 192.0.34.166 for example.org's A record" -msgstr "DNS resource record value, such as 192.0.34.166 for example.org's A record" - -#. TRANSLATORS: commandline short help for command -#. TRANSLATORS: commandline short help for command -#: src/clients/dns-server.rb:1264 src/include/dns-server/cmdline.rb:378 -msgid "Hostname for the DNS record" -msgstr "Hostname for the DNS record" - -#. TRANSLATORS: commandline short help for command, %1 are possible untranlatable parameters "(yes|no)" -#. TRANSLATORS: commandline short help for command, %1 are possible untranlatable parameters "(yes|no)" -#: src/clients/dns-server.rb:1272 src/include/dns-server/cmdline.rb:386 -msgid "Log named queries %1" -msgstr "Log named queries %1" - -#. TRANSLATORS: commandline short help for command, %1 are possible untranlatable parameters "(yes|no)" -#. TRANSLATORS: commandline short help for command, %1 are possible untranlatable parameters "(yes|no)" -#: src/clients/dns-server.rb:1280 src/include/dns-server/cmdline.rb:394 -msgid "Log zone updates %1" -msgstr "Log zone updates %1" - -#. TRANSLATORS: commandline short help for command, %1 are possible untranlatable parameters "(yes|no)" -#. TRANSLATORS: commandline short help for command, %1 are possible untranlatable parameters "(yes|no)" -#: src/clients/dns-server.rb:1288 src/include/dns-server/cmdline.rb:402 -msgid "Log zone transfers %1" -msgstr "Log zone transfers %1" - -#. TRANSLATORS: commandline short help for command -#. TRANSLATORS: commandline short help for command -#: src/clients/dns-server.rb:1295 src/include/dns-server/cmdline.rb:409 -msgid "Comma-separated list of zone forwarders" -msgstr "Comma-separated list of zone forwarders" - #. Dialog caption (before a colon) #. Dialog caption (before a colon) #. Dialog caption (before a colon) @@ -682,8 +560,8 @@ #. Dialog Label - DNS - expert settings #. Tree Menu Item - DNS - expert settings #: src/include/dns-server/dialog-installwizard.rb:79 -#: src/include/dns-server/dialog-main.rb:560 -#: src/include/dns-server/dialog-main.rb:563 +#: src/include/dns-server/dialog-main.rb:517 +#: src/include/dns-server/dialog-main.rb:520 msgid "DNS Zones" msgstr "DNS Zones" @@ -704,10 +582,8 @@ #. check box #. TRANSLATORS: checkbox label, turning LDAP support on or off -#. check box #: src/include/dns-server/dialog-installwizard.rb:175 -#: src/include/dns-server/dialog-main.rb:338 -#: src/include/dns-server/dialog-main.rb:597 +#: src/include/dns-server/dialog-main.rb:291 msgid "&LDAP Support Active" msgstr "&LDAP Support Active" @@ -732,99 +608,34 @@ msgstr "DNS Server &Expert Configuration..." #. Dialog label DNS - expert settings -#: src/include/dns-server/dialog-main.rb:256 +#: src/include/dns-server/dialog-main.rb:261 msgid "DNS Server" msgstr "DNS Server" -#. radio button (starting DNS service - option 1) -#: src/include/dns-server/dialog-main.rb:270 -msgid "When &Booting" -msgstr "When &Booting" +#. FIXME: new startup +#: src/include/dns-server/dialog-main.rb:419 +#, fuzzy +#| msgid "Apply Changes to Dialog" +msgid "Apply Changes" +msgstr "Apply Changes to Dialogue" -#. radio button (starting DNS service - option 2) -#: src/include/dns-server/dialog-main.rb:274 -msgid "&Manually" -msgstr "&Manually" - -#. part of help text, used to describe radiobuttons (matching starting DNS service but without "&") -#: src/include/dns-server/dialog-main.rb:280 -msgid "When Booting" -msgstr "When Booting" - -#. part of help text, used to describe radiobuttons (matching starting DNS service but without "&") -#: src/include/dns-server/dialog-main.rb:282 -msgid "Manually" -msgstr "Manually" - -#. label - service status, informative text -#. service status - label -#. service sttus - label -#: src/include/dns-server/dialog-main.rb:290 -#: src/include/dns-server/dialog-main.rb:612 -#: src/include/dns-server/dialog-main.rb:651 -msgid "DNS server is running." -msgstr "DNS server is running." - -#. label - service status, informative text -#. service sttus - label -#: src/include/dns-server/dialog-main.rb:294 -#: src/include/dns-server/dialog-main.rb:653 -msgid "DNS server is not running." -msgstr "DNS server is not running." - -#. push button (DNS service handling) -#. Pushbutton for starting the DNS server -#: src/include/dns-server/dialog-main.rb:298 -#: src/include/dns-server/dialog-main.rb:620 -msgid "&Start DNS Server Now" -msgstr "&Start DNS Server Now" - -#. push button (DNS service handling) -#. Pushbutton for stopping the DNS server -#: src/include/dns-server/dialog-main.rb:302 -#: src/include/dns-server/dialog-main.rb:626 -msgid "S&top DNS Server Now" -msgstr "S&top DNS Server Now" - -#. push button (DNS service handling) -#: src/include/dns-server/dialog-main.rb:310 -msgid "Save Settings and Reload DNS Server &Now" -msgstr "Save Settings and Reload DNS Server &Now" - -#. part of help text, used to describe pusbuttons (matching DNS service handling but without "&") -#: src/include/dns-server/dialog-main.rb:316 -msgid "Start DNS Server Now" -msgstr "Start DNS Server Now" - -#. part of help text, used to describe pusbuttons (matching DNS service handling but without "&") -#: src/include/dns-server/dialog-main.rb:318 -msgid "Stop DNS Server Now" -msgstr "Stop DNS Server Now" - -#. part of help text, used to describe pusbuttons (matching DNS service handling but without "&") -#: src/include/dns-server/dialog-main.rb:320 -msgid "Save Settings and Reload DNS Server Now" -msgstr "Save Settings and Reload DNS Server Now" - #. Dialog Label - DNS - expert settings #. Tree Menu Item - DNS - expert settings -#. Frame label (DNS starting) -#: src/include/dns-server/dialog-main.rb:472 -#: src/include/dns-server/dialog-main.rb:475 -#: src/include/dns-server/dialog-main.rb:580 +#: src/include/dns-server/dialog-main.rb:425 +#: src/include/dns-server/dialog-main.rb:428 msgid "Start-Up" msgstr "Start-Up" #. Dialog Label - DNS - expert settings #. Tree Menu Item - DNS - expert settings -#: src/include/dns-server/dialog-main.rb:503 -#: src/include/dns-server/dialog-main.rb:506 +#: src/include/dns-server/dialog-main.rb:456 +#: src/include/dns-server/dialog-main.rb:459 msgid "Basic Options" msgstr "Basic Options" #. Dialog Label - DNS - expert settings -#: src/include/dns-server/dialog-main.rb:516 -#: src/include/dns-server/dialog-main.rb:518 +#: src/include/dns-server/dialog-main.rb:469 +#: src/include/dns-server/dialog-main.rb:471 msgid "Logging" msgstr "Logging" @@ -832,8 +643,8 @@ #. Tree Menu Item - DNS - expert settings #. multi selection box #. multi selection box -#: src/include/dns-server/dialog-main.rb:529 -#: src/include/dns-server/dialog-main.rb:532 +#: src/include/dns-server/dialog-main.rb:482 +#: src/include/dns-server/dialog-main.rb:485 #: src/include/dns-server/dialog-masterzone.rb:163 #: src/include/dns-server/dialog-masterzone.rb:2729 msgid "ACLs" @@ -841,131 +652,99 @@ #. Dialog Label - DNS - expert settings #. Tree Menu Item - DNS - expert settings -#: src/include/dns-server/dialog-main.rb:546 -#: src/include/dns-server/dialog-main.rb:549 +#: src/include/dns-server/dialog-main.rb:499 +#: src/include/dns-server/dialog-main.rb:502 msgid "TSIG Keys" msgstr "TSIG Keys" -#. Radiobutton label -#: src/include/dns-server/dialog-main.rb:586 -msgid "Now and When Booting" -msgstr "Now and When Booting" - -#. Radiobutton label -#: src/include/dns-server/dialog-main.rb:588 -msgid "Only Manually" -msgstr "Only Manually" - -#. Frame label (stoping starting DNS server) -#: src/include/dns-server/dialog-main.rb:602 -msgid "Switch On and Off" -msgstr "Switch On and Off" - -#. Current status -#: src/include/dns-server/dialog-main.rb:608 -msgid "Current Status: " -msgstr "Current Status: " - -#. yes-no popup -#. if (! Popup::YesNo ( -#: src/include/dns-server/dialog-main.rb:719 -msgid "" -"All your changes will be lost. Settings will\n" -"be reread from new data storage.\n" -"Continue?\n" -msgstr "" -"All your changes will be lost. Settings will\n" -"be reread from new data storage.\n" -"Continue?\n" - #. T: ComboBox label -#: src/include/dns-server/dialog-main.rb:751 +#: src/include/dns-server/dialog-main.rb:563 msgid "Local DNS Resolution &Policy" msgstr "" #. T: ComboBox item -#: src/include/dns-server/dialog-main.rb:754 +#: src/include/dns-server/dialog-main.rb:566 msgid "Merging forwarders is disabled" msgstr "" #. T: ComboBox item -#: src/include/dns-server/dialog-main.rb:756 +#: src/include/dns-server/dialog-main.rb:568 msgid "Automatic merging" msgstr "" #. T: ComboBox item -#: src/include/dns-server/dialog-main.rb:758 +#: src/include/dns-server/dialog-main.rb:570 msgid "Merging forwarders is enabled" msgstr "" #. T: ComboBox item -#: src/include/dns-server/dialog-main.rb:760 +#: src/include/dns-server/dialog-main.rb:572 #, fuzzy #| msgid "DNS server configuration" msgid "Custom configuration" msgstr "DNS server configuration" -#: src/include/dns-server/dialog-main.rb:764 +#: src/include/dns-server/dialog-main.rb:576 #, fuzzy msgid "Custom policy" msgstr "Custom Repair" #. T: ComboBox label -#: src/include/dns-server/dialog-main.rb:771 +#: src/include/dns-server/dialog-main.rb:583 msgid "Local DNS Resolution &Forwarder" msgstr "" #. T: ComboBox item -#: src/include/dns-server/dialog-main.rb:774 +#: src/include/dns-server/dialog-main.rb:586 #, fuzzy #| msgid "Zone name servers" msgid "Using system name servers" msgstr "Zone name servers" #. T: ComboBox item -#: src/include/dns-server/dialog-main.rb:776 +#: src/include/dns-server/dialog-main.rb:588 #, fuzzy #| msgid "Zone name servers" msgid "This name server (bind)" msgstr "Zone name servers" #. T: ComboBox item -#: src/include/dns-server/dialog-main.rb:778 +#: src/include/dns-server/dialog-main.rb:590 msgid "Local dnsmasq server" msgstr "" #. Frame label for DNS-Forwarders adding IP -#: src/include/dns-server/dialog-main.rb:788 +#: src/include/dns-server/dialog-main.rb:600 msgid "Add IP Address" msgstr "Add IP Address" #. Textentry for DNS-Forwarders adding IP -#: src/include/dns-server/dialog-main.rb:797 +#: src/include/dns-server/dialog-main.rb:609 #, fuzzy msgid "IPv4 or IPv6 A&ddress" msgstr "IPv4 or IPv6 address" #. Selectionbox for listing current DNS-Forwarders #. Selectionbox for listing current DNS-Forwarders -#: src/include/dns-server/dialog-main.rb:826 -#: src/include/dns-server/dialog-main.rb:857 +#: src/include/dns-server/dialog-main.rb:638 +#: src/include/dns-server/dialog-main.rb:669 msgid "Forwarder &List" msgstr "Forwarder &List" #. Store settings of a tab of a dialog -#: src/include/dns-server/dialog-main.rb:1001 +#: src/include/dns-server/dialog-main.rb:813 msgid "Cannot set local forwarder to %{forwarder}" msgstr "" #. An error message, %1 is replaced with a variable IP -#: src/include/dns-server/dialog-main.rb:1065 +#: src/include/dns-server/dialog-main.rb:877 #, fuzzy #| msgid "Cannot create account for user %1." msgid "Cannot find local equivalent for IP %1." msgstr "Cannot create account for user %1." #. TRANSLATORS: A warning message, %1 is replaced with the input IP, %2 with the output IP -#: src/include/dns-server/dialog-main.rb:1071 +#: src/include/dns-server/dialog-main.rb:883 msgid "" "Forwarding DNS queries to itself would create an infinite loop.\n" "IP address %1 is currently used by this server, so it has\n" @@ -973,12 +752,12 @@ msgstr "" #. both IPv4 and IPv6 -#: src/include/dns-server/dialog-main.rb:1099 +#: src/include/dns-server/dialog-main.rb:911 #, fuzzy msgid "Invalid IPv4 or IPv6 address." msgstr "Invalid IP address." -#: src/include/dns-server/dialog-main.rb:1102 +#: src/include/dns-server/dialog-main.rb:914 #, fuzzy msgid "" "A valid IPv6 address consists of letters a-f, numbers,\n" @@ -988,46 +767,46 @@ "in the range 0-255 separated by dots." #. error report -#: src/include/dns-server/dialog-main.rb:1118 +#: src/include/dns-server/dialog-main.rb:930 msgid "The specified forwarder is already present." msgstr "The specified forwarder is already present." #. Frame label for Basic-Options -#: src/include/dns-server/dialog-main.rb:1147 +#: src/include/dns-server/dialog-main.rb:959 msgid "Add or Change Option" msgstr "Add or Change Option" #. Combobox for choosing the basic-option -#: src/include/dns-server/dialog-main.rb:1161 +#: src/include/dns-server/dialog-main.rb:973 msgid "O&ption" msgstr "O&ption" #. Textentry for setting the basic-option value #. Textentry - adding ACL-optiopn - value -#: src/include/dns-server/dialog-main.rb:1171 -#: src/include/dns-server/dialog-main.rb:1776 +#: src/include/dns-server/dialog-main.rb:983 +#: src/include/dns-server/dialog-main.rb:1588 msgid "&Value" msgstr "&Value" #. Pushbutton for changing the basic-option #. Pushbutton - Change Record -#: src/include/dns-server/dialog-main.rb:1195 +#: src/include/dns-server/dialog-main.rb:1007 #: src/include/dns-server/dialog-masterzone.rb:1387 msgid "C&hange" msgstr "C&hange" #. Table label for basic-options listing -#: src/include/dns-server/dialog-main.rb:1209 +#: src/include/dns-server/dialog-main.rb:1021 msgid "Current Options" msgstr "Current Options" #. Table header item - basic-options listing -#: src/include/dns-server/dialog-main.rb:1218 +#: src/include/dns-server/dialog-main.rb:1030 msgid "Option" msgstr "Option" #. TRANSLATORS: Popup question -#: src/include/dns-server/dialog-main.rb:1349 +#: src/include/dns-server/dialog-main.rb:1161 msgid "" "Really set this\n" "option without any value?\n" @@ -1036,7 +815,7 @@ "option without any value?\n" #. TRANSLATORS: Popup question. Please, do not translate 'yes' and 'no' strings. %1 is a name of the option, %2 is the value of the option. -#: src/include/dns-server/dialog-main.rb:1361 +#: src/include/dns-server/dialog-main.rb:1173 msgid "" "Option %1 can only have a yes or no value set.\n" "Really set it to %2?\n" @@ -1045,7 +824,7 @@ "Really set it to %2?\n" #. TRANSLATORS: Popup question. %1 is a name of the option, %2 is the value of the option. -#: src/include/dns-server/dialog-main.rb:1378 +#: src/include/dns-server/dialog-main.rb:1190 msgid "" "Option %1 can only be a number.\n" "Really set it to %2?\n" @@ -1054,7 +833,7 @@ "Really set it to %2?\n" #. TRANSLATORS: Popup question. %1 is the value of the option. -#: src/include/dns-server/dialog-main.rb:1390 +#: src/include/dns-server/dialog-main.rb:1202 msgid "" "Quotes are not used correctly in this option.\n" "Really set it to %1?\n" @@ -1063,7 +842,7 @@ "Really set it to %1?\n" #. TRANSLATORS: Popup question. %1 is the value of the option. -#: src/include/dns-server/dialog-main.rb:1402 +#: src/include/dns-server/dialog-main.rb:1214 msgid "" "Brackets are not used correctly in this option.\n" "Really set it to %1?\n" @@ -1072,7 +851,7 @@ "Really set it to %1?\n" #. Popup question, %1 is the name of the option -#: src/include/dns-server/dialog-main.rb:1446 +#: src/include/dns-server/dialog-main.rb:1258 msgid "" "Option %1 should be set only once.\n" "Really add another one?\n" @@ -1081,77 +860,77 @@ "Really add another one?\n" #. Table header - logging options -#: src/include/dns-server/dialog-main.rb:1486 +#: src/include/dns-server/dialog-main.rb:1298 msgid "Log Type" msgstr "Log Type" #. Radiobutton - log type -#: src/include/dns-server/dialog-main.rb:1498 +#: src/include/dns-server/dialog-main.rb:1310 msgid "&System Log" msgstr "&System Log" #. Radiobutton - log type -#: src/include/dns-server/dialog-main.rb:1507 +#: src/include/dns-server/dialog-main.rb:1319 msgid "&File" msgstr "&File" #. IntField - max. log size -#: src/include/dns-server/dialog-main.rb:1540 +#: src/include/dns-server/dialog-main.rb:1352 msgid "Maximum &Size (MB)" msgstr "Maximum &Size (MB)" #. IntField - max. log age -#: src/include/dns-server/dialog-main.rb:1551 +#: src/include/dns-server/dialog-main.rb:1363 msgid "Maximum &Versions" msgstr "Maximum &Versions" #. Frame label - additional-logging -#: src/include/dns-server/dialog-main.rb:1569 +#: src/include/dns-server/dialog-main.rb:1381 msgid "Additional Logging" msgstr "Additional Logging" #. Checkbox - additional-logging -#: src/include/dns-server/dialog-main.rb:1574 +#: src/include/dns-server/dialog-main.rb:1386 msgid "Log All DNS &Queries" msgstr "Log All DNS &Queries" #. Checkbox - additional-logging -#: src/include/dns-server/dialog-main.rb:1577 +#: src/include/dns-server/dialog-main.rb:1389 msgid "Log Zone &Updates" msgstr "Log Zone &Updates" #. Checkbox - additional-logging -#: src/include/dns-server/dialog-main.rb:1580 +#: src/include/dns-server/dialog-main.rb:1392 msgid "Log Zone &Transfers" msgstr "Log Zone &Transfers" #. popup headline -#: src/include/dns-server/dialog-main.rb:1737 +#: src/include/dns-server/dialog-main.rb:1549 msgid "Select File for Log" msgstr "Select File for Log" #. Frame label - adding ACL-optiopn -#: src/include/dns-server/dialog-main.rb:1754 +#: src/include/dns-server/dialog-main.rb:1566 msgid "Option Setup" msgstr "Option Setup" #. Textentry - adding ACL-optiopn - name -#: src/include/dns-server/dialog-main.rb:1767 +#: src/include/dns-server/dialog-main.rb:1579 msgid "&Name" msgstr "&Name" #. Table header - ACL-options listing -#: src/include/dns-server/dialog-main.rb:1803 +#: src/include/dns-server/dialog-main.rb:1615 msgid "Current ACL List" msgstr "Current ACL List" #. Table header item - ACL-options -#: src/include/dns-server/dialog-main.rb:1811 +#: src/include/dns-server/dialog-main.rb:1623 msgid "ACL" msgstr "ACL" #. A popup question, %1 is number of zones -#: src/include/dns-server/dialog-main.rb:1931 +#: src/include/dns-server/dialog-main.rb:1743 msgid "" "This ACL is used by %1 zones.\n" "Really remove it?\n" @@ -1160,12 +939,12 @@ "Really remove it?\n" #. An error popup message -#: src/include/dns-server/dialog-main.rb:2018 +#: src/include/dns-server/dialog-main.rb:1830 msgid "The specified ACL entry already exists." msgstr "The specified ACL entry already exists." #. frame label -#: src/include/dns-server/dialog-main.rb:2035 +#: src/include/dns-server/dialog-main.rb:1847 #, fuzzy msgid "Add New Zone " msgstr "A&dd New Zone " @@ -1175,8 +954,8 @@ #. TRANSLATORS: Table item - Server type #. #-#-#-#-# dns-server.xgettext.pot #-#-#-#-# #. type of zone to be used in summary -#: src/include/dns-server/dialog-main.rb:2056 -#: src/include/dns-server/dialog-main.rb:2146 src/modules/DnsServer.pm:1582 +#: src/include/dns-server/dialog-main.rb:1868 +#: src/include/dns-server/dialog-main.rb:1958 src/modules/DnsServer.pm:1658 msgid "Master" msgstr "Master" @@ -1186,9 +965,9 @@ #. TRANSLATORS: Table item - Server type #. #-#-#-#-# dns-server.xgettext.pot #-#-#-#-# #. type of zone to be used in summary -#: src/include/dns-server/dialog-main.rb:2058 -#: src/include/dns-server/dialog-main.rb:2149 -#: src/include/dns-server/dialog-main.rb:2152 src/modules/DnsServer.pm:1584 +#: src/include/dns-server/dialog-main.rb:1870 +#: src/include/dns-server/dialog-main.rb:1961 +#: src/include/dns-server/dialog-main.rb:1964 src/modules/DnsServer.pm:1660 msgid "Slave" msgstr "Slave" @@ -1197,23 +976,36 @@ #. TRANSLATORS: Table item - Server type #. #-#-#-#-# dns-server.xgettext.pot #-#-#-#-# #. type of zone to be used in summary -#: src/include/dns-server/dialog-main.rb:2060 -#: src/include/dns-server/dialog-main.rb:2155 src/modules/DnsServer.pm:1590 +#: src/include/dns-server/dialog-main.rb:1872 +#: src/include/dns-server/dialog-main.rb:1967 src/modules/DnsServer.pm:1666 msgid "Forward" msgstr "Forward" #. Table header - DNS listing zones -#: src/include/dns-server/dialog-main.rb:2083 +#: src/include/dns-server/dialog-main.rb:1895 msgid "Configured DNS Zones" msgstr "Configured DNS Zones" #. error report -#: src/include/dns-server/dialog-main.rb:2292 +#: src/include/dns-server/dialog-main.rb:2104 msgid "A zone with the specified name is already configured." msgstr "A zone with the specified name is already configured." +#. Write settings dialog +#. @return `abort if aborted and `next otherwise +#: src/include/dns-server/dialog-main.rb:2153 +msgid "Saving the configuration failed. Change the settings?" +msgstr "Saving the configuration failed. Change the settings?" + +#. Writes settings and restores the dialog without exiting +#: src/include/dns-server/dialog-main.rb:2169 +#, fuzzy +#| msgid "Save configuration files" +msgid "Saving the configuration failed" +msgstr "Save configuration files" + #. Yes-No popup -#: src/include/dns-server/dialog-main.rb:2347 +#: src/include/dns-server/dialog-main.rb:2182 msgid "" "All changes will be lost.\n" "Really leave the DNS server configuration without saving?" @@ -1705,13 +1497,8 @@ "All changes will be lost.\n" "Really exit?" -#. yes-no popup -#: src/include/dns-server/dialogs.rb:70 -msgid "Saving the configuration failed. Change the settings?" -msgstr "Saving the configuration failed. Change the settings?" - #. message popup -#: src/include/dns-server/dialogs.rb:96 +#: src/include/dns-server/dialogs.rb:81 msgid "A zone of this type cannot be edited with this tool." msgstr "A zone of this type cannot be edited with this tool." @@ -2784,56 +2571,56 @@ msgstr "&Mail Relay" #. DNS server read dialog caption -#: src/modules/DnsServer.pm:934 +#: src/modules/DnsServer.pm:960 msgid "Initializing DNS Server Configuration" msgstr "Initialising DNS Server Configuration" #. progress stage -#: src/modules/DnsServer.pm:938 +#: src/modules/DnsServer.pm:964 msgid "Check the environment" msgstr "Check the environment" #. progress stage -#: src/modules/DnsServer.pm:940 src/modules/DnsServer.pm:1275 +#: src/modules/DnsServer.pm:966 src/modules/DnsServer.pm:1337 msgid "Flush caches of the DNS daemon" msgstr "Flush caches of the DNS daemon" #. progress stage -#: src/modules/DnsServer.pm:942 +#: src/modules/DnsServer.pm:968 msgid "Read the firewall settings" msgstr "Read the firewall settings" #. progress stage -#: src/modules/DnsServer.pm:944 +#: src/modules/DnsServer.pm:970 msgid "Read the settings" msgstr "Read the settings" #. progress step -#: src/modules/DnsServer.pm:948 +#: src/modules/DnsServer.pm:974 msgid "Checking the environment..." msgstr "Checking the environment..." #. progress step -#: src/modules/DnsServer.pm:950 src/modules/DnsServer.pm:1291 +#: src/modules/DnsServer.pm:976 src/modules/DnsServer.pm:1353 msgid "Flushing caches of the DNS daemon..." msgstr "Flushing caches of the DNS daemon..." #. progress step -#: src/modules/DnsServer.pm:952 +#: src/modules/DnsServer.pm:978 msgid "Reading the firewall settings..." msgstr "Reading the firewall settings..." #. progress step -#: src/modules/DnsServer.pm:954 +#: src/modules/DnsServer.pm:980 msgid "Reading the settings..." msgstr "Reading the settings..." #. progress step -#: src/modules/DnsServer.pm:956 src/modules/DnsServer.pm:1305 +#: src/modules/DnsServer.pm:982 src/modules/DnsServer.pm:1367 msgid "Finished" msgstr "Finished" -#: src/modules/DnsServer.pm:1233 +#: src/modules/DnsServer.pm:1266 #, fuzzy msgid "" "Error occurred while calling netconfig.\n" @@ -2843,73 +2630,73 @@ "Error: " #. DNS server read dialog caption -#: src/modules/DnsServer.pm:1271 +#: src/modules/DnsServer.pm:1333 msgid "Saving DNS Server Configuration" msgstr "Saving DNS Server Configuration" #. progress stage -#: src/modules/DnsServer.pm:1277 +#: src/modules/DnsServer.pm:1339 msgid "Save configuration files" msgstr "Save configuration files" #. progress stage -#: src/modules/DnsServer.pm:1279 +#: src/modules/DnsServer.pm:1341 msgid "Restart the DNS daemon" msgstr "Restart the DNS daemon" #. progress stage -#: src/modules/DnsServer.pm:1281 +#: src/modules/DnsServer.pm:1343 msgid "Update zone files" msgstr "Update zone files" #. progress stage -#: src/modules/DnsServer.pm:1283 +#: src/modules/DnsServer.pm:1345 msgid "Adjust the DNS service" msgstr "Adjust the DNS service" #. progress stage -#: src/modules/DnsServer.pm:1285 +#: src/modules/DnsServer.pm:1347 msgid "Call netconfig" msgstr "" #. progress stage -#: src/modules/DnsServer.pm:1287 +#: src/modules/DnsServer.pm:1349 msgid "Write the firewall settings" msgstr "Write the firewall settings" #. progress step -#: src/modules/DnsServer.pm:1293 +#: src/modules/DnsServer.pm:1355 msgid "Saving configuration files..." msgstr "Saving configuration files..." #. progress step -#: src/modules/DnsServer.pm:1295 +#: src/modules/DnsServer.pm:1357 msgid "Restarting the DNS daemon..." msgstr "Restarting the DNS daemon..." #. progress step -#: src/modules/DnsServer.pm:1297 +#: src/modules/DnsServer.pm:1359 msgid "Updating zone files..." msgstr "Updating zone files..." #. progress step -#: src/modules/DnsServer.pm:1299 +#: src/modules/DnsServer.pm:1361 msgid "Adjusting the DNS service..." msgstr "Adjusting the DNS service..." #. progress step -#: src/modules/DnsServer.pm:1301 +#: src/modules/DnsServer.pm:1363 #, fuzzy msgid "Calling netconfig..." msgstr "Starting SuSEconfig..." #. progress step -#: src/modules/DnsServer.pm:1303 +#: src/modules/DnsServer.pm:1365 msgid "Writing the firewall settings..." msgstr "Writing the firewall settings..." #. Cannot start service 'named', because of error that follows Error:. Do not translate named. -#: src/modules/DnsServer.pm:1475 +#: src/modules/DnsServer.pm:1538 #, fuzzy #| msgid "" #| "Error occurred while starting service named.\n" @@ -2922,43 +2709,43 @@ "Error: " #. type of zone to be used in summary -#: src/modules/DnsServer.pm:1586 +#: src/modules/DnsServer.pm:1662 msgid "Stub" msgstr "Stub" #. type of zone to be used in summary -#: src/modules/DnsServer.pm:1588 +#: src/modules/DnsServer.pm:1664 msgid "Hint" msgstr "Hint" #. summary string -#: src/modules/DnsServer.pm:1597 +#: src/modules/DnsServer.pm:1673 msgid "The DNS server starts when booting the system." msgstr "The DNS server starts when booting the system." #. summary string -#: src/modules/DnsServer.pm:1603 +#: src/modules/DnsServer.pm:1679 msgid "The DNS server does not start when booting the system." msgstr "The DNS server does not start when booting the system." #. summary string, %s is list of DNS zones (their names), coma separated -#: src/modules/DnsServer.pm:1632 +#: src/modules/DnsServer.pm:1707 #, perl-format msgid "Configured Zones: %s" msgstr "Configured Zones: %s" #. error message -#: src/modules/DnsServer.pm:1646 +#: src/modules/DnsServer.pm:1721 msgid "Invalid LDAP configuration. Cannot use LDAP." msgstr "Invalid LDAP configuration. Cannot use LDAP." #. yes-no popup -#: src/modules/DnsServer.pm:1727 +#: src/modules/DnsServer.pm:1802 msgid "Enable LDAP support?" msgstr "Enable LDAP support?" #. error popup -#: src/modules/DnsServer.pm:1815 +#: src/modules/DnsServer.pm:1890 msgid "" "Installation of required packages failed.\n" "LDAP support will not be active." @@ -2967,32 +2754,89 @@ "LDAP support will not be active." #. BNC #679960 -#: src/modules/DnsServer.pm:1874 +#: src/modules/DnsServer.pm:1949 #, fuzzy #| msgid "LDAP initialization failed." msgid "Unknown LDAP initialization error." msgstr "LDAP initialisation failed." #. TRANSLATORS: Popup error message, %1 is an LDAP object whose creation failed -#: src/modules/DnsServer.pm:1910 +#: src/modules/DnsServer.pm:1985 msgid "Error occurred while creating %1." msgstr "Error occurred while creating %1." #. error report, %1 is ldap object -#: src/modules/DnsServer.pm:1946 +#: src/modules/DnsServer.pm:2021 msgid "Error occurred while creating cn=defaultDNS,%1. Not using LDAP." msgstr "Error occurred while creating cn=defaultDNS,%1. Not using LDAP." #. error report, %1 is LDAP record DN -#: src/modules/DnsServer.pm:1972 +#: src/modules/DnsServer.pm:2047 msgid "Error occurred while updating %1." msgstr "Error occurred while updating %1." #. error report, %1 is LDAP record DN -#: src/modules/DnsServer.pm:2007 +#: src/modules/DnsServer.pm:2082 msgid "Error occurred while creating %1. Not using LDAP." msgstr "Error occurred while creating %1. Not using LDAP." +#~ msgid "When &Booting" +#~ msgstr "When &Booting" + +#~ msgid "&Manually" +#~ msgstr "&Manually" + +#~ msgid "When Booting" +#~ msgstr "When Booting" + +#~ msgid "Manually" +#~ msgstr "Manually" + +#~ msgid "DNS server is running." +#~ msgstr "DNS server is running." + +#~ msgid "DNS server is not running." +#~ msgstr "DNS server is not running." + +#~ msgid "&Start DNS Server Now" +#~ msgstr "&Start DNS Server Now" + +#~ msgid "S&top DNS Server Now" +#~ msgstr "S&top DNS Server Now" + +#~ msgid "Save Settings and Reload DNS Server &Now" +#~ msgstr "Save Settings and Reload DNS Server &Now" + +#~ msgid "Start DNS Server Now" +#~ msgstr "Start DNS Server Now" + +#~ msgid "Stop DNS Server Now" +#~ msgstr "Stop DNS Server Now" + +#~ msgid "Save Settings and Reload DNS Server Now" +#~ msgstr "Save Settings and Reload DNS Server Now" + +#~ msgid "Now and When Booting" +#~ msgstr "Now and When Booting" + +#~ msgid "Only Manually" +#~ msgstr "Only Manually" + +#~ msgid "Switch On and Off" +#~ msgstr "Switch On and Off" + +#~ msgid "Current Status: " +#~ msgstr "Current Status: " + +#~ msgid "" +#~ "All your changes will be lost. Settings will\n" +#~ "be reread from new data storage.\n" +#~ "Continue?\n" +#~ msgstr "" +#~ "All your changes will be lost. Settings will\n" +#~ "be reread from new data storage.\n" +#~ "Continue?\n" + #~ msgid "&Start DNS Server" #~ msgstr "&Start DNS Server" Added: trunk/yast/en_GB/po/docker.en_GB.po =================================================================== --- trunk/yast/en_GB/po/docker.en_GB.po (rev 0) +++ trunk/yast/en_GB/po/docker.en_GB.po 2015-09-09 08:19:44 UTC (rev 92603) @@ -0,0 +1,190 @@ +# English message file for YaST2 (@memory@). +# Copyright (C) 2005 SUSE Linux Products GmbH. +# Copyright (C) 2002 SuSE Linux AG. +# Copyright (C) 2000, 2001 SuSE GmbH. +# James Ogley , 2000, 2001. +# +msgid "" +msgstr "" +"Project-Id-Version: YaST (@memory@)\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2015-08-25 18:36+0200\n" +"PO-Revision-Date: 2001-07-17 16:27+0200\n" +"Last-Translator: James Ogley \n" +"Language-Team: English \n" +"Language: en\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8-bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" + +#. Only root can start process +#: src/lib/ydocker/main_dialog.rb:74 +msgid "Docker service does not run. Should YaST start docker? Otherwise YaST quits." +msgstr "" + +#: src/lib/ydocker/main_dialog.rb:78 +msgid "Docker service does not run. Run this module as root or start docker service manually." +msgstr "" + +#: src/lib/ydocker/main_dialog.rb:141 +#, fuzzy +#| msgid "Communication with fingerprint reader failed." +msgid "Communication with docker failed with error: %s. Please try again." +msgstr "Communication with fingerprint reader failed." + +#: src/lib/ydocker/main_dialog.rb:152 +#, fuzzy +#| msgid "" +#| "Do you really want\n" +#| "to quit the installation?" +msgid "Do you really want to stop the running container?" +msgstr "" +"Do you really want\n" +"to quit the installation?" + +#: src/lib/ydocker/main_dialog.rb:154 src/lib/ydocker/main_dialog.rb:163 +#, fuzzy +#| msgid "Do you really want to remove the current volume group?" +msgid "Do you want to remove the container?" +msgstr "Do you really want to remove the current volume group?" + +#: src/lib/ydocker/main_dialog.rb:161 +#, fuzzy +#| msgid "" +#| "Do you really want\n" +#| "to quit the installation?" +msgid "Do you really want to kill the running container?" +msgstr "" +"Do you really want\n" +"to quit the installation?" + +#: src/lib/ydocker/main_dialog.rb:173 +#, fuzzy +#| msgid "Image" +msgid "&Images" +msgstr "Image" + +#: src/lib/ydocker/main_dialog.rb:174 +#, fuzzy +#| msgid " Container" +msgid "&Containers" +msgstr " Container" + +#: src/lib/ydocker/main_dialog.rb:184 +#, fuzzy +#| msgid "Disk Image" +msgid "Docker Images" +msgstr "Disk Image" + +#: src/lib/ydocker/main_dialog.rb:194 +#, fuzzy +#| msgid "Running Internet Connection Test" +msgid "Running Docker Containers" +msgstr "Running Internet Connection Test" + +#: src/lib/ydocker/main_dialog.rb:217 +msgid "Repository" +msgstr "Repository" + +#: src/lib/ydocker/main_dialog.rb:218 +#, fuzzy +#| msgid "Tab" +msgid "Tag" +msgstr "Tab" + +#: src/lib/ydocker/main_dialog.rb:219 +#, fuzzy +#| msgid "Image" +msgid "Image ID" +msgstr "Image" + +#: src/lib/ydocker/main_dialog.rb:220 src/lib/ydocker/main_dialog.rb:234 +#, fuzzy +#| msgid "Create" +msgid "Created" +msgstr "Create" + +#: src/lib/ydocker/main_dialog.rb:221 +#, fuzzy +#| msgid "Virtual Device" +msgid "Virtual Size" +msgstr "Virtual Device" + +#: src/lib/ydocker/main_dialog.rb:231 +#, fuzzy +#| msgid " Container" +msgid "Container ID" +msgstr " Container" + +#: src/lib/ydocker/main_dialog.rb:232 +msgid "Image" +msgstr "Image" + +#: src/lib/ydocker/main_dialog.rb:233 +msgid "Command" +msgstr "Command" + +#: src/lib/ydocker/main_dialog.rb:235 +msgid "Status" +msgstr "Status" + +#: src/lib/ydocker/main_dialog.rb:236 +#, fuzzy +#| msgid "Port" +msgid "Ports" +msgstr "Port" + +#: src/lib/ydocker/main_dialog.rb:283 src/lib/ydocker/main_dialog.rb:293 +msgid "Re&fresh" +msgstr "Re&fresh" + +#: src/lib/ydocker/main_dialog.rb:284 +msgid "R&un" +msgstr "" + +#: src/lib/ydocker/main_dialog.rb:285 +msgid "&Delete" +msgstr "&Delete" + +#: src/lib/ydocker/main_dialog.rb:294 +#, fuzzy +#| msgid "&Show Changes" +msgid "S&how Changes" +msgstr "&Show Changes" + +#: src/lib/ydocker/main_dialog.rb:295 +#, fuzzy +#| msgid "Terminals" +msgid "Inject &Terminal" +msgstr "Terminals" + +#: src/lib/ydocker/main_dialog.rb:296 +#, fuzzy +#| msgid " Container" +msgid "&Stop Container" +msgstr " Container" + +#: src/lib/ydocker/main_dialog.rb:297 +#, fuzzy +#| msgid " Container" +msgid "&Kill Container" +msgstr " Container" + +#: src/lib/ydocker/main_dialog.rb:298 +#, fuzzy +#| msgid "Comment" +msgid "&Commit" +msgstr "Comment" + +#: src/lib/ydocker/main_dialog.rb:304 +#, fuzzy +#| msgid "Exit" +msgid "&Exit" +msgstr "Exit" + +#: src/lib/ydocker/main_dialog.rb:315 +#, fuzzy +#| msgid "Do you really want to delete this user?" +msgid "Do you really want to delete image \"%s\"?" +msgstr "Do you really want to delete this user?" Modified: trunk/yast/en_GB/po/drbd.en_GB.po =================================================================== --- trunk/yast/en_GB/po/drbd.en_GB.po 2015-09-09 08:18:21 UTC (rev 92602) +++ trunk/yast/en_GB/po/drbd.en_GB.po 2015-09-09 08:19:44 UTC (rev 92603) @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-10-29 16:20+0100\n" +"POT-Creation-Date: 2015-08-25 18:36+0200\n" "PO-Revision-Date: 2001-07-17 16:27+0200\n" "Last-Translator: James Ogley \n" "Language-Team: English \n" @@ -73,11 +73,15 @@ msgstr "Source Configuration" #: src/include/drbd/common.rb:47 +msgid "LVM Configuration" +msgstr "LVM Configuration" + +#: src/include/drbd/common.rb:48 #, fuzzy msgid "Resource Basic Configuration" msgstr "Source Configuration" -#: src/include/drbd/common.rb:48 +#: src/include/drbd/common.rb:49 #, fuzzy msgid "Resource Advanced Configuration" msgstr "Source Configuration" @@ -257,7 +261,7 @@ "\n" "\t\t<p>\"Name\" is mandatory and must match the Linux host name (uname -n) of one of the nodes. Should not include \".\" in hostname.</p>\n" "\t\t<p>\"Address:Port\": A resource needs one IP address per device, which is used to wait for incoming connections from the partner device to reach the device. Each DRBD resource needs a TCP port which is used to connect to the node's partner device.</p>\n" -"\t\t<p>\"Device\": The name of the block device node of the resource being described. You must use this device with your application (file system) and you must not use the low level block device which is specified with the disk parameter,following its minor number. Or either omit the name or minor and the minor number. If you omit the name a default of /dev/drbdminor will be used.\n" +"\t\t<p>\"Device\": The name of the block device node of the resource being described. You must use this device with your application (file system) and you must not use the low level block device which is specified with the disk parameter,following its minor number. Otherwise, you may omit the name, or the word minor and its number. If you omit the name a default of /dev/drbd'minor number' will be used.\n" "\t\tLike: '/dev/drbd{service} minor {minor drbd number [0...255]}' or '/dev/drbd{minor drbd number [0...255]}'</p>\n" "\t\t<p>\"Disk\": DRBD uses this block device to actually store and retrieve the data. Never access such a device while DRBD is running on top of it.</p>\n" "\t\t<p>\"Meta-disk\": internal. Internal means that the last part of the backing device is used to store the meta-data.</p>\n" @@ -292,14 +296,34 @@ #: src/include/drbd/helps.rb:112 #, fuzzy +#| msgid "<p><b><big>Connection Configuration</big></b></p>" +msgid "<p><b><big>LVM Configuration</big></b></p>" +msgstr "<p><b><big>Connection Configuration</big></b></p>" + +#: src/include/drbd/helps.rb:115 +msgid "" +"\n" +"\t\t<p><b>LVM configuration file /etc/lvm/lvm.conf</b></p>\n" +"\t\t<p>To use LVM with DRBD, it is necessary to change some options in the LVM configuration file and to remove stale cache entries on the nodes.</p>\t\t<p>Refer to 'man lvm.conf' for further information including the file layout.</p>\n" +"\t\t\t\t\t\t\t\t\t\t \n" +"\t\t<p><b>Device Filter</b>: This masks the underlying block device from the list of devices LVM scans for Physical Volume signatures. This way, LVM is instructed to read Physical Volume signatures from DRBD devices, rather than from the underlying backing block devices.</p>\t\t<p><b>AutoFilter</b>: According to the configuration of drbd, LVM filter will always be changed automatically. To change it manually, disable the checkbox of AutoFilter.</p>\n" +"\t\t<p>The filter consists of an array of regular expressions. These expressions can be delimited by a character of your choice, and prefixed with either an 'a' (for accept) or 'r' (for reject).</p>\t\t<p>For example, setting filter as [\"r|/dev/sda.*|\"]</p>\n" +"\n" +"\t\t<p><b>LVM cache</b>: Enable/turn on writing the LVM cache is default. Disable cache when for network storage, like nfs. </p>\n" +"\n" +"\t\t" +msgstr "" + +#: src/include/drbd/helps.rb:130 +#, fuzzy msgid "<p><b><big>Global Configuration of DRBD</big></b></p>" msgstr "<p><b><big>Connection Configuration</big></b></p>" -#: src/include/drbd/helps.rb:115 +#: src/include/drbd/helps.rb:133 msgid "<p>Check <b>\"Disable IP Verification\"</b> to disable one of drbdadm's sanity check</p>" msgstr "" -#: src/include/drbd/helps.rb:118 +#: src/include/drbd/helps.rb:136 msgid "" "<p><b>Dialog Refresh:</b> The user dialog counts and displays the seconds it waited so\n" " far. You might want to disable this if you have the console\n" @@ -309,7 +333,7 @@ " set it to 0 to disable redrawing completely. </p>" msgstr "" -#: src/include/drbd/helps.rb:126 +#: src/include/drbd/helps.rb:144 msgid "" "<p><b>Minor Count:</b>\n" " use this if you want to define more resources later\n" @@ -319,7 +343,7 @@ msgstr "" #. Summary dialog help 1/3 -#: src/include/drbd/helps.rb:134 +#: src/include/drbd/helps.rb:152 #, fuzzy msgid "" "<p><b><big>DRBD Configuration</big></b><br>\n" @@ -329,7 +353,7 @@ "Configure squid here.<br></p>\n" #. Summary dialog help 2/3 -#: src/include/drbd/helps.rb:138 +#: src/include/drbd/helps.rb:156 #, fuzzy #| msgid "" #| "<p><b><big>Adding a Kdump:</big></b><br>\n" @@ -348,7 +372,7 @@ "Then press <b>Configure</b>.</p>\n" #. Summary dialog help 3/3 -#: src/include/drbd/helps.rb:145 +#: src/include/drbd/helps.rb:163 msgid "" "<p><b><big>Editing or Deleting:</big></b><br>\n" "If you press <b>Edit</b>, an additional dialog in which to change\n" @@ -359,7 +383,7 @@ "the configuration opens.</p>\n" #. Ovreview dialog help 1/3 -#: src/include/drbd/helps.rb:151 +#: src/include/drbd/helps.rb:169 #, fuzzy msgid "" "<p><b><big>DRBD Configuration Overview</big></b><br>\n" @@ -371,7 +395,7 @@ "edit their configurations.<br></p>\n" #. Ovreview dialog help 2/3 -#: src/include/drbd/helps.rb:157 +#: src/include/drbd/helps.rb:175 #, fuzzy #| msgid "" #| "<p><b><big>Adding a Kdump:</big></b><br>\n" @@ -384,7 +408,7 @@ "Press <b>Add</b> to configure a kdump.</p>" #. Ovreview dialog help 3/3 -#: src/include/drbd/helps.rb:161 +#: src/include/drbd/helps.rb:179 #, fuzzy #| msgid "" #| "<p><b><big>Editing or Deleting:</big></b><br>\n" @@ -400,7 +424,7 @@ "Then press <b>Edit</b> or <b>Delete</b> as desired.</p>\n" #. Configure1 dialog help 1/2 -#: src/include/drbd/helps.rb:167 +#: src/include/drbd/helps.rb:185 msgid "" "<p><b><big>Configuration Part One</big></b><br>\n" "Press <b>Next</b> to continue.\n" @@ -412,7 +436,7 @@ #. Configure1 dialog help 2/2 #. Configure2 dialog help 2/2 -#: src/include/drbd/helps.rb:173 src/include/drbd/helps.rb:185 +#: src/include/drbd/helps.rb:191 src/include/drbd/helps.rb:203 msgid "" "<p><b><big>Selecting Something</big></b><br>\n" "It is not possible. You must code it first. :-)\n" @@ -423,7 +447,7 @@ "</p>" #. Configure2 dialog help 1/2 -#: src/include/drbd/helps.rb:179 +#: src/include/drbd/helps.rb:197 msgid "" "<p><b><big>Configuration Part Two</big></b><br>\n" "Press <b>Next</b> to continue.\n" @@ -433,28 +457,58 @@ "Press <b>Next</b> to continue.\n" "<br></p>\n" +#. Default is always true (auto) +#: src/include/drbd/lvm_conf.rb:36 +#, fuzzy +msgid "LVM Filter Configuration of DRBD" +msgstr "Global Configuration" + +#: src/include/drbd/lvm_conf.rb:44 +msgid "Modify LVM Device filter Automatically" +msgstr "" + +#: src/include/drbd/lvm_conf.rb:54 +#, fuzzy +#| msgid "Device type" +msgid "Device Filter" +msgstr "Device type" + +#: src/include/drbd/lvm_conf.rb:64 +#, fuzzy +#| msgid "Writing the SCPM database..." +msgid "Writing the LVM cache" +msgstr "Writing the SCPM database..." + +#: src/include/drbd/lvm_conf.rb:73 +#, fuzzy +#| msgid "Enable Microphone." +msgid "Enable LVM Cache" +msgstr "Enable Microphone." + #. encoding: utf-8 #: src/include/drbd/resource_conf.rb:134 #, fuzzy msgid "Resource Name" msgstr "Resource Sets" -#: src/include/drbd/resource_conf.rb:300 +#. Update new add disk used of drbd res for LVM filter +#. Ignore the removed disk +#: src/include/drbd/resource_conf.rb:326 msgid "Protocol" msgstr "Protocol" #. myHelp("basic_conf"); -#: src/include/drbd/resource_conf.rb:546 +#: src/include/drbd/resource_conf.rb:572 #, fuzzy #| msgid "Scheme name must be set." msgid "Node names must be different." msgstr "Scheme name must be set." -#: src/include/drbd/resource_conf.rb:552 +#: src/include/drbd/resource_conf.rb:578 msgid "Node names must not include \".\" , using the local hostname." msgstr "" -#: src/include/drbd/resource_conf.rb:582 +#: src/include/drbd/resource_conf.rb:608 msgid "Please fill out all fields." msgstr "" @@ -463,79 +517,80 @@ #. Authors: Martin Lazar #. #. $Id: startup_conf.ycp 30707 2006-05-04 13:19:08Z lslezak $ -#: src/include/drbd/startup_conf.rb:28 +#: src/include/drbd/startup_conf.rb:29 msgid "Booting" msgstr "Booting" -#: src/include/drbd/startup_conf.rb:36 +#: src/include/drbd/startup_conf.rb:37 #, fuzzy -msgid "On -- Start DRBD Server Now and when Booting" +msgid "On -- Start DRBD Server when Booting" msgstr "O&n -- Start DNS Server Now and when Booting" -#: src/include/drbd/startup_conf.rb:40 +#: src/include/drbd/startup_conf.rb:41 msgid "Off -- Server Only Starts Manually" msgstr "Off -- Server Only Starts Manually" -#: src/include/drbd/startup_conf.rb:49 +#: src/include/drbd/startup_conf.rb:50 msgid "Switch On and Off" msgstr "Switch On and Off" -#: src/include/drbd/startup_conf.rb:54 +#: src/include/drbd/startup_conf.rb:55 msgid "Current Status: " msgstr "Current Status: " -#: src/include/drbd/startup_conf.rb:61 +#: src/include/drbd/startup_conf.rb:62 #, fuzzy msgid "Start DRBD Server Now" msgstr "Start DNS Server Now" -#: src/include/drbd/startup_conf.rb:66 +#: src/include/drbd/startup_conf.rb:67 #, fuzzy msgid "Stop DRBD Server Now" msgstr "Stop DNS Server Now" -#: src/include/drbd/startup_conf.rb:74 +#. firewall_layout is just a dialog +#: src/include/drbd/startup_conf.rb:89 msgid "Propagate Configuration" msgstr "Propagate Configuration" -#: src/include/drbd/startup_conf.rb:81 +#: src/include/drbd/startup_conf.rb:96 msgid "" "To propagate this configuration ,\n" "copy the configuration file '/etc/drbd.conf' to the rest of nodes manually." msgstr "" #. } -#: src/include/drbd/startup_conf.rb:122 +#: src/include/drbd/startup_conf.rb:141 #, fuzzy msgid "DRBD server is running." msgstr "DNS server is running." -#: src/include/drbd/startup_conf.rb:123 +#: src/include/drbd/startup_conf.rb:142 #, fuzzy msgid "DRBD server is not running." msgstr "DNS server is not running." #. Report::Error ( Service::Error()); -#: src/include/drbd/startup_conf.rb:142 +#: src/include/drbd/startup_conf.rb:166 #, fuzzy #| msgid "Starting the 'lirc' service failed." msgid "Start DRBD service failed" msgstr "Starting the 'lirc' service failed." #. Report::Error ( Service::Error() ); -#: src/include/drbd/startup_conf.rb:150 +#: src/include/drbd/startup_conf.rb:174 #, fuzzy #| msgid "Stop services" msgid "Stop DRBD service failed" msgstr "Stop services" #. Initialization dialog caption -#: src/include/drbd/wizards.rb:137 +#: src/include/drbd/wizards.rb:139 msgid "Heartbeat Configuration" msgstr "Heartbeat Configuration" #. Initialization dialog contents -#: src/include/drbd/wizards.rb:139 +#: src/include/drbd/wizards.rb:141 msgid "Initializing..." msgstr "Initialising..." @@ -567,65 +622,83 @@ #. #. Representation of the configuration of drbd. #. Input and output routines. -#: src/modules/Drbd.rb:101 +#: src/modules/Drbd.rb:110 msgid "Failed to merge separated DRBD conf files\n" msgstr "" -#: src/modules/Drbd.rb:123 +#: src/modules/Drbd.rb:132 #, fuzzy #| msgid "Unable to write to idmapd.conf." msgid "Failed to write drbd.conf.YaST2prepare" msgstr "Unable to write to idmapd.conf." #. DRBD read dialog caption -#: src/modules/Drbd.rb:133 +#: src/modules/Drbd.rb:185 #, fuzzy msgid "Initializing DRBD Configuration" msgstr "Initialising DSL Configuration" #. We do not set help text here, because it was set outside -#: src/modules/Drbd.rb:141 +#: src/modules/Drbd.rb:193 #, fuzzy msgid "Read global settings" msgstr "Read global Samba settings" -#: src/modules/Drbd.rb:142 +#: src/modules/Drbd.rb:194 msgid "Read resources" msgstr "Read resources" -#: src/modules/Drbd.rb:143 +#: src/modules/Drbd.rb:195 +#, fuzzy +#| msgid "LVM configuration" +msgid "Read LVM configurations" +msgstr "LVM configuration" + +#: src/modules/Drbd.rb:196 msgid "Read daemon status" msgstr "Read daemon status" -#: src/modules/Drbd.rb:146 +#: src/modules/Drbd.rb:197 src/modules/Drbd.rb:204 #, fuzzy +#| msgid "Read firewall settings" +msgid "Read SuSEFirewall Settings" +msgstr "Read firewall settings" + +#: src/modules/Drbd.rb:200 +#, fuzzy msgid "Reading global settings..." msgstr "Reading global Samba settings..." -#: src/modules/Drbd.rb:147 +#: src/modules/Drbd.rb:201 msgid "Reading resources..." msgstr "Reading resources..." -#: src/modules/Drbd.rb:148 +#: src/modules/Drbd.rb:202 +#, fuzzy +#| msgid "Reading the configuration..." +msgid "Reading LVM configurations..." +msgstr "Reading the configuration..." + +#: src/modules/Drbd.rb:203 msgid "Reading daemon status..." msgstr "Reading daemon status..." -#: src/modules/Drbd.rb:149 src/modules/Drbd.rb:494 +#: src/modules/Drbd.rb:205 src/modules/Drbd.rb:629 msgid "Finished" msgstr "Finished" #. new_map = remove(new_map, key); -#: src/modules/Drbd.rb:412 +#: src/modules/Drbd.rb:497 #, fuzzy #| msgid "Failed to save ipsec.conf:" msgid "Failed to backup drbd.conf" msgstr "Failed to save ipsec.conf:" -#: src/modules/Drbd.rb:421 +#: src/modules/Drbd.rb:506 msgid "Failed to clean drbd.conf for drbdadm test" msgstr "" -#: src/modules/Drbd.rb:445 +#: src/modules/Drbd.rb:530 #, fuzzy #| msgid "Configuration of Resource Groups" msgid "" @@ -633,12 +706,12 @@ "%2" msgstr "Configuration of Resource Groups" -#: src/modules/Drbd.rb:464 +#: src/modules/Drbd.rb:549 msgid "Failed to bring drbd.conf back" msgstr "" #. DRBD write dialog caption -#: src/modules/Drbd.rb:474 +#: src/modules/Drbd.rb:605 #, fuzzy msgid "Writing DRBD Configuration" msgstr "Writing NFS Configuration" @@ -647,34 +720,58 @@ #. won't change modified flag #. return true if !@modified #. We do not set help text here, because it was set outside -#: src/modules/Drbd.rb:486 +#: src/modules/Drbd.rb:617 msgid "Write global settings" msgstr "Write global settings" -#: src/modules/Drbd.rb:487 +#: src/modules/Drbd.rb:618 msgid "Write resources" msgstr "Write resources" -#: src/modules/Drbd.rb:488 +#: src/modules/Drbd.rb:619 #, fuzzy +#| msgid "Write configuration" +msgid "Write LVM configurations" +msgstr "Write configuration" + +#: src/modules/Drbd.rb:620 +#, fuzzy msgid "Set daemon status" msgstr "Read daemon status" -#: src/modules/Drbd.rb:491 +#: src/modules/Drbd.rb:621 +#, fuzzy +#| msgid "Write the firewall settings" +msgid "Write the SuSEfirewall settings" +msgstr "Write the firewall settings" + +#: src/modules/Drbd.rb:624 msgid "Writing global settings..." msgstr "Writing global settings..." -#: src/modules/Drbd.rb:492 +#: src/modules/Drbd.rb:625 msgid "Writing resources..." msgstr "Writing resources..." -#: src/modules/Drbd.rb:493 +#: src/modules/Drbd.rb:626 #, fuzzy +#| msgid "Writing configuration..." +msgid "Writing LVM configurations..." +msgstr "Writing configuration..." + +#: src/modules/Drbd.rb:627 +#, fuzzy msgid "Setting daemon status..." msgstr "Reading daemon status..." -#: src/modules/Drbd.rb:504 +#: src/modules/Drbd.rb:628 #, fuzzy +#| msgid "Writing the firewall settings..." +msgid "Writing the SuSEFirewall settings" +msgstr "Writing the firewall settings..." + +#: src/modules/Drbd.rb:639 +#, fuzzy #| msgid "Unable to create directory '%1'." msgid "Failed to make directory /etc/drbd.d" msgstr "Unable to create directory '%1'." Modified: trunk/yast/en_GB/po/fcoe-client.en_GB.po =================================================================== --- trunk/yast/en_GB/po/fcoe-client.en_GB.po 2015-09-09 08:18:21 UTC (rev 92602) +++ trunk/yast/en_GB/po/fcoe-client.en_GB.po 2015-09-09 08:19:44 UTC (rev 92603) @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-04 15:52+0200\n" +"POT-Creation-Date: 2015-08-25 18:36+0200\n" "PO-Revision-Date: 2001-07-17 16:27+0200\n" "Last-Translator: James Ogley \n" "Language-Team: English \n" Modified: trunk/yast/en_GB/po/firewall-services.en_GB.po =================================================================== --- trunk/yast/en_GB/po/firewall-services.en_GB.po 2015-09-09 08:18:21 UTC (rev 92602) +++ trunk/yast/en_GB/po/firewall-services.en_GB.po 2015-09-09 08:19:44 UTC (rev 92603) @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: firewall-services\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-04 15:54+0200\n" +"POT-Creation-Date: 2015-08-25 18:38+0200\n" "PO-Revision-Date: 2007-08-16 16:37+0100\n" "Last-Translator: Benjamin Weber \n" "Language-Team: \n" Modified: trunk/yast/en_GB/po/firewall.en_GB.po =================================================================== --- trunk/yast/en_GB/po/firewall.en_GB.po 2015-09-09 08:18:21 UTC (rev 92602) +++ trunk/yast/en_GB/po/firewall.en_GB.po 2015-09-09 08:19:44 UTC (rev 92603) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: firewall\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-04 15:52+0200\n" +"POT-Creation-Date: 2015-08-25 18:36+0200\n" "PO-Revision-Date: 2007-08-16 16:36+0100\n" "Last-Translator: Benjamin Weber \n" "Language-Team: \n" Modified: trunk/yast/en_GB/po/firstboot.en_GB.po =================================================================== --- trunk/yast/en_GB/po/firstboot.en_GB.po 2015-09-09 08:18:21 UTC (rev 92602) +++ trunk/yast/en_GB/po/firstboot.en_GB.po 2015-09-09 08:19:44 UTC (rev 92603) @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: firstboot\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-04 15:52+0200\n" +"POT-Creation-Date: 2015-08-25 18:36+0200\n" "PO-Revision-Date: 2007-08-16 16:37+0100\n" "Last-Translator: Benjamin Weber \n" "Language-Team: \n" @@ -116,13 +116,13 @@ msgstr "Label" #: src/clients/firstboot_config.rb:68 +msgid "Module Name" +msgstr "Module Name" + +#: src/clients/firstboot_config.rb:68 msgid "Status" msgstr "Status" -#: src/clients/firstboot_config.rb:68 -msgid "Module Name" -msgstr "Module Name" - #. translators: dialog text #: src/clients/firstboot_desktop.rb:90 msgid "" @@ -226,7 +226,7 @@ "return to this installation sequence.</p>\n" #. popup text -#: src/clients/firstboot_language.rb:124 +#: src/clients/firstboot_language.rb:123 #, fuzzy msgid "" "Your language setting has been changed.\n" @@ -244,23 +244,23 @@ #. Build dialog #. ---------------------------------------------------------------------- #. heading text -#: src/clients/firstboot_language_keyboard.rb:73 +#: src/clients/firstboot_language_keyboard.rb:72 #, fuzzy msgid "Language and Keyboard Layout" msgstr "Keyboard Layout" #. combo box label -#: src/clients/firstboot_language_keyboard.rb:79 +#: src/clients/firstboot_language_keyboard.rb:78 msgid "&Language" msgstr "&Language" #. combo box label -#: src/clients/firstboot_language_keyboard.rb:87 +#: src/clients/firstboot_language_keyboard.rb:86 msgid "&Keyboard Layout" msgstr "&Keyboard Layout" #. help text for firstboot language + keyboard screen -#: src/clients/firstboot_language_keyboard.rb:114 +#: src/clients/firstboot_language_keyboard.rb:113 #, fuzzy msgid "" "<p>\n" @@ -274,7 +274,7 @@ "</p>\n" #. help text, continued -#: src/clients/firstboot_language_keyboard.rb:121 +#: src/clients/firstboot_language_keyboard.rb:120 msgid "" "<p>\n" "Click <b>Next</b> to proceed to the next dialog.\n" @@ -285,7 +285,7 @@ "</p>\n" #. help text, continued -#: src/clients/firstboot_language_keyboard.rb:127 +#: src/clients/firstboot_language_keyboard.rb:126 #, fuzzy msgid "" "<p>\n" @@ -299,7 +299,7 @@ "</p>\n" #. error message -#: src/clients/firstboot_language_keyboard.rb:272 +#: src/clients/firstboot_language_keyboard.rb:271 #, fuzzy msgid "There is not enough space to install all additional packages." msgstr "" Added: trunk/yast/en_GB/po/fonts.en_GB.po =================================================================== --- trunk/yast/en_GB/po/fonts.en_GB.po (rev 0) +++ trunk/yast/en_GB/po/fonts.en_GB.po 2015-09-09 08:19:44 UTC (rev 92603) @@ -0,0 +1,681 @@ +# English message file for YaST2 (@memory@). +# Copyright (C) 2005 SUSE Linux Products GmbH. +# Copyright (C) 2002 SuSE Linux AG. +# Copyright (C) 2000, 2001 SuSE GmbH. +# James Ogley , 2000, 2001. +# +msgid "" +msgstr "" +"Project-Id-Version: YaST (@memory@)\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2015-08-25 18:36+0200\n" +"PO-Revision-Date: 2001-07-17 16:27+0200\n" +"Last-Translator: James Ogley \n" +"Language-Team: English \n" +"Language: en\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8-bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" + +#. in case of changing profiles, please reflect +#. edits in test/data/sysconfig.fonts-config.* +#. otherwise testsuite will fail +#: src/lib/fonts/fonts-config-state.rb:58 +#, fuzzy +#| msgid "Bitmap Editors" +msgid "Bitmap Fonts" +msgstr "Bitmap Editors" + +#: src/lib/fonts/fonts-config-state.rb:103 +msgid "Unlike 'outline fonts' (fonts described mathematically via curves; chosen in the rest of profiles), 'bitmap fonts' represents group of fonts, which contain bitmap for each glyph and size. Thus, only several sizes exist for each font. They are very fast to render, because there's no need to compute the bitmap and are considered more readable especially on small sizes (even, some outline fonts contains so called 'embedded bitmaps', bitmap versions of itself, for small sizes). Bitmap fonts are rendered black and white, not smoothed." +msgstr "" + +#: src/lib/fonts/fonts-config-state.rb:106 +msgid "Black and White Rendering" +msgstr "" + +#: src/lib/fonts/fonts-config-state.rb:123 +msgid "Fonts rendered without antialiasing (grayscale smoothing), black and white. In contrast with smoothed fonts, they are much more readable without any drawback of smoothing (fuzzy or uneven stems etc.). In connection with good hinted fonts (e. g. Liberation 1 fonts), this setting can give bitmap quality fonts while maintaining scalability." +msgstr "" + +#: src/lib/fonts/fonts-config-state.rb:126 +msgid "Black and White Rendering for Monospaced Fonts" +msgstr "" + +#: src/lib/fonts/fonts-config-state.rb:143 +msgid "Monospaced fonts rendered not smoothed, other fonts (sans-serif, sans and unspecified) will use default setting. Default family preference list is used." +msgstr "" + +#: src/lib/fonts/fonts-config-state.rb:146 +msgid "Default" +msgstr "Default" + +#: src/lib/fonts/fonts-config-state.rb:163 +msgid "Fonts are smoothed with antialiasing. Unlike black and white rendered fonts, this setting can produce 'beautiful' fonts sometimes to the detriment of readability. TrueType fonts, which are known to have good hinting instructions are rendered with bytecode interpreter, otherwise FreeType autohinter is used on the 'hintslight' hinting level. Using font native hinting instructions produces glyphs displayed with thiner stems. Default family preference list is used (nowdays TrueType fonts with good instructions are prefered)." +msgstr "" + +#: src/lib/fonts/fonts-config-state.rb:166 +#, fuzzy +#| msgid "Fonts" +msgid "CFF Fonts" +msgstr "Fonts" + +#: src/lib/fonts/fonts-config-state.rb:206 +msgid "Given Adobe's contribution to FreeType library, CFF fonts can be considered good compromise between readability and smoothness of rendered glyphs." +msgstr "" + +#: src/lib/fonts/fonts-config-state.rb:209 +msgid "Exclusive Autohinter Rendering" +msgstr "" + +#: src/lib/fonts/fonts-config-state.rb:226 +msgid "Unlike in default profile, even for good hinted fonts, FreeType's autohinter is used (on the 'hintslight' level). That leads to thicker, but sometimes fuzzier (and therefore less readable), glyphs. Default family preference list is used." +msgstr "" + +#: src/lib/fonts/fonts-config-state.rb:229 src/lib/fonts/fonts-dialog.rb:818 +msgid "Subpixel Rendering" +msgstr "" + +#: src/lib/fonts/fonts-config-state.rb:254 +msgid "Use subpixel rendering capability of LCD monitor. Requires subpixel rendering enabled FreeType library." +msgstr "" + +#. for testsuite +#: src/lib/fonts/fonts-dialog.rb:181 +msgid "installed" +msgstr "" + +#: src/lib/fonts/fonts-dialog.rb:181 +#, fuzzy +#| msgid "Do not install" +msgid "not installed" +msgstr "Do not install" + +#: src/lib/fonts/fonts-dialog.rb:190 +#, fuzzy +#| msgid "&Preferences" +msgid "Preference List for %s" +msgstr "&Preferences" + +#. nothing to do here, initialize_familylist_widget will +#. toggle off/on btn_add_manual as appropriate +#: src/lib/fonts/fonts-dialog.rb:324 +#, fuzzy +#| msgid "<p><b>Validity:</b></p>" +msgid "<p><b>Family:</b> %s</b></p>" +msgstr "<p><b>Validity:</b></p>" + +#: src/lib/fonts/fonts-dialog.rb:325 +#, fuzzy +#| msgid "<p><b> Description for %1 </b></p>" +msgid "<p><b>Specimen for %s</b></p>" +msgstr "<p><b> Description for %1 </b></p>" + +#: src/lib/fonts/fonts-dialog.rb:328 +#, fuzzy +#| msgid "No UID is available for this type of user." +msgid "<p>No specimen available for this font and script.</p>" +msgstr "No UID is available for this type of user." + +#. unlikely +#: src/lib/fonts/fonts-dialog.rb:333 +#, fuzzy +#| msgid "<p><b> Description for %1 </b></p>" +msgid "<b>No script found for %s.</b>" +msgstr "<p><b> Description for %1 </b></p>" + +#: src/lib/fonts/fonts-dialog.rb:341 +#, fuzzy +#| msgid "<p><b>Validity:</b></p>" +msgid "<p><b>Family:</b> %s</p>" +msgstr "<p><b>Validity:</b></p>" + +#: src/lib/fonts/fonts-dialog.rb:342 +#, fuzzy +#| msgid "<p><b>Description</b></p>" +msgid "<p><b>Scripts</b><ul>" +msgstr "<p><b>Description</b></p>" + +#. nothing to do nowadays +#: src/lib/fonts/fonts-dialog.rb:496 +msgid "" +"Family preference list for %s\n" +"do not contain any installed family.\n" +"\n" +msgstr "" + +#: src/lib/fonts/fonts-dialog.rb:499 +msgid "" +"Please make sure to install at least one for each\n" +"alias, otherwise this preference setting has no effect.\n" +"\n" +msgstr "" + +#: src/lib/fonts/fonts-dialog.rb:502 +msgid "" +"Fonts can be installed e. g. via fontinfo.opensuse.org. \n" +"If you install them when this yast module is running,\n" +"reread the profile to see results.\n" +msgstr "" + +#. <table> do not work for text mode +#: src/lib/fonts/fonts-dialog.rb:542 +#, fuzzy +#| msgid "You have to select a configuration type" +msgid "You have set LCD filter type (%s)." +msgstr "You have to select a configuration type" + +#: src/lib/fonts/fonts-dialog.rb:543 +msgid "" +" This needs subpixel rendering capabality\n" +"compiled in FreeType library." +msgstr "" + +#: src/lib/fonts/fonts-dialog.rb:545 +msgid " Unfortunately, we can not ship it due patent reasons.\n" +msgstr "" + +#: src/lib/fonts/fonts-dialog.rb:547 +msgid "See README.subpixel-patents from yast2-fonts package documentation.\n" +msgstr "" + +#: src/lib/fonts/fonts-dialog.rb:560 +msgid "Match for %s" +msgstr "" + +#: src/lib/fonts/fonts-dialog.rb:577 src/lib/fonts/fonts-dialog.rb:766 +#, fuzzy +#| msgid "Initializing" +msgid "Font &Antialiasing" +msgstr "Initialising" + +#: src/lib/fonts/fonts-dialog.rb:588 +msgid "Antialias Also &Monospaced Fonts" +msgstr "" + +#: src/lib/fonts/fonts-dialog.rb:599 src/lib/fonts/fonts-dialog.rb:769 +msgid "Force A&utohinting On" +msgstr "" + +#: src/lib/fonts/fonts-dialog.rb:613 src/lib/fonts/fonts-dialog.rb:772 +msgid "Force Hint St&yle" +msgstr "" + +#: src/lib/fonts/fonts-dialog.rb:623 +msgid "Embedded Bitmaps" +msgstr "" + +#: src/lib/fonts/fonts-dialog.rb:626 +msgid "Use &Embedded Bitmaps" +msgstr "" + +#: src/lib/fonts/fonts-dialog.rb:632 +#, fuzzy +#| msgid "Add Lan&guage" +msgid "All Lan&guages" +msgstr "Add Lan&guage" + +#: src/lib/fonts/fonts-dialog.rb:637 +#, fuzzy +#| msgid "Bamileke Languages" +msgid "Limit to &Selected Languages" +msgstr "Bamileke Languages" + +#: src/lib/fonts/fonts-dialog.rb:644 +msgid "&Select" +msgstr "&Select" + +#: src/lib/fonts/fonts-dialog.rb:666 src/lib/fonts/fonts-dialog.rb:777 +#, fuzzy +#| msgid "&Filter" +msgid "LCD &Filter" +msgstr "&Filter" + +#: src/lib/fonts/fonts-dialog.rb:677 +#, fuzzy +#| msgid "&Keyboard Layout" +msgid "&Layout" +msgstr "&Keyboard Layout" + +#: src/lib/fonts/fonts-dialog.rb:688 +msgid "Alias" +msgstr "Alias" + +#: src/lib/fonts/fonts-dialog.rb:707 +#, fuzzy +#| msgid "Net Family" +msgid "Font Family" +msgstr "Net Family" + +#: src/lib/fonts/fonts-dialog.rb:707 +msgid "Available" +msgstr "Available" + +#: src/lib/fonts/fonts-dialog.rb:708 +msgid "Remove" +msgstr "Remove" + +#: src/lib/fonts/fonts-dialog.rb:710 +#, fuzzy +#| msgid "&Down" +msgid "Down" +msgstr "&Down" + +#: src/lib/fonts/fonts-dialog.rb:711 +#, fuzzy +#| msgid "&Up" +msgid "Up" +msgstr "&Up" + +#: src/lib/fonts/fonts-dialog.rb:717 src/lib/fonts/fpl-add-dialog.rb:66 +msgid "&Add" +msgstr "&Add" + +#: src/lib/fonts/fonts-dialog.rb:719 +#, fuzzy +#| msgid "Installed Patches" +msgid "&Installed families..." +msgstr "Installed Patches" + +#: src/lib/fonts/fonts-dialog.rb:735 +#, fuzzy +#| msgid "Search &description" +msgid "Search &Metric Compatible" +msgstr "Search &description" + +#: src/lib/fonts/fonts-dialog.rb:746 +msgid "Never use o&ther fonts" +msgstr "" + +#: src/lib/fonts/fonts-dialog.rb:775 +msgid "Subpixel &Rendering" +msgstr "" + +#: src/lib/fonts/fonts-dialog.rb:799 +#, fuzzy +#| msgid "&Connection Details" +msgid "&Rendering Details" +msgstr "&Connection Details" + +#: src/lib/fonts/fonts-dialog.rb:803 +#, fuzzy +#| msgid "Initializing" +msgid "Antialiasing" +msgstr "Initialising" + +#: src/lib/fonts/fonts-dialog.rb:810 +#, fuzzy +#| msgid "Printing" +msgid "Hinting" +msgstr "Printing" + +#: src/lib/fonts/fonts-dialog.rb:837 +#, fuzzy +#| msgid "&Preferences" +msgid "Prefered &Families" +msgstr "&Preferences" + +#: src/lib/fonts/fonts-dialog.rb:844 +msgid "Forcing Family Preferences" +msgstr "" + +#: src/lib/fonts/fonts-dialog.rb:860 +#, fuzzy +#| msgid "Patch Level" +msgid "Match &Preview" +msgstr "Patch Level" + +#: src/lib/fonts/fonts-dialog.rb:879 +#, fuzzy +#| msgid "Presentation" +msgid "&Presets" +msgstr "Presentation" + +#. create copy of system settings; remove fonts-config generated +#. config files to have such fontconfig setup as fonts-config +#. would never run; point fontconfig to this configuration +#: src/lib/fonts/fonts-dialog.rb:933 +#, fuzzy +#| msgid "Reading the Configuration" +msgid "Reading Font Configuration" +msgstr "Reading the Configuration" + +#: src/lib/fonts/fonts-dialog.rb:936 +#, fuzzy +#| msgid "Read sysconfig values" +msgid "Read sysconfig file" +msgstr "Read sysconfig values" + +#: src/lib/fonts/fonts-dialog.rb:937 +#, fuzzy +#| msgid "Reading routes..." +msgid "Reading %s..." +msgstr "Reading routes..." + +#: src/lib/fonts/fonts-dialog.rb:957 +#, fuzzy +#| msgid "Host Configuration" +msgid "Font Configuration" +msgstr "Host Configuration" + +#: src/lib/fonts/fonts-dialog.rb:958 +#, fuzzy +#| msgid "&User Code" +msgid " (User Mode)" +msgstr "&User Code" + +#. misuse back_button a bit +#: src/lib/fonts/fonts-dialog.rb:963 +#, fuzzy +#| msgid "Save system settings" +msgid "&Use system settings" +msgstr "Save system settings" + +#: src/lib/fonts/fonts-dialog.rb:975 +#, fuzzy +#| msgid "Writing NFS Configuration" +msgid "Writing Font Configuration" +msgstr "Writing NFS Configuration" + +#: src/lib/fonts/fonts-dialog.rb:978 +#, fuzzy +#| msgid "Write the sysconfig settings" +msgid "Write sysconfig file" +msgstr "Write the sysconfig settings" + +#: src/lib/fonts/fonts-dialog.rb:979 +#, fuzzy +#| msgid "Run SuSEconfig" +msgid "Run fonts-config" +msgstr "Run SuSEconfig" + +#: src/lib/fonts/fonts-dialog.rb:980 +#, fuzzy +#| msgid "Writing users..." +msgid "Writing %s..." +msgstr "Writing users..." + +#: src/lib/fonts/fonts-dialog.rb:981 +#, fuzzy +#| msgid "Running SuSEconfig..." +msgid "Running fonts-config..." +msgstr "Running SuSEconfig..." + +#. we are in user mode +#: src/lib/fonts/fonts-dialog.rb:999 +msgid "This will irrecoverably remove user setting done previously with this module." +msgstr "" + +#: src/lib/fonts/fonts-dialog.rb:1026 +#, fuzzy +#| msgid "Configuration &Module" +msgid "<h1>Font Configuraution Module</h1>" +msgstr "Configuration &Module" + +#: src/lib/fonts/fonts-dialog.rb:1027 +msgid "<p>Module to control <b>system wide</b> or <b>user</b> font rendering setting.</p>" +msgstr "" + +#: src/lib/fonts/fonts-dialog.rb:1028 +msgid "<i>Distribution default</i> is font setting shipped on media and it is that one almost same for years (not counting decisions of individual DE). " +msgstr "" + +#: src/lib/fonts/fonts-dialog.rb:1030 +msgid "This setting can be changed:<ul>" +msgstr "" + +#: src/lib/fonts/fonts-dialog.rb:1031 +msgid "<li>system wide when module is run with <tt>root</tt> credentials to create <i>system setting.</i> " +msgstr "" + +#: src/lib/fonts/fonts-dialog.rb:1033 +msgid "System, where font module never run or <b>Default</b> preset was chosen, uses distribution default.</li>" +msgstr "" + +#: src/lib/fonts/fonts-dialog.rb:1035 +msgid "<li>for <i>user setting</i> when module is run as ordindary user. " +msgstr "" + +#: src/lib/fonts/fonts-dialog.rb:1036 +msgid "User, which never run this module or chooses to <b>Use system settings</b>, uses system settings. " +msgstr "" + +#: src/lib/fonts/fonts-dialog.rb:1037 +msgid "User, which chooses <b>Default</b> preset, uses distribution default.</li></ul>" +msgstr "" + +#: src/lib/fonts/fonts-dialog.rb:1038 +msgid "<p><b>NOTE:</b> " +msgstr "" + +#: src/lib/fonts/fonts-dialog.rb:1039 +msgid "In general, it is not recommended to combine font module user mode with other font setting. " +msgstr "" + +#: src/lib/fonts/fonts-dialog.rb:1040 +msgid "Nevertheless, setting in <tt>~/.config/fontconfig/fonts.conf</tt> should always have precendence before arbitrary font module setting.</p>" +msgstr "" + +#: src/lib/fonts/fonts-dialog.rb:1042 +msgid "<p>Help for <i>Presets</i> button and for the current tab follows.</p>" +msgstr "" + +#: src/lib/fonts/fonts-dialog.rb:1043 +msgid "<p><b>Presets</b> button serves a possibility to choose predefined profiles: <ul>" +msgstr "" + +#: src/lib/fonts/fonts-dialog.rb:1045 +msgid "<li><b>%{name}: </b>%{help}</li>" +msgstr "" + +#: src/lib/fonts/fonts-dialog.rb:1050 +msgid "Every single menu item there just fills appropriate setting in all tabs. That setting can be later arbitrarily customized in depth by respective individual fields of corresponding tabs.</p>" +msgstr "" + +#: src/lib/fonts/fonts-dialog.rb:1056 +msgid "<h2>Match Preview Tab</h2>" +msgstr "" + +#: src/lib/fonts/fonts-dialog.rb:1057 +msgid "<p>In this paragraph, <i>current setting</i> means setting of the system plus changes made in currently running fonts module.</p>" +msgstr "" + +#: src/lib/fonts/fonts-dialog.rb:1059 +msgid "<p>Matches to system generic aliases can be seen in this initial tab. " +msgstr "" + +#: src/lib/fonts/fonts-dialog.rb:1060 +msgid "In other words, for every alias (%s) you can see family name, which resolves to given alias according to <i>current setting.</i></p>" +msgstr "" + +#: src/lib/fonts/fonts-dialog.rb:1063 +msgid "<p>In adition to that, graphical mode allows to display font specimen of the matched font rendered (again) taking <i>current setting</i> into account. " +msgstr "" + +#: src/lib/fonts/fonts-dialog.rb:1066 +msgid "In the corresponding combo box, script coverage of matched font can be seen and specimen string for given script can be chosen.</p>" +msgstr "" + +#: src/lib/fonts/fonts-dialog.rb:1068 +msgid "<p>At the bottom, there are crucial rendering options duplicated from Rendered Details Tab, which can be used to see changes in the rendering on the fly.</p>" +msgstr "" + +#: src/lib/fonts/fonts-dialog.rb:1074 +msgid "

Rendering Details Tab</h2>" +msgstr "" + +#: src/lib/fonts/fonts-dialog.rb:1075 +msgid "<p>This tab controls <b>how</b> fonts are rendered. It allows you to amend font rendering algorithms to be used and change their options.</p>" +msgstr "" + +#: src/lib/fonts/fonts-dialog.rb:1078 +#, fuzzy +#| msgid "<h3>Listen On</h3>" +msgid "<h3>Antialiasing</h3>" +msgstr "<h3>Listen On</h3>" + +#: src/lib/fonts/fonts-dialog.rb:1079 +msgid "<p>By default, all outline fonts are smoothed by method called <i>antialiasing.</i>" +msgstr "" + +#: src/lib/fonts/fonts-dialog.rb:1081 +msgid " Black and white rendering can be forced for all fonts or for monospaced only.</p>" +msgstr "" + +#: src/lib/fonts/fonts-dialog.rb:1083 src/lib/fonts/fonts-dialog.rb:1097 +#: src/lib/fonts/fonts-dialog.rb:1118 +msgid "<p>See: %s<p>" +msgstr "" + +#: src/lib/fonts/fonts-dialog.rb:1087 +#, fuzzy +#| msgid "<h3>Listen On</h3>" +msgid "<h3>Hinting</h3>" +msgstr "<h3>Listen On</h3>" + +#: src/lib/fonts/fonts-dialog.rb:1088 +msgid "<p>Hinting instructions helps rasterizer to fit glyphs stems to the grid.</p>" +msgstr "" + +#: src/lib/fonts/fonts-dialog.rb:1090 +msgid "<p>In the default setting, FreeType's autohinter can be used depending on font type and quality of own instructions. Use of autohinter can be forced by <b>Force Autohinting On</b> option.</p>" +msgstr "" + +#: src/lib/fonts/fonts-dialog.rb:1094 +msgid "<p>For each hinting algorithm, hint style (hinting level) is chosen." +msgstr "" + +#: src/lib/fonts/fonts-dialog.rb:1095 +msgid " It is possible to set hint style globally by <b>Force Hint Style</b> option.</p>" +msgstr "" + +#: src/lib/fonts/fonts-dialog.rb:1101 +msgid "<h3>Embedded Bitmaps</h3>" +msgstr "" + +#: src/lib/fonts/fonts-dialog.rb:1102 +msgid "<p>Some outline fonts contain so called bitmap strikes, i. e. bitmap version of given font for certain sizes. In this section it can be turned off entirely, on only for fonts which cover specified languages, or on for every font." +msgstr "" + +#: src/lib/fonts/fonts-dialog.rb:1109 +msgid "<h3>Subpixel Rendering</h3>" +msgstr "" + +#: src/lib/fonts/fonts-dialog.rb:1110 +msgid "<p>Subpixel rendering multiples resolution in one direction by using colour primaries (subpixels) of an LCD display.</p>" +msgstr "" + +#: src/lib/fonts/fonts-dialog.rb:1112 +msgid "<p>Choose LCD filter, which should be used, and subpixel layout corresponding to display and its rotation.</p>" +msgstr "" + +#: src/lib/fonts/fonts-dialog.rb:1114 +msgid "<p>Note, that due to patent reasons, FreeType has subpixel rendering turned off by default." +msgstr "" + +#: src/lib/fonts/fonts-dialog.rb:1116 +msgid " Without FreeType's subpixel rendering support compiled in, setting in this section has no effect.</p>" +msgstr "" + +#: src/lib/fonts/fonts-dialog.rb:1122 +msgid "<h2>Prefered Families Tab</h2>" +msgstr "" + +#: src/lib/fonts/fonts-dialog.rb:1123 +msgid "<p>This tab controls <b>which</b> fonts are rendered.</p>" +msgstr "" + +#: src/lib/fonts/fonts-dialog.rb:1124 +#, fuzzy +#| msgid "<h3>Users</h3>" +msgid "<h3>Preference Lists</h3>" +msgstr "<h3>Users</h3>" + +#: src/lib/fonts/fonts-dialog.rb:1125 +msgid "<p>Here, Family Preference Lists (FPL) for generic aliases (%s) can be defined." +msgstr "" + +#: src/lib/fonts/fonts-dialog.rb:1127 +msgid " These are sorted lists of family names, with most prefered family first." +msgstr "" + +#: src/lib/fonts/fonts-dialog.rb:1129 +msgid " There is default (system-wide) FPL yet defined for each generic alias." +msgstr "" + +#: src/lib/fonts/fonts-dialog.rb:1130 +msgid " FPLs defined in this dialog will be prepended to them.</p>" +msgstr "" + +#: src/lib/fonts/fonts-dialog.rb:1131 +msgid "<p>System will look for the first <b>installed</b> family in the list, other query elements taking into account of course. Available font packages for SUSE distributions can be browsed and installed from <b>fontinfo.opensuse.org.</b></p>" +msgstr "" + +#: src/lib/fonts/fonts-dialog.rb:1138 +msgid "<h3>Forcing Family Preferences</h3>" +msgstr "" + +#: src/lib/fonts/fonts-dialog.rb:1139 +msgid "<p>In some circumstances, FPLs defined in this dialog are not taken into account. Following two options strenghten their role.</p>" +msgstr "" + +#: src/lib/fonts/fonts-dialog.rb:1142 +msgid "<h4>Search Metric Compatible</h4>" +msgstr "" + +#: src/lib/fonts/fonts-dialog.rb:1143 +msgid "<p>Two fonts are metric compatible, when all corresponding letters are of the same size. That implies, document displayed using these fonts has the same same size too, same line wraps etc.</p>" +msgstr "" + +#: src/lib/fonts/fonts-dialog.rb:1146 +msgid "<p>Via default setting, system substitutes metric compatible fonts preferably, and FPLs defined in this dialog can be circumvented by this rule.</p>" +msgstr "" + +#: src/lib/fonts/fonts-dialog.rb:1148 +msgid "<p>Where metric compatibility does not matter, this option can be unchecked.</p>" +msgstr "" + +#: src/lib/fonts/fonts-dialog.rb:1149 +msgid "<h4>Never use other fonts</h4>" +msgstr "" + +#: src/lib/fonts/fonts-dialog.rb:1150 +msgid "<p>When checked, this option introduces very strong position for here defined preference lists. It pushes families from there before document or GUI requests, if they cover required charset.</p>" +msgstr "" + +#. delete families, that are part of list for some alias +#: src/lib/fonts/fpl-add-dialog.rb:57 +msgid "&Filter" +msgstr "&Filter" + +#: src/lib/fonts/fpl-add-dialog.rb:61 +#, fuzzy +#| msgid "Installed Patches" +msgid "Installed Families" +msgstr "Installed Patches" + +#: src/lib/fonts/fpl-add-dialog.rb:62 +#, fuzzy +#| msgid "Export Format" +msgid "Font Format" +msgstr "Export Format" + +#: src/lib/fonts/fpl-add-dialog.rb:63 +#, fuzzy +#| msgid "Script Name" +msgid "Script Coverages" +msgstr "Script Name" + +#: src/lib/fonts/fpl-add-dialog.rb:65 src/lib/fonts/select-ebl-dialog.rb:242 +msgid "&Cancel" +msgstr "&Cancel" + +#: src/lib/fonts/rich-text-dialog.rb:24 src/lib/fonts/select-ebl-dialog.rb:243 +msgid "&Ok" +msgstr "&Ok" + +#. save unknown langs +#: src/lib/fonts/select-ebl-dialog.rb:240 +msgid "&Languages" +msgstr "&Languages" Modified: trunk/yast/en_GB/po/ftp-server.en_GB.po =================================================================== --- trunk/yast/en_GB/po/ftp-server.en_GB.po 2015-09-09 08:18:21 UTC (rev 92602) +++ trunk/yast/en_GB/po/ftp-server.en_GB.po 2015-09-09 08:19:44 UTC (rev 92603) @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: ftp-server\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-10-29 16:20+0100\n" +"POT-Creation-Date: 2015-08-25 18:36+0200\n" "PO-Revision-Date: 2007-08-16 20:49+0100\n" "Last-Translator: Benjamin Weber\n" "Language-Team: British English\n" @@ -2220,21 +2220,21 @@ msgstr "Cannot create upload directory for anonymous connections!" #. anonymous dir -#: src/modules/FtpServer.rb:1074 +#: src/modules/FtpServer.rb:1079 msgid "<p><ul><i>FTP daemon is not configured.</i></ul></p>" msgstr "<p><ul><i>FTP daemon is not configured.</i></ul></p>" #. Translators: Summary head, if nothing configured -#: src/modules/FtpServer.rb:1084 +#: src/modules/FtpServer.rb:1089 msgid "FTP daemon" msgstr "FTP daemon" #. Translators: Summary head, if something configured -#: src/modules/FtpServer.rb:1089 +#: src/modules/FtpServer.rb:1094 msgid "FTP daemon %1" msgstr "FTP daemon %1" -#: src/modules/FtpServer.rb:1093 +#: src/modules/FtpServer.rb:1098 msgid "These options will be configured" msgstr "These options will be configured" Modified: trunk/yast/en_GB/po/geo-cluster.en_GB.po =================================================================== --- trunk/yast/en_GB/po/geo-cluster.en_GB.po 2015-09-09 08:18:21 UTC (rev 92602) +++ trunk/yast/en_GB/po/geo-cluster.en_GB.po 2015-09-09 08:19:44 UTC (rev 92603) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: opensuse-i 18n\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-10-29 16:20+0100\n" +"POT-Creation-Date: 2015-08-25 18:36+0200\n" "PO-Revision-Date: 2014-05-19 09:34+0200\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" @@ -61,10 +61,10 @@ #. $Id: wizards.ycp 27914 2006-02-13 14:32:08Z locilka $ #. Initialization dialog caption #: src/include/geo-cluster/complex.rb:83 -#: src/include/geo-cluster/dialogs.rb:416 -#: src/include/geo-cluster/dialogs.rb:689 +#: src/include/geo-cluster/dialogs.rb:465 +#: src/include/geo-cluster/dialogs.rb:814 #: src/include/geo-cluster/wizards.rb:46 -#: src/include/geo-cluster/wizards.rb:140 +#: src/include/geo-cluster/wizards.rb:141 #, fuzzy #| msgid "GeoCluster Configuration" msgid "Geo Cluster Configuration" @@ -123,17 +123,17 @@ msgstr "arbitrator ip" #: src/include/geo-cluster/dialogs.rb:74 src/include/geo-cluster/dialogs.rb:85 -#: src/include/geo-cluster/dialogs.rb:679 +#: src/include/geo-cluster/dialogs.rb:804 msgid "Add" msgstr "Add" #: src/include/geo-cluster/dialogs.rb:75 src/include/geo-cluster/dialogs.rb:86 -#: src/include/geo-cluster/dialogs.rb:680 +#: src/include/geo-cluster/dialogs.rb:805 msgid "Edit" msgstr "Edit" #: src/include/geo-cluster/dialogs.rb:76 src/include/geo-cluster/dialogs.rb:87 -#: src/include/geo-cluster/dialogs.rb:681 +#: src/include/geo-cluster/dialogs.rb:806 msgid "Delete" msgstr "Delete" @@ -141,185 +141,251 @@ msgid "site" msgstr "site" -#: src/include/geo-cluster/dialogs.rb:94 -#: src/include/geo-cluster/dialogs.rb:186 +#: src/include/geo-cluster/dialogs.rb:93 +#: src/include/geo-cluster/dialogs.rb:235 msgid "ticket" msgstr "ticket" -#. return `cacel or a string #: src/include/geo-cluster/dialogs.rb:106 -#: src/include/geo-cluster/dialogs.rb:128 -#: src/include/geo-cluster/dialogs.rb:205 +#, fuzzy +#| msgid "Authentication" +msgid "Authentification" +msgstr "Authentication" + +#: src/include/geo-cluster/dialogs.rb:108 +#: src/include/geo-cluster/dialogs.rb:156 +#, fuzzy +#| msgid "Cancel" +msgid "Ca&ncel" +msgstr "Cancel" + +#. return `cancel or a string +#: src/include/geo-cluster/dialogs.rb:109 +#: src/include/geo-cluster/dialogs.rb:157 +#: src/include/geo-cluster/dialogs.rb:177 +#: src/include/geo-cluster/dialogs.rb:254 msgid "OK" msgstr "OK" -#: src/include/geo-cluster/dialogs.rb:107 -#: src/include/geo-cluster/dialogs.rb:129 -#: src/include/geo-cluster/dialogs.rb:206 +#: src/include/geo-cluster/dialogs.rb:122 +#, fuzzy +#| msgid "Enable &GSS Security" +msgid "Enable Security Auth" +msgstr "Enable &GSS Security" + +#: src/include/geo-cluster/dialogs.rb:128 +#, fuzzy +#| msgid "Authentication Key" +msgid "Authentification file" +msgstr "Authentication Key" + +#: src/include/geo-cluster/dialogs.rb:132 +msgid "A relative path will be saved in /etc/booth, or using absolute path directly." +msgstr "" + +#: src/include/geo-cluster/dialogs.rb:137 +msgid "For a newly created geo cluster, push the button below to generate /etc/booth/<key>." +msgstr "" + +#: src/include/geo-cluster/dialogs.rb:142 +msgid "To join a existing geo cluster, please copy /etc/booth/<key> from other node manually." +msgstr "" + +#: src/include/geo-cluster/dialogs.rb:146 +#, fuzzy +#| msgid "Authentication Key" +msgid "Generate Authentification Key File" +msgstr "Authentication Key" + +#: src/include/geo-cluster/dialogs.rb:154 +#, fuzzy +#| msgid "&Basics" +msgid "Basic" +msgstr "&Basics" + +#: src/include/geo-cluster/dialogs.rb:178 +#: src/include/geo-cluster/dialogs.rb:255 msgid "Cancel" msgstr "Cancel" -#: src/include/geo-cluster/dialogs.rb:143 +#: src/include/geo-cluster/dialogs.rb:192 #, fuzzy #| msgid "Enter a valid e-mail address" msgid "Please enter a valid ip address" msgstr "Enter a valid e-mail address." -#: src/include/geo-cluster/dialogs.rb:184 +#: src/include/geo-cluster/dialogs.rb:233 msgid "Enter ticket and timeout" msgstr "Enter ticket and timeout" -#: src/include/geo-cluster/dialogs.rb:190 +#: src/include/geo-cluster/dialogs.rb:239 msgid "timeout" msgstr "timeout" -#: src/include/geo-cluster/dialogs.rb:192 +#: src/include/geo-cluster/dialogs.rb:241 #, fuzzy #| msgid "NFS entries" msgid "retries" msgstr "NFS entries" -#: src/include/geo-cluster/dialogs.rb:194 +#: src/include/geo-cluster/dialogs.rb:243 #, fuzzy #| msgid "Height" msgid "weights" msgstr "Height" -#: src/include/geo-cluster/dialogs.rb:196 +#: src/include/geo-cluster/dialogs.rb:245 #, fuzzy #| msgid "Expired" msgid "expire" msgstr "Expired" -#: src/include/geo-cluster/dialogs.rb:198 +#: src/include/geo-cluster/dialogs.rb:247 #, fuzzy #| msgid "Required patterns" msgid "acquire-after" msgstr "Required patterns" -#: src/include/geo-cluster/dialogs.rb:200 +#: src/include/geo-cluster/dialogs.rb:249 msgid "before-acquire-handler" msgstr "" -#: src/include/geo-cluster/dialogs.rb:237 +#: src/include/geo-cluster/dialogs.rb:286 #, fuzzy #| msgid "timeout is no valid" msgid "timeout is invalid" msgstr "timeout is no valid" -#: src/include/geo-cluster/dialogs.rb:239 +#: src/include/geo-cluster/dialogs.rb:288 #, fuzzy #| msgid "timeout is no valid" msgid "expire is invalid" msgstr "timeout is no valid" -#: src/include/geo-cluster/dialogs.rb:241 +#: src/include/geo-cluster/dialogs.rb:290 #, fuzzy #| msgid "timeout is no valid" msgid "acquireafter is invalid" msgstr "timeout is no valid" -#: src/include/geo-cluster/dialogs.rb:243 +#: src/include/geo-cluster/dialogs.rb:292 #, fuzzy #| msgid "timeout is no valid" msgid "retries is invalid" msgstr "timeout is no valid" -#: src/include/geo-cluster/dialogs.rb:245 +#: src/include/geo-cluster/dialogs.rb:294 msgid "retries values lower than 3 is illegal" msgstr "" -#: src/include/geo-cluster/dialogs.rb:247 +#: src/include/geo-cluster/dialogs.rb:296 #, fuzzy #| msgid "timeout is no valid" msgid "weights is invalid" msgstr "timeout is no valid" -#: src/include/geo-cluster/dialogs.rb:249 +#: src/include/geo-cluster/dialogs.rb:298 #, fuzzy #| msgid "ticket can not be null" msgid "ticket can not be empty" msgstr "ticket can not be null" #. fill confs with global_files -#: src/include/geo-cluster/dialogs.rb:358 -#: src/include/geo-cluster/wizards.rb:47 +#: src/include/geo-cluster/dialogs.rb:407 +#: src/include/geo-cluster/wizards.rb:48 msgid "Firewall Configuration" msgstr "Firewall Configuration" #. Wizard::SetContentsButtons(caption, contents, HELPS["c2"]:"", #. Label::BackButton(), Label::NextButton()); -#: src/include/geo-cluster/dialogs.rb:494 +#: src/include/geo-cluster/dialogs.rb:554 #, fuzzy #| msgid "Enter an IP address of your site" msgid "Enter an IP address of your arbitrator" msgstr "Enter an IP address of your site" -#: src/include/geo-cluster/dialogs.rb:505 +#: src/include/geo-cluster/dialogs.rb:565 #, fuzzy #| msgid "Edit IP address of your site" msgid "Edit IP address of your arbitrator" msgstr "Edit IP address of your site" -#: src/include/geo-cluster/dialogs.rb:521 +#: src/include/geo-cluster/dialogs.rb:581 msgid "Enter an IP address of your site" msgstr "Enter an IP address of your site" -#: src/include/geo-cluster/dialogs.rb:532 +#: src/include/geo-cluster/dialogs.rb:592 msgid "Edit IP address of your site" msgstr "Edit IP address of your site" -#: src/include/geo-cluster/dialogs.rb:554 +#: src/include/geo-cluster/dialogs.rb:614 #, fuzzy #| msgid "Zone name %1 already exists." msgid "Ticket name already exist!" msgstr "Zone name %1 already exists." -#. abort? -#: src/include/geo-cluster/dialogs.rb:600 +#. Validation check before switch to authentification +#. Still fall to :authentification or :ok +#: src/include/geo-cluster/dialogs.rb:646 #, fuzzy #| msgid "Error: Configuration name cannot be empty." msgid "Configuration name can not be empty." msgstr "Error: Configuration name cannot be empty." -#: src/include/geo-cluster/dialogs.rb:603 +#: src/include/geo-cluster/dialogs.rb:649 #, fuzzy #| msgid "Error: Configuration name cannot be empty." msgid "Configuration name can not be duplicated." msgstr "Error: Configuration name cannot be empty." -#: src/include/geo-cluster/dialogs.rb:610 +#. "5405d4" will show like "5405" +#: src/include/geo-cluster/dialogs.rb:657 #, fuzzy #| msgid "Key is invalid." msgid "port is invalid!" msgstr "Key is invalid." -#: src/include/geo-cluster/dialogs.rb:616 +#: src/include/geo-cluster/dialogs.rb:663 #, fuzzy #| msgid "Software to be installed:" msgid "transport have to be filled!" msgstr "Software to be installed:" -#: src/include/geo-cluster/dialogs.rb:621 +#. Same to UI.QueryWidget(:arbitrator_box, :Value).to_s == "" +#: src/include/geo-cluster/dialogs.rb:669 #, fuzzy #| msgid "Software to be installed:" msgid "arbitrator have to be filled!" msgstr "Software to be installed:" -#: src/include/geo-cluster/dialogs.rb:626 +#: src/include/geo-cluster/dialogs.rb:674 #, fuzzy #| msgid "Software to be installed:" msgid "site have to be filled!" msgstr "Software to be installed:" -#: src/include/geo-cluster/dialogs.rb:631 +#: src/include/geo-cluster/dialogs.rb:679 #, fuzzy #| msgid "ticket can not be null" msgid "ticket have to be filled!" msgstr "ticket can not be null" +#. Validation check before switch to basic +#. Still fall to :basic or :ok +#: src/include/geo-cluster/dialogs.rb:733 +#, fuzzy +#| msgid "Failed to create the new map." +msgid "Failed to create authentification file " +msgstr "Failed to create the new map." + +#: src/include/geo-cluster/dialogs.rb:736 +#, fuzzy +#| msgid "Set the authentication for proxy" +msgid "Succeed to created authentification file " +msgstr "Set the authentication for proxy" + #. GeoCluster choose configure dialog caption -#: src/include/geo-cluster/dialogs.rb:670 +#: src/include/geo-cluster/dialogs.rb:795 #, fuzzy #| msgid "GeoCluster Configuration" msgid "GeoCluster Configuration Select" @@ -327,105 +393,112 @@ #. Wizard::SetContentsButtons(caption, contents, HELPS["c2"]:"", #. Label::BackButton(), Label::NextButton()); -#: src/include/geo-cluster/dialogs.rb:676 +#: src/include/geo-cluster/dialogs.rb:801 #, fuzzy #| msgid "Read configuration file" msgid "Choose configuration file:" msgstr "Read configuration file" +#: src/include/geo-cluster/wizards.rb:47 +#, fuzzy +#| msgid "TV Station Configuration" +msgid "Authentification Configuration" +msgstr "TV Station Configuration" + #. Initialization dialog contents -#: src/include/geo-cluster/wizards.rb:142 +#: src/include/geo-cluster/wizards.rb:143 msgid "Initializing..." msgstr "Initializing..." -#. Not necessary to use remove_list_quote? -#: src/modules/GeoCluster.rb:224 +#. SCR won't write authfile when empty("") +#. Convert relative path to absolute path +#: src/modules/GeoCluster.rb:235 #, fuzzy #| msgid "Cannot write global settings." msgid "Cannot write global conf settings." msgstr "Cannot write global settings." #. List like site -#: src/modules/GeoCluster.rb:242 +#: src/modules/GeoCluster.rb:253 msgid "Cannot write global settings." msgstr "Cannot write global settings." #. Empty (all Int) ticket will be ignore by ag_booth #. Create a ticket item -#: src/modules/GeoCluster.rb:266 +#: src/modules/GeoCluster.rb:277 #, fuzzy #| msgid "Cannot write global settings." msgid "Cannot write global ticket settings." msgstr "Cannot write global settings." #. GeoCluster read dialog caption -#: src/modules/GeoCluster.rb:273 +#: src/modules/GeoCluster.rb:284 #, fuzzy #| msgid "Initializing geo-cluster Configuration" msgid "Initializing Geo Cluster Configuration" msgstr "Initializing geo-cluster Configuration" -#: src/modules/GeoCluster.rb:286 src/modules/GeoCluster.rb:289 -msgid "Read SuSEFirewall Settings" -msgstr "Read SuSEFirewall Settings" - #. #-#-#-#-# geo-cluster.rxgettext.pot (PACKAGE VERSION) #-#-#-#-# #. TODO FIXME Names of real stages #. We do not set help text here, because it was set outside #. #-#-#-#-# geo-cluster.xgettext.pot #-#-#-#-# #. Progress stage 2/3 -#: src/modules/GeoCluster.rb:286 src/modules/GeoCluster2.pm:143 +#: src/modules/GeoCluster.rb:297 src/modules/GeoCluster2.pm:143 msgid "Read the previous settings" msgstr "Read the previous settings" +#: src/modules/GeoCluster.rb:297 src/modules/GeoCluster.rb:300 +msgid "Read SuSEFirewall Settings" +msgstr "Read SuSEFirewall Settings" + #. #-#-#-#-# geo-cluster.xgettext.pot #-#-#-#-# #. Progress step 2/3 -#: src/modules/GeoCluster.rb:288 src/modules/GeoCluster2.pm:150 +#: src/modules/GeoCluster.rb:299 src/modules/GeoCluster2.pm:150 msgid "Reading the previous settings..." msgstr "Reading the previous settings..." #. Progress finished -#: src/modules/GeoCluster.rb:290 src/modules/GeoCluster.rb:358 +#: src/modules/GeoCluster.rb:301 src/modules/GeoCluster.rb:369 #: src/modules/GeoCluster2.pm:154 src/modules/GeoCluster2.pm:232 msgid "Finished" msgstr "Finished" #. GeoCluster write dialog caption -#: src/modules/GeoCluster.rb:332 +#: src/modules/GeoCluster.rb:343 #, fuzzy #| msgid "Saving geo-cluster Configuration" msgid "Saving Geo Cluster Configuration" msgstr "Saving geo-cluster Configuration" #. Progress stage 1/2 -#: src/modules/GeoCluster.rb:348 src/modules/GeoCluster2.pm:223 +#: src/modules/GeoCluster.rb:359 src/modules/GeoCluster2.pm:223 msgid "Write the settings" msgstr "Write the settings" #. Progress stage 2/2 -#: src/modules/GeoCluster.rb:350 +#: src/modules/GeoCluster.rb:361 msgid "Write the SuSEfirewall settings" msgstr "Write the SuSEfirewall settings" #. Progress step 1/2 -#: src/modules/GeoCluster.rb:354 src/modules/GeoCluster2.pm:228 +#: src/modules/GeoCluster.rb:365 src/modules/GeoCluster2.pm:228 msgid "Writing the settings..." msgstr "Writing the settings..." #. Progress step 2/2 -#: src/modules/GeoCluster.rb:356 +#: src/modules/GeoCluster.rb:367 msgid "Writing the SuSEFirewall settings" msgstr "Writing the SuSEFirewall settings" #. #-#-#-#-# geo-cluster.rxgettext.pot (PACKAGE VERSION) #-#-#-#-# #. Error message -#: src/modules/GeoCluster.rb:379 src/modules/GeoCluster2.pm:242 +#: src/modules/GeoCluster.rb:390 src/modules/GeoCluster2.pm:242 msgid "Cannot write settings." msgstr "Cannot write settings." #. TODO FIXME: your code here... #. Configuration summary text for autoyast -#: src/modules/GeoCluster.rb:440 +#: src/modules/GeoCluster.rb:451 msgid "Configuration summary..." msgstr "Configuration summary..." Modified: trunk/yast/en_GB/po/gtk.en_GB.po =================================================================== --- trunk/yast/en_GB/po/gtk.en_GB.po 2015-09-09 08:18:21 UTC (rev 92602) +++ trunk/yast/en_GB/po/gtk.en_GB.po 2015-09-09 08:19:44 UTC (rev 92603) @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-04 15:52+0200\n" +"POT-Creation-Date: 2015-08-25 18:36+0200\n" "PO-Revision-Date: 2001-07-17 16:27+0200\n" "Last-Translator: James Ogley \n" "Language-Team: English \n" Modified: trunk/yast/en_GB/po/http-server.en_GB.po =================================================================== --- trunk/yast/en_GB/po/http-server.en_GB.po 2015-09-09 08:18:21 UTC (rev 92602) +++ trunk/yast/en_GB/po/http-server.en_GB.po 2015-09-09 08:19:44 UTC (rev 92603) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: http-server.en_GB\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-04 15:52+0200\n" +"POT-Creation-Date: 2015-08-25 18:36+0200\n" "PO-Revision-Date: 2007-08-16 20:49+0100\n" "Last-Translator: Benjamin Weber\n" "Language-Team: British English\n" @@ -148,10 +148,10 @@ #. string status = (string) select( (term) UI::QueryWidget( `id(`modules), `Item(ci) ), 2, _("Enabled") ); #. string name = (string) select( (term) UI::QueryWidget( `id(`modules), `Item(ci) ), 1, nil ); #: src/clients/http-server.rb:350 src/modules/HttpServerWidgets.rb:357 -#: src/modules/HttpServerWidgets.rb:3068 src/modules/HttpServerWidgets.rb:3091 -#: src/modules/HttpServerWidgets.rb:3138 src/modules/HttpServerWidgets.rb:3147 -#: src/modules/HttpServerWidgets.rb:3150 src/modules/HttpServerWidgets.rb:3154 -#: src/modules/HttpServerWidgets.rb:3183 +#: src/modules/HttpServerWidgets.rb:3066 src/modules/HttpServerWidgets.rb:3089 +#: src/modules/HttpServerWidgets.rb:3136 src/modules/HttpServerWidgets.rb:3145 +#: src/modules/HttpServerWidgets.rb:3148 src/modules/HttpServerWidgets.rb:3152 +#: src/modules/HttpServerWidgets.rb:3181 msgid "Enabled" msgstr "Enabled" @@ -159,8 +159,8 @@ #. translators: service status radio button label #. translators: server module status #: src/clients/http-server.rb:352 src/modules/HttpServerWidgets.rb:355 -#: src/modules/HttpServerWidgets.rb:3070 src/modules/HttpServerWidgets.rb:3148 -#: src/modules/HttpServerWidgets.rb:3170 +#: src/modules/HttpServerWidgets.rb:3068 src/modules/HttpServerWidgets.rb:3146 +#: src/modules/HttpServerWidgets.rb:3168 msgid "Disabled" msgstr "Disabled" @@ -171,9 +171,9 @@ #. translators: server module status unknown #. list of all installed modules #: src/clients/http-server.rb:353 src/include/http-server/wizard-dialog.rb:167 -#: src/modules/HttpServerWidgets.rb:3041 src/modules/HttpServerWidgets.rb:3051 -#: src/modules/HttpServerWidgets.rb:3052 src/modules/HttpServerWidgets.rb:3061 -#: src/modules/HttpServerWidgets.rb:3210 +#: src/modules/HttpServerWidgets.rb:3039 src/modules/HttpServerWidgets.rb:3049 +#: src/modules/HttpServerWidgets.rb:3050 src/modules/HttpServerWidgets.rb:3059 +#: src/modules/HttpServerWidgets.rb:3208 msgid "unknown" msgstr "unknown" @@ -723,9 +723,9 @@ #. translators: all network addresses Listen type #. translators: all network addresses Listen type #: src/include/http-server/routines.rb:59 -#: src/modules/HttpServerWidgets.rb:2397 src/modules/HttpServerWidgets.rb:2399 -#: src/modules/HttpServerWidgets.rb:2413 src/modules/HttpServerWidgets.rb:2417 -#: src/modules/HttpServerWidgets.rb:3297 src/modules/HttpServerWidgets.rb:3302 +#: src/modules/HttpServerWidgets.rb:2395 src/modules/HttpServerWidgets.rb:2397 +#: src/modules/HttpServerWidgets.rb:2411 src/modules/HttpServerWidgets.rb:2415 +#: src/modules/HttpServerWidgets.rb:3295 src/modules/HttpServerWidgets.rb:3300 msgid "All Addresses" msgstr "All Addresses" @@ -779,37 +779,37 @@ msgstr "Initialising ..." #. HttpServer read dialog caption -#: src/modules/HttpServer.rb:116 +#: src/modules/HttpServer.rb:131 msgid "Initializing HTTP Server Configuration" msgstr "Initialising HTTP Server Configuration " #. translators: progress stage -#: src/modules/HttpServer.rb:127 +#: src/modules/HttpServer.rb:142 msgid "Check the environment" msgstr "Check the environment" #. translators: progress stage -#: src/modules/HttpServer.rb:129 +#: src/modules/HttpServer.rb:144 msgid "Read Apache2 configuration" msgstr "Read Apache2 configuration" #. translators: progress stage -#: src/modules/HttpServer.rb:131 +#: src/modules/HttpServer.rb:146 msgid "Read network configuration" msgstr "Read network configuration" #. translators: progress step -#: src/modules/HttpServer.rb:135 +#: src/modules/HttpServer.rb:150 msgid "Checking the environment..." msgstr "Checking the environment..." #. translators: progress step -#: src/modules/HttpServer.rb:137 +#: src/modules/HttpServer.rb:152 msgid "Reading Apache2 configuration..." msgstr "Reading Apache2 configuration..." #. translators: progress step -#: src/modules/HttpServer.rb:139 +#: src/modules/HttpServer.rb:154 msgid "Reading network configuration..." msgstr "Reading network configuration..." @@ -818,23 +818,23 @@ #. translators: progress step #. translators: progress finished #. translators: progress finished -#: src/modules/HttpServer.rb:141 src/modules/HttpServer.rb:367 -#: src/modules/HttpServer.rb:408 src/modules/HttpServer.rb:489 +#: src/modules/HttpServer.rb:156 src/modules/HttpServer.rb:388 +#: src/modules/HttpServer.rb:429 src/modules/HttpServer.rb:510 msgid "Finished" msgstr "Finished" #. notification about package needed 1/2 -#: src/modules/HttpServer.rb:170 +#: src/modules/HttpServer.rb:185 msgid "<p>To configure the HTTP server, the <b>%1</b> packages must be installed.</p>" msgstr "<p>To configure the HTTP server, the <b>%1</b> packages must be installed.</p>" #. notification about package needed 2/2 -#: src/modules/HttpServer.rb:174 +#: src/modules/HttpServer.rb:189 msgid "<p>Do you want to install it now?</p>" msgstr "<p>Do you want to install it now?</p>" #. translators: error popup before aborting the module -#: src/modules/HttpServer.rb:180 +#: src/modules/HttpServer.rb:195 msgid "" "The package %1 is not available.\n" "\n" @@ -850,52 +850,52 @@ #. translators: error message, %1 is the file name of expected configuration file #. translators: warning message, %1 is the file name of expected configuration file -#: src/modules/HttpServer.rb:208 src/modules/HttpServer.rb:232 +#: src/modules/HttpServer.rb:223 src/modules/HttpServer.rb:247 msgid "The configuration file '%1' does not exist." msgstr "The configuration file '%1' does not exist." #. off(); -#: src/modules/HttpServer.rb:264 +#: src/modules/HttpServer.rb:279 msgid "There is no DNS server running on this machine." msgstr "There is no DNS server running on this machine." #. HttpServer read dialog caption -#: src/modules/HttpServer.rb:381 +#: src/modules/HttpServer.rb:402 msgid "Saving HTTP Server Configuration" msgstr "Saving HTTP Server Configuration" #. translators: progress stage 1/3 -#: src/modules/HttpServer.rb:392 +#: src/modules/HttpServer.rb:413 msgid "Write the Apache2 settings" msgstr "Write the Apache2 settings" #. translators: progress stage 2/3 -#: src/modules/HttpServer.rb:395 +#: src/modules/HttpServer.rb:416 msgid "Enable Apache2 service" msgstr "Enable Apache2 service" #. translators: progress stage 3/3 -#: src/modules/HttpServer.rb:397 +#: src/modules/HttpServer.rb:418 msgid "Disable Apache2 service" msgstr "Disable Apache2 service" #. translators: progress step 1/3 -#: src/modules/HttpServer.rb:401 +#: src/modules/HttpServer.rb:422 msgid "Writing the settings..." msgstr "Writing the settings..." #. translators: progress step 2/3 -#: src/modules/HttpServer.rb:404 +#: src/modules/HttpServer.rb:425 msgid "Enabling Apache2 service..." msgstr "Enabling Apache2 service..." #. translators: progress step 3/3 -#: src/modules/HttpServer.rb:406 +#: src/modules/HttpServer.rb:427 msgid "Disabling Apache2 service..." msgstr "Disabling Apache2 service..." #. install required RPMs for modules -#: src/modules/HttpServer.rb:420 +#: src/modules/HttpServer.rb:441 msgid "" "The enabled modules require\n" "installation of some of these additional packages:\n" @@ -908,17 +908,17 @@ "Install them now?\n" #. translators: warning in autoyast loading the configuration description. -#: src/modules/HttpServer.rb:529 +#: src/modules/HttpServer.rb:550 msgid "Module description does not have a name specified, ignoring." msgstr "Module description does not have a name specified, ignoring." #. translators: warning in autoyast loading the configuration description. -#: src/modules/HttpServer.rb:541 +#: src/modules/HttpServer.rb:562 msgid "Unknown change of a module for autoinstallation: %1" msgstr "Unknown change of a module for autoinstallation: %1" #. translators: warning in autoyast loading the configuration description. -#: src/modules/HttpServer.rb:560 +#: src/modules/HttpServer.rb:581 msgid "" "Default value for module %1 does not match.\n" "This can cause inconsistent module configuration." @@ -927,38 +927,38 @@ "This can cause inconsistent module configuration." #. translators: error in autoyast loading the configuration description. -#: src/modules/HttpServer.rb:575 +#: src/modules/HttpServer.rb:596 msgid "Listen statement without port found." msgstr "Listen statement without port found." #. "Listen on " information (interfaces, port) -#: src/modules/HttpServer.rb:678 +#: src/modules/HttpServer.rb:730 msgid "<h3>Listen On</h3>" msgstr "<h3>Listen On</h3>" #. "Default host" information -#: src/modules/HttpServer.rb:698 +#: src/modules/HttpServer.rb:750 msgid "<h3>Default Host</h3>" msgstr "<h3>Default Host</h3>" #. translators: assiciation server name with document root #. translators: assiciation server name with document root -#: src/modules/HttpServer.rb:717 src/modules/HttpServer.rb:747 +#: src/modules/HttpServer.rb:769 src/modules/HttpServer.rb:799 msgid " in " msgstr " in " #. translators: whether SSL is enabled or disabled #. translators: whether SSL is enabled or disable -#: src/modules/HttpServer.rb:722 src/modules/HttpServer.rb:751 +#: src/modules/HttpServer.rb:774 src/modules/HttpServer.rb:803 msgid "enabled" msgstr "enabled" -#: src/modules/HttpServer.rb:722 src/modules/HttpServer.rb:751 +#: src/modules/HttpServer.rb:774 src/modules/HttpServer.rb:803 msgid "disabled" msgstr "disabled" #. the same information as in default host but for other virtual hosts -#: src/modules/HttpServer.rb:726 +#: src/modules/HttpServer.rb:778 msgid "<h3>Virtual Hosts</h3>" msgstr "<h3>Virtual Hosts</h3>" @@ -1072,7 +1072,7 @@ #. translators: multi selection box #. translators: multi selection box -#: src/modules/HttpServerWidgets.rb:572 src/modules/HttpServerWidgets.rb:3476 +#: src/modules/HttpServerWidgets.rb:572 src/modules/HttpServerWidgets.rb:3474 msgid "&Listen on Interfaces" msgstr "&Listen on Interfaces" @@ -1280,26 +1280,26 @@ msgid "Administrator E-Mail cannot be empty." msgstr "Administrator E-Mail cannot be empty." -#: src/modules/HttpServerWidgets.rb:1710 +#: src/modules/HttpServerWidgets.rb:1709 #, fuzzy msgid "All addresses (*)" msgstr "All Addresses" -#: src/modules/HttpServerWidgets.rb:1715 +#: src/modules/HttpServerWidgets.rb:1714 msgid "IP Addresses" msgstr "IP Addresses" -#: src/modules/HttpServerWidgets.rb:1717 +#: src/modules/HttpServerWidgets.rb:1716 msgid "ServerName" msgstr "ServerName" -#: src/modules/HttpServerWidgets.rb:1804 +#: src/modules/HttpServerWidgets.rb:1803 #, fuzzy msgid "Name for VirtualHost ID cannot be empty." msgstr "Name for VirtualHost ID can't be empty." #. regexp matches '*' and '*:80' -#: src/modules/HttpServerWidgets.rb:1819 +#: src/modules/HttpServerWidgets.rb:1818 msgid "" "To use name-based virtual hosting,\n" "you must designate the IP address on the server\n" @@ -1307,61 +1307,61 @@ "Also * for all addresses and *:port are acceptable." msgstr "" -#: src/modules/HttpServerWidgets.rb:1855 +#: src/modules/HttpServerWidgets.rb:1854 msgid "Master Zone %1" msgstr "Master Zone %1" -#: src/modules/HttpServerWidgets.rb:1873 +#: src/modules/HttpServerWidgets.rb:1872 msgid "Record %1 already exists in zone %2." msgstr "Record %1 already exists in zone %2." -#: src/modules/HttpServerWidgets.rb:1881 src/modules/HttpServerWidgets.rb:1926 +#: src/modules/HttpServerWidgets.rb:1880 src/modules/HttpServerWidgets.rb:1925 msgid "DNS Settings" msgstr "DNS Settings" -#: src/modules/HttpServerWidgets.rb:1885 +#: src/modules/HttpServerWidgets.rb:1884 msgid "Add to Zone" msgstr "Add to Zone" -#: src/modules/HttpServerWidgets.rb:1930 +#: src/modules/HttpServerWidgets.rb:1929 msgid "Zone Name" msgstr "Zone Name" -#: src/modules/HttpServerWidgets.rb:1931 +#: src/modules/HttpServerWidgets.rb:1930 msgid "Create New Zone" msgstr "Create New Zone" #. disable using SSL for name-based virtual host -#: src/modules/HttpServerWidgets.rb:2022 +#: src/modules/HttpServerWidgets.rb:2021 msgid "CGI Directory" msgstr "CGI Directory" -#: src/modules/HttpServerWidgets.rb:2029 +#: src/modules/HttpServerWidgets.rb:2028 msgid "Choose Certificate File" msgstr "Choose Certificate File" #. translators: error popup -#: src/modules/HttpServerWidgets.rb:2040 +#: src/modules/HttpServerWidgets.rb:2039 msgid "Enter the certificate file." msgstr "Enter the certificate file." -#: src/modules/HttpServerWidgets.rb:2046 +#: src/modules/HttpServerWidgets.rb:2045 msgid "Choose Certificate Key File" msgstr "Choose Certificate Key File" #. translators: error popup -#: src/modules/HttpServerWidgets.rb:2058 +#: src/modules/HttpServerWidgets.rb:2057 msgid "Enter the key file." msgstr "Enter the key file." #. translators: dialog to set *.pem file with certificate #. translators: dialog to set *.pem file with certificate -#: src/modules/HttpServerWidgets.rb:2194 src/modules/HttpServerWidgets.rb:2232 +#: src/modules/HttpServerWidgets.rb:2192 src/modules/HttpServerWidgets.rb:2230 msgid "Select Certificate" msgstr "Select Certificate" #. translators: error message un failed certificate import -#: src/modules/HttpServerWidgets.rb:2224 +#: src/modules/HttpServerWidgets.rb:2222 msgid "" "Cannot import certificate\n" "%1" @@ -1370,63 +1370,63 @@ "%1" #. translators: combo box label for list of configured IPs -#: src/modules/HttpServerWidgets.rb:2431 +#: src/modules/HttpServerWidgets.rb:2429 msgid "Network &Address:" msgstr "Network &Address:" #. translators: error message when validating Listen statement #. translators: popup error -#: src/modules/HttpServerWidgets.rb:2476 src/modules/HttpServerWidgets.rb:3444 +#: src/modules/HttpServerWidgets.rb:2474 src/modules/HttpServerWidgets.rb:3442 msgid "Invalid port number." msgstr "Invalid port number." #. translators: table entry text for name-based vhosts -#: src/modules/HttpServerWidgets.rb:2942 +#: src/modules/HttpServerWidgets.rb:2940 msgid "Resolution via HTTP Headers" msgstr "Resolution via HTTP Headers" #. translators: table entry text for IP-based vhosts -#: src/modules/HttpServerWidgets.rb:2945 +#: src/modules/HttpServerWidgets.rb:2943 msgid "Resolution via IP Address Used" msgstr "Resolution via IP Address Used" -#: src/modules/HttpServerWidgets.rb:3109 +#: src/modules/HttpServerWidgets.rb:3107 msgid "Modules dependency problem" msgstr "" -#: src/modules/HttpServerWidgets.rb:3111 +#: src/modules/HttpServerWidgets.rb:3109 #, fuzzy msgid "requires" msgstr "Requires" -#: src/modules/HttpServerWidgets.rb:3113 +#: src/modules/HttpServerWidgets.rb:3111 #, fuzzy msgid "Enable required module or disable first one." msgstr "Enable precise pointer or disable it." #. translators: combo box for selsect module from installed unknown modules -#: src/modules/HttpServerWidgets.rb:3223 +#: src/modules/HttpServerWidgets.rb:3221 msgid "New Module &Name:" msgstr "New Module &Name:" #. translators: error message -#: src/modules/HttpServerWidgets.rb:3241 +#: src/modules/HttpServerWidgets.rb:3239 msgid "A name for the module to add is required." msgstr "A name for the module to add is required." #. translators: error message -#: src/modules/HttpServerWidgets.rb:3244 +#: src/modules/HttpServerWidgets.rb:3242 msgid "The module is already in the list." msgstr "The module is already in the list." #. FIXME: CreateListen error reporting #. translators: error message for adding a new Listen statement -#: src/modules/HttpServerWidgets.rb:3307 +#: src/modules/HttpServerWidgets.rb:3305 msgid "The entry '%1' already exists." msgstr "The entry '%1' already exists." #. translators: error message -#: src/modules/HttpServerWidgets.rb:3328 +#: src/modules/HttpServerWidgets.rb:3326 msgid "" "The list of the ports to which the server should\n" "listen cannot be empty." @@ -1435,85 +1435,85 @@ "listen cannot be empty." #. translators: popup error - multi selection box with server network adresses -#: src/modules/HttpServerWidgets.rb:3495 +#: src/modules/HttpServerWidgets.rb:3493 msgid "At least one interface must be selected." msgstr "At least one interface must be selected." #. translators: checkbox - support for php script language -#: src/modules/HttpServerWidgets.rb:3522 +#: src/modules/HttpServerWidgets.rb:3520 msgid "Enable &PHP5 Scripting" msgstr "Enable &PHP5 Scripting" #. translators: checkbox - support for perl script language -#: src/modules/HttpServerWidgets.rb:3530 +#: src/modules/HttpServerWidgets.rb:3528 msgid "Enable P&erl Scripting" msgstr "Enable P&erl Scripting" #. translators: checkbox - support for python script language -#: src/modules/HttpServerWidgets.rb:3538 +#: src/modules/HttpServerWidgets.rb:3536 msgid "Enable P&ython Scripting" msgstr "Enable P&ython Scripting" #. illegal keys in vhost -#: src/modules/YaPI/HTTPD.pm:679 src/modules/YaPI/HTTPD.pm:762 +#: src/modules/YaPI/HTTPD.pm:670 src/modules/YaPI/HTTPD.pm:753 #, fuzzy, perl-format #| msgid "Illegal key in vhost '%s'." msgid "Illegal key in virtual host '%s'." msgstr "Illegal key in vhost '%s'." -#: src/modules/YaPI/HTTPD.pm:748 +#: src/modules/YaPI/HTTPD.pm:739 #, perl-format msgid "Internal Error: Data must be an array ref and not %s." msgstr "Internal Error: Data must be an array ref and not %s." -#: src/modules/YaPI/HTTPD.pm:773 +#: src/modules/YaPI/HTTPD.pm:764 msgid "Illegal host ID." msgstr "Illegal host ID." -#: src/modules/YaPI/HTTPD.pm:795 +#: src/modules/YaPI/HTTPD.pm:786 msgid "hostid already exists" msgstr "hostid already exists" -#: src/modules/YaPI/HTTPD.pm:834 +#: src/modules/YaPI/HTTPD.pm:825 msgid "can not delete default host" msgstr "can not delete default host" -#: src/modules/YaPI/HTTPD.pm:855 +#: src/modules/YaPI/HTTPD.pm:846 msgid "hostid not found" msgstr "hostid not found" -#: src/modules/YaPI/HTTPD.pm:1270 +#: src/modules/YaPI/HTTPD.pm:1261 msgid "illegal port" msgstr "illegal port" -#: src/modules/YaPI/HTTPD.pm:1287 +#: src/modules/YaPI/HTTPD.pm:1278 msgid "writing the firewall rules failed" msgstr "writing the firewall rules failed" -#: src/modules/YaPI/HTTPD.pm:1334 +#: src/modules/YaPI/HTTPD.pm:1325 msgid "listen value to delete not found" msgstr "listen value to delete not found" -#: src/modules/YaPI/HTTPD.pm:1587 src/modules/YaPI/HTTPD.pm:1635 -#: src/modules/YaPI/HTTPD.pm:1680 src/modules/YaPI/HTTPD.pm:1763 -#: src/modules/YaPI/HTTPD.pm:1807 +#: src/modules/YaPI/HTTPD.pm:1578 src/modules/YaPI/HTTPD.pm:1626 +#: src/modules/YaPI/HTTPD.pm:1671 src/modules/YaPI/HTTPD.pm:1754 +#: src/modules/YaPI/HTTPD.pm:1798 msgid "Unable to fetch a host with the specified ID." msgstr "Unable to fetch a host with the specified ID." -#: src/modules/YaPI/HTTPD.pm:1596 src/modules/YaPI/HTTPD.pm:1643 -#: src/modules/YaPI/HTTPD.pm:1690 +#: src/modules/YaPI/HTTPD.pm:1587 src/modules/YaPI/HTTPD.pm:1634 +#: src/modules/YaPI/HTTPD.pm:1681 msgid "Corrupt PEM data." msgstr "Corrupt PEM data." -#: src/modules/YaPI/HTTPD.pm:1770 +#: src/modules/YaPI/HTTPD.pm:1761 msgid "No certificate key file configured for this host ID." msgstr "No certificate key file configured for this host ID." -#: src/modules/YaPI/HTTPD.pm:1779 +#: src/modules/YaPI/HTTPD.pm:1770 msgid "Parsing the key file failed." msgstr "Parsing the key file failed." -#: src/modules/YaPI/HTTPD.pm:1812 +#: src/modules/YaPI/HTTPD.pm:1803 msgid "No CA certificate file configured for this host ID." msgstr "No CA certificate file configured for this host ID." @@ -1521,224 +1521,224 @@ msgid "Provides access control based on client host name, IP address, etc." msgstr "Provides access control based on client host name, IP address, etc." -#: src/modules/YaPI/HTTPDModules.pm:23 +#: src/modules/YaPI/HTTPDModules.pm:21 msgid "Executing CGI scripts based on media type or request method" msgstr "Executing CGI scripts based on media type or request method" -#: src/modules/YaPI/HTTPDModules.pm:32 +#: src/modules/YaPI/HTTPDModules.pm:30 msgid "Mapping different parts of the host file system in the document tree and for URL redirection" msgstr "Mapping different parts of the host file system in the document tree and for URL redirection" -#: src/modules/YaPI/HTTPDModules.pm:47 +#: src/modules/YaPI/HTTPDModules.pm:45 msgid "Basic authentication" msgstr "Basic Authentication" -#: src/modules/YaPI/HTTPDModules.pm:56 +#: src/modules/YaPI/HTTPDModules.pm:54 msgid "User authentication using text files" msgstr "User authentication using text files" -#: src/modules/YaPI/HTTPDModules.pm:64 +#: src/modules/YaPI/HTTPDModules.pm:62 msgid "User Authorization" msgstr "User Authorization" -#: src/modules/YaPI/HTTPDModules.pm:72 +#: src/modules/YaPI/HTTPDModules.pm:70 msgid "Group authorization using plaintext files" msgstr "Group authorization using text files" -#: src/modules/YaPI/HTTPDModules.pm:81 +#: src/modules/YaPI/HTTPDModules.pm:79 msgid "User authentication using DBM files" msgstr "User authentication using DBM files" -#: src/modules/YaPI/HTTPDModules.pm:96 +#: src/modules/YaPI/HTTPDModules.pm:94 msgid "Generates directory indices, automatically, similar to the Unix ls command" msgstr "Generates directory indices, automatically, similar to the Unix ls command" -#: src/modules/YaPI/HTTPDModules.pm:117 +#: src/modules/YaPI/HTTPDModules.pm:115 msgid "Execution of CGI scripts" msgstr "Execution of CGI scripts" -#: src/modules/YaPI/HTTPDModules.pm:127 +#: src/modules/YaPI/HTTPDModules.pm:125 msgid "Provides for trailing slash redirects and serving directory index files" msgstr "Provides for trailing slash redirects and serving directory index files" -#: src/modules/YaPI/HTTPDModules.pm:136 +#: src/modules/YaPI/HTTPDModules.pm:134 msgid "Modifies the environment passed to CGI scripts and SSI pages" msgstr "Modifies the environment passed to CGI scripts and SSI pages" -#: src/modules/YaPI/HTTPDModules.pm:146 +#: src/modules/YaPI/HTTPDModules.pm:144 msgid "Generation of Expires HTTP headers according to user-specified criteria" msgstr "Generation of Expires HTTP headers according to user-specified criteria" -#: src/modules/YaPI/HTTPDModules.pm:161 +#: src/modules/YaPI/HTTPDModules.pm:159 msgid "Server-parsed HTML documents (Server Side Includes)" msgstr "Server-parsed HTML documents (Server Side Includes)" -#: src/modules/YaPI/HTTPDModules.pm:175 +#: src/modules/YaPI/HTTPDModules.pm:173 msgid "Logging of the requests made to the server" msgstr "Logging of the requests made to the server" -#: src/modules/YaPI/HTTPDModules.pm:187 +#: src/modules/YaPI/HTTPDModules.pm:185 msgid "Associates the requested file name's extensions with the file's behavior and content" msgstr "Associates the requested file name's extensions with the file's bhaviour and content" -#: src/modules/YaPI/HTTPDModules.pm:212 +#: src/modules/YaPI/HTTPDModules.pm:210 msgid "Provides for content negotiation" msgstr "Provides for content negotiation" -#: src/modules/YaPI/HTTPDModules.pm:222 +#: src/modules/YaPI/HTTPDModules.pm:220 msgid "Allows the setting of environment variables based on characteristics of the request" msgstr "Allows the setting of environment variables based on characteristics of the request" -#: src/modules/YaPI/HTTPDModules.pm:233 +#: src/modules/YaPI/HTTPDModules.pm:231 msgid "Provides information about server activity and performance" msgstr "Provides information about server activity and performance" -#: src/modules/YaPI/HTTPDModules.pm:241 +#: src/modules/YaPI/HTTPDModules.pm:239 msgid "Allows CGI scripts to run as a specified user and group" msgstr "Allows CGI scripts to run as a specified user and group" -#: src/modules/YaPI/HTTPDModules.pm:252 +#: src/modules/YaPI/HTTPDModules.pm:250 msgid "User-specific directories" msgstr "User-specific directories" -#: src/modules/YaPI/HTTPDModules.pm:260 +#: src/modules/YaPI/HTTPDModules.pm:258 msgid "Sends files that contain their own HTTP headers" msgstr "Sends files that contain their own HTTP headers" -#: src/modules/YaPI/HTTPDModules.pm:266 +#: src/modules/YaPI/HTTPDModules.pm:264 msgid "Allows \"anonymous\" user access to authenticated areas" msgstr "Allows \"anonymous\" user access to authenticated areas" -#: src/modules/YaPI/HTTPDModules.pm:287 +#: src/modules/YaPI/HTTPDModules.pm:285 msgid "User authentication using MD5 Digest Authentication" msgstr "User authentication using MD5 Digest Authentication" -#: src/modules/YaPI/HTTPDModules.pm:302 +#: src/modules/YaPI/HTTPDModules.pm:300 msgid "Allows an LDAP directory to be used to store the database for HTTP Basic authentication" msgstr "Allows an LDAP directory to be used to store the database for HTTP Basic authentication" -#: src/modules/YaPI/HTTPDModules.pm:320 src/modules/YaPI/HTTPDModules.pm:495 +#: src/modules/YaPI/HTTPDModules.pm:318 src/modules/YaPI/HTTPDModules.pm:493 msgid "Content cache keyed to URIs" msgstr "Content cache keyed to URIs" -#: src/modules/YaPI/HTTPDModules.pm:337 +#: src/modules/YaPI/HTTPDModules.pm:335 msgid "Specify character set translation or recoding" msgstr "Specify character set translation or recoding" -#: src/modules/YaPI/HTTPDModules.pm:347 +#: src/modules/YaPI/HTTPDModules.pm:345 msgid "Distributed Authoring and Versioning (WebDAV) functionality" msgstr "Distributed Authoring and Versioning (WebDAV) functionality" -#: src/modules/YaPI/HTTPDModules.pm:362 +#: src/modules/YaPI/HTTPDModules.pm:360 msgid "File system provider for mod_dav" msgstr "File system provider for mod_dav" -#: src/modules/YaPI/HTTPDModules.pm:373 +#: src/modules/YaPI/HTTPDModules.pm:371 msgid "Compress content before it is delivered to the client" msgstr "Compress content before it is delivered to the client" -#: src/modules/YaPI/HTTPDModules.pm:392 +#: src/modules/YaPI/HTTPDModules.pm:390 msgid "Content cache storage manager keyed to URIs" msgstr "Content cache storage manager keyed to URIs" -#: src/modules/YaPI/HTTPDModules.pm:405 +#: src/modules/YaPI/HTTPDModules.pm:403 msgid "A simple echo server to illustrate protocol modules" msgstr "A simple echo server to illustrate protocol modules" -#: src/modules/YaPI/HTTPDModules.pm:413 +#: src/modules/YaPI/HTTPDModules.pm:411 msgid "Pass the response body through an external program before delivery to the client" msgstr "Pass the response body through an external program before delivery to the client" -#: src/modules/YaPI/HTTPDModules.pm:426 +#: src/modules/YaPI/HTTPDModules.pm:424 msgid "Caches a static list of files in memory" msgstr "Caches a static list of files in memory" -#: src/modules/YaPI/HTTPDModules.pm:436 +#: src/modules/YaPI/HTTPDModules.pm:434 msgid "Customization of HTTP request and response headers" msgstr "Customization of HTTP request and response headers" -#: src/modules/YaPI/HTTPDModules.pm:449 +#: src/modules/YaPI/HTTPDModules.pm:447 msgid "Server-side image map processing" msgstr "Server-side image map processing" -#: src/modules/YaPI/HTTPDModules.pm:460 +#: src/modules/YaPI/HTTPDModules.pm:458 msgid "Provides a comprehensive overview of the server configuration" msgstr "Provides a comprehensive overview of the server configuration" -#: src/modules/YaPI/HTTPDModules.pm:469 +#: src/modules/YaPI/HTTPDModules.pm:467 msgid "LDAP connection pooling and result caching services for use by other LDAP modules" msgstr "LDAP connection pooling and result caching services for use by other LDAP modules" -#: src/modules/YaPI/HTTPDModules.pm:489 +#: src/modules/YaPI/HTTPDModules.pm:487 msgid "Logging of input and output bytes per request" msgstr "Logging of input and output bytes per request" -#: src/modules/YaPI/HTTPDModules.pm:509 +#: src/modules/YaPI/HTTPDModules.pm:507 msgid "Determines the MIME type of a file by looking at a few bytes of its contents" msgstr "Determines the MIME type of a file by looking at a few bytes of its contents" -#: src/modules/YaPI/HTTPDModules.pm:518 +#: src/modules/YaPI/HTTPDModules.pm:516 msgid "HTTP/1.1 proxy/gateway server" msgstr "HTTP/1.1 proxy/gateway server" -#: src/modules/YaPI/HTTPDModules.pm:566 +#: src/modules/YaPI/HTTPDModules.pm:564 #, fuzzy msgid "AJP support module for mod_proxy" msgstr "FTP support module for mod_proxy" -#: src/modules/YaPI/HTTPDModules.pm:573 +#: src/modules/YaPI/HTTPDModules.pm:571 msgid "mod_proxy extension for CONNECT request handling" msgstr "mod_proxy extension for CONNECT request handling" -#: src/modules/YaPI/HTTPDModules.pm:580 +#: src/modules/YaPI/HTTPDModules.pm:578 msgid "FTP support module for mod_proxy" msgstr "FTP support module for mod_proxy" -#: src/modules/YaPI/HTTPDModules.pm:586 +#: src/modules/YaPI/HTTPDModules.pm:584 msgid "HTTP support module for mod_proxy" msgstr "HTTP support module for mod_proxy" -#: src/modules/YaPI/HTTPDModules.pm:592 +#: src/modules/YaPI/HTTPDModules.pm:590 msgid "Provides a rule-based rewriting engine to rewrite requested URLs on the fly" msgstr "Provides a rule-based rewriting engine to rewrite requested URLs on the fly" -#: src/modules/YaPI/HTTPDModules.pm:619 +#: src/modules/YaPI/HTTPDModules.pm:617 msgid "Attempts to correct mistaken URLs that users might have entered" msgstr "Attempts to correct mistaken URLs that users might have entered" -#: src/modules/YaPI/HTTPDModules.pm:628 +#: src/modules/YaPI/HTTPDModules.pm:626 msgid "Strong cryptography using the Secure Sockets Layer (SSL) and Transport Layer Security (TLS) protocols" msgstr "Strong cryptography using the Secure Sockets Layer (SSL) and Transport Layer Security (TLS) protocols" -#: src/modules/YaPI/HTTPDModules.pm:668 +#: src/modules/YaPI/HTTPDModules.pm:666 msgid "Provides an environment variable with a unique identifier for each request" msgstr "Provides an environment variable with a unique identifier for each request" -#: src/modules/YaPI/HTTPDModules.pm:674 +#: src/modules/YaPI/HTTPDModules.pm:672 msgid "Clickstream logging of user activity on a site" msgstr "Clickstream logging of user activity on a site" -#: src/modules/YaPI/HTTPDModules.pm:694 +#: src/modules/YaPI/HTTPDModules.pm:692 msgid "Provides support for dynamically configured mass virtual hosting" msgstr "Provides support for dynamically configured mass virtual hosting" -#: src/modules/YaPI/HTTPDModules.pm:711 +#: src/modules/YaPI/HTTPDModules.pm:709 msgid "Provides support for PHP5 dynamically generated pages" msgstr "Provides support for PHP5 dynamically generated pages" -#: src/modules/YaPI/HTTPDModules.pm:717 +#: src/modules/YaPI/HTTPDModules.pm:715 msgid "Provides support for Perl dynamically generated pages" msgstr "Provides support for Perl dynamically generated pages" -#: src/modules/YaPI/HTTPDModules.pm:723 +#: src/modules/YaPI/HTTPDModules.pm:721 msgid "Provides support for Python dynamically generated pages" msgstr "Provides support for Python dynamically generated pages" -#: src/modules/YaPI/HTTPDModules.pm:729 +#: src/modules/YaPI/HTTPDModules.pm:727 msgid "Provides support for AppArmor subprocess confinement within apache" msgstr "Provides support for AppArmor subprocess confinement within apache" -#: src/modules/YaPI/HTTPDModules.pm:735 src/modules/YaPI/HTTPDModules.pm:742 +#: src/modules/YaPI/HTTPDModules.pm:733 src/modules/YaPI/HTTPDModules.pm:740 #, fuzzy msgid "Provides support for subversion" msgstr "Provides support for Ruby dynamically generated pages" Modified: trunk/yast/en_GB/po/inetd.en_GB.po =================================================================== --- trunk/yast/en_GB/po/inetd.en_GB.po 2015-09-09 08:18:21 UTC (rev 92602) +++ trunk/yast/en_GB/po/inetd.en_GB.po 2015-09-09 08:19:44 UTC (rev 92603) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-10-29 16:20+0100\n" +"POT-Creation-Date: 2015-08-25 18:36+0200\n" "PO-Revision-Date: 2003-09-09 10:54+0200\n" "Last-Translator: Karl Eichwalder \n" "Language-Team: English \n" Modified: trunk/yast/en_GB/po/installation.en_GB.po =================================================================== --- trunk/yast/en_GB/po/installation.en_GB.po 2015-09-09 08:18:21 UTC (rev 92602) +++ trunk/yast/en_GB/po/installation.en_GB.po 2015-09-09 08:19:44 UTC (rev 92603) @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: installation.en_GB\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-10-29 16:20+0100\n" +"POT-Creation-Date: 2015-08-27 10:52+0200\n" "PO-Revision-Date: 2008-05-16 13:44+0200\n" "Last-Translator: Benjamin Weber\n" "Language-Team: British English\n" @@ -19,23 +19,307 @@ "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Generator: KAider 0.1\n" +#. help for the dialog - busy message +#: src/include/installation/inst_inc_all.rb:52 +msgid "<p>Initializing the installation...</p>" +msgstr "<p>Initialising the installation...</p>" + +#. dialog content - busy message +#: src/include/installation/inst_inc_all.rb:57 +msgid "Preparing the 1st system configuration..." +msgstr "Preparing the 1st system configuration..." + +#. help for the dialog - busy message +#. TRANSLATORS: dialog help +#: src/include/installation/inst_inc_all.rb:59 +#: src/lib/installation/clients/inst_initialization.rb:48 +msgid "<p>Please wait...</p>" +msgstr "<P>Please wait...</P>" + +#. dialog caption +#. TRANSLATORS: progress message +#: src/include/installation/inst_inc_all.rb:64 +#: src/lib/installation/clients/inst_installation_options.rb:154 +msgid "Initializing..." +msgstr "Initialising..." + +#. TRANSLATORS: Error message +#: src/include/installation/inst_inc_all.rb:77 +msgid "" +"No installation control file has been found,\n" +"the installer cannot continue." +msgstr "" + +#. TRANSLATORS: busy message +#. progress step title +#: src/include/installation/inst_inc_all.rb:112 +#: src/lib/installation/clients/yast_inf_finish.rb:73 +#, fuzzy +#| msgid "Writing YaST Configuration..." +msgid "Writing YaST configuration..." +msgstr "Writing YaST Configuration..." + +#. TRANSLATORS: busy message +#. Dialog busy message +#: src/include/installation/inst_inc_all.rb:126 +#: src/lib/installation/clients/inst_congratulate.rb:267 +msgid "Finishing the installation..." +msgstr "Finishing the installation" + +#. Somehow the graphical frontend failed and we're running in +#. text mode. Inform the user about this fact. +#: src/include/installation/inst_inc_all.rb:174 +#, fuzzy +#| msgid "" +#| "Your computer does not fulfill all requirements for\n" +#| "a graphical installation. There is less than %1 MB\n" +#| "memory or the X server could not be started.\n" +#| "\n" +#| "As a fallback, the text front-end of YaST2 will guide you\n" +#| "through the installation. This front-end offers the\n" +#| "same functionality as the graphical one, but the screens\n" +#| "differ from those in the manual.\n" +msgid "" +"Your computer does not fulfill all requirements for\n" +"a graphical installation. There is either less than %1 MB\n" +"memory or the X server could not be started.\n" +"\n" +"As fallback, the text front-end of YaST2 will guide you\n" +"through the installation. This front-end offers the\n" +"same functionality as the graphical one, but the screens\n" +"differ from those in the manual.\n" +msgstr "" +"Your computer does not fulfill all requirements for\n" +"a graphical installation. There is less than %1 MB\n" +"memory or the X server could not be started.\n" +"\n" +"As a fallback, the text front-end of YaST will guide you\n" +"through the installation. This front-end offers the\n" +"same functionality as the graphical one, but the screens\n" +"differ from those in the manual.\n" + +#. The script YaST2 wants to inform about a problem with the +#. option no_x11 but it's broken. +#. else if (Installation::no_x11 ()) +#. Somehow the graphical frontend failed and we're running in +#. text mode. Inform the user about this fact. +#: src/include/installation/inst_inc_all.rb:193 +#, fuzzy +#| msgid "" +#| "The graphical interface could not be started.\n" +#| "\n" +#| "The required packages were not installed (minimal installation) or\n" +#| "the graphics card is not properly supported.\n" +#| "\n" +#| "As a fallback, the text front-end of YaST2 will guide you\n" +#| "through the installation. This front-end offers the\n" +#| "same functionality as the graphical one, but the screens\n" +#| "differ from those in the manual.\n" +msgid "" +"The graphical interface could not be started.\n" +"\n" +"Either the required packages were not installed (minimal installation) \n" +"or the graphics card is not properly supported.\n" +"\n" +"As fallback, the text front-end of YaST2 will guide you\n" +"through the installation. This front-end offers the\n" +"same functionality as the graphical one, but the screens\n" +"differ from those in the manual.\n" +msgstr "" +"The graphical interface could not be started.\n" +"\n" +"The required packages were not installed (minimal installation) or\n" +"the graphics card is not properly supported.\n" +"\n" +"As a fallback, the text front-end of YaST will guide you\n" +"through the installation. This front-end offers the\n" +"same functionality as the graphical one, but the screens\n" +"differ from those in the manual.\n" + +#. TRANSLATORS: progress stage, %1 stands for service name +#: src/include/installation/inst_inc_second.rb:277 +msgid "Start service %1" +msgstr "Start service %1" + +#. TRANSLATORS: progress stage, %1 stands for service name +#. TRANSLATORS: busy message +#: src/include/installation/inst_inc_second.rb:282 +#: src/lib/installation/clients/inst_restore_settings.rb:47 +msgid "Starting service %1..." +msgstr "Starting service %1..." + +#. TRANSLATORS: dialog caption +#: src/include/installation/inst_inc_second.rb:297 +msgid "Adjusting Network Settings" +msgstr "Adjusting Network Settings" + +#. TRANSLATORS: dialog help +#: src/include/installation/inst_inc_second.rb:303 +#, fuzzy +#| msgid "Please wait while network settings are being adjusted..." +msgid "Network settings are being adjusted." +msgstr "Please wait while network settings are being adjusted..." + +#. popup question (#x1) +#: src/include/installation/inst_inc_second.rb:356 +msgid "" +"The previous installation has failed.\n" +"Would you like it to continue?\n" +"\n" +"Note: You may have to enter some information again." +msgstr "" +"The previous installation has failed.\n" +"Would you like it to continue?\n" +"\n" +"Note: You may have to enter some information again." + +#. popup question (#x1) +#: src/include/installation/inst_inc_second.rb:364 +msgid "" +"The previous installation has been aborted.\n" +"Would you like it to continue?\n" +"\n" +"Note: You may have to enter some information again." +msgstr "" +"The previous installation has been aborted.\n" +"Would you like it to continue?\n" +"\n" +"Note: You may have to enter some information again." + +#. popup headline (#x1) +#. TRANSLATORS: starting the installation process +#. dialog cotent (progress information) +#: src/include/installation/inst_inc_second.rb:378 +#: src/lib/installation/clients/inst_doit.rb:60 +msgid "Starting Installation..." +msgstr "Starting Installation" + +#. Heading for confirmation popup before the installation really starts +#: src/include/installation/misc.rb:167 +msgid "Confirm Installation" +msgstr "Confirm Installation" + +#. Text for confirmation popup before the installation really starts 1/3 +#: src/include/installation/misc.rb:170 +#, fuzzy +#| msgid "<p>All information required for the base installation is now complete.</p>" +msgid "<p>Information required for the base installation is now complete.</p>" +msgstr "<p>All information required for the base installation is now complete.</p>" + +#. Text for confirmation popup before the installation really starts 2/3 +#: src/include/installation/misc.rb:182 +#, fuzzy +msgid "" +"<p>If you continue now, <b>existing\n" +"partitions</b> on your hard disk will be <b>deleted</b> or <b>formatted</b>\n" +"(<b>erasing any existing data</b> in those partitions) according to the\n" +"installation settings in the previous dialogs.</p>" +msgstr "" +"\n" +"<p>If you continue now, partitions on your hard disk will be <b>formatted</b>\n" +"(erasing any existing data in those partitions) \n" +"according to the installation settings in the previous dialogs.</p>" + +#. Text for confirmation popup before the installation really starts 2/3 +#: src/include/installation/misc.rb:193 +#, fuzzy +msgid "" +"<p>If you continue now, partitions on your\n" +"hard disk will be modified according to the installation settings in the\n" +"previous dialogs.</p>" +msgstr "" +"\n" +"<p>If you continue now, data on your hard disk will be overwritten \n" +"according to the settings in the previous dialogs.</p>" + +#. Text for confirmation popup before the installation really starts 3/3 +#. Text for confirmation popup before the update really starts 3/3 +#. Text for confirmation popup before the update really starts 3/3 +#: src/include/installation/misc.rb:204 src/include/installation/misc.rb:222 +#: src/lib/installation/proposal_runner.rb:136 +msgid "<p>Go back and check the settings if you are unsure.</p>" +msgstr "<p>Go back and check the settings if you are unsure.</p>" + +#. Heading for confirmation popup before the update really starts +#. Heading for confirmation popup before the update really starts +#: src/include/installation/misc.rb:210 +#: src/lib/installation/proposal_runner.rb:124 +msgid "Confirm Update" +msgstr "Confirm Update" + +#. Text for confirmation popup before the update really starts 1/3 +#. Text for confirmation popup before the update really starts 1/3 +#: src/include/installation/misc.rb:214 +#: src/lib/installation/proposal_runner.rb:128 +#, fuzzy +#| msgid "<p>All information required to perform an update is now complete.</p>" +msgid "<p>Information required to perform an update is now complete.</p>" +msgstr "<p>All information required to perform an update is now complete.</p>" + +#. Text for confirmation popup before the update really starts 2/3 +#. Text for confirmation popup before the update really starts 2/3 +#: src/include/installation/misc.rb:216 +#: src/lib/installation/proposal_runner.rb:130 +#, fuzzy +msgid "" +"\n" +"<p>If you continue now, data on your hard disk will be overwritten\n" +"according to the settings in the previous dialogs.</p>" +msgstr "" +"\n" +"<p>If you continue now, data on your hard disk will be overwritten \n" +"according to the settings in the previous dialogs.</p>" + +#. Label for the button that confirms startint the installation +#. Label for the button that confirms startint the installation +#: src/include/installation/misc.rb:225 +#: src/lib/installation/proposal_runner.rb:139 +msgid "Start &Update" +msgstr "Start &Update" + #. this is a heading -#: doc/proposal/dummy_proposal.rb:61 -msgid "Dummy" -msgstr "Dummy" +#: src/lib/installation/cio_ignore.rb:66 +msgid "Blacklist Devices" +msgstr "" #. this is a menu entry -#: doc/proposal/dummy_proposal.rb:63 -msgid "&Dummy" -msgstr "&Dummy" +#: src/lib/installation/cio_ignore.rb:68 +msgid "B&lacklist Devices" +msgstr "" +#. TRANSLATORS: Installation overview +#. IMPORTANT: Please, do not change the HTML link <a href="...">...</a>, only visible text +#: src/lib/installation/cio_ignore.rb:87 +#, fuzzy +msgid "Blacklist devices enabled (disable</a>)." +msgstr "Installation Mode" + +#. TRANSLATORS: Installation overview +#. IMPORTANT: Please, do not change the HTML link <a href="...">...</a>, only visible text +#: src/lib/installation/cio_ignore.rb:93 +#, fuzzy +msgid "Blacklist devices disabled (enable</a>)." +msgstr "Installation Mode" + +#. TRANSLATORS: help text +#: src/lib/installation/cio_ignore.rb:102 +msgid "<p>Use <b>Blacklist devices</b> if you want to create blacklist channels to such devices which will reduce kernel memory footprint.</p>" +msgstr "" + #. progress step title -#: src/clients/clone_finish.rb:47 +#: src/lib/installation/cio_ignore.rb:157 +#, fuzzy +#| msgid "Starting service %1..." +msgid "Blacklisting Devices..." +msgstr "Starting service %1..." + +#. progress step title +#: src/lib/installation/clients/clone_finish.rb:43 msgid "Generating AutoYaST profile if needed..." msgstr "" #. TRANSLATORS: help text -#: src/clients/clone_proposal.rb:39 +#: src/lib/installation/clients/clone_proposal.rb:39 #, fuzzy msgid "" "<p>Use <b>Clone System Settings</b> if you want to create an AutoYaST profile.\n" @@ -48,15 +332,19 @@ "needs a profile to know what the installed system should look like. If this option is\n" "selected, a profile of the current system is stored in /root/autoyast.xml.</p>\n" +#: src/lib/installation/clients/clone_proposal.rb:60 +msgid "Write AutoYaST profile to /root/autoinst.xmlat the end of installation?" +msgstr "" + #. this is a heading -#: src/clients/clone_proposal.rb:68 +#: src/lib/installation/clients/clone_proposal.rb:71 #, fuzzy #| msgid "Writing the system configuration" msgid "Clone System Configuration" msgstr "Writing the system configuration" #. this is a menu entry -#: src/clients/clone_proposal.rb:70 +#: src/lib/installation/clients/clone_proposal.rb:73 #, fuzzy #| msgid "&Skip Configuration" msgid "&Clone System Configuration" @@ -64,107 +352,100 @@ #. TRANSLATORS: Installation overview #. IMPORTANT: Please, do not change the HTML link <a href="...">...</a>, only visible text -#: src/clients/clone_proposal.rb:98 +#: src/lib/installation/clients/clone_proposal.rb:101 msgid "The AutoYaST profile will be written under /root/autoinst.xml (do not write it</a>)." msgstr "" #. TRANSLATORS: Installation overview #. IMPORTANT: Please, do not change the HTML link <a href="...">...</a>, only visible text -#: src/clients/clone_proposal.rb:107 +#: src/lib/installation/clients/clone_proposal.rb:110 msgid "The AutoYaST profile will not be saved (write it</a>)." msgstr "" -#: src/clients/clone_proposal.rb:119 -msgid "Write AutoYaST profile to /root/autoinst.xml" -msgstr "" - #. progress step title -#: src/clients/copy_files_finish.rb:81 +#: src/lib/installation/clients/copy_files_finish.rb:81 msgid "Copying files to installed system..." msgstr "Copying files to installed system..." #. progress step title -#: src/clients/copy_logs_finish.rb:65 -msgid "Copying log files to installed system..." -msgstr "Copying log files to installed system..." - -#. progress step title -#: src/clients/copy_systemfiles_finish.rb:61 +#: src/lib/installation/clients/copy_systemfiles_finish.rb:60 msgid "Copying system files to the installed system..." msgstr "Copying system files to the installed system..." #. Create a summary #. return string -#: src/clients/deploy_image_auto.rb:90 +#: src/lib/installation/clients/deploy_image_auto.rb:90 #, fuzzy msgid "Installation from images is: <b>enabled</b>" msgstr "Installation Mode" -#: src/clients/deploy_image_auto.rb:91 +#: src/lib/installation/clients/deploy_image_auto.rb:92 #, fuzzy msgid "Installation from images is: <b>disabled</b>" msgstr "Installation Mode" #. TRANSLATORS: dialog caption #. this is a heading -#: src/clients/deploy_image_auto.rb:111 src/clients/deploy_image_auto.rb:116 -#: src/clients/deploying_proposal.rb:133 +#: src/lib/installation/clients/deploy_image_auto.rb:113 +#: src/lib/installation/clients/deploy_image_auto.rb:118 +#: src/lib/installation/clients/deploying_proposal.rb:133 #, fuzzy msgid "Installation from Images" msgstr "Installation Mode" -#: src/clients/deploy_image_auto.rb:119 +#: src/lib/installation/clients/deploy_image_auto.rb:121 msgid "Here you can choose to use Novell pre-defined images to speed up RPM installation." msgstr "" -#: src/clients/deploy_image_auto.rb:133 +#: src/lib/installation/clients/deploy_image_auto.rb:135 #, fuzzy msgid "&Install from Images" msgstr "Installation Mode" -#: src/clients/deploy_image_auto.rb:142 +#: src/lib/installation/clients/deploy_image_auto.rb:144 #, fuzzy msgid "&Do not Install from Images" msgstr "Installation Mode" -#: src/clients/deploy_image_auto.rb:153 +#: src/lib/installation/clients/deploy_image_auto.rb:155 msgid "Custom images deployment - this needs a URL to be configured as installation source" msgstr "" #. Image name, Image location -#: src/clients/deploy_image_auto.rb:162 +#: src/lib/installation/clients/deploy_image_auto.rb:164 msgid "Here you can create custom images.\n" msgstr "" -#: src/clients/deploy_image_auto.rb:163 +#: src/lib/installation/clients/deploy_image_auto.rb:165 msgid "You have to configure the software selection first before you can create an image here" msgstr "" -#: src/clients/deploy_image_auto.rb:174 +#: src/lib/installation/clients/deploy_image_auto.rb:176 msgid "Create an image file (AutoYaST will fetch it from the given location during installation)" msgstr "" -#: src/clients/deploy_image_auto.rb:181 +#: src/lib/installation/clients/deploy_image_auto.rb:183 #, fuzzy #| msgid "&Create Image" msgid "Create Image" msgstr "&Create Image" -#: src/clients/deploy_image_auto.rb:186 +#: src/lib/installation/clients/deploy_image_auto.rb:188 msgid "Where will AutoYaST find the image? (e.g. http://host/)" msgstr "" -#: src/clients/deploy_image_auto.rb:198 +#: src/lib/installation/clients/deploy_image_auto.rb:200 msgid "What is the name of the image? (e.g. my_image)" msgstr "" -#: src/clients/deploy_image_auto.rb:211 +#: src/lib/installation/clients/deploy_image_auto.rb:213 msgid "Create ISO (image and autoinst.xml will be on the media)" msgstr "" #. TRANSLATORS: help text #. TRANSLATORS: help text -#: src/clients/deploy_image_auto.rb:227 src/clients/deploying_proposal.rb:69 +#: src/lib/installation/clients/deploy_image_auto.rb:229 +#: src/lib/installation/clients/deploying_proposal.rb:69 msgid "" "<p><b>Installation from Images</b> is used to speed the installation up.\n" "Images contain compressed snapshots of an installed system matching your\n" @@ -172,7 +453,7 @@ "images will be installed from packages the standard way.</p>\n" msgstr "" -#: src/clients/deploy_image_auto.rb:233 +#: src/lib/installation/clients/deploy_image_auto.rb:235 msgid "" "<p><b>Creating own Images</b> is used if you\n" "want to skip the complete step of RPM installation. Instead AutoYaST will dump an\n" @@ -180,30 +461,31 @@ "Everything else than RPM installation is done like during a normal auto-installation.</p>" msgstr "" -#: src/clients/deploy_image_auto.rb:336 src/clients/deploy_image_auto.rb:347 +#: src/lib/installation/clients/deploy_image_auto.rb:338 +#: src/lib/installation/clients/deploy_image_auto.rb:349 msgid "you need to do the software selection before creating an image" msgstr "" #. TRANSLATORS: help text -#: src/clients/deploying_proposal.rb:76 +#: src/lib/installation/clients/deploying_proposal.rb:76 msgid "" "<p>Note that when installing from images, the time stamps of all packages originating from the images will\n" "not match the installation date but rather the date the image was created.</p>" msgstr "" #. TRANSLATORS: help text -#: src/clients/deploying_proposal.rb:80 +#: src/lib/installation/clients/deploying_proposal.rb:80 msgid "" "<p>Installation from images is disabled by default if the current\n" "pattern selection does not fit any set of images.</p>" msgstr "" -#: src/clients/deploying_proposal.rb:90 +#: src/lib/installation/clients/deploying_proposal.rb:90 msgid "Error: Images should not be used for mode: %1." msgstr "" #. changed to true -#: src/clients/deploying_proposal.rb:119 +#: src/lib/installation/clients/deploying_proposal.rb:119 msgid "" "Cannot enable installation from images.\n" "\n" @@ -212,51 +494,51 @@ msgstr "" #. this is a menu entry -#: src/clients/deploying_proposal.rb:135 +#: src/lib/installation/clients/deploying_proposal.rb:135 #, fuzzy msgid "Installation from &Images" msgstr "Installation Mode" #. TRANSLATORS: Installation overview -#: src/clients/deploying_proposal.rb:155 +#: src/lib/installation/clients/deploying_proposal.rb:155 #, fuzzy msgid "No installation images are available" msgstr "Download installation images" #. TRANSLATORS: Installation overview #. IMPORTANT: Please, do not change the HTML link <a href="...">...</a>, only visible text -#: src/clients/deploying_proposal.rb:166 +#: src/lib/installation/clients/deploying_proposal.rb:166 #, fuzzy msgid "Installation from images is enabled (disable</a>)." msgstr "Installation Mode" #. TRANSLATORS: Installation overview #. IMPORTANT: Please, do not change the HTML link <a href="...">...</a>, only visible text -#: src/clients/deploying_proposal.rb:181 +#: src/lib/installation/clients/deploying_proposal.rb:181 #, fuzzy msgid "Installation from images is disabled (enable</a>)." msgstr "Installation Mode" #. progress step title -#: src/clients/desktop_finish.rb:70 +#: src/lib/installation/clients/desktop_finish.rb:70 msgid "Initializing default window manager..." msgstr "Initialising default window manager..." #. feedback heading -#: src/clients/inst_addon_update_sources.rb:52 +#: src/lib/installation/clients/inst_addon_update_sources.rb:51 #, fuzzy #| msgid "Add-On Product Installation" msgid "Add-on Product Installation" msgstr "Add-On Product Installation" #. feedback message -#: src/clients/inst_addon_update_sources.rb:54 +#: src/lib/installation/clients/inst_addon_update_sources.rb:53 msgid "Reading packages available in the repositories..." msgstr "Reading packages available on the repositories..." #. popup error message #. %1 represents the the error message details -#: src/clients/inst_addon_update_sources.rb:110 +#: src/lib/installation/clients/inst_addon_update_sources.rb:109 msgid "" "An error occurred while connecting to the server.\n" "Details: %1\n" @@ -270,34 +552,34 @@ #. bnc #542792 #. Repository name must be generated from product details -#: src/clients/inst_addon_update_sources.rb:166 +#: src/lib/installation/clients/inst_addon_update_sources.rb:165 #, fuzzy msgid "Updates for %1 %2" msgstr "Alias for %1" -#: src/clients/inst_addon_update_sources.rb:173 -#: src/clients/inst_system_analysis.rb:301 +#: src/lib/installation/clients/inst_addon_update_sources.rb:172 +#: src/lib/installation/clients/inst_system_analysis.rb:304 msgid "Unknown Product" msgstr "Unknown Product" #. strings for "ask for online update"-popup -#: src/clients/inst_ask_online_update.rb:71 +#: src/lib/installation/clients/inst_ask_online_update.rb:70 msgid "Run Update" msgstr "Run Update" -#: src/clients/inst_ask_online_update.rb:72 +#: src/lib/installation/clients/inst_ask_online_update.rb:71 msgid "Skip Update" msgstr "Skip Update" -#: src/clients/inst_ask_online_update.rb:74 +#: src/lib/installation/clients/inst_ask_online_update.rb:73 msgid "Online Update" msgstr "Online Update" -#: src/clients/inst_ask_online_update.rb:75 +#: src/lib/installation/clients/inst_ask_online_update.rb:74 msgid "Run Online Update now?" msgstr "Run Online Update now?" -#: src/clients/inst_ask_online_update.rb:77 +#: src/lib/installation/clients/inst_ask_online_update.rb:76 msgid "" "Select whether to run an online update now.\n" "You may skip this step and run an online update later.\n" @@ -309,45 +591,52 @@ #. Build dialog #. ---------------------------------------------------------------------- #. heading text -#: src/clients/inst_complex_welcome.rb:86 +#: src/lib/installation/clients/inst_complex_welcome.rb:65 msgid "Language, Keyboard and License Agreement" msgstr "" #. combo box label #. combobox #. TRANSLATORS: Combo box -#: src/clients/inst_complex_welcome.rb:92 -#: src/clients/inst_release_notes.rb:218 src/clients/inst_release_notes.rb:437 +#: src/lib/installation/clients/inst_complex_welcome.rb:71 +#: src/lib/installation/clients/inst_release_notes.rb:217 +#: src/lib/installation/clients/inst_release_notes.rb:431 msgid "&Language" msgstr "&Language" #. combo box label -#: src/clients/inst_complex_welcome.rb:100 +#: src/lib/installation/clients/inst_complex_welcome.rb:79 msgid "&Keyboard Layout" msgstr "&Keyboard Layout" #. bnc #359456 #. TRANSLATORS: check-box -#: src/clients/inst_complex_welcome.rb:112 +#: src/lib/installation/clients/inst_complex_welcome.rb:91 #, fuzzy msgid "I &Agree to the License Terms." msgstr "Yes, I Agree to the License Agreement" #. this type of contents will be shown only for initial installation dialog +#: src/lib/installation/clients/inst_complex_welcome.rb:110 +#, fuzzy +#| msgid "Keyboard &test:" +msgid "K&eyboard Test" +msgstr "Keyboard &test:" + #. TRANSLATORS: dialog caption -#: src/clients/inst_complex_welcome.rb:137 -#: src/clients/inst_complex_welcome.rb:318 +#: src/lib/installation/clients/inst_complex_welcome.rb:119 +#: src/lib/installation/clients/inst_complex_welcome.rb:299 msgid "License Agreement" msgstr "License Agreement" #. TRANSLATORS: button label -#: src/clients/inst_complex_welcome.rb:143 +#: src/lib/installation/clients/inst_complex_welcome.rb:141 #, fuzzy msgid "License &Translations..." msgstr "PTR: Reverse Translation" #. help text for initial (first time) language screen -#: src/clients/inst_complex_welcome.rb:172 +#: src/lib/installation/clients/inst_complex_welcome.rb:153 #, fuzzy msgid "" "<p>\n" @@ -362,7 +651,7 @@ #. help text, continued #. Describes the #ICW_B1 button -#: src/clients/inst_complex_welcome.rb:180 +#: src/lib/installation/clients/inst_complex_welcome.rb:161 msgid "" "<p>\n" "The license must be accepted before the installation continues.\n" @@ -371,7 +660,7 @@ msgstr "" #. help text, continued -#: src/clients/inst_complex_welcome.rb:187 +#: src/lib/installation/clients/inst_complex_welcome.rb:168 msgid "" "<p>\n" "Click <b>Next</b> to proceed to the next dialog.\n" @@ -382,7 +671,7 @@ "</p>\n" #. help text, continued -#: src/clients/inst_complex_welcome.rb:193 +#: src/lib/installation/clients/inst_complex_welcome.rb:174 msgid "" "<p>\n" "Nothing will happen to your computer until you confirm\n" @@ -395,7 +684,7 @@ "</p>\n" #. help text, continued -#: src/clients/inst_complex_welcome.rb:200 +#: src/lib/installation/clients/inst_complex_welcome.rb:181 #, fuzzy msgid "" "<p>\n" @@ -414,26 +703,26 @@ #. 7 = Failed to connect to host. #. 28 = Operation timeout. #. push button -#: src/clients/inst_complex_welcome.rb:230 -#: src/clients/inst_download_release_notes.rb:139 -#: src/clients/inst_system_analysis.rb:299 +#: src/lib/installation/clients/inst_complex_welcome.rb:211 +#: src/lib/installation/clients/inst_download_release_notes.rb:126 +#: src/lib/installation/clients/inst_system_analysis.rb:302 #, fuzzy #| msgid "Release Notes" msgid "Re&lease Notes..." msgstr "Release Notes" -#: src/clients/inst_complex_welcome.rb:342 +#: src/lib/installation/clients/inst_complex_welcome.rb:323 msgid "You must accept the license to install this product" msgstr "" #. TRANSLATORS: check box, see #ZMD -#: src/clients/inst_congratulate.rb:107 +#: src/lib/installation/clients/inst_congratulate.rb:107 #, fuzzy msgid "&Disable ZMD Service" msgstr "Disable VPN Services" #. TRANSLATORS: help text, see #ZMD -#: src/clients/inst_congratulate.rb:114 +#: src/lib/installation/clients/inst_congratulate.rb:114 msgid "" "<p>Select <b>Disable ZMD Service</b> to stop and disable\n" "the ZMD service during system start.</p>\n" @@ -441,22 +730,22 @@ #. Check box: start the clone process and store the AutoYaST #. profile in /root/autoinst.xml -#: src/clients/inst_congratulate.rb:149 +#: src/lib/installation/clients/inst_congratulate.rb:149 msgid "&Clone This System for AutoYaST" msgstr "&Clone This System for AutoYaST" #. caption for dialog "Congratulation Dialog" -#: src/clients/inst_congratulate.rb:155 +#: src/lib/installation/clients/inst_congratulate.rb:155 msgid "Installation Completed" msgstr "Installation Completed" #. congratulation text 1/4 -#: src/clients/inst_congratulate.rb:163 +#: src/lib/installation/clients/inst_congratulate.rb:163 msgid "<p><b>Congratulations!</b></p>" msgstr "<p><b>Congratulations!</b></p>" #. congratulation text 2/4 -#: src/clients/inst_congratulate.rb:165 +#: src/lib/installation/clients/inst_congratulate.rb:165 msgid "" "<p>The installation of &product; on your machine is complete.\n" "After clicking <b>Finish</b>, you can log in to the system.</p>\n" @@ -465,22 +754,22 @@ "After clicking <b>Finish</b>, you can log in to the system.</p>\n" #. congratulation text 3/4 -#: src/clients/inst_congratulate.rb:169 +#: src/lib/installation/clients/inst_congratulate.rb:169 msgid "<p>Visit us at %1.</p>" msgstr "<p>Visit us at %1.</p>" #. congratulation text 4/4 -#: src/clients/inst_congratulate.rb:172 +#: src/lib/installation/clients/inst_congratulate.rb:172 msgid "<p>Have a lot of fun!<br>Your SUSE Development Team</p>" msgstr "<p>Have a lot of fun!<br>Your SUSE Development Team</p>" #. help 1/4 for dialog "Congratulation Dialog" -#: src/clients/inst_congratulate.rb:197 +#: src/lib/installation/clients/inst_congratulate.rb:196 msgid "<p>Your system is ready for use.</p>" msgstr "<p>Your system is ready for use.</p>" #. help 2/4 for dialog "Congratulation Dialog" -#: src/clients/inst_congratulate.rb:199 +#: src/lib/installation/clients/inst_congratulate.rb:198 #, fuzzy #| msgid "" #| "<p><b>Finish</b> will close the YaST installation and continue\n" @@ -493,7 +782,7 @@ "to the login screen.</p>\n" #. help 3/4 for dialog "Congratulation Dialog" -#: src/clients/inst_congratulate.rb:204 +#: src/lib/installation/clients/inst_congratulate.rb:203 msgid "" "<p>If you choose the default graphical desktop KDE, you can\n" "adjust some KDE settings to your hardware. Also notice\n" @@ -504,7 +793,7 @@ "our SUSE Welcome Dialogue.</p>\n" #. Show this help only in case of KDE as the default windowmanager -#: src/clients/inst_congratulate.rb:214 +#: src/lib/installation/clients/inst_congratulate.rb:215 #, fuzzy msgid "" "<p>Use <b>Clone</b> if you want to create an AutoYaST profile.\n" @@ -517,33 +806,26 @@ "needs a profile to know what the installed system should look like. If this option is\n" "selected, a profile of the current system is stored in /root/autoyast.xml.</p>\n" -#. Dialog busy message -#. TRANSLATORS: busy message -#: src/clients/inst_congratulate.rb:265 -#: src/include/installation/inst_inc_all.rb:126 -msgid "Finishing the installation..." -msgstr "Finishing the installation" - #. #187558 #. Load Add-On products configured in the fist stage -#: src/clients/inst_congratulate.rb:308 +#: src/lib/installation/clients/inst_congratulate.rb:310 #, fuzzy #| msgid "<p>To access the X11 system, the <b>%1</b> package must be installed.</p>" msgid "<p>To clone the current system, the <b>%1</b> package must be installed.</p>" msgstr "<p>To access the X11 system, the <b>%1</b> package must be installed.</p>" -#: src/clients/inst_congratulate.rb:311 +#: src/lib/installation/clients/inst_congratulate.rb:313 msgid "<p>Install it now?</p>" msgstr "<p>Install it now?</p>" -#: src/clients/inst_congratulate.rb:313 +#: src/lib/installation/clients/inst_congratulate.rb:315 #, fuzzy #| msgid "SuSEfirewall2 package is not installed, firewall will be disabled." msgid "autoyast2 package not installed. Cloning disabled." msgstr "SuSEfirewall2 package is not installed, firewall will be disabled." #. OEM image if target disk is defined -#: src/clients/inst_deploy_image.rb:46 +#: src/lib/installation/clients/inst_deploy_image.rb:46 msgid "The system will reboot now..." msgstr "The system will reboot now..." @@ -552,16 +834,17 @@ #. twice more steps #. FIXME: 2 minutes #. own workflow for OEM image deployment -#: src/clients/inst_deploy_image.rb:106 src/clients/inst_deploy_image.rb:351 -#: src/clients/inst_prepareprogress.rb:110 -#: src/clients/inst_prepareprogress.rb:151 +#: src/lib/installation/clients/inst_deploy_image.rb:106 +#: src/lib/installation/clients/inst_deploy_image.rb:351 +#: src/lib/installation/clients/inst_prepareprogress.rb:110 +#: src/lib/installation/clients/inst_prepareprogress.rb:152 #, fuzzy msgid "Deploying Images..." msgstr "Use Image %1" #. BNC #444209 #. false == error -#: src/clients/inst_deploy_image.rb:167 +#: src/lib/installation/clients/inst_deploy_image.rb:167 #, fuzzy msgid "" "Deploying images has failed.\n" @@ -571,135 +854,128 @@ "Aborting the installation." #. TRANSLATORS: pop-up message -#: src/clients/inst_deploy_image.rb:199 +#: src/lib/installation/clients/inst_deploy_image.rb:199 msgid "" "Debugging has been turned on.\n" "YaST will open a software manager for you to check the current status of packages." msgstr "" #. unknown image -#: src/clients/inst_deploy_image.rb:375 +#: src/lib/installation/clients/inst_deploy_image.rb:375 #, fuzzy msgid "Downloading image at speed %1/s" msgstr "Downloading image %1..." -#: src/clients/inst_deploy_image.rb:380 +#: src/lib/installation/clients/inst_deploy_image.rb:380 #, fuzzy msgid "Downloading image %1 at speed %2/s" msgstr "Downloading image %1..." #. reset the label -#: src/clients/inst_deploy_image.rb:442 +#: src/lib/installation/clients/inst_deploy_image.rb:442 #, fuzzy msgid "Deploying image..." msgstr "Downloading image..." -#: src/clients/inst_deploy_image.rb:445 +#: src/lib/installation/clients/inst_deploy_image.rb:445 #, fuzzy msgid "Deploying image %1..." msgstr "Downloading image..." #. FIXME: move blacklist to Storage -#: src/clients/inst_disk_for_image.rb:84 +#: src/lib/installation/clients/inst_disk_for_image.rb:84 msgid "Select the disk to deploy the image to." msgstr "" -#: src/clients/inst_disk_for_image.rb:85 +#: src/lib/installation/clients/inst_disk_for_image.rb:85 msgid "All data on the disk will be lost!!!" msgstr "" -#: src/clients/inst_disk_for_image.rb:87 +#: src/lib/installation/clients/inst_disk_for_image.rb:87 msgid "&Disk to Use" msgstr "" -#: src/clients/inst_disk_for_image.rb:93 +#: src/lib/installation/clients/inst_disk_for_image.rb:93 msgid "Select the disk, which the image will be deployed to. All data on the disk will be lost and the disk will be partitioned as defined in the image." msgstr "" -#: src/clients/inst_disk_for_image.rb:100 +#: src/lib/installation/clients/inst_disk_for_image.rb:100 msgid "Hard Disk for Image Deployment" msgstr "" #. popup label -#: src/clients/inst_disks_activate.rb:60 +#: src/lib/installation/clients/inst_disks_activate.rb:60 msgid "Detecting Available Controllers" msgstr "Detecting Available Controllers" #. dialog caption -#: src/clients/inst_disks_activate.rb:77 +#: src/lib/installation/clients/inst_disks_activate.rb:76 msgid "Disk Activation" msgstr "Disk Activation" -#: src/clients/inst_disks_activate.rb:87 +#: src/lib/installation/clients/inst_disks_activate.rb:86 msgid "Configure &DASD Disks" msgstr "Configure &DASD Disks" -#: src/clients/inst_disks_activate.rb:93 +#: src/lib/installation/clients/inst_disks_activate.rb:92 msgid "Configure &ZFCP Disks" msgstr "Configure &ZFCP Disks" -#: src/clients/inst_disks_activate.rb:99 +#: src/lib/installation/clients/inst_disks_activate.rb:98 #, fuzzy #| msgid "Configure &Resources" msgid "Configure &FCoE Interfaces" msgstr "Configure &Resources" -#: src/clients/inst_disks_activate.rb:111 +#: src/lib/installation/clients/inst_disks_activate.rb:110 msgid "Configure &iSCSI Disks" msgstr "Configure &iSCSI Disks" -#: src/clients/inst_disks_activate.rb:112 +#: src/lib/installation/clients/inst_disks_activate.rb:111 #, fuzzy #| msgid "Saving network configuration..." msgid "Change Net&work Configuration" msgstr "Saving network configuration..." #. TRANSLATORS: dialog caption -#: src/clients/inst_doit.rb:63 +#: src/lib/installation/clients/inst_doit.rb:56 #, fuzzy msgid "Installation - Warming Up" msgstr "Installation Media" -#. TRANSLATORS: starting the installation process -#. dialog cotent (progress information) -#. popup headline (#x1) -#: src/clients/inst_doit.rb:67 src/include/installation/inst_inc_second.rb:379 -msgid "Starting Installation..." -msgstr "Starting Installation" - #. TRANSLATORS: dialog help -#: src/clients/inst_doit.rb:70 +#: src/lib/installation/clients/inst_doit.rb:63 msgid "<p>Installation is just about to start!</p>" msgstr "" #. Set the UI content to show some progress. -#. TODO FIXME: use a better title (reused existing texts because of text freeze) +#. FIXME: use a better title (reused existing texts because of text freeze) #. TRANSLATORS: dialog caption #. bug #302384 -#: src/clients/inst_download_release_notes.rb:147 -#: src/clients/inst_initialization.rb:56 -#: src/clients/inst_installation_options.rb:151 +#: src/lib/installation/clients/inst_download_release_notes.rb:134 +#: src/lib/installation/clients/inst_initialization.rb:56 +#: src/lib/installation/clients/inst_installation_options.rb:152 msgid "Initializing" msgstr "Initialising" #. TRANSLATORS: dialog progress message -#: src/clients/inst_download_release_notes.rb:147 -#: src/clients/inst_initialization.rb:44 +#: src/lib/installation/clients/inst_download_release_notes.rb:134 +#: src/lib/installation/clients/inst_initialization.rb:44 msgid "Initializing the installation..." msgstr "Initialising the installation..." #. popup message, list of repositores is appended to the text -#: src/clients/inst_extrasources.rb:150 +#: src/lib/installation/clients/inst_extrasources.rb:142 msgid "Package updates have been found in these additional repositories:" msgstr "" #. yes/no popup question -#: src/clients/inst_extrasources.rb:168 +#: src/lib/installation/clients/inst_extrasources.rb:160 msgid "Start the software manager to check and install the updates?" msgstr "" #. check box -#: src/clients/inst_extrasources.rb:512 +#: src/lib/installation/clients/inst_extrasources.rb:501 #, fuzzy #| msgid "Show packages with status" msgid "Show &package updates" @@ -708,128 +984,115 @@ #. Adjust a SlideShow dialog if not configured #. kilobytes #. just make it longer than inst_finish, TODO: better value later -#: src/clients/inst_finish.rb:88 src/clients/inst_prepareprogress.rb:139 -#: src/clients/inst_prepareprogress.rb:157 +#: src/lib/installation/clients/inst_finish.rb:79 +#: src/lib/installation/clients/inst_prepareprogress.rb:140 +#: src/lib/installation/clients/inst_prepareprogress.rb:158 msgid "Finishing Basic Installation" msgstr "Finishing Basic Installation" #. Might be left from the previous stage -#: src/clients/inst_finish.rb:114 +#: src/lib/installation/clients/inst_finish.rb:105 #, fuzzy msgid "Creating list of finish scripts to call..." msgstr "Preinstallation Scripts" #. progress stage -#: src/clients/inst_finish.rb:213 +#: src/lib/installation/clients/inst_finish.rb:204 msgid "Copy files to installed system" msgstr "Copy files to installed system" #. progress stage -#: src/clients/inst_finish.rb:220 +#: src/lib/installation/clients/inst_finish.rb:211 msgid "Save configuration" msgstr "Save configuration" #. progress stage -#: src/clients/inst_finish.rb:227 +#: src/lib/installation/clients/inst_finish.rb:218 msgid "Save installation settings" msgstr "Save installation settings" #. progress stage -#: src/clients/inst_finish.rb:236 +#: src/lib/installation/clients/inst_finish.rb:227 msgid "Install boot manager" msgstr "Install boot manager" #. progress stage -#: src/clients/inst_finish.rb:243 +#: src/lib/installation/clients/inst_finish.rb:234 msgid "Prepare system for initial boot" msgstr "Prepare system for initial boot" #. merge steps from add-on products #. bnc #438678 -#: src/clients/inst_finish.rb:348 +#: src/lib/installation/clients/inst_finish.rb:338 #, fuzzy msgid "Checking stage: %1..." msgstr "Checking for binary %1..." #. a fallback busy message -#: src/clients/inst_finish.rb:437 +#: src/lib/installation/clients/inst_finish.rb:425 #, fuzzy msgid "Calling step %1..." msgstr "Saving queue %1..." #. use as ' * %1' -> ' * One of the finish steps...' in the SlideShow log -#: src/clients/inst_finish.rb:457 +#: src/lib/installation/clients/inst_finish.rb:445 msgid " * %1" msgstr "" #. Anything else -#: src/clients/inst_finish.rb:494 +#: src/lib/installation/clients/inst_finish.rb:482 msgid "Finished" msgstr "Finished" #. get the latest errors -#: src/clients/inst_finish.rb:625 +#: src/lib/installation/clients/inst_finish.rb:614 msgid "Installation Error" msgstr "Installation Error" #. Button to accept a license agreement -#: src/clients/inst_info.rb:63 +#: src/lib/installation/clients/inst_info.rb:63 msgid "I &Agree" msgstr "I &Agree" #. Button to reject a license agreement -#: src/clients/inst_info.rb:67 +#: src/lib/installation/clients/inst_info.rb:67 msgid "I Do &Not Agree" msgstr "I Do &Not Agree" #. TRANSLATORS: dialog help -#: src/clients/inst_initialization.rb:42 +#: src/lib/installation/clients/inst_initialization.rb:42 #, fuzzy #| msgid "Please wait while the installation is being initialized." msgid "Installation is being initialized." msgstr "Please wait while the installation is being initialised." -#. TRANSLATORS: dialog help -#. help for the dialog - busy message -#: src/clients/inst_initialization.rb:48 -#: src/include/installation/inst_inc_all.rb:59 -msgid "<p>Please wait...</p>" -msgstr "<P>Please wait...</P>" - #. TRANSLATORS: dialog progress message -#: src/clients/inst_initialization.rb:50 +#: src/lib/installation/clients/inst_initialization.rb:50 #, fuzzy msgid "Preparing the initial system configuration..." msgstr "Preparing the 1st system configuration..." #. dialog caption -#: src/clients/inst_installation_options.rb:83 +#: src/lib/installation/clients/inst_installation_options.rb:83 #, fuzzy #| msgid "Installation Settings" msgid "Installation Options" msgstr "Installation Settings" -#. TRANSLATORS: progress message -#. dialog caption -#: src/clients/inst_installation_options.rb:153 -#: src/include/installation/inst_inc_all.rb:64 -msgid "Initializing..." -msgstr "Initialising..." - #. check box -#: src/clients/inst_installation_options.rb:180 +#: src/lib/installation/clients/inst_installation_options.rb:181 msgid "&Add Online Repositories Before Installation" msgstr "&Add Online Repositories Before Installation" #. check box -#: src/clients/inst_installation_options.rb:190 +#: src/lib/installation/clients/inst_installation_options.rb:193 #, fuzzy #| msgid "In&clude Add-On Products from Separate Media" msgid "In&clude Add-on Products from Separate Media" msgstr "In&clude Add-On Products from Separate Media" #. help text for installation method -#: src/clients/inst_installation_options.rb:201 +#: src/lib/installation/clients/inst_installation_options.rb:204 #, fuzzy #| msgid "" #| "<p><big><b>Installation Mode</b></big><br>\n" @@ -840,7 +1103,7 @@ "Select what to do:</p>" #. help text for installation option -#: src/clients/inst_installation_options.rb:204 +#: src/lib/installation/clients/inst_installation_options.rb:207 #, fuzzy msgid "" "<p>\n" @@ -852,7 +1115,7 @@ "<b>Add Online Repositories Before Installation</b>.</p>\n" #. help text for installation method -#: src/clients/inst_installation_options.rb:208 +#: src/lib/installation/clients/inst_installation_options.rb:213 #, fuzzy #| msgid "" #| "<p>\n" @@ -868,22 +1131,22 @@ "<b>Include Add-On Products from Separate Media</b>.</p>\n" #. help text: additional help for installation -#: src/clients/inst_installation_options.rb:211 +#: src/lib/installation/clients/inst_installation_options.rb:216 msgid "<p>If you need specific hardware drivers for installation, see <i>http://drivers.suse.com</i> site.</p>" msgstr "" #. Error message -#: src/clients/inst_license.rb:128 +#: src/lib/installation/clients/inst_license.rb:128 msgid "Internal error: Missing license to show" msgstr "" #. TRANSLATORS: dialog caption -#: src/clients/inst_network_check.rb:82 +#: src/lib/installation/clients/inst_network_check.rb:82 msgid "Network Setup" msgstr "Network Setup Method" #. TRANSLATORS: dialog label -#: src/clients/inst_network_check.rb:97 +#: src/lib/installation/clients/inst_network_check.rb:95 #, fuzzy msgid "" "No network setup has been found.\n" @@ -895,28 +1158,28 @@ "otherwise you can safely skip it." #. TRANSLATORS: dialog label -#: src/clients/inst_network_check.rb:107 +#: src/lib/installation/clients/inst_network_check.rb:105 #, fuzzy msgid "Configure your network card now?" msgstr "Would you like to configure your network card now?" #. TRANSLATORS: frame label -#: src/clients/inst_network_check.rb:111 +#: src/lib/installation/clients/inst_network_check.rb:109 msgid "Select" msgstr "Select" #. TRANSLATORS: radio button -#: src/clients/inst_network_check.rb:120 +#: src/lib/installation/clients/inst_network_check.rb:118 msgid "&Yes, Run the Network Setup" msgstr "&Yes, Run the Network Setup" #. TRANSLATORS: radio button -#: src/clients/inst_network_check.rb:128 +#: src/lib/installation/clients/inst_network_check.rb:126 msgid "No, &Skip the Network Setup" msgstr "No, &Skip the Network Setup" #. TRANSLATORS: help text, part 1/2 -#: src/clients/inst_network_check.rb:141 +#: src/lib/installation/clients/inst_network_check.rb:139 #, fuzzy msgid "" "<p>The current installation system does not\n" @@ -926,7 +1189,7 @@ "to have a configured network.</p>" #. TRANSLATORS: help text, part 2/2 -#: src/clients/inst_network_check.rb:145 +#: src/lib/installation/clients/inst_network_check.rb:143 #, fuzzy msgid "" "<p>A configured network is needed for using remote repositories\n" @@ -937,7 +1200,7 @@ "to use any remote repository and you can skip the configuration then.</p>" #. error popup -#: src/clients/inst_network_check.rb:187 +#: src/lib/installation/clients/inst_network_check.rb:185 #, fuzzy #| msgid "" #| "Error while initializing package descriptions.\n" @@ -950,7 +1213,7 @@ "Check the log file %1 for more details." #. TRANSLATORS: help text, part 1 -#: src/clients/inst_new_desktop.rb:57 +#: src/lib/installation/clients/inst_new_desktop.rb:57 msgid "" "<p>At Linux <b>choice</b> is a top priority. <i>openSUSE</i> offers a number \n" "of different desktop environments. Below you see a list of the 2 major ones \n" @@ -958,7 +1221,7 @@ msgstr "" #. TRANSLATORS: help text, part 3 -#: src/clients/inst_new_desktop.rb:63 +#: src/lib/installation/clients/inst_new_desktop.rb:63 msgid "" "<p>You may select alternative desktop environments (or one of minimal installation patterns)\n" "that could fit your needs better using the <b>Other</b> option . Later in the software \n" @@ -967,12 +1230,12 @@ msgstr "" #. TRANSLATORS: dialog caption -#: src/clients/inst_new_desktop.rb:121 +#: src/lib/installation/clients/inst_new_desktop.rb:121 msgid "Desktop Selection" msgstr "Desktop Selection" #. UI wait loop -#: src/clients/inst_new_desktop.rb:190 +#: src/lib/installation/clients/inst_new_desktop.rb:190 #, fuzzy #| msgid "" #| "No desktop was selected. Select the\n" @@ -985,337 +1248,49 @@ "desktop to install." #. BNC #449818 -#: src/clients/inst_new_desktop.rb:380 +#: src/lib/installation/clients/inst_new_desktop.rb:383 msgid "Other" msgstr "Other" #. hide the RN button and set the release notes for SlideShow (bnc#871158) -#: src/clients/inst_prepareprogress.rb:56 +#: src/lib/installation/clients/inst_prepareprogress.rb:56 msgid "Cannot find base product. Release notes will not be shown." msgstr "" #. 1 GB is a good approximation -#: src/clients/inst_prepareprogress.rb:104 +#: src/lib/installation/clients/inst_prepareprogress.rb:104 #, fuzzy msgid "Preparing disks..." msgstr "Preparing ..." -#. kilobytes -#: src/clients/inst_prepareprogress.rb:125 +#. Use 'zero' if image installation is not used +#. BNC #439104 +#: src/lib/installation/clients/inst_prepareprogress.rb:126 msgid "Installing Packages..." msgstr "Installing Packages..." -#. question in a popup box -#: src/clients/inst_proposal.rb:214 -msgid "Really reset everything to default values?" -msgstr "Really reset everything to default values?" - -#. explain consequences of a decision -#: src/clients/inst_proposal.rb:216 -msgid "You will lose all changes." -msgstr "You will lose all changes." - -#. force_reset -#: src/clients/inst_proposal.rb:220 -#, fuzzy -msgid "Location of Stored Configuration" -msgstr "&Use Following Configuration" - -#. force write, so it always write profile even if user do not want -#. to store profile after installation -#: src/clients/inst_proposal.rb:227 -msgid "Failed to store configuration. Details can be found in log." -msgstr "" - -#. message show when user has disabled the configuration -#: src/clients/inst_proposal.rb:238 -msgid "Skipping configuration upon user request" -msgstr "Skipping configuration upon user request" - -#. error message is a popup -#: src/clients/inst_proposal.rb:255 -msgid "" -"The proposal contains an error that must be\n" -"resolved before continuing.\n" -msgstr "" -"The proposal contains an error that must be\n" -"resolved before continuing.\n" - -#. not using tabs -#. heading in proposal, in case the module doesn't create one -#. heading in proposal, in case the module doesn't create one -#: src/clients/inst_proposal.rb:496 src/clients/inst_proposal.rb:498 -#: src/clients/inst_proposal.rb:512 src/clients/inst_proposal.rb:555 -#: src/clients/inst_proposal.rb:557 src/clients/inst_proposal.rb:567 -msgid "ERROR: Missing Title" -msgstr "ERROR: Missing Title" - -#. busy message -#: src/clients/inst_proposal.rb:523 -#, fuzzy -msgid "Adapting the proposal to the current settings..." -msgstr "Cannot read the current settings." - -#. busy message; -#. Initial contents of proposal subwindow while proposals are calculated -#: src/clients/inst_proposal.rb:527 src/clients/inst_proposal.rb:1029 -msgid "Analyzing your system..." -msgstr "Analysing your system..." - -#. fallback proposal, means usually an internal error -#: src/clients/inst_proposal.rb:698 -msgid "ERROR: No proposal" -msgstr "ERROR: No proposal" - -#. Submodules handle their own error reporting -#. text for a message box -#: src/clients/inst_proposal.rb:743 -msgid "" -"Configuration saved.\n" -"There were errors." -msgstr "" -"Configuration saved.\n" -"There were errors." - -#. dialog headline -#: src/clients/inst_proposal.rb:947 -#, fuzzy -msgid "Installation Overview" -msgstr "Installation Server" - -#. Check box: Skip all the configurations in this dialog - -#. do this later manually or not at all -#. Translators: About 40 characters max, -#. use newlines for longer translations. -#. radio button -#: src/clients/inst_proposal.rb:971 -msgid "&Skip Configuration" -msgstr "&Skip Configuration" - -#. radio button -#: src/clients/inst_proposal.rb:980 -msgid "&Use Following Configuration" -msgstr "&Use Following Configuration" - -#. menu button -#. menu button -#. TRANSLATORS: Push button -#: src/clients/inst_proposal.rb:992 src/clients/inst_proposal.rb:1176 -#: src/clients/inst_upgrade_urls.rb:236 -msgid "&Change..." -msgstr "&Change..." - -#. menu button -#: src/clients/inst_proposal.rb:998 src/clients/inst_proposal.rb:1171 -#, fuzzy -#| msgid "&Skip Configuration" -msgid "&Export Configuration" -msgstr "&Skip Configuration" - -#. Help message between headline and installation proposal / settings summary. -#. May contain newlines, but don't make it very much longer than the original. -#: src/clients/inst_proposal.rb:1069 -#, fuzzy -#| msgid "Click any headline to make changes or use the \"Change...\" menu below." -msgid "Click a headline to make changes or use the \"Change...\" menu below." -msgstr "Click any headline to make changes or use the \"Change...\" menu below." - -#: src/clients/inst_proposal.rb:1073 -#, fuzzy -#| msgid "Click any headline to make changes or use the \"Change...\" menu below." -msgid "Click a headline to make changes." -msgstr "Click any headline to make changes or use the \"Change...\" menu below." - -#. menu button item -#: src/clients/inst_proposal.rb:1170 -msgid "&Reset to defaults" -msgstr "&Reset to defaults" - -#. General part of the help text for all types of proposals -#: src/clients/inst_proposal.rb:1206 -msgid "" -"<p>\n" -"Change the values by clicking on the respective headline\n" -"or by using the <b>Change...</b> menu.\n" -"</p>\n" -msgstr "" -"<p>\n" -"Change the values by clicking on the respective headline\n" -"or by using the <b>Change...</b> menu.\n" -"</p>\n" - -#. Help text for installation proposal -#. General part ("You can change values...") is added as the next paragraph. -#: src/clients/inst_proposal.rb:1217 -#, fuzzy -msgid "" -"<p>\n" -"Select <b>Install</b> to perform a new installation with the values displayed.\n" -"</p>\n" -msgstr "" -"<p>\n" -"Use <b>Accept</b> to perform a new installation with the values displayed.\n" -"</p>\n" - -#. kicking out, bug #203811 -#. no such headline -#. // Help text for installation proposal, continued -#. help_text_string = help_text_string + _("<p> -#. To update an existing &product; system instead of doing a new install, -#. click the <b>Mode</b> headline or select <b>Mode</b> in the -#. <b>Change...</b> menu. -#. </p> -#. "); -#. Deliberately omitting "boot installed system" here to avoid -#. confusion: The user will be prompted for that if Linux -#. partitions are found. -#. - sh@suse.de 2002-02-26 -#. -#. Help text for installation proposal, continued -#. Deliberately omitting "boot installed system" here to avoid -#. confusion: The user will be prompted for that if Linux -#. partitions are found. -#. - sh@suse.de 2002-02-26 -#. -#. Help text for installation proposal, continued -#: src/clients/inst_proposal.rb:1243 src/clients/inst_proposal.rb:1270 -#, fuzzy -#| msgid "" -#| "<p>\n" -#| "Your hard disk has not been modified in any way, so you can still safely abort.\n" -#| "</p>\n" -msgid "" -"<p>\n" -"Your hard disk has not been modified yet. You can still safely abort.\n" -"</p>\n" -msgstr "" -"<p>\n" -"Your hard disk has not been modified in any way, so you can still safely abort.\n" -"</p>\n" - -#. Help text for update proposal -#. General part ("You can change values...") is added as the next paragraph. -#: src/clients/inst_proposal.rb:1253 -#, fuzzy -msgid "" -"<p>\n" -"Select <b>Update</b> to perform an update with the values displayed.\n" -"</p>\n" -msgstr "" -"<p>\n" -"Use <b>Accept</b> to perform an update with the values displayed.\n" -"</p>\n" - -#. Help text for network configuration proposal -#. General part ("You can change values...") is added as the next paragraph. -#: src/clients/inst_proposal.rb:1280 -msgid "" -"<p>\n" -"Put the network settings into effect by pressing <b>Next</b>.\n" -"</p>\n" -msgstr "" -"<p>\n" -"Put the network settings into effect by pressing <b>Next</b>.\n" -"</p>\n" - -#. Help text for service configuration proposal -#. General part ("You can change values...") is added as the next paragraph. -#: src/clients/inst_proposal.rb:1291 -msgid "" -"<p>\n" -"Put the service settings into effect by pressing <b>Next</b>.\n" -"</p>\n" -msgstr "" -"<p>\n" -"Put the service settings into effect by pressing <b>Next</b>.\n" -"</p>\n" - -#. Help text for hardware configuration proposal -#. General part ("You can change values...") is added as the next paragraph. -#: src/clients/inst_proposal.rb:1302 -msgid "" -"<p>\n" -"Put the hardware settings into effect by pressing <b>Next</b>.\n" -"</p>\n" -msgstr "" -"<p>\n" -"Put the hardware settings into effect by pressing <b>Next</b>.\n" -"</p>\n" - -#. Proposal in uml module -#: src/clients/inst_proposal.rb:1311 -msgid "<P><B>UML Installation Proposal</B></P>" -msgstr "<P><B>UML Installation Proposal</B></P>" - -#. help text -#: src/clients/inst_proposal.rb:1313 -msgid "" -"<P>UML (User Mode Linux) installation allows you to start independent\n" -"Linux virtual machines in the host system.</P>" -msgstr "" -"<P>UML (User Mode Linux) installation allows you to start independent\n" -"Linux virtual machines in the host system.</P>" - -#. Generic help text for other proposals (not basic installation or -#. hardhware configuration. -#. General part ("You can change values...") is added as the next paragraph. -#: src/clients/inst_proposal.rb:1330 -msgid "" -"<p>\n" -"To use the settings as displayed, press <b>Next</b>.\n" -"</p>\n" -msgstr "" -"<p>\n" -"To use the settings as displayed, press <b>Next</b>.\n" -"</p>\n" - -#. help text -#: src/clients/inst_proposal.rb:1343 -#, fuzzy -#| msgid "" -#| "<p>Some proposals might be\n" -#| "locked by the system administrator, so cannot be changed. To change\n" -#| "a proposal that is locked, ask your system administrator.</p>" -msgid "" -"<p>Some proposals might be\n" -"locked by the system administrator and therefore cannot be changed. If a\n" -"locked proposal needs to be changed, ask your system administrator.</p>\n" -msgstr "" -"<p>Some proposals might be\n" -"locked by the system administrator, so cannot be changed. To change\n" -"a proposal that is locked, ask your system administrator.</p>" - -#. FATE #120373 -#: src/clients/inst_proposal.rb:1369 -msgid "&Update" -msgstr "&Update" - -#: src/clients/inst_proposal.rb:1370 -msgid "&Install" -msgstr "&Install" - #. TRANSLATORS: error message - the module does not provide command line interface -#: src/clients/inst_release_notes.rb:59 +#: src/lib/installation/clients/inst_release_notes.rb:59 msgid "There is no user interface available for this module." msgstr "There is no user interface available for this module." #. combobox item -#: src/clients/inst_release_notes.rb:159 +#: src/lib/installation/clients/inst_release_notes.rb:159 msgid "Language: %1" msgstr "Language: %1" #. caption for dialog "Release Notes" -#: src/clients/inst_release_notes.rb:207 +#: src/lib/installation/clients/inst_release_notes.rb:206 msgid "Release Notes" msgstr "Release Notes" #. +2 thingies on the right -#: src/clients/inst_release_notes.rb:249 +#: src/lib/installation/clients/inst_release_notes.rb:248 msgid "&Product" msgstr "&Product" #. help text for dialog "Release Notes" -#: src/clients/inst_release_notes.rb:261 +#: src/lib/installation/clients/inst_release_notes.rb:260 #, fuzzy #| msgid "" #| "<p>Here are the <b>release notes</b> for the installed\n" @@ -1328,128 +1303,121 @@ "Linux system. They provide a brief summary of new features and changes.</p>" #. informative message in RichText widget -#: src/clients/inst_release_notes.rb:463 +#: src/lib/installation/clients/inst_release_notes.rb:457 msgid "<p>No release notes have been installed.</p>" msgstr "<p>No release notes have been installed.</p>" -#. TRANSLATORS: busy message -#. TRANSLATORS: progress stage, %1 stands for service name -#: src/clients/inst_restore_settings.rb:47 -#: src/include/installation/inst_inc_second.rb:283 -msgid "Starting service %1..." -msgstr "Starting service %1..." - #. TRANSLATORS: help text -#: src/clients/inst_scenarios.rb:108 +#: src/lib/installation/clients/inst_scenarios.rb:108 msgid "" "<p>Select the scenario that meets your needs best.\n" "Additional software can be selected later in software proposal.</p>\n" msgstr "" #. TRANSLATORS: pop-up message -#: src/clients/inst_scenarios.rb:138 +#: src/lib/installation/clients/inst_scenarios.rb:138 #, fuzzy msgid "Choose one scenario, please." msgstr "Choose ftp daemon please." #. TRANSLATORS: frame label -#: src/clients/inst_scenarios.rb:298 +#: src/lib/installation/clients/inst_scenarios.rb:300 #, fuzzy msgid "Choose Scenario" msgstr "Choose Document Root" #. This dialog in not interactive #. always return `back when came from the previous dialog -#: src/clients/inst_system_analysis.rb:80 +#: src/lib/installation/clients/inst_system_analysis.rb:80 msgid "Analyzing the Computer" msgstr "Analysing the Computer" #. TRANSLATORS: progress steps in system probing -#: src/clients/inst_system_analysis.rb:99 +#: src/lib/installation/clients/inst_system_analysis.rb:99 msgid "Probe USB devices" msgstr "Probe USB devices" -#: src/clients/inst_system_analysis.rb:100 +#: src/lib/installation/clients/inst_system_analysis.rb:100 msgid "Probing USB devices..." msgstr "Probing USB devices..." -#: src/clients/inst_system_analysis.rb:103 +#: src/lib/installation/clients/inst_system_analysis.rb:103 msgid "Probe FireWire devices" msgstr "Probe FireWire devices" -#: src/clients/inst_system_analysis.rb:104 +#: src/lib/installation/clients/inst_system_analysis.rb:104 msgid "Probing FireWire devices..." msgstr "Probing FireWire devices..." -#: src/clients/inst_system_analysis.rb:107 +#: src/lib/installation/clients/inst_system_analysis.rb:107 msgid "Probe floppy disk devices" msgstr "Probe floppy disk devices" -#: src/clients/inst_system_analysis.rb:108 +#: src/lib/installation/clients/inst_system_analysis.rb:108 msgid "Probing floppy disk devices..." msgstr "Probing floppy disk devices..." -#: src/clients/inst_system_analysis.rb:112 +#: src/lib/installation/clients/inst_system_analysis.rb:112 msgid "Probe hard disk controllers" msgstr "Probe hard disk controllers" -#: src/clients/inst_system_analysis.rb:113 +#: src/lib/installation/clients/inst_system_analysis.rb:113 msgid "Probing hard disk controllers..." msgstr "Probing hard disk controllers..." -#: src/clients/inst_system_analysis.rb:116 +#: src/lib/installation/clients/inst_system_analysis.rb:116 msgid "Load kernel modules for hard disk controllers" msgstr "Load kernel modules for hard disk controllers" -#: src/clients/inst_system_analysis.rb:117 +#: src/lib/installation/clients/inst_system_analysis.rb:117 msgid "Loading kernel modules for hard disk controllers..." msgstr "Loading kernel modules for hard disk controllers..." -#: src/clients/inst_system_analysis.rb:120 +#: src/lib/installation/clients/inst_system_analysis.rb:120 msgid "Probe hard disks" msgstr "Probe hard disks" -#: src/clients/inst_system_analysis.rb:121 +#: src/lib/installation/clients/inst_system_analysis.rb:121 msgid "Probing hard disks..." msgstr "Probing hard disks..." #. FATE #302980: Simplified user config during installation -#: src/clients/inst_system_analysis.rb:128 +#: src/lib/installation/clients/inst_system_analysis.rb:128 #, fuzzy msgid "Search for system files" msgstr "Search for Patch Name" -#: src/clients/inst_system_analysis.rb:129 +#: src/lib/installation/clients/inst_system_analysis.rb:129 #, fuzzy msgid "Searching for system files..." msgstr "Searching for modified files" -#: src/clients/inst_system_analysis.rb:132 +#: src/lib/installation/clients/inst_system_analysis.rb:132 #, fuzzy #| msgid "Initialize package manager" msgid "Initialize software manager" msgstr "Initialise package manager" -#: src/clients/inst_system_analysis.rb:133 +#: src/lib/installation/clients/inst_system_analysis.rb:133 #, fuzzy #| msgid "Initializing package manager..." msgid "Initializing software manager..." msgstr "Initialising package manager..." #. TRANSLATORS: dialog caption -#: src/clients/inst_system_analysis.rb:138 +#: src/lib/installation/clients/inst_system_analysis.rb:138 msgid "System Probing" msgstr "System Probing" #. TRANSLATORS: dialog help -#: src/clients/inst_system_analysis.rb:144 +#: src/lib/installation/clients/inst_system_analysis.rb:144 #, fuzzy #| msgid "Please wait while computer hardware and installed systems are being probed..." msgid "YaST is probing computer hardware and installed systems now." msgstr "Please wait while computer hardware and installed systems are being probed..." #. additonal error when HW was not found -#: src/clients/inst_system_analysis.rb:241 +#: src/lib/installation/clients/inst_system_analysis.rb:240 #, fuzzy #| msgid "" #| "No hard disks were found for the installation.\n" @@ -1462,7 +1430,7 @@ "Please check your hardware!\n" #. pop-up error report -#: src/clients/inst_system_analysis.rb:255 +#: src/lib/installation/clients/inst_system_analysis.rb:254 #, fuzzy #| msgid "" #| "No hard disks were found for the installation.\n" @@ -1475,7 +1443,7 @@ "No hard disks were found for the installation.\n" "Please check your hardware!\n" -#: src/clients/inst_system_analysis.rb:265 +#: src/lib/installation/clients/inst_system_analysis.rb:264 msgid "" "No hard disks were found for the installation.\n" "During an automatic installation, they might be detected later.\n" @@ -1483,7 +1451,7 @@ msgstr "" #. pop-up error report -#: src/clients/inst_system_analysis.rb:276 +#: src/lib/installation/clients/inst_system_analysis.rb:275 #, fuzzy #| msgid "" #| "No hard disks and no hard disk controllers were\n" @@ -1500,7 +1468,7 @@ "Check your hardware.\n" #. popup message -#: src/clients/inst_system_analysis.rb:318 +#: src/lib/installation/clients/inst_system_analysis.rb:320 #, fuzzy msgid "" "Failed to initialize the software repositories.\n" @@ -1510,33 +1478,34 @@ "Aborting the installation." #. TRANSLATORS: Table item status (repository) -#: src/clients/inst_upgrade_urls.rb:104 +#: src/lib/installation/clients/inst_upgrade_urls.rb:109 #, fuzzy #| msgid "Remove" msgid "Removed" msgstr "Remove" #. TRANSLATORS: Table item status (repository) -#: src/clients/inst_upgrade_urls.rb:108 +#: src/lib/installation/clients/inst_upgrade_urls.rb:113 msgid "Enabled" msgstr "Enabled" #. TRANSLATORS: Table item status (repository) -#: src/clients/inst_upgrade_urls.rb:112 +#: src/lib/installation/clients/inst_upgrade_urls.rb:117 msgid "Disabled" msgstr "Disabled" #. TRANSLATORS: dialog caption #. TRANSLATORS: dialog caption #. TRANSLATORS: dialog caption -#: src/clients/inst_upgrade_urls.rb:209 src/clients/inst_upgrade_urls.rb:677 -#: src/clients/inst_upgrade_urls.rb:736 +#: src/lib/installation/clients/inst_upgrade_urls.rb:220 +#: src/lib/installation/clients/inst_upgrade_urls.rb:617 +#: src/lib/installation/clients/inst_upgrade_urls.rb:676 msgid "Previously Used Repositories" msgstr "Previously Used Repositories" #. TRANSLATORS: dialog text, possibly multiline, #. Please, do not use more than 50 characters per line. -#: src/clients/inst_upgrade_urls.rb:215 +#: src/lib/installation/clients/inst_upgrade_urls.rb:226 #, fuzzy msgid "" "These repositories were found on the system\n" @@ -1546,27 +1515,36 @@ "you are just upgrading:" #. TRANSLATORS: Table header item -#: src/clients/inst_upgrade_urls.rb:225 +#: src/lib/installation/clients/inst_upgrade_urls.rb:236 msgid "Current Status" msgstr "Current Status" #. TRANSLATORS: Table header item -#: src/clients/inst_upgrade_urls.rb:227 +#: src/lib/installation/clients/inst_upgrade_urls.rb:238 msgid "Repository" msgstr "Repository" #. TRANSLATORS: Table header item -#: src/clients/inst_upgrade_urls.rb:229 +#: src/lib/installation/clients/inst_upgrade_urls.rb:240 msgid "URL" msgstr "URL" #. TRANSLATORS: Push button -#: src/clients/inst_upgrade_urls.rb:239 +#. menu button +#. menu button +#: src/lib/installation/clients/inst_upgrade_urls.rb:247 +#: src/lib/installation/proposal_runner.rb:659 +#: src/lib/installation/proposal_runner.rb:783 +msgid "&Change..." +msgstr "&Change..." + +#. TRANSLATORS: Push button +#: src/lib/installation/clients/inst_upgrade_urls.rb:250 msgid "&Toggle Status" msgstr "&Toggle Status" #. TRANSLATORS: help text 1/3 -#: src/clients/inst_upgrade_urls.rb:245 +#: src/lib/installation/clients/inst_upgrade_urls.rb:256 #, fuzzy msgid "" "<p>Here you see all software repositories found\n" @@ -1577,7 +1555,7 @@ "those you want to include in the upgrade process.</p>" #. TRANSLATORS: help text 2/3 -#: src/clients/inst_upgrade_urls.rb:249 +#: src/lib/installation/clients/inst_upgrade_urls.rb:260 #, fuzzy #| msgid "" #| "<p>To enable or disable an URL, click on the\n" @@ -1590,30 +1568,31 @@ "<b>Toggle Status</b> button or double-click on the respective table item.</p>" #. TRANSLATORS: help text 3/3 -#: src/clients/inst_upgrade_urls.rb:253 +#: src/lib/installation/clients/inst_upgrade_urls.rb:264 msgid "<p>To change the URL, click on the <b>Change...</b> button.</p>" msgstr "<p>To change the URL, click on the <b>Change...</b> button.</p>" #. one_url already has "id" and some items might be deleted #. looking to id_to_name is done via the original key #. TRANSLATORS: Fallback name for a repository -#: src/clients/inst_upgrade_urls.rb:275 src/clients/inst_upgrade_urls.rb:282 -#: src/clients/inst_upgrade_urls.rb:288 +#: src/lib/installation/clients/inst_upgrade_urls.rb:286 +#: src/lib/installation/clients/inst_upgrade_urls.rb:293 +#: src/lib/installation/clients/inst_upgrade_urls.rb:299 msgid "Unknown" msgstr "Unknown" #. TRANSLATORS: textentry -#: src/clients/inst_upgrade_urls.rb:383 +#: src/lib/installation/clients/inst_upgrade_urls.rb:373 msgid "&Repository URL" msgstr "&Repository URL" #. TRANSLATORS: popup header -#: src/clients/inst_upgrade_urls.rb:647 +#: src/lib/installation/clients/inst_upgrade_urls.rb:587 msgid "Network is not Configured" msgstr "Network is not Configured" #. TRANSLATORS: popup question -#: src/clients/inst_upgrade_urls.rb:649 +#: src/lib/installation/clients/inst_upgrade_urls.rb:589 #, fuzzy msgid "" "Remote repositories require an Internet connection.\n" @@ -1624,57 +1603,62 @@ "Would you like to configure it?" #. TRANSLATORS: Progress text -#: src/clients/inst_upgrade_urls.rb:680 src/clients/inst_upgrade_urls.rb:737 +#: src/lib/installation/clients/inst_upgrade_urls.rb:620 +#: src/lib/installation/clients/inst_upgrade_urls.rb:677 msgid "Adding and removing repositories..." msgstr "Adding and removing repositories..." #. TRANSLATORS: help text #. TRANSLATORS: help text -#: src/clients/inst_upgrade_urls.rb:683 src/clients/inst_upgrade_urls.rb:742 +#: src/lib/installation/clients/inst_upgrade_urls.rb:623 +#: src/lib/installation/clients/inst_upgrade_urls.rb:682 #, fuzzy #| msgid "<p>Please wait while repositories are being added and removed.</p>" msgid "<p>Repositories are being added and removed.</p>" msgstr "<p>Please wait while repositories are being added and removed.</p>" -#: src/clients/inst_upgrade_urls.rb:702 +#: src/lib/installation/clients/inst_upgrade_urls.rb:642 #, fuzzy msgid "Remove unused repositories" msgstr "Read previously used repositories" #. force reloading the libzypp repomanager to notice the removed files -#: src/clients/inst_upgrade_urls.rb:706 src/clients/inst_upgrade_urls.rb:859 +#: src/lib/installation/clients/inst_upgrade_urls.rb:646 +#: src/lib/installation/clients/inst_upgrade_urls.rb:803 #, fuzzy msgid "Removing unused repositories..." msgstr "Reading previously used repositories..." -#: src/clients/inst_upgrade_urls.rb:713 +#: src/lib/installation/clients/inst_upgrade_urls.rb:653 #, fuzzy msgid "Add enabled repositories" msgstr "Available Repositories" #. Adds selected repositories as <tt>enabled</tt> -#: src/clients/inst_upgrade_urls.rb:716 src/clients/inst_upgrade_urls.rb:925 +#: src/lib/installation/clients/inst_upgrade_urls.rb:656 +#: src/lib/installation/clients/inst_upgrade_urls.rb:869 #, fuzzy msgid "Adding enabled repositories..." msgstr "Adding Repositories..." -#: src/clients/inst_upgrade_urls.rb:725 +#: src/lib/installation/clients/inst_upgrade_urls.rb:665 #, fuzzy msgid "Add disabled repositories" msgstr "Available Repositories" #. Adds selected repositories as <tt>disabled</tt> -#: src/clients/inst_upgrade_urls.rb:729 src/clients/inst_upgrade_urls.rb:1082 +#: src/lib/installation/clients/inst_upgrade_urls.rb:669 +#: src/lib/installation/clients/inst_upgrade_urls.rb:1026 #, fuzzy msgid "Adding disabled repositories..." msgstr "Adding Repositories..." #. true - OK, continue -#: src/clients/inst_upgrade_urls.rb:899 +#: src/lib/installation/clients/inst_upgrade_urls.rb:843 msgid "Correct Media Requested" msgstr "" -#: src/clients/inst_upgrade_urls.rb:901 +#: src/lib/installation/clients/inst_upgrade_urls.rb:845 msgid "" "Make sure that media with label %1\n" "is in the CD/DVD drive.\n" @@ -1684,7 +1668,7 @@ #. Adding repositories in a disabled state, then enable them #. for the system upgrade -#: src/clients/inst_upgrade_urls.rb:964 +#: src/lib/installation/clients/inst_upgrade_urls.rb:908 msgid "" "Cannot add repository %1\n" "URL: %2\n" @@ -1694,7 +1678,7 @@ msgstr "" #. bnc #543468, do not check aliases of repositories stored in Installation::destdir -#: src/clients/inst_upgrade_urls.rb:1001 +#: src/lib/installation/clients/inst_upgrade_urls.rb:945 #, fuzzy msgid "" "Cannot add enabled repository\n" @@ -1706,7 +1690,7 @@ #. TRANSLATORS: error report #. %1 is replaced with repo-name, %2 with repo-URL -#: src/clients/inst_upgrade_urls.rb:1021 +#: src/lib/installation/clients/inst_upgrade_urls.rb:965 #, fuzzy msgid "" "An error occurred while refreshing repository\n" @@ -1716,7 +1700,7 @@ #. TRANSLATORS: error report #. %1 is replaced with repo-name, %2 with repo-URL -#: src/clients/inst_upgrade_urls.rb:1041 +#: src/lib/installation/clients/inst_upgrade_urls.rb:985 #, fuzzy msgid "" "An error occurred while enabling repository\n" @@ -1727,7 +1711,7 @@ "%2" #. do not probe! adding as disabled! -#: src/clients/inst_upgrade_urls.rb:1122 +#: src/lib/installation/clients/inst_upgrade_urls.rb:1066 #, fuzzy msgid "" "Cannot add disabled repository\n" @@ -1738,17 +1722,17 @@ "%2" #. dialog caption -#: src/clients/inst_welcome.rb:69 +#: src/lib/installation/clients/inst_welcome.rb:68 msgid "Welcome" msgstr "Welcome" #. welcome text 1/4 -#: src/clients/inst_welcome.rb:72 +#: src/lib/installation/clients/inst_welcome.rb:71 msgid "<p><b>Welcome!</b></p>" msgstr "<p><b>Welcome!</b></p>" #. welcome text 2/4 -#: src/clients/inst_welcome.rb:74 +#: src/lib/installation/clients/inst_welcome.rb:73 msgid "" "<p>There are a few more steps to take before your system is ready to\n" "use. YaST will now guide you through some basic configuration. Click\n" @@ -1761,7 +1745,7 @@ " \n" #. help ttext -#: src/clients/inst_welcome.rb:88 +#: src/lib/installation/clients/inst_welcome.rb:85 #, fuzzy #| msgid "" #| "<p>Click <b>Next</b> to go through the\n" @@ -1774,125 +1758,109 @@ "basic configuration of the system.</p>\n" #. TRANSLATORS: error message -#: src/clients/installation.rb:83 +#: src/lib/installation/clients/installation.rb:83 msgid "No workflow defined for this kind of installation." msgstr "No workflow defined for this kind of installation." #. progress step title -#: src/clients/installation_settings_finish.rb:60 +#: src/lib/installation/clients/installation_settings_finish.rb:60 #, fuzzy msgid "Writing automatic configuration..." msgstr "Writing routing configuration..." #. progress step title -#: src/clients/kernel_finish.rb:64 +#: src/lib/installation/clients/kernel_finish.rb:63 msgid "Updating kernel module dependencies..." msgstr "Updating kernel module dependencies..." #. progress step title -#: src/clients/ldconfig_finish.rb:61 +#: src/lib/installation/clients/ldconfig_finish.rb:60 #, fuzzy #| msgid "Setting up linker cache" msgid "Setting up linker cache..." msgstr "Setting up linker cache" #. progress step title -#: src/clients/network_finish.rb:69 +#: src/lib/installation/clients/network_finish.rb:68 msgid "Saving network configuration..." msgstr "Saving network configuration..." #. progress step title -#: src/clients/pre_umount_finish.rb:65 +#: src/lib/installation/clients/pre_umount_finish.rb:65 msgid "Checking the installed system..." msgstr "Checking the installed system..." #. progress step title -#: src/clients/proxy_finish.rb:63 +#: src/lib/installation/clients/proxy_finish.rb:62 msgid "Saving proxy configuration..." msgstr "Saving proxy configuration..." #. progress step title -#: src/clients/save_config_finish.rb:136 +#: src/lib/installation/clients/save_config_finish.rb:134 msgid "Saving time zone..." msgstr "Saving time zone..." #. progress step title -#: src/clients/save_config_finish.rb:145 +#: src/lib/installation/clients/save_config_finish.rb:143 msgid "Saving language..." msgstr "Saving language..." #. progress step title -#: src/clients/save_config_finish.rb:150 +#: src/lib/installation/clients/save_config_finish.rb:148 msgid "Saving console configuration..." msgstr "Saving console configuration..." #. progress step title -#: src/clients/save_config_finish.rb:169 +#: src/lib/installation/clients/save_config_finish.rb:167 msgid "Saving keyboard configuration..." msgstr "Saving keyboard configuration..." #. progress step title -#: src/clients/save_config_finish.rb:174 +#: src/lib/installation/clients/save_config_finish.rb:172 msgid "Saving product information..." msgstr "Saving product information..." #. progress step title -#: src/clients/save_config_finish.rb:179 +#: src/lib/installation/clients/save_config_finish.rb:177 #, fuzzy #| msgid "Saving automatical installation settings..." msgid "Saving automatic installation settings..." msgstr "Saving automatical installation settings..." #. progress step title -#: src/clients/save_config_finish.rb:185 +#: src/lib/installation/clients/save_config_finish.rb:183 #, fuzzy #| msgid "Reading security settings..." msgid "Saving security settings..." msgstr "Reading security settings..." #. progress step title -#: src/clients/save_config_finish.rb:208 -#, fuzzy -#| msgid "Saving sound card settings..." -msgid "Saving boot scripts settings..." -msgstr "Saving sound card settings..." - -#. progress step title -#: src/clients/save_hw_status_finish.rb:67 +#: src/lib/installation/clients/save_hw_status_finish.rb:66 msgid "Saving hardware configuration..." msgstr "Saving hardware configuration..." #. progress step title -#: src/clients/ssh_settings_finish.rb:65 +#: src/lib/installation/clients/ssh_settings_finish.rb:64 msgid "Copying SSH settings to installed system..." msgstr "Copying SSH settings to installed system..." #. progress step title -#: src/clients/switch_scr_finish.rb:65 +#: src/lib/installation/clients/switch_scr_finish.rb:65 msgid "Moving to installed system..." msgstr "Moving to installed system..." #. progress step title -#: src/clients/umount_finish.rb:71 +#: src/lib/installation/clients/umount_finish.rb:71 msgid "Unmounting all mounted devices..." msgstr "Unmounting all mounted devices..." #. progress step title -#: src/clients/x11_finish.rb:66 +#: src/lib/installation/clients/x11_finish.rb:65 msgid "Copying X Window System configuration into system..." msgstr "Copying X Window System configuration into system..." -#. progress step title -#. TRANSLATORS: busy message -#: src/clients/yast_inf_finish.rb:74 -#: src/include/installation/inst_inc_all.rb:112 -#, fuzzy -#| msgid "Writing YaST Configuration..." -msgid "Writing YaST configuration..." -msgstr "Writing YaST Configuration..." - #. call command -#: src/clients/yast_inf_finish.rb:109 +#: src/lib/installation/clients/yast_inf_finish.rb:108 #, fuzzy msgid "" "\n" @@ -1917,277 +1885,307 @@ "\n" "***********************************************************\n" -#. dialog content - busy message -#: src/include/installation/inst_inc_all.rb:50 -msgid "Initializing the installation environment..." -msgstr "Initialising the installation environment..." +#. ------------------------------------------------------------------------------ +#. Copyright (c) 2006-2015 Novell, Inc. All Rights Reserved. +#. +#. +#. This program is free software; you can redistribute it and/or modify it under +#. the terms of version 2 of the GNU General Public License as published by the +#. Free Software Foundation. +#. +#. This program is distributed in the hope that it will be useful, but WITHOUT +#. ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS +#. FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. +#. +#. You should have received a copy of the GNU General Public License along with +#. this program; if not, contact Novell, Inc. +#. +#. To contact Novell about this file by physical or electronic mail, you may find +#. current contact information at www.novell.com. +#. ------------------------------------------------------------------------------ +#: src/lib/installation/copy_logs_finish.rb:42 +msgid "Copying log files to installed system..." +msgstr "Copying log files to installed system..." -#. help for the dialog - busy message -#: src/include/installation/inst_inc_all.rb:52 -msgid "<p>Initializing the installation...</p>" -msgstr "<p>Initialising the installation...</p>" +#. progress step title +#: src/lib/installation/prep_shrink.rb:34 +#, fuzzy +#| msgid "Searching for Linux partitions..." +msgid "Shrinking PREP partition..." +msgstr "Searching for Linux partitions..." -#. dialog content - busy message -#: src/include/installation/inst_inc_all.rb:57 -msgid "Preparing the 1st system configuration..." -msgstr "Preparing the 1st system configuration..." +#. question in a popup box +#: src/lib/installation/proposal_runner.rb:207 +msgid "Really reset everything to default values?" +msgstr "Really reset everything to default values?" -#. TRANSLATORS: Error message -#: src/include/installation/inst_inc_all.rb:77 -msgid "" -"No installation control file has been found,\n" -"the installer cannot continue." +#. explain consequences of a decision +#: src/lib/installation/proposal_runner.rb:209 +msgid "You will lose all changes." +msgstr "You will lose all changes." + +#. while input loop +#: src/lib/installation/proposal_runner.rb:251 +#, fuzzy +msgid "Location of Stored Configuration" +msgstr "&Use Following Configuration" + +#. force write, so it always write profile even if user do not want +#. to store profile after installation +#: src/lib/installation/proposal_runner.rb:257 +msgid "Failed to store configuration. Details can be found in log." msgstr "" -#. Somehow the graphical frontend failed and we're running in -#. text mode. Inform the user about this fact. -#: src/include/installation/inst_inc_all.rb:174 -#, fuzzy -#| msgid "" -#| "Your computer does not fulfill all requirements for\n" -#| "a graphical installation. There is less than %1 MB\n" -#| "memory or the X server could not be started.\n" -#| "\n" -#| "As a fallback, the text front-end of YaST2 will guide you\n" -#| "through the installation. This front-end offers the\n" -#| "same functionality as the graphical one, but the screens\n" -#| "differ from those in the manual.\n" +#. message show when user has disabled the configuration +#: src/lib/installation/proposal_runner.rb:268 +msgid "Skipping configuration upon user request" +msgstr "Skipping configuration upon user request" + +#. error message is a popup +#: src/lib/installation/proposal_runner.rb:288 msgid "" -"Your computer does not fulfill all requirements for\n" -"a graphical installation. There is either less than %1 MB\n" -"memory or the X server could not be started.\n" -"\n" -"As fallback, the text front-end of YaST2 will guide you\n" -"through the installation. This front-end offers the\n" -"same functionality as the graphical one, but the screens\n" -"differ from those in the manual.\n" +"The proposal contains an error that must be\n" +"resolved before continuing.\n" msgstr "" -"Your computer does not fulfill all requirements for\n" -"a graphical installation. There is less than %1 MB\n" -"memory or the X server could not be started.\n" -"\n" -"As a fallback, the text front-end of YaST will guide you\n" -"through the installation. This front-end offers the\n" -"same functionality as the graphical one, but the screens\n" -"differ from those in the manual.\n" +"The proposal contains an error that must be\n" +"resolved before continuing.\n" -#. The script YaST2 wants to inform about a problem with the -#. option no_x11 but it's broken. -#. else if (Installation::no_x11 ()) -#. Somehow the graphical frontend failed and we're running in -#. text mode. Inform the user about this fact. -#: src/include/installation/inst_inc_all.rb:193 +#. busy message +#: src/lib/installation/proposal_runner.rb:394 #, fuzzy -#| msgid "" -#| "The graphical interface could not be started.\n" -#| "\n" -#| "The required packages were not installed (minimal installation) or\n" -#| "the graphics card is not properly supported.\n" -#| "\n" -#| "As a fallback, the text front-end of YaST2 will guide you\n" -#| "through the installation. This front-end offers the\n" -#| "same functionality as the graphical one, but the screens\n" -#| "differ from those in the manual.\n" +msgid "Adapting the proposal to the current settings..." +msgstr "Cannot read the current settings." + +#. busy message; +#. Initial contents of proposal subwindow while proposals are calculated +#: src/lib/installation/proposal_runner.rb:398 +#: src/lib/installation/proposal_runner.rb:687 +msgid "Analyzing your system..." +msgstr "Analysing your system..." + +#. fallback proposal, means usually an internal error +#: src/lib/installation/proposal_runner.rb:500 +msgid "ERROR: No proposal" +msgstr "ERROR: No proposal" + +#. Submodules handle their own error reporting +#. text for a message box +#: src/lib/installation/proposal_runner.rb:539 msgid "" -"The graphical interface could not be started.\n" -"\n" -"Either the required packages were not installed (minimal installation) \n" -"or the graphics card is not properly supported.\n" -"\n" -"As fallback, the text front-end of YaST2 will guide you\n" -"through the installation. This front-end offers the\n" -"same functionality as the graphical one, but the screens\n" -"differ from those in the manual.\n" +"Configuration saved.\n" +"There were errors." msgstr "" -"The graphical interface could not be started.\n" -"\n" -"The required packages were not installed (minimal installation) or\n" -"the graphics card is not properly supported.\n" -"\n" -"As a fallback, the text front-end of YaST will guide you\n" -"through the installation. This front-end offers the\n" -"same functionality as the graphical one, but the screens\n" -"differ from those in the manual.\n" +"Configuration saved.\n" +"There were errors." -#. TRANSLATORS: progress stage, %1 stands for service name -#: src/include/installation/inst_inc_second.rb:278 -msgid "Start service %1" -msgstr "Start service %1" +#. Check box: Skip all the configurations in this dialog - +#. do this later manually or not at all +#. Translators: About 40 characters max, +#. use newlines for longer translations. +#. radio button +#: src/lib/installation/proposal_runner.rb:634 +msgid "&Skip Configuration" +msgstr "&Skip Configuration" -#. TRANSLATORS: dialog caption -#: src/include/installation/inst_inc_second.rb:298 -msgid "Adjusting Network Settings" -msgstr "Adjusting Network Settings" +#. radio button +#: src/lib/installation/proposal_runner.rb:643 +msgid "&Use Following Configuration" +msgstr "&Use Following Configuration" -#. TRANSLATORS: dialog help -#: src/include/installation/inst_inc_second.rb:304 +#. menu button +#: src/lib/installation/proposal_runner.rb:667 +#: src/lib/installation/proposal_runner.rb:778 #, fuzzy -#| msgid "Please wait while network settings are being adjusted..." -msgid "Network settings are being adjusted." -msgstr "Please wait while network settings are being adjusted..." +#| msgid "&Skip Configuration" +msgid "&Export Configuration" +msgstr "&Skip Configuration" -#. popup question (#x1) -#: src/include/installation/inst_inc_second.rb:357 -msgid "" -"The previous installation has failed.\n" -"Would you like it to continue?\n" -"\n" -"Note: You may have to enter some information again." -msgstr "" -"The previous installation has failed.\n" -"Would you like it to continue?\n" -"\n" -"Note: You may have to enter some information again." +#. Help message between headline and installation proposal / settings summary. +#. May contain newlines, but don't make it very much longer than the original. +#: src/lib/installation/proposal_runner.rb:713 +#, fuzzy +#| msgid "Click any headline to make changes or use the \"Change...\" menu below." +msgid "Click a headline to make changes or use the \"Change...\" menu below." +msgstr "Click any headline to make changes or use the \"Change...\" menu below." -#. popup question (#x1) -#: src/include/installation/inst_inc_second.rb:365 -msgid "" -"The previous installation has been aborted.\n" -"Would you like it to continue?\n" -"\n" -"Note: You may have to enter some information again." -msgstr "" -"The previous installation has been aborted.\n" -"Would you like it to continue?\n" -"\n" -"Note: You may have to enter some information again." +#: src/lib/installation/proposal_runner.rb:717 +#, fuzzy +#| msgid "Click any headline to make changes or use the \"Change...\" menu below." +msgid "Click a headline to make changes." +msgstr "Click any headline to make changes or use the \"Change...\" menu below." -#. Heading for confirmation popup before the installation really starts -#: src/include/installation/misc.rb:199 -msgid "Confirm Installation" -msgstr "Confirm Installation" +#. menu button item +#: src/lib/installation/proposal_runner.rb:777 +msgid "&Reset to defaults" +msgstr "&Reset to defaults" -#. Text for confirmation popup before the installation really starts 1/3 -#: src/include/installation/misc.rb:202 +#. FATE #120373 +#: src/lib/installation/proposal_runner.rb:800 +msgid "&Update" +msgstr "&Update" + +#: src/lib/installation/proposal_runner.rb:800 +msgid "&Install" +msgstr "&Install" + +#. @return [String] translated headline +#: src/lib/installation/proposal_store.rb:57 #, fuzzy -#| msgid "<p>All information required for the base installation is now complete.</p>" -msgid "<p>Information required for the base installation is now complete.</p>" -msgstr "<p>All information required for the base installation is now complete.</p>" +msgid "Installation Overview" +msgstr "Installation Server" -#. Text for confirmation popup before the installation really starts 2/3 -#: src/include/installation/misc.rb:214 -#, fuzzy +#. General part of the help text for all types of proposals +#: src/lib/installation/proposal_store.rb:77 msgid "" -"<p>If you continue now, <b>existing\n" -"partitions</b> on your hard disk will be <b>deleted</b> or <b>formatted</b>\n" -"(<b>erasing any existing data</b> in those partitions) according to the\n" -"installation settings in the previous dialogs.</p>" +"<p>\n" +"Change the values by clicking on the respective headline\n" +"or by using the <b>Change...</b> menu.\n" +"</p>\n" msgstr "" -"\n" -"<p>If you continue now, partitions on your hard disk will be <b>formatted</b>\n" -"(erasing any existing data in those partitions) \n" -"according to the installation settings in the previous dialogs.</p>" +"<p>\n" +"Change the values by clicking on the respective headline\n" +"or by using the <b>Change...</b> menu.\n" +"</p>\n" -#. Text for confirmation popup before the installation really starts 2/3 -#: src/include/installation/misc.rb:225 +#. Help text for installation proposal, continued +#: src/lib/installation/proposal_store.rb:85 #, fuzzy +#| msgid "" +#| "<p>\n" +#| "Your hard disk has not been modified in any way, so you can still safely abort.\n" +#| "</p>\n" msgid "" -"<p>If you continue now, partitions on your\n" -"hard disk will be modified according to the installation settings in the\n" -"previous dialogs.</p>" +"<p>\n" +"Your hard disk has not been modified yet. You can still safely abort.\n" +"</p>\n" msgstr "" -"\n" -"<p>If you continue now, data on your hard disk will be overwritten \n" -"according to the settings in the previous dialogs.</p>" +"<p>\n" +"Your hard disk has not been modified in any way, so you can still safely abort.\n" +"</p>\n" -#. Text for confirmation popup before the installation really starts 3/3 -#. Text for confirmation popup before the update really starts 3/3 -#: src/include/installation/misc.rb:236 src/include/installation/misc.rb:254 -msgid "<p>Go back and check the settings if you are unsure.</p>" -msgstr "<p>Go back and check the settings if you are unsure.</p>" - -#. Heading for confirmation popup before the update really starts -#: src/include/installation/misc.rb:242 -msgid "Confirm Update" -msgstr "Confirm Update" - -#. Text for confirmation popup before the update really starts 1/3 -#: src/include/installation/misc.rb:246 +#. Help text for installation proposal +#. General part ("You can change values...") is added as the next paragraph. +#: src/lib/installation/proposal_store.rb:417 #, fuzzy -#| msgid "<p>All information required to perform an update is now complete.</p>" -msgid "<p>Information required to perform an update is now complete.</p>" -msgstr "<p>All information required to perform an update is now complete.</p>" +msgid "" +"<p>\n" +"Select <b>Install</b> to perform a new installation with the values displayed.\n" +"</p>\n" +msgstr "" +"<p>\n" +"Use <b>Accept</b> to perform a new installation with the values displayed.\n" +"</p>\n" -#. Text for confirmation popup before the update really starts 2/3 -#: src/include/installation/misc.rb:248 +#. so update +#. Help text for update proposal +#. General part ("You can change values...") is added as the next paragraph. +#: src/lib/installation/proposal_store.rb:425 #, fuzzy msgid "" -"\n" -"<p>If you continue now, data on your hard disk will be overwritten\n" -"according to the settings in the previous dialogs.</p>" +"<p>\n" +"Select <b>Update</b> to perform an update with the values displayed.\n" +"</p>\n" msgstr "" -"\n" -"<p>If you continue now, data on your hard disk will be overwritten \n" -"according to the settings in the previous dialogs.</p>" +"<p>\n" +"Use <b>Accept</b> to perform an update with the values displayed.\n" +"</p>\n" -#. Label for the button that confirms startint the installation -#: src/include/installation/misc.rb:258 -msgid "Start &Update" -msgstr "Start &Update" +#. Help text for network configuration proposal +#. General part ("You can change values...") is added as the next paragraph. +#: src/lib/installation/proposal_store.rb:434 +msgid "" +"<p>\n" +"Put the network settings into effect by pressing <b>Next</b>.\n" +"</p>\n" +msgstr "" +"<p>\n" +"Put the network settings into effect by pressing <b>Next</b>.\n" +"</p>\n" -#. this is a heading -#: src/lib/installation/cio_ignore.rb:42 -msgid "Blacklist Devices" +#. Help text for service configuration proposal +#. General part ("You can change values...") is added as the next paragraph. +#: src/lib/installation/proposal_store.rb:442 +msgid "" +"<p>\n" +"Put the service settings into effect by pressing <b>Next</b>.\n" +"</p>\n" msgstr "" +"<p>\n" +"Put the service settings into effect by pressing <b>Next</b>.\n" +"</p>\n" -#. this is a menu entry -#: src/lib/installation/cio_ignore.rb:44 -msgid "B&lacklist Devices" +#. Help text for hardware configuration proposal +#. General part ("You can change values...") is added as the next paragraph. +#: src/lib/installation/proposal_store.rb:450 +msgid "" +"<p>\n" +"Put the hardware settings into effect by pressing <b>Next</b>.\n" +"</p>\n" msgstr "" +"<p>\n" +"Put the hardware settings into effect by pressing <b>Next</b>.\n" +"</p>\n" -#. TRANSLATORS: Installation overview -#. IMPORTANT: Please, do not change the HTML link <a href="...">...</a>, only visible text -#: src/lib/installation/cio_ignore.rb:63 -#, fuzzy -msgid "Blacklist devices enabled (disable</a>)." -msgstr "Installation Mode" +#. Proposal in uml module +#: src/lib/installation/proposal_store.rb:457 +msgid "<P><B>UML Installation Proposal</B></P>" +msgstr "<P><B>UML Installation Proposal</B></P>" -#. TRANSLATORS: Installation overview -#. IMPORTANT: Please, do not change the HTML link <a href="...">...</a>, only visible text -#: src/lib/installation/cio_ignore.rb:69 -#, fuzzy -msgid "Blacklist devices disabled (enable</a>)." -msgstr "Installation Mode" +#. help text +#: src/lib/installation/proposal_store.rb:459 +msgid "" +"<P>UML (User Mode Linux) installation allows you to start independent\n" +"Linux virtual machines in the host system.</P>" +msgstr "" +"<P>UML (User Mode Linux) installation allows you to start independent\n" +"Linux virtual machines in the host system.</P>" -#. TRANSLATORS: help text -#: src/lib/installation/cio_ignore.rb:78 -msgid "<p>Use <b>Blacklist devices</b> if you want to create blacklist channels to such devices which will reduce kernel memory footprint.</p>" +#. Generic help text for other proposals (not basic installation or +#. hardhware configuration. +#. General part ("You can change values...") is added as the next paragraph. +#: src/lib/installation/proposal_store.rb:473 +msgid "" +"<p>\n" +"To use the settings as displayed, press <b>Next</b>.\n" +"</p>\n" msgstr "" +"<p>\n" +"To use the settings as displayed, press <b>Next</b>.\n" +"</p>\n" -#. progress step title -#: src/lib/installation/cio_ignore.rb:135 -#, fuzzy -#| msgid "Starting service %1..." -msgid "Blacklisting Devices..." -msgstr "Starting service %1..." - -#. progress step title -#: src/lib/installation/prep_shrink.rb:35 -#, fuzzy -#| msgid "Searching for Linux partitions..." -msgid "Shrinking PREP partition..." -msgstr "Searching for Linux partitions..." - #. Text to display #. #. @return String -#: src/lib/installation/remote_finish_client.rb:68 +#: src/lib/installation/remote_finish_client.rb:67 #, fuzzy #| msgid "Remote Administration" msgid "Enabling remote administration..." msgstr "Remote Administration" +#. Writes configuration +#. +#. It creates a snapshot when no second stage is required and +#. Snapper is configured. +#. +#. @return [TrueClass,FalseClass] True if snapshot was created; +#. otherwise it returns false. +#: src/lib/installation/snapshots_finish.rb:40 +#, fuzzy +#| msgid "Copying root filesystem..." +msgid "Creating root filesystem snapshot..." +msgstr "Copying root filesystem..." + #. checking whether images are supported #. BNC #409927 #. Checking files for signatures -#: src/modules/ImageInstallation.rb:845 +#: src/modules/ImageInstallation.rb:840 #, fuzzy #| msgid "Failed to copy %1 to installation system" msgid "Failed to read information about installation images" msgstr "Failed to copy %1 to installation system" -#. sleep in order not to kill -USR1 to dd too early, otherwise it finishes -#: src/modules/ImageInstallation.rb:1193 +#. count megabytes +#: src/modules/ImageInstallation.rb:1196 #, fuzzy msgid "Deploying..." msgstr "Downloading image..." @@ -2196,7 +2194,7 @@ #. #. @see #all_supported_types #. @see #objects_state -#: src/modules/ImageInstallation.rb:1216 +#: src/modules/ImageInstallation.rb:1219 #, fuzzy msgid "Storing user preferences..." msgstr "Storing volume settings..." @@ -2204,19 +2202,50 @@ #. Restores packages statuses from 'objects_state': Selects packages for removal, installation, upgrade. #. #. @return [Boolean] if successful -#: src/modules/ImageInstallation.rb:1348 +#: src/modules/ImageInstallation.rb:1351 #, fuzzy msgid "Restoring user preferences..." msgstr "Restarting services..." #. Error message -#: src/modules/ImageInstallation.rb:1446 +#: src/modules/ImageInstallation.rb:1448 msgid "" "Installation was unable to solve package dependencies automatically.\n" "Software manager will be opened for you to solve them manually." msgstr "" +#~ msgid "ERROR: Missing Title" +#~ msgstr "ERROR: Missing Title" + #, fuzzy +#~| msgid "" +#~| "<p>Some proposals might be\n" +#~| "locked by the system administrator, so cannot be changed. To change\n" +#~| "a proposal that is locked, ask your system administrator.</p>" +#~ msgid "" +#~ "<p>Some proposals might be\n" +#~ "locked by the system administrator and therefore cannot be changed. If a\n" +#~ "locked proposal needs to be changed, ask your system administrator.</p>\n" +#~ msgstr "" +#~ "<p>Some proposals might be\n" +#~ "locked by the system administrator, so cannot be changed. To change\n" +#~ "a proposal that is locked, ask your system administrator.</p>" + +#~ msgid "Initializing the installation environment..." +#~ msgstr "Initialising the installation environment..." + +#~ msgid "Dummy" +#~ msgstr "Dummy" + +#~ msgid "&Dummy" +#~ msgstr "&Dummy" + +#, fuzzy +#~| msgid "Saving sound card settings..." +#~ msgid "Saving boot scripts settings..." +#~ msgstr "Saving sound card settings..." + +#, fuzzy #~ msgid "License needs to be accepted" #~ msgstr "needs to be reinstalled" Modified: trunk/yast/en_GB/po/instserver.en_GB.po =================================================================== --- trunk/yast/en_GB/po/instserver.en_GB.po 2015-09-09 08:18:21 UTC (rev 92602) +++ trunk/yast/en_GB/po/instserver.en_GB.po 2015-09-09 08:19:44 UTC (rev 92603) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-10-29 16:20+0100\n" +"POT-Creation-Date: 2015-08-25 18:36+0200\n" "PO-Revision-Date: 2001-07-17 16:27+0200\n" "Last-Translator: James Ogley \n" "Language-Team: English \n" Modified: trunk/yast/en_GB/po/iplb.en_GB.po =================================================================== --- trunk/yast/en_GB/po/iplb.en_GB.po 2015-09-09 08:18:21 UTC (rev 92602) +++ trunk/yast/en_GB/po/iplb.en_GB.po 2015-09-09 08:19:44 UTC (rev 92603) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: opensuse-i 18n\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-04 15:52+0200\n" +"POT-Creation-Date: 2015-08-25 18:36+0200\n" "PO-Revision-Date: 2014-05-19 09:34+0200\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" Modified: trunk/yast/en_GB/po/iscsi-client.en_GB.po =================================================================== --- trunk/yast/en_GB/po/iscsi-client.en_GB.po 2015-09-09 08:18:21 UTC (rev 92602) +++ trunk/yast/en_GB/po/iscsi-client.en_GB.po 2015-09-09 08:19:44 UTC (rev 92603) @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-04 15:52+0200\n" +"POT-Creation-Date: 2015-08-25 18:36+0200\n" "PO-Revision-Date: 2007-08-16 19:20+0100\n" "Last-Translator: Benjamin Weber\n" "Language-Team: British English\n" @@ -120,8 +120,10 @@ msgstr "Edit" #: src/include/iscsi-client/dialogs.rb:161 -msgid "Log Out" -msgstr "Log Out" +#, fuzzy +#| msgid "Disconnected" +msgid "Disconnect" +msgstr "Disconnected" #: src/include/iscsi-client/dialogs.rb:186 msgid "Connected" @@ -132,9 +134,6 @@ msgstr "Discovery" #: src/include/iscsi-client/dialogs.rb:193 -msgid "Log In" -msgstr "Log In" - #: src/include/iscsi-client/dialogs.rb:223 msgid "Connect" msgstr "Connect" @@ -217,8 +216,8 @@ #. dialog for all targets from portal (connected/disconnected) #. authentification dialog for add/discovery target #: src/include/iscsi-client/dialogs.rb:404 -#: src/include/iscsi-client/helps.rb:107 src/include/iscsi-client/helps.rb:119 -#: src/include/iscsi-client/helps.rb:126 +#: src/include/iscsi-client/helps.rb:110 src/include/iscsi-client/helps.rb:122 +#: src/include/iscsi-client/helps.rb:129 msgid "<h1>iSCSI Initiator</h1>" msgstr "<h1>iSCSI Initiator</h1>" @@ -337,34 +336,27 @@ #. table of connected targets #: src/include/iscsi-client/helps.rb:90 -#, fuzzy -msgid "" -"List of current sessions. To add a new target, select it and press <b>Add</b>.\n" -"To remove it, press <b>Log Out</b>.\n" -"To change the start-up status, press <b>Toggle</b>.\n" +msgid "<p>List of current sessions.</p><p>Use the <b>Add</b> button to get additional targets. A discovery is started to detect new targets and the start-up mode of already connected targets keeps unchanged.<br>Use <b>Disconnect</b> to cancel the connection and with it remove the target from the list.<br>To change the start-up status, press <b>Edit</b>.</p>" msgstr "" -"List of current sessions. To add a new target, press <b>Add</b>.\n" -"To remove one, select it and press <b>Log Out</b>.\n" -"To change start-up status, press <b>Toggle</b>.\n" #. Warning #. Warning -#: src/include/iscsi-client/helps.rb:96 src/include/iscsi-client/helps.rb:114 +#: src/include/iscsi-client/helps.rb:99 src/include/iscsi-client/helps.rb:117 msgid "<h1>Warning</h1>" msgstr "<h1>Warning</h1>" -#: src/include/iscsi-client/helps.rb:97 src/include/iscsi-client/helps.rb:115 +#: src/include/iscsi-client/helps.rb:100 src/include/iscsi-client/helps.rb:118 msgid "<p>When accessing an iSCSI device <b>READ</b>/<b>WRITE</b>, make sure that this access is exclusive. Otherwise there is a potential risk of data corruption.</p>\n" msgstr "<p>When accessing an iSCSI device <b>READ</b>/<b>WRITE</b>, make sure that this access is exclusive. Otherwise there is a potential risk of data corruption.</p>\n" -#: src/include/iscsi-client/helps.rb:100 +#: src/include/iscsi-client/helps.rb:103 #, fuzzy msgid "" -"<p><b>InitiatorName</b> is a value from <tt>/etc/iscsi/initiatorname.iscsi</tt>. \n" +"<p><b>Initiator Name</b> is a value from <tt>/etc/iscsi/initiatorname.iscsi</tt>. \n" "In case you have iBFT, this value will be added from there and you are only able to change it in the BIOS setup.</p>" msgstr "<p><b>InitiatorName</b> is value from /etc/initiatorname.iscsi. In case you have iBFT this value will be replaced from there and you are not able to change it (do it in BIOS Setup).</p>" -#: src/include/iscsi-client/helps.rb:103 +#: src/include/iscsi-client/helps.rb:106 #, fuzzy msgid "" "If you want to use <b>iSNS</b> (Internet Storage Name Service) for discovering targets instead of the default SendTargets method,\n" @@ -373,9 +365,14 @@ "If you want to use <b>iSNS</b> (Internet Storage Name Service) for discovering targets instead of default SendTargets method,\n" "fill IP address of iSNS server and port. Default port should be 3205." -#: src/include/iscsi-client/helps.rb:108 +#: src/include/iscsi-client/helps.rb:111 +#, fuzzy +#| msgid "" +#| "Enter the <b>IP Address</b> of the discovered server.\n" +#| "Only change <b>Port</b> if needed. For authentication, use <b>Username</b> and <b>Password</b>. If you do not need authentication,\n" +#| "select <b>No Authentication</b>.\n" msgid "" -"Enter the <b>IP Address</b> of the discovered server.\n" +"Enter the <b>IP Address</b> of the iSCSI target server.\n" "Only change <b>Port</b> if needed. For authentication, use <b>Username</b> and <b>Password</b>. If you do not need authentication,\n" "select <b>No Authentication</b>.\n" msgstr "" @@ -383,14 +380,10 @@ "Only change <b>Port</b> if needed. For authentication, use <b>Username</b> and <b>Password</b>. If you do not need authentication,\n" "select <b>No Authentication</b>.\n" -#: src/include/iscsi-client/helps.rb:122 +#: src/include/iscsi-client/helps.rb:125 msgid "List of nodes offered by the iSCSI target. Select one item and click <b>Connect</b>. " msgstr "List of nodes offered by the iSCSI target. Select one item and click <b>Connect</b>. " -#: src/include/iscsi-client/helps.rb:129 -msgid "Select the type of authentication and enter the <b>Username</b> and <b>Password</b>." -msgstr "Select the type of authentication and enter the <b>Username</b> and <b>Password</b>." - #: src/include/iscsi-client/helps.rb:132 #, fuzzy msgid "<h1>Startup</h1>" @@ -406,12 +399,22 @@ "starts up.</p>\n" msgstr "" -#. list of discovered targets +#: src/include/iscsi-client/helps.rb:141 +#, fuzzy +#| msgid "Authentication" +msgid "<h1>Authentication</h1>" +msgstr "Authentication" + #: src/include/iscsi-client/helps.rb:142 -msgid "List of discovered targets. Start a new <b>Discovery</b> or <b>Connect</b> to any target." -msgstr "List of discovered targets. Start a new <b>Discovery</b> or <b>Connect</b> to any target." +msgid "<p>The default setting here is <i>No Authentication</i>. Uncheck the checkbox if authentication is needed for security reasons. Enter <b>Username</b> and <b>Password</b> for 'Incoming Authentication', 'Outgoing Authentication' or for both.</p><p><b>Please note:</b><br>'Incoming Authentication' here correlates to 'Outgoing Authentication' on iSCSI target server side and the other way round.</p>" +msgstr "" -#: src/include/iscsi-client/helps.rb:145 +#. list of discovered targets +#: src/include/iscsi-client/helps.rb:151 +msgid "<p>This screen shows the list of discovered targets.</p><p>Use the <b>Discovery</b> button to get available iSCSI targets from a server specified by IP address.<br><b>Connect</b> to a target to establih the connection. If login was successful the column <i>Connected</i> shows status 'True' and the target will appear on the <i>Connected Targets</i> screen.<br>To remove a target use the <b>Delete</b> button.<br> <b>Hint:</b> Removing of targets is only possible for not connected onces. If required, <b>Disconnect</b> at <i>Connected Targets</i> first.</p><p><b>Please note:</b> Starting the <b>Discovery</b> again means doing a re-discovery of targets which possibly will change the start-up mode of already connected targets (to default 'manual'). Switch to <i>Connected Targets</i> screen and use the <b>Add</b> button if you want to add new targets without changing the start-up mode.</p>" +msgstr "" + +#: src/include/iscsi-client/helps.rb:167 msgid "<h1>iBTF</h1>" msgstr "<h1>iBTF</h1>" @@ -465,16 +468,24 @@ msgstr "Port field can't be empty" #. regexp for "cz.suse" or just "suse", "cz.su-se" -#: src/include/iscsi-client/widgets.rb:423 +#: src/include/iscsi-client/widgets.rb:428 #, fuzzy +#| msgid "Initiator Name" +msgid "Incorrect Initiator Name" +msgstr "Initiator Name" + +#: src/include/iscsi-client/widgets.rb:429 +#, fuzzy msgid "" -"Incorrect InitiatorName.\n" +"\n" "The correct syntax is\n" "iqn.yyyy-mm.reversed.domain.name[:identifier]\n" "or eui.yyyy-mm.reversed.domain.name[:identifier]\n" "\n" "Example:\n" "iqn.2007-04.cz.server:storage.disk.sdb\n" +"\n" +"Do you want to use the name?\n" msgstr "" "Incorrect InitiatorName\n" "Correct syntax is\n" @@ -484,12 +495,12 @@ "iqn.2007-04.cz.server:storage.disk.sdb\n" #. brackets needed around IPv6 -#: src/include/iscsi-client/widgets.rb:625 +#: src/include/iscsi-client/widgets.rb:635 msgid "Insert the IP address." msgstr "Insert the IP address." #. validate port number -#: src/include/iscsi-client/widgets.rb:631 +#: src/include/iscsi-client/widgets.rb:641 msgid "Insert the port." msgstr "Insert the port." @@ -497,37 +508,37 @@ #. ******************* target table ************************* #. initialize dialog for all targets from portal (connected/disconnected) #. enable/disable connect button according target is or not already connected -#: src/include/iscsi-client/widgets.rb:733 -#: src/include/iscsi-client/widgets.rb:838 -#: src/include/iscsi-client/widgets.rb:866 +#: src/include/iscsi-client/widgets.rb:754 +#: src/include/iscsi-client/widgets.rb:859 +#: src/include/iscsi-client/widgets.rb:887 msgid "True" msgstr "True" -#: src/include/iscsi-client/widgets.rb:733 -#: src/include/iscsi-client/widgets.rb:838 +#: src/include/iscsi-client/widgets.rb:754 +#: src/include/iscsi-client/widgets.rb:859 msgid "False" msgstr "False" #. check if not already connected #. check if not already connected -#: src/include/iscsi-client/widgets.rb:771 -#: src/include/iscsi-client/widgets.rb:891 +#: src/include/iscsi-client/widgets.rb:792 +#: src/include/iscsi-client/widgets.rb:912 #, fuzzy msgid "The target with this TargetName is already connected. Make sure that multipathing is enabled to prevent data corruption." msgstr "The target with this TargetName is already connected. Make sure that Multipathing is enabled to prevent data corruption." -#: src/include/iscsi-client/widgets.rb:774 -#: src/include/iscsi-client/widgets.rb:894 +#: src/include/iscsi-client/widgets.rb:795 +#: src/include/iscsi-client/widgets.rb:915 msgid "Continue" msgstr "Continue" -#: src/include/iscsi-client/widgets.rb:775 -#: src/include/iscsi-client/widgets.rb:895 +#: src/include/iscsi-client/widgets.rb:796 +#: src/include/iscsi-client/widgets.rb:916 msgid "Cancel" msgstr "Cancel" #. check if is not already connected -#: src/include/iscsi-client/widgets.rb:885 +#: src/include/iscsi-client/widgets.rb:906 msgid "The target is already connected." msgstr "The target is already connected." @@ -620,7 +631,7 @@ msgstr "all" #. } -#: src/modules/IscsiClientLib.rb:694 +#: src/modules/IscsiClientLib.rb:698 #, fuzzy msgid "" "InitiatorName from iBFT and from <tt>/etc/iscsi/initiatorname.iscsi</tt>\n" @@ -632,11 +643,40 @@ "Old initiatorname will be replaced by value from iBFT and create a backup.\n" "If you want to use different initiatorname change it in BIOS." +#. change startup status (manual/onboot) for target +#: src/modules/IscsiClientLib.rb:1013 +#, fuzzy +#| msgid "Image creation failed." +msgid "Target connection failed.\n" +msgstr "Image creation failed." + #. do discovery first -#: src/modules/IscsiClientLib.rb:1147 +#: src/modules/IscsiClientLib.rb:1156 msgid "Configuration summary..." msgstr "Configuration summary..." +#~ msgid "Log Out" +#~ msgstr "Log Out" + +#~ msgid "Log In" +#~ msgstr "Log In" + +#, fuzzy +#~ msgid "" +#~ "List of current sessions. To add a new target, select it and press <b>Add</b>.\n" +#~ "To remove it, press <b>Log Out</b>.\n" +#~ "To change the start-up status, press <b>Toggle</b>.\n" +#~ msgstr "" +#~ "List of current sessions. To add a new target, press <b>Add</b>.\n" +#~ "To remove one, select it and press <b>Log Out</b>.\n" +#~ "To change start-up status, press <b>Toggle</b>.\n" + +#~ msgid "Select the type of authentication and enter the <b>Username</b> and <b>Password</b>." +#~ msgstr "Select the type of authentication and enter the <b>Username</b> and <b>Password</b>." + +#~ msgid "List of discovered targets. Start a new <b>Discovery</b> or <b>Connect</b> to any target." +#~ msgstr "List of discovered targets. Start a new <b>Discovery</b> or <b>Connect</b> to any target." + #~ msgid "Toggle Start-Up" #~ msgstr "Toggle Start-Up" Modified: trunk/yast/en_GB/po/iscsi-lio-server.en_GB.po =================================================================== --- trunk/yast/en_GB/po/iscsi-lio-server.en_GB.po 2015-09-09 08:18:21 UTC (rev 92602) +++ trunk/yast/en_GB/po/iscsi-lio-server.en_GB.po 2015-09-09 08:19:44 UTC (rev 92603) @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-10-29 16:20+0100\n" +"POT-Creation-Date: 2015-08-25 18:36+0200\n" "PO-Revision-Date: 2001-07-17 16:27+0200\n" "Last-Translator: James Ogley \n" "Language-Team: English \n" @@ -188,7 +188,7 @@ #: src/include/iscsi-lio-server/dialogs.rb:253 #: src/include/iscsi-lio-server/widgets.rb:223 #: src/include/iscsi-lio-server/widgets.rb:236 -#: src/include/iscsi-lio-server/widgets.rb:720 +#: src/include/iscsi-lio-server/widgets.rb:721 msgid "Username" msgstr "Username" @@ -196,7 +196,7 @@ #: src/include/iscsi-lio-server/dialogs.rb:254 #: src/include/iscsi-lio-server/widgets.rb:224 #: src/include/iscsi-lio-server/widgets.rb:237 -#: src/include/iscsi-lio-server/widgets.rb:721 +#: src/include/iscsi-lio-server/widgets.rb:722 msgid "Password" msgstr "Password" @@ -624,7 +624,7 @@ msgstr "Import CA from Disk" #: src/include/iscsi-lio-server/widgets.rb:638 -#: src/include/iscsi-lio-server/widgets.rb:694 +#: src/include/iscsi-lio-server/widgets.rb:695 #, fuzzy #| msgid "Alias name must not be empty." msgid "Client name must not be empty!" @@ -634,7 +634,7 @@ #. client name. It's allowed to have several LUNs accessable for same client. #. TODO: verify whether it's necessary to check @changed_lun here? #: src/include/iscsi-lio-server/widgets.rb:644 -#: src/include/iscsi-lio-server/widgets.rb:700 +#: src/include/iscsi-lio-server/widgets.rb:701 #, fuzzy #| msgid "Alias with name %1 already exists" msgid "Client name already exists!" @@ -642,32 +642,32 @@ #. Copy exisiting LUN, i.e. give additional client access to the LUN #. (which is allowed, makes sense e.g. with multipath) -#: src/include/iscsi-lio-server/widgets.rb:677 +#: src/include/iscsi-lio-server/widgets.rb:678 msgid "New client name:" msgstr "" -#: src/include/iscsi-lio-server/widgets.rb:723 +#: src/include/iscsi-lio-server/widgets.rb:724 msgid "OK" msgstr "OK" -#: src/include/iscsi-lio-server/widgets.rb:724 +#: src/include/iscsi-lio-server/widgets.rb:725 msgid "Cancel" msgstr "Cancel" #. remove a item #. **************** Edit Dialog ***************************** #. init values for modifying target (read it from stored map) -#: src/include/iscsi-lio-server/widgets.rb:819 -#: src/include/iscsi-lio-server/widgets.rb:933 -#: src/include/iscsi-lio-server/widgets.rb:1291 +#: src/include/iscsi-lio-server/widgets.rb:820 +#: src/include/iscsi-lio-server/widgets.rb:934 +#: src/include/iscsi-lio-server/widgets.rb:1288 msgid "Really delete the selected item?" msgstr "Really delete the selected item?" -#: src/include/iscsi-lio-server/widgets.rb:1001 +#: src/include/iscsi-lio-server/widgets.rb:1002 msgid "Problem creating target %1 with tpg %2" msgstr "" -#: src/include/iscsi-lio-server/widgets.rb:1023 +#: src/include/iscsi-lio-server/widgets.rb:1024 #, fuzzy #| msgid "" #| "Problem with resetting resource group:\n" @@ -677,66 +677,75 @@ "Problem with resetting resource group:\n" "%1\n" -#: src/include/iscsi-lio-server/widgets.rb:1044 +#: src/include/iscsi-lio-server/widgets.rb:1045 #, fuzzy #| msgid "Error while removing %1\n" msgid "Problem removing lun %1" msgstr "Error while removing %1\n" -#: src/include/iscsi-lio-server/widgets.rb:1069 +#: src/include/iscsi-lio-server/widgets.rb:1070 msgid "Problem setting lun %1 (name:%2) to path %3" msgstr "" -#: src/include/iscsi-lio-server/widgets.rb:1083 +#: src/include/iscsi-lio-server/widgets.rb:1084 msgid "Problem setting auth on %1:%2 to %3" msgstr "" #. validate function checks if target/tpg are unique and not empty -#: src/include/iscsi-lio-server/widgets.rb:1201 +#: src/include/iscsi-lio-server/widgets.rb:1198 msgid "The target cannot be empty." msgstr "The target cannot be empty." -#: src/include/iscsi-lio-server/widgets.rb:1205 +#: src/include/iscsi-lio-server/widgets.rb:1202 #, fuzzy #| msgid "The target cannot be empty." msgid "The target portal group cannot be empty." msgstr "The target cannot be empty." -#: src/include/iscsi-lio-server/widgets.rb:1216 +#: src/include/iscsi-lio-server/widgets.rb:1213 msgid "The target already exists." msgstr "The target already exists." -#: src/include/iscsi-lio-server/widgets.rb:1236 +#: src/include/iscsi-lio-server/widgets.rb:1233 msgid "Incoming" msgstr "Incoming" -#: src/include/iscsi-lio-server/widgets.rb:1239 +#: src/include/iscsi-lio-server/widgets.rb:1236 msgid "Outgoing" msgstr "Outgoing" -#: src/include/iscsi-lio-server/widgets.rb:1241 +#: src/include/iscsi-lio-server/widgets.rb:1238 msgid "None" msgstr "None" -#: src/include/iscsi-lio-server/widgets.rb:1264 -#: src/include/iscsi-lio-server/widgets.rb:1367 -#: src/include/iscsi-lio-server/widgets.rb:1404 +#: src/include/iscsi-lio-server/widgets.rb:1261 +#: src/include/iscsi-lio-server/widgets.rb:1364 +#: src/include/iscsi-lio-server/widgets.rb:1401 msgid "Disabled" msgstr "Disabled" -#: src/include/iscsi-lio-server/widgets.rb:1456 +#: src/include/iscsi-lio-server/widgets.rb:1450 +msgid "" +"There isn't any client specified.\n" +"To allow a client login to the target, please\n" +"use the 'Add' button and enter the name\n" +"(see /etc/iscsi/initiatorname.iscsi on initiator).\n" +"Really want to continue without client access?" +msgstr "" + +#: src/include/iscsi-lio-server/widgets.rb:1464 msgid "Problem removing lun %4 for client %3 in %1:%2" msgstr "" -#: src/include/iscsi-lio-server/widgets.rb:1471 +#: src/include/iscsi-lio-server/widgets.rb:1479 msgid "Problem adding lun %4:%5 for client %3 in %1:%2" msgstr "" -#: src/include/iscsi-lio-server/widgets.rb:1492 +#: src/include/iscsi-lio-server/widgets.rb:1500 msgid "Problem removing client %3 from %1:%2" msgstr "" -#: src/include/iscsi-lio-server/widgets.rb:1516 +#: src/include/iscsi-lio-server/widgets.rb:1524 #, fuzzy #| msgid "" #| "Error occurred while creating directory %1:\n" @@ -746,7 +755,7 @@ "Error occurred while creating directory %1:\n" "%2" -#: src/include/iscsi-lio-server/widgets.rb:1551 +#: src/include/iscsi-lio-server/widgets.rb:1559 msgid "Problem changing auth for client %3 in %1:%2" msgstr "" @@ -762,12 +771,12 @@ msgid "Initializing..." msgstr "Initialising..." -#. local IPv6 -#: src/modules/IscsiLioData.rb:1420 +#. scope link IPv6 +#: src/modules/IscsiLioData.rb:1424 msgid "Cannot save lio setup" msgstr "" -#: src/modules/IscsiLioData.rb:1424 +#: src/modules/IscsiLioData.rb:1428 msgid "Cannot save tcm setup" msgstr "" Modified: trunk/yast/en_GB/po/isns.en_GB.po =================================================================== --- trunk/yast/en_GB/po/isns.en_GB.po 2015-09-09 08:18:21 UTC (rev 92602) +++ trunk/yast/en_GB/po/isns.en_GB.po 2015-09-09 08:19:44 UTC (rev 92603) @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-10-29 16:20+0100\n" +"POT-Creation-Date: 2015-08-25 18:36+0200\n" "PO-Revision-Date: 2001-07-17 16:27+0200\n" "Last-Translator: James Ogley \n" "Language-Team: English \n" Added: trunk/yast/en_GB/po/journal.en_GB.po =================================================================== --- trunk/yast/en_GB/po/journal.en_GB.po (rev 0) +++ trunk/yast/en_GB/po/journal.en_GB.po 2015-09-09 08:19:44 UTC (rev 92603) @@ -0,0 +1,153 @@ +# English message file for YaST2 (@memory@). +# Copyright (C) 2005 SUSE Linux Products GmbH. +# Copyright (C) 2002 SuSE Linux AG. +# Copyright (C) 2000, 2001 SuSE GmbH. +# James Ogley , 2000, 2001. +# +msgid "" +msgstr "" +"Project-Id-Version: YaST (@memory@)\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2015-08-25 18:36+0200\n" +"PO-Revision-Date: 2001-07-17 16:27+0200\n" +"Last-Translator: James Ogley \n" +"Language-Team: English \n" +"Language: en\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8-bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" + +#. Header +#: src/lib/systemd_journal/entries_dialog.rb:43 +#, fuzzy +#| msgid "&Countries" +msgid "Journal entries" +msgstr "&Countries" + +#. Filters +#: src/lib/systemd_journal/entries_dialog.rb:47 +msgid "Displaying entries with the following text" +msgstr "" + +#. Return the result as an array of Items +#: src/lib/systemd_journal/entries_dialog.rb:117 +#, fuzzy +#| msgid "Change Suffix" +msgid "Change filter..." +msgstr "Change Suffix" + +#: src/lib/systemd_journal/entries_dialog.rb:119 +msgid "Refresh" +msgstr "Refresh" + +#. Header +#: src/lib/systemd_journal/query_dialog.rb:50 +#, fuzzy +#| msgid "Braille display" +msgid "Entries to display" +msgstr "Braille display" + +#. Interval +#: src/lib/systemd_journal/query_dialog.rb:53 +#, fuzzy +#| msgid "Periodic interval" +msgid "Time interval" +msgstr "Periodic interval" + +#. Filters +#: src/lib/systemd_journal/query_dialog.rb:59 +#, fuzzy +#| msgid "&Filter" +msgid "Filters" +msgstr "&Filter" + +#. User readable description of the current filters +#: src/lib/systemd_journal/query_presenter.rb:65 +#, fuzzy +#| msgid "No additional information" +msgid "With no additional conditions" +msgstr "No additional Information" + +#. User readable description of the time interval +#: src/lib/systemd_journal/query_presenter.rb:82 +#, fuzzy +#| msgid "File system" +msgid "Since system's boot" +msgstr "File system" + +#: src/lib/systemd_journal/query_presenter.rb:84 +msgid "From previous boot" +msgstr "" + +#: src/lib/systemd_journal/query_presenter.rb:90 +msgid "Between %{since} and %{until}" +msgstr "" + +#. Possible intervals for a QueryPresenter object to be used in forms +#. +#. @return [Array<Hash>] each interval is represented by a hash with two keys +#. :value and :label +#: src/lib/systemd_journal/query_presenter.rb:102 +msgid "Between these dates" +msgstr "" + +#: src/lib/systemd_journal/query_presenter.rb:104 +msgid "Since system's boot (%s)" +msgstr "" + +#: src/lib/systemd_journal/query_presenter.rb:108 +msgid "From previous boot (%s)" +msgstr "" + +#. Possible filters for a QueryPresenter object +#. +#. @return [Array<Hash>] for each filter there are 4 possible keys +#. +#. * :name name of the filter +#. * :label short label for the filter +#. * :form_label label for the widget used to set the filter +#. * :multiple boolean indicating if an array is a valid value +#. * :values optional list of valid values +#: src/lib/systemd_journal/query_presenter.rb:128 +#, fuzzy +#| msgid "&Units" +msgid "Units" +msgstr "&Units" + +#: src/lib/systemd_journal/query_presenter.rb:129 +msgid "For these systemd units" +msgstr "" + +#: src/lib/systemd_journal/query_presenter.rb:134 +msgid "Files" +msgstr "Files" + +#: src/lib/systemd_journal/query_presenter.rb:135 +msgid "For these files (executable or device)" +msgstr "" + +#: src/lib/systemd_journal/query_presenter.rb:140 +msgid "Priority" +msgstr "Priority" + +#: src/lib/systemd_journal/query_presenter.rb:141 +msgid "With at least this priority" +msgstr "" + +#. Fields to display for listing the entries +#. +#. @return [Array<Hash>] for each column a :label and a :method is provided +#: src/lib/systemd_journal/query_presenter.rb:164 +msgid "Time" +msgstr "Time" + +#: src/lib/systemd_journal/query_presenter.rb:165 +msgid "Source" +msgstr "Source" + +#: src/lib/systemd_journal/query_presenter.rb:166 +#, fuzzy +#| msgid "Messages" +msgid "Message" +msgstr "Messages" Modified: trunk/yast/en_GB/po/kdump.en_GB.po =================================================================== --- trunk/yast/en_GB/po/kdump.en_GB.po 2015-09-09 08:18:21 UTC (rev 92602) +++ trunk/yast/en_GB/po/kdump.en_GB.po 2015-09-09 08:19:44 UTC (rev 92603) @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-04 15:52+0200\n" +"POT-Creation-Date: 2015-08-25 18:36+0200\n" "PO-Revision-Date: 2007-08-16 19:49+0100\n" "Last-Translator: Benjamin Weber\n" "Language-Team: British English\n" @@ -53,213 +53,213 @@ msgstr "Dump target includes destination for saving dump images" #. TRANSLATORS: CommandLine help -#: src/clients/kdump.rb:116 +#: src/clients/kdump.rb:117 #, fuzzy msgid "The naming scheme is:/boot/vmlinu[zx]-[.gz] Please enter only \"kernel_string\"." msgstr "The naming scheme is:/boot/vmlinu[zx]-[.gz] Please eneter only \"kernel_string\"." #. TRANSLATORS: CommandLine help -#: src/clients/kdump.rb:127 +#: src/clients/kdump.rb:128 msgid "The kdump commandline is the command line that needs to be passed off to the kdump kernel." msgstr "The kdump commandline is the command line that needs to be passed off to the kdump kernel." #. TRANSLATORS: CommandLine help -#: src/clients/kdump.rb:138 +#: src/clients/kdump.rb:139 msgid "Set this variable if you only want to _append_ values to the default command line string." msgstr "Set this variable if you only want to _append_ values to the default command line string." #. TRANSLATORS: CommandLine help -#: src/clients/kdump.rb:149 +#: src/clients/kdump.rb:150 msgid "Immediately reboot after saving the core in the kdump kernel." msgstr "Immediately reboot after saving the core in the kdump kernel." #. TRANSLATORS: CommandLine help -#: src/clients/kdump.rb:157 +#: src/clients/kdump.rb:158 #, fuzzy msgid "Copy kernel into dump directory." msgstr "Copy kernel and initrd" #. TRANSLATORS: CommandLine help -#: src/clients/kdump.rb:165 +#: src/clients/kdump.rb:166 msgid "Specifies how many old dumps are kept. 0 means keep all." msgstr "Specifies how many old dumps are kept. 0 means keep all." #. TRANSLATORS: CommandLine help -#: src/clients/kdump.rb:173 +#: src/clients/kdump.rb:174 #, fuzzy msgid "SMTP server for sending notification messages." msgstr "An email address is required for each selected notification method." #. TRANSLATORS: CommandLine help -#: src/clients/kdump.rb:181 +#: src/clients/kdump.rb:182 #, fuzzy msgid "SMTP username for sending notification messages." msgstr "An email address is required for each selected notification method." #. TRANSLATORS: CommandLine help -#: src/clients/kdump.rb:189 +#: src/clients/kdump.rb:190 #, fuzzy msgid "SMTP password for sending notification messages. Path of file which includes password (plain text file)." msgstr "Path of file which includes passwort (plain text file)" #. TRANSLATORS: CommandLine help -#: src/clients/kdump.rb:197 +#: src/clients/kdump.rb:198 #, fuzzy msgid "Email address for sending notification messages" msgstr "An email address is required for each selected notification method." #. TRANSLATORS: CommandLine help -#: src/clients/kdump.rb:208 +#: src/clients/kdump.rb:209 msgid "Email address for sending copy of notification messages" msgstr "" #. TRANSLATORS: CommandLine help -#: src/clients/kdump.rb:220 +#: src/clients/kdump.rb:221 msgid "Enable option" msgstr "Enable option" #. TRANSLATORS: CommandLine help -#: src/clients/kdump.rb:224 +#: src/clients/kdump.rb:225 msgid "Disable option" msgstr "Disable option" #. TRANSLATORS: CommandLine help -#: src/clients/kdump.rb:228 +#: src/clients/kdump.rb:229 msgid "Shows current option status" msgstr "" #. TRANSLATORS: CommandLine help -#: src/clients/kdump.rb:233 +#: src/clients/kdump.rb:234 #, fuzzy msgid "Size of allocated memory MB" msgstr "Size of memory to alocate (MB)" #. TRANSLATORS: CommandLine help -#: src/clients/kdump.rb:240 +#: src/clients/kdump.rb:241 msgid "Number for dump level includes pages for saving" msgstr "Number for dump level includes pages for saving" #. TRANSLATORS: CommandLine help -#: src/clients/kdump.rb:247 +#: src/clients/kdump.rb:248 #, fuzzy #| msgid "Dump format can be ELF or compressed" msgid "Dump format can be none, ELF, compressed or lzo" msgstr "Dump format can be ELF or compressed" #. TRANSLATORS: CommandLine help -#: src/clients/kdump.rb:254 +#: src/clients/kdump.rb:255 #, fuzzy -msgid "Dump target includes type of target from: file (local filesystem), ftp, ssh, nfs, cifs" +msgid "Dump target includes type of target from: file (local filesystem), ftp, ssh, sftp, nfs, cifs" msgstr "Dump target includes kind of target from: file (local filesystem), ftp, ssh, nfs, cifs" #. TRANSLATORS: CommandLine help -#: src/clients/kdump.rb:261 +#: src/clients/kdump.rb:262 msgid "Name of server" msgstr "Name of server" #. TRANSLATORS: CommandLine help -#: src/clients/kdump.rb:266 +#: src/clients/kdump.rb:267 msgid "Port for connection" msgstr "Port for connection" #. TRANSLATORS: CommandLine help -#: src/clients/kdump.rb:271 +#: src/clients/kdump.rb:272 #, fuzzy msgid "Directory for saving dump images" msgstr "Directory for saving dumps images" #. TRANSLATORS: CommandLine help -#: src/clients/kdump.rb:278 +#: src/clients/kdump.rb:279 msgid "Exported share" msgstr "Exported share" #. TRANSLATORS: CommandLine help -#: src/clients/kdump.rb:283 +#: src/clients/kdump.rb:284 msgid "User name" msgstr "User name" #. TRANSLATORS: CommandLine help -#: src/clients/kdump.rb:288 +#: src/clients/kdump.rb:289 #, fuzzy msgid "Path of file which includes password (plain text file)" msgstr "Path of file which includes passwort (plain text file)" #. TRANSLATORS: CommandLine help -#: src/clients/kdump.rb:295 +#: src/clients/kdump.rb:296 msgid "udev_id of raw partition" msgstr "udev_id of raw partition" #. TRANSLATORS: CommandLine help -#: src/clients/kdump.rb:302 +#: src/clients/kdump.rb:303 msgid "The naming scheme is: /boot/vmlinu[zx]-[.gz] kernel means only \"kernel_string\"." msgstr "The naming scheme is: /boot/vmlinu[zx]-[.gz] kernel means only \"kernel_string\"." #. TRANSLATORS: CommandLine help -#: src/clients/kdump.rb:309 +#: src/clients/kdump.rb:310 msgid "Include command line options." msgstr "Include command line options." #. TRANSLATORS: CommandLine help -#: src/clients/kdump.rb:316 +#: src/clients/kdump.rb:317 #, fuzzy msgid "Option means runlevel to boot the kdump kernel. Only values such as 1,2,3,5 or s are allowed" msgstr "Option means run-level to boot the kdump kernel. Only values such as 1,2,3,5 or s are allowed" #. TRANSLATORS: CommandLine help -#: src/clients/kdump.rb:323 +#: src/clients/kdump.rb:324 msgid "Number of dumps. 0 means keep all." msgstr "Number of dumps. 0 means keep all." #. TRANSLATORS: CommandLine help -#: src/clients/kdump.rb:330 +#: src/clients/kdump.rb:331 #, fuzzy msgid "Email address" msgstr "E-mail address" #. TRANSLATORS: CommandLine help -#: src/clients/kdump.rb:364 +#: src/clients/kdump.rb:365 msgid "Handles usage of firmware-assisted dump" msgstr "" #. TRANSLATORS: CommandLine printed text -#: src/clients/kdump.rb:414 +#: src/clients/kdump.rb:415 msgid "Display Settings:" msgstr "Display Settings:" #. TRANSLATORS: CommandLine printed text -#: src/clients/kdump.rb:419 +#: src/clients/kdump.rb:420 msgid "Kdump is enabled (boot option \"crashkernel\" is added)" msgstr "Kdump is enabled (boot option \"crashkernel\" is added)" #. TRANSLATORS: CommandLine printed text -#: src/clients/kdump.rb:424 +#: src/clients/kdump.rb:425 #, fuzzy msgid "Allocate memory (MB) for kdump is: %1" msgstr "Alocate memory (MB) for kdump is: %1" #. TRANSLATORS: CommandLine printed text -#: src/clients/kdump.rb:430 +#: src/clients/kdump.rb:431 #, fuzzy msgid "Kdump is disabled" msgstr "Kdump is disable" #. TRANSLATORS: CommandLine printed text -#: src/clients/kdump.rb:436 +#: src/clients/kdump.rb:437 msgid "Dump Level: %1" msgstr "Dump Level: %1" #. TRANSLATORS: CommandLine printed text -#: src/clients/kdump.rb:444 +#: src/clients/kdump.rb:445 msgid "Dump Format: %1" msgstr "Dump Format: %1" #. parsing target info -#: src/clients/kdump.rb:451 +#: src/clients/kdump.rb:452 msgid "Dump Target Settings" msgstr "Dump Target Settings" #. TRANSLATORS: CommandLine printed text -#: src/clients/kdump.rb:456 +#: src/clients/kdump.rb:457 msgid "target: %1" msgstr "target: %1" @@ -268,8 +268,8 @@ #. TRANSLATORS: CommandLine printed text #. TRANSLATORS: CommandLine printed text #. TRANSLATORS: CommandLine printed text -#: src/clients/kdump.rb:466 src/clients/kdump.rb:493 src/clients/kdump.rb:536 -#: src/clients/kdump.rb:564 src/clients/kdump.rb:581 +#: src/clients/kdump.rb:467 src/clients/kdump.rb:494 src/clients/kdump.rb:537 +#: src/clients/kdump.rb:565 src/clients/kdump.rb:582 msgid "file directory: %1" msgstr "file directory: %1" @@ -277,120 +277,120 @@ #. TRANSLATORS: CommandLine printed text #. TRANSLATORS: CommandLine printed text #. TRANSLATORS: CommandLine printed text -#: src/clients/kdump.rb:476 src/clients/kdump.rb:517 src/clients/kdump.rb:557 -#: src/clients/kdump.rb:574 +#: src/clients/kdump.rb:477 src/clients/kdump.rb:518 src/clients/kdump.rb:558 +#: src/clients/kdump.rb:575 msgid "server name: %1" msgstr "server name: %1" #. TRANSLATORS: CommandLine printed text #. TRANSLATORS: CommandLine printed text -#: src/clients/kdump.rb:485 src/clients/kdump.rb:527 +#: src/clients/kdump.rb:486 src/clients/kdump.rb:528 msgid "port: %1" msgstr "port: %1" #. TRANSLATORS: CommandLine printed text #. TRANSLATORS: CommandLine printed text -#: src/clients/kdump.rb:501 src/clients/kdump.rb:596 +#: src/clients/kdump.rb:502 src/clients/kdump.rb:597 msgid "user name: anonymous connection is allowed" msgstr "user name: anonymous connection is allowed" #. TRANSLATORS: CommandLine printed text #. TRANSLATORS: CommandLine printed text #. TRANSLATORS: CommandLine printed text -#: src/clients/kdump.rb:506 src/clients/kdump.rb:546 src/clients/kdump.rb:601 +#: src/clients/kdump.rb:507 src/clients/kdump.rb:547 src/clients/kdump.rb:602 msgid "user name: %1" msgstr "user name: %1" #. TRANSLATORS: CommandLine printed text -#: src/clients/kdump.rb:588 +#: src/clients/kdump.rb:589 msgid "share: %1" msgstr "share: %1" #. TRANSLATORS: CommandLine printed text -#: src/clients/kdump.rb:609 +#: src/clients/kdump.rb:610 msgid "EMPTY" msgstr "EMPTY" #. TRANSLATORS: CommandLine printed text -#: src/clients/kdump.rb:617 +#: src/clients/kdump.rb:618 msgid "Custom kdump kernel: %1" msgstr "Custom kdump kernel: %1" #. TRANSLATORS: CommandLine printed text -#: src/clients/kdump.rb:628 +#: src/clients/kdump.rb:629 msgid "Kdump command line: %1" msgstr "Kdump command line: %1" #. TRANSLATORS: CommandLine printed text -#: src/clients/kdump.rb:639 +#: src/clients/kdump.rb:640 msgid "Kdump command line append: %1" msgstr "Kdump command line append: %1" #. TRANSLATORS: CommandLine printed text -#: src/clients/kdump.rb:649 +#: src/clients/kdump.rb:650 msgid "Kdump immediate reboots: %1" msgstr "Kdump immediate reboots: %1" -#: src/clients/kdump.rb:651 src/clients/kdump.rb:1258 +#: src/clients/kdump.rb:652 src/clients/kdump.rb:1259 #, fuzzy #| msgid "enabled" msgid "Enabled" msgstr "enabled" -#: src/clients/kdump.rb:652 src/clients/kdump.rb:1259 +#: src/clients/kdump.rb:653 src/clients/kdump.rb:1260 #, fuzzy #| msgid "disabled" msgid "Disabled" msgstr "disabled" #. TRANSLATORS: CommandLine printed text -#: src/clients/kdump.rb:661 +#: src/clients/kdump.rb:662 msgid "Numbers of old dumps: All dumps are saved without deleting old dumps" msgstr "Numbers of old dumps: All dumps are saved without deleting old dumps" #. TRANSLATORS: CommandLine printed text -#: src/clients/kdump.rb:669 +#: src/clients/kdump.rb:670 msgid "Numbers of old dumps: %1" msgstr "Numbers of old dumps: %1" #. TRANSLATORS: CommandLine printed text -#: src/clients/kdump.rb:680 +#: src/clients/kdump.rb:681 #, fuzzy msgid "Kdump SMTP Server: %1" msgstr "SMT Server: %1" #. TRANSLATORS: CommandLine printed text -#: src/clients/kdump.rb:691 +#: src/clients/kdump.rb:692 #, fuzzy msgid "Kdump SMTP User: %1" msgstr "Kdump runlevel: %1" #. TRANSLATORS: CommandLine printed text -#: src/clients/kdump.rb:700 +#: src/clients/kdump.rb:701 msgid "Kdump SMTP Password: ********" msgstr "" #. TRANSLATORS: CommandLine printed text -#: src/clients/kdump.rb:708 +#: src/clients/kdump.rb:709 #, fuzzy msgid "Kdump Sending Notification To: %1" msgstr "Identification: %1" #. TRANSLATORS: CommandLine printed text -#: src/clients/kdump.rb:719 +#: src/clients/kdump.rb:720 msgid "Kdump Sending Copy of Notification To: %1" msgstr "" #. TRANSLATORS: CommandLine printed text -#: src/clients/kdump.rb:746 +#: src/clients/kdump.rb:747 msgid "Kernel option \"crashkernel\" includes ranges. They will be rewritten." msgstr "" #. TRANSLATORS: CommandLine printed text #. Popup::Message(crash_value); #. delete crashkernel paramter from bootloader -#: src/clients/kdump.rb:751 src/clients/kdump.rb:756 src/modules/Kdump.rb:559 -#: src/modules/Kdump.rb:578 +#: src/clients/kdump.rb:752 src/clients/kdump.rb:757 src/modules/Kdump.rb:570 +#: src/modules/Kdump.rb:589 #, fuzzy msgid "To apply changes a reboot is necessary." msgstr "To apply this change reboot is needed." @@ -410,42 +410,42 @@ #. TRANSLATORS: CommandLine error message #. TRANSLATORS: CommandLine error message #. TRANSLATORS: CommandLine error message -#: src/clients/kdump.rb:760 src/clients/kdump.rb:786 src/clients/kdump.rb:815 -#: src/clients/kdump.rb:1047 src/clients/kdump.rb:1064 -#: src/clients/kdump.rb:1081 src/clients/kdump.rb:1098 -#: src/clients/kdump.rb:1113 src/clients/kdump.rb:1129 -#: src/clients/kdump.rb:1152 src/clients/kdump.rb:1172 -#: src/clients/kdump.rb:1192 src/clients/kdump.rb:1206 -#: src/clients/kdump.rb:1229 src/clients/kdump.rb:1249 +#: 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 #, fuzzy msgid "Wrong options were used." msgstr "Wrong options were used." #. TRANSLATORS: CommandLine printed text -#: src/clients/kdump.rb:777 +#: src/clients/kdump.rb:778 msgid "Dump level was set." msgstr "Dump level was set." #. TRANSLATORS: CommandLine error message #. TRANSLATORS: CommandLine error message -#: src/clients/kdump.rb:781 src/clients/kdump.rb:806 +#: src/clients/kdump.rb:782 src/clients/kdump.rb:807 msgid "Wrong value of option." msgstr "Wrong value of option." #. TRANSLATORS: CommandLine printed text -#: src/clients/kdump.rb:802 +#: src/clients/kdump.rb:803 msgid "Dump format was set." msgstr "Dump format was set." #. TRANSLATORS: CommandLine printed text help -#: src/clients/kdump.rb:809 +#: src/clients/kdump.rb:810 #, fuzzy #| msgid "Option can include only \"ELF\" or \"compressed\" value." msgid "Option can include only \"none\", \"ELF\", \"compressed\" or \"lzo\" value." msgstr "Option can include only \"ELF\" or \"compressed\" value." #. TRANSLATORS: CommandLine error message -#: src/clients/kdump.rb:829 +#: src/clients/kdump.rb:830 msgid "File %1 does not exist." msgstr "File %1 does not exist." @@ -453,8 +453,8 @@ #. TRANSLATORS: CommandLine error message #. TRANSLATORS: CommandLine error message #. TRANSLATORS: CommandLine error message -#: src/clients/kdump.rb:851 src/clients/kdump.rb:885 src/clients/kdump.rb:934 -#: src/clients/kdump.rb:968 src/clients/kdump.rb:1015 +#: 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 msgid "Value for \"dir\" missing." msgstr "Value for \"dir\" missing." @@ -462,51 +462,51 @@ #. TRANSLATORS: CommandLine error message #. TRANSLATORS: CommandLine error message #. TRANSLATORS: CommandLine error message -#: src/clients/kdump.rb:865 src/clients/kdump.rb:915 src/clients/kdump.rb:956 -#: src/clients/kdump.rb:982 +#: src/clients/kdump.rb:866 src/clients/kdump.rb:916 src/clients/kdump.rb:957 +#: src/clients/kdump.rb:983 msgid "Value for \"server\" missing." msgstr "Value for \"server\" missing." #. TRANSLATORS: CommandLine error message -#: src/clients/kdump.rb:994 +#: src/clients/kdump.rb:995 msgid "Value for \"share\" missing." msgstr "Value for \"share\" missing." #. TRANSLATORS: CommandLine error message -#: src/clients/kdump.rb:1036 +#: src/clients/kdump.rb:1037 msgid "Wrong value for target." msgstr "Wrong value for target." #. TRANSLATORS: CommandLine error message -#: src/clients/kdump.rb:1147 +#: src/clients/kdump.rb:1148 msgid "Wrong value of options \"no\"." msgstr "Wrong value of options \"no\"." #. TRANSLATORS: CommandLine error message -#: src/clients/kdump.rb:1167 +#: src/clients/kdump.rb:1168 #, fuzzy msgid "Wrong value for option \"server\"." msgstr "Wrong value of options \"level\"." #. TRANSLATORS: CommandLine error message -#: src/clients/kdump.rb:1187 +#: src/clients/kdump.rb:1188 #, fuzzy msgid "Wrong value for option \"user\"." msgstr "Wrong value of options \"no\"." #. TRANSLATORS: CommandLine error message #. TRANSLATORS: CommandLine error message -#: src/clients/kdump.rb:1224 src/clients/kdump.rb:1244 +#: src/clients/kdump.rb:1225 src/clients/kdump.rb:1245 #, fuzzy msgid "Wrong value for option \"email\"." msgstr "Wrong value of options \"level\"." -#: src/clients/kdump.rb:1256 +#: src/clients/kdump.rb:1257 msgid "Firmware-assisted dump: %{status}" msgstr "" #. TRANSLATORS: CommandLine error message -#: src/clients/kdump.rb:1274 +#: src/clients/kdump.rb:1275 #, fuzzy msgid "No option has been defined." msgstr "Wrong options were used." @@ -518,12 +518,12 @@ msgstr "Saving kdump Configuration" #. proposal part - kdump label -#: src/clients/kdump_proposal.rb:68 +#: src/clients/kdump_proposal.rb:82 msgid "Kdump" msgstr "" #. menubutton entry -#: src/clients/kdump_proposal.rb:70 +#: src/clients/kdump_proposal.rb:84 #, fuzzy msgid "&Kdump" msgstr "&Disable Kdump" @@ -627,20 +627,24 @@ msgid "FTP" msgstr "FTP" -#: src/include/kdump/dialogs.rb:223 src/include/kdump/uifunctions.rb:143 -msgid "SSH (scp)" -msgstr "SSH (scp)" +#: src/include/kdump/dialogs.rb:223 +msgid "SSH" +msgstr "SSH" -#: src/include/kdump/dialogs.rb:224 src/include/kdump/uifunctions.rb:173 +#: src/include/kdump/dialogs.rb:224 +msgid "SFTP" +msgstr "" + +#: src/include/kdump/dialogs.rb:225 src/include/kdump/uifunctions.rb:173 msgid "NFS" msgstr "NFS" -#: src/include/kdump/dialogs.rb:225 src/include/kdump/uifunctions.rb:188 +#: src/include/kdump/dialogs.rb:226 src/include/kdump/uifunctions.rb:188 msgid "CIFS (SMB)" msgstr "CIFS (SMB)" #. TRANSLATORS: TextEntry Label -#: src/include/kdump/dialogs.rb:250 +#: src/include/kdump/dialogs.rb:251 #, fuzzy msgid "&SMTP Server" msgstr "NTP Server" @@ -649,7 +653,7 @@ #. text entry #. text entry #. text entry -#: src/include/kdump/dialogs.rb:262 src/include/kdump/uifunctions.rb:130 +#: src/include/kdump/dialogs.rb:263 src/include/kdump/uifunctions.rb:130 #: src/include/kdump/uifunctions.rb:160 src/include/kdump/uifunctions.rb:212 msgid "&User Name" msgstr "&User Name" @@ -658,121 +662,121 @@ #. password entry #. password entry #. password entry -#: src/include/kdump/dialogs.rb:274 src/include/kdump/uifunctions.rb:133 +#: src/include/kdump/dialogs.rb:275 src/include/kdump/uifunctions.rb:133 #: src/include/kdump/uifunctions.rb:163 src/include/kdump/uifunctions.rb:215 msgid "&Password" msgstr "&Password" #. TRANSLATORS: TextEntry Label -#: src/include/kdump/dialogs.rb:286 +#: src/include/kdump/dialogs.rb:287 #, fuzzy msgid "Notification &To" msgstr "Modification Time" #. TRANSLATORS: TextEntry Label -#: src/include/kdump/dialogs.rb:302 +#: src/include/kdump/dialogs.rb:303 #, fuzzy msgid "Notifica&tion CC" msgstr "Terse Notification" #. TRANSLATORS: TextEntry Label -#: src/include/kdump/dialogs.rb:319 +#: src/include/kdump/dialogs.rb:320 msgid "Custom Kdump &Kernel" msgstr "Custom Kdump &Kernel" #. TRANSLATORS: TextEntry Label -#: src/include/kdump/dialogs.rb:331 +#: src/include/kdump/dialogs.rb:332 msgid "Kdump Co&mmand Line" msgstr "Kdump Co&mmand Line" #. TRANSLATORS: TextEntry Label -#: src/include/kdump/dialogs.rb:343 +#: src/include/kdump/dialogs.rb:344 #, fuzzy msgid "Kdump Command &Line Append" msgstr "Kdump Co&mmand Line" #. TRANSLATORS: CheckBox Label -#: src/include/kdump/dialogs.rb:360 +#: src/include/kdump/dialogs.rb:361 msgid "&Enable Immediate Reboot After Saving the Core" msgstr "&Enable Immediate Reboot After Saving the Core" #. TRANSLATORS: CheckBox Label -#: src/include/kdump/dialogs.rb:374 +#: src/include/kdump/dialogs.rb:375 msgid "Enable Copy Ke&rnel into the Dump Directory" msgstr "" #. TRANSLATORS: CheckBox Label -#: src/include/kdump/dialogs.rb:388 +#: src/include/kdump/dialogs.rb:389 msgid "Enable &Delete Old Dump Images" msgstr "Enable &Delete Old Dump Images" #. TRANSLATORS: IntField Label -#: src/include/kdump/dialogs.rb:405 +#: src/include/kdump/dialogs.rb:406 msgid "N&umber of Old Dumps" msgstr "N&umber of Old Dumps" #. "handle" : -#: src/include/kdump/dialogs.rb:426 +#: src/include/kdump/dialogs.rb:427 msgid "Kdump Memory" msgstr "Kdump Memory" -#: src/include/kdump/dialogs.rb:431 +#: src/include/kdump/dialogs.rb:432 msgid "Kdump Start-Up" msgstr "Kdump Start-Up" -#: src/include/kdump/dialogs.rb:432 +#: src/include/kdump/dialogs.rb:433 msgid "Start-Up" msgstr "Start-Up" -#: src/include/kdump/dialogs.rb:447 +#: src/include/kdump/dialogs.rb:448 msgid "Kdump - Dump Filtering" msgstr "Kdump - Dump Filtering" -#: src/include/kdump/dialogs.rb:448 +#: src/include/kdump/dialogs.rb:449 msgid "Dump Filtering" msgstr "Dump Filtering" -#: src/include/kdump/dialogs.rb:454 +#: src/include/kdump/dialogs.rb:455 msgid "Saving Target for Kdump Image" msgstr "Saving Target for Kdump Image" -#: src/include/kdump/dialogs.rb:461 src/include/kdump/dialogs.rb:462 +#: src/include/kdump/dialogs.rb:462 src/include/kdump/dialogs.rb:463 msgid "Dump Target" msgstr "Dump Target" -#: src/include/kdump/dialogs.rb:468 +#: src/include/kdump/dialogs.rb:469 #, fuzzy msgid "SMTP Server" msgstr "NTP Server" -#: src/include/kdump/dialogs.rb:478 +#: src/include/kdump/dialogs.rb:479 #, fuzzy msgid "Notification Email Addresses" msgstr "Notification is disabled" -#: src/include/kdump/dialogs.rb:486 src/include/kdump/dialogs.rb:487 +#: src/include/kdump/dialogs.rb:487 src/include/kdump/dialogs.rb:488 #, fuzzy msgid "Email Notification" msgstr "Summary Notification" -#: src/include/kdump/dialogs.rb:500 +#: src/include/kdump/dialogs.rb:501 msgid "Custom Kernel for Kdump" msgstr "Custom Kernel for Kdump" -#: src/include/kdump/dialogs.rb:505 +#: src/include/kdump/dialogs.rb:506 msgid "Command Line" msgstr "Command Line" -#: src/include/kdump/dialogs.rb:513 +#: src/include/kdump/dialogs.rb:514 #, fuzzy msgid "Dump Settings" msgstr "DNS Settings" -#: src/include/kdump/dialogs.rb:526 +#: src/include/kdump/dialogs.rb:527 msgid "Kdump Expert Settings" msgstr "Kdump Expert Settings" -#: src/include/kdump/dialogs.rb:527 +#: src/include/kdump/dialogs.rb:528 msgid "Expert Settings" msgstr "Expert Settings" @@ -830,7 +834,7 @@ "</p>" msgstr "" -#. Dump Format - RadioButtons 1/6 +#. Dump Format - RadioButtons 1/7 #: src/include/kdump/helps.rb:72 #, fuzzy msgid "" @@ -840,7 +844,7 @@ "<p><b>Saving Target for Kdump Image</b><br>\n" " The target for saving kdump images.<br></p>" -#. Dump Format - RadioButtons 2/6 +#. Dump Format - RadioButtons 2/7 #: src/include/kdump/helps.rb:76 msgid "" "<p><b>Local Filestem</b> - Save kdump image in the local filesystem.\n" @@ -853,7 +857,7 @@ " Selecting directory for saving kdump images via dialog by pressing <i>Browse</i>\n" " <br></p>" -#. Dump Format - RadioButtons 3/6 +#. Dump Format - RadioButtons 3/7 #: src/include/kdump/helps.rb:83 msgid "" "<p><b>FTP</b> - Save kdump image via FTP.\n" @@ -870,11 +874,11 @@ " <i>Enable Anonymous FTP</i> enables anonymous connection to server.\n" " <i>User Name</i> for ftp connection. <i>Password</i> for ftp connection.<br></p>" -#. Dump Format - RadioButtons 4/6 +#. Dump Format - RadioButtons 4/7 #: src/include/kdump/helps.rb:92 #, fuzzy msgid "" -"<p><b>SSH</b> - Save kdump image via SSH.\n" +"<p><b>SSH</b> - Save kdump image via SSH and 'dd' on target machine.\n" " <i>Server Name</i> - The name of server.\n" " <i>Port</i> - The port number for connection.\n" " <i>Directory on Server</i> - The path for saving kdump images.\n" @@ -887,9 +891,33 @@ " <i>Directory on Server</i> - The path for saving kdump images.\n" " <i>User Name</i> for ssh connection.<br></p>" -#. Dump Format - RadioButtons 5/6 +#. Dump Format - RadioButtons 5/7 #: src/include/kdump/helps.rb:101 +#, fuzzy msgid "" +"<p><b>SFTP</b> - Save kdump image via SFTP.\n" +" <i>Server Name</i> - The name of server.\n" +" <i>Port</i> - The port number for connection.\n" +" <i>Directory on Server</i> - The path for saving kdump images.\n" +" <i>User Name</i> for SSH connection. \n" +" <i>Password</i> for SSH connection.<br></p>\n" +msgstr "" +"<p><b>SSH</b> - Save kdump image via SSH.\n" +" <i>Server Name</i> - The name of server.\n" +" <i>Port</i> - The port number for connection.\n" +" <i>Directory on Server</i> - The path for saving kdump images.\n" +" <i>User Name</i> for ssh connection.<br></p>" + +#: src/include/kdump/helps.rb:109 +msgid "" +"<p>The choice between SSH and SFTP depends\n" +"on details of server configuration. SLE servers support both\n" +"by default.</p>" +msgstr "" + +#. Dump Format - RadioButtons 6/7 +#: src/include/kdump/helps.rb:115 +msgid "" "<p><b>NFS</b> - Save kdump image on NFS.\n" " <i>Server Name</i> - The name of nfs server.\n" " <i>Directory on Server</i> - The path for saving kdump images.<br></p>" @@ -898,8 +926,8 @@ " <i>Server Name</i> - The name of nfs server.\n" " <i>Directory on Server</i> - The path for saving kdump images.<br></p>" -#. Dump Format - RadioButtons 6/6 -#: src/include/kdump/helps.rb:107 +#. Dump Format - RadioButtons 7/7 +#: src/include/kdump/helps.rb:121 msgid "" "<p><b>CIFS</b> - Save kdump image via CIFS.\n" " <i>Server Name</i> - The name of server.\n" @@ -916,7 +944,7 @@ " <i>User Name</i> for connection. <i>Password</i> for connection.<br></p>" #. Custom Kdump Kernel - TextEntry 1/1 -#: src/include/kdump/helps.rb:116 +#: src/include/kdump/helps.rb:130 msgid "" "<p><b>Custom Kdump Kernel</b> The user can enter the custom kernel.\n" " The naming scheme is:<i>/boot/vmlinu[zx]-[.gz]</i>\n" @@ -927,7 +955,7 @@ " Please enter only <i>kernel_string</i>.<br></p>" #. Kdump Command Line - TextEntry 1/1 -#: src/include/kdump/helps.rb:122 +#: src/include/kdump/helps.rb:136 #, fuzzy msgid "" "<p><b>Kdump Command Line</b>\n" @@ -935,7 +963,7 @@ msgstr "<p><b>Optional Kernel Command Line Parameter</b> lets you define additional parameters to pass to the kernel</p>" #. Kdump Command Line Append - TextEntry 1/1 -#: src/include/kdump/helps.rb:126 +#: src/include/kdump/helps.rb:140 #, fuzzy msgid "" "<p><b>Kdump Command Line Append</b>\n" @@ -950,7 +978,7 @@ " is set. <br></p>" #. Enable Immediate Reboot After Saving the Core - CheckBox 1/1 -#: src/include/kdump/helps.rb:133 +#: src/include/kdump/helps.rb:147 msgid "" "<p><b>Enable Immediate Reboot After Saving the Core</b> - \n" " Enable immediately reboot after saving the core in the kdump.<br></p>" @@ -959,7 +987,7 @@ " Enable immediately reboot after saving the core in the kdump.<br></p>" #. Enable Delete Old Dump Images - CheckBox 1/1 -#: src/include/kdump/helps.rb:137 +#: src/include/kdump/helps.rb:151 msgid "" "<p><b>Enable Delete Old Dump Images</b> - \n" " Enable Delete Old Dump Images. If the number of dump files in \n" @@ -970,7 +998,7 @@ " <i>Number of Old Dumps</i> exceeds this number, older dumps are removed.<br></p>" #. Enable Copy Ke&rnel into the Dump Directory - CheckBox 1/1 -#: src/include/kdump/helps.rb:143 +#: src/include/kdump/helps.rb:157 msgid "" "<p><b>Enable Copy Kernel into the Dump Directory</b> - \n" " If this option is selected, the kernel and the\n" @@ -980,38 +1008,38 @@ msgstr "" #. SMTP Server -#: src/include/kdump/helps.rb:151 +#: src/include/kdump/helps.rb:165 msgid "<p><b>SMTP Server</b> used for sending a notification email after a dump.</p>" msgstr "" #. SMTP User Name -#: src/include/kdump/helps.rb:155 +#: src/include/kdump/helps.rb:169 msgid "" "<p><b>User Name</b> for SMTP authetication when <i>SMTP Server</i> is\n" " set. This is optional. If you do not specifiy a username and password, plain SMTP will be used.</p>\n" msgstr "" #. SMTP Password -#: src/include/kdump/helps.rb:159 +#: src/include/kdump/helps.rb:173 msgid "" "<p><b>Password</b> for SMTP authetication when <i>SMTP Server</i> is set. This\n" " is optional. If you do not specify a username and password, plain SMTP will be used.</p>\n" msgstr "" #. Notification To (email addresses) -#: src/include/kdump/helps.rb:163 +#: src/include/kdump/helps.rb:177 msgid "<p><b>Notification To</b> Specify the email address to which a notification email will be sent when a dump has been saved.</p>\n" msgstr "" #. Notification CC (email addresses) -#: src/include/kdump/helps.rb:167 +#: src/include/kdump/helps.rb:181 msgid "" "<p><b>Notification CC</b> Specify a list of space-separated email addresses to\n" " which a notification email will be sent via cc if a dump has been saved.</p>\n" msgstr "" #. Number of Old Dumps (number) -#: src/include/kdump/helps.rb:171 +#: src/include/kdump/helps.rb:185 #, fuzzy #| msgid "" #| "<p><b>Enable Delete Old Dump Images</b> - \n" @@ -1026,7 +1054,7 @@ " <i>Number of Old Dumps</i> exceeds this number, older dumps are removed.<br></p>" #. Read dialog help 1/2 -#: src/include/kdump/helps.rb:175 +#: src/include/kdump/helps.rb:189 msgid "" "<p><b><big>Initializing Kdump Configuration</big></b><br>\n" "Please wait...<br></p>\n" @@ -1035,7 +1063,7 @@ "Please wait...<br></p>\n" #. Read dialog help 2/2 -#: src/include/kdump/helps.rb:179 +#: src/include/kdump/helps.rb:193 msgid "" "<p><b><big>Aborting Initialization:</big></b><br>\n" "Safely abort the configuration utility by pressing <b>Abort</b> now.</p>\n" @@ -1044,7 +1072,7 @@ "Safely abort the configuration utility by pressing <b>Abort</b> now.</p>\n" #. Write dialog help 1/2 -#: src/include/kdump/helps.rb:183 +#: src/include/kdump/helps.rb:197 msgid "" "<p><b><big>Saving Kdump Configuration</big></b><br>\n" "Please wait...<br></p>\n" @@ -1053,7 +1081,7 @@ "Please wait...<br></p>\n" #. Write dialog help 2/2 -#: src/include/kdump/helps.rb:187 +#: src/include/kdump/helps.rb:201 msgid "" "<p><b><big>Aborting Saving:</big></b><br>\n" "Abort the save procedure by pressing <b>Abort</b>.\n" @@ -1066,7 +1094,7 @@ "</p>\n" #. Summary dialog help 1/3 -#: src/include/kdump/helps.rb:194 +#: src/include/kdump/helps.rb:208 msgid "" "<p><b><big>Kdump Configuration</big></b><br>\n" "Configure kdump here.<br></p>\n" @@ -1075,7 +1103,7 @@ "Configure kdump here.<br></p>\n" #. Summary dialog help 2/3 -#: src/include/kdump/helps.rb:198 +#: src/include/kdump/helps.rb:212 #, fuzzy msgid "" "<p><b><big>Adding a Kdump:</big></b><br>\n" @@ -1089,7 +1117,7 @@ "Then press <b>Configure</b>.</p>\n" #. Summary dialog help 3/3 -#: src/include/kdump/helps.rb:205 +#: src/include/kdump/helps.rb:219 msgid "" "<p><b><big>Editing or Deleting:</big></b><br>\n" "If you press <b>Edit</b>, an additional dialog in which to change\n" @@ -1100,7 +1128,7 @@ "the configuration opens.</p>\n" #. Ovreview dialog help 1/3 -#: src/include/kdump/helps.rb:211 +#: src/include/kdump/helps.rb:225 msgid "" "<p><b><big>Kdump Configuration Overview</big></b><br>\n" "Obtain an overview of installed kdumps. Additionally\n" @@ -1111,7 +1139,7 @@ "edit their configurations.<br></p>\n" #. Ovreview dialog help 2/3 -#: src/include/kdump/helps.rb:217 +#: src/include/kdump/helps.rb:231 msgid "" "<p><b><big>Adding a Kdump:</big></b><br>\n" "Press <b>Add</b> to configure a kdump.</p>" @@ -1120,7 +1148,7 @@ "Press <b>Add</b> to configure a kdump.</p>" #. Ovreview dialog help 3/3 -#: src/include/kdump/helps.rb:221 +#: src/include/kdump/helps.rb:235 msgid "" "<p><b><big>Editing or Deleting:</big></b><br>\n" "Choose a kdump to change or remove.\n" @@ -1165,6 +1193,10 @@ msgid "Enable Anon&ymous FTP" msgstr "Enable Anon&ymous FTP" +#: src/include/kdump/uifunctions.rb:143 +msgid "SSH / SFTP" +msgstr "" + #. text entries #: src/include/kdump/uifunctions.rb:196 msgid "Exported Sha&re" @@ -1226,139 +1258,148 @@ #. See FATE#315780 #. See https://www.suse.com/support/kb/doc.php?id=7012786 #. FIXME what about dracut? -#: src/modules/Kdump.rb:484 +#: src/modules/Kdump.rb:495 msgid "" "Error updating initrd while calling '%{cmd}'.\n" "See %{log} for details." msgstr "" #. Kdump read dialog caption -#: src/modules/Kdump.rb:594 +#: src/modules/Kdump.rb:605 msgid "Initializing kdump Configuration" msgstr "Initialising kdump Configuration" #. Progress stage 1/4 #. Progress step 1/4 -#: src/modules/Kdump.rb:603 src/modules/Kdump.rb:611 +#: src/modules/Kdump.rb:614 src/modules/Kdump.rb:622 msgid "Reading the config file..." msgstr "Reading the config file..." #. Progress stage 3/4 -#: src/modules/Kdump.rb:605 +#: src/modules/Kdump.rb:616 #, fuzzy msgid "Reading kernel boot options..." msgstr "Read kernel boot options" #. Progress stage 4/4 #. Progress finished 3/4 -#: src/modules/Kdump.rb:607 src/modules/Kdump.rb:615 +#: src/modules/Kdump.rb:618 src/modules/Kdump.rb:626 msgid "Reading available memory..." msgstr "Reading available memory..." #. Progress step 2/4 -#: src/modules/Kdump.rb:613 +#: src/modules/Kdump.rb:624 msgid "Reading partitions of disks..." msgstr "Reading partitions of disks..." #. Error message -#: src/modules/Kdump.rb:627 +#: src/modules/Kdump.rb:638 msgid "Cannot read config file /etc/sysconfig/kdump" msgstr "Cannot read config file /etc/sysconfig/kdump" #. Error message -#: src/modules/Kdump.rb:635 +#: src/modules/Kdump.rb:646 #, fuzzy msgid "Cannot read kernel boot options." msgstr "Cannot read kernel boot options" #. Error message -#: src/modules/Kdump.rb:642 +#: src/modules/Kdump.rb:653 #, fuzzy msgid "Cannot read available memory." msgstr "Cannot read available memory" #. Kdump read dialog caption -#: src/modules/Kdump.rb:668 +#: src/modules/Kdump.rb:679 msgid "Saving kdump Configuration" msgstr "Saving kdump Configuration" #. Progress stage 1/2 -#: src/modules/Kdump.rb:697 +#: src/modules/Kdump.rb:708 msgid "Write the settings" msgstr "Write the settings" #. Progress stage 2/2 -#: src/modules/Kdump.rb:699 +#: src/modules/Kdump.rb:710 msgid "Update boot options" msgstr "Update boot options" #. Progress step 1/2 -#: src/modules/Kdump.rb:703 +#: src/modules/Kdump.rb:714 msgid "Writing the settings..." msgstr "Writing the settings..." #. Progress step 2/2 -#: src/modules/Kdump.rb:705 +#: src/modules/Kdump.rb:716 msgid "Updating boot options..." msgstr "Updating boot options..." #. Progress finished -#: src/modules/Kdump.rb:707 +#: src/modules/Kdump.rb:718 msgid "Finished" msgstr "Finished" #. Error message -#: src/modules/Kdump.rb:717 +#: src/modules/Kdump.rb:728 msgid "Cannot write settings." msgstr "Cannot write settings." #. Error message -#: src/modules/Kdump.rb:726 +#: src/modules/Kdump.rb:737 msgid "Adding crashkernel parameter to bootloader fault." msgstr "Adding crashkernel parameter to bootloader fault." #. Create a textual summary and a list of unconfigured cards #. @return summary of the current configuration -#: src/modules/Kdump.rb:833 +#: src/modules/Kdump.rb:851 #, fuzzy msgid "Kdump status: %1" msgstr "Kdump runlevel: %1" -#: src/modules/Kdump.rb:834 +#: src/modules/Kdump.rb:852 msgid "enabled" msgstr "enabled" -#: src/modules/Kdump.rb:834 +#: src/modules/Kdump.rb:852 msgid "disabled" msgstr "disabled" -#: src/modules/Kdump.rb:841 +#: src/modules/Kdump.rb:859 #, fuzzy msgid "Value of crashkernel option: %1" msgstr "Empty value for option: %1" -#: src/modules/Kdump.rb:848 +#: src/modules/Kdump.rb:866 #, fuzzy msgid "Dump format: %1" msgstr "Dump Format: %1" -#: src/modules/Kdump.rb:855 +#: src/modules/Kdump.rb:873 #, fuzzy msgid "Target of dumps: %1" msgstr "Numbers of old dumps: %1" -#: src/modules/Kdump.rb:862 +#: src/modules/Kdump.rb:880 #, fuzzy msgid "Number of dumps: %1" msgstr "Numbers of old dumps: %1" +#. TRANSLATORS: warning message in installation proposal, +#. do not translate %{requested} and %{available} - they are replaced with actual sizes later +#: src/modules/Kdump.rb:972 +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:950 +#: src/modules/Kdump.rb:1065 msgid "" "Cannot use Firmware-assisted dump.\n" "It is not supported on this hardware." msgstr "" +#~ msgid "SSH (scp)" +#~ msgstr "SSH (scp)" + #~ msgid "Package for kexec-tools is not available." #~ msgstr "Package for kexec-tools is not available." Modified: trunk/yast/en_GB/po/languages_db.en_GB.po =================================================================== --- trunk/yast/en_GB/po/languages_db.en_GB.po 2015-09-09 08:18:21 UTC (rev 92602) +++ trunk/yast/en_GB/po/languages_db.en_GB.po 2015-09-09 08:19:44 UTC (rev 92603) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-04 15:52+0200\n" +"POT-Creation-Date: 2015-08-25 18:36+0200\n" "PO-Revision-Date: 2001-07-17 16:27+0200\n" "Last-Translator: James Ogley \n" "Language-Team: English \n" Modified: trunk/yast/en_GB/po/ldap-client.en_GB.po =================================================================== --- trunk/yast/en_GB/po/ldap-client.en_GB.po 2015-09-09 08:18:21 UTC (rev 92602) +++ trunk/yast/en_GB/po/ldap-client.en_GB.po 2015-09-09 08:19:44 UTC (rev 92603) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: yast2 9.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-04 15:52+0200\n" +"POT-Creation-Date: 2015-08-25 18:36+0200\n" "PO-Revision-Date: 2007-08-16 19:55+0100\n" "Last-Translator: Benjamin Weber\n" "Language-Team: British English\n" @@ -17,748 +17,18 @@ "X-Generator: KAider 0.1\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#. translators: command line help text for Ldap client module -#: src/clients/ldap.rb:53 -msgid "LDAP client configuration module" -msgstr "LDAP client configuration module" - -#. translators: command line help text for pam action -#: src/clients/ldap.rb:66 -msgid "Enable or disable authentication with LDAP" -msgstr "Enable or disable authentication with LDAP" - -#. translators: command line help text for summary action -#: src/clients/ldap.rb:73 -msgid "Configuration summary of the LDAP client" -msgstr "Configuration summary of the LDAP client" - -#. translators: command line help text for configure action -#: src/clients/ldap.rb:83 -msgid "Change the global settings of the LDAP client" -msgstr "Change the global settings of the LDAP client" - -#. translators: command line help text for pam enable option -#: src/clients/ldap.rb:91 -msgid "Enable the service" -msgstr "Enable the service" - -#. translators: command line help text for pam disable option -#: src/clients/ldap.rb:97 -msgid "Disable the service" -msgstr "Disable the service" - -#. translators: command line help text for the server option -#: src/clients/ldap.rb:103 -msgid "The LDAP server name" -msgstr "The LDAP server name" - -#. translators: command line help text for the base option -#: src/clients/ldap.rb:110 -msgid "Distinguished name (DN) of the search base" -msgstr "Distinguished name (DN) of the search base" - -#. command line help text for the 'createconfig' option -#: src/clients/ldap.rb:117 -msgid "Create default configuration objects." -msgstr "Create default configuration objects." - -#. command line help text for the 'ldappw' option -#: src/clients/ldap.rb:123 -msgid "LDAP Server Password" -msgstr "LDAP Server Password" - -#. help text for the 'automounter' option -#: src/clients/ldap.rb:130 -msgid "Start or stop automounter" -msgstr "Start or stop automounter" - -#. help text for the 'mkhomedir' option -#: src/clients/ldap.rb:138 -msgid "Create Home Directory on Login" -msgstr "Create Home Directory on Login" - -#. help text for the 'tls' option -#: src/clients/ldap.rb:146 -#, fuzzy -msgid "Encrypted connection (StartTLS)" -msgstr "Enter connection name" - -#. help text for the 'sssd' option -#: src/clients/ldap.rb:154 -msgid "Use System Security Services Daemon (SSSD)" -msgstr "" - -#. help text for the 'cache_credentials' option -#: src/clients/ldap.rb:162 -#, fuzzy -msgid "SSSD Offline Authentication" -msgstr "User Authentication" - -#. command line help text for the 'realm' option -#: src/clients/ldap.rb:170 -#, fuzzy -#| msgid "Kerberos" -msgid "Kerberos Realm" -msgstr "Kerberos" - -#. command line help text for the 'kdc' option -#: src/clients/ldap.rb:177 -msgid "KDC Server Address" -msgstr "KDC Server Address" - -#. password entering label -#: src/clients/ldap.rb:313 -msgid "LDAP Server Password:" -msgstr "LDAP Server Password:" - #. popup text -#: src/include/ldap/ui.rb:88 +#: src/ui.rb:88 msgid "Really abort the writing process?" msgstr "Really abort the writing process?" #. help text -#: src/include/ldap/ui.rb:96 +#: src/ui.rb:96 msgid "Writing LDAP Client Settings" msgstr "Writing LDAP Client Settings" -#. popup window -#: src/include/ldap/ui.rb:130 -msgid "Scanning for LDAP servers provided by SLP..." -msgstr "Scanning for LDAP servers provided by SLP..." - -#. multiselection box label -#: src/include/ldap/ui.rb:152 -msgid "LDAP &Servers Provided by SLP" -msgstr "LDAP &Servers Provided by SLP" - -#. warning popup -#: src/include/ldap/ui.rb:206 -#, fuzzy -#| msgid "CA certificate file does not exist." -msgid "The certificate file does not seem to have valid format." -msgstr "CA certificate file does not exist." - -#. Popup for TLS/SSL related stuff -#: src/include/ldap/ui.rb:248 -#, fuzzy -#| msgid "&NTP Configuration..." -msgid "SSL/TLS Configuration" -msgstr "&NTP Configuration..." - -#: src/include/ldap/ui.rb:255 -msgid "Use SSL/TLS" -msgstr "" - -#: src/include/ldap/ui.rb:264 -msgid "Protocols" -msgstr "" - -#: src/include/ldap/ui.rb:278 -msgid "StartTLS" -msgstr "" - -#: src/include/ldap/ui.rb:286 -#, fuzzy -#| msgid "LDAP Server" -msgid "LDAPS" -msgstr "LDAP Server" - -#: src/include/ldap/ui.rb:300 -msgid "TLS Options" -msgstr "" - -#: src/include/ldap/ui.rb:310 -msgid "Request server certificate" -msgstr "" - -#: src/include/ldap/ui.rb:320 -#, fuzzy -msgid "Certificates" -msgstr "Choose Certificate File" - -#. inputfield label -#: src/include/ldap/ui.rb:330 -#, fuzzy -msgid "Cer&tificate Directory" -msgstr "Certificate File to Import" - -#. button label -#: src/include/ldap/ui.rb:336 -msgid "B&rowse" -msgstr "B&rowse" - -#. inputfield label -#: src/include/ldap/ui.rb:345 -#, fuzzy -msgid "CA Cert&ificate File" -msgstr "Choose Certificate File" - -#. button label -#: src/include/ldap/ui.rb:351 -msgid "Brows&e" -msgstr "Brows&e" - -#. inputfield label -#: src/include/ldap/ui.rb:360 -#, fuzzy -msgid "CA Certificate URL for Download" -msgstr "" -"\n" -"Certificate not found" - -#. push button label -#: src/include/ldap/ui.rb:365 -#, fuzzy -msgid "Do&wnload CA Certificate" -msgstr "CA Certificate" - -#. popup label -#: src/include/ldap/ui.rb:425 -#, fuzzy -msgid "Choose the directory with certificates" -msgstr "Path to directory with packages" - -#. popup label -#: src/include/ldap/ui.rb:437 -#, fuzzy -msgid "Choose the certificate file" -msgstr "Choose Certificate File" - -#. error message -#: src/include/ldap/ui.rb:462 -#, fuzzy -msgid "Could not download the certificate file from specified URL." -msgstr "Could not download the SMT certificate file from specified URL." - -#. popup message, %1 is file name, %2 directory -#: src/include/ldap/ui.rb:497 -msgid "" -"The downloaded certificate file\n" -"\n" -"'%1'\n" -"\n" -"has been copied to '%2' directory.\n" -msgstr "" - -#. help text 1/9 -#: src/include/ldap/ui.rb:533 -#, fuzzy -#| msgid "" -#| "<p>Here, your machine can be set up as an\n" -#| "LDAP client.</p>\n" -msgid "<p>Set up your machine as an LDAP client.</p>\n" -msgstr "" -"<p>Here, your machine can be set up as an\n" -"LDAP client.</p>\n" - -#. help text 2/9 -#: src/include/ldap/ui.rb:535 -msgid "<p>To authenticate your users with an OpenLDAP server, select <b>Use LDAP</b>. NSS and PAM will be configured accordingly.</p>" -msgstr "<p>To authenticate your users with an OpenLDAP server, select <b>Use LDAP</b>. NSS and PAM will be configured accordingly.</p>" - -#. help text 3/9 -#: src/include/ldap/ui.rb:539 -msgid "" -"<p>To deactivate LDAP services, click <b>Do Not Use LDAP</b>.\n" -"If you deactivate LDAP, the current LDAP entry for passwd in /etc/nsswitch.conf\n" -"will be removed. The PAM configuration will be modified and the LDAP entry\n" -"removed.</p>" -msgstr "" -"<p>To deactivate LDAP services, click <b>Do Not Use LDAP</b>.\n" -"If you deactivate LDAP, the current LDAP entry for passwd in /etc/nsswitch.conf\n" -"will be removed. The PAM configuration will be modified and the LDAP entry\n" -"removed.</p>" - -#. help text 3.5/9 -#: src/include/ldap/ui.rb:546 -msgid "<p>To activate LDAP but forbid users from logging in to this machine, select <b>Enable LDAP Users but Disable Logins</b>.</p>" -msgstr "<p>To activate LDAP but forbid users from logging in to this machine, select <b>Enable LDAP Users but Disable Logins</b>.</p>" - -#. help text -#: src/include/ldap/ui.rb:550 -msgid "<p>Check <b>Use System Security Services Daemon</b> if you want the system to use SSSD instead of nss_ldap.</p>" -msgstr "" - -#. help text 4/9 -#: src/include/ldap/ui.rb:554 -msgid "" -"<p>Enter the LDAP server's address (such as ldap.example.com or 10.20.0.2) in <b>Addresses</b> and the distinguished name of the search base (<b>Base DN</b>, such as dc=example,dc=com). Specify multiple servers\n" -"by separating their addresses with spaces. It must be possible to resolve the\n" -"addresses without using LDAP. You can also specify the port on which the server is running using the syntax \"server:port\", for example, <tt>ldap.example.com:379</tt>.\n" -"</p>\n" -msgstr "" -"<p>Enter the LDAP server's address (such as ldap.example.com or 10.20.0.2) in <b>Addresses</b> and the distinguished name of the search base (<b>Base DN</b>, such as dc=example,dc=com). Specify multiple servers\n" -"by separating their addresses with spaces. It must be possible to resolve the\n" -"addresses without using LDAP. You can also specify the port on which the server is running using the syntax \"server:port\", for example, <tt>ldap.example.com:379</tt>.\n" -"</p>\n" - -#. help text 5/9 -#: src/include/ldap/ui.rb:561 -msgid "<p>With <b>Find</b>, select the LDAP server from the list provided by the service location protocol (SLP). Using <b>Fetch DN</b>, read the base DN from server.</p>" -msgstr "<p>With <b>Find</b>, select the LDAP server from the list provided by the service location protocol (SLP). Using <b>Fetch DN</b>, read the base DN from server.</p>" - -#. help text 6/9 -#: src/include/ldap/ui.rb:565 -#, fuzzy -msgid "" -"<p>Some LDAP servers support StartTLS (RFC2830).\n" -"If your server supports it and it is configured, activate <b>LDAP TLS/SSL</b>\n" -"to encrypt your communication with the LDAP server. You may download a CA\n" -"certificate file in PEM format from a given URL.</p>\n" -msgstr "" -"<p>Some LDAP servers support StartTLS (RFC2830).\n" -"If your server supports it and it is configured, activate <b>LDAP TLS/SSL</b>\n" -"to encrypt your communication with the LDAP server.</p>\n" - -#: src/include/ldap/ui.rb:571 -msgid "" -"<p>A TLS session may require special client configuration. One of the config\n" -" options is TLS_REQCERT which specifies what checks to perform on server certificates.\n" -" The value is the <b>level</b> that can be specified with keywords <i>never</i>, <i>allow</i>,\n" -" <i>try</i> and <i>demand</i>. In the <b>SSL/TLS Configuration</b> dialog there is\n" -" the option <b>Request server certificate</b> which will set the TLS_REQCERT\n" -" configuration option to <i>demand</i> if it's enabled or to <i>allow</i> if it's disabled.</p>\n" -msgstr "" - -#: src/include/ldap/ui.rb:579 -msgid "" -"<p>In addition to LDAP URLs and TLS/SSL encryption, LDAP supports LDAPS URLs.\n" -" LDAPS URLs use SSL connections instead of plain connections. They have a syntax\n" -" similar to LDAP URLs except the schemes are different and the default port for LDAPS URLs\n" -" is 636 instead of 389.</p>\n" -msgstr "" - -#. help text 8/9 -#: src/include/ldap/ui.rb:586 -#, fuzzy -#| msgid "" -#| "<p>For configuration of advanced LDAP settings, click\n" -#| "<b>Advanced Configuration</b>.</p>\n" -msgid "" -"<p>To configure advanced LDAP settings, click\n" -"<b>Advanced Configuration</b>.</p>\n" -"<p>To configure security settings, click\n" -"<b>SSL/TLS Configuration</b>.</p>\n" -msgstr "" -"<p>For configuration of advanced LDAP settings, click\n" -"<b>Advanced Configuration</b>.</p>\n" - -#. help text 9/9 (additional) -#: src/include/ldap/ui.rb:591 -#, fuzzy -#| msgid "" -#| "<p><b>Automounter</b> is a daemon that automatically mounts directories,\n" -#| "such as users' home directories.\n" -#| "It is assumed that its configuration files (auto.*) already exist\n" -#| "locally or over LDAP.\n" -#| "If it is not installed and you want to use it, it is installed\n" -#| "automatically.</p>\n" -msgid "" -"<p><b>Automounter</b> is a daemon that automatically mounts directories, such\n" -"as users' home directories. Its configuration files (auto.*) should already\n" -"exist locally or over LDAP. If the automounter is not installed yet but you\n" -"want to use it, it will be installed automatically.</p>\n" -msgstr "" -"<p><b>Automounter</b> is a daemon that automatically mounts directories,\n" -"such as users' home directories.\n" -"It is assumed that its configuration files (auto.*) already exist\n" -"locally or over LDAP.\n" -"If it is not installed and you want to use it, it is installed\n" -"automatically.</p>\n" - -#. check box label -#: src/include/ldap/ui.rb:614 -msgid "Start Auto&mounter" -msgstr "Start Auto&mounter" - -#. checkbox label -#: src/include/ldap/ui.rb:625 -#, fuzzy -msgid "C&reate Home Directory on Login" -msgstr "Create Home Directory on Login" - -#. checkbox label -#: src/include/ldap/ui.rb:635 -#, fuzzy -#| msgid "D&isable User Login" -msgid "Disable User &Logins" -msgstr "D&isable User Login" - -#. frame label -#: src/include/ldap/ui.rb:648 -msgid "User Authentication" -msgstr "User Authentication" - -#. radio button label -#: src/include/ldap/ui.rb:663 -#, fuzzy -msgid "Do &Not Use LDAP" -msgstr "Do N&ot Use LDAP" - -#. radio button label -#: src/include/ldap/ui.rb:672 -msgid "&Use LDAP" -msgstr "&Use LDAP" - -#. frame label -#: src/include/ldap/ui.rb:687 -msgid "LDAP Client" -msgstr "LDAP Client" - -#. text entry label -#: src/include/ldap/ui.rb:697 -msgid "Addresses of LDAP &Servers" -msgstr "Addresses of LDAP &Servers" - -#. push button label -#: src/include/ldap/ui.rb:703 -msgid "F&ind" -msgstr "F&ind" - -#. text entry label -#: src/include/ldap/ui.rb:711 -msgid "LDAP Base &DN" -msgstr "LDAP Base &DN" - -#. push button label -#: src/include/ldap/ui.rb:717 -msgid "F&etch DN" -msgstr "F&etch DN" - -#. pushbutton label -#: src/include/ldap/ui.rb:731 -#, fuzzy -#| msgid "&NTP Configuration..." -msgid "SSL/TLS Configuration..." -msgstr "&NTP Configuration..." - -#. pushbutton label -#: src/include/ldap/ui.rb:733 -msgid "&Advanced Configuration..." -msgstr "&Advanced Configuration..." - -#. dialog title -#. dialog label -#: src/include/ldap/ui.rb:742 src/include/ldap/wizards.rb:90 -msgid "LDAP Client Configuration" -msgstr "LDAP Client Configuration" - -#. question popup -#: src/include/ldap/ui.rb:765 -msgid "" -"Previous LDAP client configuration was detected.\n" -"\n" -"Current configuration does not use SSSD but nss_ldap.\n" -"Only SSSD based configurations are supported by YaST.\n" -"Do you want to continue and use SSSD or cancel to keep the old configuration?" -msgstr "" - -#. error popup label -#: src/include/ldap/ui.rb:838 -msgid "Enter an LDAP base DN." -msgstr "Enter an LDAP base DN." - -#. error popup label -#: src/include/ldap/ui.rb:845 -msgid "Enter at least one address of an LDAP server." -msgstr "Enter at least one address of an LDAP server." - -#. error popup label -#: src/include/ldap/ui.rb:853 -msgid "The LDAP server address is invalid." -msgstr "The LDAP server address is invalid." - -#. popup question: user enabled LDAP now, but probably has -#. enabled NIS client before -#: src/include/ldap/ui.rb:871 -msgid "" -"When you configure your machine as an LDAP client,\n" -"you cannot retrieve data with NIS. Really use LDAP instead of NIS?\n" -msgstr "" -"When you configure your machine as an LDAP client,\n" -"you cannot retrieve data with NIS. Really use LDAP instead of NIS?\n" - -#. popup text -#: src/include/ldap/ui.rb:941 -msgid "LDAP is now enabled." -msgstr "LDAP is now enabled." - -#. message popup, part 1/2 -#: src/include/ldap/ui.rb:947 -msgid "" -"This change only affects newly created processes and not already\n" -"running services. Restart your services manually or reboot \n" -"the machine to enable it for all services.\n" -msgstr "" -"This change only affects newly created processes and not already\n" -"running services. Restart your services manually or reboot \n" -"the machine to enable it for all services.\n" - -#. message popup, part 1/2 -#: src/include/ldap/ui.rb:958 -msgid "" -"\n" -"To enable remote login for LDAP users, sshd is\n" -"restarted automatically by YaST.\n" -msgstr "" -"\n" -"To enable remote login for LDAP users, sshd is\n" -"restarted automatically by YaST.\n" - -#. yes/no question -#: src/include/ldap/ui.rb:970 -msgid "" -"The security connection is enabled, but server certificate verification is disabled.\n" -"Enable certificate checks now?" -msgstr "" - -#. help text caption 1 -#: src/include/ldap/ui.rb:1015 -msgid "<p><b>Advanced LDAP Client Settings</b></p>" -msgstr "<p><b>Advanced LDAP Client Settings</b></p>" - -#. help text 1/3 -#: src/include/ldap/ui.rb:1017 -msgid "" -"<p>If Kerberos authentication should be used, specify the <b>realm</b> and <b>KDC Address</b>.\n" -"Determine if user credentials should be cached locally by checking <b>SSSD Offline Authentication</b>.\n" -"For more info about SSSD settings, check the man page of <tt>sssd.conf</tt>.</p>\n" -msgstr "" - -#. help text 2/3 -#: src/include/ldap/ui.rb:1023 -#, fuzzy -#| msgid "<p><b>Password Change Protocol</b> refers to the pam_password attribute of the <tt>/etc/ldap.conf</tt> file. See <tt>man pam_ldap</tt> for the meaning of its values.</p>" -msgid "" -"<p><b>Password Change Protocol</b> refers to the pam_password attribute of the\n" -"<tt>/etc/ldap.conf</tt> file. See <tt>man pam_ldap</tt> for an explanation of its values.</p>" -msgstr "<p><b>Password Change Protocol</b> refers to the pam_password attribute of the <tt>/etc/ldap.conf</tt> file. See <tt>man pam_ldap</tt> for the meaning of its values.</p>" - -#. help text 3/3, %1 is attribute name -#: src/include/ldap/ui.rb:1028 -msgid "" -"<p>Set the type of LDAP groups to use.\n" -"The default value for <b>Group Member Attribute</b> is <i>%1</i>.</p>\n" -msgstr "" -"<p>Set the type of LDAP groups to use.\n" -"The default value for <b>Group Member Attribute</b> is <i>%1</i>.</p>\n" - -#: src/include/ldap/ui.rb:1034 -msgid "" -"<p>If secure connection requires certificate checking, specify where your\n" -"certificate file is located. Enter either a directory containing certificates\n" -"or the explicit path to one certificate file.</p>" -msgstr "" - -#. help text caption 2 -#: src/include/ldap/ui.rb:1042 -msgid "<p><b>Access to Server</b></p>" -msgstr "<p><b>Access to Server</b></p>" - -#. help text 1/4 -#: src/include/ldap/ui.rb:1044 -#, fuzzy -#| msgid "" -#| "<p>First, set <b>Configuration Base DN</b>.\n" -#| "It is the base for storing your configuration data, which is saved on the LDAP\n" -#| "server.</p>\n" -msgid "" -"<p>First, set <b>Configuration Base DN</b>.\n" -"This is the base for storing your configuration data on the LDAP\n" -"server.</p>\n" -msgstr "" -"<p>First, set <b>Configuration Base DN</b>.\n" -"It is the base for storing your configuration data, which is saved on the LDAP\n" -"server.</p>\n" - -#. help text 2/4 -#: src/include/ldap/ui.rb:1050 -#, fuzzy -#| msgid "" -#| "<p>To access the data stored on the server, enter the\n" -#| "<b>Administrator DN</b>.\n" -#| "You can enter the full DN (for example, cn=Administrator,dc=mydomain,dc=com) or just\n" -#| "the relative DN (for example, cn=Administrator). The LDAP base DN is appended automatically if the appropriate option is checked.</p>\n" -msgid "" -"<p>To access the data stored on the server, enter the\n" -"<b>Administrator DN</b>.\n" -"You can enter the full DN (for example, cn=Administrator,dc=mydomain,dc=com) or \n" -"the relative DN (for example, cn=Administrator). The LDAP base DN is appended automatically if the appropriate option is checked.</p>\n" -msgstr "" -"<p>To access the data stored on the server, enter the\n" -"<b>Administrator DN</b>.\n" -"You can enter the full DN (for example, cn=Administrator,dc=mydomain,dc=com) or just\n" -"the relative DN (for example, cn=Administrator). The LDAP base DN is appended automatically if the appropriate option is checked.</p>\n" - -#. help text 3/4 -#: src/include/ldap/ui.rb:1057 -msgid "" -"<p>To create the default configuration objects for LDAP users and groups,\n" -"check <b>Create Default Configuration Objects</b>. The objects are only created when they do not already exist.</p>\n" -msgstr "" -"<p>To create the default configuration objects for LDAP users and groups,\n" -"check <b>Create Default Configuration Objects</b>. The objects are only created when they do not already exist.</p>\n" - -#. help text 4/4 -#: src/include/ldap/ui.rb:1061 -msgid "" -"<p>Press <b>Configure</b> to configure settings stored on the\n" -"LDAP server. You will be asked for the password if you are not connected yet or\n" -"have changed your configuration.</p>\n" -msgstr "" -"<p>Press <b>Configure</b> to configure settings stored on the\n" -"LDAP server. You will be asked for the password if you are not connected yet or\n" -"have changed your configuration.</p>\n" - -#. help text 1/1 -#: src/include/ldap/ui.rb:1068 -#, fuzzy -#| msgid "" -#| "<p>Specify the search bases to use for specific maps (users, passwords, and groups) if they are different from the base DN. These values are\n" -#| "set to the nss_base_passwd, nss_base_shadow, and nss_base_group attributes\n" -#| "in /etc/ldap.conf file.</p>\n" -msgid "" -"<p>Specify the search bases to use for specific maps (users or groups) if they are different from the base DN. These values are\n" -"set to the ldap_user_search_base, ldap_group_search_base and ldap_autofs_search_base attributes in /etc/sssd/sssd.conf file.</p>\n" -msgstr "" -"<p>Specify the search bases to use for specific maps (users, passwords, and groups) if they are different from the base DN. These values are\n" -"set to the nss_base_passwd, nss_base_shadow, and nss_base_group attributes\n" -"in /etc/ldap.conf file.</p>\n" - -#. tab label -#: src/include/ldap/ui.rb:1142 -msgid "C&lient Settings" -msgstr "C&lient Settings" - -#. tab label -#: src/include/ldap/ui.rb:1144 -msgid "Ad&ministration Settings" -msgstr "Ad&ministration Settings" - -#. tab label -#: src/include/ldap/ui.rb:1146 -msgid "Naming Contexts" -msgstr "Naming Contexts" - -#. textentry label -#: src/include/ldap/ui.rb:1180 -msgid "&User Map" -msgstr "&User Map" - -#. button label -#: src/include/ldap/ui.rb:1186 -msgid "&Browse" -msgstr "&Browse" - -#. textentry label -#: src/include/ldap/ui.rb:1194 -msgid "&Group Map" -msgstr "&Group Map" - -#. button label -#. button label -#. button label -#: src/include/ldap/ui.rb:1200 src/include/ldap/ui.rb:1214 -#: src/include/ldap/ui.rb:1332 -msgid "Bro&wse" -msgstr "Bro&wse" - -#. textentry label -#: src/include/ldap/ui.rb:1208 -#, fuzzy -#| msgid "&User Map" -msgid "&Autofs Map" -msgstr "&User Map" - -#. checkbox label -#: src/include/ldap/ui.rb:1240 -msgid "&Use Kerberos" -msgstr "&Use Kerberos" - -#. textentry label -#: src/include/ldap/ui.rb:1248 -msgid "Default Real&m" -msgstr "Default Real&m" - -#. textentry label -#: src/include/ldap/ui.rb:1250 -msgid "&KDC Server Address" -msgstr "&KDC Server Address" - -#. combobox label -#: src/include/ldap/ui.rb:1257 -#, fuzzy -#| msgid "LDAP Server" -msgid "LDAP Schema" -msgstr "LDAP Server" - -#. checkbox label -#: src/include/ldap/ui.rb:1269 -#, fuzzy -#| msgid "Initializing user and group configuration" -msgid "Enable user and group enumeration" -msgstr "Initialising user and group configuration" - -#. check box label -#: src/include/ldap/ui.rb:1281 -#, fuzzy -msgid "SSSD O&ffline Authentication" -msgstr "User Authentication" - -#. combobox label -#: src/include/ldap/ui.rb:1291 -#, fuzzy -msgid "Passwor&d Change Protocol" -msgstr "Pa&ssword Change Protocol" - -#. combobox label -#: src/include/ldap/ui.rb:1298 -#, fuzzy -msgid "Group Member &Attribute" -msgstr "G&roup Member Attribute" - -#. textentry label -#: src/include/ldap/ui.rb:1326 -msgid "Configuration &Base DN" -msgstr "Configuration &Base DN" - -#. textentry label -#: src/include/ldap/ui.rb:1341 -msgid "Administrator &DN" -msgstr "Administrator &DN" - -#. checkbox label -#: src/include/ldap/ui.rb:1347 -msgid "A&ppend Base DN" -msgstr "A&ppend Base DN" - -#. checkbox label -#: src/include/ldap/ui.rb:1355 -msgid "Crea&te Default Configuration Objects" -msgstr "Crea&te Default Configuration Objects" - -#. pushbutton label -#: src/include/ldap/ui.rb:1364 -msgid "Configure User Management &Settings..." -msgstr "Configure User Management &Settings..." - -#. dialog label -#: src/include/ldap/ui.rb:1384 -msgid "Advanced Configuration" -msgstr "Advanced Configuration" - -#. error popup label -#: src/include/ldap/ui.rb:1500 -msgid "Enter the DN used for binding to the LDAP server." -msgstr "Enter the DN used for binding to the LDAP server." - -#. error popup label -#: src/include/ldap/ui.rb:1507 -msgid "Enter the configuration base DN." -msgstr "Enter the configuration base DN." - #. yes/no popup -#: src/include/ldap/ui.rb:1592 +#: src/ui.rb:144 msgid "" "If you reread settings from the server,\n" "all changes will be lost. Really reread?\n" @@ -767,7 +37,7 @@ "all changes will be lost. Really reread?\n" #. help text 1/3 -#: src/include/ldap/ui.rb:1616 +#: src/ui.rb:168 #, fuzzy #| msgid "" #| "<p>Here, configure the template used for\n" @@ -780,7 +50,7 @@ "creating new objects (like users or groups).</p>\n" #. help text 2/3 -#: src/include/ldap/ui.rb:1620 +#: src/ui.rb:172 msgid "" "<p>Edit the template attribute values with <b>Edit</b>.\n" "Changing the <b>cn</b> value renames the template.</p>\n" @@ -789,7 +59,7 @@ "Changing the <b>cn</b> value renames the template.</p>\n" #. help text 3/3 -#: src/include/ldap/ui.rb:1624 +#: src/ui.rb:176 #, fuzzy #| msgid "" #| "<p>The second table contains a list of <b>default values</b>, used\n" @@ -806,54 +76,54 @@ #. table header 1/2 #. table header 1/2 -#: src/include/ldap/ui.rb:1693 src/include/ldap/ui.rb:2033 +#: src/ui.rb:245 src/ui.rb:580 msgid "Attribute" msgstr "Attribute" #. table header 2/2 #. table header 2/2 -#: src/include/ldap/ui.rb:1695 src/include/ldap/ui.rb:2035 +#: src/ui.rb:247 src/ui.rb:582 msgid "Value" msgstr "Value" #. label (table folows) -#: src/include/ldap/ui.rb:1701 +#: src/ui.rb:253 msgid "Default Values for New Objects" msgstr "Default Values for New Objects" #. table header 1/2 -#: src/include/ldap/ui.rb:1707 +#: src/ui.rb:259 msgid "Attribute of Object" msgstr "Attribute of Object" #. table header 2/2 -#: src/include/ldap/ui.rb:1709 +#: src/ui.rb:261 msgid "Default Value" msgstr "Default Value" #. button label (with non-default shortcut) -#: src/include/ldap/ui.rb:1715 +#: src/ui.rb:267 msgid "A&dd" msgstr "A&dd" #. button label -#: src/include/ldap/ui.rb:1717 +#: src/ui.rb:269 msgid "&Edit" msgstr "&Edit" #. dialog label -#: src/include/ldap/ui.rb:1729 +#: src/ui.rb:281 msgid "Object Template Configuration" msgstr "Object Template Configuration" #. yes/no popup, %1 is name -#: src/include/ldap/ui.rb:1832 +#: src/ui.rb:384 msgid "Really delete default attribute \"%1\"?" msgstr "Really delete default attribute \"%1\"?" #. error popup, %1 is attribute name #. error popup, %1 is attribute name -#: src/include/ldap/ui.rb:1865 src/include/ldap/ui.rb:2090 +#: src/ui.rb:417 src/ui.rb:636 msgid "" "The \"%1\" attribute is mandatory.\n" "Enter a value." @@ -862,14 +132,14 @@ "Enter a value." #. helptext 1/4 -#: src/include/ldap/ui.rb:1886 +#: src/ui.rb:438 #, fuzzy #| msgid "<p>Here, manage the configuration stored in LDAP directory.</p>" msgid "<p>Manage the configuration stored in the LDAP directory.</p>" msgstr "<p>Here, manage the configuration stored in LDAP directory.</p>" #. helptext 2/4 -#: src/include/ldap/ui.rb:1890 +#: src/ui.rb:442 msgid "" "<p>Each configuration set is called a \"configuration module.\" If there\n" "is no configuration module in the provided location (base configuration),\n" @@ -882,7 +152,7 @@ "using <b>Delete</b>.</p>\n" #. helptext 3/4 -#: src/include/ldap/ui.rb:1897 +#: src/ui.rb:449 msgid "" "<p>Edit the values of attributes in the table with <b>Edit</b>.\n" "Some values have special meanings, for example, changing the <b>cn</b> value renames the\n" @@ -893,7 +163,7 @@ "current module.</p>\n" #. helptext 4/4 -#: src/include/ldap/ui.rb:1903 +#: src/ui.rb:455 msgid "" "<p>To configure the default template of the current module,\n" "click <b>Configure Template</b>.\n" @@ -904,44 +174,485 @@ "</p>\n" #. combobox label -#: src/include/ldap/ui.rb:1983 +#: src/ui.rb:535 msgid "Configuration &Module" msgstr "Configuration &Module" #. button label -#: src/include/ldap/ui.rb:2007 +#: src/ui.rb:559 msgid "C&onfigure Template" msgstr "C&onfigure Template" #. dialog label -#: src/include/ldap/ui.rb:2051 +#: src/ui.rb:598 msgid "Module Configuration" msgstr "Module Configuration" -#. yes/no popup, %1 is name -#: src/include/ldap/ui.rb:2118 -msgid "Really delete module \"%1\"?" -msgstr "Really delete module \"%1\"?" +#~ msgid "LDAP client configuration module" +#~ msgstr "LDAP client configuration module" -#. message -#: src/include/ldap/ui.rb:2154 +#~ msgid "Enable or disable authentication with LDAP" +#~ msgstr "Enable or disable authentication with LDAP" + +#~ msgid "Configuration summary of the LDAP client" +#~ msgstr "Configuration summary of the LDAP client" + +#~ msgid "Change the global settings of the LDAP client" +#~ msgstr "Change the global settings of the LDAP client" + +#~ msgid "Enable the service" +#~ msgstr "Enable the service" + +#~ msgid "Disable the service" +#~ msgstr "Disable the service" + +#~ msgid "The LDAP server name" +#~ msgstr "The LDAP server name" + +#~ msgid "Distinguished name (DN) of the search base" +#~ msgstr "Distinguished name (DN) of the search base" + +#~ msgid "Create default configuration objects." +#~ msgstr "Create default configuration objects." + +#~ msgid "LDAP Server Password" +#~ msgstr "LDAP Server Password" + +#~ msgid "Start or stop automounter" +#~ msgstr "Start or stop automounter" + +#~ msgid "Create Home Directory on Login" +#~ msgstr "Create Home Directory on Login" + #, fuzzy -#| msgid "" -#| "You currently have configuration modules\n" -#| "of each type, so you cannot add a new one." -msgid "" -"You currently have a configuration module of each \n" -"type, therefore you cannot add a new one.\n" -msgstr "" -"You currently have configuration modules\n" -"of each type, so you cannot add a new one." +#~ msgid "Encrypted connection (StartTLS)" +#~ msgstr "Enter connection name" -#. label (init dialog) -#: src/include/ldap/wizards.rb:92 -msgid "Initializing..." -msgstr "Initialising..." +#, fuzzy +#~ msgid "SSSD Offline Authentication" +#~ msgstr "User Authentication" #, fuzzy +#~| msgid "Kerberos" +#~ msgid "Kerberos Realm" +#~ msgstr "Kerberos" + +#~ msgid "KDC Server Address" +#~ msgstr "KDC Server Address" + +#~ msgid "LDAP Server Password:" +#~ msgstr "LDAP Server Password:" + +#~ msgid "Scanning for LDAP servers provided by SLP..." +#~ msgstr "Scanning for LDAP servers provided by SLP..." + +#~ msgid "LDAP &Servers Provided by SLP" +#~ msgstr "LDAP &Servers Provided by SLP" + +#, fuzzy +#~| msgid "CA certificate file does not exist." +#~ msgid "The certificate file does not seem to have valid format." +#~ msgstr "CA certificate file does not exist." + +#, fuzzy +#~| msgid "&NTP Configuration..." +#~ msgid "SSL/TLS Configuration" +#~ msgstr "&NTP Configuration..." + +#, fuzzy +#~| msgid "LDAP Server" +#~ msgid "LDAPS" +#~ msgstr "LDAP Server" + +#, fuzzy +#~ msgid "Certificates" +#~ msgstr "Choose Certificate File" + +#, fuzzy +#~ msgid "Cer&tificate Directory" +#~ msgstr "Certificate File to Import" + +#~ msgid "B&rowse" +#~ msgstr "B&rowse" + +#, fuzzy +#~ msgid "CA Cert&ificate File" +#~ msgstr "Choose Certificate File" + +#~ msgid "Brows&e" +#~ msgstr "Brows&e" + +#, fuzzy +#~ msgid "CA Certificate URL for Download" +#~ msgstr "" +#~ "\n" +#~ "Certificate not found" + +#, fuzzy +#~ msgid "Do&wnload CA Certificate" +#~ msgstr "CA Certificate" + +#, fuzzy +#~ msgid "Choose the directory with certificates" +#~ msgstr "Path to directory with packages" + +#, fuzzy +#~ msgid "Choose the certificate file" +#~ msgstr "Choose Certificate File" + +#, fuzzy +#~ msgid "Could not download the certificate file from specified URL." +#~ msgstr "Could not download the SMT certificate file from specified URL." + +#, fuzzy +#~| msgid "" +#~| "<p>Here, your machine can be set up as an\n" +#~| "LDAP client.</p>\n" +#~ msgid "<p>Set up your machine as an LDAP client.</p>\n" +#~ msgstr "" +#~ "<p>Here, your machine can be set up as an\n" +#~ "LDAP client.</p>\n" + +#~ msgid "<p>To authenticate your users with an OpenLDAP server, select <b>Use LDAP</b>. NSS and PAM will be configured accordingly.</p>" +#~ msgstr "<p>To authenticate your users with an OpenLDAP server, select <b>Use LDAP</b>. NSS and PAM will be configured accordingly.</p>" + +#~ msgid "" +#~ "<p>To deactivate LDAP services, click <b>Do Not Use LDAP</b>.\n" +#~ "If you deactivate LDAP, the current LDAP entry for passwd in /etc/nsswitch.conf\n" +#~ "will be removed. The PAM configuration will be modified and the LDAP entry\n" +#~ "removed.</p>" +#~ msgstr "" +#~ "<p>To deactivate LDAP services, click <b>Do Not Use LDAP</b>.\n" +#~ "If you deactivate LDAP, the current LDAP entry for passwd in /etc/nsswitch.conf\n" +#~ "will be removed. The PAM configuration will be modified and the LDAP entry\n" +#~ "removed.</p>" + +#~ msgid "<p>To activate LDAP but forbid users from logging in to this machine, select <b>Enable LDAP Users but Disable Logins</b>.</p>" +#~ msgstr "<p>To activate LDAP but forbid users from logging in to this machine, select <b>Enable LDAP Users but Disable Logins</b>.</p>" + +#~ msgid "" +#~ "<p>Enter the LDAP server's address (such as ldap.example.com or 10.20.0.2) in <b>Addresses</b> and the distinguished name of the search base (<b>Base DN</b>, such as dc=example,dc=com). Specify multiple servers\n" +#~ "by separating their addresses with spaces. It must be possible to resolve the\n" +#~ "addresses without using LDAP. You can also specify the port on which the server is running using the syntax \"server:port\", for example, <tt>ldap.example.com:379</tt>.\n" +#~ "</p>\n" +#~ msgstr "" +#~ "<p>Enter the LDAP server's address (such as ldap.example.com or 10.20.0.2) in <b>Addresses</b> and the distinguished name of the search base (<b>Base DN</b>, such as dc=example,dc=com). Specify multiple servers\n" +#~ "by separating their addresses with spaces. It must be possible to resolve the\n" +#~ "addresses without using LDAP. You can also specify the port on which the server is running using the syntax \"server:port\", for example, <tt>ldap.example.com:379</tt>.\n" +#~ "</p>\n" + +#~ msgid "<p>With <b>Find</b>, select the LDAP server from the list provided by the service location protocol (SLP). Using <b>Fetch DN</b>, read the base DN from server.</p>" +#~ msgstr "<p>With <b>Find</b>, select the LDAP server from the list provided by the service location protocol (SLP). Using <b>Fetch DN</b>, read the base DN from server.</p>" + +#, fuzzy +#~ msgid "" +#~ "<p>Some LDAP servers support StartTLS (RFC2830).\n" +#~ "If your server supports it and it is configured, activate <b>LDAP TLS/SSL</b>\n" +#~ "to encrypt your communication with the LDAP server. You may download a CA\n" +#~ "certificate file in PEM format from a given URL.</p>\n" +#~ msgstr "" +#~ "<p>Some LDAP servers support StartTLS (RFC2830).\n" +#~ "If your server supports it and it is configured, activate <b>LDAP TLS/SSL</b>\n" +#~ "to encrypt your communication with the LDAP server.</p>\n" + +#, fuzzy +#~| msgid "" +#~| "<p>For configuration of advanced LDAP settings, click\n" +#~| "<b>Advanced Configuration</b>.</p>\n" +#~ msgid "" +#~ "<p>To configure advanced LDAP settings, click\n" +#~ "<b>Advanced Configuration</b>.</p>\n" +#~ "<p>To configure security settings, click\n" +#~ "<b>SSL/TLS Configuration</b>.</p>\n" +#~ msgstr "" +#~ "<p>For configuration of advanced LDAP settings, click\n" +#~ "<b>Advanced Configuration</b>.</p>\n" + +#, fuzzy +#~| msgid "" +#~| "<p><b>Automounter</b> is a daemon that automatically mounts directories,\n" +#~| "such as users' home directories.\n" +#~| "It is assumed that its configuration files (auto.*) already exist\n" +#~| "locally or over LDAP.\n" +#~| "If it is not installed and you want to use it, it is installed\n" +#~| "automatically.</p>\n" +#~ msgid "" +#~ "<p><b>Automounter</b> is a daemon that automatically mounts directories, such\n" +#~ "as users' home directories. Its configuration files (auto.*) should already\n" +#~ "exist locally or over LDAP. If the automounter is not installed yet but you\n" +#~ "want to use it, it will be installed automatically.</p>\n" +#~ msgstr "" +#~ "<p><b>Automounter</b> is a daemon that automatically mounts directories,\n" +#~ "such as users' home directories.\n" +#~ "It is assumed that its configuration files (auto.*) already exist\n" +#~ "locally or over LDAP.\n" +#~ "If it is not installed and you want to use it, it is installed\n" +#~ "automatically.</p>\n" + +#~ msgid "Start Auto&mounter" +#~ msgstr "Start Auto&mounter" + +#, fuzzy +#~ msgid "C&reate Home Directory on Login" +#~ msgstr "Create Home Directory on Login" + +#, fuzzy +#~| msgid "D&isable User Login" +#~ msgid "Disable User &Logins" +#~ msgstr "D&isable User Login" + +#~ msgid "User Authentication" +#~ msgstr "User Authentication" + +#, fuzzy +#~ msgid "Do &Not Use LDAP" +#~ msgstr "Do N&ot Use LDAP" + +#~ msgid "&Use LDAP" +#~ msgstr "&Use LDAP" + +#~ msgid "LDAP Client" +#~ msgstr "LDAP Client" + +#~ msgid "Addresses of LDAP &Servers" +#~ msgstr "Addresses of LDAP &Servers" + +#~ msgid "F&ind" +#~ msgstr "F&ind" + +#~ msgid "LDAP Base &DN" +#~ msgstr "LDAP Base &DN" + +#~ msgid "F&etch DN" +#~ msgstr "F&etch DN" + +#, fuzzy +#~| msgid "&NTP Configuration..." +#~ msgid "SSL/TLS Configuration..." +#~ msgstr "&NTP Configuration..." + +#~ msgid "&Advanced Configuration..." +#~ msgstr "&Advanced Configuration..." + +#~ msgid "LDAP Client Configuration" +#~ msgstr "LDAP Client Configuration" + +#~ msgid "Enter an LDAP base DN." +#~ msgstr "Enter an LDAP base DN." + +#~ msgid "Enter at least one address of an LDAP server." +#~ msgstr "Enter at least one address of an LDAP server." + +#~ msgid "The LDAP server address is invalid." +#~ msgstr "The LDAP server address is invalid." + +#~ msgid "" +#~ "When you configure your machine as an LDAP client,\n" +#~ "you cannot retrieve data with NIS. Really use LDAP instead of NIS?\n" +#~ msgstr "" +#~ "When you configure your machine as an LDAP client,\n" +#~ "you cannot retrieve data with NIS. Really use LDAP instead of NIS?\n" + +#~ msgid "LDAP is now enabled." +#~ msgstr "LDAP is now enabled." + +#~ msgid "" +#~ "This change only affects newly created processes and not already\n" +#~ "running services. Restart your services manually or reboot \n" +#~ "the machine to enable it for all services.\n" +#~ msgstr "" +#~ "This change only affects newly created processes and not already\n" +#~ "running services. Restart your services manually or reboot \n" +#~ "the machine to enable it for all services.\n" + +#~ msgid "" +#~ "\n" +#~ "To enable remote login for LDAP users, sshd is\n" +#~ "restarted automatically by YaST.\n" +#~ msgstr "" +#~ "\n" +#~ "To enable remote login for LDAP users, sshd is\n" +#~ "restarted automatically by YaST.\n" + +#~ msgid "<p><b>Advanced LDAP Client Settings</b></p>" +#~ msgstr "<p><b>Advanced LDAP Client Settings</b></p>" + +#, fuzzy +#~| msgid "<p><b>Password Change Protocol</b> refers to the pam_password attribute of the <tt>/etc/ldap.conf</tt> file. See <tt>man pam_ldap</tt> for the meaning of its values.</p>" +#~ msgid "" +#~ "<p><b>Password Change Protocol</b> refers to the pam_password attribute of the\n" +#~ "<tt>/etc/ldap.conf</tt> file. See <tt>man pam_ldap</tt> for an explanation of its values.</p>" +#~ msgstr "<p><b>Password Change Protocol</b> refers to the pam_password attribute of the <tt>/etc/ldap.conf</tt> file. See <tt>man pam_ldap</tt> for the meaning of its values.</p>" + +#~ msgid "" +#~ "<p>Set the type of LDAP groups to use.\n" +#~ "The default value for <b>Group Member Attribute</b> is <i>%1</i>.</p>\n" +#~ msgstr "" +#~ "<p>Set the type of LDAP groups to use.\n" +#~ "The default value for <b>Group Member Attribute</b> is <i>%1</i>.</p>\n" + +#~ msgid "<p><b>Access to Server</b></p>" +#~ msgstr "<p><b>Access to Server</b></p>" + +#, fuzzy +#~| msgid "" +#~| "<p>First, set <b>Configuration Base DN</b>.\n" +#~| "It is the base for storing your configuration data, which is saved on the LDAP\n" +#~| "server.</p>\n" +#~ msgid "" +#~ "<p>First, set <b>Configuration Base DN</b>.\n" +#~ "This is the base for storing your configuration data on the LDAP\n" +#~ "server.</p>\n" +#~ msgstr "" +#~ "<p>First, set <b>Configuration Base DN</b>.\n" +#~ "It is the base for storing your configuration data, which is saved on the LDAP\n" +#~ "server.</p>\n" + +#, fuzzy +#~| msgid "" +#~| "<p>To access the data stored on the server, enter the\n" +#~| "<b>Administrator DN</b>.\n" +#~| "You can enter the full DN (for example, cn=Administrator,dc=mydomain,dc=com) or just\n" +#~| "the relative DN (for example, cn=Administrator). The LDAP base DN is appended automatically if the appropriate option is checked.</p>\n" +#~ msgid "" +#~ "<p>To access the data stored on the server, enter the\n" +#~ "<b>Administrator DN</b>.\n" +#~ "You can enter the full DN (for example, cn=Administrator,dc=mydomain,dc=com) or \n" +#~ "the relative DN (for example, cn=Administrator). The LDAP base DN is appended automatically if the appropriate option is checked.</p>\n" +#~ msgstr "" +#~ "<p>To access the data stored on the server, enter the\n" +#~ "<b>Administrator DN</b>.\n" +#~ "You can enter the full DN (for example, cn=Administrator,dc=mydomain,dc=com) or just\n" +#~ "the relative DN (for example, cn=Administrator). The LDAP base DN is appended automatically if the appropriate option is checked.</p>\n" + +#~ msgid "" +#~ "<p>To create the default configuration objects for LDAP users and groups,\n" +#~ "check <b>Create Default Configuration Objects</b>. The objects are only created when they do not already exist.</p>\n" +#~ msgstr "" +#~ "<p>To create the default configuration objects for LDAP users and groups,\n" +#~ "check <b>Create Default Configuration Objects</b>. The objects are only created when they do not already exist.</p>\n" + +#~ msgid "" +#~ "<p>Press <b>Configure</b> to configure settings stored on the\n" +#~ "LDAP server. You will be asked for the password if you are not connected yet or\n" +#~ "have changed your configuration.</p>\n" +#~ msgstr "" +#~ "<p>Press <b>Configure</b> to configure settings stored on the\n" +#~ "LDAP server. You will be asked for the password if you are not connected yet or\n" +#~ "have changed your configuration.</p>\n" + +#, fuzzy +#~| msgid "" +#~| "<p>Specify the search bases to use for specific maps (users, passwords, and groups) if they are different from the base DN. These values are\n" +#~| "set to the nss_base_passwd, nss_base_shadow, and nss_base_group attributes\n" +#~| "in /etc/ldap.conf file.</p>\n" +#~ msgid "" +#~ "<p>Specify the search bases to use for specific maps (users or groups) if they are different from the base DN. These values are\n" +#~ "set to the ldap_user_search_base, ldap_group_search_base and ldap_autofs_search_base attributes in /etc/sssd/sssd.conf file.</p>\n" +#~ msgstr "" +#~ "<p>Specify the search bases to use for specific maps (users, passwords, and groups) if they are different from the base DN. These values are\n" +#~ "set to the nss_base_passwd, nss_base_shadow, and nss_base_group attributes\n" +#~ "in /etc/ldap.conf file.</p>\n" + +#~ msgid "C&lient Settings" +#~ msgstr "C&lient Settings" + +#~ msgid "Ad&ministration Settings" +#~ msgstr "Ad&ministration Settings" + +#~ msgid "Naming Contexts" +#~ msgstr "Naming Contexts" + +#~ msgid "&User Map" +#~ msgstr "&User Map" + +#~ msgid "&Browse" +#~ msgstr "&Browse" + +#~ msgid "&Group Map" +#~ msgstr "&Group Map" + +#~ msgid "Bro&wse" +#~ msgstr "Bro&wse" + +#, fuzzy +#~| msgid "&User Map" +#~ msgid "&Autofs Map" +#~ msgstr "&User Map" + +#~ msgid "&Use Kerberos" +#~ msgstr "&Use Kerberos" + +#~ msgid "Default Real&m" +#~ msgstr "Default Real&m" + +#~ msgid "&KDC Server Address" +#~ msgstr "&KDC Server Address" + +#, fuzzy +#~| msgid "LDAP Server" +#~ msgid "LDAP Schema" +#~ msgstr "LDAP Server" + +#, fuzzy +#~| msgid "Initializing user and group configuration" +#~ msgid "Enable user and group enumeration" +#~ msgstr "Initialising user and group configuration" + +#, fuzzy +#~ msgid "SSSD O&ffline Authentication" +#~ msgstr "User Authentication" + +#, fuzzy +#~ msgid "Passwor&d Change Protocol" +#~ msgstr "Pa&ssword Change Protocol" + +#, fuzzy +#~ msgid "Group Member &Attribute" +#~ msgstr "G&roup Member Attribute" + +#~ msgid "Configuration &Base DN" +#~ msgstr "Configuration &Base DN" + +#~ msgid "Administrator &DN" +#~ msgstr "Administrator &DN" + +#~ msgid "A&ppend Base DN" +#~ msgstr "A&ppend Base DN" + +#~ msgid "Crea&te Default Configuration Objects" +#~ msgstr "Crea&te Default Configuration Objects" + +#~ msgid "Configure User Management &Settings..." +#~ msgstr "Configure User Management &Settings..." + +#~ msgid "Advanced Configuration" +#~ msgstr "Advanced Configuration" + +#~ msgid "Enter the DN used for binding to the LDAP server." +#~ msgstr "Enter the DN used for binding to the LDAP server." + +#~ msgid "Enter the configuration base DN." +#~ msgstr "Enter the configuration base DN." + +#~ msgid "Really delete module \"%1\"?" +#~ msgstr "Really delete module \"%1\"?" + +#, fuzzy +#~| msgid "" +#~| "You currently have configuration modules\n" +#~| "of each type, so you cannot add a new one." +#~ msgid "" +#~ "You currently have a configuration module of each \n" +#~ "type, therefore you cannot add a new one.\n" +#~ msgstr "" +#~ "You currently have configuration modules\n" +#~ "of each type, so you cannot add a new one." + +#~ msgid "Initializing..." +#~ msgstr "Initialising..." + +#, fuzzy #~ msgid "<p>Browse the LDAP tree in the left part of the dialog.</p>" #~ msgstr "<p>Browse the LDAP tree in the <b>LDAP Tree</b> tab.</p>" Modified: trunk/yast/en_GB/po/ldap.en_GB.po =================================================================== --- trunk/yast/en_GB/po/ldap.en_GB.po 2015-09-09 08:18:21 UTC (rev 92602) +++ trunk/yast/en_GB/po/ldap.en_GB.po 2015-09-09 08:19:44 UTC (rev 92603) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: opensuse-i 18n\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-10-29 16:20+0100\n" +"POT-Creation-Date: 2015-08-25 18:36+0200\n" "PO-Revision-Date: 2014-05-19 09:34+0200\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" Modified: trunk/yast/en_GB/po/live-installer.en_GB.po =================================================================== --- trunk/yast/en_GB/po/live-installer.en_GB.po 2015-09-09 08:18:21 UTC (rev 92602) +++ trunk/yast/en_GB/po/live-installer.en_GB.po 2015-09-09 08:19:44 UTC (rev 92603) @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-04 15:52+0200\n" +"POT-Creation-Date: 2015-08-25 18:36+0200\n" "PO-Revision-Date: 2007-08-16 19:57+0100\n" "Last-Translator: Benjamin Weber\n" "Language-Team: British English\n" Modified: trunk/yast/en_GB/po/mail.en_GB.po =================================================================== --- trunk/yast/en_GB/po/mail.en_GB.po 2015-09-09 08:18:21 UTC (rev 92602) +++ trunk/yast/en_GB/po/mail.en_GB.po 2015-09-09 08:19:44 UTC (rev 92603) @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-10-29 16:21+0100\n" +"POT-Creation-Date: 2015-08-25 18:36+0200\n" "PO-Revision-Date: 2008-05-21 15:49+0200\n" "Last-Translator: Benjamin Weber\n" "Language-Team: British English\n" Modified: trunk/yast/en_GB/po/multipath.en_GB.po =================================================================== --- trunk/yast/en_GB/po/multipath.en_GB.po 2015-09-09 08:18:21 UTC (rev 92602) +++ trunk/yast/en_GB/po/multipath.en_GB.po 2015-09-09 08:19:44 UTC (rev 92603) @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-04 15:52+0200\n" +"POT-Creation-Date: 2015-08-25 18:36+0200\n" "PO-Revision-Date: 2001-07-17 16:27+0200\n" "Last-Translator: James Ogley \n" "Language-Team: English \n" @@ -91,8 +91,8 @@ msgid "alias" msgstr "Alias" -#: src/include/multipath/complex.rb:197 src/include/multipath/complex.rb:2285 -#: src/include/multipath/complex.rb:2956 +#: src/include/multipath/complex.rb:197 src/include/multipath/complex.rb:2284 +#: src/include/multipath/complex.rb:2955 msgid "wwid" msgstr "" @@ -133,15 +133,15 @@ #. check if user input is legal, and popup necessary information #. check if user input is legal, and popup necessary information -#: src/include/multipath/complex.rb:1063 src/include/multipath/complex.rb:3259 +#: src/include/multipath/complex.rb:1063 src/include/multipath/complex.rb:3258 #, fuzzy msgid "Illegal parameters:\n" msgstr "illegal '%s' parameter" #. duplicated configuraton checking #. duplicated configuraton checking -#: src/include/multipath/complex.rb:1135 src/include/multipath/complex.rb:2002 -#: src/include/multipath/complex.rb:2670 src/include/multipath/complex.rb:3330 +#: src/include/multipath/complex.rb:1135 src/include/multipath/complex.rb:2001 +#: src/include/multipath/complex.rb:2669 src/include/multipath/complex.rb:3329 #, fuzzy msgid "Duplicated configuration." msgstr "Mouse configuration." @@ -149,89 +149,76 @@ #. used for store undecided input #. used for store undecided input #: src/include/multipath/complex.rb:1180 src/include/multipath/complex.rb:1226 -#: src/include/multipath/complex.rb:1244 src/include/multipath/complex.rb:3393 -#: src/include/multipath/complex.rb:3438 src/include/multipath/complex.rb:3456 +#: src/include/multipath/complex.rb:1244 src/include/multipath/complex.rb:3392 +#: src/include/multipath/complex.rb:3437 src/include/multipath/complex.rb:3455 #, fuzzy msgid "Show Details" msgstr "&Show Details" #. do not do with number id -#: src/include/multipath/complex.rb:1444 +#: src/include/multipath/complex.rb:1443 #, fuzzy msgid "Illegal parameter:" msgstr "illegal '%s' parameter" #. devices section #. if value is empty, do not write name into configuration file. -#: src/include/multipath/complex.rb:1894 src/include/multipath/complex.rb:2562 +#: src/include/multipath/complex.rb:1893 src/include/multipath/complex.rb:2561 #, fuzzy msgid "Illegal parameters:" msgstr "illegal '%s' parameter" #. do not handle, `ok will do with the value #. do not handle, `ok will do with the value -#: src/include/multipath/complex.rb:2028 src/include/multipath/complex.rb:2034 -#: src/include/multipath/complex.rb:2273 src/include/multipath/complex.rb:2696 -#: src/include/multipath/complex.rb:2702 src/include/multipath/complex.rb:2944 +#: src/include/multipath/complex.rb:2027 src/include/multipath/complex.rb:2033 +#: src/include/multipath/complex.rb:2272 src/include/multipath/complex.rb:2695 +#: src/include/multipath/complex.rb:2701 src/include/multipath/complex.rb:2943 msgid "item" msgstr "" #. duplicated configuraton checking -#: src/include/multipath/complex.rb:3344 +#: src/include/multipath/complex.rb:3343 #, fuzzy msgid "Duplicated configuration" msgstr "Mouse configuration." -#: src/include/multipath/complex.rb:3608 +#: src/include/multipath/complex.rb:3607 #, fuzzy msgid "Can not find /sbin/multipath" msgstr "Cannot find source" #. "multipath -l" may returns "" to bash -#: src/include/multipath/complex.rb:3648 +#: src/include/multipath/complex.rb:3647 #, fuzzy msgid "Use multipath failed:" msgstr "Installation failed." -#: src/include/multipath/complex.rb:3654 +#: src/include/multipath/complex.rb:3653 #, fuzzy -msgid "* Cannot enable boot.multipath." -msgstr "Can not enable service 'boot.idedma'." - -#: src/include/multipath/complex.rb:3664 -#, fuzzy msgid "* Cannot enable multipathd." msgstr "Can not enable service 'boot.idedma'." -#. do not check result for starting boot.multipath -#: src/include/multipath/complex.rb:3676 +#: src/include/multipath/complex.rb:3663 #, fuzzy msgid "* Cannot start multipathd." msgstr "Auto&detect Multipath" -#. CallInsserv(true, "boot.multipath"); #. CallInsserv(true, "multipathd"); -#: src/include/multipath/complex.rb:3697 +#: src/include/multipath/complex.rb:3683 #, fuzzy msgid "Do not use multipath failed:" msgstr "Do ¬ use NIS" -#: src/include/multipath/complex.rb:3703 +#: src/include/multipath/complex.rb:3689 #, fuzzy msgid "* Cannot stop multipath." msgstr "Could not disable 'ipsec' bootscript:" -#. do not check result of stopping boot.multipath -#: src/include/multipath/complex.rb:3715 +#: src/include/multipath/complex.rb:3699 #, fuzzy msgid "* Cannot disable multipathd." msgstr "Could not disable 'ipsec' bootscript:" -#: src/include/multipath/complex.rb:3725 -#, fuzzy -msgid "* Cannot disable boot.multipath." -msgstr "Could not disable 'ipsec' bootscript:" - #. Read dialog help 1/2 #: src/include/multipath/helps.rb:36 #, fuzzy @@ -329,38 +316,38 @@ #. if the value has quotes pair, do not touch it. #. if more than 1 quote at the head or end, only keep one. #. if there are quote inside the value, ignore. -#: src/include/multipath/options.rb:821 src/include/multipath/options.rb:1635 -#: src/include/multipath/options.rb:1699 src/include/multipath/options.rb:1912 +#: src/include/multipath/options.rb:832 src/include/multipath/options.rb:1662 +#: src/include/multipath/options.rb:1726 src/include/multipath/options.rb:1939 #, fuzzy msgid "should be a decimal integer" msgstr "Invalid default" #. replacewidget_notify = true; -#: src/include/multipath/options.rb:829 src/include/multipath/options.rb:846 -#: src/include/multipath/options.rb:900 src/include/multipath/options.rb:975 -#: src/include/multipath/options.rb:1052 src/include/multipath/options.rb:1129 -#: src/include/multipath/options.rb:1244 src/include/multipath/options.rb:1348 -#: src/include/multipath/options.rb:1410 src/include/multipath/options.rb:1511 -#: src/include/multipath/options.rb:1641 src/include/multipath/options.rb:1654 -#: src/include/multipath/options.rb:1717 src/include/multipath/options.rb:1778 -#: src/include/multipath/options.rb:1917 src/include/multipath/options.rb:1923 -#: src/include/multipath/options.rb:1990 src/include/multipath/options.rb:2144 -#: src/include/multipath/options.rb:2308 src/include/multipath/options.rb:2369 +#: src/include/multipath/options.rb:840 src/include/multipath/options.rb:857 +#: src/include/multipath/options.rb:911 src/include/multipath/options.rb:994 +#: src/include/multipath/options.rb:1079 src/include/multipath/options.rb:1156 +#: src/include/multipath/options.rb:1271 src/include/multipath/options.rb:1375 +#: src/include/multipath/options.rb:1437 src/include/multipath/options.rb:1538 +#: src/include/multipath/options.rb:1668 src/include/multipath/options.rb:1681 +#: src/include/multipath/options.rb:1744 src/include/multipath/options.rb:1805 +#: src/include/multipath/options.rb:1944 src/include/multipath/options.rb:1950 +#: src/include/multipath/options.rb:2017 src/include/multipath/options.rb:2171 +#: src/include/multipath/options.rb:2335 src/include/multipath/options.rb:2396 #, fuzzy msgid "illegal value" msgstr "illegal port" -#: src/include/multipath/options.rb:836 src/include/multipath/options.rb:1647 +#: src/include/multipath/options.rb:847 src/include/multipath/options.rb:1674 msgid "should be greater than 0" msgstr "" -#: src/include/multipath/options.rb:1710 +#: src/include/multipath/options.rb:1737 #, fuzzy msgid "invalid decimal integer" msgstr "Invalid default" -#: src/include/multipath/options.rb:2036 src/include/multipath/options.rb:2091 -#: src/include/multipath/options.rb:2196 src/include/multipath/options.rb:2251 +#: src/include/multipath/options.rb:2063 src/include/multipath/options.rb:2118 +#: src/include/multipath/options.rb:2223 src/include/multipath/options.rb:2278 #, fuzzy msgid "should not be empty" msgstr "Port field can't be empty" @@ -498,6 +485,14 @@ msgstr "" #, fuzzy +#~ msgid "* Cannot enable boot.multipath." +#~ msgstr "Can not enable service 'boot.idedma'." + +#, fuzzy +#~ msgid "* Cannot disable boot.multipath." +#~ msgstr "Could not disable 'ipsec' bootscript:" + +#, fuzzy #~ msgid "Cannot install required packages" #~ msgstr "Cannot install required packages." Modified: trunk/yast/en_GB/po/ncurses-pkg.en_GB.po =================================================================== --- trunk/yast/en_GB/po/ncurses-pkg.en_GB.po 2015-09-09 08:18:21 UTC (rev 92602) +++ trunk/yast/en_GB/po/ncurses-pkg.en_GB.po 2015-09-09 08:19:44 UTC (rev 92603) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: yast2 9.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-04 15:52+0200\n" +"POT-Creation-Date: 2015-08-25 18:36+0200\n" "PO-Revision-Date: 2007-08-16 20:14+0100\n" "Last-Translator: Benjamin Weber\n" "Language-Team: British English\n" @@ -18,19 +18,19 @@ "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. headline of package versions popup -#: src/NCPackageSelector.cc:980 +#: src/NCPackageSelector.cc:990 #, fuzzy msgid "Package Versions" msgstr "Package Descriptions" #. text above of list of all package versions -#: src/NCPackageSelector.cc:982 +#: src/NCPackageSelector.cc:992 #, fuzzy #| msgid "List all available languages." msgid "List of all available package versions:" msgstr "List all available languages." -#: src/NCPackageSelector.cc:1095 +#: src/NCPackageSelector.cc:1105 #, fuzzy msgid "&Packages with Status" msgstr "Show packages with status" @@ -38,68 +38,68 @@ #. headline - packages with automatic status change #. headline of a popup with packages #. the headline of the popup containing a list with packages with status changes -#: src/NCPackageSelector.cc:1270 src/NCPkgMenuDeps.cc:247 -#: src/NCPkgStrings.cc:582 +#: src/NCPackageSelector.cc:1280 src/NCPkgMenuDeps.cc:192 +#: src/NCPkgMenuDeps.cc:289 src/NCPkgStrings.cc:589 msgid "Automatic Changes" msgstr "Automatic Changes" #. text part1 of popup with automatic changes (it's a label; text continous) -#: src/NCPackageSelector.cc:1272 src/NCPkgStrings.cc:589 +#: src/NCPackageSelector.cc:1282 src/NCPkgStrings.cc:596 msgid "In addition to your manual selections, the following" msgstr "In addition to your manual selections, the following" #. text part2 of popup with automatic changes #. text part1 of popup with automatic changes continous -#: src/NCPackageSelector.cc:1274 src/NCPkgStrings.cc:596 +#: src/NCPackageSelector.cc:1284 src/NCPkgStrings.cc:603 msgid "packages have been changed to resolve dependencies:" msgstr "packages have been changed to resolve dependencies:" -#: src/NCPackageSelector.cc:1297 +#: src/NCPackageSelector.cc:1307 msgid "You can choose to install anyway, but you risk getting a corrupted system." msgstr "" -#: src/NCPackageSelector.cc:1298 +#: src/NCPackageSelector.cc:1308 #, fuzzy msgid "&Continue anyway" msgstr "C&ontinue Anyway" #. headline of a popup showing the package license -#: src/NCPackageSelector.cc:1492 +#: src/NCPackageSelector.cc:1502 #, fuzzy msgid "End User License Agreement" msgstr "License Agreement" #. label text - keep it short -#: src/NCPackageSelector.cc:1681 +#: src/NCPackageSelector.cc:1691 msgid "Filter: " msgstr "Filter: " #. label text - keep it short (use abbreviation if necessary) -#: src/NCPackageSelector.cc:1688 +#: src/NCPackageSelector.cc:1698 msgid "Total Download Size: " msgstr "Total Download Size: " #. Help button -#: src/NCPackageSelector.cc:1701 src/NCPackageSelector.cc:1818 +#: src/NCPackageSelector.cc:1711 src/NCPackageSelector.cc:1828 #: src/NCPkgStrings.cc:107 msgid "&Help" msgstr "&Help" #. add the Cancel button #. begin: the label of the Cancel button -#: src/NCPackageSelector.cc:1707 src/NCPackageSelector.cc:1826 -#: src/NCPkgStrings.cc:677 +#: src/NCPackageSelector.cc:1717 src/NCPackageSelector.cc:1836 +#: src/NCPkgStrings.cc:684 msgid "&Cancel" msgstr "&Cancel" #. add the OK button #. the label of an Accept button -#: src/NCPackageSelector.cc:1712 src/NCPackageSelector.cc:1831 -#: src/NCPkgStrings.cc:691 +#: src/NCPackageSelector.cc:1722 src/NCPackageSelector.cc:1841 +#: src/NCPkgStrings.cc:698 msgid "&Accept" msgstr "&Accept" -#: src/NCPackageSelector.cc:1737 +#: src/NCPackageSelector.cc:1747 #, fuzzy msgid "C&onfiguration" msgstr "Configuration" @@ -125,7 +125,7 @@ msgstr "&New Patches" #: src/NCPkgFilterClassification.cc:203 -msgid "This is a list of useful packages. They will be additionally installed if recommeded by a newly installed package. To get packages recommeded by already installed packages the option <b>Install Recommended Packages for Already Installed Packages</b> from <b>Dependencies</b> menu has to be set." +msgid "This is a list of useful packages. They will be additionally installed if recommeded by a newly installed package." msgstr "" #: src/NCPkgFilterClassification.cc:207 @@ -175,7 +175,7 @@ msgstr "" #. the label of the selections -#: src/NCPkgFilterMain.cc:68 src/NCPkgStrings.cc:319 +#: src/NCPkgFilterMain.cc:68 src/NCPkgStrings.cc:326 msgid "Patterns" msgstr "Patterns" @@ -406,46 +406,58 @@ msgstr "&Verify System" #: src/NCPkgMenuDeps.cc:98 -msgid "&Install Recommended Packages for Already Installed Packages" +#, fuzzy +#| msgid "Recommended packages" +msgid "Install &Recommended Packages" +msgstr "Recommended packages" + +#: src/NCPkgMenuDeps.cc:102 +msgid "&Install Recommended Packages for Already Installed Packages Now" msgstr "" -#: src/NCPkgMenuDeps.cc:102 +#: src/NCPkgMenuDeps.cc:105 #, fuzzy #| msgid "Selecting packages..." msgid "&Cleanup when Deleting Packages (Temporary Change)" msgstr "Selecting packages..." -#: src/NCPkgMenuDeps.cc:106 +#: src/NCPkgMenuDeps.cc:109 #, fuzzy msgid "&Allow Vendor Change (Temporary Change)" msgstr "All Listed &Packages" -#: src/NCPkgMenuDeps.cc:110 +#: src/NCPkgMenuDeps.cc:113 #, fuzzy msgid "&Generate Dependency Solver Testcase" msgstr "Generate Dependency Resolver &Test Case" -#: src/NCPkgMenuDeps.cc:143 +#: src/NCPkgMenuDeps.cc:169 msgid "All package dependencies are OK." msgstr "All package dependencies are OK." -#: src/NCPkgMenuDeps.cc:180 -msgid "Dependency resolver test case written to " -msgstr "Dependency resolver test case written to " - #. part 1 of a text explaining the list of packages which follow -#: src/NCPkgMenuDeps.cc:249 -msgid "To fulfill the dependencies of already installed packages following" +#: src/NCPkgMenuDeps.cc:194 +msgid "Being recommended by already installed packages, the following" msgstr "" #. part 2 of the text -#: src/NCPkgMenuDeps.cc:251 +#: src/NCPkgMenuDeps.cc:196 src/NCPkgMenuDeps.cc:293 #, fuzzy #| msgid "No patches have been selected for installation.\n" msgid "packages have been automatically selected for installation:" msgstr "No patches have been selected for installation.\n" -#: src/NCPkgMenuDeps.cc:265 +#: src/NCPkgMenuDeps.cc:226 +msgid "Dependency resolver test case written to " +msgstr "Dependency resolver test case written to " + +#. part 1 of a text explaining the list of packages which follow +#: src/NCPkgMenuDeps.cc:291 +msgid "To fulfill the dependencies of already installed packages following" +msgstr "" + +#. dependencies OK, no automatic changes/the user has accepted the changes +#: src/NCPkgMenuDeps.cc:305 msgid "System dependencies verify OK." msgstr "System dependencies verify OK." @@ -611,7 +623,7 @@ #. column header package description (keep it short!) #: src/NCPkgPatchSearch.cc:126 src/NCPkgSearchSettings.cc:64 -#: src/NCPkgStrings.cc:380 +#: src/NCPkgStrings.cc:387 msgid "Summary" msgstr "Summary" @@ -825,299 +837,299 @@ msgid "<p>To disable dependency checking on every status change, toggle <i>Automatic Dependency Check</i> OFF. You can check dependencies manually by selecting <i>Check Dependencies Now</i>. The <i>Verify system</i> entry will check the dependencies of already installed packages and resolve conflicts non-interactively, marking missing packages for automatic installation if necessary. For debugging purposes, use <i>Generate Dependency Solver Testcase</i>. It will dump package dependencies data into the directory <tt>/var/log/YaST2/solverTestcase</tt>. This is usually what you need when asked for a \"solver testcase\" in Bugzilla.</p>" msgstr "" -#: src/NCPkgStrings.cc:266 -msgid "<p>Available options for dependency checking are:<br><i>Automatic Dependency Check</i> (see above), <i>Install Recommended for Already Installed Packages</i>: if ON, also recommended packages of already installed package will be installed, <i>System Verification Mode</i>: repair dependencies of installed packages and solve immediately. Please note: after checking the system with <i>Verify System Now</i> the option <i>System Verification Mode</i> is ON (uncheck the option, if desired). These options are saved in the YaST configuration file <tt>/etc/sysconfig/yast2</tt>.</p>" +#: src/NCPkgStrings.cc:267 +msgid "<p>Available options for dependency checking are:<br><i>Automatic Dependency Check</i> (see above), <i>Install Recommended Packages</i>: if ON, weak dependencies will be honored, <i>System Verification Mode</i>: repair dependencies of installed packages and solve immediately. Please note: after checking the system with <i>Verify System Now</i> the option <i>System Verification Mode</i> is ON (uncheck the option, if desired). These options are saved in the YaST configuration file <tt>/etc/sysconfig/yast2</tt>.</p>" msgstr "" -#: src/NCPkgStrings.cc:272 +#: src/NCPkgStrings.cc:279 msgid "<p>Advanced options:<br> <i>Cleanup when deleting packages</i>: remove dependent unused packages. <i>Allow vendor change</i>: package vendor may differ from vendor of installed package. These options will not be saved, they can only be set in the configuration file of the package library <tt>/etc/zypp/zypp.conf</tt>.</p>" msgstr "" -#: src/NCPkgStrings.cc:278 +#: src/NCPkgStrings.cc:285 msgid "<p><b>View:</b><br>Choose which information about the selected package will be displayed in the window below the package table. Available options are: package description, technical data (version, size, license etc.) package versions (all available), file list (all files included in the package) and dependencies (provides, requires etc.).</p>" msgstr "" -#: src/NCPkgStrings.cc:284 +#: src/NCPkgStrings.cc:291 msgid "<p><b>Configuration:</b><br>This menu integrates package selector with the rest of package management utils. From here, you can <b>Launch Repository Manager</b> and edit configured repositories or register to update repository and configure periodic download of available updates (<b>Launch Online Update Configuration</b>). Also, you can pick one of the three possible behaviours of package selector at exit - in <b>Action after Package Installation</b> menu.</p>" msgstr "" -#: src/NCPkgStrings.cc:289 +#: src/NCPkgStrings.cc:296 msgid "<p><b>Extras:</b><br>Miscellaneous functions reside here. <i>Export Package List to File</i> will dump data on installed packages, patterns and languages into specified XML file. This file can be later read by <i>Import Package List from File</i> option e.g. on different computer. It will bring the set of packages on the target computer into the same state as described in provided XML file. <i>Show Available Disk Space</i> will show a popup table displaying disk usage and free disk space on currently mounted partition.</p>" msgstr "" #. label of a frame with search settings -#: src/NCPkgStrings.cc:297 +#: src/NCPkgStrings.cc:304 #, fuzzy msgid "&Search in " msgstr " Search in " #. begin: text/labels for search popups (use unique hotkeys until the end:) #. text for the package search popup -#: src/NCPkgStrings.cc:305 +#: src/NCPkgStrings.cc:312 #, fuzzy msgid "Search &Phrase" msgstr "&Search Phrase" -#: src/NCPkgStrings.cc:325 +#: src/NCPkgStrings.cc:332 msgid "Code" msgstr "Code" -#: src/NCPkgStrings.cc:331 +#: src/NCPkgStrings.cc:338 msgid "Language" msgstr "Language" -#: src/NCPkgStrings.cc:337 +#: src/NCPkgStrings.cc:344 msgid "URL" msgstr "URL" #. column header package name (keep it short!) -#: src/NCPkgStrings.cc:345 +#: src/NCPkgStrings.cc:352 msgid "Name" msgstr "Name" #. column header installed package version (keep it short!) -#: src/NCPkgStrings.cc:352 +#: src/NCPkgStrings.cc:359 msgid "Version" msgstr "Version" #. column header - repository of the package (e.g. openSUSE 10.3) -#: src/NCPkgStrings.cc:359 +#: src/NCPkgStrings.cc:366 msgid "Repository" msgstr "Repository" #. column header available package version (keep it short - use abbreviation!) -#: src/NCPkgStrings.cc:366 +#: src/NCPkgStrings.cc:373 msgid "Avail. Vers." msgstr "Avail. Vers." #. column header installed package version (keep it short - use abbreviation!) -#: src/NCPkgStrings.cc:373 +#: src/NCPkgStrings.cc:380 msgid "Inst. Vers." msgstr "Inst. Vers." #. column header package size (keep it short!) -#: src/NCPkgStrings.cc:388 +#: src/NCPkgStrings.cc:395 msgid "Size" msgstr "Size" #. column header package architecture (keep it short!) -#: src/NCPkgStrings.cc:395 +#: src/NCPkgStrings.cc:402 msgid "Architecture" msgstr "Architecture" #. column header patch kind (keep it short!) -#: src/NCPkgStrings.cc:402 +#: src/NCPkgStrings.cc:409 msgid "Kind" msgstr "Kind" #. a text for a small popup which is shown during package dependency checking -#: src/NCPkgStrings.cc:409 +#: src/NCPkgStrings.cc:416 msgid "Solving..." msgstr "Solving..." #. a text for a small popup which is shown during writing package selection to a file -#: src/NCPkgStrings.cc:415 +#: src/NCPkgStrings.cc:422 msgid "Saving..." msgstr "Saving..." #. a text for a samll popup which is shown during loading package selections from a file -#: src/NCPkgStrings.cc:421 +#: src/NCPkgStrings.cc:428 msgid "Loading..." msgstr "Loading..." #. the headline of the disk space popup -#: src/NCPkgStrings.cc:428 +#: src/NCPkgStrings.cc:435 msgid "Disk Usage Overview" msgstr "Disk Usage Overview" #. column header name of the partition (keep it short!) -#: src/NCPkgStrings.cc:435 +#: src/NCPkgStrings.cc:442 msgid "Partition" msgstr "Partition" #. column header used disk space (keep it short!) -#: src/NCPkgStrings.cc:442 +#: src/NCPkgStrings.cc:449 msgid "Used" msgstr "Used" #. column header free disk space (keep it short!) -#: src/NCPkgStrings.cc:449 +#: src/NCPkgStrings.cc:456 msgid "Free" msgstr "Free" #. column header total disk space (keep it short!) -#: src/NCPkgStrings.cc:456 +#: src/NCPkgStrings.cc:463 msgid "Total" msgstr "Total" #. -#: src/NCPkgStrings.cc:463 +#: src/NCPkgStrings.cc:470 msgid "<i>Out of disk space!</i>" msgstr "<i>Out of disk space!</i>" #. -#: src/NCPkgStrings.cc:470 +#: src/NCPkgStrings.cc:477 msgid "<b>Disk space is running out!</b>" msgstr "<b>Disk space is running out!</b>" #. part of a text -#: src/NCPkgStrings.cc:477 +#: src/NCPkgStrings.cc:484 msgid "needs" msgstr "needs" #. part of a text -#: src/NCPkgStrings.cc:484 +#: src/NCPkgStrings.cc:491 msgid "more disk space." msgstr "more disk space." #. part of the package description -#: src/NCPkgStrings.cc:491 +#: src/NCPkgStrings.cc:498 msgid "<b>Version: </b>" msgstr "<b>Version: </b>" #. part of the package description -#: src/NCPkgStrings.cc:498 +#: src/NCPkgStrings.cc:505 msgid "<b>Size: </b>" msgstr "<b>Size: </b>" #. part of the package description -#: src/NCPkgStrings.cc:505 +#: src/NCPkgStrings.cc:512 msgid "<b>Installed: </b>" msgstr "<b>Installed: </b>" #. part of the package description -#: src/NCPkgStrings.cc:512 +#: src/NCPkgStrings.cc:519 msgid "<b>Authors: </b>" msgstr "<b>Authors: </b>" #. part of the package description -#: src/NCPkgStrings.cc:519 +#: src/NCPkgStrings.cc:526 msgid "<b>License: </b>" msgstr "<b>License: </b>" #. part of the package description -#: src/NCPkgStrings.cc:526 +#: src/NCPkgStrings.cc:533 msgid "<b>Media No.: </b>" msgstr "<b>Media No.: </b>" #. part of the package description -#: src/NCPkgStrings.cc:533 +#: src/NCPkgStrings.cc:540 msgid "<b>Package Group: </b>" msgstr "<b>Package Group: </b>" #. part of the package description -#: src/NCPkgStrings.cc:540 +#: src/NCPkgStrings.cc:547 msgid "<b>Provides: </b>" msgstr "<b>Provides: </b>" #. part of the package description -#: src/NCPkgStrings.cc:547 +#: src/NCPkgStrings.cc:554 msgid "<b>Requires: </b>" msgstr "<b>Requires: </b>" #. part of the package description -#: src/NCPkgStrings.cc:554 +#: src/NCPkgStrings.cc:561 msgid "<b>Prerequires: </b>" msgstr "<b>Prerequires: </b>" #. part of the package description -#: src/NCPkgStrings.cc:562 +#: src/NCPkgStrings.cc:569 msgid "<b>Conflicts with: </b>" msgstr "<b>Conflicts with: </b>" #. headline for a list of installed files -#: src/NCPkgStrings.cc:569 +#: src/NCPkgStrings.cc:576 msgid "<i>List of Installed Files:</i><br>" msgstr "<i>List of Installed Files:</i><br>" -#: src/NCPkgStrings.cc:575 +#: src/NCPkgStrings.cc:582 msgid "Translations, dictionaries and other language-related files for " msgstr "" #. the headline of the help popup -#: src/NCPkgStrings.cc:603 +#: src/NCPkgStrings.cc:610 #, fuzzy msgid "Patch Status and Patch Installation" msgstr "Patch Download and Installation" #. help text online udpate #. Do NOT translate 'recommended' and 'security'! because the patch kind is always shown as english text. -#: src/NCPkgStrings.cc:611 +#: src/NCPkgStrings.cc:618 msgid "<p>General information about patches:</p><p>The patches of kind <b>security</b> are solving security issues and we highly recommend to install it. You should also install <b>recommended</b> patches, they usually contain important bug-fixes. Install <b>feature</b> patches if you are interested in the feature.</p>" msgstr "" #. help text online udpate continue -#: src/NCPkgStrings.cc:618 +#: src/NCPkgStrings.cc:625 #, fuzzy msgid "<p>Patches for \"libzypp\" (Package, Patch, Pattern and Product Management) will always get installed first. Other patches must be installed on a second run.</p>" msgstr "<p>Mode \"recommended\" means you should install the patch. \"security\" is a security patch and it is highly recommended to install it. \"YaST\" patches will be always installed first. The other patches must be installed on a second run.</p>" #. help text online udpate continue -#: src/NCPkgStrings.cc:625 +#: src/NCPkgStrings.cc:632 #, fuzzy msgid "<p>Meaning of the status flags:</p><p><b>a+ </b>: Patches concerning your installation are preselected. They will be downloaded and installed on your system. If you do not want a certain patch, deselect it with '-'.</p><p><b> i </b>: All requirements of this patch are satisfied.</p><p><b> + </b>: You have selected this patch for installation.</p>" msgstr "<p>Meaning of the status flags:</p><p><b>+</b>: Patches concerning your installation are preselected. They will be downloaded and installed on your system. If you do not want a certain patch, deselect it with '-'.</p>" #. help text online udpate continue -#: src/NCPkgStrings.cc:632 +#: src/NCPkgStrings.cc:639 msgid "<p>More details about the status:<br>If there are several patches for a package (or a set of packages) which aren't yet applied to the system all got preselected and have status <b>a+</b>. If one of these patches is deselected with '-' it might show the status <b>i</b> afterwards. This is because any of the other patches concerning the same package(s) is still selected. The newer version(s) of the package(s) will be installed and with it this patch is satisfied. Deselecting of all patches is required if the patches are not wanted.</p>" msgstr "" #. help text online udpate continue -#: src/NCPkgStrings.cc:639 +#: src/NCPkgStrings.cc:646 msgid "<p>The menus:</p><p>The <b>Filter</b> menu allows to filter the patches, e.g. show the 'Installed' ones or list 'Security' patches. It also provides to search for patches.<br>Use the <b>Actions</b> menu to change the status of a patch.<br>The <b>View</b> menu offers the possibility to see which packages are concerned by the patch. Please note: If the filter is 'All Patches' the package list for some patches might be empty. This means no packages are concerned because none of the patch packages is installed on the system.<br>The <b>Dependencies</b> menu contains dependencies checks and the 'Generate Solver Testcase' entry.</p>" msgstr "" #. label for a warning popup -#: src/NCPkgStrings.cc:648 +#: src/NCPkgStrings.cc:655 msgid "Warning" msgstr "Warning" #. label for an error popup -#: src/NCPkgStrings.cc:655 +#: src/NCPkgStrings.cc:662 msgid "Error" msgstr "Error" #. label for a notify popup -#: src/NCPkgStrings.cc:662 +#: src/NCPkgStrings.cc:669 msgid "Notify" msgstr "Notify" #. the label of an OK button -#: src/NCPkgStrings.cc:670 +#: src/NCPkgStrings.cc:677 msgid "&OK" msgstr "&OK" #. the label of the Yes button -#: src/NCPkgStrings.cc:684 +#: src/NCPkgStrings.cc:691 msgid "&Yes" msgstr "&Yes" #. the label of the No button -#: src/NCPkgStrings.cc:698 +#: src/NCPkgStrings.cc:705 msgid "&No" msgstr "&No" #. the label of the Solve button - 'try again' implies that user #. has to make some action (#213602) -#: src/NCPkgStrings.cc:706 +#: src/NCPkgStrings.cc:713 msgid "&OK -- Try Again" msgstr "&OK -- Try Again" #. text for a Notify popup -#: src/NCPkgStrings.cc:714 +#: src/NCPkgStrings.cc:721 #, fuzzy #| msgid "<p>All changes in package, patch or pattern selection will be lost.<br>Really exit?</p>" msgid "<p>All changes in the package, patch or pattern selection will be lost.<br>Really exit?</p>" msgstr "<p>All changes in package, patch or pattern selection will be lost.<br>Really exit?</p>" #. the label of language table -#: src/NCPkgStrings.cc:722 +#: src/NCPkgStrings.cc:729 msgid "Available Languages" msgstr "Available Languages" #. the label of language table -#: src/NCPkgStrings.cc:729 +#: src/NCPkgStrings.cc:736 msgid "Available Repositories" msgstr "Available Repositories" @@ -1125,63 +1137,63 @@ #. (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:739 +#: src/NCPkgStrings.cc:746 #, fuzzy msgid "Needed Patches" msgstr "&New Patches" #. 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:747 +#: src/NCPkgStrings.cc:754 msgid "Installed Patches" msgstr "Installed Patches" #. A common label for a list of YOU Patches - keep it short - max. 25 chars! -#: src/NCPkgStrings.cc:755 +#: src/NCPkgStrings.cc:762 msgid "Online Update Patches" msgstr "Online Update Patches" #. the label Filter: Update Problem ( keep it short - max. 25 chars ) -#: src/NCPkgStrings.cc:762 +#: src/NCPkgStrings.cc:769 msgid "Update Problem -- see help" msgstr "Update Problem -- see help" #. the label for Filter: Search results -#: src/NCPkgStrings.cc:769 +#: src/NCPkgStrings.cc:776 msgid "Search Results" msgstr "Search Results" #. the headline of the dependency popup -#: src/NCPkgStrings.cc:776 +#: src/NCPkgStrings.cc:783 msgid "Package Dependencies" msgstr "Package Dependencies" #. help text package status -#: src/NCPkgStrings.cc:783 +#: src/NCPkgStrings.cc:790 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>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>" #. column header source RPM installation (keep it short!) -#: src/NCPkgStrings.cc:790 +#: src/NCPkgStrings.cc:797 msgid "Source" msgstr "Source" #. menu entry Update List -#: src/NCPkgStrings.cc:798 +#: src/NCPkgStrings.cc:805 msgid "&Update List" msgstr "&Update List" #. part of the patch description -#: src/NCPkgStrings.cc:805 +#: src/NCPkgStrings.cc:812 msgid "<b>Patch: </b>" msgstr "<b>Patch: </b>" #. info line is shown if YOU patch list is empty -#: src/NCPkgStrings.cc:812 +#: src/NCPkgStrings.cc:819 msgid "No patches available" msgstr "No patches available" -#: src/NCPkgStrings.cc:818 +#: src/NCPkgStrings.cc:825 msgid "Script" msgstr "Script" Modified: trunk/yast/en_GB/po/ncurses.en_GB.po =================================================================== --- trunk/yast/en_GB/po/ncurses.en_GB.po 2015-09-09 08:18:21 UTC (rev 92602) +++ trunk/yast/en_GB/po/ncurses.en_GB.po 2015-09-09 08:19:44 UTC (rev 92603) @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-04 15:52+0200\n" +"POT-Creation-Date: 2015-08-25 18:36+0200\n" "PO-Revision-Date: 2001-07-17 16:27+0200\n" "Last-Translator: James Ogley \n" "Language-Team: English \n" Modified: trunk/yast/en_GB/po/network.en_GB.po =================================================================== --- trunk/yast/en_GB/po/network.en_GB.po 2015-09-09 08:18:21 UTC (rev 92602) +++ trunk/yast/en_GB/po/network.en_GB.po 2015-09-09 08:19:44 UTC (rev 92603) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-10-29 16:21+0100\n" +"POT-Creation-Date: 2015-08-25 18:36+0200\n" "PO-Revision-Date: 2009-10-08 07:09+0200\n" "Last-Translator: Benjamin Weber\n" "Language-Team: British English\n" @@ -63,44 +63,44 @@ msgstr "The address of the server" #. Command line output Headline -#: src/clients/dns.rb:163 +#: src/clients/dns.rb:161 msgid "DNS Configuration Summary:" msgstr "DNS Configuration Summary:" #. validator: a reference to boolean( string) is expected #. setter: a reference to void( any) is expected #. fail message: a string is expected -#: src/clients/dns.rb:188 +#: src/clients/dns.rb:186 #, fuzzy #| msgid "Invalid hostname." msgid "InvalidHostname. " msgstr "Invalid hostname." -#: src/clients/dns.rb:194 src/clients/dns.rb:202 src/clients/dns.rb:210 +#: src/clients/dns.rb:192 src/clients/dns.rb:200 src/clients/dns.rb:208 #, fuzzy #| msgid "Invalid IP address." msgid "Invalid IP. " msgstr "Invalid IP address." -#: src/clients/dns.rb:225 +#: src/clients/dns.rb:223 #, fuzzy #| msgid "[not set]" msgid "Cannot set " msgstr "[not set]" -#: src/clients/dns.rb:226 +#: src/clients/dns.rb:224 #, fuzzy #| msgid "Managed by NetworkManager" msgid ". Network is managed by NetworkManager." msgstr "Managed by NetworkManager" -#: src/clients/dns.rb:245 +#: src/clients/dns.rb:243 #, fuzzy #| msgid "Invalid value." msgid "Invalid option value." msgstr "Invalid value." -#: src/clients/dns.rb:254 +#: src/clients/dns.rb:252 msgid "Internal error" msgstr "Internal error" @@ -111,41 +111,41 @@ msgstr "Writing Firewall Configuration" #. Proposal title -#: src/clients/firewall_stage1_proposal.rb:137 +#: src/clients/firewall_stage1_proposal.rb:141 #, fuzzy msgid "Firewall and SSH" msgstr "Firewall Zone" #. Menu entry label -#: src/clients/firewall_stage1_proposal.rb:139 +#: src/clients/firewall_stage1_proposal.rb:143 #, fuzzy msgid "&Firewall and SSH" msgstr "&Firewall" -#: src/clients/firewall_stage1_proposal.rb:152 +#: src/clients/firewall_stage1_proposal.rb:156 #, fuzzy msgid "Basic Firewall and SSH Configuration" msgstr "Firewall Configuration" #. frame label -#: src/clients/firewall_stage1_proposal.rb:157 +#: src/clients/firewall_stage1_proposal.rb:161 #, fuzzy msgid "Firewall and SSH service" msgstr "Firewall Service" #. TRANSLATORS: check-box label -#: src/clients/firewall_stage1_proposal.rb:168 +#: src/clients/firewall_stage1_proposal.rb:172 #, fuzzy msgid "Enable Firewall" msgstr "&Enable Firewall" #. TRANSLATORS: check-box label -#: src/clients/firewall_stage1_proposal.rb:177 +#: src/clients/firewall_stage1_proposal.rb:181 #, fuzzy msgid "Enable SSH Service" msgstr "Firewall Service" -#: src/clients/firewall_stage1_proposal.rb:191 +#: src/clients/firewall_stage1_proposal.rb:195 #, fuzzy msgid "" "<p><b><big>Firewall and SSH</big></b><br>\n" @@ -156,13 +156,13 @@ "<p><b><big>Firewall</big></b><br />\n" "Firewall is a defensive mechanism that protects your computer from network attacks.</p>" -#: src/clients/firewall_stage1_proposal.rb:197 +#: src/clients/firewall_stage1_proposal.rb:201 msgid "" "<p>Here you can choose whether the firewall will be enabled or disabled after\n" "the installation. It is recommended to keep it enabled.</p>" msgstr "" -#: src/clients/firewall_stage1_proposal.rb:200 +#: src/clients/firewall_stage1_proposal.rb:204 msgid "" "<p>With enabled firewall, you can decide whether to open firewall port for SSH\n" "service and allow remote SSH logins. Independently you can also enable SSH service (i.e. it\n" @@ -170,7 +170,7 @@ msgstr "" #. TRANSLATORS: help text -#: src/clients/firewall_stage1_proposal.rb:207 +#: src/clients/firewall_stage1_proposal.rb:211 msgid "" "<p>You can also open VNC ports in firewall. It will not enable\n" "the remote administration service on a running system but it is\n" @@ -179,48 +179,48 @@ #. anything but enabling the firewall closes this dialog #. (VNC and SSH checkboxes do nothing) -#: src/clients/firewall_stage1_proposal.rb:278 +#: src/clients/firewall_stage1_proposal.rb:284 #, fuzzy msgid "Firewall will be enabled (disable</a>)" msgstr "Firewall is enabled (disable</a>)" -#: src/clients/firewall_stage1_proposal.rb:282 +#: src/clients/firewall_stage1_proposal.rb:288 #, fuzzy msgid "Firewall will be disabled (enable</a>)" msgstr "Firewall is disabled (enable</a>)" -#: src/clients/firewall_stage1_proposal.rb:287 +#: src/clients/firewall_stage1_proposal.rb:294 #, fuzzy msgid "SSH service will be enabled (disable</a>)" msgstr "Firewall is enabled (disable</a>)" -#: src/clients/firewall_stage1_proposal.rb:291 +#: src/clients/firewall_stage1_proposal.rb:298 #, fuzzy msgid "SSH service will be disabled (enable</a>)" msgstr "Firewall is disabled (enable</a>)" #. TRANSLATORS: check-box label -#: src/clients/firewall_stage1_proposal.rb:307 +#: src/clients/firewall_stage1_proposal.rb:315 #, fuzzy #| msgid "&RPC Ports" msgid "Open SSH Port" msgstr "&RPC Ports" #. TRANSLATORS: check-box label -#: src/clients/firewall_stage1_proposal.rb:321 +#: src/clients/firewall_stage1_proposal.rb:329 #, fuzzy #| msgid "&RPC Ports" msgid "Open &VNC Ports" msgstr "&RPC Ports" #. Show VNC port only if installing over VNC -#: src/clients/firewall_stage1_proposal.rb:339 +#: src/clients/firewall_stage1_proposal.rb:347 #, fuzzy #| msgid "SSH port is blocked (open</a>)" msgid "VNC ports will be open (close</a>)" msgstr "SSH port is blocked (open</a>)" -#: src/clients/firewall_stage1_proposal.rb:341 +#: src/clients/firewall_stage1_proposal.rb:349 #, fuzzy #| msgid "SSH port is blocked (open</a>)" msgid "VNC ports will be blocked (open</a>)" @@ -229,13 +229,13 @@ #. Returns the SSH-port part of the firewall proposal description #. Returns nil if this part should be skipped #. @return [String] proposal html text -#: src/clients/firewall_stage1_proposal.rb:352 +#: src/clients/firewall_stage1_proposal.rb:361 #, fuzzy #| msgid "SSH port is blocked (open</a>)" msgid "SSH port will be open (block</a>)" msgstr "SSH port is blocked (open</a>)" -#: src/clients/firewall_stage1_proposal.rb:354 +#: src/clients/firewall_stage1_proposal.rb:363 #, fuzzy #| msgid "SSH port is blocked (open</a>)" msgid "SSH port will be blocked (open</a>)" @@ -250,32 +250,32 @@ #. Command line output Headline #. configuration of hosts -#: src/clients/host.rb:125 +#: src/clients/host.rb:123 msgid "Host Configuration Summary:" msgstr "Host Configuration Summary:" #. Progress step 1/3 -#: src/clients/inst_do_net_test.rb:110 +#: src/clients/inst_do_net_test.rb:107 msgid "Connecting to Internet..." msgstr "Connecting to Internet..." #. Progress step 2/3 -#: src/clients/inst_do_net_test.rb:112 +#: src/clients/inst_do_net_test.rb:109 msgid "Downloading the latest release notes..." msgstr "Downloading the latest release notes..." #. Progress step 3/3 -#: src/clients/inst_do_net_test.rb:114 +#: src/clients/inst_do_net_test.rb:111 msgid "Closing connection..." msgstr "Closing connection..." #. Test dialog caption -#: src/clients/inst_do_net_test.rb:245 +#: src/clients/inst_do_net_test.rb:239 msgid "Running Internet Connection Test" msgstr "Running Internet Connection Test" #. help for dialog "Running Internet Connection Test" -#: src/clients/inst_do_net_test.rb:248 +#: src/clients/inst_do_net_test.rb:242 msgid "" "<p>Here, view the progress of the\n" "Internet connection test.</p>\n" @@ -284,7 +284,7 @@ "Internet connection test.</p>\n" #. help for dialog "Running Internet Connection Test" -#: src/clients/inst_do_net_test.rb:252 +#: src/clients/inst_do_net_test.rb:246 msgid "" "<p>The test can be aborted by pressing\n" "<b>Abort Test</b>.</p>\n" @@ -293,7 +293,7 @@ "<b>Abort Test</b>.</p>\n" #. help for dialog "Running Internet Connection Test" -#: src/clients/inst_do_net_test.rb:260 +#: src/clients/inst_do_net_test.rb:254 msgid "" "<p>If the test fails, return to the network configuration\n" "and correct the settings.</p>\n" @@ -302,62 +302,62 @@ "and correct the settings.</p>\n" #. Label for result of internet test -#: src/clients/inst_do_net_test.rb:296 +#: src/clients/inst_do_net_test.rb:288 msgid "Test Result:" msgstr "Test Result:" #. Push Button to abort internet test -#: src/clients/inst_do_net_test.rb:307 +#: src/clients/inst_do_net_test.rb:299 msgid "&Abort Test" msgstr "&Abort Test" #. Frame label: status of internet test -#: src/clients/inst_do_net_test.rb:312 +#: src/clients/inst_do_net_test.rb:304 msgid "Test Status" msgstr "Test Status" #. Push Button to see logs of internet test -#: src/clients/inst_do_net_test.rb:322 +#: src/clients/inst_do_net_test.rb:314 msgid "&View Logs..." msgstr "&View Logs..." #. result of internet test -#: src/clients/inst_do_net_test.rb:361 +#: src/clients/inst_do_net_test.rb:351 msgid "Success" msgstr "Success" #. result of internet test -#: src/clients/inst_do_net_test.rb:365 +#: src/clients/inst_do_net_test.rb:355 msgid "Failure" msgstr "Failure" #. label of combobox where the log is selected -#: src/clients/inst_do_net_test.rb:380 +#: src/clients/inst_do_net_test.rb:365 msgid "Kernel Network Interfaces" msgstr "Kernel Network Interfaces" #. label of combobox where the log is selected -#: src/clients/inst_do_net_test.rb:402 +#: src/clients/inst_do_net_test.rb:386 msgid "Kernel Routing Table" msgstr "Kernel Routing Table" #. label of combobox where the log is selected -#: src/clients/inst_do_net_test.rb:422 +#: src/clients/inst_do_net_test.rb:406 msgid "Hostname Lookup" msgstr "Hostname Lookup" #. label of combobox where the log is selected -#: src/clients/inst_do_net_test.rb:446 +#: src/clients/inst_do_net_test.rb:426 msgid "Kernel Messages" msgstr "Kernel Messages" #. label of combobox where the log is selected -#: src/clients/inst_do_net_test.rb:593 +#: src/clients/inst_do_net_test.rb:576 msgid "Download of Release Notes" msgstr "Download of Release Notes" #. popup error message -#: src/clients/inst_do_net_test.rb:736 +#: src/clients/inst_do_net_test.rb:719 msgid "" "Cannot install downloaded release notes.\n" "RPM signature check failed." @@ -366,18 +366,18 @@ "RPM signature check failed." #. popup error message -#: src/clients/inst_do_net_test.rb:763 +#: src/clients/inst_do_net_test.rb:746 msgid "Installation of downloaded release notes failed." msgstr "Installation of downloaded release notes failed." #. label of combobox where the log is selected -#: src/clients/inst_do_net_test.rb:800 +#: src/clients/inst_do_net_test.rb:782 msgid "Opening of Connection" msgstr "Opening of Connection" #. popup to inform user about the failure #. popup to inform user about the failure -#: src/clients/inst_do_net_test.rb:808 src/clients/inst_do_net_test.rb:834 +#: src/clients/inst_do_net_test.rb:789 src/clients/inst_do_net_test.rb:815 msgid "" "Connecting to the Internet failed. View\n" "the logs for details.\n" @@ -386,14 +386,14 @@ "the logs for details.\n" #. Fallback for situation that mustn't exist -#: src/clients/inst_do_net_test.rb:892 +#: src/clients/inst_do_net_test.rb:873 #, fuzzy msgid "No URL for the release notes defined. Internet test cannot be performed." msgstr "There is no URL for release notes defined. Internet test can't be performed." #. popup informing user about the failure to retrieve release notes #. most likely due to server-side error -#: src/clients/inst_do_net_test.rb:905 +#: src/clients/inst_do_net_test.rb:886 #, fuzzy #| msgid "" #| "Download of latest release notes failed due to server-side error. \n" @@ -418,7 +418,7 @@ "click 'Cancel'." #. popup to inform user about the failure -#: src/clients/inst_do_net_test.rb:917 +#: src/clients/inst_do_net_test.rb:898 msgid "" "Download of latest release notes failed. View\n" "the logs for details." @@ -427,12 +427,12 @@ "the logs for details." #. label of combobox where the log is selected -#: src/clients/inst_do_net_test.rb:965 +#: src/clients/inst_do_net_test.rb:945 msgid "Check for Patches" msgstr "Check for Patches" #. popup to inform user about the failure -#: src/clients/inst_do_net_test.rb:974 +#: src/clients/inst_do_net_test.rb:954 msgid "" "Check for latest updates failed. View\n" "the logs for details.\n" @@ -441,7 +441,7 @@ "the logs for details.\n" #. label of combobox where the log is selected -#: src/clients/inst_do_net_test.rb:1001 +#: src/clients/inst_do_net_test.rb:980 msgid "Closing of Connection" msgstr "Closing of Connection" @@ -488,65 +488,54 @@ msgid "Config identifier" msgstr "Config identifier" -#: src/clients/lan.rb:136 +#. Commandline option help +#: src/clients/lan.rb:137 msgid "Use static or dynamic configuration" msgstr "Use static or dynamic configuration" -#: src/clients/lan.rb:140 +#: src/clients/lan.rb:141 msgid "Configuration Name" msgstr "Configuration Name" #. Commandline option help -#: src/clients/lan.rb:145 -msgid "Device boot protocol" -msgstr "Device boot protocol" - -#. Commandline option help -#: src/clients/lan.rb:150 +#: src/clients/lan.rb:146 msgid "Device IP address" msgstr "Device IP address" #. Commandline option help -#: src/clients/lan.rb:155 +#: src/clients/lan.rb:151 msgid "Network mask" msgstr "Network mask" #. Commandline option help -#: src/clients/lan.rb:160 +#: src/clients/lan.rb:156 #, fuzzy msgid "Prefix length" msgstr "Key length" #. Commandline option help -#: src/clients/lan.rb:165 +#: src/clients/lan.rb:161 #, fuzzy msgid "Bond Slaves" msgstr "Bond &Slaves" #. Commandline option help -#: src/clients/lan.rb:170 +#: src/clients/lan.rb:166 #, fuzzy msgid "Ethernet Device for VLAN" msgstr "Firewall Interfaces" #. Commandline option help -#: src/clients/lan.rb:175 +#: src/clients/lan.rb:171 #, fuzzy msgid "Interfaces for Bridging" msgstr "Interface or String" -#. copy the keys/values that are not existing in the XML -#. so we merge the inst-sys settings with the XML while XML -#. has higher priority -#. -#. bnc#796580 The problem with this is that due to compatibility with -#. older profiles, a missing element may have a different meaning than -#. "use what the filesystem/kernel currently uses". -#. In particular, a missing write_hostname [1] means -#. "use the product default from DVD1/control.xml". -#. Other elements may have similar problems, -#. to be fixed post-PTF for maintenance. -#: src/clients/lan_auto.rb:171 +#. see bnc#498993 +#. in case keep_install_network is set to true (in AY) +#. we'll keep values from installation +#. and merge with XML data (bnc#712864) +#: src/clients/lan_auto.rb:136 #, fuzzy msgid "Configuration Error: uninitialized interface." msgstr "Configuration Error : uninitialised interface!" @@ -574,17 +563,17 @@ "lan\t" #. Selection box item -#: src/clients/network.rb:67 src/clients/network.rb:110 +#: src/clients/network.rb:67 src/clients/network.rb:108 msgid "Network Card" msgstr "Network Card" #. Network dialog caption -#: src/clients/network.rb:90 +#: src/clients/network.rb:88 msgid "Network Configuration" msgstr "Network Configuration" #. Network dialog help -#: src/clients/network.rb:93 +#: src/clients/network.rb:91 msgid "" "<p>Choose one of the available network modules to configure\n" " the corresponding devices and press <b>Launch</b>.</p>" @@ -593,11 +582,11 @@ " the corresponding devices and press <b>Launch</b>.</p>" #. Selection box label -#: src/clients/network.rb:107 +#: src/clients/network.rb:105 msgid "&Available Network Modules:" msgstr "&Available Network Modules:" -#: src/clients/network.rb:125 +#: src/clients/network.rb:123 msgid "&Launch" msgstr "&Launch" @@ -617,12 +606,12 @@ msgstr "Set 'yes' to allow or 'no' to disallow the remote administration" #. Command line output Headline -#: src/clients/remote.rb:128 +#: src/clients/remote.rb:126 msgid "Remote Access Configuration Summary:" msgstr "Remote Access Configuration Summary:" #. Command line error message -#: src/clients/remote.rb:148 +#: src/clients/remote.rb:146 msgid "" "Please set 'yes' to allow the remote administration\n" "or 'no' to disallow it." @@ -643,7 +632,7 @@ #. Commandline help title #. Main routing dialog #. @return dialog result -#: src/clients/routing.rb:57 src/include/network/services/routing.rb:479 +#: src/clients/routing.rb:57 src/include/network/services/routing.rb:468 msgid "Routing Configuration" msgstr "Routing Configuration" @@ -727,120 +716,120 @@ #. main ui function #. Frame label -#: src/clients/routing.rb:205 src/include/network/services/routing.rb:77 +#: src/clients/routing.rb:203 src/include/network/services/routing.rb:77 msgid "Routing Table" msgstr "Routing Table" #. Table header 1/4 -#: src/clients/routing.rb:208 src/include/network/services/routing.rb:85 +#: src/clients/routing.rb:206 src/include/network/services/routing.rb:85 msgid "Destination" msgstr "Destination" #. Table header 2/4 -#: src/clients/routing.rb:209 src/include/network/services/routing.rb:87 +#: src/clients/routing.rb:207 src/include/network/services/routing.rb:87 msgid "Gateway" msgstr "Gateway" #. Table header label -#: src/clients/routing.rb:210 src/include/network/lan/address.rb:100 +#: src/clients/routing.rb:208 src/include/network/lan/address.rb:99 msgid "Netmask" msgstr "Netmask" #. Table header 4/4 -#: src/clients/routing.rb:211 src/include/network/lan/complex.rb:75 +#: src/clients/routing.rb:209 src/include/network/lan/complex.rb:75 #: src/include/network/services/routing.rb:68 #: src/include/network/services/routing.rb:72 #: src/include/network/services/routing.rb:91 msgid "Device" msgstr "Device" -#: src/clients/routing.rb:212 src/include/network/lan/hardware.rb:417 +#: src/clients/routing.rb:210 src/include/network/lan/hardware.rb:399 msgid "Options" msgstr "Options" #. Handler for action "list" #. @param [Hash{String => String}] options action options -#: src/clients/routing.rb:242 src/clients/routing.rb:383 -#: src/clients/routing.rb:427 +#: src/clients/routing.rb:239 src/clients/routing.rb:377 +#: src/clients/routing.rb:423 msgid "No entry for destination '%1' in routing table" msgstr "" #. translators: %s is "IPv4" or "IPv6" -#: src/clients/routing.rb:265 +#: src/clients/routing.rb:261 #, fuzzy msgid "%s forwarding is enabled" msgstr "IP Forwarding: on" #. translators: %s is "IPv4" or "IPv6" -#: src/clients/routing.rb:268 +#: src/clients/routing.rb:264 #, fuzzy msgid "%s forwarding is disabled" msgstr "Infrared control is disabled" #. translators: %s is "IPv4" or "IPv6" -#: src/clients/routing.rb:272 +#: src/clients/routing.rb:268 #, fuzzy msgid "Enabling %s forwarding..." msgstr "Enable &IP Forwarding" #. translators: %s is "IPv4" or "IPv6" -#: src/clients/routing.rb:276 +#: src/clients/routing.rb:272 #, fuzzy msgid "Disabling %s forwarding..." msgstr "Enable &IP Forwarding" -#: src/clients/routing.rb:282 +#: src/clients/routing.rb:278 #, fuzzy msgid "IPv4 Forwarding:" msgstr "IP Forwarding: on" -#: src/clients/routing.rb:292 +#: src/clients/routing.rb:288 #, fuzzy msgid "IPv6 Forwarding:" msgstr "IP Forwarding: on" -#: src/clients/routing.rb:302 +#: src/clients/routing.rb:298 #, fuzzy msgid "IPv4 and IPv6 Forwarding:" msgstr "IP Forwarding: on" -#: src/clients/routing.rb:324 +#: src/clients/routing.rb:320 #, fuzzy msgid "At least destination and gateway IP addresses must be specified." msgstr "At least one address must be specified." -#: src/clients/routing.rb:333 +#: src/clients/routing.rb:329 #, fuzzy msgid "Adding '%1' destination to routing table ..." msgstr "Adding files to table..." -#: src/clients/routing.rb:349 +#: src/clients/routing.rb:343 #, fuzzy msgid "Destination IP address must be specified." msgstr "At least one address must be specified." -#: src/clients/routing.rb:354 +#: src/clients/routing.rb:348 msgid "At least one of the following parameters (gateway, netmask, device, options) must be specified" msgstr "" -#: src/clients/routing.rb:376 +#: src/clients/routing.rb:370 #, fuzzy msgid "Updating '%1' destination in routing table ..." msgstr "Updating translations in boot loader menu..." -#: src/clients/routing.rb:419 +#: src/clients/routing.rb:415 msgid "Deleting '%1' destination from routing table ..." msgstr "" #. interface summary: WiFi without encryption #. interface summary: WiFi without encryption -#: src/include/network/complex.rb:101 src/modules/LanItems.rb:1356 +#: src/include/network/complex.rb:101 src/modules/LanItems.rb:1363 msgid "Warning: no encryption is used." msgstr "Warning: no encryption is used." #. Hyperlink: Change the configuration of an interface #. Hyperlink: Change the configuration of an interface -#: src/include/network/complex.rb:107 src/modules/LanItems.rb:1358 +#: src/include/network/complex.rb:107 src/modules/LanItems.rb:1365 msgid "Change." msgstr "Change." @@ -862,149 +851,149 @@ msgstr "Nothing is configured" #. Device type label -#: src/include/network/complex.rb:204 +#: src/include/network/complex.rb:202 msgid "PCMCIA ISDN Card" msgstr "PCMCIA ISDN Card" #. Device type label -#: src/include/network/complex.rb:206 +#: src/include/network/complex.rb:204 msgid "USB ISDN Card" msgstr "USB ISDN Card" #. Device type label -#: src/include/network/complex.rb:208 +#: src/include/network/complex.rb:206 msgid "PCMCIA Ethernet Network Card" msgstr "PCMCIA Ethernet Network Card" #. Device type label -#: src/include/network/complex.rb:210 +#: src/include/network/complex.rb:208 msgid "USB Ethernet Network Card" msgstr "USB Ethernet Network Card" #. Device type label -#: src/include/network/complex.rb:212 +#: src/include/network/complex.rb:210 msgid "PCMCIA FDDI Network Card" msgstr "PCMCIA FDDI Network Card" #. Device type label -#: src/include/network/complex.rb:214 +#: src/include/network/complex.rb:212 msgid "USB FDDI Network Card" msgstr "USB FDDI Network Card" #. Device type label #. Device type label -#: src/include/network/complex.rb:216 src/include/network/complex.rb:220 +#: src/include/network/complex.rb:214 src/include/network/complex.rb:218 msgid "PCMCIA ISDN Connection" msgstr "PCMCIA ISDN Connection" #. Device type label #. Device type label -#: src/include/network/complex.rb:218 src/include/network/complex.rb:222 +#: src/include/network/complex.rb:216 src/include/network/complex.rb:220 msgid "USB ISDN Connection" msgstr "USB ISDN Connection" #. Device type label #. Device type label -#: src/include/network/complex.rb:224 src/include/network/complex.rb:228 +#: src/include/network/complex.rb:222 src/include/network/complex.rb:226 msgid "PCMCIA Modem" msgstr "PCMCIA Modem" #. Device type label #. Device type label -#: src/include/network/complex.rb:226 src/include/network/complex.rb:230 +#: src/include/network/complex.rb:224 src/include/network/complex.rb:228 msgid "USB Modem" msgstr "USB Modem" #. Device type label -#: src/include/network/complex.rb:232 +#: src/include/network/complex.rb:230 msgid "PCMCIA Token Ring Network Card" msgstr "PCMCIA Token Ring Network Card" #. Device type label -#: src/include/network/complex.rb:236 +#: src/include/network/complex.rb:234 msgid "USB Token Ring Network Card" msgstr "USB Token Ring Network Card" #. Device type label -#: src/include/network/complex.rb:238 +#: src/include/network/complex.rb:236 msgid "USB Network Device" msgstr "USB Network Device" #. Device type label -#: src/include/network/complex.rb:240 +#: src/include/network/complex.rb:238 msgid "PCMCIA Wireless Network Card" msgstr "PCMCIA Wireless Network Card" #. Device type label -#: src/include/network/complex.rb:242 +#: src/include/network/complex.rb:240 msgid "USB Wireless Network Card" msgstr "USB Wireless Network Card" #. Device type label -#: src/include/network/complex.rb:259 +#: src/include/network/complex.rb:257 msgid "Unknown Network Device" msgstr "Unknown Network Device" #. Modem status (%1 is device) #. ISDN device status (%1 is device) #. Network card status (%1 is device) -#: src/include/network/complex.rb:313 src/include/network/complex.rb:325 -#: src/include/network/complex.rb:384 +#: src/include/network/complex.rb:312 src/include/network/complex.rb:324 +#: src/include/network/complex.rb:383 msgid "Configured as %1" msgstr "Configured as %1" #. Modem status (%1 is device, %2 is provider) -#: src/include/network/complex.rb:317 +#: src/include/network/complex.rb:316 msgid "Configured as %1 with provider %2" msgstr "Configured as %1 with provider %2" #. ISDN status (%1 is device, %2 is provider, %3 protocol) -#: src/include/network/complex.rb:334 +#: src/include/network/complex.rb:333 msgid "Configured as %1 with provider %2 (protocol %3)" msgstr "Configured as %1 with provider %2 (protocol %3)" -#: src/include/network/complex.rb:349 +#: src/include/network/complex.rb:348 msgid "Configured without address (NONE)" msgstr "Configured without address (NONE)" #. Network card status -#: src/include/network/complex.rb:352 +#: src/include/network/complex.rb:351 msgid "Configured without an address" msgstr "Configured without an address" #. Network card status (%1 is address) -#: src/include/network/complex.rb:356 +#: src/include/network/complex.rb:355 msgid "Configured with address %1" msgstr "Configured with address %1" #. Network card status (%1 is address, %2 is address) -#: src/include/network/complex.rb:362 +#: src/include/network/complex.rb:361 msgid "Configured with address %1 (remote %2)" msgstr "Configured with address %1 (remote %2)" #. Network card status (%1 is protocol) -#: src/include/network/complex.rb:370 +#: src/include/network/complex.rb:369 msgid "Configured with %1" msgstr "Configured with %1" #. Network card status (%1 is device, %2 is address) -#: src/include/network/complex.rb:388 +#: src/include/network/complex.rb:387 msgid "Configured as %1 with address %2" msgstr "Configured as %1 with address %2" #. Network card status (%1 is device, %2 is address, %3 is address) -#: src/include/network/complex.rb:395 +#: src/include/network/complex.rb:394 msgid "Configured as %1 with address %2 (remote %3)" msgstr "Configured as %1 with address %2 (remote %3)" #. Network card status (%1 is device, %2 is protocol) -#: src/include/network/complex.rb:404 +#: src/include/network/complex.rb:403 msgid "Configured as %1 with %2" msgstr "Configured as %1 with %2" #. Abbreviation for "The interface is Managed by NetworkManager" #. ComboBox item -#: src/include/network/complex.rb:420 src/include/network/lan/wireless.rb:440 +#: src/include/network/complex.rb:419 src/include/network/lan/wireless.rb:438 msgid "Managed" msgstr "Managed" @@ -1089,67 +1078,67 @@ msgstr "- Connect to the Internet" #. label text - one step of during network test -#: src/include/network/installation/dialogs.rb:202 +#: src/include/network/installation/dialogs.rb:201 msgid "- Download latest release notes" msgstr "- Download latest release notes" #. label text - one step of during network test -#: src/include/network/installation/dialogs.rb:209 +#: src/include/network/installation/dialogs.rb:207 msgid "- Check for latest updates" msgstr "- Check for latest updates" #. label text - one step of during network test -#: src/include/network/installation/dialogs.rb:214 +#: src/include/network/installation/dialogs.rb:212 msgid "- Close connection" msgstr "- Close connection" #. Heading text -#: src/include/network/installation/dialogs.rb:225 +#: src/include/network/installation/dialogs.rb:223 msgid "The following steps will be performed:" msgstr "The following steps will be performed:" #. Frame label -#: src/include/network/installation/dialogs.rb:233 +#: src/include/network/installation/dialogs.rb:231 msgid "Select:" msgstr "Select:" #. RadioButton label -#: src/include/network/installation/dialogs.rb:286 +#: src/include/network/installation/dialogs.rb:284 msgid "&Yes, Run Online Update Now" msgstr "&Yes, Run Online Update Now" #. RadioButton label -#: src/include/network/installation/dialogs.rb:288 +#: src/include/network/installation/dialogs.rb:286 msgid "N&o, Skip Update" msgstr "N&o, Skip Update" #. Heading text -#: src/include/network/installation/dialogs.rb:298 +#: src/include/network/installation/dialogs.rb:296 msgid "Online Updates Available" msgstr "Online Updates Available" #. Label text -#: src/include/network/installation/dialogs.rb:301 +#: src/include/network/installation/dialogs.rb:299 msgid "Download and install them via the YaST Online Update?" msgstr "Download and install them via the YaST Online Update?" #. Heading -#: src/include/network/installation/dialogs.rb:347 +#: src/include/network/installation/dialogs.rb:344 msgid "Internet Connection Test Logs:" msgstr "Internet Connection Test Logs:" #. ComboBox label -#: src/include/network/installation/dialogs.rb:355 +#: src/include/network/installation/dialogs.rb:352 msgid "&Select Log:" msgstr "&Select Log:" #. Frame label -#: src/include/network/lan/address.rb:84 +#: src/include/network/lan/address.rb:83 msgid "Additional Addresses" msgstr "Additional Addresses" #. Table header label -#: src/include/network/lan/address.rb:96 +#: src/include/network/lan/address.rb:95 #, fuzzy #| msgid "IP Address" msgid "IPv4 Address Label" @@ -1157,7 +1146,7 @@ #. Table header label #. Table header label -#: src/include/network/lan/address.rb:98 src/include/network/lan/complex.rb:75 +#: src/include/network/lan/address.rb:97 src/include/network/lan/complex.rb:75 #: src/include/network/services/host.rb:128 msgid "IP Address" msgstr "IP Address" @@ -1165,7 +1154,7 @@ #. PushButton label #. PushButton label #. PushButton label -#: src/include/network/lan/address.rb:107 +#: src/include/network/lan/address.rb:106 #: src/include/network/services/host.rb:139 #: src/include/network/services/routing.rb:100 msgid "Ad&d" @@ -1175,7 +1164,7 @@ #. PushButton label #. PushButton label #. Pushbutton label -#: src/include/network/lan/address.rb:109 +#: src/include/network/lan/address.rb:108 #: src/include/network/services/host.rb:141 #: src/include/network/services/routing.rb:102 #: src/include/network/summary.rb:69 @@ -1186,136 +1175,136 @@ #. PushButton label #. PushButton label #. Pushbutton label -#: src/include/network/lan/address.rb:111 +#: src/include/network/lan/address.rb:110 #: src/include/network/services/host.rb:143 #: src/include/network/services/routing.rb:104 #: src/include/network/summary.rb:71 msgid "De&lete" msgstr "De&lete" -#: src/include/network/lan/address.rb:132 +#: src/include/network/lan/address.rb:131 msgid "&Name of Interface" msgstr "&Name of Interface" -#: src/include/network/lan/address.rb:134 +#: src/include/network/lan/address.rb:133 msgid "<p>TODO kind of vague!</p>" msgstr "<p>TODO kind of vague!</p>" #. Combo Box label -#: src/include/network/lan/address.rb:139 +#: src/include/network/lan/address.rb:138 #, fuzzy msgid "Assign Interface to Firewall &Zone" msgstr "Network Interfaces in Firewall Zones:" #. check box label -#: src/include/network/lan/address.rb:147 +#: src/include/network/lan/address.rb:146 msgid "&Mandatory Interface" msgstr "&Mandatory Interface" #. ComboBox label #. ComboBox label -#: src/include/network/lan/address.rb:155 -#: src/include/network/lan/hardware.rb:369 +#: src/include/network/lan/address.rb:154 +#: src/include/network/lan/hardware.rb:351 msgid "&Device Type" msgstr "&Device Type" #. ComboBox label #. TextEntry label -#: src/include/network/lan/address.rb:174 -#: src/include/network/lan/hardware.rb:355 +#: src/include/network/lan/address.rb:172 +#: src/include/network/lan/hardware.rb:337 msgid "&Configuration Name" msgstr "&Configuration Name" -#: src/include/network/lan/address.rb:183 +#: src/include/network/lan/address.rb:181 msgid "Tunnel owner" msgstr "" -#: src/include/network/lan/address.rb:184 +#: src/include/network/lan/address.rb:182 #, fuzzy msgid "Tunnel group" msgstr "Unknown group" -#: src/include/network/lan/address.rb:193 -#: src/include/network/lan/address.rb:1316 +#: src/include/network/lan/address.rb:191 +#: src/include/network/lan/address.rb:1297 #, fuzzy msgid "Bridged Devices" msgstr "Modem Devices" -#: src/include/network/lan/address.rb:213 +#: src/include/network/lan/address.rb:211 #, fuzzy msgid "Real Interface for &VLAN" msgstr "Firewall Interfaces" -#: src/include/network/lan/address.rb:216 +#: src/include/network/lan/address.rb:214 #, fuzzy #| msgid "VLAN" msgid "VLAN ID" msgstr "VLAN" -#: src/include/network/lan/address.rb:233 +#: src/include/network/lan/address.rb:231 #, fuzzy msgid "Bond Slaves and Order" msgstr "Bond &Slaves" -#: src/include/network/lan/address.rb:237 +#: src/include/network/lan/address.rb:235 #, fuzzy #| msgid "&Up" msgid "Up" msgstr "&Up" -#: src/include/network/lan/address.rb:238 +#: src/include/network/lan/address.rb:236 #, fuzzy #| msgid "&Down" msgid "Down" msgstr "&Down" -#: src/include/network/lan/address.rb:242 +#: src/include/network/lan/address.rb:240 msgid "Bond &Slaves" msgstr "Bond &Slaves" #. ComboBox label -#: src/include/network/lan/address.rb:258 +#: src/include/network/lan/address.rb:256 #, fuzzy msgid "&Bond Driver Options" msgstr "Bond &Driver Options" -#: src/include/network/lan/address.rb:260 +#: src/include/network/lan/address.rb:258 #, fuzzy msgid "<p>Select the bond driver options and edit them if necessary. </p>" msgstr "<p>Select the bond driver options, and edit it if you need. </p>" #. if (LanItems::type=="br") UI::ReplaceWidget(`rp, `Empty()); #. else -#: src/include/network/lan/address.rb:285 -#: src/include/network/lan/address.rb:811 +#: src/include/network/lan/address.rb:283 +#: src/include/network/lan/address.rb:798 msgid "No Link and IP Setup (Bonding Slaves)" msgstr "" -#: src/include/network/lan/address.rb:288 +#: src/include/network/lan/address.rb:286 msgid "Use iBFT Values" msgstr "" -#: src/include/network/lan/address.rb:294 +#: src/include/network/lan/address.rb:292 msgid "Dynamic Address" msgstr "Dynamic Address" -#: src/include/network/lan/address.rb:310 +#: src/include/network/lan/address.rb:308 #, fuzzy msgid "DHCP both version 4 and 6" msgstr "Product version and release" -#: src/include/network/lan/address.rb:311 +#: src/include/network/lan/address.rb:309 #, fuzzy msgid "DHCP version 4 only" msgstr "LDAP Version 2" -#: src/include/network/lan/address.rb:312 +#: src/include/network/lan/address.rb:310 #, fuzzy msgid "DHCP version 6 only" msgstr "LDAP Version 2" #. TODO : Stat ... Assigned -#: src/include/network/lan/address.rb:323 +#: src/include/network/lan/address.rb:321 #, fuzzy #| msgid "Statically assigned IP Address" msgid "Statically Assigned IP Address" @@ -1323,37 +1312,37 @@ #. TextEntry label #. TextEntry label -#: src/include/network/lan/address.rb:327 -#: src/include/network/lan/virtual.rb:218 -#: src/include/network/services/host.rb:356 +#: src/include/network/lan/address.rb:325 +#: src/include/network/lan/virtual.rb:213 +#: src/include/network/services/host.rb:341 msgid "&IP Address" msgstr "&IP Address" -#: src/include/network/lan/address.rb:329 +#: src/include/network/lan/address.rb:327 msgid "&Subnet Mask" msgstr "&Subnet Mask" -#: src/include/network/lan/address.rb:331 +#: src/include/network/lan/address.rb:329 msgid "&Hostname" msgstr "&Hostname" #. Text entry label -#: src/include/network/lan/address.rb:364 +#: src/include/network/lan/address.rb:360 msgid "R&emote IP Address" msgstr "R&emote IP Address" #. validation error popup -#: src/include/network/lan/address.rb:373 +#: src/include/network/lan/address.rb:369 msgid "The remote IP address is invalid." msgstr "The remote IP address is invalid." #. push button label -#: src/include/network/lan/address.rb:381 +#: src/include/network/lan/address.rb:377 msgid "&S/390" msgstr "&S/390" #. validate device type, misdetection -#: src/include/network/lan/address.rb:1037 +#: src/include/network/lan/address.rb:1018 msgid "" "You have changed the interface type from the one\n" "that has been detected. This only makes sense\n" @@ -1364,13 +1353,13 @@ "if you know that the detection is wrong." #. Popup text -#: src/include/network/lan/address.rb:1057 +#: src/include/network/lan/address.rb:1038 msgid "Configuration %1 already present." msgstr "Configuration %1 already present." #. If firewall is active and interface in no zone, nothing #. gets through (#62309) so warn and redirect to details -#: src/include/network/lan/address.rb:1081 +#: src/include/network/lan/address.rb:1062 msgid "" "The firewall is active, but this interface is not\n" "in any zone. All its traffic would be blocked.\n" @@ -1384,21 +1373,21 @@ #. @param [String] key the widget being validated #. @param [Hash] event the event being handled #. @return whether valid -#: src/include/network/lan/address.rb:1101 +#: src/include/network/lan/address.rb:1082 msgid "No valid IP address." msgstr "No valid IP address." -#: src/include/network/lan/address.rb:1108 +#: src/include/network/lan/address.rb:1089 #, fuzzy msgid "No valid netmask or prefix length." msgstr "No valid Netmask." -#: src/include/network/lan/address.rb:1116 +#: src/include/network/lan/address.rb:1097 msgid "Invalid hostname." msgstr "Invalid hostname." #. There'll be no 127.0.0.2 -> remind user to define some hostname -#: src/include/network/lan/address.rb:1124 +#: src/include/network/lan/address.rb:1105 msgid "" "No hostname has been specified. We recommend to associate \n" "a hostname with a static IP, otherwise the machine name will \n" @@ -1408,7 +1397,7 @@ msgstr "" #. Popup text -#: src/include/network/lan/address.rb:1143 +#: src/include/network/lan/address.rb:1124 msgid "" "Duplicate IP address detected.\n" "Really continue?\n" @@ -1418,56 +1407,55 @@ #. @param [Array<String>] types network card types #. @return their descriptions for CWM -#: src/include/network/lan/address.rb:1197 +#: src/include/network/lan/address.rb:1177 msgid "&General" msgstr "&General" -#. TODO: -#. "MANDATORY", -#: src/include/network/lan/address.rb:1209 +#. TODO: "MANDATORY", +#: src/include/network/lan/address.rb:1188 msgid "Device Activation" msgstr "Device Activation" -#: src/include/network/lan/address.rb:1213 +#: src/include/network/lan/address.rb:1192 msgid "Firewall Zone" msgstr "Firewall Zone" -#: src/include/network/lan/address.rb:1218 +#: src/include/network/lan/address.rb:1197 msgid "Maximum Transfer Unit (MTU)" msgstr "Maximum Transfer Unit (MTU)" -#. FIXME we have helps per widget and for the whole +#. FIXME: we have helps per widget and for the whole #. tab set but not for one tab -#: src/include/network/lan/address.rb:1228 +#: src/include/network/lan/address.rb:1207 msgid "<p>Configure the detailed network card settings here.</p>" msgstr "<p>Configure the detailed network card settings here.</p>" #. FIXME: here it does not complain about missing #. shortcuts -#: src/include/network/lan/address.rb:1293 +#: src/include/network/lan/address.rb:1274 msgid "&Address" msgstr "&Address" #. Address tab help -#: src/include/network/lan/address.rb:1296 +#: src/include/network/lan/address.rb:1277 msgid "<p>Configure your IP address.</p>" msgstr "<p>Configure your IP address.</p>" -#: src/include/network/lan/address.rb:1302 +#: src/include/network/lan/address.rb:1283 msgid "&Hardware" msgstr "&Hardware" -#: src/include/network/lan/address.rb:1309 +#: src/include/network/lan/address.rb:1290 #, fuzzy msgid "&Bond Slaves" msgstr "Bond &Slaves" -#: src/include/network/lan/address.rb:1323 +#: src/include/network/lan/address.rb:1304 msgid "&Wireless" msgstr "&Wireless" #. Combo box label - when to activate device (e.g. on boot, manually, never,..) -#: src/include/network/lan/address.rb:1408 +#: src/include/network/lan/address.rb:1388 #, fuzzy #| msgid "Swap &Priority" msgid "Ifplugd Priority" @@ -1475,7 +1463,7 @@ #. Device activation main help. The individual parts will be #. substituted as %1 -#: src/include/network/lan/address.rb:1414 +#: src/include/network/lan/address.rb:1394 msgid "" "<p><b><big>IFPLUGD PRIORITY</big></b></p> \n" "<p> All interfaces configured with <b>On Cable Connection</b> and with IFPLUGD_PRIORITY != 0 will be\n" @@ -1485,7 +1473,7 @@ msgstr "" #. Address dialog caption -#: src/include/network/lan/address.rb:1499 +#: src/include/network/lan/address.rb:1476 msgid "Network Card Setup" msgstr "Network Card Setup" @@ -1676,11 +1664,11 @@ msgstr "CI7000 adapter" #. list > overview = (list >)LanItems::Overview(); -#: src/include/network/lan/cmdline.rb:92 +#: src/include/network/lan/cmdline.rb:89 msgid "Use \"id\" option to determine device." msgstr "Use \"id\" option to determine device." -#: src/include/network/lan/cmdline.rb:101 +#: src/include/network/lan/cmdline.rb:98 msgid "Value of \"id\" is out of range. Use \"list\" option to check max. value of \"id\"." msgstr "Value of \"id\" is out of range. Use \"list\" option to check max. value of \"id\"." @@ -1688,26 +1676,26 @@ #. @param [Hash{String => String}] options action options #. Handler for action "edit" #. @param [Hash{String => String}] options action options -#: src/include/network/lan/cmdline.rb:219 -#: src/include/network/lan/cmdline.rb:270 +#: src/include/network/lan/cmdline.rb:214 +#: src/include/network/lan/cmdline.rb:265 #, fuzzy msgid "Impossible value for bootproto." msgstr "Not possible value for bootproto!" -#: src/include/network/lan/cmdline.rb:228 -#: src/include/network/lan/cmdline.rb:294 +#: src/include/network/lan/cmdline.rb:223 +#: src/include/network/lan/cmdline.rb:289 #, fuzzy msgid "Impossible value for startmode." msgstr "Not possible value for startmode!" -#: src/include/network/lan/cmdline.rb:276 +#: src/include/network/lan/cmdline.rb:271 #, fuzzy msgid "For static configuration, the \"ip\" option is needed." msgstr "Automatic configuration skipped (%1)" #. Handler for action "delete" #. @param [Hash{String => String}] options action options -#: src/include/network/lan/cmdline.rb:322 +#: src/include/network/lan/cmdline.rb:316 msgid "The device was deleted." msgstr "The device was deleted." @@ -1747,17 +1735,17 @@ msgid "Note" msgstr "Note:" -#: src/include/network/lan/complex.rb:116 +#: src/include/network/lan/complex.rb:115 msgid "Global Options" msgstr "Global Options" -#: src/include/network/lan/complex.rb:126 +#: src/include/network/lan/complex.rb:125 msgid "Overview" msgstr "Overview" #. continue-cancel popup, #178848 #. %1 is a (long) path to a README file -#: src/include/network/lan/complex.rb:154 +#: src/include/network/lan/complex.rb:153 msgid "" "A Xen network bridge was detected.\n" "Due to the renaming of network interfaces by the bridge script,\n" @@ -1771,7 +1759,7 @@ #. Write settings dialog #. @return `abort if aborted and `next otherwise -#: src/include/network/lan/complex.rb:200 +#: src/include/network/lan/complex.rb:199 msgid "" "Firmware is needed. Install it from \n" "the add-on CD.\n" @@ -1779,7 +1767,7 @@ "to this configuration dialog.\n" msgstr "" -#: src/include/network/lan/complex.rb:214 +#: src/include/network/lan/complex.rb:213 msgid "" "The device needs a firmware to function properly. Usually, it can be\n" "downloaded from your driver vendor's Web page. \n" @@ -1792,22 +1780,22 @@ #. - kernel modules (InstallKernel): before loaded #. - wlan firmware: here, just because it is copied from modems #. #45960 -#: src/include/network/lan/complex.rb:233 +#: src/include/network/lan/complex.rb:232 #, fuzzy msgid "Installing firmware" msgstr "Installing firmware..." -#: src/include/network/lan/complex.rb:234 +#: src/include/network/lan/complex.rb:233 msgid "For successful firmware installation, the 'install_bcm43xx_firmware' script needs to be executed. Execute it now?" msgstr "" -#: src/include/network/lan/complex.rb:248 +#: src/include/network/lan/complex.rb:247 #, fuzzy msgid "An error occurred during firmware installation." msgstr "An error occurred during installation." #. Continue-Cancel popup -#: src/include/network/lan/complex.rb:403 +#: src/include/network/lan/complex.rb:402 msgid "" "The interface is currently set to be managed\n" "by the NetworkManager applet.\n" @@ -1822,12 +1810,12 @@ "the interface will no longer be managed by NetworkManager.\n" #. warn user when device to delete has STARTMODE=nfsroot (bnc#433867) -#: src/include/network/lan/complex.rb:457 +#: src/include/network/lan/complex.rb:456 msgid "Device you select has STARTMODE=nfsroot. Really delete?" msgstr "" #. Network setup method dialog caption -#: src/include/network/lan/complex.rb:493 src/include/network/widgets.rb:376 +#: src/include/network/lan/complex.rb:487 src/include/network/widgets.rb:363 msgid "Network Setup Method" msgstr "Network Setup Method" @@ -1836,7 +1824,7 @@ #. it is basically useful if user aborts dialog and he has done some #. changes already. Calling this function may results in confirmation #. popup. -#: src/include/network/lan/complex.rb:526 +#: src/include/network/lan/complex.rb:519 msgid "Network Settings" msgstr "Network Settings" @@ -1864,7 +1852,7 @@ msgstr "&Change Hostname via DHCP" #. Manual network card setup help 1/4 -#: src/include/network/lan/hardware.rb:83 +#: src/include/network/lan/hardware.rb:82 #, fuzzy msgid "" "<p>Set up hardware-specific options for \n" @@ -1873,20 +1861,20 @@ #. Manual network card setup help 2/4 #. translators: do not translated udev, MAC, BusID -#: src/include/network/lan/hardware.rb:92 +#: src/include/network/lan/hardware.rb:91 msgid "" "<p><b>Device Type</b>. Various device types are available, select \n" "one according your needs.</p>" msgstr "" -#: src/include/network/lan/hardware.rb:100 +#: src/include/network/lan/hardware.rb:99 msgid "" "<p><b>Udev Rules</b> are rules for the kernel device manager that allow\n" "associating the MAC address or BusID of the network device with its name (for\n" "example, eth1, wlan0 ) and assures a persistent device name upon reboot.\n" msgstr "" -#: src/include/network/lan/hardware.rb:106 +#: src/include/network/lan/hardware.rb:105 msgid "" "<p><b>Show visible port identification</b> allows you to physically identify now configured NIC. \n" "Set appropriate time, click <b>Blink</b> and LED diodes on you NIC will start blinking for selected time.\n" @@ -1894,7 +1882,7 @@ msgstr "" #. Manual network card setup help 2/4 -#: src/include/network/lan/hardware.rb:119 +#: src/include/network/lan/hardware.rb:118 msgid "" "<p><b>Kernel Module</b>. Enter the kernel module (driver) name \n" "for your network device here. If the device is already configured, see if there is more than one driver available for\n" @@ -1902,7 +1890,7 @@ msgstr "" #. Manual networ card setup help 3/4 -#: src/include/network/lan/hardware.rb:126 +#: src/include/network/lan/hardware.rb:125 #, fuzzy msgid "" "<p>Additionally, specify <b>Options</b> for the kernel module. Use this\n" @@ -1914,12 +1902,12 @@ "for example, <i>io=0x300 irq=5</i>. <b>Note:</b> If two cards are configured\n" "with the same module name, options will be merged while saving.</p>" -#: src/include/network/lan/hardware.rb:132 +#: src/include/network/lan/hardware.rb:131 msgid "<p>If you specify options via <b>Ethtool options</b>, ifup will call ethtool with these options.</p>\n" msgstr "" #. Manual dialog help 4/4 -#: src/include/network/lan/hardware.rb:141 +#: src/include/network/lan/hardware.rb:140 msgid "" "<p>If you have a <b>PCMCIA</b> network card, select PCMCIA.\n" "If you have a <b>USB</b> network card, select USB.</p>\n" @@ -1929,7 +1917,7 @@ #. overwrite help #. Manual dialog help 5/4 -#: src/include/network/lan/hardware.rb:150 +#: src/include/network/lan/hardware.rb:149 msgid "" "<p>Here, set up your networking device. The values will be\n" "written to <i>/etc/modprobe.conf</i> or <i>/etc/chandev.conf</i>.</p>\n" @@ -1938,7 +1926,7 @@ "written to <i>/etc/modprobe.conf</i> or <i>/etc/chandev.conf</i>.</p>\n" #. Manual dialog help 6/4 -#: src/include/network/lan/hardware.rb:154 +#: src/include/network/lan/hardware.rb:153 msgid "" "<p>Options for the module should be written in the format specified\n" "in the <b>IBM Device Drivers and Installation Commands</b> manual.</p>" @@ -1946,85 +1934,70 @@ "<p>Options for the module should be written in the format specified\n" "in the <b>IBM Device Drivers and Installation Commands</b> manual.</p>" -#. Manual dialog caption -#: src/include/network/lan/hardware.rb:271 -msgid "Manual Network Card Configuration" -msgstr "Manual Network Card Configuration" - #. CheckBox label -#: src/include/network/lan/hardware.rb:284 +#: src/include/network/lan/hardware.rb:281 msgid "&PCMCIA" msgstr "&PCMCIA" #. CheckBox label -#: src/include/network/lan/hardware.rb:293 +#: src/include/network/lan/hardware.rb:290 msgid "&USB" msgstr "&USB" -#. ComboBox label -#: src/include/network/lan/hardware.rb:302 -msgid "&Hotplug Type" -msgstr "&Hotplug Type" - -#. CheckBox label -#: src/include/network/lan/hardware.rb:307 -msgid "P&CI" -msgstr "P&CI" - #. #116211 - allow user to change modules from list #. Frame label -#: src/include/network/lan/hardware.rb:319 +#: src/include/network/lan/hardware.rb:302 msgid "&Kernel Module" msgstr "&Kernel Module" #. Text entry label -#: src/include/network/lan/hardware.rb:329 +#: src/include/network/lan/hardware.rb:312 msgid "&Module Name" msgstr "&Module Name" -#: src/include/network/lan/hardware.rb:383 +#: src/include/network/lan/hardware.rb:365 #, fuzzy #| msgid "Udev rules" msgid "Udev Rules" msgstr "Udev rules" -#: src/include/network/lan/hardware.rb:385 +#: src/include/network/lan/hardware.rb:367 msgid "Device Name" msgstr "Device Name" -#: src/include/network/lan/hardware.rb:386 +#: src/include/network/lan/hardware.rb:368 msgid "Change" msgstr "Change" -#: src/include/network/lan/hardware.rb:397 +#: src/include/network/lan/hardware.rb:379 #, fuzzy #| msgid "Server Identification" msgid "Show Visible Port Identification" msgstr "Server Identification" #. translators: how many seconds will card be blinking -#: src/include/network/lan/hardware.rb:402 +#: src/include/network/lan/hardware.rb:384 msgid "Seconds" msgstr "Seconds" -#: src/include/network/lan/hardware.rb:407 +#: src/include/network/lan/hardware.rb:389 #, fuzzy #| msgid "Blin" msgid "Blink" msgstr "Blin" -#: src/include/network/lan/hardware.rb:412 +#: src/include/network/lan/hardware.rb:394 #, fuzzy msgid "Ethtool Options" msgstr "&Additional ipppd options" #. Manual selection caption -#: src/include/network/lan/hardware.rb:492 +#: src/include/network/lan/hardware.rb:472 msgid "Manual Network Card Selection" msgstr "Manual Network Card Selection" #. Manual selection help -#: src/include/network/lan/hardware.rb:495 +#: src/include/network/lan/hardware.rb:475 msgid "" "<p>Select the network card to configure. Search\n" "for a particular network card by entering the name in the search entry.</p>" @@ -2034,18 +2007,18 @@ #. Selection box label #. Selection box title -#: src/include/network/lan/hardware.rb:505 -#: src/include/network/lan/hardware.rb:560 +#: src/include/network/lan/hardware.rb:485 +#: src/include/network/lan/hardware.rb:540 msgid "&Network Card" msgstr "&Network Card" #. Text entry field -#: src/include/network/lan/hardware.rb:509 +#: src/include/network/lan/hardware.rb:489 msgid "&Search" msgstr "&Search" #. bnc#767946 -#: src/include/network/lan/hardware.rb:819 +#: src/include/network/lan/hardware.rb:799 #, fuzzy msgid "" "Configuration name %1 already exists.\n" @@ -2055,7 +2028,7 @@ "Choose a different one." #. S/390 dialog caption -#: src/include/network/lan/hardware.rb:874 +#: src/include/network/lan/hardware.rb:854 msgid "S/390 Network Card Configuration" msgstr "S/390 Network Card Configuration" @@ -2063,134 +2036,134 @@ #. Frame label #. Frame label #. Frame label -#: src/include/network/lan/hardware.rb:894 -#: src/include/network/lan/hardware.rb:996 -#: src/include/network/lan/hardware.rb:1063 -#: src/include/network/lan/hardware.rb:1100 +#: src/include/network/lan/hardware.rb:873 +#: src/include/network/lan/hardware.rb:975 +#: src/include/network/lan/hardware.rb:1042 +#: src/include/network/lan/hardware.rb:1079 msgid "S/390 Device Settings" msgstr "S/390 Device Settings" #. TextEntry label -#: src/include/network/lan/hardware.rb:904 +#: src/include/network/lan/hardware.rb:883 msgid "&Port Name" msgstr "&Port Name" -#: src/include/network/lan/hardware.rb:909 +#: src/include/network/lan/hardware.rb:888 msgid "Port Number" msgstr "Port Number" #. CheckBox label -#: src/include/network/lan/hardware.rb:923 +#: src/include/network/lan/hardware.rb:902 msgid "&Enable IPA Takeover" msgstr "&Enable IPA Takeover" #. CheckBox label -#: src/include/network/lan/hardware.rb:930 +#: src/include/network/lan/hardware.rb:909 msgid "Enable &Layer 2 Support" msgstr "Enable &Layer 2 Support" #. TextEntry label -#: src/include/network/lan/hardware.rb:937 +#: src/include/network/lan/hardware.rb:916 msgid "Layer2 &MAC Address" msgstr "Layer2 &MAC Address" -#: src/include/network/lan/hardware.rb:945 -#: src/include/network/lan/hardware.rb:1021 -#: src/include/network/lan/hardware.rb:1075 +#: src/include/network/lan/hardware.rb:924 +#: src/include/network/lan/hardware.rb:1000 +#: src/include/network/lan/hardware.rb:1054 #, fuzzy msgid "Read Channel" msgstr "R&ead Channel" -#: src/include/network/lan/hardware.rb:951 -#: src/include/network/lan/hardware.rb:1027 -#: src/include/network/lan/hardware.rb:1081 +#: src/include/network/lan/hardware.rb:930 +#: src/include/network/lan/hardware.rb:1006 +#: src/include/network/lan/hardware.rb:1060 #, fuzzy msgid "Write Channel" msgstr "&Write Channel" -#: src/include/network/lan/hardware.rb:957 +#: src/include/network/lan/hardware.rb:936 #, fuzzy msgid "Control Channel" msgstr "Control file changed." #. S/390 dialog help: QETH Port name -#: src/include/network/lan/hardware.rb:968 +#: src/include/network/lan/hardware.rb:947 msgid "<p>Enter the <b>Port Name</b> for this interface (case-sensitive).</p>" msgstr "<p>Enter the <b>Port Name</b> for this interface (case-sensitive).</p>" #. S/390 dialog help: QETH Options -#: src/include/network/lan/hardware.rb:972 +#: src/include/network/lan/hardware.rb:951 msgid "<p>Enter any additional <b>Options</b> for this interface (separated by spaces).</p>" msgstr "<p>Enter any additional <b>Options</b> for this interface (separated by spaces).</p>" -#: src/include/network/lan/hardware.rb:975 +#: src/include/network/lan/hardware.rb:954 msgid "<p>Select <b>Enable IPA Takeover</b> if IP address takeover should be enabled for this interface.</p>" msgstr "<p>Select <b>Enable IPA Takeover</b> if IP address takeover should be enabled for this interface.</p>" -#: src/include/network/lan/hardware.rb:978 +#: src/include/network/lan/hardware.rb:957 msgid "<p>Select <b>Enable Layer 2 Support</b> if this card has been configured with layer 2 support.</p>" msgstr "<p>Select <b>Enable Layer 2 Support</b> if this card has been configured with layer 2 support.</p>" -#: src/include/network/lan/hardware.rb:981 +#: src/include/network/lan/hardware.rb:960 msgid "<p>Enter the <b>Layer 2 MAC Address</b> if this card has been configured with layer 2 support.</p>" msgstr "<p>Enter the <b>Layer 2 MAC Address</b> if this card has been configured with layer 2 support.</p>" #. TextEntry label -#: src/include/network/lan/hardware.rb:1005 +#: src/include/network/lan/hardware.rb:984 msgid "&Port Number" msgstr "&Port Number" #. TextEntry label -#: src/include/network/lan/hardware.rb:1013 +#: src/include/network/lan/hardware.rb:992 msgid "&LANCMD Time-Out" msgstr "&LANCMD Time-Out" #. S/390 dialog help: LCS -#: src/include/network/lan/hardware.rb:1038 +#: src/include/network/lan/hardware.rb:1017 msgid "<p>Choose the <b>Port Number</b> for this interface.</p>" msgstr "<p>Choose the <b>Port Number</b> for this interface.</p>" -#: src/include/network/lan/hardware.rb:1039 +#: src/include/network/lan/hardware.rb:1018 msgid "<p>Specify the <b>LANCMD Time-Out</b> for this interface.</p>" msgstr "<p>Specify the <b>LANCMD Time-Out</b> for this interface.</p>" #. ComboBox item: CTC device protocol -#: src/include/network/lan/hardware.rb:1044 +#: src/include/network/lan/hardware.rb:1023 msgid "Compatibility Mode" msgstr "Compatibility Mode" #. ComboBox item: CTC device protocol -#: src/include/network/lan/hardware.rb:1046 +#: src/include/network/lan/hardware.rb:1025 msgid "Extended Mode" msgstr "Extended Mode" #. ComboBox item: CTC device protocol -#: src/include/network/lan/hardware.rb:1048 +#: src/include/network/lan/hardware.rb:1027 msgid "CTC-Based tty (Linux to Linux Connections)" msgstr "CTC-Based tty (Linux to Linux Connections)" #. ComboBox item: CTC device protocol -#: src/include/network/lan/hardware.rb:1050 +#: src/include/network/lan/hardware.rb:1029 msgid "Compatibility Mode with OS/390 and z/OS" msgstr "Compatibility Mode with OS/390 and z/OS" #. TextEntry label -#: src/include/network/lan/hardware.rb:1069 +#: src/include/network/lan/hardware.rb:1048 msgid "&Protocol" msgstr "&Protocol" #. S/390 dialog help: CTC -#: src/include/network/lan/hardware.rb:1092 +#: src/include/network/lan/hardware.rb:1071 msgid "<p>Choose the <b>Protocol</b> for this interface.</p>" msgstr "<p>Choose the <b>Protocol</b> for this interface.</p>" #. TextEntry label, #42789 -#: src/include/network/lan/hardware.rb:1109 +#: src/include/network/lan/hardware.rb:1088 msgid "&Peer Name" msgstr "&Peer Name" #. S/390 dialog help: IUCV, #42789 -#: src/include/network/lan/hardware.rb:1120 +#: src/include/network/lan/hardware.rb:1099 msgid "" "<p>Enter the name of the IUCV peer,\n" "for example, the z/VM user name with which to connect (case-sensitive).</p>\n" @@ -2199,7 +2172,7 @@ "for example, the z/VM user name with which to connect (case-sensitive).</p>\n" #. #176330, must be static -#: src/include/network/lan/hardware.rb:1244 +#: src/include/network/lan/hardware.rb:1220 #, fuzzy msgid "" "An error occurred while creating device.\n" @@ -2208,12 +2181,12 @@ #. Manual network card configuration dialog #. @return dialog result -#: src/include/network/lan/hardware.rb:1266 +#: src/include/network/lan/hardware.rb:1242 msgid "Hardware Dialog" msgstr "Hardware Dialogue" #. Network cards read dialog help 1/2 -#: src/include/network/lan/help.rb:32 +#: src/include/network/lan/help.rb:31 msgid "" "<p><b><big>Initializing Network Card\n" "Configuration</big></b><br>Please wait...<br></p>\n" @@ -2222,7 +2195,7 @@ "Configuration</big></b><br>Please wait...<br></p>\n" #. Network cards read dialog help 2/2 -#: src/include/network/lan/help.rb:36 +#: src/include/network/lan/help.rb:35 msgid "" "<p><b><big>Aborting the Initialization:</big></b><br>\n" "Safely abort the configuration utility by pressing <B>Abort</B> now.</p>\n" @@ -2231,7 +2204,7 @@ "Safely abort the configuration utility by pressing <B>Abort</B> now.</p>\n" #. Network cards write dialog help 1/2 -#: src/include/network/lan/help.rb:41 +#: src/include/network/lan/help.rb:39 msgid "" "<p><b><big>Saving Network Card\n" "Configuration</big></b><br>Please wait...<br></p>\n" @@ -2240,7 +2213,7 @@ "Configuration</big></b><br>Please wait...<br></p>\n" #. Network cards write dialog help 2/2 -#: src/include/network/lan/help.rb:45 +#: src/include/network/lan/help.rb:43 msgid "" "<p><b><big>Aborting Saving:</big></b><br>\n" "Abort saving by pressing <b>Abort</b>.</p>\n" @@ -2249,8 +2222,8 @@ "Abort saving by pressing <b>Abort</b>.</p>\n" #. Network setup method help -#. NetworkManager and ifup are programs -#: src/include/network/lan/help.rb:51 +#. NetworkManager and wicked are programs +#: src/include/network/lan/help.rb:48 #, fuzzy msgid "" "<p><b><big>Network Setup Method</big></b></p>\n" @@ -2263,9 +2236,7 @@ "manage connections for all interfaces. It is well-suited\n" "to switching among wired and multiple wireless networks.</p>\n" -#. Network setup method help -#. NetworkManager and wicked are programs -#: src/include/network/lan/help.rb:59 +#: src/include/network/lan/help.rb:54 #, fuzzy msgid "" "<p>Use <b>wicked</b> if you do not run a desktop environment\n" @@ -2275,8 +2246,17 @@ "if you do not run a desktop environment (GNOME or KDE)\n" "or need to use multiple interfaces at once.</p>\n" -#: src/include/network/lan/help.rb:63 +#. For systems not including NetworkManager by default (bnc#892678) +#: src/include/network/lan/help.rb:59 msgid "" +"<p><b>NetworkManager</b> is not part of every base\n" +"installation repository. For example, to enable it on SUSE\n" +"Linux Enterprise Server add the Workstation Extension\n" +"repository and install the 'NetworkManager' package.</p>\n" +msgstr "" + +#: src/include/network/lan/help.rb:66 +msgid "" "<p><b><big>Network Card Overview</big></b><br>\n" "Obtain an overview of installed network cards. Additionally,\n" "edit their configuration.<br></p>\n" @@ -2285,7 +2265,7 @@ "Obtain an overview of installed network cards. Additionally,\n" "edit their configuration.<br></p>\n" -#: src/include/network/lan/help.rb:68 +#: src/include/network/lan/help.rb:71 msgid "" "<p><b><big>Adding a Network Card:</big></b><br>\n" "Press <b>Add</b> to configure a new network card manually.</p>\n" @@ -2293,7 +2273,7 @@ "<p><b><big>Adding a Network Card:</big></b><br>\n" "Press <b>Add</b> to configure a new network card manually.</p>\n" -#: src/include/network/lan/help.rb:71 +#: src/include/network/lan/help.rb:74 #, fuzzy msgid "" "<p><b><big>Configuring or Deleting:</big></b><br>\n" @@ -2305,7 +2285,7 @@ "Then press <b>Edit</b> or <b>Delete</b> as desired.</p>\n" #. IPv6 help -#: src/include/network/lan/help.rb:78 +#: src/include/network/lan/help.rb:81 #, fuzzy msgid "" "<p><b><big>IPv6 Protocol Settings</big></b></p>\n" @@ -2322,12 +2302,12 @@ "module for ipv6). When ipv6 protocol is not used on your network, response \n" "time can be faster." -#: src/include/network/lan/help.rb:86 +#: src/include/network/lan/help.rb:89 msgid "<p>All changes will be applied after reboot.</p>" msgstr "<p>All changes will be applied after reboot.</p>" #. Routing dialog help 1/2 -#: src/include/network/lan/help.rb:89 +#: src/include/network/lan/help.rb:92 msgid "" "<p>The routing can be set up in this dialog.\n" "The <b>Default Gateway</b> matches every possible destination, but poorly. \n" @@ -2341,7 +2321,7 @@ "used instead of the default route. The idea of the default route is simply\n" "to enable you to say \"and everything else should go here.\"</p>\n" -#: src/include/network/lan/help.rb:96 +#: src/include/network/lan/help.rb:99 msgid "" "<p>For each route, enter destination network IP address, gateway address,\n" "and netmask. To omit any of these values, use a dash sign \"-\". Select\n" @@ -2349,13 +2329,13 @@ msgstr "" #. Routing dialog help 2/2 -#: src/include/network/lan/help.rb:102 +#: src/include/network/lan/help.rb:105 msgid "" "<p>Enable <b>IPv4 Forwarding</b> (forwarding packets from external networks\n" "to the internal one) if this system is a router.\n" msgstr "" -#: src/include/network/lan/help.rb:106 +#: src/include/network/lan/help.rb:109 msgid "" "<p>Enable <b>IPv6 Forwarding</b> (forwarding packets from external networks\n" "to the internal one) if this system is a router.\n" @@ -2363,14 +2343,14 @@ "autoconfiguration (SLAAC)." msgstr "" -#: src/include/network/lan/help.rb:112 +#: src/include/network/lan/help.rb:115 msgid "" "<p><b>Important:</b> if the firewall is enabled, allowing forwarding alone is not enough. \n" "You should enable masquerading and/or set at least one redirect rule in the\n" "firewall configuration. Use the YaST firewall module.</p>\n" msgstr "" -#: src/include/network/lan/help.rb:117 +#: src/include/network/lan/help.rb:121 #, fuzzy msgid "" "<p>If you are using DHCP to get an IP address, check whether you get\n" @@ -2388,7 +2368,7 @@ "the hostname at runtime may confuse the graphical desktop.\n" "</p> " -#: src/include/network/lan/help.rb:124 +#: src/include/network/lan/help.rb:129 msgid "" "<p><b>Assign Hostname to Loopback IP</b> associates your hostname with \n" "the IP address <tt>127.0.0.2</tt> (loopback) in <tt>/etc/hosts</tt>. This is a \n" @@ -2397,7 +2377,7 @@ "if this computer provides some network services.</p>\n" msgstr "" -#: src/include/network/lan/help.rb:131 +#: src/include/network/lan/help.rb:137 msgid "" "<p>Enter the name servers and domain search list for resolving \n" "hostnames. Usually they can be obtained by DHCP.</p>\n" @@ -2406,7 +2386,7 @@ "hostnames. Usually they can be obtained by DHCP.</p>\n" #. resolver dialog help -#: src/include/network/lan/help.rb:135 +#: src/include/network/lan/help.rb:141 msgid "" "<p>A name server is a computer that translates hostnames into\n" "IP addresses. This value must be entered as an <b>IP address</b>\n" @@ -2417,7 +2397,7 @@ "(for example, 192.168.0.42), not as a hostname.</p>\n" #. resolver dialog help -#: src/include/network/lan/help.rb:141 +#: src/include/network/lan/help.rb:147 msgid "" "<p>Search domain is the domain name where hostname searching starts.\n" "The primary search domain is usually the same as the domain name of\n" @@ -2429,7 +2409,7 @@ "your computer (for example, suse.de). There may be additional search domains\n" "(such as suse.com). Separate the domains with commas or white space.</p>\n" -#: src/include/network/lan/help.rb:147 +#: src/include/network/lan/help.rb:154 msgid "" "<p>Enter the short name for this computer (e.g. <i>mymachine</i>) and the DNS domain\n" "(e.g. <i>example.com</i>) that it belongs to. The domain is especially important if this \n" @@ -2437,7 +2417,7 @@ "command.</p>" msgstr "" -#: src/include/network/lan/help.rb:153 +#: src/include/network/lan/help.rb:161 msgid "" "<p>Select the way how the DNS configuration will be modified (name servers,\n" "search list, the content of <i>/etc/resolv.conf</i>). Normally, it is handled\n" @@ -2447,7 +2427,7 @@ "configurations.</p>\n" msgstr "" -#: src/include/network/lan/help.rb:161 +#: src/include/network/lan/help.rb:169 msgid "" "<p>By choosing <b>Only Manually</b>, <i>netconfig</i> will no longer be\n" "allowed to modify <i>/etc/resolv.conf</i>. You can however edit the file\n" @@ -2461,7 +2441,7 @@ #. Address dialog help 1-6/8: dynamic address preferred #. Address dialog help 1/8 -#: src/include/network/lan/help.rb:174 +#: src/include/network/lan/help.rb:181 #, fuzzy msgid "" "<p><b><big>Address Setup</big></b></p>\n" @@ -2472,12 +2452,12 @@ "<p>Select <b>No Address Setup</b> if you don't want any IP address for this device.\n" "This is particularly useful for bonding ethernet devices.</p>" -#: src/include/network/lan/help.rb:179 +#: src/include/network/lan/help.rb:186 msgid "<p>Check <b>iBFT</b> if you want to keep the network configured in your BIOS.</p>\n" msgstr "" #. Address dialog help 2/8 -#: src/include/network/lan/help.rb:183 +#: src/include/network/lan/help.rb:190 #, fuzzy msgid "" "<p>Select <b>Dynamic Address</b> if you do not have a static IP address \n" @@ -2487,7 +2467,7 @@ "assigned by the system administrator or your cable or DSL provider.</p>" #. Address dialog help 3/8 -#: src/include/network/lan/help.rb:187 +#: src/include/network/lan/help.rb:194 #, fuzzy msgid "" "<p>Choose one of the dynamic address assignment methods. Select <b>DHCP</b>\n" @@ -2499,7 +2479,7 @@ "obtained automatically from the server.<p>" #. Address dialog help 4/8 -#: src/include/network/lan/help.rb:193 +#: src/include/network/lan/help.rb:200 #, fuzzy msgid "" "<p>To search for an IP address and assign it statically, select \n" @@ -2511,7 +2491,7 @@ "</b>. Otherwise, network addresses must be assigned <b>statically</b>.</p>" #. Address dialog help 5/8 -#: src/include/network/lan/help.rb:199 +#: src/include/network/lan/help.rb:207 #, fuzzy msgid "" "<p>Enter the <b>IP Address</b> (for example: <tt>192.168.100.99</tt>) for your computer, and the \n" @@ -2523,7 +2503,7 @@ "of your peer.</p>" #. Address dialog help 6/8 -#: src/include/network/lan/help.rb:205 +#: src/include/network/lan/help.rb:214 #, fuzzy msgid "" "<p>For <b>Static Address Setup</b> enter the static IP address for your computer (for example: <tt>192.168.100.99</tt>) and\n" @@ -2535,7 +2515,7 @@ "fully qualified hostname for this IP address. It will be written to <i>/etc/hosts</i>.</p>" #. Address dialog help 8/8 -#: src/include/network/lan/help.rb:211 +#: src/include/network/lan/help.rb:220 msgid "" "<p>Contact your <b>network administrator</b> for more information about\n" "the network configuration.</p>" @@ -2543,7 +2523,7 @@ "<p>Contact your <b>network administrator</b> for more information about\n" "the network configuration.</p>" -#: src/include/network/lan/help.rb:214 +#: src/include/network/lan/help.rb:224 msgid "" "<p>DHCP configuration is not recommended for this product.\n" "Components of this product might not work with DHCP.</p>" @@ -2551,7 +2531,7 @@ "<p>DHCP configuration is not recommended for this product.\n" "Components of this product might not work with DHCP.</p>" -#: src/include/network/lan/help.rb:217 +#: src/include/network/lan/help.rb:228 msgid "" "<p><b><big>Firewall Zone</big></b></p>\n" "<p>Select the firewall zone to put the interface into. If you\n" @@ -2569,11 +2549,11 @@ "interface. If you do not select a zone and no others exist, \n" "the firewall will be disabled.</p>" -#: src/include/network/lan/help.rb:226 +#: src/include/network/lan/help.rb:238 msgid "<p><b>Mandatory Interface</b> specifies whether the network service reports failure if the interface fails to start at boot time.</p>" msgstr "<p><b>Mandatory Interface</b> specifies whether the network service reports failure if the interface fails to start at boot time.</p>" -#: src/include/network/lan/help.rb:229 +#: src/include/network/lan/help.rb:242 #, fuzzy msgid "" "<p><b><big>Maximum Transfer Unit</big></b></p>\n" @@ -2590,7 +2570,7 @@ "especially on slow dial-up connections. Select one of the recommended values\n" "or define your own one.</p>" -#: src/include/network/lan/help.rb:237 +#: src/include/network/lan/help.rb:251 #, fuzzy msgid "" "<p>Select the slave devices for the bond device.\n" @@ -2598,13 +2578,13 @@ msgstr "<p>Select the slave devices for the bond device. Only the devices whose Device Activation is set to Never and have No Address Setup are available.</p>" #. DHCP dialog help 1/7 -#: src/include/network/lan/help.rb:242 +#: src/include/network/lan/help.rb:255 #, fuzzy msgid "<p><b><big>DHCP Client Options</big></b></p>" msgstr "<p><b><big>DHCP client options</big></b></p>" #. DHCP dialog help 2/7 -#: src/include/network/lan/help.rb:244 +#: src/include/network/lan/help.rb:257 msgid "" "<p>The <b>DHCP Client Identifier</b>, if left empty, defaults to\n" "the hardware address of the network interface. It must be different for each\n" @@ -2619,7 +2599,7 @@ "network interface and thus the same hardware address.</p>" #. DHCP dialog help 3/7 -#: src/include/network/lan/help.rb:252 +#: src/include/network/lan/help.rb:265 #, fuzzy msgid "" "<p>The <b>Hostname to Send</b> specifies a string used for the\n" @@ -2642,7 +2622,7 @@ "Leave empty not to send a hostname.</p>" #. Aliases dialog help 1/4 -#: src/include/network/lan/help.rb:264 +#: src/include/network/lan/help.rb:276 #, fuzzy msgid "" "<p><b><big>Additional Addresses</big></b></p>\n" @@ -2652,7 +2632,7 @@ "<p>Configure additional addresses of an interface (its aliases) in this table.</p>" #. Aliases dialog help 2/4 -#: src/include/network/lan/help.rb:268 +#: src/include/network/lan/help.rb:280 #, fuzzy #| msgid "" #| "<p>Enter an <b>Alias Name</b>, an <b>IP Address</b>, and\n" @@ -2665,22 +2645,24 @@ "the <b>Netmask</b>.</p>" #. Aliases dialog help 3/4 -#: src/include/network/lan/help.rb:272 +#: src/include/network/lan/help.rb:284 msgid "" "<p><b>IPv4 Address Label</b>, formerly known as Alias Name, is optional and legacy. The total\n" -" length of interface name (inclusive of the colon and label) is\n" -" limited to 15 characters and the obsolete ifconfig utility truncates it after 9 characters.</p>" +"length of interface name (inclusive of the colon and label) is\n" +"limited to 15 characters. The obsolete ifconfig utility truncates it after 9 characters.</p>" msgstr "" #. Aliases dialog help 3/4, #83766 -#: src/include/network/lan/help.rb:278 -msgid "<p>Do not include the interface name in the alias name. For example, enter <b>foo</b> instead of <b>eth0:foo</b>.</p>" +#: src/include/network/lan/help.rb:290 +#, fuzzy +#| msgid "<p>Do not include the interface name in the alias name. For example, enter <b>foo</b> instead of <b>eth0:foo</b>.</p>" +msgid "<p>Do not include the interface name in the label. For example, enter <b>foo</b> instead of <b>eth0:foo</b>.</p>" msgstr "<p>Do not include the interface name in the alias name. For example, enter <b>foo</b> instead of <b>eth0:foo</b>.</p>" #. shared between WirelessDialog and WirelessKeyPopup #. this is suited to the button-switched key typing #. Translators: dialog help -#: src/include/network/lan/help.rb:284 +#: src/include/network/lan/help.rb:297 #, fuzzy msgid "" "<p>Choose between three <b>Key Input Types</b> for your key.\n" @@ -2710,7 +2692,7 @@ "</p> " #. Wireless dialog help -#: src/include/network/lan/help.rb:299 +#: src/include/network/lan/help.rb:312 msgid "" "<p>Here, set the most important settings\n" "for wireless networking.</p>" @@ -2718,8 +2700,7 @@ "<p>Here, set the most important settings\n" "for wireless networking.</p>" -#. Wireless dialog help -#: src/include/network/lan/help.rb:303 +#: src/include/network/lan/help.rb:315 msgid "" "<p>The <b>Operating Mode</b> depends on the network topology. The mode\n" "can be <b>Ad-Hoc</b> (peer-to-peer network without an access point),\n" @@ -2733,8 +2714,7 @@ "called <i>Infrastructure Mode</i>), or <b>Master</b> (the network card\n" "acts as an access point).</p>\n" -#. Wireless dialog help -#: src/include/network/lan/help.rb:311 +#: src/include/network/lan/help.rb:322 msgid "" "<p>Set the <b>Network Name (ESSID)</b> used to identify\n" "cells that are part of the same virtual network. All stations in a\n" @@ -2752,8 +2732,7 @@ "case, your WLAN card associates with the access point with the best\n" "signal strength.</p>\n" -#. Wireless dialog help -#: src/include/network/lan/help.rb:321 +#: src/include/network/lan/help.rb:331 #, fuzzy msgid "" "<p>In some networks, you need to set an <b>Authentication Mode</b>.\n" @@ -2790,8 +2769,7 @@ "authentication mode. This is only possible in the operation mode\n" "<b>Managed</b>.</p>\n" -#. Wireless dialog help -#: src/include/network/lan/help.rb:340 +#: src/include/network/lan/help.rb:349 msgid "" "<p>To use WEP, enter the\n" "WEP encryption key to use. It can have a key\n" @@ -2806,7 +2784,7 @@ "are dynamically generated, so you only need to enter 40 to 232 bits.</p>\n" #. Wireless dialog help -#: src/include/network/lan/help.rb:348 +#: src/include/network/lan/help.rb:357 msgid "" "<p>To use WPA-PSK (sometimes referred to as WPA Home),\n" "enter the preshared key. This\n" @@ -2822,8 +2800,7 @@ "dictionary attacks are still possible. Do not use a word that is\n" "easy to guess as the passphrase.</p>\n" -#. Wireless dialog help -#: src/include/network/lan/help.rb:357 +#: src/include/network/lan/help.rb:365 msgid "" "<p>To use WPA-EAP (sometimes referred to as WPA Enterprise),\n" "enter some additional parameters in the next dialog.</p>\n" @@ -2831,8 +2808,7 @@ "<p>To use WPA-EAP (sometimes referred to as WPA Enterprise),\n" "enter some additional parameters in the next dialogue.</p>\n" -#. Wireless dialog help -#: src/include/network/lan/help.rb:361 +#: src/include/network/lan/help.rb:368 msgid "" "<p>These values will be written to the interface configuration file\n" "'ifcfg-*' in '/etc/sysconfig/network'. If you need additional settings,\n" @@ -2845,31 +2821,31 @@ "available options.</p>" #. TextEntry label -#: src/include/network/lan/virtual.rb:214 +#: src/include/network/lan/virtual.rb:209 #, fuzzy #| msgid "IP Address" msgid "IPv4 &Address Label" msgstr "IP Address" #. TextEntry label -#: src/include/network/lan/virtual.rb:222 +#: src/include/network/lan/virtual.rb:217 msgid "Net&mask" msgstr "Net&mask" #. Popup::Error text -#: src/include/network/lan/virtual.rb:254 +#: src/include/network/lan/virtual.rb:247 msgid "Label is too long." msgstr "" #. Popup::Error text #. Popup::Error text -#: src/include/network/lan/virtual.rb:264 -#: src/include/network/services/host.rb:401 +#: src/include/network/lan/virtual.rb:257 +#: src/include/network/services/host.rb:386 msgid "The IP address is invalid." msgstr "The IP address is invalid." #. Popup::Error text -#: src/include/network/lan/virtual.rb:273 +#: src/include/network/lan/virtual.rb:266 msgid "The subnet mask is invalid." msgstr "The subnet mask is invalid." @@ -2896,26 +2872,26 @@ msgstr "&Hexadecimal" #. combo box label -#: src/include/network/lan/wireless.rb:76 +#: src/include/network/lan/wireless.rb:75 msgid "EAP &Mode" msgstr "EAP &Mode" #. combo box item, one of WPA EAP modes -#: src/include/network/lan/wireless.rb:80 +#: src/include/network/lan/wireless.rb:79 msgid "TTLS" msgstr "TTLS" #. combo box item, one of WPA EAP modes -#: src/include/network/lan/wireless.rb:82 +#: src/include/network/lan/wireless.rb:81 msgid "PEAP" msgstr "PEAP" #. combo box item, one of WPA EAP modes -#: src/include/network/lan/wireless.rb:84 +#: src/include/network/lan/wireless.rb:83 msgid "TLS" msgstr "TLS" -#: src/include/network/lan/wireless.rb:86 +#: src/include/network/lan/wireless.rb:85 msgid "" "<p>WPA-EAP uses a RADIUS server to authenticate users. There\n" "are different methods in EAP to connect to the server and\n" @@ -2926,11 +2902,11 @@ "perform the authentication, namely TLS, TTLS, and PEAP.</p>\n" #. text entry label -#: src/include/network/lan/wireless.rb:99 +#: src/include/network/lan/wireless.rb:98 msgid "&Identity" msgstr "&Identity" -#: src/include/network/lan/wireless.rb:101 +#: src/include/network/lan/wireless.rb:100 msgid "" "<p>For TTLS and PEAP, enter your <b>Identity</b>\n" "and <b>Password</b> as configured on the server.\n" @@ -2943,22 +2919,22 @@ "<b>Anonymous Identity</b>, you may set it here. This is usually not needed.</p>\n" #. text entry label -#: src/include/network/lan/wireless.rb:111 +#: src/include/network/lan/wireless.rb:110 msgid "&Anonymous Identity" msgstr "&Anonymous Identity" #. or password? #. text entry label -#: src/include/network/lan/wireless.rb:119 +#: src/include/network/lan/wireless.rb:118 msgid "&Password" msgstr "&Password" #. text entry label -#: src/include/network/lan/wireless.rb:126 +#: src/include/network/lan/wireless.rb:125 msgid "&Client Certificate" msgstr "&Client Certificate" -#: src/include/network/lan/wireless.rb:128 +#: src/include/network/lan/wireless.rb:127 msgid "" "<p>TLS uses a <b>Client Certificate</b> instead of a username and\n" "password combination for authentication. It uses a public and private key pair\n" @@ -2973,23 +2949,23 @@ "the appropriate <b>Client Key Password</b> for that file.</p>\n" #. text entry label -#: src/include/network/lan/wireless.rb:144 +#: src/include/network/lan/wireless.rb:143 msgid "Client &Key" msgstr "Client &Key" #. or password? #. text entry label -#: src/include/network/lan/wireless.rb:157 +#: src/include/network/lan/wireless.rb:156 msgid "Client Key Pass&word" msgstr "Client Key Pass&word" #. text entry label #. aka certificate of the CA (certification authority) -#: src/include/network/lan/wireless.rb:167 +#: src/include/network/lan/wireless.rb:166 msgid "&Server Certificate" msgstr "&Server Certificate" -#: src/include/network/lan/wireless.rb:171 +#: src/include/network/lan/wireless.rb:170 msgid "" "<p>To increase security, it is recommended to configure\n" "a <b>Server Certificate</b>. It is used\n" @@ -3000,11 +2976,11 @@ "to validate the server's authenticity.</p>\n" #. push button label -#: src/include/network/lan/wireless.rb:212 +#: src/include/network/lan/wireless.rb:211 msgid "&Details" msgstr "&Details" -#: src/include/network/lan/wireless.rb:221 +#: src/include/network/lan/wireless.rb:220 msgid "" "If you do not know your ID and password or you do not have\n" "any certificate or key files, contact your system administrator.\n" @@ -3013,11 +2989,11 @@ "any certificate or key files, contact your system administrator.\n" #. combo box label -#: src/include/network/lan/wireless.rb:239 +#: src/include/network/lan/wireless.rb:238 msgid "&Authentication Method" msgstr "&Authentication Method" -#: src/include/network/lan/wireless.rb:240 +#: src/include/network/lan/wireless.rb:239 msgid "" "<p>Here you can configure the inner authentication (also known as phase 2)\n" "method. By default, all methods are allowed. If you want to restrict the\n" @@ -3030,11 +3006,11 @@ "authentication, choose your inner authentication method.</p>\n" #. radio button group label -#: src/include/network/lan/wireless.rb:250 +#: src/include/network/lan/wireless.rb:249 msgid "&PEAP Version" msgstr "&PEAP Version" -#: src/include/network/lan/wireless.rb:251 +#: src/include/network/lan/wireless.rb:250 msgid "" "<p>If you are using PEAP, you can also force the use of a specific PEAP\n" "implementation (version 0 or 1). Normally this should not be necessary.</p>\n" @@ -3043,134 +3019,134 @@ "implementation (version 0 or 1). Normally this should not be necessary.</p>\n" #. radio button: any version of PEAP -#: src/include/network/lan/wireless.rb:256 +#: src/include/network/lan/wireless.rb:255 msgid "&Any" msgstr "&Any" #. Wireless authentication modes: #. ComboBox item -#: src/include/network/lan/wireless.rb:359 +#: src/include/network/lan/wireless.rb:357 msgid "No Encryption" msgstr "No Encryption" #. ComboBox item -#: src/include/network/lan/wireless.rb:363 +#: src/include/network/lan/wireless.rb:361 msgid "WEP - Open" msgstr "WEP - Open" #. ComboBox item -#: src/include/network/lan/wireless.rb:365 +#: src/include/network/lan/wireless.rb:363 msgid "WEP - Shared Key" msgstr "WEP - Shared Key" #. ComboBox item #. Ask me what it means, I don't know yet -#: src/include/network/lan/wireless.rb:368 +#: src/include/network/lan/wireless.rb:366 msgid "WPA-PSK (WPA version 1 or 2)" msgstr "" #. ComboBox item -#: src/include/network/lan/wireless.rb:372 +#: src/include/network/lan/wireless.rb:370 msgid "WPA-EAP (WPA version 1 or 2)" msgstr "" #. Wireless dialog caption -#: src/include/network/lan/wireless.rb:396 +#: src/include/network/lan/wireless.rb:394 msgid "Wireless Network Card Configuration" msgstr "Wireless Network Card Configuration" #. Frame label -#: src/include/network/lan/wireless.rb:426 +#: src/include/network/lan/wireless.rb:424 msgid "Wireless Device Settings" msgstr "Wireless Device Settings" #. ComboBox label -#: src/include/network/lan/wireless.rb:435 +#: src/include/network/lan/wireless.rb:433 msgid "O&perating Mode" msgstr "O&perating Mode" #. ComboBox item -#: src/include/network/lan/wireless.rb:438 +#: src/include/network/lan/wireless.rb:436 msgid "Ad-Hoc" msgstr "Ad-Hoc" #. ComboBox item -#: src/include/network/lan/wireless.rb:442 +#: src/include/network/lan/wireless.rb:440 msgid "Master" msgstr "Master" #. Text entry label -#: src/include/network/lan/wireless.rb:451 +#: src/include/network/lan/wireless.rb:449 msgid "Ne&twork Name (ESSID)" msgstr "Ne&twork Name (ESSID)" -#: src/include/network/lan/wireless.rb:454 +#: src/include/network/lan/wireless.rb:452 #, fuzzy msgid "Scan Network" msgstr "Local Network" #. ComboBox label -#: src/include/network/lan/wireless.rb:461 +#: src/include/network/lan/wireless.rb:459 msgid "&Authentication Mode" msgstr "&Authentication Mode" #. Text entry label -#: src/include/network/lan/wireless.rb:468 +#: src/include/network/lan/wireless.rb:466 msgid "&Encryption Key" msgstr "&Encryption Key" #. PushButton label -#: src/include/network/lan/wireless.rb:477 +#: src/include/network/lan/wireless.rb:475 msgid "E&xpert Settings" msgstr "E&xpert Settings" #. PushButton label, keys for WEP encryption -#: src/include/network/lan/wireless.rb:480 +#: src/include/network/lan/wireless.rb:478 msgid "&WEP Keys" msgstr "&WEP Keys" #. Popup text -#: src/include/network/lan/wireless.rb:562 +#: src/include/network/lan/wireless.rb:560 msgid "WPA authentication mode is only possible in managed operating mode." msgstr "WPA authentication mode is only possible in managed operating mode." #. Popup text #. modes: combination of operation and authentication -#: src/include/network/lan/wireless.rb:573 +#: src/include/network/lan/wireless.rb:571 msgid "Specify the network name for this mode." msgstr "Specify the network name for this mode." #. Popup text -#: src/include/network/lan/wireless.rb:580 +#: src/include/network/lan/wireless.rb:578 msgid "The network name must be shorter than 32 characters." msgstr "The network name must be shorter than 32 characters." #. Error popup -#: src/include/network/lan/wireless.rb:600 +#: src/include/network/lan/wireless.rb:598 msgid "The passphrase must have between 8 and 63 characters (inclusively)." msgstr "The passphrase must have between 8 and 63 characters (inclusively)." #. Error popup -#: src/include/network/lan/wireless.rb:611 +#: src/include/network/lan/wireless.rb:609 msgid "The key must have %1 hexadecimal digits." msgstr "The key must have %1 hexadecimal digits." #. Popup text #. Popup text -#: src/include/network/lan/wireless.rb:623 -#: src/include/network/lan/wireless.rb:963 +#: src/include/network/lan/wireless.rb:621 +#: src/include/network/lan/wireless.rb:939 msgid "The encryption key is invalid." msgstr "The encryption key is invalid." #. error #. Popup text -#: src/include/network/lan/wireless.rb:631 +#: src/include/network/lan/wireless.rb:629 msgid "The encryption key must be specified for this authentication mode." msgstr "The encryption key must be specified for this authentication mode." #. warning only #. Popup text -#: src/include/network/lan/wireless.rb:638 +#: src/include/network/lan/wireless.rb:636 msgid "" "Using no encryption is a security risk.\n" "Really continue?\n" @@ -3180,13 +3156,13 @@ #. Wireless expert dialog caption #. Frame label -#: src/include/network/lan/wireless.rb:696 -#: src/include/network/lan/wireless.rb:799 +#: src/include/network/lan/wireless.rb:694 +#: src/include/network/lan/wireless.rb:775 msgid "Wireless Expert Settings" msgstr "Wireless Expert Settings" #. Wireless expert dialog help 1/5 -#: src/include/network/lan/wireless.rb:699 +#: src/include/network/lan/wireless.rb:697 msgid "" "<p>Here, set additional configuration parameters\n" "(rarely needed).</p>" @@ -3195,7 +3171,7 @@ "(rarely needed).</p>" #. Wireless expert dialog help 2/5 -#: src/include/network/lan/wireless.rb:703 +#: src/include/network/lan/wireless.rb:701 msgid "" "<p>To use your wireless LAN card in master or ad-hoc mode,\n" "set the <b>Channel</b> the card should use here. This is not needed\n" @@ -3208,7 +3184,7 @@ "points in that case.</p>\n" #. Wireless expert dialog help 3/5 -#: src/include/network/lan/wireless.rb:710 +#: src/include/network/lan/wireless.rb:708 msgid "" "<p>In some rare cases, you may want to set a transmission\n" "<b>Bit Rate</b> explicitly. The default is to go as fast as possible.</p>" @@ -3217,7 +3193,7 @@ "<b>Bit Rate</b> explicitly. The default is to go as fast as possible.</p>" #. Wireless expert dialog help 4/5 -#: src/include/network/lan/wireless.rb:714 +#: src/include/network/lan/wireless.rb:712 msgid "" "<p>In an environment with multiple <b>Access Points</b>, you may want to\n" "define the one to which to connect by entering its MAC address.</p>" @@ -3226,7 +3202,7 @@ "define the one to which to connect by entering its MAC address.</p>" #. Wireless expert dialog help 5/5 -#: src/include/network/lan/wireless.rb:718 +#: src/include/network/lan/wireless.rb:716 msgid "" "<p><b>Use Power Management</b> enables power saving mechanisms.\n" "This is generally a good idea, especially if you are a laptop user and may\n" @@ -3236,77 +3212,61 @@ "This is generally a good idea, especially if you are a laptop user and may\n" "be disconnected from AC power.</p>\n" -#. Wireless expert dialog help 2b/5 -#: src/include/network/lan/wireless.rb:726 -msgid "" -"<p>To specify the <b>Frequency</b> instead of\n" -"the channel, select the desired value.</p>\n" -msgstr "" -"<p>To specify the <b>Frequency</b> instead of\n" -"the channel, select the desired value.</p>\n" - -#. Combobox label -#: src/include/network/lan/wireless.rb:734 -msgid "&Frequency" -msgstr "&Frequency" - #. Combobox item #. Combobox item -#. Combobox item -#: src/include/network/lan/wireless.rb:737 -#: src/include/network/lan/wireless.rb:768 -#: src/include/network/lan/wireless.rb:790 +#: src/include/network/lan/wireless.rb:744 +#: src/include/network/lan/wireless.rb:766 msgid "Automatic" msgstr "Automatic" #. Combobox label -#: src/include/network/lan/wireless.rb:805 +#: src/include/network/lan/wireless.rb:781 msgid "&Channel" msgstr "&Channel" #. Combobox label -#: src/include/network/lan/wireless.rb:808 +#: src/include/network/lan/wireless.rb:784 msgid "B&it Rate" msgstr "B&it Rate" #. Text entry label -#: src/include/network/lan/wireless.rb:814 +#: src/include/network/lan/wireless.rb:790 msgid "&Access Point" msgstr "&Access Point" #. CheckBox label -#: src/include/network/lan/wireless.rb:822 +#: src/include/network/lan/wireless.rb:798 msgid "Use &Power Management" msgstr "Use &Power Management" -#: src/include/network/lan/wireless.rb:831 +#: src/include/network/lan/wireless.rb:807 #, fuzzy #| msgid "EAP &Mode" msgid "AP ScanMode" msgstr "EAP &Mode" #. Translators: popup dialog heading -#: src/include/network/lan/wireless.rb:921 +#: src/include/network/lan/wireless.rb:897 msgid "Enter Encryption Key" msgstr "Enter Encryption Key" #. Translators: text entry label -#: src/include/network/lan/wireless.rb:925 +#: src/include/network/lan/wireless.rb:901 msgid "&Key" msgstr "&Key" #. Translators: popup title -#: src/include/network/lan/wireless.rb:949 +#: src/include/network/lan/wireless.rb:925 msgid "Help" msgstr "Help" #. Wireless keys dialog caption -#: src/include/network/lan/wireless.rb:998 +#: src/include/network/lan/wireless.rb:974 msgid "Wireless Keys" msgstr "Wireless Keys" #. Wireless keys dialog help 1/3 -#: src/include/network/lan/wireless.rb:1001 +#: src/include/network/lan/wireless.rb:977 msgid "" "<p>In this dialog, define your WEP keys used\n" "to encrypt your data before it is transmitted. You can have up to four keys,\n" @@ -3321,7 +3281,7 @@ "one key.</p>" #. Wireless keys dialog help 2/3 -#: src/include/network/lan/wireless.rb:1009 +#: src/include/network/lan/wireless.rb:985 msgid "" "<p><b>Key Length</b> defines the bit length of your WEP keys.\n" "Possible are 64 and 128 bit, sometimes also referred to as 40 and 104 bit.\n" @@ -3336,50 +3296,50 @@ "value to 64.</p>" #. Frame label -#: src/include/network/lan/wireless.rb:1034 +#: src/include/network/lan/wireless.rb:1010 msgid "WEP Keys" msgstr "WEP Keys" #. ComboBox label -#: src/include/network/lan/wireless.rb:1040 +#: src/include/network/lan/wireless.rb:1016 msgid "&Key Length" msgstr "&Key Length" #. Table header label #. Abbreviation of Number -#: src/include/network/lan/wireless.rb:1048 +#: src/include/network/lan/wireless.rb:1024 msgid "No." msgstr "No." #. Table header label -#: src/include/network/lan/wireless.rb:1050 +#: src/include/network/lan/wireless.rb:1026 msgid "Key" msgstr "Key" #. Table header label -#: src/include/network/lan/wireless.rb:1052 +#: src/include/network/lan/wireless.rb:1028 msgid "Default" msgstr "Default" #. PushButton label -#: src/include/network/lan/wireless.rb:1062 +#: src/include/network/lan/wireless.rb:1038 msgid "&Set as Default" msgstr "&Set as Default" #. file browser dialog headline -#: src/include/network/lan/wireless.rb:1234 +#: src/include/network/lan/wireless.rb:1210 msgid "Choose a Certificate" msgstr "Choose a Certificate" #. validated in ValidateWpaEap -#: src/include/network/lan/wireless.rb:1281 +#: src/include/network/lan/wireless.rb:1255 msgid "" "Not using a Certificate Authority (CA) certificate can result in connections\n" "to insecure, rogue wireless networks. Continue without CA ?" msgstr "" #. error popup text -#: src/include/network/lan/wireless.rb:1310 +#: src/include/network/lan/wireless.rb:1283 msgid "" "Enter either the identity and password\n" "or the client certificate." @@ -3388,47 +3348,47 @@ "or the client certificate." #. dialog caption -#: src/include/network/lan/wireless.rb:1357 +#: src/include/network/lan/wireless.rb:1329 msgid "WPA-EAP" msgstr "WPA-EAP" #. combo box item, any of EAP authentication methods -#: src/include/network/lan/wireless.rb:1380 +#: src/include/network/lan/wireless.rb:1351 msgid "Any" msgstr "Any" #. combo box item, an EAP authentication method -#: src/include/network/lan/wireless.rb:1384 +#: src/include/network/lan/wireless.rb:1355 msgid "MD5" msgstr "MD5" #. combo box item, an EAP authentication method -#: src/include/network/lan/wireless.rb:1386 +#: src/include/network/lan/wireless.rb:1357 msgid "GTC" msgstr "GTC" #. combo box item, an EAP authentication method -#: src/include/network/lan/wireless.rb:1388 +#: src/include/network/lan/wireless.rb:1359 msgid "CHAP" msgstr "CHAP" #. combo box item, an EAP authentication method -#: src/include/network/lan/wireless.rb:1390 +#: src/include/network/lan/wireless.rb:1361 msgid "PAP" msgstr "PAP" #. combo box item, an EAP authentication method -#: src/include/network/lan/wireless.rb:1392 +#: src/include/network/lan/wireless.rb:1363 msgid "MSCHAPv1" msgstr "MSCHAPv1" #. combo box item, an EAP authentication method -#: src/include/network/lan/wireless.rb:1396 +#: src/include/network/lan/wireless.rb:1367 msgid "MSCHAPv2" msgstr "MSCHAPv2" #. dialog caption -#: src/include/network/lan/wireless.rb:1420 +#: src/include/network/lan/wireless.rb:1390 msgid "WPA-EAP Details" msgstr "WPA-EAP Details" @@ -3476,12 +3436,12 @@ msgstr "Remote Administration Settings" #. Popup text -#: src/include/network/routines.rb:155 +#: src/include/network/routines.rb:144 msgid "These packages need to be installed:" msgstr "These packages need to be installed:" #. Popup text -#: src/include/network/routines.rb:173 +#: src/include/network/routines.rb:162 msgid "" "The required packages are not installed.\n" "The configuration will be aborted.\n" @@ -3493,75 +3453,68 @@ "\n" "Try again?\n" -#. Translators: Appended after a network card name to indicate that -#. there is no carrier, no link to the network, the cable is not -#. plugged in. Preferably a short string. -#: src/include/network/routines.rb:265 -msgid "unplugged" -msgstr "unplugged" - #. Table field (Unknown device) -#: src/include/network/routines.rb:271 +#: src/include/network/routines.rb:255 msgid "Unknown" msgstr "Unknown" #. Popup headline -#: src/include/network/routines.rb:299 +#: src/include/network/routines.rb:279 msgid "Configuration Successfully Saved" msgstr "Configuration Successfully Saved" #. Popup headline -#: src/include/network/routines.rb:304 +#: src/include/network/routines.rb:284 msgid "DNS Configuration Successfully Saved" msgstr "DNS Configuration Successfully Saved" #. Popup headline -#: src/include/network/routines.rb:306 +#: src/include/network/routines.rb:286 msgid "DSL Configuration Successfully Saved" msgstr "DSL Configuration Successfully Saved" #. Popup headline -#: src/include/network/routines.rb:308 +#: src/include/network/routines.rb:288 msgid "Hosts Configuration Successfully Saved" msgstr "Hosts Configuration Successfully Saved" #. Popup headline -#: src/include/network/routines.rb:312 +#: src/include/network/routines.rb:292 msgid "ISDN Configuration Successfully Saved" msgstr "ISDN Configuration Successfully Saved" #. Popup headline -#: src/include/network/routines.rb:316 +#: src/include/network/routines.rb:296 msgid "Network Card Configuration Successfully Saved" msgstr "Network Card Configuration Successfully Saved" #. Popup headline -#: src/include/network/routines.rb:320 +#: src/include/network/routines.rb:300 msgid "Modem Configuration Successfully Saved" msgstr "Modem Configuration Successfully Saved" #. Popup headline -#: src/include/network/routines.rb:324 +#: src/include/network/routines.rb:304 msgid "Proxy Configuration Successfully Saved" msgstr "Proxy Configuration Successfully Saved" #. Popup headline -#: src/include/network/routines.rb:328 +#: src/include/network/routines.rb:308 msgid "Provider Configuration Successfully Saved" msgstr "Provider Configuration Successfully Saved" #. Popup headline -#: src/include/network/routines.rb:332 +#: src/include/network/routines.rb:312 msgid "Routing Configuration Successfully Saved" msgstr "Routing Configuration Successfully Saved" #. Popup text -#: src/include/network/routines.rb:341 +#: src/include/network/routines.rb:321 msgid "Configure mail now?" msgstr "Configure mail now?" #. Popup text -#: src/include/network/routines.rb:346 +#: src/include/network/routines.rb:326 msgid "Run configuration of %1?" msgstr "Run configuration of %1?" @@ -3571,126 +3524,126 @@ #. if listed any items, disable them, if show_popup, show warning popup #. #. returns true if items were disabled -#: src/include/network/routines.rb:1019 +#: src/include/network/routines.rb:1004 msgid "" "Network is currently handled by NetworkManager\n" "or completely disabled. YaST is unable to configure some options." msgstr "" #. Confirmation: label text (detecting hardware: xxx) -#: src/include/network/routines.rb:1078 +#: src/include/network/routines.rb:1064 msgid "Network Cards" msgstr "Network Cards" #. Confirmation: label text (detecting hardware: xxx) -#: src/include/network/routines.rb:1082 +#: src/include/network/routines.rb:1068 msgid "Modems" msgstr "Modems" #. Confirmation: label text (detecting hardware: xxx) -#: src/include/network/routines.rb:1086 +#: src/include/network/routines.rb:1072 msgid "ISDN Cards" msgstr "ISDN Cards" #. Confirmation: label text (detecting hardware: xxx) -#: src/include/network/routines.rb:1090 +#: src/include/network/routines.rb:1076 msgid "DSL Devices" msgstr "DSL Devices" -#: src/include/network/routines.rb:1095 +#: src/include/network/routines.rb:1081 msgid "All Network Devices" msgstr "All Network Devices" #. validation error popup #. Popup::Error text -#: src/include/network/services/dns.rb:93 -#: src/include/network/services/host.rb:413 +#: src/include/network/services/dns.rb:92 +#: src/include/network/services/host.rb:398 msgid "The hostname is invalid." msgstr "The hostname is invalid." #. textentry label -#: src/include/network/services/dns.rb:112 +#: src/include/network/services/dns.rb:111 msgid "&Domain Name" msgstr "&Domain Name" #. validation error popup -#: src/include/network/services/dns.rb:128 +#: src/include/network/services/dns.rb:127 msgid "The domain name is invalid." msgstr "The domain name is invalid." -#: src/include/network/services/dns.rb:135 +#: src/include/network/services/dns.rb:134 msgid "&Change Hostname via DHCP" msgstr "&Change Hostname via DHCP" #. checkbox label -#: src/include/network/services/dns.rb:145 +#: src/include/network/services/dns.rb:144 msgid "&Assign Hostname to Loopback IP" msgstr "" #. help -#: src/include/network/services/dns.rb:152 +#: src/include/network/services/dns.rb:151 #, fuzzy msgid "&Modify DNS Configuration" msgstr "DNS configuration" -#: src/include/network/services/dns.rb:155 +#: src/include/network/services/dns.rb:154 msgid "Only Manually" msgstr "Only Manually" -#: src/include/network/services/dns.rb:156 +#: src/include/network/services/dns.rb:155 #, fuzzy msgid "Use Default Policy" msgstr "Use Default Values" -#: src/include/network/services/dns.rb:157 +#: src/include/network/services/dns.rb:156 #, fuzzy msgid "Use Custom Policy" msgstr "Password Policy" -#: src/include/network/services/dns.rb:168 +#: src/include/network/services/dns.rb:167 #, fuzzy msgid "&Custom Policy Rule" msgstr "Custom Rules" #. textentry label -#: src/include/network/services/dns.rb:178 +#: src/include/network/services/dns.rb:177 msgid "Name Server &1" msgstr "Name Server &1" #. validation error popup -#: src/include/network/services/dns.rb:194 +#: src/include/network/services/dns.rb:193 msgid "The IP address of the name server is invalid." msgstr "The IP address of the name server is invalid." #. textentry label -#: src/include/network/services/dns.rb:202 +#: src/include/network/services/dns.rb:201 msgid "Do&main Search" msgstr "Do&main Search" #. text entry label -#: src/include/network/services/dns.rb:229 +#: src/include/network/services/dns.rb:228 msgid "Name Server &2" msgstr "Name Server &2" #. text entry label -#: src/include/network/services/dns.rb:231 +#: src/include/network/services/dns.rb:230 msgid "Name Server &3" msgstr "Name Server &3" #. Frame label #. dialog caption -#: src/include/network/services/dns.rb:235 -#: src/include/network/services/dns.rb:694 -#: src/include/network/services/dns.rb:708 +#: src/include/network/services/dns.rb:234 +#: src/include/network/services/dns.rb:684 +#: src/include/network/services/dns.rb:697 msgid "Hostname and Domain Name" msgstr "Hostname and Domain Name" #. Frame label -#: src/include/network/services/dns.rb:252 +#: src/include/network/services/dns.rb:251 msgid "Name Servers and Domain Search List" msgstr "Name Servers and Domain Search List" -#: src/include/network/services/dns.rb:269 +#: src/include/network/services/dns.rb:268 msgid "Hostname/DNS" msgstr "Hostname/DNS" @@ -3699,7 +3652,7 @@ #. @param [String] key the widget receiving the event #. @param event the event being handled #. @return nil so that the dialog loops on -#: src/include/network/services/dns.rb:445 +#: src/include/network/services/dns.rb:442 #, fuzzy msgid "No interface with dhcp" msgstr "no interface with dhcp" @@ -3708,28 +3661,28 @@ #. @param [String] key the widget being validated #. @param [Hash] event the event being handled #. @return whether valid -#: src/include/network/services/dns.rb:502 +#: src/include/network/services/dns.rb:496 msgid "It's not recommended to use .local as domainname due to Multicast DNS. Use it at your own risk?" msgstr "" #. Popup::Error text -#: src/include/network/services/dns.rb:527 +#: src/include/network/services/dns.rb:520 msgid "The search list can have at most %1 domains." msgstr "The search list can have at most %1 domains." #. Popup::Error text -#: src/include/network/services/dns.rb:533 +#: src/include/network/services/dns.rb:526 msgid "The search list can have at most %1 characters." msgstr "The search list can have at most %1 characters." #. Popup::Error text -#: src/include/network/services/dns.rb:542 +#: src/include/network/services/dns.rb:535 msgid "The search domain '%1' is invalid." msgstr "The search domain '%1' is invalid." #. Standalone dialog only - embedded one is handled separately #. via CWMTab -#: src/include/network/services/dns.rb:737 +#: src/include/network/services/dns.rb:725 msgid "Hostname and Name Server Configuration" msgstr "Hostname and Name Server Configuration" @@ -3778,12 +3731,12 @@ msgstr "Host Aliases" #. TextEntry label -#: src/include/network/services/host.rb:366 +#: src/include/network/services/host.rb:351 msgid "Hos&t Aliases" msgstr "Hos&t Aliases" #. Popup::Error text -#: src/include/network/services/host.rb:429 +#: src/include/network/services/host.rb:414 msgid "Alias name \"%1\" is invalid." msgstr "Alias name \"%1\" is invalid." @@ -3863,7 +3816,7 @@ #. #178538 - disable routing dialog when NetworkManager is used #. but instead of default route (#299448) - NM reads it -#: src/include/network/services/routing.rb:420 +#: src/include/network/services/routing.rb:414 msgid "The default gateway is invalid." msgstr "The default gateway is invalid." @@ -3888,12 +3841,12 @@ msgstr "Dele&te" #. TextEntry label -#: src/include/network/widgets.rb:55 +#: src/include/network/widgets.rb:54 msgid "&Dial Prefix Regular Expression" msgstr "&Dial Prefix Regular Expression" #. dial prefix regex help -#: src/include/network/widgets.rb:58 +#: src/include/network/widgets.rb:57 msgid "" "<p>When <b>Dial Prefix Regular Expression</b> is set, users can\n" "change the dial prefix in KInternet provided that it matches the expression.\n" @@ -3908,43 +3861,43 @@ "to change the prefix.</p>\n" #. radio button group label,method of setup -#: src/include/network/widgets.rb:70 +#: src/include/network/widgets.rb:69 msgid "Setup Method" msgstr "Setup Method" #. radio button label -#: src/include/network/widgets.rb:76 +#: src/include/network/widgets.rb:75 msgid "A&utomatic Address Setup (via DHCP)" msgstr "A&utomatic Address Setup (via DHCP)" #. radio button label -#: src/include/network/widgets.rb:78 +#: src/include/network/widgets.rb:77 msgid "S&tatic Address Setup" msgstr "S&tatic Address Setup" -#: src/include/network/widgets.rb:81 +#: src/include/network/widgets.rb:80 msgid "<p>H</p>" msgstr "<p>H</p>" #. Combo box option for Device Activation -#: src/include/network/widgets.rb:96 +#: src/include/network/widgets.rb:95 msgid "At Boot Time" msgstr "At Boot Time" #. is a part of the static help text -#: src/include/network/widgets.rb:103 +#: src/include/network/widgets.rb:102 msgid "Never" msgstr "Never" #. Combo box option for Device Activation #. DO NOT TRANSLATE NetworkManager, it is a program name -#: src/include/network/widgets.rb:107 +#: src/include/network/widgets.rb:106 msgid "By NetworkManager" msgstr "By NetworkManager" #. help text for Device Activation #. DO NOT TRANSLATE NetworkManager, it is a program name -#: src/include/network/widgets.rb:112 +#: src/include/network/widgets.rb:111 msgid "" "<b>By NetworkManager</b>: a desktop applet\n" "controls the interface. There is no need to set it up in YaST." @@ -3953,12 +3906,12 @@ "controls the interface. There is no need to set it up in YaST." #. Combo box option for Device Activation -#: src/include/network/widgets.rb:118 +#: src/include/network/widgets.rb:117 msgid "Manually" msgstr "Manually" #. help text for Device Activation -#: src/include/network/widgets.rb:120 +#: src/include/network/widgets.rb:119 #, fuzzy msgid "" "<p><b>Manually</b>: You control the interface manually\n" @@ -3968,12 +3921,12 @@ "via 'ifup' or 'kinternet' (See 'User Controlled' below)." #. Combo box option for Device Activation -#: src/include/network/widgets.rb:126 +#: src/include/network/widgets.rb:125 msgid "On Cable Connection" msgstr "On Cable Connection" #. help text for Device Activation -#: src/include/network/widgets.rb:130 +#: src/include/network/widgets.rb:129 msgid "" "<b>On Cable Connection</b>:\n" "The interface is watched for whether there is a physical\n" @@ -3986,12 +3939,12 @@ "wireless interface can connect to an access point.\n" #. Combo box option for Device Activation -#: src/include/network/widgets.rb:139 +#: src/include/network/widgets.rb:138 msgid "On Hotplug" msgstr "On Hotplug" #. help text for Device Activation -#: src/include/network/widgets.rb:141 +#: src/include/network/widgets.rb:140 msgid "" "With <b>On Hotplug</b>,\n" "the interface is set up as soon as it is available. This is\n" @@ -4004,13 +3957,12 @@ "boot time if the interface is not present.\n" #. Combo box option for Device Activation -#. Combo box option for Device Activation -#: src/include/network/widgets.rb:150 src/include/network/widgets.rb:160 +#: src/include/network/widgets.rb:149 msgid "On NFSroot" msgstr "On NFSroot" #. help text for Device Activation -#: src/include/network/widgets.rb:152 +#: src/include/network/widgets.rb:151 #, fuzzy msgid "" "Using <b>On NFSroot</b> is similar to <tt>auto</tt>. Interfaces with this startmode will never\n" @@ -4021,26 +3973,15 @@ "be shut down via 'rcnetwork stop'. 'ifdown <iface>' still works.\n" "Use this when you have a nfs or iscsi root filesystem.\n" -#. help text for Device Activation -#: src/include/network/widgets.rb:162 -msgid "" -"Using <b>On NFSroot</b> is nearly like 'auto'. But interfaces with this startmode will never\n" -"be shut down via 'rcnetwork stop'. 'ifdown <iface>' still works.\n" -"Use this when you have a nfs or iscsi root filesystem.\n" -msgstr "" -"Using <b>On NFSroot</b> is nearly like 'auto'. But interfaces with this startmode will never\n" -"be shut down via 'rcnetwork stop'. 'ifdown <iface>' still works.\n" -"Use this when you have a nfs or iscsi root filesystem.\n" - #. Combo box label - when to activate device (e.g. on boot, manually, never,..) -#: src/include/network/widgets.rb:195 +#: src/include/network/widgets.rb:184 #, fuzzy msgid "Activate &Device" msgstr "&Activate All Services" #. Device activation main help. The individual parts will be #. substituted as %1 -#: src/include/network/widgets.rb:201 +#: src/include/network/widgets.rb:190 #, fuzzy msgid "" "<p><b><big>Device Activation</big></b></p> \n" @@ -4053,66 +3994,66 @@ "<b>Never</b> does not start the device.\n" "%1</p>\n" -#: src/include/network/widgets.rb:247 +#: src/include/network/widgets.rb:235 msgid "IPoIB Device Mode" msgstr "" -#: src/include/network/widgets.rb:258 +#: src/include/network/widgets.rb:246 #, fuzzy #| msgid "Firewall is not installed" msgid "Firewall is not installed." msgstr "Firewall is not installed" #. translators: MTU value description (size in bytes, desc) -#: src/include/network/widgets.rb:266 +#: src/include/network/widgets.rb:253 msgid "1500 (Ethernet, DSL broadband)" msgstr "" -#: src/include/network/widgets.rb:267 +#: src/include/network/widgets.rb:254 msgid "1492 (PPPoE broadband)" msgstr "" -#: src/include/network/widgets.rb:268 +#: src/include/network/widgets.rb:255 msgid "576 (dial-up)" msgstr "" #. translators: MTU value description (size in bytes, desc) -#: src/include/network/widgets.rb:275 +#: src/include/network/widgets.rb:262 msgid "65520 (IPoIB in connected mode)" msgstr "" -#: src/include/network/widgets.rb:276 +#: src/include/network/widgets.rb:263 msgid "2044 (IPoIB in datagram mode)" msgstr "" #. textentry label, Maximum Transfer Unit -#: src/include/network/widgets.rb:284 +#: src/include/network/widgets.rb:271 msgid "Set &MTU" msgstr "Set &MTU" #. the user can control the network with the NetworkManager program -#: src/include/network/widgets.rb:300 +#: src/include/network/widgets.rb:287 #, fuzzy #| msgid "Network Services" msgid "NetworkManager Service" msgstr "Network Services" #. ifup is a program name -#: src/include/network/widgets.rb:308 +#: src/include/network/widgets.rb:295 #, fuzzy #| msgid "Traditional Chinese" msgid "Traditional ifup" msgstr "Traditional Chinese" #. wicked is network configuration backend like netconfig -#: src/include/network/widgets.rb:316 +#: src/include/network/widgets.rb:303 #, fuzzy #| msgid "Web Services" msgid "Wicked Service" msgstr "Web Services" #. used when no network service is active or to disable network service -#: src/include/network/widgets.rb:324 +#: src/include/network/widgets.rb:311 #, fuzzy #| msgid "Network Services" msgid "Network Services Disabled" @@ -4121,46 +4062,46 @@ #. Store the NetworkManager widget #. @param [String] key id of the widget #. @param [Hash] event the event being handled -#: src/include/network/widgets.rb:355 +#: src/include/network/widgets.rb:342 msgid "Applet needed" msgstr "" -#: src/include/network/widgets.rb:356 +#: src/include/network/widgets.rb:343 msgid "" "NetworkManager is controlled by desktop applet\n" "(KDE plasma widget and nm-applet for GNOME).\n" "Be sure it's running and if not, start it manually." msgstr "" -#: src/include/network/widgets.rb:371 +#: src/include/network/widgets.rb:358 msgid "General Network Settings" msgstr "General Network Settings" -#: src/include/network/widgets.rb:417 +#: src/include/network/widgets.rb:402 msgid "IPv6 Protocol Settings" msgstr "IPv6 Protocol Settings" #. enable ipv6 support -#: src/include/network/widgets.rb:418 src/modules/Lan.rb:820 +#: src/include/network/widgets.rb:403 src/modules/Lan.rb:810 msgid "Enable IPv6" msgstr "Enable IPv6" #. TRANSLATORS: Informs that device name is not known -#: src/include/network/widgets.rb:435 +#: src/include/network/widgets.rb:420 msgid "Unknown device" msgstr "Unknown device" #. TRANSLATORS: Part of label, device with IP address assigned by DHCP -#: src/include/network/widgets.rb:447 +#: src/include/network/widgets.rb:429 msgid "DHCP address" msgstr "DHCP address" #. TRANSLATORS: Informs that no IP has been assigned to the device -#: src/include/network/widgets.rb:452 +#: src/include/network/widgets.rb:436 msgid "No IP address assigned" msgstr "No IP address assigned" -#: src/include/network/widgets.rb:455 +#: src/include/network/widgets.rb:439 msgid "" "%1 \n" "%2 - %3" @@ -4169,124 +4110,135 @@ "%2 - %3" #. #186102 -#: src/include/network/widgets.rb:510 +#: src/include/network/widgets.rb:492 msgid "&Change Device" msgstr "&Change Device" #. popup dialog title -#: src/include/network/widgets.rb:544 +#: src/include/network/widgets.rb:525 msgid "Network Device Select" msgstr "Network Device Select" +#. this conditions origin from bridge configuration +#. if enslaving a configured device then its configuration is rewritten +#. to "0.0.0.0/32" +#. +#. translators: a note that listed device is already configured +#: src/include/network/widgets.rb:571 +#, fuzzy +#| msgid "Unconfigured" +msgid "configured" +msgstr "Unconfigured" + #. Shows a confirmation timed dialogue #. #. Returns :ok when user agreed, :cancel otherwise -#: src/lib/network/confirm_virt_proposal.rb:25 +#: src/lib/network/confirm_virt_proposal.rb:23 #, fuzzy msgid "Confirm Network Restart" msgstr "&Configure Network Cards" -#: src/lib/network/confirm_virt_proposal.rb:26 +#: src/lib/network/confirm_virt_proposal.rb:24 msgid "Because of the bridged network, YaST2 needs to restart the network to apply the settings." msgstr "" #. Opens dialog for editing NIC name -#: src/lib/network/edit_nic_name.rb:97 +#: src/lib/network/edit_nic_name.rb:93 #, fuzzy #| msgid "Device Name" msgid "Device Name:" msgstr "Device Name" -#: src/lib/network/edit_nic_name.rb:103 +#: src/lib/network/edit_nic_name.rb:99 msgid "Base Udev Rule On" msgstr "" #. make sure there is enough space (#367239) -#: src/lib/network/edit_nic_name.rb:112 +#: src/lib/network/edit_nic_name.rb:108 #, fuzzy #| msgid "MAC Address: %1" msgid "MAC address: %s" msgstr "MAC Address: %1" -#: src/lib/network/edit_nic_name.rb:118 +#: src/lib/network/edit_nic_name.rb:114 msgid "BusID: %s" msgstr "" #. check if the name is assigned to another device already -#: src/lib/network/edit_nic_name.rb:155 +#: src/lib/network/edit_nic_name.rb:151 #, fuzzy msgid "Configuration name already exists." msgstr "Configuration %1 already present." -#: src/lib/network/edit_nic_name.rb:159 +#: src/lib/network/edit_nic_name.rb:155 #, fuzzy #| msgid "Read configuration file" msgid "Invalid configuration name." msgstr "Read configuration file" #. Progress stage 1 -#: src/modules/DNS.rb:390 +#: src/modules/DNS.rb:377 msgid "Write hostname" msgstr "Write hostname" #. Progress stage 2 #. Progress stage 10 -#: src/modules/DNS.rb:392 src/modules/Lan.rb:535 +#: src/modules/DNS.rb:379 src/modules/Lan.rb:534 msgid "Update configuration" msgstr "Update configuration" #. Progress stage 3 -#: src/modules/DNS.rb:394 +#: src/modules/DNS.rb:381 msgid "Update /etc/resolv.conf" msgstr "Update /etc/resolv.conf" #. Write dialog caption -#: src/modules/DNS.rb:398 +#: src/modules/DNS.rb:385 msgid "Saving Hostname and DNS Configuration" msgstr "Saving Hostname and DNS Configuration" #. Allow to set hostname even if it's modified by DHCP (#13427) #. if(NetworkConfig::DHCP["DHCLIENT_SET_HOSTNAME"]:false != true) { #. Progress step 1/3 -#: src/modules/DNS.rb:407 +#: src/modules/DNS.rb:394 msgid "Writing hostname..." msgstr "Writing hostname..." #. Progress step 2/3 #. Progress step 10 -#: src/modules/DNS.rb:424 src/modules/Lan.rb:630 +#: src/modules/DNS.rb:411 src/modules/Lan.rb:622 msgid "Updating configuration..." msgstr "Updating configuration..." #. if(SCR::Read(.target.size, resolv_conf) < 0) #. SCR::Write(.target.string, resolv_conf, ""); #. Progress step 3/3 -#: src/modules/DNS.rb:435 +#: src/modules/DNS.rb:421 #, fuzzy msgid "Updating /etc/resolv.conf ..." msgstr "Updating /etc/resolv.conf..." #. Summary text -#: src/modules/DNS.rb:552 +#: src/modules/DNS.rb:538 msgid "Hostname: Set by DHCP" msgstr "Hostname: Set by DHCP" #. Summary text -#: src/modules/DNS.rb:558 +#: src/modules/DNS.rb:544 msgid "Hostname: %1" msgstr "Hostname: %1" -#: src/modules/DNS.rb:566 +#: src/modules/DNS.rb:552 msgid "Hostname will not be written to /etc/hosts" msgstr "Hostname will not be written to /etc/hosts" #. Summary text -#: src/modules/DNS.rb:588 +#: src/modules/DNS.rb:573 msgid "Name Servers: %1" msgstr "Name Servers: %1" #. Summary text -#: src/modules/DNS.rb:598 +#: src/modules/DNS.rb:583 msgid "Search List: %1" msgstr "Search List: %1" @@ -4417,7 +4369,7 @@ #. Final progress step #. Final progress step -#: src/modules/Lan.rb:412 src/modules/Lan.rb:651 +#: src/modules/Lan.rb:412 src/modules/Lan.rb:643 msgid "Finished" msgstr "Finished" @@ -4429,92 +4381,92 @@ msgstr "To apply this change reboot is needed." #. Write dialog caption -#: src/modules/Lan.rb:507 +#: src/modules/Lan.rb:506 msgid "Saving Network Configuration" msgstr "Saving Network Configuration" #. Progress stage 2 -#: src/modules/Lan.rb:514 +#: src/modules/Lan.rb:513 msgid "Write drivers information" msgstr "Write drivers information" #. Progress stage 3 - multiple devices may be present,really plural -#: src/modules/Lan.rb:516 +#: src/modules/Lan.rb:515 msgid "Write device configuration" msgstr "Write device configuration" #. Progress stage 4 -#: src/modules/Lan.rb:518 +#: src/modules/Lan.rb:517 msgid "Write network configuration" msgstr "Write network configuration" #. Progress stage 5 -#: src/modules/Lan.rb:520 +#: src/modules/Lan.rb:519 msgid "Write routing configuration" msgstr "Write routing configuration" #. Progress stage 6 -#: src/modules/Lan.rb:522 +#: src/modules/Lan.rb:521 msgid "Write hostname and DNS configuration" msgstr "Write hostname and DNS configuration" #. Progress stage 7 -#: src/modules/Lan.rb:524 +#: src/modules/Lan.rb:523 msgid "Set up network services" msgstr "Set up network services" #. Progress stage 8 #. Progress stage 1 -#: src/modules/Lan.rb:528 src/modules/Remote.rb:293 +#: src/modules/Lan.rb:527 src/modules/Remote.rb:293 msgid "Write firewall settings" msgstr "Write firewall settings" #. Progress stage 9 -#: src/modules/Lan.rb:532 +#: src/modules/Lan.rb:531 msgid "Activate network services" msgstr "Activate network services" #. Progress step 2 -#: src/modules/Lan.rb:549 +#: src/modules/Lan.rb:547 msgid "Writing /etc/modprobe.conf..." msgstr "Writing /etc/modprobe.conf..." #. Progress step 3 - multiple devices may be present, really plural -#: src/modules/Lan.rb:554 +#: src/modules/Lan.rb:552 msgid "Writing device configuration..." msgstr "Writing device configuration..." #. Progress step 4 -#: src/modules/Lan.rb:560 +#: src/modules/Lan.rb:558 msgid "Writing network configuration..." msgstr "Writing network configuration..." #. Progress step 5 -#: src/modules/Lan.rb:566 +#: src/modules/Lan.rb:564 msgid "Writing routing configuration..." msgstr "Writing routing configuration..." #. Progress step 6 -#: src/modules/Lan.rb:574 +#: src/modules/Lan.rb:572 msgid "Writing hostname and DNS configuration..." msgstr "Writing hostname and DNS configuration..." #. Progress step 7 -#: src/modules/Lan.rb:587 +#: src/modules/Lan.rb:585 msgid "Setting up network services..." msgstr "Setting up network services..." #. Progress step 8 -#: src/modules/Lan.rb:595 src/modules/Remote.rb:307 +#: src/modules/Lan.rb:593 src/modules/Remote.rb:307 msgid "Writing firewall settings..." msgstr "Writing firewall settings..." #. Progress step 9 -#: src/modules/Lan.rb:605 +#: src/modules/Lan.rb:603 msgid "Activating network services..." msgstr "Activating network services..." -#: src/modules/Lan.rb:647 +#: src/modules/Lan.rb:639 #, fuzzy msgid "No network running" msgstr "Network Settings" @@ -4522,162 +4474,161 @@ #. Import data #. @param [Hash] settings settings to be imported #. @return true on success -#: src/modules/Lan.rb:706 +#: src/modules/Lan.rb:698 msgid "AutoYaST setting networking/managed: NetworkManager is not available, Wicked will be used." msgstr "" #. Create a textual summary for the general network settings #. proposal (NetworkManager + ipv6) #. @return [rich text, links] -#: src/modules/Lan.rb:792 +#: src/modules/Lan.rb:782 msgid "Network Mode" msgstr "Network Mode" #. network mode: the interfaces are controlled by the user -#: src/modules/Lan.rb:797 +#: src/modules/Lan.rb:787 msgid "Interfaces controlled by NetworkManager" msgstr "Interfaces controlled by NetworkManager" #. disable NetworkManager applet -#: src/modules/Lan.rb:799 +#: src/modules/Lan.rb:789 msgid "Disable NetworkManager" msgstr "Disable NetworkManager" #. network mode -#: src/modules/Lan.rb:803 +#: src/modules/Lan.rb:793 msgid "Traditional network setup with NetControl - ifup" msgstr "Traditional network setup with NetControl - ifup" #. enable NetworkManager applet #. for virtual network proposal (bridged) don't show hyperlink to enable networkmanager -#: src/modules/Lan.rb:806 +#: src/modules/Lan.rb:796 msgid "Enable NetworkManager" msgstr "Enable NetworkManager" #. ipv6 support is enabled -#: src/modules/Lan.rb:812 +#: src/modules/Lan.rb:802 msgid "Support for IPv6 protocol is enabled" msgstr "Support for IPv6 protocol is enabled" #. disable ipv6 support -#: src/modules/Lan.rb:814 +#: src/modules/Lan.rb:804 msgid "Disable IPv6" msgstr "Disable IPv6" #. ipv6 support is disabled -#: src/modules/Lan.rb:818 +#: src/modules/Lan.rb:808 msgid "Support for IPv6 protocol is disabled" msgstr "Support for IPv6 protocol is disabled" #. translators: a possible value for: IPoIB device mode -#: src/modules/LanItems.rb:194 +#: src/modules/LanItems.rb:193 #, fuzzy msgid "connected" msgstr "(not connected)" -#: src/modules/LanItems.rb:195 +#: src/modules/LanItems.rb:194 msgid "datagram" msgstr "" #. summary description of STARTMODE=auto #. summary description of STARTMODE=auto #. summary description of STARTMODE=hotplug -#: src/modules/LanItems.rb:1246 src/modules/LanItems.rb:1250 -#: src/modules/LanItems.rb:1254 +#: src/modules/LanItems.rb:1260 src/modules/LanItems.rb:1264 +#: src/modules/LanItems.rb:1268 msgid "Started automatically at boot" msgstr "Started automatically at boot" #. summary description of STARTMODE=ifplugd -#: src/modules/LanItems.rb:1258 +#: src/modules/LanItems.rb:1272 msgid "Started automatically on cable connection" msgstr "Started automatically on cable connection" #. summary description of STARTMODE=managed -#: src/modules/LanItems.rb:1262 +#: src/modules/LanItems.rb:1276 msgid "Managed by NetworkManager" msgstr "Managed by NetworkManager" #. summary description of STARTMODE=off -#: src/modules/LanItems.rb:1266 +#: src/modules/LanItems.rb:1280 msgid "Will not be started at all" msgstr "Will not be started at all" -#: src/modules/LanItems.rb:1271 +#: src/modules/LanItems.rb:1286 msgid "Started manually" msgstr "Started manually" #. do nothing -#: src/modules/LanItems.rb:1283 +#: src/modules/LanItems.rb:1298 #, fuzzy msgid "IP address assigned using" msgstr "IP address assigned using DHCP" -#: src/modules/LanItems.rb:1287 +#: src/modules/LanItems.rb:1302 #, fuzzy msgid "IP address: %s/%s" msgstr "IP Address: %1" -#: src/modules/LanItems.rb:1290 +#: src/modules/LanItems.rb:1305 #, fuzzy #| msgid "IP address: %1, subnet mask %2" msgid "IP address: %s, subnet mask %s" msgstr "IP address: %1, subnet mask %2" -#. FIXME: -#. - side effect: sets @type. No reason for that. It should only build item +#. FIXME: side effect: sets @type. No reason for that. It should only build item #. overview. Check and remove. -#: src/modules/LanItems.rb:1321 +#: src/modules/LanItems.rb:1329 msgid "Not configured" msgstr "Not configured" #. display it only if we need it, don't duplicate "ifcfg_name" above -#: src/modules/LanItems.rb:1344 src/modules/LanItems.rb:1410 +#: src/modules/LanItems.rb:1351 src/modules/LanItems.rb:1411 #, fuzzy #| msgid "Device Name: %1" msgid "Device Name: %s" msgstr "Device Name: %1" -#: src/modules/LanItems.rb:1364 +#: src/modules/LanItems.rb:1372 #, fuzzy #| msgid "Bond slaves" msgid "Bonding slaves" msgstr "Bond slaves" -#: src/modules/LanItems.rb:1378 +#: src/modules/LanItems.rb:1386 msgid "enslaved in %s" msgstr "" -#: src/modules/LanItems.rb:1379 +#: src/modules/LanItems.rb:1387 msgid "Bonding master" msgstr "" -#: src/modules/LanItems.rb:1393 +#: src/modules/LanItems.rb:1401 #, fuzzy msgid "Not connected" msgstr "(not connected)" -#: src/modules/LanItems.rb:1396 +#: src/modules/LanItems.rb:1402 msgid "No hwinfo" msgstr "" -#: src/modules/LanItems.rb:1416 +#: src/modules/LanItems.rb:1417 #, fuzzy msgid "Unable to configure the network card because the kernel device (eth0, wlan0) is not present. This is mostly caused by missing firmware (for wlan devices). See dmesg output for details." msgstr "<p>Unable to configure network card because kernel device is not present</p>" -#: src/modules/LanItems.rb:1422 +#: src/modules/LanItems.rb:1423 #, fuzzy msgid "" "The device is not configured. Press <b>Edit</b>\n" "to configure.\n" msgstr "<P><UL><LI>The device is not configured</LI><LI>Press <B>Configure</B> to configure</LI></UL></P>" -#: src/modules/LanItems.rb:1429 +#: src/modules/LanItems.rb:1430 #, fuzzy msgid "Needed firmware" msgstr "Needed Information" -#: src/modules/LanItems.rb:1429 +#: src/modules/LanItems.rb:1430 msgid "unknown" msgstr "unknown" @@ -4715,14 +4666,14 @@ #. Enable xinetd #. Enable XDM -#: src/modules/Remote.rb:343 src/modules/Remote.rb:351 +#: src/modules/Remote.rb:342 src/modules/Remote.rb:350 #, fuzzy #| msgid "Enabling service 'uml' failed." msgid "Enabling service %{service} has failed" msgstr "Enabling service 'uml' failed." #. Do this only if package xinetd is installed (#256385) -#: src/modules/Remote.rb:378 +#: src/modules/Remote.rb:377 msgid "" "Your display manager must be restarted.\n" "To take the changes in remote administration into account, \n" @@ -4730,63 +4681,63 @@ msgstr "" #. description in proposal -#: src/modules/Remote.rb:409 +#: src/modules/Remote.rb:408 msgid "Remote administration is enabled." msgstr "Remote administration is enabled." -#: src/modules/Remote.rb:409 +#: src/modules/Remote.rb:408 msgid "Remote administration is disabled." msgstr "Remote administration is disabled." #. Progress stage 1 -#: src/modules/Routing.rb:244 +#: src/modules/Routing.rb:261 msgid "Write IP forwarding settings" msgstr "Write IP forwarding settings" #. Progress stage 2 -#: src/modules/Routing.rb:246 +#: src/modules/Routing.rb:263 msgid "Write routing settings" msgstr "Write routing settings" -#: src/modules/Routing.rb:249 +#: src/modules/Routing.rb:266 msgid "Saving Routing Configuration" msgstr "Saving Routing Configuration" #. Progress stage 1/2 -#: src/modules/Routing.rb:254 +#: src/modules/Routing.rb:271 msgid "Writing IP forwarding settings..." msgstr "Writing IP forwarding settings..." #. at first stop the running routes -#. FIXME SCR::Execute(.target.bash, "/etc/init.d/route stop"); +#. FIXME: SCR::Execute(.target.bash, "/etc/init.d/route stop"); #. sysconfig does not support restarting routes only, #. so we let our caller do it together with other things #. Progress stage 2/2 -#: src/modules/Routing.rb:264 +#: src/modules/Routing.rb:281 msgid "Writing routing settings..." msgstr "Writing routing settings..." #. Summary text -#: src/modules/Routing.rb:413 +#: src/modules/Routing.rb:434 #, fuzzy #| msgid "Gateway: %1" msgid "Gateway: %s" msgstr "Gateway: %1" #. Summary text -#: src/modules/Routing.rb:417 +#: src/modules/Routing.rb:438 #, fuzzy msgid "IP Forwarding for IPv4: %s" msgstr "IP Forwarding: on" #. Summary text -#: src/modules/Routing.rb:421 +#: src/modules/Routing.rb:442 #, fuzzy msgid "IP Forwarding for IPv6: %s" msgstr "IP Forwarding: on" #. item in combo box Firewall Zone -#: src/modules/SuSEFirewall4Network.rb:125 +#: src/modules/SuSEFirewall4Network.rb:124 #, fuzzy msgid "Automatically Assigned Zone" msgstr "Automatically &Reconnect" @@ -4801,6 +4752,40 @@ msgid "(Unprotected)" msgstr "(Unprotected)" +#~ msgid "Device boot protocol" +#~ msgstr "Device boot protocol" + +#~ msgid "Manual Network Card Configuration" +#~ msgstr "Manual Network Card Configuration" + +#~ msgid "&Hotplug Type" +#~ msgstr "&Hotplug Type" + +#~ msgid "P&CI" +#~ msgstr "P&CI" + +#~ msgid "" +#~ "<p>To specify the <b>Frequency</b> instead of\n" +#~ "the channel, select the desired value.</p>\n" +#~ msgstr "" +#~ "<p>To specify the <b>Frequency</b> instead of\n" +#~ "the channel, select the desired value.</p>\n" + +#~ msgid "&Frequency" +#~ msgstr "&Frequency" + +#~ msgid "unplugged" +#~ msgstr "unplugged" + +#~ msgid "" +#~ "Using <b>On NFSroot</b> is nearly like 'auto'. But interfaces with this startmode will never\n" +#~ "be shut down via 'rcnetwork stop'. 'ifdown <iface>' still works.\n" +#~ "Use this when you have a nfs or iscsi root filesystem.\n" +#~ msgstr "" +#~ "Using <b>On NFSroot</b> is nearly like 'auto'. But interfaces with this startmode will never\n" +#~ "be shut down via 'rcnetwork stop'. 'ifdown <iface>' still works.\n" +#~ "Use this when you have a nfs or iscsi root filesystem.\n" + #~ msgid "&User Controlled with NetworkManager" #~ msgstr "&User Controlled with NetworkManager" Modified: trunk/yast/en_GB/po/nfs.en_GB.po =================================================================== --- trunk/yast/en_GB/po/nfs.en_GB.po 2015-09-09 08:18:21 UTC (rev 92602) +++ trunk/yast/en_GB/po/nfs.en_GB.po 2015-09-09 08:19:44 UTC (rev 92603) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-04 15:52+0200\n" +"POT-Creation-Date: 2015-08-25 18:37+0200\n" "PO-Revision-Date: 2003-09-09 10:54+0200\n" "Last-Translator: Karl Eichwalder \n" "Language-Team: English \n" @@ -17,55 +17,55 @@ "Plural-Forms: nplurals=2; plural=n != 1;\n" #. Command line help text for the nfs module -#: src/clients/nfs.rb:42 +#: src/clients/nfs.rb:29 msgid "Configuration of NFS client" msgstr "Configuration of NFS client" #. command line action help -#: src/clients/nfs.rb:56 +#: src/clients/nfs.rb:43 msgid "List configured NFS mounts" msgstr "List configured NFS mounts" #. command line action help -#: src/clients/nfs.rb:63 +#: src/clients/nfs.rb:50 msgid "Add an NFS mount" msgstr "Add an NFS mount" #. command line action help -#: src/clients/nfs.rb:68 +#: src/clients/nfs.rb:55 msgid "Edit an NFS mount" msgstr "Edit an NFS mount" #. command line action help -#: src/clients/nfs.rb:73 +#: src/clients/nfs.rb:60 msgid "Delete an NFS mount" msgstr "Delete an NFS mount" #. host:path #. command line option help #. fstab(5): fs_spec -#: src/clients/nfs.rb:83 +#: src/clients/nfs.rb:70 msgid "Remote file system (in the form 'host:path')" msgstr "Remote file system (in the form 'host:path')" #. path #. command line option help #. fstab(5): fs_file -#: src/clients/nfs.rb:92 +#: src/clients/nfs.rb:79 msgid "Local mount point" msgstr "Local mount point" #. a list? #. command line option help #. fstab(5): fs_mntops -#: src/clients/nfs.rb:102 +#: src/clients/nfs.rb:89 msgid "Mount options" msgstr "Mount options" #. nfs or nfs4 #. command line option help #. fstab(5): fs_type -#: src/clients/nfs.rb:111 +#: src/clients/nfs.rb:98 msgid "File system ID, supported nfs and nfs4. Default value is nfs." msgstr "" @@ -74,28 +74,28 @@ #. @param [Hash] options command options #. @return false so that Write is not called in non-interactive mode #. table header -#: src/clients/nfs.rb:173 src/include/nfs/ui.rb:495 +#: src/clients/nfs.rb:159 src/include/nfs/ui.rb:481 msgid "Server" msgstr "Server" -#: src/clients/nfs.rb:174 +#: src/clients/nfs.rb:160 msgid "Remote File System" msgstr "Remote File System" #. table header -#: src/clients/nfs.rb:175 src/include/nfs/ui.rb:498 +#: src/clients/nfs.rb:161 src/include/nfs/ui.rb:484 msgid "Mount Point" msgstr "Mount Point" #. table header -#: src/clients/nfs.rb:176 src/include/nfs/ui.rb:502 +#: src/clients/nfs.rb:162 src/include/nfs/ui.rb:488 msgid "Options" msgstr "Options" #. CLI action handler. #. @param [Hash] options command options #. @return whether successful -#: src/clients/nfs.rb:219 src/clients/nfs.rb:250 +#: src/clients/nfs.rb:205 src/clients/nfs.rb:236 #, fuzzy #| msgid "Unknown value '%s' in 'datatype'." msgid "Unknown value for option \"type\"." @@ -103,22 +103,22 @@ #. error #. error -#: src/clients/nfs.rb:244 src/clients/nfs.rb:348 +#: src/clients/nfs.rb:230 src/clients/nfs.rb:334 msgid "No NFS mount specified." msgstr "No NFS mount specified." #. error message -#: src/clients/nfs.rb:267 +#: src/clients/nfs.rb:253 msgid "No NFS mount matching the criteria found." msgstr "No NFS mount matching the criteria found." #. error message -#: src/clients/nfs.rb:285 +#: src/clients/nfs.rb:271 msgid "Multiple NFS mounts match the criteria:" msgstr "Multiple NFS mounts match the criteria:" #. error popup message -#: src/include/nfs/routines.rb:99 +#: src/include/nfs/routines.rb:83 #, fuzzy #| msgid "" #| "The hostname entered is invalid. It must be\n" @@ -137,7 +137,7 @@ "0-9, A-Z, a-z, dots, -, and _." #. error popup message -#: src/include/nfs/routines.rb:132 +#: src/include/nfs/routines.rb:116 msgid "" "fstab already contains an entry\n" "with mount point '%1'." @@ -146,7 +146,7 @@ "with mount point '%1'." #. error popup message (spaces are now allowed) -#: src/include/nfs/routines.rb:155 +#: src/include/nfs/routines.rb:139 msgid "" "The path entered is invalid.\n" "It must be shorter than 70 characters\n" @@ -157,14 +157,14 @@ "and it must begin with a slash (/)." #. Help, part 1 of 3 -#: src/include/nfs/ui.rb:57 +#: src/include/nfs/ui.rb:41 msgid "" "<p>The table contains all directories \n" "exported from remote servers and mounted locally via NFS (NFS shares).</p>" msgstr "" #. Help, part 2 of 3 -#: src/include/nfs/ui.rb:61 +#: src/include/nfs/ui.rb:46 msgid "" "<p>Each NFS share is identified by remote NFS server address and\n" "exported directory, local directory where the remote directory is mounted, \n" @@ -173,14 +173,14 @@ msgstr "" #. Help, part 3 of 3 -#: src/include/nfs/ui.rb:68 +#: src/include/nfs/ui.rb:53 msgid "" "<p>To mount a new NFS share, click <B>Add</B>. To change the configuration of\n" "a currently mounted share, click <B>Edit</B>. Remove and unmount a selected\n" "share with <B>Delete</B>.</p>\n" msgstr "" -#: src/include/nfs/ui.rb:76 +#: src/include/nfs/ui.rb:60 msgid "" "<p>If you need to access NFSv4 shares (NFSv4 is a newer version of the NFS\n" "protocol), check the <b>Enable NFSv4</b> option. In that case, you might need\n" @@ -191,29 +191,29 @@ #. selection box label #. changed from "Remote hosts" because now it shows #. NFS servers only -#: src/include/nfs/ui.rb:180 +#: src/include/nfs/ui.rb:164 msgid "&NFS Servers" msgstr "&NFS Servers" #. selection box label -#: src/include/nfs/ui.rb:192 +#: src/include/nfs/ui.rb:176 msgid "&Exported Directories" msgstr "&Exported Directories" #. text entry label -#: src/include/nfs/ui.rb:264 +#: src/include/nfs/ui.rb:249 msgid "&NFS Server Hostname" msgstr "&NFS Server Hostname" #. pushbutton label #. choose a host from a list #. appears in help text too -#: src/include/nfs/ui.rb:270 +#: src/include/nfs/ui.rb:255 msgid "Choo&se" msgstr "Choo&se" #. textentry label -#: src/include/nfs/ui.rb:278 +#: src/include/nfs/ui.rb:263 msgid "&Remote Directory" msgstr "&Remote Directory" @@ -221,50 +221,50 @@ #. select from a list of remote filesystems #. make it short #. appears in help text too -#: src/include/nfs/ui.rb:285 +#: src/include/nfs/ui.rb:270 msgid "&Select" msgstr "&Select" -#: src/include/nfs/ui.rb:290 +#: src/include/nfs/ui.rb:275 #, fuzzy msgid "NFS&v4 Share" msgstr "&NFS Servers" #. parallel NFS, protocol version 4.1 -#: src/include/nfs/ui.rb:293 +#: src/include/nfs/ui.rb:278 msgid "pNFS (v4.1)" msgstr "" #. textentry label -#: src/include/nfs/ui.rb:302 +#: src/include/nfs/ui.rb:287 msgid "&Mount Point (local)" msgstr "&Mount Point (local)" #. button label #. browse directories to select a mount point #. appears in help text too -#: src/include/nfs/ui.rb:308 +#: src/include/nfs/ui.rb:293 msgid "&Browse" msgstr "&Browse" #. textentry label -#: src/include/nfs/ui.rb:313 +#: src/include/nfs/ui.rb:298 msgid "O&ptions" msgstr "O&ptions" #. label message -#: src/include/nfs/ui.rb:335 +#: src/include/nfs/ui.rb:319 msgid "Scanning for hosts on this LAN..." msgstr "Scanning for hosts on this LAN..." #. Translators: 1st part of error message -#: src/include/nfs/ui.rb:341 +#: src/include/nfs/ui.rb:325 #, fuzzy msgid "No NFS server has been found on your network." msgstr "No NTP server has been found on your network." #. Translators: 2nd part of error message (1st one is 'No nfs servers have been found ...) -#: src/include/nfs/ui.rb:347 +#: src/include/nfs/ui.rb:331 #, fuzzy msgid "" "\n" @@ -276,18 +276,18 @@ "which probably blocks the network scanning." #. Popup dialog, %1 is a host name -#: src/include/nfs/ui.rb:372 +#: src/include/nfs/ui.rb:356 msgid "Getting directory list for \"%1\"..." msgstr "Getting directory list for \"%1\"..." #. heading for a directory selection dialog -#: src/include/nfs/ui.rb:387 +#: src/include/nfs/ui.rb:371 msgid "Select the Mount Point" msgstr "Select the Mount Point" #. help text 1/4 #. change: locally defined -> servers on LAN -#: src/include/nfs/ui.rb:436 +#: src/include/nfs/ui.rb:420 msgid "" "<p>Enter the <b>NFS Server Hostname</b>. With\n" "<b>Choose</b>, browse through a list of\n" @@ -299,7 +299,7 @@ #. help text 2/4 #. added "Select" button -#: src/include/nfs/ui.rb:445 +#: src/include/nfs/ui.rb:429 msgid "" "<p>In <b>Remote File System</b>,\n" "enter the path to the directory on the NFS server. Use\n" @@ -312,7 +312,7 @@ "</p>" #. help text 3/4 -#: src/include/nfs/ui.rb:455 +#: src/include/nfs/ui.rb:439 msgid "" "<p>\t\t\n" "For <b>Mount Point</b>, enter the path in the local file system where the directory should be mounted. With\n" @@ -325,7 +325,7 @@ "interactively.</p>" #. help text 4/4 -#: src/include/nfs/ui.rb:465 +#: src/include/nfs/ui.rb:450 msgid "" "<p>For a list of <b>Options</b>,\n" "read the man page mount(8).</p>" @@ -334,62 +334,62 @@ "read the man page mount(8).</p>" #. popup heading -#: src/include/nfs/ui.rb:470 +#: src/include/nfs/ui.rb:455 msgid "Help" msgstr "Help" -#: src/include/nfs/ui.rb:496 +#: src/include/nfs/ui.rb:482 #, fuzzy msgid "Remote Directory" msgstr "&Remote Directory" #. table header -#: src/include/nfs/ui.rb:500 +#: src/include/nfs/ui.rb:486 #, fuzzy msgid "NFS Type" msgstr "USB Type" -#. `VSpacing (1), -#: src/include/nfs/ui.rb:522 +#. #211570 +#: src/include/nfs/ui.rb:507 msgid "Enable NFSv4" msgstr "Enable NFSv4" -#: src/include/nfs/ui.rb:523 +#: src/include/nfs/ui.rb:508 #, fuzzy msgid "NFSv4 Domain Name" msgstr "NIS &Domain Name" -#: src/include/nfs/ui.rb:528 +#: src/include/nfs/ui.rb:513 msgid "Enable &GSS Security" msgstr "Enable &GSS Security" -#: src/include/nfs/ui.rb:542 +#: src/include/nfs/ui.rb:527 #, fuzzy msgid "&NFS Shares" msgstr "&NFS Servers" -#: src/include/nfs/ui.rb:543 +#: src/include/nfs/ui.rb:528 #, fuzzy msgid "NFS &Settings" msgstr "DNS Settings" #. Default values -#: src/include/nfs/ui.rb:656 +#: src/include/nfs/ui.rb:640 msgid "Really delete %1?" msgstr "Really delete %1?" #. dialog heading -#: src/include/nfs/ui.rb:695 +#: src/include/nfs/ui.rb:681 msgid "NFS Client Configuration" msgstr "NFS Client Configuration" #. error popup message -#: src/modules/Nfs.rb:432 +#: src/modules/Nfs.rb:387 msgid "Unable to create directory '%1'." msgstr "Unable to create directory '%1'." #. error popup message -#: src/modules/Nfs.rb:449 +#: src/modules/Nfs.rb:405 msgid "" "Unable to write to /etc/fstab.\n" "No changes will be made to the\n" @@ -400,81 +400,83 @@ "the NFS client configuration.\n" #. dialog label -#: src/modules/Nfs.rb:494 +#: src/modules/Nfs.rb:447 msgid "Writing NFS Configuration" msgstr "Writing NFS Configuration" #. progress stage label -#: src/modules/Nfs.rb:499 +#: src/modules/Nfs.rb:452 msgid "Stop services" msgstr "Stop services" #. progress stage label -#: src/modules/Nfs.rb:501 +#: src/modules/Nfs.rb:454 msgid "Start services" msgstr "Start services" #. progress step label -#: src/modules/Nfs.rb:505 +#: src/modules/Nfs.rb:458 msgid "Stopping services..." msgstr "Stopping services..." #. progress step label -#: src/modules/Nfs.rb:507 +#: src/modules/Nfs.rb:460 msgid "Starting services..." msgstr "Starting services..." #. final progress step label -#: src/modules/Nfs.rb:509 +#: src/modules/Nfs.rb:462 msgid "Finished" msgstr "Finished" #. help text -#: src/modules/Nfs.rb:515 +#: src/modules/Nfs.rb:468 msgid "Writing NFS client settings. Please wait..." msgstr "Writing NFS client settings. Please wait..." #. error popup message -#: src/modules/Nfs.rb:535 +#: src/modules/Nfs.rb:488 msgid "Unable to mount the NFS entries from /etc/fstab." msgstr "Unable to mount the NFS entries from /etc/fstab." #. summary header -#: src/modules/Nfs.rb:557 +#: src/modules/Nfs.rb:510 msgid "NFS Entries" msgstr "NFS Entries" #. summary item, %1 is a number -#: src/modules/Nfs.rb:561 +#: src/modules/Nfs.rb:514 msgid "%1 entries configured" msgstr "%1 entries configured" #. To translators: error popup -#: src/modules/NfsOptions.rb:137 +#: src/modules/NfsOptions.rb:140 msgid "Empty option strings are not allowed." msgstr "Empty option strings are not allowed." #. To translators: error popup -#: src/modules/NfsOptions.rb:149 -msgid "\"Unexpected value '#{value}' for option '#{key}'\"" -msgstr "" +#: src/modules/NfsOptions.rb:151 +#, fuzzy +#| msgid "Empty value for option: %1" +msgid "Unexpected value '%{value}' for option '%{key}'" +msgstr "Empty value for option: %1" #. To translators: error popup -#: src/modules/NfsOptions.rb:153 +#: src/modules/NfsOptions.rb:155 #, fuzzy #| msgid "Unknown option: %1" msgid "Unknown option: '%{key}'" msgstr "Unknown option: %1" #. To translators: error popup -#: src/modules/NfsOptions.rb:157 +#: src/modules/NfsOptions.rb:159 #, fuzzy #| msgid "Invalid option: %1" msgid "Invalid option: '%{opt}'" msgstr "Invalid option: %1" #. To translators: error popup -#: src/modules/NfsOptions.rb:161 +#: src/modules/NfsOptions.rb:163 #, fuzzy #| msgid "Empty value for option: %1" msgid "Empty value for option: '%{key}'" Modified: trunk/yast/en_GB/po/nfs_server.en_GB.po =================================================================== --- trunk/yast/en_GB/po/nfs_server.en_GB.po 2015-09-09 08:18:21 UTC (rev 92602) +++ trunk/yast/en_GB/po/nfs_server.en_GB.po 2015-09-09 08:19:44 UTC (rev 92603) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-04 15:52+0200\n" +"POT-Creation-Date: 2015-08-25 18:37+0200\n" "PO-Revision-Date: 2007-08-16 20:05+0100\n" "Last-Translator: Benjamin Weber\n" "Language-Team: British English\n" Modified: trunk/yast/en_GB/po/nis.en_GB.po =================================================================== --- trunk/yast/en_GB/po/nis.en_GB.po 2015-09-09 08:18:21 UTC (rev 92602) +++ trunk/yast/en_GB/po/nis.en_GB.po 2015-09-09 08:19:44 UTC (rev 92603) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: yast2 9.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-04 15:52+0200\n" +"POT-Creation-Date: 2015-08-25 18:37+0200\n" "PO-Revision-Date: 2004-03-18 11:36+0100\n" "Last-Translator: proofreader\n" "Language-Team: en_US\n" @@ -131,7 +131,7 @@ msgid "&NIS Servers in Domain %1" msgstr "&NIS Servers in Domain %1" -#. firewall openning help +#. firewall opening help #: src/include/nis/ui.rb:228 msgid "" "<p><b>Firewall Settings</b><br>\n" @@ -216,7 +216,7 @@ #. frame label #. frame label -#: src/include/nis/ui.rb:342 src/include/nis/ui.rb:1026 +#: src/include/nis/ui.rb:342 src/include/nis/ui.rb:1028 msgid "NIS client" msgstr "NIS client" @@ -269,7 +269,7 @@ #. Shortcut must not conflict with Finish and Next (#29960) #. pushbutton label, find nis servers #. Shortcut must not conflict with Finish and Next (#29960) -#: src/include/nis/ui.rb:417 src/include/nis/ui.rb:862 +#: src/include/nis/ui.rb:417 src/include/nis/ui.rb:864 msgid "Fin&d" msgstr "Fin&d" @@ -292,11 +292,6 @@ msgid "&Use NIS" msgstr "&Use NIS" -#. checkbox label -#: src/include/nis/ui.rb:482 -msgid "Start Auto&mounter" -msgstr "Start Auto&mounter" - #. button label (short for Expert settings) #: src/include/nis/ui.rb:489 msgid "E&xpert..." @@ -309,9 +304,14 @@ msgid "NFS Configuration..." msgstr "NFS Configuration" +#. check box label +#: src/include/nis/ui.rb:499 +msgid "Start Auto&mounter" +msgstr "Start Auto&mounter" + #. dialog title #. dialog title -#: src/include/nis/ui.rb:506 src/include/nis/ui.rb:1034 +#: src/include/nis/ui.rb:508 src/include/nis/ui.rb:1036 msgid "Configuration of NIS client" msgstr "Configuration of NIS client" @@ -319,12 +319,12 @@ #. but the domain is unknown. #. Message popup. The user wants to Find servers #. but the domain is unknown. -#: src/include/nis/ui.rb:573 src/include/nis/ui.rb:902 +#: src/include/nis/ui.rb:575 src/include/nis/ui.rb:904 msgid "Finding servers works only when the domain is known." msgstr "Finding servers works only when the domain is known." #. yes-no popup -#: src/include/nis/ui.rb:591 +#: src/include/nis/ui.rb:593 msgid "" "When you configure your machine as a NIS client,\n" "you cannot retrieve the user data from LDAP.\n" @@ -335,81 +335,81 @@ "Are you sure?" #. help text 1/4 -#: src/include/nis/ui.rb:674 +#: src/include/nis/ui.rb:676 msgid "<p>Normally, it is possible for any host to query which server a client is using. Disabling <b>Answer Remote Hosts</b> restricts this only to the local host.</p>" msgstr "<p>Normally, it is possible for any host to query which server a client is using. Disabling <b>Answer Remote Hosts</b> restricts this only to the local host.</p>" #. help text 2/4 #. Check, ie. turn on a check box -#: src/include/nis/ui.rb:682 +#: src/include/nis/ui.rb:684 msgid "<p>Check <b>Broken server</b> if answers from servers running on an unprivileged port should be accepted. It is a security risk and it is better to replace such a server.</p>" msgstr "<p>Check <b>Broken server</b> if answers from servers running on an unprivileged port should be accepted. It is a security risk and it is better to replace such a server.</p>" #. help text 3/4 -#: src/include/nis/ui.rb:690 +#: src/include/nis/ui.rb:692 msgid "<p>See <b>man ypbind</b> for details on other options.</p>" msgstr "<p>See <b>man ypbind</b> for details on other options.</p>" #. frame label #. dialog title -#: src/include/nis/ui.rb:701 src/include/nis/ui.rb:729 +#: src/include/nis/ui.rb:703 src/include/nis/ui.rb:731 msgid "Expert settings" msgstr "Expert settings" #. check box label -#: src/include/nis/ui.rb:706 +#: src/include/nis/ui.rb:708 msgid "Ans&wer Remote Hosts" msgstr "Ans&wer Remote Hosts" #. check box label -#: src/include/nis/ui.rb:710 +#: src/include/nis/ui.rb:712 msgid "Br&oken server" msgstr "Br&oken server" #. text entry label (do not translate 'ypbind') -#: src/include/nis/ui.rb:717 +#: src/include/nis/ui.rb:719 msgid "Other &ypbind options" msgstr "Other &ypbind options" #. Translators: multilineedit label #. comma: "," -#: src/include/nis/ui.rb:844 +#: src/include/nis/ui.rb:846 msgid "&Servers (separated by spaces or commas)" msgstr "&Servers (separated by spaces or commas)" #. checkbox label -#: src/include/nis/ui.rb:851 +#: src/include/nis/ui.rb:853 msgid "&Broadcast" msgstr "&Broadcast" #. checkbox label -#: src/include/nis/ui.rb:857 +#: src/include/nis/ui.rb:859 msgid "&SLP" msgstr "&SLP" #. Translators: popup dialog heading -#: src/include/nis/ui.rb:872 +#: src/include/nis/ui.rb:874 msgid "Domain Settings" msgstr "Domain Settings" #. Add a domain, Adding a domain? Edit... #. Translators: text entry label -#: src/include/nis/ui.rb:875 +#: src/include/nis/ui.rb:877 msgid "&Domain name" msgstr "&Domain name" #. Translators: error message -#: src/include/nis/ui.rb:930 +#: src/include/nis/ui.rb:932 msgid "This domain is already defined." msgstr "This domain is already defined." #. Translators: error message -#: src/include/nis/ui.rb:935 +#: src/include/nis/ui.rb:937 msgid "The format of server address '%1' is not correct." msgstr "The format of server address '%1' is not correct." #. error message, 'Broadcast' and 'SLP' are checkboxes -#: src/include/nis/ui.rb:944 +#: src/include/nis/ui.rb:946 msgid "" "Enabling both Broadcast and SLP options\n" "does not make any sense. Select just one option." @@ -418,56 +418,56 @@ "does not make any sense. Select just one option." #. help text -#: src/include/nis/ui.rb:977 +#: src/include/nis/ui.rb:979 msgid "<p>Specify the servers for additional domains.</p>" msgstr "<p>Specify the servers for additional domains.</p>" #. help text -#: src/include/nis/ui.rb:985 +#: src/include/nis/ui.rb:987 msgid "<p>The Service Location Protocol (<b>SLP</b>) can be used to find NIS server.</p>" msgstr "<p>The Service Location Protocol (<b>SLP</b>) can be used to find NIS server.</p>" #. dialog label #. dialog subtitle -#: src/include/nis/ui.rb:997 src/include/nis/ui.rb:1036 +#: src/include/nis/ui.rb:999 src/include/nis/ui.rb:1038 msgid "Additional Domains" msgstr "Additional Domains" #. table header #. summary item -#: src/include/nis/ui.rb:1003 src/modules/Nis.rb:889 +#: src/include/nis/ui.rb:1005 src/modules/Nis.rb:889 msgid "Domain" msgstr "Domain" #. table header #. summary header -#: src/include/nis/ui.rb:1005 src/modules/Nis.rb:842 +#: src/include/nis/ui.rb:1007 src/modules/Nis.rb:842 msgid "Broadcast" msgstr "Broadcast" #. table header - Service Location Protocol -#: src/include/nis/ui.rb:1007 +#: src/include/nis/ui.rb:1009 msgid "SLP" msgstr "SLP" #. table header #. summary item -#: src/include/nis/ui.rb:1009 src/modules/Nis.rb:887 +#: src/include/nis/ui.rb:1011 src/modules/Nis.rb:887 msgid "Servers" msgstr "Servers" #. button label -#: src/include/nis/ui.rb:1015 +#: src/include/nis/ui.rb:1017 msgid "A&dd" msgstr "A&dd" #. Translators: a yes-no popup -#: src/include/nis/ui.rb:1121 +#: src/include/nis/ui.rb:1123 msgid "Really delete this domain?" msgstr "Really delete this domain?" #. popup text FIXME better... -#: src/include/nis/ui.rb:1251 +#: src/include/nis/ui.rb:1253 msgid "NIS is now enabled." msgstr "NIS is now enabled." @@ -547,47 +547,47 @@ msgstr "Client Enabled" #. dialog label -#: src/modules/Nis.rb:1208 +#: src/modules/Nis.rb:1206 msgid "Writing NIS Configuration..." msgstr "Writing NIS Configuration..." #. progress stage label -#: src/modules/Nis.rb:1213 +#: src/modules/Nis.rb:1211 msgid "Stop services" msgstr "Stop services" #. progress stage label -#: src/modules/Nis.rb:1215 +#: src/modules/Nis.rb:1213 msgid "Start services" msgstr "Start services" #. progress step label -#: src/modules/Nis.rb:1219 +#: src/modules/Nis.rb:1217 msgid "Stopping services..." msgstr "Stopping services..." #. progress step label -#: src/modules/Nis.rb:1221 +#: src/modules/Nis.rb:1219 msgid "Starting services..." msgstr "Starting services..." #. final progress step label -#: src/modules/Nis.rb:1223 +#: src/modules/Nis.rb:1221 msgid "Finished" msgstr "Finished" #. help text -#: src/modules/Nis.rb:1229 +#: src/modules/Nis.rb:1227 msgid "Writing NIS client settings" msgstr "Writing NIS client settings" #. error popup message -#: src/modules/Nis.rb:1254 +#: src/modules/Nis.rb:1252 msgid "Error while running ypclient." msgstr "Error while running ypclient." #. error popup message -#: src/modules/Nis.rb:1262 +#: src/modules/Nis.rb:1260 msgid "NIS server not found." msgstr "NIS server not found." Modified: trunk/yast/en_GB/po/nis_server.en_GB.po =================================================================== --- trunk/yast/en_GB/po/nis_server.en_GB.po 2015-09-09 08:18:21 UTC (rev 92602) +++ trunk/yast/en_GB/po/nis_server.en_GB.po 2015-09-09 08:19:44 UTC (rev 92603) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-04 15:52+0200\n" +"POT-Creation-Date: 2015-08-25 18:37+0200\n" "PO-Revision-Date: 2007-08-16 20:06+0100\n" "Last-Translator: Benjamin Weber\n" "Language-Team: British English\n" Modified: trunk/yast/en_GB/po/ntp-client.en_GB.po =================================================================== --- trunk/yast/en_GB/po/ntp-client.en_GB.po 2015-09-09 08:18:21 UTC (rev 92602) +++ trunk/yast/en_GB/po/ntp-client.en_GB.po 2015-09-09 08:19:44 UTC (rev 92603) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: yast2 9.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-09-03 16:51+0200\n" +"POT-Creation-Date: 2015-08-25 18:37+0200\n" "PO-Revision-Date: 2007-08-16 20:07+0100\n" "Last-Translator: Benjamin Weber\n" "Language-Team: British English\n" @@ -82,7 +82,7 @@ msgstr "&Configure..." #. Otherwise, prompt user for confirming pkg installation -#: src/clients/ntp-client_proposal.rb:386 +#: src/clients/ntp-client_proposal.rb:380 #, fuzzy msgid "" "Synchronization with NTP server is not possible\n" @@ -92,13 +92,13 @@ "without having package %1 installed." #. Only if network is running try to synchronize the ntp server -#: src/clients/ntp-client_proposal.rb:398 +#: src/clients/ntp-client_proposal.rb:392 #, fuzzy msgid "Synchronizing with NTP server..." msgstr "Synchronise with NTP Server" #. update time widgets -#: src/clients/ntp-client_proposal.rb:443 +#: src/clients/ntp-client_proposal.rb:438 #, fuzzy #| msgid "Connection to the LDAP server cannot be established." msgid "Connection to selected NTP server failed." @@ -106,7 +106,7 @@ #. Translators: yes-no popup, #. ntpdate is a command, %1 is the server address -#: src/clients/ntp-client_proposal.rb:474 +#: src/clients/ntp-client_proposal.rb:469 msgid "" "Test query to server '%1' failed.\n" "If server is not yet accessible or network is not configured\n" @@ -1354,27 +1354,27 @@ msgstr "Initialising ..." #. NtpClient read dialog caption -#: src/modules/NtpClient.rb:477 +#: src/modules/NtpClient.rb:486 msgid "Initializing NTP Client Configuration" msgstr "Initialising NTP Client Configuration" #. progress stage -#: src/modules/NtpClient.rb:492 +#: src/modules/NtpClient.rb:501 msgid "Read network configuration" msgstr "Read network configuration" #. progress stage -#: src/modules/NtpClient.rb:494 +#: src/modules/NtpClient.rb:503 msgid "Read NTP settings" msgstr "Read NTP settings" #. progress step -#: src/modules/NtpClient.rb:498 +#: src/modules/NtpClient.rb:507 msgid "Reading network configuration..." msgstr "Reading network configuration..." #. progress step -#: src/modules/NtpClient.rb:500 +#: src/modules/NtpClient.rb:509 msgid "Reading NTP settings..." msgstr "Reading NTP settings..." @@ -1384,119 +1384,119 @@ #. (This would be done if yast2-ntp-client will be called in the UI) #. In that case the error popup will not be shown. (bnc#889557) #. progress step -#: src/modules/NtpClient.rb:502 src/modules/NtpClient.rb:597 -#: src/modules/NtpClient.rb:758 src/modules/NtpClient.rb:909 +#: src/modules/NtpClient.rb:511 src/modules/NtpClient.rb:606 +#: src/modules/NtpClient.rb:767 src/modules/NtpClient.rb:918 msgid "Finished" msgstr "Finished" #. boolean update_dhcp = original_config_dhcp != config_dhcp; #. NtpClient read dialog caption -#: src/modules/NtpClient.rb:731 +#: src/modules/NtpClient.rb:740 msgid "Saving NTP Client Configuration" msgstr "Saving NTP Client Configuration" #. progress stage -#: src/modules/NtpClient.rb:748 +#: src/modules/NtpClient.rb:757 msgid "Write NTP settings" msgstr "Write NTP settings" #. progress stage -#: src/modules/NtpClient.rb:750 +#: src/modules/NtpClient.rb:759 msgid "Restart NTP daemon" msgstr "Restart NTP daemon" #. progress step -#: src/modules/NtpClient.rb:754 +#: src/modules/NtpClient.rb:763 msgid "Writing the settings..." msgstr "Writing the settings..." #. progress step -#: src/modules/NtpClient.rb:756 +#: src/modules/NtpClient.rb:765 msgid "Restarting NTP daemon..." msgstr "Restarting NTP daemon..." #. error message -#: src/modules/NtpClient.rb:841 +#: src/modules/NtpClient.rb:850 #, fuzzy msgid "Cannot update the dynamic configuration policy." msgstr "Cannot update the configuration of the virtual machine." #. error report -#: src/modules/NtpClient.rb:879 +#: src/modules/NtpClient.rb:888 msgid "Cannot restart the NTP daemon." msgstr "Cannot restart the NTP daemon." #. summary string -#: src/modules/NtpClient.rb:973 +#: src/modules/NtpClient.rb:998 msgid "The NTP daemon starts when starting the system." msgstr "The NTP daemon starts when starting the system." #. summary string -#: src/modules/NtpClient.rb:979 +#: src/modules/NtpClient.rb:1004 msgid "The NTP daemon does not start automatically." msgstr "The NTP daemon does not start automatically." #. summary string, %1 is list of addresses -#: src/modules/NtpClient.rb:985 +#: src/modules/NtpClient.rb:1010 msgid "Servers: %1" msgstr "Servers: %1" #. summary string, %1 is list of addresses -#: src/modules/NtpClient.rb:989 +#: src/modules/NtpClient.rb:1014 msgid "Radio Clocks: %1" msgstr "Radio Clocks: %1" #. summary string, %1 is list of addresses -#: src/modules/NtpClient.rb:993 +#: src/modules/NtpClient.rb:1018 msgid "Peers: %1" msgstr "Peers: %1" #. summary string, %1 is list of addresses -#: src/modules/NtpClient.rb:997 +#: src/modules/NtpClient.rb:1022 msgid "Broadcast time information to: %1" msgstr "Broadcast time information to: %1" #. summary string, %1 is list of addresses -#: src/modules/NtpClient.rb:1001 +#: src/modules/NtpClient.rb:1026 msgid "Accept broadcasted time information from: %1" msgstr "Accept broadcasted time information from: %1" #. summary string, FIXME -#: src/modules/NtpClient.rb:1017 +#: src/modules/NtpClient.rb:1042 #, fuzzy msgid "Combine static and DHCP configuration." msgstr "Write hostname and DNS configuration" #. summary string, FIXME -#: src/modules/NtpClient.rb:1021 +#: src/modules/NtpClient.rb:1046 #, fuzzy msgid "Static configuration only." msgstr "Static Configuration Files" #. summary string, FIXME -#: src/modules/NtpClient.rb:1024 +#: src/modules/NtpClient.rb:1049 #, fuzzy msgid "Custom configuration policy." msgstr "Modem configuration overview" #. An informative popup label diring the NTP server testings -#: src/modules/NtpClient.rb:1057 +#: src/modules/NtpClient.rb:1082 msgid "Testing the NTP server..." msgstr "Testing the NTP server..." #. message report - result of test of connection to NTP server -#: src/modules/NtpClient.rb:1087 +#: src/modules/NtpClient.rb:1103 msgid "Server is reachable and responds properly." msgstr "Server is reachable and responds properly." #. error message - result of test of connection to NTP server #. report error instead of simple message (#306018) -#: src/modules/NtpClient.rb:1091 +#: src/modules/NtpClient.rb:1107 msgid "Server is unreachable or does not respond properly." msgstr "Server is unreachable or does not respond properly." #. if package is not installed (in the inst-sys, it is: bnc#399659) -#: src/modules/NtpClient.rb:1109 +#: src/modules/NtpClient.rb:1125 #, fuzzy #| msgid "" #| "Cannot search for NTP server in local network\n" Modified: trunk/yast/en_GB/po/oneclickinstall.en_GB.po =================================================================== --- trunk/yast/en_GB/po/oneclickinstall.en_GB.po 2015-09-09 08:18:21 UTC (rev 92602) +++ trunk/yast/en_GB/po/oneclickinstall.en_GB.po 2015-09-09 08:19:44 UTC (rev 92603) @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-04 15:52+0200\n" +"POT-Creation-Date: 2015-08-25 18:36+0200\n" "PO-Revision-Date: 2001-07-17 16:27+0200\n" "Last-Translator: James Ogley \n" "Language-Team: English \n" @@ -74,7 +74,7 @@ #. Remove any removals #. initialize slideshow data (package counters) #: src/clients/OneClickInstallCLI.rb:139 -#: src/modules/OneClickInstallWorkerFunctions.rb:292 +#: src/modules/OneClickInstallWorkerFunctions.rb:291 msgid "Removing Packages..." msgstr "Removing Packages..." @@ -85,7 +85,7 @@ #. if that was successful now try and install the patterns #. initialize slideshow data (package counters) #: src/clients/OneClickInstallCLI.rb:152 -#: src/modules/OneClickInstallWorkerFunctions.rb:265 +#: src/modules/OneClickInstallWorkerFunctions.rb:264 msgid "Installing Patterns..." msgstr "Installing Patterns..." @@ -98,8 +98,8 @@ #. initialize slideshow data (package counters) #: src/clients/OneClickInstallCLI.rb:165 #: src/clients/OneClickInstallWorker.rb:71 -#: src/modules/OneClickInstallWorkerFunctions.rb:224 -#: src/modules/OneClickInstallWorkerFunctions.rb:232 +#: src/modules/OneClickInstallWorkerFunctions.rb:223 +#: src/modules/OneClickInstallWorkerFunctions.rb:231 msgid "Installing Packages..." msgstr "Installing Packages..." @@ -390,36 +390,36 @@ msgid "Adding repository %1" msgstr "Adding repository %1" -#: src/modules/OneClickInstallWorkerFunctions.rb:124 +#: src/modules/OneClickInstallWorkerFunctions.rb:123 msgid "An error occurred while initializing the software repository." msgstr "An error occurred while initialising the software repository." -#: src/modules/OneClickInstallWorkerFunctions.rb:127 +#: src/modules/OneClickInstallWorkerFunctions.rb:126 msgid "Details:" msgstr "Details:" -#: src/modules/OneClickInstallWorkerFunctions.rb:132 +#: src/modules/OneClickInstallWorkerFunctions.rb:131 msgid "Try again?" msgstr "Try again?" #. * Install all the specified packages #. * return true if all installations were successful, false otherwise -#: src/modules/OneClickInstallWorkerFunctions.rb:186 +#: src/modules/OneClickInstallWorkerFunctions.rb:185 msgid "Marking package %1 for installation" msgstr "Marking package %1 for installation" #. If we didn't find it in the repos specified in the YMP try any repo. -#: src/modules/OneClickInstallWorkerFunctions.rb:212 +#: src/modules/OneClickInstallWorkerFunctions.rb:211 msgid "Warning: package %1 could not be installed." msgstr "Warning: package %1 could not be installed." -#: src/modules/OneClickInstallWorkerFunctions.rb:226 +#: src/modules/OneClickInstallWorkerFunctions.rb:225 msgid "Performing Installation..." msgstr "Performing Installation..." #. * Install all the specified patterns #. * return true if all installations were successful, false otherwise -#: src/modules/OneClickInstallWorkerFunctions.rb:253 +#: src/modules/OneClickInstallWorkerFunctions.rb:252 msgid "Warning: pattern %1 could not be installed." msgstr "Warning: pattern %1 could not be installed." Modified: trunk/yast/en_GB/po/online-update-configuration.en_GB.po =================================================================== --- trunk/yast/en_GB/po/online-update-configuration.en_GB.po 2015-09-09 08:18:21 UTC (rev 92602) +++ trunk/yast/en_GB/po/online-update-configuration.en_GB.po 2015-09-09 08:19:44 UTC (rev 92603) @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-04 15:53+0200\n" +"POT-Creation-Date: 2015-08-25 18:37+0200\n" "PO-Revision-Date: 2001-07-17 16:27+0200\n" "Last-Translator: James Ogley \n" "Language-Team: English \n" Modified: trunk/yast/en_GB/po/online-update.en_GB.po =================================================================== --- trunk/yast/en_GB/po/online-update.en_GB.po 2015-09-09 08:18:21 UTC (rev 92602) +++ trunk/yast/en_GB/po/online-update.en_GB.po 2015-09-09 08:19:44 UTC (rev 92603) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: yast2 9.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-04 15:53+0200\n" +"POT-Creation-Date: 2015-08-25 18:37+0200\n" "PO-Revision-Date: 2007-08-16 20:11+0100\n" "Last-Translator: Benjamin Weber\n" "Language-Team: British English\n" @@ -252,9 +252,13 @@ #. popup message #: src/modules/OnlineUpdate.rb:51 +#, fuzzy +#| msgid "" +#| "Packages for package management were updated.\n" +#| "Finishing and restarting now." msgid "" "Packages for package management were updated.\n" -"Finishing and restarting now." +"Finishing and restarting YaST now." msgstr "" "Packages for package management were updated.\n" "Finishing and restarting now." @@ -331,66 +335,50 @@ msgstr "OK" #. Progress log. Leave the space at the end, some other text may follow -#: src/modules/OnlineUpdateCallbacks.rb:233 +#: src/modules/OnlineUpdateCallbacks.rb:230 #, fuzzy msgid "Downloading delta RPM %1 " msgstr "Downloading delta RPM %1" #. progress bar label -#: src/modules/OnlineUpdateCallbacks.rb:239 +#: src/modules/OnlineUpdateCallbacks.rb:236 msgid "Delta RPM Download Progress" msgstr "Delta RPM Download Progress" #. progress log item (previous action failed(%1 is reason) -#: src/modules/OnlineUpdateCallbacks.rb:265 +#: src/modules/OnlineUpdateCallbacks.rb:262 msgid "Failed to download delta RPM: %1" msgstr "Failed to download delta RPM: %1" #. Progress log item (%1 is name of delta RPM). #. Leave the space at the end, some other text may follow. -#: src/modules/OnlineUpdateCallbacks.rb:280 +#: src/modules/OnlineUpdateCallbacks.rb:277 #, fuzzy msgid "Applying delta RPM: %1 " msgstr "Applying delta RPM: %1" #. progress bar label -#: src/modules/OnlineUpdateCallbacks.rb:287 +#: src/modules/OnlineUpdateCallbacks.rb:284 msgid "Delta RPM Application Progress" msgstr "Delta RPM Application Progress" #. progress log item (previous action failed(%1 is reason) -#: src/modules/OnlineUpdateCallbacks.rb:316 +#: src/modules/OnlineUpdateCallbacks.rb:313 msgid "Failed to apply delta RPM: %1" msgstr "Failed to apply delta RPM: %1" -#. Progress log; lave the space at the end, some other text may follow. -#: src/modules/OnlineUpdateCallbacks.rb:331 -#, fuzzy -msgid "Downloading patch RPM %1 " -msgstr "Downloading patch RPM %1" - #. progress bar label -#: src/modules/OnlineUpdateCallbacks.rb:337 -msgid "Patch RPM Download Progress" -msgstr "Patch RPM Download Progress" - -#. progress log item (previous action failed(%1 is reason) -#: src/modules/OnlineUpdateCallbacks.rb:364 -msgid "Failed to download patch RPM: %1" -msgstr "Failed to download patch RPM: %1" - -#. progress bar label -#: src/modules/OnlineUpdateCallbacks.rb:405 +#: src/modules/OnlineUpdateCallbacks.rb:354 msgid "Script Execution Progress" msgstr "Script Execution Progress" #. log entry, %1 is name of the patch which contains the script -#: src/modules/OnlineUpdateCallbacks.rb:411 +#: src/modules/OnlineUpdateCallbacks.rb:360 msgid "Starting script %1" msgstr "Starting script %1" #. label, %1 is patch name with version and architecture -#: src/modules/OnlineUpdateCallbacks.rb:481 +#: src/modules/OnlineUpdateCallbacks.rb:430 msgid "" "Patch %1\n" "\n" @@ -399,7 +387,7 @@ "\n" #. error popoup (detailed info follows) -#: src/modules/OnlineUpdateCallbacks.rb:614 +#: src/modules/OnlineUpdateCallbacks.rb:549 #, fuzzy msgid "There was an error in the repository initialization." msgstr "Error while moving repository content." @@ -562,6 +550,16 @@ "Contact us if you need further assistance." msgstr "" +#, fuzzy +#~ msgid "Downloading patch RPM %1 " +#~ msgstr "Downloading patch RPM %1" + +#~ msgid "Patch RPM Download Progress" +#~ msgstr "Patch RPM Download Progress" + +#~ msgid "Failed to download patch RPM: %1" +#~ msgstr "Failed to download patch RPM: %1" + #~ msgid "" #~ "If you abort the installation now, SuSEconfig will\n" #~ "not be run. The patches have been installed\n" Modified: trunk/yast/en_GB/po/opensuse_mirror.en_GB.po =================================================================== --- trunk/yast/en_GB/po/opensuse_mirror.en_GB.po 2015-09-09 08:18:21 UTC (rev 92602) +++ trunk/yast/en_GB/po/opensuse_mirror.en_GB.po 2015-09-09 08:19:44 UTC (rev 92603) @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-04 15:53+0200\n" +"POT-Creation-Date: 2015-08-25 18:37+0200\n" "PO-Revision-Date: 2001-07-17 16:27+0200\n" "Last-Translator: James Ogley \n" "Language-Team: English \n" Modified: trunk/yast/en_GB/po/packager.en_GB.po =================================================================== --- trunk/yast/en_GB/po/packager.en_GB.po 2015-09-09 08:18:21 UTC (rev 92602) +++ trunk/yast/en_GB/po/packager.en_GB.po 2015-09-09 08:19:44 UTC (rev 92603) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: yast2 9.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-10-29 16:21+0100\n" +"POT-Creation-Date: 2015-08-25 18:37+0200\n" "PO-Revision-Date: 2007-08-16 20:13+0100\n" "Last-Translator: Benjamin Weber\n" "Language-Team: British English\n" @@ -234,7 +234,7 @@ #. TRANSLATORS: popup header #. TRANSLATORS: popup header #: src/clients/inst_productsources.rb:268 -#: src/clients/inst_productsources.rb:1343 +#: src/clients/inst_productsources.rb:1346 #, fuzzy msgid "Aborting Configuration of Online Repository" msgstr "Routing Configuration Summary:" @@ -242,7 +242,7 @@ #. TRANSLATORS: popup question #. TRANSLATORS: popup question #: src/clients/inst_productsources.rb:270 -#: src/clients/inst_productsources.rb:1345 +#: src/clients/inst_productsources.rb:1348 #, fuzzy msgid "Are you sure you want to abort the configuration?" msgstr "" @@ -269,49 +269,49 @@ "Would you like to configure it?" #. TRANSLATORS: progress step -#: src/clients/inst_productsources.rb:643 +#: src/clients/inst_productsources.rb:646 #, fuzzy msgid "Check network configuration" msgstr "Read network configuration" #. TRANSLATORS: progress step -#: src/clients/inst_productsources.rb:645 +#: src/clients/inst_productsources.rb:648 #, fuzzy msgid "Download list of online repositories" msgstr "Download of Release Notes" #. TRANSLATORS: progress step -#: src/clients/inst_productsources.rb:650 +#: src/clients/inst_productsources.rb:653 #, fuzzy msgid "Checking network configuration..." msgstr "Reading network configuration..." #. TRANSLATORS: progress step -#: src/clients/inst_productsources.rb:652 +#: src/clients/inst_productsources.rb:655 #, fuzzy msgid "Downloading list of online repositories..." msgstr "Downloading the latest release notes..." #. TRANSLATORS: progress step -#: src/clients/inst_productsources.rb:661 +#: src/clients/inst_productsources.rb:664 #, fuzzy msgid "Initialize the repository manager" msgstr "Cannot Initialise the Package Database" #. TRANSLATORS: progress step -#: src/clients/inst_productsources.rb:666 +#: src/clients/inst_productsources.rb:669 #, fuzzy msgid "Initializing the repository manager..." msgstr "Initialising new package database..." #. TRANSLATORS: dialog caption -#: src/clients/inst_productsources.rb:676 +#: src/clients/inst_productsources.rb:679 #, fuzzy msgid "Reading List of Online Repositories" msgstr "Reposi&tories" #. TRANSLATORS: dialog help -#: src/clients/inst_productsources.rb:682 +#: src/clients/inst_productsources.rb:685 #, fuzzy msgid "" "<p>The packager is being initialized and \n" @@ -319,7 +319,7 @@ msgstr "<p>Please wait while packages are installed.</p>" #. TRANSLATORS: error report -#: src/clients/inst_productsources.rb:714 +#: src/clients/inst_productsources.rb:717 #, fuzzy msgid "" "Cannot download list of repositories,\n" @@ -327,7 +327,7 @@ msgstr "Download of Release Notes" #. TRANSLATORS: light-warning message -#: src/clients/inst_productsources.rb:792 +#: src/clients/inst_productsources.rb:795 #, fuzzy msgid "" "No product URL defined from which to download\n" @@ -335,7 +335,7 @@ msgstr "Download of Release Notes" #. TRANSLATORS: warning message -#: src/clients/inst_productsources.rb:806 +#: src/clients/inst_productsources.rb:809 #, fuzzy msgid "" "Unable to download list of repositories\n" @@ -345,13 +345,13 @@ #. TRANSLATORS: HTML-formatted summary text #. %1 is replaced with "Yes" (currently only "Yes") #. see *4 -#: src/clients/inst_productsources.rb:912 +#: src/clients/inst_productsources.rb:915 #, fuzzy msgid "<b>Recommended:</b> %1<br>" msgstr "<b>Summary:</b> %1<br>" #. TRANSLATORS: used for "Recommended: Yes" (see *4) -#: src/clients/inst_productsources.rb:914 +#: src/clients/inst_productsources.rb:917 msgid "Yes" msgstr "Yes" @@ -362,7 +362,7 @@ #. %3 is replaced with a summary text for the selected repository #. %4 is replaced with a description text for the selected repository #. %5 is replaced with an emty string or "Recommended: Yes" (*4) -#: src/clients/inst_productsources.rb:926 +#: src/clients/inst_productsources.rb:929 msgid "" "<p>\n" "<b>URL:</b> %1<br>\n" @@ -374,31 +374,31 @@ msgstr "" #. TRANSLATORS: dialog caption -#: src/clients/inst_productsources.rb:1234 +#: src/clients/inst_productsources.rb:1237 #, fuzzy msgid "List of Online Repositories" msgstr "Reposi&tories" #. TRANSLATORS: push button #. push button -#: src/clients/inst_productsources.rb:1241 src/modules/SourceManagerSLP.rb:111 +#: src/clients/inst_productsources.rb:1244 src/modules/SourceManagerSLP.rb:111 msgid "&Filter" msgstr "&Filter" #. TRANSLATORS: multi-selection box -#: src/clients/inst_productsources.rb:1251 +#: src/clients/inst_productsources.rb:1254 #, fuzzy msgid "&List of Repositories" msgstr "Reposi&tories" #. TRANSLATORS: Rich-text widget (HTML) -#: src/clients/inst_productsources.rb:1257 +#: src/clients/inst_productsources.rb:1260 #, fuzzy msgid "Repository Description" msgstr "No Description" #. TRANSLATORS: dialog help 1/3 -#: src/clients/inst_productsources.rb:1261 +#: src/clients/inst_productsources.rb:1264 #, fuzzy msgid "" "<p>List of default online repositories.\n" @@ -408,33 +408,33 @@ "Please wait while the image is retrieved.</p>\n" #. TRANSLATORS: dialog help 2/3 (version for installation) -#: src/clients/inst_productsources.rb:1266 +#: src/clients/inst_productsources.rb:1269 #, fuzzy #| msgid "Select one of them or type your own new name and click <b>Next</b>.</p>" msgid "<p>Select the online repositories you want to use then click <b>Next</b>.</p>\n" msgstr "Select one of them or type your own new name and click <b>Next</b>.</p>" #. TRANSLATORS: dialog help 2/3 (version for running system) -#: src/clients/inst_productsources.rb:1270 +#: src/clients/inst_productsources.rb:1273 #, fuzzy #| msgid "<p>Select language extensions to be installed and click <b>Accept</b>.</p>" msgid "<p>Select the online repositories you want to use then click <b>Finish</b>.</p>\n" msgstr "<p>Select language extensions to be installed and click <b>Accept</b>.</p>" #. TRANSLATORS: dialog help 3/3 -#: src/clients/inst_productsources.rb:1275 +#: src/clients/inst_productsources.rb:1278 msgid "<p>To remove a used repository, simply deselect it.</p>" msgstr "" #. TRANSLATORS: dialog caption -#: src/clients/inst_productsources.rb:1371 +#: src/clients/inst_productsources.rb:1374 #, fuzzy msgid "Writing List of Online Repositories" msgstr "Reposi&tories" #. TRANSLATORS: dialog help #. TRANSLATORS: dialog help -#: src/clients/inst_productsources.rb:1377 +#: src/clients/inst_productsources.rb:1380 #: src/include/packager/repositories_include.rb:91 #, fuzzy msgid "<p>The repository manager is downloading repository details...</p>" @@ -448,53 +448,53 @@ #. %1 is replaced with a repository name or URL #. TRANSLATORS: pop-up error message #. %1 is replaced with a repository name or URL -#: src/clients/inst_productsources.rb:1469 -#: src/clients/inst_productsources.rb:1493 -#: src/clients/inst_productsources.rb:1511 +#: src/clients/inst_productsources.rb:1472 +#: src/clients/inst_productsources.rb:1496 +#: src/clients/inst_productsources.rb:1514 #, fuzzy msgid "Adding repository %1 failed." msgstr "Reading file on %1 failed.\n" #. TRANSLATORS: progress step -#: src/clients/inst_productsources.rb:1588 +#: src/clients/inst_productsources.rb:1591 #, fuzzy msgid "Delete deselected online repositories" msgstr "Delete selected catalogue from list?" #. TRANSLATORS: progress step -#: src/clients/inst_productsources.rb:1590 +#: src/clients/inst_productsources.rb:1593 #, fuzzy msgid "Deleting deselected online repositories..." msgstr "Detecting mounted ext2 file systems..." #. TRANSLATORS: progress step -#: src/clients/inst_productsources.rb:1598 +#: src/clients/inst_productsources.rb:1601 #, fuzzy msgid "Add all selected online repositories" msgstr "Delete selected catalogue from list?" #. TRANSLATORS: progress step -#: src/clients/inst_productsources.rb:1603 +#: src/clients/inst_productsources.rb:1606 #, fuzzy msgid "Adding all selected online repositories..." msgstr "Detecting mounted ext2 file systems..." #. TRANSLATORS: progress step #. %1 is replaced with repository name or URL -#: src/clients/inst_productsources.rb:1612 +#: src/clients/inst_productsources.rb:1615 #, fuzzy msgid "Add repository: %1" msgstr "&Alice Repository:" #. TRANSLATORS: progress step, #. %1 is replaced with repository name or URL -#: src/clients/inst_productsources.rb:1621 +#: src/clients/inst_productsources.rb:1624 #, fuzzy msgid "Adding repository: %1 ..." msgstr "Adding partition %1 to swap..." #. less than LOW_MEMORY_MIB RAM -#: src/clients/inst_productsources.rb:1733 +#: src/clients/inst_productsources.rb:1736 msgid "" "Low memory detected.\n" "\n" @@ -517,7 +517,7 @@ #. re-initialize package information #. force reinitialization -#: src/clients/inst_rpmcopy.rb:129 src/clients/sw_single.rb:744 +#: src/clients/inst_rpmcopy.rb:129 src/clients/sw_single.rb:739 msgid "Installing Packages..." msgstr "Installing Packages..." @@ -554,8 +554,8 @@ #. dialog caption #. dialog caption #. dialog caption -#: src/clients/key_manager.rb:70 src/clients/repositories.rb:1809 -#: src/modules/AddOnProduct.rb:683 +#: src/clients/key_manager.rb:70 src/clients/repositories.rb:1810 +#: src/modules/AddOnProduct.rb:682 msgid "Initializing..." msgstr "Initialising..." @@ -622,7 +622,7 @@ #. label to be used instead of URL if not found #: src/clients/repositories.rb:328 src/clients/repositories.rb:361 -#: src/modules/AddOnProduct.rb:1325 +#: src/modules/AddOnProduct.rb:1334 msgid "URL: %1" msgstr "URL: %1" @@ -880,7 +880,7 @@ #. popup message part 2 followed by other info #. popup message, after message header, header of details -#: src/clients/repositories.rb:1011 src/modules/Packages.rb:1323 +#: src/clients/repositories.rb:1011 src/modules/Packages.rb:1329 #: src/modules/SourceManager.rb:162 src/modules/SourceManager.rb:310 msgid "Details:" msgstr "Details:" @@ -888,7 +888,7 @@ #. popup message part 3 #. end of popup message, question #. end of popup message, question -#: src/clients/repositories.rb:1013 src/modules/Packages.rb:1331 +#: src/clients/repositories.rb:1013 src/modules/Packages.rb:1337 #: src/modules/SourceManager.rb:164 src/modules/SourceManager.rb:312 msgid "Try again?" msgstr "Try again?" @@ -910,7 +910,7 @@ "All changes will be lost." #. refresh also the combobox widget -#: src/clients/repositories.rb:1328 +#: src/clients/repositories.rb:1329 #, fuzzy msgid "" "There is no service at URL:\n" @@ -918,47 +918,47 @@ msgstr "There is no profile '%1'" #. TODO: add help text -#: src/clients/repositories.rb:1439 +#: src/clients/repositories.rb:1440 #, fuzzy msgid "Refreshing Repositories" msgstr "Refreshing repository " -#: src/clients/repositories.rb:1440 +#: src/clients/repositories.rb:1441 #, fuzzy msgid "Refreshing Services" msgstr "Refreshing repository " -#: src/clients/repositories.rb:1445 +#: src/clients/repositories.rb:1446 #, fuzzy msgid "Refresh Repositories" msgstr "Registered Host" -#: src/clients/repositories.rb:1446 +#: src/clients/repositories.rb:1447 #, fuzzy msgid "Refresh Services" msgstr "Registered Host" #. progress bar label -#: src/clients/repositories.rb:1478 +#: src/clients/repositories.rb:1479 #, fuzzy msgid "Refreshing Repository %1..." msgstr "Refreshing repository " #. refreshing services #. progress bar label -#: src/clients/repositories.rb:1504 +#: src/clients/repositories.rb:1505 #, fuzzy msgid "Refreshing Service %1..." msgstr "Restarting service %1..." #. yes-no popup -#: src/clients/repositories.rb:1523 +#: src/clients/repositories.rb:1524 #, fuzzy msgid "Delete the selected repository from the list?" msgstr "Delete selected catalogue from list?" #. yes-no popup -#: src/clients/repositories.rb:1537 +#: src/clients/repositories.rb:1538 #, fuzzy msgid "" "Delete service %1\n" @@ -966,7 +966,7 @@ msgstr "Delete selected catalogue from list?" #. popup message -#: src/clients/repositories.rb:1605 +#: src/clients/repositories.rb:1606 #, fuzzy msgid "" "For the selected repository, refresh\n" @@ -976,7 +976,7 @@ "cannot be set." #. popup question, %1 is repository URL -#: src/clients/repositories.rb:1767 +#: src/clients/repositories.rb:1768 msgid "" "Repository %1\n" "has been already added. Each repository should be added only once.\n" @@ -985,7 +985,7 @@ msgstr "" #. Error popup -#: src/clients/repositories.rb:1835 +#: src/clients/repositories.rb:1836 #, fuzzy msgid "<p>Errors occurred while restoring the repository configuration.</p>\n" msgstr "<p>Please wait while reading the configuration.</p>" @@ -1124,7 +1124,7 @@ "Install them now?\n" #. start the repository manager -#: src/clients/sw_single.rb:619 +#: src/clients/sw_single.rb:614 #, fuzzy msgid "" "Cannot configure online update repository \n" @@ -1133,7 +1133,7 @@ "Cannot search for SLP installation sources\n" "without having %1 package installed" -#: src/clients/sw_single.rb:645 +#: src/clients/sw_single.rb:640 #, fuzzy msgid "" "Cannot search packages in online repositories\n" @@ -1143,7 +1143,7 @@ "without having %1 package installed" #. error report, %1 is a list of packages -#: src/clients/sw_single.rb:673 +#: src/clients/sw_single.rb:668 #, fuzzy #| msgid "" #| "Following packages haven't been found on the medium:\n" @@ -1309,7 +1309,7 @@ msgid "&Start Check" msgstr "&Start Check" -#: src/include/checkmedia/ui.rb:361 src/modules/SourceManager.rb:684 +#: src/include/checkmedia/ui.rb:361 src/modules/SourceManager.rb:685 msgid "&Eject" msgstr "&Eject" @@ -1576,7 +1576,7 @@ #. popup message part 1 #. Import GPG keys found in the inst-sys #: src/include/packager/repositories_include.rb:319 -#: src/modules/Packages.rb:1318 src/modules/SourceManager.rb:306 +#: src/modules/Packages.rb:1324 src/modules/SourceManager.rb:306 #, fuzzy msgid "" "Unable to create repository\n" @@ -1615,84 +1615,94 @@ #. error report #. popup error #. popup error -#: src/modules/AddOnProduct.rb:517 src/modules/AddOnProduct.rb:619 -#: src/modules/ProductLicense.rb:534 src/modules/ProductLicense.rb:725 +#: src/modules/AddOnProduct.rb:516 src/modules/AddOnProduct.rb:618 +#: src/modules/ProductLicense.rb:539 src/modules/ProductLicense.rb:730 #, fuzzy msgid "An error occurred while preparing the installation system." msgstr "An error occurred during the installation of" #. error report -#: src/modules/AddOnProduct.rb:654 +#: src/modules/AddOnProduct.rb:653 #, fuzzy msgid "Control file %1 not found on media." msgstr "Control file %1 was not found." +#. FATE #305578: Add-On Product Requiring Registration +#. or check the content file +#: src/modules/AddOnProduct.rb:894 +#, fuzzy +#| msgid "Package %1 was not installed. The service cannot be edited." +msgid "" +"Package '%s' is not installed.\n" +"The add-on product cannot be registered." +msgstr "Package %1 was not installed. The service cannot be edited." + #. TRANSLATORS: error report #. TRANSLATORS: error report -#: src/modules/AddOnProduct.rb:1252 src/modules/AddOnProduct.rb:1416 +#: src/modules/AddOnProduct.rb:1261 src/modules/AddOnProduct.rb:1425 #, fuzzy msgid "Unable to use additional products." msgstr "Insert the add-on product CD" #. fill up internal map (used later when item selected) -#: src/modules/AddOnProduct.rb:1303 src/modules/AddOnProduct.rb:1309 +#: src/modules/AddOnProduct.rb:1312 src/modules/AddOnProduct.rb:1318 #, fuzzy msgid "%1, URL: %2" msgstr "%1, %2" -#: src/modules/AddOnProduct.rb:1319 +#: src/modules/AddOnProduct.rb:1328 #, fuzzy msgid "URL: %1, Path: %2" msgstr "URL: %1, Directory: %2" #. TRANSLATORS: popup heading -#: src/modules/AddOnProduct.rb:1350 +#: src/modules/AddOnProduct.rb:1359 #, fuzzy msgid "Additional Products" msgstr "Additional &LDAP Groups" #. TRANSLATORS: additional dialog information -#: src/modules/AddOnProduct.rb:1356 +#: src/modules/AddOnProduct.rb:1365 msgid "" "The installation repository also contains the listed additional repositories.\n" "Select the ones you want to use.\n" msgstr "" -#: src/modules/AddOnProduct.rb:1367 +#: src/modules/AddOnProduct.rb:1376 #, fuzzy msgid "Additional Products to Select" msgstr "Additional Group Settings" #. push button label -#: src/modules/AddOnProduct.rb:1374 +#: src/modules/AddOnProduct.rb:1383 #, fuzzy msgid "Add Selected &Products" msgstr "Add-On Products" #. %1 is either "CD" or "DVD" -#: src/modules/AddOnProduct.rb:1505 +#: src/modules/AddOnProduct.rb:1515 #, fuzzy #| msgid "Insert the add-on product CD" msgid "Insert the addon %1 medium" msgstr "Insert the add-on product CD" #. %1 is the product name, %2 is either "CD" or "DVD" -#: src/modules/AddOnProduct.rb:1510 +#: src/modules/AddOnProduct.rb:1520 #, fuzzy #| msgid "Insert the first installation medium." msgid "Insert the %1 %2 medium" msgstr "Insert the first installation medium." #. TRANSLATORS: error message, %1 is replaced with product URL -#: src/modules/AddOnProduct.rb:1562 +#: src/modules/AddOnProduct.rb:1572 #, fuzzy msgid "Unable to add product %1." msgstr "Unable to write %1." #. adding the product to the list of products (BNC #269625) #. no such products -#: src/modules/AddOnProduct.rb:1754 src/modules/AddOnProduct.rb:1760 -#: src/modules/Packages.rb:469 +#: src/modules/AddOnProduct.rb:1764 src/modules/AddOnProduct.rb:1770 +#: src/modules/Packages.rb:471 msgid "Unknown Product" msgstr "Unknown Product" @@ -1791,7 +1801,7 @@ #. Add "Total" item - at the top so it is visible by default even if there are many items #. #. List column header for total remaining MB and time to install -#: src/modules/PackageSlideShow.rb:924 +#: src/modules/PackageSlideShow.rb:918 msgid "Total" msgstr "Total" @@ -1800,13 +1810,13 @@ #. #. message in the installatino log, %1 is package name, #. %2 is package size -#: src/modules/PackageSlideShow.rb:1051 src/modules/PackageSlideShow.rb:1303 -#: src/modules/PackageSlideShow.rb:1355 +#: src/modules/PackageSlideShow.rb:1045 src/modules/PackageSlideShow.rb:1297 +#: src/modules/PackageSlideShow.rb:1349 #, fuzzy msgid "Downloading %1 (download size %2)" msgstr "Downloading %1 (%2)" -#: src/modules/PackageSlideShow.rb:1081 +#: src/modules/PackageSlideShow.rb:1075 #, fuzzy msgid " (Remaining: %1%2 packages)" msgstr "" @@ -1815,118 +1825,118 @@ #. display download progress in DownloadInAdvance mode #. translations: progress message (part1) -#: src/modules/PackageSlideShow.rb:1114 +#: src/modules/PackageSlideShow.rb:1108 #, fuzzy #| msgid "Downloading Package" msgid "Downloading Packages..." msgstr "Downloading Package" #. progress message (part2) -#: src/modules/PackageSlideShow.rb:1117 +#: src/modules/PackageSlideShow.rb:1111 #, fuzzy msgid " (Downloaded %1 of %2 packages)" msgstr "Downloading Package" #. Heading for the progress bar for the current package #. while it is deleted. "%1" is the package name. -#: src/modules/PackageSlideShow.rb:1253 +#: src/modules/PackageSlideShow.rb:1247 msgid "Deleting %1" msgstr "Deleting %1" #. package installation - summary text #. %1 is RPM name, %2 is installed (unpacked) size (e.g. 6.20MB) -#: src/modules/PackageSlideShow.rb:1260 +#: src/modules/PackageSlideShow.rb:1254 #, fuzzy msgid "Installing %1 (installed size %2)" msgstr "Not installed (%1 -> %2)" #. message in the installatino log, %1 is package name, #. %2 is package size -#: src/modules/PackageSlideShow.rb:1338 +#: src/modules/PackageSlideShow.rb:1332 #, fuzzy msgid "Applying delta RPM: %1" msgstr "Applying delta" #. warning text -#: src/modules/Packages.rb:309 +#: src/modules/Packages.rb:311 #, fuzzy msgid "Your computer is a 64-bit x86-64 system, but you are trying to install a 32-bit distribution." msgstr "However, you are trying to install a 32-bit distribution." #. help text for software proposal -#: src/modules/Packages.rb:325 +#: src/modules/Packages.rb:327 msgid "<P>The pattern list states which functionality will be available after installing the system.</P>" msgstr "" #. (see bnc#178357 why these numbers) #. translators: help text for software proposal -#: src/modules/Packages.rb:337 +#: src/modules/Packages.rb:339 msgid "<P>The proposal reports the total size of files which will be installed to the system. However, the system will contain some other files (temporary and working files) so the used space will be slightly larger than the proposed value. Therefore it is a good idea to have at least 25% (or about 300MB) free space before starting the installation.</P>" msgstr "" #. help text for software proposal -#: src/modules/Packages.rb:342 +#: src/modules/Packages.rb:344 msgid "" "<P>The total 'size to download' is the size of the packages which will be\n" "downloaded from remote (network) repositories. This value is important if the connection is slow or if there is a data limit for downloading.</P>\n" msgstr "" #. help text for software proposal - header -#: src/modules/Packages.rb:351 +#: src/modules/Packages.rb:353 #, fuzzy msgid "<P><B>Software Proposal</B></P>" msgstr "<P><B>UML Installation Proposal</B></P>" #. installation proposal - SW summary, %1 is name of the installed product #. (e.g. openSUSE 10.3, SUSE Linux Enterprise ...) -#: src/modules/Packages.rb:368 +#: src/modules/Packages.rb:370 msgid "Product: %1" msgstr "Product: %1" #. installation proposal - SW summary, %1 is name of the selected desktop or system type (e.g. KDE) -#: src/modules/Packages.rb:382 +#: src/modules/Packages.rb:384 #, fuzzy msgid "System Type: %1" msgstr "System: %1" -#: src/modules/Packages.rb:393 +#: src/modules/Packages.rb:395 #, fuzzy msgid "Patterns:<br>" msgstr "Patterns" #. installation proposal - SW summary, %1 is size of the selected packages (in MB or GB) -#: src/modules/Packages.rb:403 +#: src/modules/Packages.rb:405 msgid "Size of Packages to Install: %1" msgstr "Size of Packages to Install: %1" #. installation proposal - SW summary, %1 is download size of the selected packages #. which will be installed from an ftp or http repository (in MB or GB) -#: src/modules/Packages.rb:416 +#: src/modules/Packages.rb:418 #, fuzzy msgid "Downloading from Remote Repositories: %1" msgstr "Download of Release Notes" -#: src/modules/Packages.rb:478 +#: src/modules/Packages.rb:480 msgid "These add-on products have been marked for auto-removal: %1" msgstr "" #. Warning message when some add-ons are marked to be removed automatically -#: src/modules/Packages.rb:502 +#: src/modules/Packages.rb:504 msgid "Contact the vendors of these add-ons to provide you with new installation media." msgstr "" #. Warning message when some add-ons are marked to be removed automatically -#: src/modules/Packages.rb:506 +#: src/modules/Packages.rb:508 msgid "Contact the vendor of the add-on to provide you with a new installation media." msgstr "" #. error message: %1: e.g. "/usr", %2: "/dev/sda2" -#: src/modules/Packages.rb:547 +#: src/modules/Packages.rb:549 msgid "Error: Cannot check free space in basic directory %1 (device %2), cannot start installation." msgstr "" #. error message: %1: e.g. "/local", %2: "/dev/sda2" -#: src/modules/Packages.rb:567 +#: src/modules/Packages.rb:569 #, fuzzy #| msgid "" #| "There is not enough free space in directory %1.\n" @@ -1937,43 +1947,43 @@ "Continue anyway?\n" #. summary warning -#: src/modules/Packages.rb:610 +#: src/modules/Packages.rb:612 #, fuzzy msgid "Not enough disk space." msgstr "more disk space." #. summary warning -#: src/modules/Packages.rb:612 +#: src/modules/Packages.rb:614 #, fuzzy msgid "Not enough disk space. Remove some packages in the single selection." msgstr "Not enough disk space. Remove some packages in the single selection." #. add a backslash if it's missing -#: src/modules/Packages.rb:633 +#: src/modules/Packages.rb:635 #, fuzzy msgid "Only %1 (%2%%) free space available on partition %3.<BR>" msgstr "No free space available on %1" #. newly installed products -#: src/modules/Packages.rb:702 +#: src/modules/Packages.rb:704 #, fuzzy #| msgid "Package %1 will be installed" msgid "New product <b>%s</b> will be installed" msgstr "Package %1 will be installed" #. product update: %s is a product name -#: src/modules/Packages.rb:712 +#: src/modules/Packages.rb:714 #, fuzzy #| msgid "%1 packages will be updated" msgid "Product <b>%s</b> will be updated" msgstr "%1 packages will be updated" #. product update: %{old_product} is an old product, %{new_product} is the new one -#: src/modules/Packages.rb:714 +#: src/modules/Packages.rb:716 msgid "Product <b>%{old_product}</b> will be updated to <b>%{new_product}</b>" msgstr "" -#: src/modules/Packages.rb:721 +#: src/modules/Packages.rb:723 #, fuzzy #| msgid "Package %1 will be installed." msgid "Product <b>%s</b> will stay installed" @@ -1981,17 +1991,17 @@ #. Removing another product might be an issue #. (just warn if removed by user or by YaST) -#: src/modules/Packages.rb:731 +#: src/modules/Packages.rb:733 msgid "<b>Warning:</b> Product <b>%s</b> will be removed." msgstr "" -#: src/modules/Packages.rb:732 +#: src/modules/Packages.rb:734 msgid "<b>Error:</b> Product <b>%s</b> will be automatically removed.</font>" msgstr "" #. TRANSLATORS: update proposal warning, do NOT translate "-release", #. it is part of a package name (like "sles-release") -#: src/modules/Packages.rb:758 +#: src/modules/Packages.rb:760 msgid "" "<ul><li><b>Some products are marked for automatic removal.</b></li>\n" "<ul><li>Contact the vendor of the removed add-on to provide you with a new\n" @@ -2002,13 +2012,13 @@ msgstr "" #. error in proposal, %1 is URL -#: src/modules/Packages.rb:1339 +#: src/modules/Packages.rb:1345 #, fuzzy msgid "No repository found at '%1'." msgstr "No source found at '%1'." #. TRANSLATORS: beginning of the rich text with the release notes -#: src/modules/Packages.rb:1612 +#: src/modules/Packages.rb:1618 #, fuzzy #| msgid "" #| "<p><b>These are the release notes made for the first initial release. They are\n" @@ -2026,29 +2036,29 @@ "from the SUSE Linux Web server.</b></p>" #. popup - information label -#: src/modules/Packages.rb:1639 +#: src/modules/Packages.rb:1645 #, fuzzy msgid "Integrating booted media..." msgstr "Installing boot manager..." #. close the popup in order to be able to ask about the license -#: src/modules/Packages.rb:1661 +#: src/modules/Packages.rb:1667 #, fuzzy msgid "Failed to integrate the service pack repository." msgstr "Failed to integrate service pack source" #. popup - information label -#: src/modules/Packages.rb:1694 +#: src/modules/Packages.rb:1700 #, fuzzy msgid "Initializing repositories..." msgstr "Initialising fonts..." #. message popup, %1 is product name -#: src/modules/Packages.rb:1926 +#: src/modules/Packages.rb:1932 msgid "Insert %1 CD 1" msgstr "Insert %1 CD 1" -#: src/modules/Packages.rb:1928 +#: src/modules/Packages.rb:1934 #, fuzzy msgid "%1 CD 1 not found" msgstr "" @@ -2056,7 +2066,7 @@ "CA not found" #. an error message -#: src/modules/Packages.rb:2038 +#: src/modules/Packages.rb:2044 msgid "" "Error while initializing package descriptions.\n" "Check the log file %1 for more details." @@ -2065,19 +2075,19 @@ "Check the log file %1 for more details." #. bnc #436925 -#: src/modules/Packages.rb:2299 +#: src/modules/Packages.rb:2305 msgid "" "The software selection has been changed externally.\n" "Software proposal will be called again." msgstr "" #. popup label -#: src/modules/Packages.rb:2317 +#: src/modules/Packages.rb:2323 msgid "Evaluating package selection..." msgstr "Evaluating package selection..." #. Error message, %{pattern_name} is replaced with the missing pattern name in runtime -#: src/modules/Packages.rb:2615 +#: src/modules/Packages.rb:2621 msgid "" "Failed to select default product pattern %{pattern_name}.\n" "Pattern has not been found." @@ -2085,7 +2095,7 @@ #. Sets that the license (file) has been already accepted #. -#. @param string filename +#. @param [String] license_ident file name #: src/modules/ProductLicense.rb:150 src/modules/ProductLicense.rb:157 #, fuzzy msgid "Cannot read license file %1" @@ -2127,39 +2137,49 @@ "the configuration will be aborted.</p>\n" #. dialog title +#. #459391 +#. If a progress is running open another dialog #. dialog caption -#: src/modules/ProductLicense.rb:410 src/modules/ProductLicense.rb:1211 +#: src/modules/ProductLicense.rb:410 src/modules/ProductLicense.rb:1149 +#: src/modules/ProductLicense.rb:1227 msgid "License Agreement" msgstr "License Agreement" #. popup question -#: src/modules/ProductLicense.rb:1016 +#: src/modules/ProductLicense.rb:1021 #, fuzzy msgid "Really abort the add-on product installation?" msgstr "Really abort the installation?" #. text asking whether to refuse a license (Yes-No popup) -#: src/modules/ProductLicense.rb:1040 +#: src/modules/ProductLicense.rb:1045 msgid "" "Refusing the license agreement cancels the installation.\n" "Really refuse the agreement?" msgstr "" #. text asking whether to refuse a license (Yes-No popup) -#: src/modules/ProductLicense.rb:1043 +#: src/modules/ProductLicense.rb:1048 msgid "" "Refusing the license agreement cancels the add-on\n" "product installation. Really refuse the agreement?" msgstr "" #. timed ok/cancel popup -#: src/modules/ProductLicense.rb:1053 +#: src/modules/ProductLicense.rb:1058 #, fuzzy msgid "The system is shutting down..." msgstr "System is shutting down..." +#. %s is an extension name, e.g. "SUSE Linux Enterprise Software Development Kit" +#: src/modules/ProductLicense.rb:1153 +#, fuzzy +#| msgid "License Agreement" +msgid "%s License Agreement" +msgstr "License Agreement" + #. TRANSLATORS: %{license_url} is an URL where the displayed license can be found -#: src/modules/ProductLicense.rb:1577 +#: src/modules/ProductLicense.rb:1593 msgid "" "If you want to print this EULA, you can download it from\n" "%{license_url}" @@ -2219,177 +2239,169 @@ msgid "Downloading delta RPM %1 (download size %2)" msgstr "Downloading %1 (%2)" -#. remote -#: src/modules/SlideShowCallbacks.rb:461 -#, fuzzy -msgid "Downloading patch RPM %1 (download size %2)" -msgstr "Downloading package %1 (%2)..." - #. error in installation log, %1 is detail error description -#: src/modules/SlideShowCallbacks.rb:483 +#: src/modules/SlideShowCallbacks.rb:472 #, fuzzy msgid "Failed to download delta RPM: %1" msgstr "Failed to deactivate %1." #. error in installation log, %1 is detail error description -#: src/modules/SlideShowCallbacks.rb:492 +#: src/modules/SlideShowCallbacks.rb:481 #, fuzzy msgid "Failed to apply delta RPM: %1" msgstr "Failed to deactivate %1." -#. error in installation log, %1 is detail error description -#: src/modules/SlideShowCallbacks.rb:501 -#, fuzzy -msgid "Failed to download patch RPM: %1" -msgstr "Failed to deactivate %1." - #. radio button -#: src/modules/SourceDialogs.rb:31 +#: src/modules/SourceDialogs.rb:33 msgid "&Scan Using SLP..." msgstr "&Scan Using SLP..." #. radio button -#: src/modules/SourceDialogs.rb:33 +#: src/modules/SourceDialogs.rb:35 #, fuzzy msgid "Commun&ity Repositories" msgstr "Configured Hosts" #. radio button -#: src/modules/SourceDialogs.rb:35 +#: src/modules/SourceDialogs.rb:37 msgid "&Extensions and Modules from Registration Server..." msgstr "" #. radio button -#: src/modules/SourceDialogs.rb:37 +#: src/modules/SourceDialogs.rb:39 msgid "Specify &URL..." msgstr "Specify &URL..." #. radio button -#: src/modules/SourceDialogs.rb:39 +#: src/modules/SourceDialogs.rb:41 msgid "&FTP..." msgstr "&FTP..." #. radio button -#: src/modules/SourceDialogs.rb:41 +#: src/modules/SourceDialogs.rb:43 msgid "&HTTP..." msgstr "&HTTP..." #. radio button -#: src/modules/SourceDialogs.rb:43 +#: src/modules/SourceDialogs.rb:45 msgid "HTT&PS..." msgstr "HTT&PS..." #. radio button #. radio button -#: src/modules/SourceDialogs.rb:45 src/modules/SourceDialogs.rb:1720 -msgid "&SMB/CIFS" +#: src/modules/SourceDialogs.rb:47 src/modules/SourceDialogs.rb:1757 +#, fuzzy +#| msgid "&SMB/CIFS" +msgid "S&MB/CIFS" msgstr "&SMB/CIFS" #. radio button -#: src/modules/SourceDialogs.rb:47 -msgid "&NFS..." +#: src/modules/SourceDialogs.rb:49 +#, fuzzy +#| msgid "&NFS..." +msgid "NF&S..." msgstr "&NFS..." #. radio button -#: src/modules/SourceDialogs.rb:49 +#: src/modules/SourceDialogs.rb:51 msgid "&CD..." msgstr "&CD..." #. radio button -#: src/modules/SourceDialogs.rb:51 +#: src/modules/SourceDialogs.rb:53 msgid "&DVD..." msgstr "&DVD..." #. radio button -#: src/modules/SourceDialogs.rb:53 +#: src/modules/SourceDialogs.rb:55 #, fuzzy msgid "&Hard Disk..." msgstr "&Hard Disk" #. radio button -#: src/modules/SourceDialogs.rb:55 +#: src/modules/SourceDialogs.rb:57 msgid "&USB Mass Storage (USB Stick, Disk)..." msgstr "" #. radio button -#: src/modules/SourceDialogs.rb:57 +#: src/modules/SourceDialogs.rb:59 msgid "&Local Directory..." msgstr "&Local Directory..." #. radio button -#: src/modules/SourceDialogs.rb:59 +#: src/modules/SourceDialogs.rb:61 #, fuzzy msgid "&Local ISO Image..." msgstr "Use &ISO Images" #. check box -#: src/modules/SourceDialogs.rb:61 +#: src/modules/SourceDialogs.rb:63 #, fuzzy msgid "&Download repository description files" msgstr "No Description" #. Help text suffix for some types of the media -#: src/modules/SourceDialogs.rb:110 +#: src/modules/SourceDialogs.rb:116 msgid "" "<p>If the location is a file holding an ISO image\n" "of the media, set <b>ISO Image</b>.</p>" msgstr "" #. Help text suffix for some types of the media -#: src/modules/SourceDialogs.rb:115 +#: src/modules/SourceDialogs.rb:121 msgid "" "<p>If the repository is on multiple media,\n" "set the location of the first media of the set.</p>\n" msgstr "" #. text entry -#: src/modules/SourceDialogs.rb:129 +#: src/modules/SourceDialogs.rb:135 msgid "&Server Name" msgstr "&Server Name" #. text entry #. text entry -#: src/modules/SourceDialogs.rb:137 src/modules/SourceDialogs.rb:1584 +#: src/modules/SourceDialogs.rb:143 src/modules/SourceDialogs.rb:1621 msgid "&Path to Directory or ISO Image" msgstr "&Path to Directory or ISO Image" #. checkbox label -#: src/modules/SourceDialogs.rb:145 +#: src/modules/SourceDialogs.rb:151 #, fuzzy msgid "&ISO Image" msgstr "ISO Image" #. checkbox label -#: src/modules/SourceDialogs.rb:147 +#: src/modules/SourceDialogs.rb:153 #, fuzzy #| msgid "&Protocol" msgid "N&FS v4 Protocol" msgstr "&Protocol" -#: src/modules/SourceDialogs.rb:153 +#: src/modules/SourceDialogs.rb:159 msgid "Mount Options" msgstr "Mount Options" #. TRANSLATORS: "(default)" - is a combobox value and means default libzypp #. NFS mount option (users can change it to anything else, the field is editable) -#: src/modules/SourceDialogs.rb:157 +#: src/modules/SourceDialogs.rb:163 #, fuzzy #| msgid " (default)" msgid "(default)" msgstr " (default)" -#: src/modules/SourceDialogs.rb:168 +#: src/modules/SourceDialogs.rb:174 #, fuzzy msgid "URL of the Repository" msgstr "Name of the group" #. frame -#: src/modules/SourceDialogs.rb:177 +#: src/modules/SourceDialogs.rb:183 msgid "P&rotocol" msgstr "P&rotocol" #. input field label -#: src/modules/SourceDialogs.rb:187 +#: src/modules/SourceDialogs.rb:193 #, fuzzy msgid "&URL of the Repository" msgstr "Name of the group" @@ -2397,42 +2409,42 @@ #. label / dialog caption #. bugzilla #219759 #. service label can be empty (not defined) -#: src/modules/SourceDialogs.rb:202 src/modules/SourceManagerSLP.rb:323 +#: src/modules/SourceDialogs.rb:208 src/modules/SourceManagerSLP.rb:323 #, fuzzy msgid "Repository URL" msgstr "Repository" #. label / dialog caption -#: src/modules/SourceDialogs.rb:204 +#: src/modules/SourceDialogs.rb:210 msgid "NFS Server" msgstr "NFS Server" #. label / dialog caption #. label / dialog caption -#: src/modules/SourceDialogs.rb:206 src/modules/SourceDialogs.rb:208 +#: src/modules/SourceDialogs.rb:212 src/modules/SourceDialogs.rb:214 #, fuzzy msgid "CD or DVD Media" msgstr "Read &CD or DVD Medium" #. label / dialog caption -#: src/modules/SourceDialogs.rb:210 +#: src/modules/SourceDialogs.rb:216 msgid "Hard Disk" msgstr "Hard Disk" #. label / dialog caption -#: src/modules/SourceDialogs.rb:212 +#: src/modules/SourceDialogs.rb:218 #, fuzzy msgid "USB Stick or Disk" msgstr "&USB Stick Boot Image" #. label / dialog caption #. dialog caption -#: src/modules/SourceDialogs.rb:214 src/modules/SourceDialogs.rb:889 +#: src/modules/SourceDialogs.rb:220 src/modules/SourceDialogs.rb:926 msgid "Local Directory" msgstr "Local Directory" #. label / dialog caption -#: src/modules/SourceDialogs.rb:216 +#: src/modules/SourceDialogs.rb:222 #, fuzzy msgid "Local ISO Image" msgstr "Use &ISO Images" @@ -2442,26 +2454,26 @@ #. label / dialog caption #. label / dialog caption #. label / dialog caption -#: src/modules/SourceDialogs.rb:218 src/modules/SourceDialogs.rb:220 -#: src/modules/SourceDialogs.rb:222 src/modules/SourceDialogs.rb:224 -#: src/modules/SourceDialogs.rb:226 +#: src/modules/SourceDialogs.rb:224 src/modules/SourceDialogs.rb:226 +#: src/modules/SourceDialogs.rb:228 src/modules/SourceDialogs.rb:230 +#: src/modules/SourceDialogs.rb:232 msgid "Server and Directory" msgstr "Server and Directory" #. popup message -#: src/modules/SourceDialogs.rb:441 +#: src/modules/SourceDialogs.rb:468 #, fuzzy msgid "The name of the repository cannot be empty." msgstr "Share path cannot be empty." #. text entry -#: src/modules/SourceDialogs.rb:453 +#: src/modules/SourceDialogs.rb:480 #, fuzzy msgid "&Repository Name" msgstr "Repository" #. help text -#: src/modules/SourceDialogs.rb:468 +#: src/modules/SourceDialogs.rb:495 #, fuzzy msgid "" "<p><big><b>Repository Name</b></big><br>\n" @@ -2472,13 +2484,13 @@ "loaded.</p>\n" #. text entry -#: src/modules/SourceDialogs.rb:482 +#: src/modules/SourceDialogs.rb:509 #, fuzzy msgid "&Service Name" msgstr "Service Name" #. help text -#: src/modules/SourceDialogs.rb:490 +#: src/modules/SourceDialogs.rb:517 #, fuzzy msgid "" "<p><big><b>Service Name</b></big><br>\n" @@ -2489,17 +2501,17 @@ "loaded.</p>\n" #. popup message -#: src/modules/SourceDialogs.rb:525 +#: src/modules/SourceDialogs.rb:552 msgid "URL cannot be empty." msgstr "URL cannot be empty." #. text entry -#: src/modules/SourceDialogs.rb:538 +#: src/modules/SourceDialogs.rb:566 msgid "&URL" msgstr "&URL" #. help text -#: src/modules/SourceDialogs.rb:552 +#: src/modules/SourceDialogs.rb:580 #, fuzzy msgid "" "<p><big><b>Repository URL</b></big><br>\n" @@ -2512,17 +2524,17 @@ #. @return widget description map #. Get widget description map #. @return widget description map -#: src/modules/SourceDialogs.rb:725 src/modules/SourceDialogs.rb:1852 +#: src/modules/SourceDialogs.rb:753 src/modules/SourceDialogs.rb:1893 msgid "Edit Parts of the URL" msgstr "" -#: src/modules/SourceDialogs.rb:732 src/modules/SourceDialogs.rb:1859 +#: src/modules/SourceDialogs.rb:760 src/modules/SourceDialogs.rb:1900 #, fuzzy msgid "Edit Complete URL" msgstr "Show Complete &List" #. help text -#: src/modules/SourceDialogs.rb:744 +#: src/modules/SourceDialogs.rb:772 #, fuzzy msgid "" "<p><big><b>NFS Server</b></big><br>\n" @@ -2532,7 +2544,7 @@ "<p><big><b>Kernel</b></big><br>\n" "Use <b>Kernel</b> to specify the kernel image to load.</p>" -#: src/modules/SourceDialogs.rb:751 +#: src/modules/SourceDialogs.rb:779 msgid "" "<p><big><b>Mount Options</b></big><br>\n" "You can specify extra options used for mounting the NFS volume.\n" @@ -2541,16 +2553,16 @@ msgstr "" #. radio button -#: src/modules/SourceDialogs.rb:806 +#: src/modules/SourceDialogs.rb:834 msgid "&CD-ROM" msgstr "&CD-ROM" #. radio button -#: src/modules/SourceDialogs.rb:808 +#: src/modules/SourceDialogs.rb:836 msgid "&DVD-ROM" msgstr "&DVD-ROM" -#: src/modules/SourceDialogs.rb:813 +#: src/modules/SourceDialogs.rb:841 #, fuzzy msgid "" "<p><big><b>CD or DVD Media</b></big><br>\n" @@ -2560,12 +2572,12 @@ "Use <b>Kernel</b> to specify the kernel image to load.</p>" #. dialog caption -#: src/modules/SourceDialogs.rb:904 +#: src/modules/SourceDialogs.rb:941 msgid "ISO Image File" msgstr "ISO Image File" #. error popup - the entered path is not a directory -#: src/modules/SourceDialogs.rb:927 +#: src/modules/SourceDialogs.rb:964 #, fuzzy msgid "" "The entered path is not a directory\n" @@ -2575,7 +2587,7 @@ "Try again.\n" #. error popup - the entered path is not a regular file -#: src/modules/SourceDialogs.rb:957 +#: src/modules/SourceDialogs.rb:994 #, fuzzy msgid "" "The entered path is not a file\n" @@ -2583,7 +2595,7 @@ msgstr "The specified file does not exist." #. continue/cancel popup, %1 is a file name -#: src/modules/SourceDialogs.rb:981 +#: src/modules/SourceDialogs.rb:1018 msgid "" "File '%1'\n" "does not seem to be an ISO image.\n" @@ -2591,19 +2603,19 @@ msgstr "" #. text entry -#: src/modules/SourceDialogs.rb:1002 +#: src/modules/SourceDialogs.rb:1039 #, fuzzy msgid "&Path to Directory" msgstr "&Path to Generated Directory Tree:" #. checkbox label -#: src/modules/SourceDialogs.rb:1010 src/modules/SourceDialogs.rb:1268 -#: src/modules/SourceDialogs.rb:1335 +#: src/modules/SourceDialogs.rb:1047 src/modules/SourceDialogs.rb:1305 +#: src/modules/SourceDialogs.rb:1372 #, fuzzy msgid "&Plain RPM Directory" msgstr "&Path to Generated Directory Tree:" -#: src/modules/SourceDialogs.rb:1025 +#: src/modules/SourceDialogs.rb:1062 #, fuzzy msgid "" "<p><big><b>Local Directory</b></big><br>\n" @@ -2616,22 +2628,22 @@ "Use <b>Kernel</b> to specify the kernel image to load.</p>" #. `opt(`hstretch), -#: src/modules/SourceDialogs.rb:1261 +#: src/modules/SourceDialogs.rb:1298 #, fuzzy msgid "&USB Mass Storage Device" msgstr "Mass Storage Device" #. the spacing is added to make the widget wider -#: src/modules/SourceDialogs.rb:1266 src/modules/SourceDialogs.rb:1333 +#: src/modules/SourceDialogs.rb:1303 src/modules/SourceDialogs.rb:1370 msgid "&File System" msgstr "&File System" -#: src/modules/SourceDialogs.rb:1267 src/modules/SourceDialogs.rb:1334 +#: src/modules/SourceDialogs.rb:1304 src/modules/SourceDialogs.rb:1371 #, fuzzy msgid "Dire&ctory" msgstr "Directory" -#: src/modules/SourceDialogs.rb:1272 +#: src/modules/SourceDialogs.rb:1309 #, fuzzy msgid "" "<p><big><b>USB Stick or Disk</b></big><br>\n" @@ -2647,7 +2659,7 @@ #. 'auto' is a value in the combo box widget, do not translate it! #. 'auto' is a value in the combo box widget, do not translate it! -#: src/modules/SourceDialogs.rb:1282 src/modules/SourceDialogs.rb:1349 +#: src/modules/SourceDialogs.rb:1319 src/modules/SourceDialogs.rb:1386 msgid "" "<p>The file system used on the device will be detected automatically\n" "if you select file system 'auto'. If the detection fails or you\n" @@ -2655,12 +2667,12 @@ msgstr "" #. combobox title -#: src/modules/SourceDialogs.rb:1332 +#: src/modules/SourceDialogs.rb:1369 #, fuzzy msgid "&Disk Device" msgstr "&Floppy Disk Device" -#: src/modules/SourceDialogs.rb:1339 +#: src/modules/SourceDialogs.rb:1376 #, fuzzy msgid "" "<p><big><b>Disk</b></big><br>\n" @@ -2675,13 +2687,13 @@ "Use <b>Kernel</b> to specify the kernel image to load.</p>" #. text entry -#: src/modules/SourceDialogs.rb:1365 +#: src/modules/SourceDialogs.rb:1402 #, fuzzy msgid "&Path to ISO Image" msgstr "&Path to Generated Directory Tree:" #. push button -#: src/modules/SourceDialogs.rb:1385 +#: src/modules/SourceDialogs.rb:1422 #, fuzzy msgid "" "<p><big><b>Local ISO Image</b></big><br>\n" @@ -2692,73 +2704,73 @@ "Use <b>Kernel</b> to specify the kernel image to load.</p>" #. text entry -#: src/modules/SourceDialogs.rb:1566 +#: src/modules/SourceDialogs.rb:1603 msgid "Server &Name" msgstr "Server &Name" -#: src/modules/SourceDialogs.rb:1570 +#: src/modules/SourceDialogs.rb:1607 msgid "&Port" msgstr "&Port" #. text entry -#: src/modules/SourceDialogs.rb:1575 +#: src/modules/SourceDialogs.rb:1612 msgid "&Share" msgstr "&Share" #. checkbox label -#: src/modules/SourceDialogs.rb:1588 +#: src/modules/SourceDialogs.rb:1625 #, fuzzy msgid "ISO &Image" msgstr "Use &ISO Images" #. text entry -#: src/modules/SourceDialogs.rb:1591 +#: src/modules/SourceDialogs.rb:1628 msgid "&Directory on Server" msgstr "&Directory on Server" #. frame -#: src/modules/SourceDialogs.rb:1596 +#: src/modules/SourceDialogs.rb:1633 msgid "Au&thentication" msgstr "Au&thentication" #. check box -#: src/modules/SourceDialogs.rb:1603 +#: src/modules/SourceDialogs.rb:1640 msgid "&Anonymous" msgstr "&Anonymous" #. text entry -#: src/modules/SourceDialogs.rb:1612 +#: src/modules/SourceDialogs.rb:1649 #, fuzzy msgid "&Workgroup or Domain" msgstr "Workgroup or Domain" #. text entry -#: src/modules/SourceDialogs.rb:1621 +#: src/modules/SourceDialogs.rb:1658 msgid "&User Name" msgstr "&User Name" #. password entry -#: src/modules/SourceDialogs.rb:1628 +#: src/modules/SourceDialogs.rb:1665 msgid "&Password" msgstr "&Password" #. radio button -#: src/modules/SourceDialogs.rb:1703 +#: src/modules/SourceDialogs.rb:1740 msgid "&FTP" msgstr "&FTP" #. radio button -#: src/modules/SourceDialogs.rb:1706 +#: src/modules/SourceDialogs.rb:1743 msgid "H&TTP" msgstr "H&TTP" #. radio button -#: src/modules/SourceDialogs.rb:1713 +#: src/modules/SourceDialogs.rb:1750 msgid "HTT&PS" msgstr "HTT&PS" #. help text - server dialog -#: src/modules/SourceDialogs.rb:1883 +#: src/modules/SourceDialogs.rb:1924 msgid "" "<p><big><b>Server and Directory</b></big><br>\n" "Use <b>Server Name</b> and <b>Path to Directory or ISO Image</b>\n" @@ -2773,7 +2785,7 @@ msgstr "" #. help text - server dialog, there is a "Port" widget -#: src/modules/SourceDialogs.rb:1896 +#: src/modules/SourceDialogs.rb:1937 msgid "" "<p>It is possible to set the <b>Port</b> number for a HTTP/HTTPS repository.\n" "Leave it empty to use the default port.</p>\n" @@ -2782,12 +2794,12 @@ #. Returns whether Community Repositories are defined in the control file. #. #. @return [Boolean] whether defined -#: src/modules/SourceDialogs.rb:1958 +#: src/modules/SourceDialogs.rb:1999 msgid "I would like to install an additional Add On Product" msgstr "" #. help text -#: src/modules/SourceDialogs.rb:2085 +#: src/modules/SourceDialogs.rb:2126 #, fuzzy msgid "" "<p><big><b>Media Type</b></big><br>\n" @@ -2800,7 +2812,7 @@ "</p>\n" #. help, continued -#: src/modules/SourceDialogs.rb:2094 +#: src/modules/SourceDialogs.rb:2135 #, fuzzy msgid "" "<p>\n" @@ -2813,7 +2825,7 @@ "</p>\n" #. help, continued -#: src/modules/SourceDialogs.rb:2104 +#: src/modules/SourceDialogs.rb:2145 #, fuzzy msgid "" "<p>\n" @@ -2832,7 +2844,7 @@ "</p>\n" #. help, continued -#: src/modules/SourceDialogs.rb:2116 +#: src/modules/SourceDialogs.rb:2157 #, fuzzy #| msgid "" #| "<p>\n" @@ -2851,27 +2863,27 @@ "the first CD are located, such as /data1/CD1.</p>\n" #. error popup -#: src/modules/SourceDialogs.rb:2131 +#: src/modules/SourceDialogs.rb:2172 #, fuzzy msgid "Select the media type" msgstr "Select the printer type." -#: src/modules/SourceDialogs.rb:2137 +#: src/modules/SourceDialogs.rb:2178 msgid "Insert the add-on product CD" msgstr "Insert the add-on product CD" -#: src/modules/SourceDialogs.rb:2138 +#: src/modules/SourceDialogs.rb:2179 msgid "Insert the add-on product DVD" msgstr "Insert the add-on product DVD" #. ask for a medium -#: src/modules/SourceDialogs.rb:2156 +#: src/modules/SourceDialogs.rb:2197 #, fuzzy msgid "No USB disk was detected." msgstr "No DASD disk detected" -#. TODO: disable "download" option when CD or DVD source is selected -#: src/modules/SourceDialogs.rb:2359 +#. use three slashes as third slash means path +#: src/modules/SourceDialogs.rb:2403 msgid "" "<p><b>Download Files</b><br>\n" "Each repository has description files which describe the content of the\n" @@ -2881,18 +2893,27 @@ msgstr "" #. dialog caption -#: src/modules/SourceDialogs.rb:2578 +#: src/modules/SourceDialogs.rb:2623 #, fuzzy msgid "Media Type" msgstr "Media Check" #. dialog caption -#: src/modules/SourceDialogs.rb:2602 +#: src/modules/SourceDialogs.rb:2647 #, fuzzy #| msgid "Add-On Products" msgid "Add On Product" msgstr "Add-On Products" +#. Returns boolean whether user confirmed to abort the configuration +#. +#. @return [Boolean] whether to abort +#: src/modules/SourceDialogs.rb:2678 +#, fuzzy +#| msgid "URL entered is not valid" +msgid "URL scheme '%s' is not valid." +msgstr "URL entered is not valid" + #. SourceManager read dialog caption #: src/modules/SourceManager.rb:100 #, fuzzy @@ -3000,7 +3021,7 @@ #. To adjust the width of the dialog, look for the more lengthy device label #. (and add some extra space for the frame) -#: src/modules/SourceManager.rb:670 +#: src/modules/SourceManager.rb:671 msgid "&Drive to eject" msgstr "&Drive to eject" @@ -3127,6 +3148,14 @@ msgstr "Please deselect some packages." #, fuzzy +#~ msgid "Downloading patch RPM %1 (download size %2)" +#~ msgstr "Downloading package %1 (%2)..." + +#, fuzzy +#~ msgid "Failed to download patch RPM: %1" +#~ msgstr "Failed to deactivate %1." + +#, fuzzy #~ msgid "&Yes, I Agree to the License Agreement" #~ msgstr "Yes, I Agree to the License Agreement" Modified: trunk/yast/en_GB/po/pam.en_GB.po =================================================================== --- trunk/yast/en_GB/po/pam.en_GB.po 2015-09-09 08:18:21 UTC (rev 92602) +++ trunk/yast/en_GB/po/pam.en_GB.po 2015-09-09 08:19:44 UTC (rev 92603) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: yast2 9.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-04 15:53+0200\n" +"POT-Creation-Date: 2015-08-25 18:37+0200\n" "PO-Revision-Date: 2004-MO-DA HO:MI+ZONE\n" "Last-Translator: proofreader\n" "Language-Team: en_US\n" Modified: trunk/yast/en_GB/po/pkg-bindings.en_GB.po =================================================================== --- trunk/yast/en_GB/po/pkg-bindings.en_GB.po 2015-09-09 08:18:21 UTC (rev 92602) +++ trunk/yast/en_GB/po/pkg-bindings.en_GB.po 2015-09-09 08:19:44 UTC (rev 92603) @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-04 15:53+0200\n" +"POT-Creation-Date: 2015-08-25 18:37+0200\n" "PO-Revision-Date: 2008-05-05 12:07+0200\n" "Last-Translator: Benjamin Weber\n" "Language-Team: British English\n" @@ -50,20 +50,20 @@ msgstr "" #. error message -#: src/Package.cc:651 +#: src/Package.cc:655 #, fuzzy msgid "The package cannot be selected to install." msgstr "There are package conflict which cannot be resolved automatically." #. error message -#: src/Package.cc:657 +#: src/Package.cc:661 #, fuzzy msgid "The package is not available." msgstr "%1 package not available." #. still not initialized, throw an exception #. translators: this is an error message -#: src/PkgFunctions.cc:128 +#: src/PkgFunctions.cc:129 #, fuzzy msgid "Cannot connect to the package manager" msgstr "Cannot connect to SUSE support server." @@ -95,7 +95,7 @@ msgid "Download Descriptions" msgstr "No Description" -#: src/Source_Create.cc:590 src/Source_Download.cc:402 src/Source_Load.cc:155 +#: src/Source_Create.cc:590 src/Source_Download.cc:407 src/Source_Load.cc:155 #: src/Source_Load.cc:479 msgid "Rebuild Cache" msgstr "" @@ -111,18 +111,18 @@ msgid "Adding the Repository..." msgstr "Adding and removing repositories..." -#: src/Source_Download.cc:56 src/Source_Download.cc:320 +#: src/Source_Download.cc:56 src/Source_Download.cc:325 msgid "Downloading " msgstr "Downloading " #. stages: "download", "build cache" -#: src/Source_Download.cc:401 +#: src/Source_Download.cc:406 #, fuzzy msgid "Refresh Metadata" msgstr "&Refresh status ..." #. 3 steps per repository (download, cache rebuild, load resolvables) -#: src/Source_Download.cc:409 +#: src/Source_Download.cc:414 #, fuzzy msgid "Refreshing Repository..." msgstr "Refreshing repository " Modified: trunk/yast/en_GB/po/printer.en_GB.po =================================================================== --- trunk/yast/en_GB/po/printer.en_GB.po 2015-09-09 08:18:21 UTC (rev 92602) +++ trunk/yast/en_GB/po/printer.en_GB.po 2015-09-09 08:19:44 UTC (rev 92603) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: yast2 9.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-04 15:53+0200\n" +"POT-Creation-Date: 2015-08-25 18:37+0200\n" "PO-Revision-Date: 2007-08-16 20:16+0100\n" "Last-Translator: Karl Eichwalder\n" "Language-Team: British English\n" @@ -209,7 +209,7 @@ #. where %1 will be replaced by the server name: #. where %1 will be replaced by the server name: #. where %1 will be replaced by the server name: -#: src/include/printer/autoconfig.rb:97 src/include/printer/overview.rb:1101 +#: src/include/printer/autoconfig.rb:97 src/include/printer/overview.rb:1098 #: src/include/printer/policies.rb:135 #: src/include/printer/printingvianetwork.rb:463 #: src/include/printer/sharing.rb:639 @@ -226,8 +226,8 @@ #. Only a simple message because this error does not happen on a normal system #. (i.e. a system which is not totally broken or totally messed up). #. Remove the 'ServerName' entry in /etc/cups/client.conf: -#: src/include/printer/autoconfig.rb:115 src/include/printer/overview.rb:220 -#: src/include/printer/overview.rb:1118 src/include/printer/policies.rb:153 +#: src/include/printer/autoconfig.rb:115 src/include/printer/overview.rb:217 +#: src/include/printer/overview.rb:1115 src/include/printer/policies.rb:153 #: src/include/printer/printingvianetwork.rb:478 #: src/include/printer/sharing.rb:657 msgid "Failed to remove the 'ServerName' entry in /etc/cups/client.conf" @@ -428,7 +428,7 @@ #. the currently used driver is then the very first entry in the SelectionBox. #: src/include/printer/basicadd.rb:187 src/include/printer/basicadd.rb:356 #: src/include/printer/basicadd.rb:588 src/include/printer/basicmodify.rb:1082 -#: src/modules/Printer.rb:1960 src/modules/Printer.rb:1986 +#: src/modules/Printer.rb:1954 src/modules/Printer.rb:1980 #, fuzzy msgid "Select a driver." msgstr "Select a drive first." @@ -480,8 +480,8 @@ #. does not set a valid Printer::selected_connections_index so that the BasicAddDialog #. does not preselect a connection so that the first connection in the list is preselected #. (via Table widget fallback) which is still better than an arbitrary preselected entry: -#: src/include/printer/basicadd.rb:337 src/include/printer/overview.rb:593 -#: src/include/printer/overview.rb:679 src/include/printer/overview.rb:1153 +#: src/include/printer/basicadd.rb:337 src/include/printer/overview.rb:590 +#: src/include/printer/overview.rb:676 src/include/printer/overview.rb:1150 msgid "Nothing Selected" msgstr "Nothing Selected" @@ -682,8 +682,8 @@ #. Exit this dialog in any case: #. Return at least a list with only a fallback string so that the user is informed: #. Have the PageSize option topmost: -#: src/include/printer/basicmodify.rb:853 src/modules/Printer.rb:2211 -#: src/modules/Printer.rb:2341 +#: src/include/printer/basicmodify.rb:853 src/modules/Printer.rb:2205 +#: src/modules/Printer.rb:2335 #, fuzzy msgid "No driver options available" msgstr "No description available" @@ -1052,7 +1052,11 @@ #. The user can also decide during the actual installation not to install it #. or the installation may have failed for whatever reason #. so that we test again whether or not it is now actually installed: +#. The user can also decide during the actual installation not to install it +#. or the installation may have failed for whatever reason +#. so that we test again whether or not it is now actually installed: #: src/include/printer/connectionwizard.rb:2002 +#: src/include/printer/connectionwizard.rb:2061 #, fuzzy msgid "The RPM package cups-backends is not installed." msgstr "The following packages could not be installed" @@ -1062,142 +1066,138 @@ msgid "Program (/path/to/command?option=value) [percent-encoded]" msgstr "" +#: src/include/printer/connectionwizard.rb:2044 +#, fuzzy +#| msgid "Check whether additional packages must be installed" +msgid "To use 'beh', the RPM package cups-backends must be installed." +msgstr "Check whether additional packages must be installed" + #. TRANSLATORS: Text entry for device URI (Uniform Resource Identifier) -#: src/include/printer/connectionwizard.rb:2139 +#: src/include/printer/connectionwizard.rb:2163 msgid "Device URI (for which 'beh' should be applied) [percent-encoded]" msgstr "" #. TRANSLATORS: Check box -#: src/include/printer/connectionwizard.rb:2149 +#: src/include/printer/connectionwizard.rb:2173 #, fuzzy msgid "Never Disable the Queue" msgstr "Disable the service" #. TRANSLATORS: Text entry -#: src/include/printer/connectionwizard.rb:2157 +#: src/include/printer/connectionwizard.rb:2181 msgid "Number of Retries ('0' means infinite retries)" msgstr "" #. TRANSLATORS: Text entry -#: src/include/printer/connectionwizard.rb:2165 +#: src/include/printer/connectionwizard.rb:2189 msgid "Delay in Seconds Between Two Retries" msgstr "" -#: src/include/printer/connectionwizard.rb:2172 -#: src/include/printer/connectionwizard.rb:2265 +#: src/include/printer/connectionwizard.rb:2197 +#: src/include/printer/connectionwizard.rb:2293 #, fuzzy msgid "Select a specific connection type." msgstr "- Close connection" #. TRANSLATORS: Label for tree widget description -#: src/include/printer/connectionwizard.rb:2190 +#: src/include/printer/connectionwizard.rb:2215 #, fuzzy msgid "&Connection Type" msgstr "Connection Type" #. TRANSLATORS: Tree widget item -#: src/include/printer/connectionwizard.rb:2195 +#: src/include/printer/connectionwizard.rb:2220 #, fuzzy msgid "Directly Connected Device" msgstr "Directly Connected Printers" -#: src/include/printer/connectionwizard.rb:2198 -#, fuzzy -msgid "Parallel Port" -msgstr "&Parallel Printer" - +#. Disabled legacy "Parallel Port" so that it is no longer accessible in the dialog: +#. Item(Id(:parallel), _("Parallel Port")), #. TRANSLATORS: Tree widget item -#: src/include/printer/connectionwizard.rb:2200 +#: src/include/printer/connectionwizard.rb:2226 #, fuzzy msgid "USB Port" msgstr "USB Port (%1)" #. TRANSLATORS: Tree widget item -#: src/include/printer/connectionwizard.rb:2202 +#: src/include/printer/connectionwizard.rb:2228 msgid "HP Devices (HPLIP)" msgstr "" #. TRANSLATORS: Tree widget item -#: src/include/printer/connectionwizard.rb:2204 -msgid "Serial Port" -msgstr "Serial Port" - +#. Disabled legacy "Serial Port" so that it is no longer accessible in the dialog: +#. Item(Id(:serial), _("Serial Port")), #. TRANSLATORS: Tree widget item -#: src/include/printer/connectionwizard.rb:2206 +#: src/include/printer/connectionwizard.rb:2233 msgid "Bluetooth" msgstr "Bluetooth" #. TRANSLATORS: Tree widget item -#: src/include/printer/connectionwizard.rb:2212 +#: src/include/printer/connectionwizard.rb:2239 msgid "Access Network Printer or Printserver Box via" msgstr "" -#: src/include/printer/connectionwizard.rb:2215 +#: src/include/printer/connectionwizard.rb:2242 msgid "TCP Port (AppSocket/JetDirect)" msgstr "" #. TRANSLATORS: Tree widget item -#: src/include/printer/connectionwizard.rb:2217 +#: src/include/printer/connectionwizard.rb:2244 msgid "Line Printer Daemon (LPD) Protocol" msgstr "" #. TRANSLATORS: Tree widget item -#: src/include/printer/connectionwizard.rb:2219 +#: src/include/printer/connectionwizard.rb:2246 #, fuzzy msgid "Internet Printing Protocol (IPP)" msgstr "Internet (IP) protocols" #. TRANSLATORS: Tree widget item -#: src/include/printer/connectionwizard.rb:2225 +#: src/include/printer/connectionwizard.rb:2252 #, fuzzy msgid "Print via Print Server Machine" msgstr "Print via &IPX Network Server" -#: src/include/printer/connectionwizard.rb:2228 +#: src/include/printer/connectionwizard.rb:2255 msgid "Windows (R) or Samba (SMB/CIFS)" msgstr "" #. TRANSLATORS: Tree widget item -#: src/include/printer/connectionwizard.rb:2230 +#: src/include/printer/connectionwizard.rb:2257 #, fuzzy msgid "Traditional UNIX Server (LPR/LPD)" msgstr "Additional &UDP Services" #. `item( `id(`iprint), _("iPrint (Novell OES)") ), #. TRANSLATORS: Tree widget item -#: src/include/printer/connectionwizard.rb:2233 +#: src/include/printer/connectionwizard.rb:2260 #, fuzzy #| msgid "CUPS Server" msgid "CUPS Server (IPP)" msgstr "CUPS Server" #. TRANSLATORS: Tree widget item -#: src/include/printer/connectionwizard.rb:2235 -msgid "Novell Netware Print Server (IPX)" -msgstr "" - -#. TRANSLATORS: Tree widget item -#: src/include/printer/connectionwizard.rb:2241 +#: src/include/printer/connectionwizard.rb:2269 #, fuzzy msgid "Special" msgstr "&Special Tasks" -#: src/include/printer/connectionwizard.rb:2244 +#: src/include/printer/connectionwizard.rb:2272 msgid "Specify Arbitrary Device URI" msgstr "" #. TRANSLATORS: Tree widget item -#: src/include/printer/connectionwizard.rb:2248 +#: src/include/printer/connectionwizard.rb:2276 msgid "Send Print Data to Other Program (pipe)" msgstr "" #. TRANSLATORS: Tree widget item -#: src/include/printer/connectionwizard.rb:2251 +#: src/include/printer/connectionwizard.rb:2279 msgid "Daisy-chain Backend Error Handler (beh)" msgstr "" #. TRANSLATORS: Tree widget item -#: src/include/printer/connectionwizard.rb:2262 +#: src/include/printer/connectionwizard.rb:2290 msgid "Connection Settings" msgstr "Connection Settings" @@ -1212,7 +1212,7 @@ #. and the button with the "back" functionality is named "Cancel". #. According to the YaST Style Guide (dated Thu, 06 Nov 2008) #. the "finish" button in a single (step) configuration dialog must now be named "OK". -#: src/include/printer/connectionwizard.rb:2285 +#: src/include/printer/connectionwizard.rb:2313 #, fuzzy msgid "Connection Wizard" msgstr "Connection" @@ -1222,12 +1222,12 @@ #. i.e. the scsi backend will be dropped. #. Therefore in yast2-printer SCSI printer support is also dropped. #. Because of the dropped scsi backend there must be a user notification: -#: src/include/printer/connectionwizard.rb:2338 +#: src/include/printer/connectionwizard.rb:2366 msgid "In CUPS version 1.5 SCSI printer support is dropped." msgstr "" #. Popup::ErrorDetails details (for experts only): -#: src/include/printer/connectionwizard.rb:2340 +#: src/include/printer/connectionwizard.rb:2368 msgid "" "An untested and insecure workaround might be\n" "to set 'FileDevice Yes' in cupsd.conf\n" @@ -1237,48 +1237,48 @@ #. while a Device URI to access a network printer via IPP #. does probably not contain "/printers/" so that this is used here #. as a best effort attempt to distinguish both cases: -#: src/include/printer/connectionwizard.rb:2415 +#: src/include/printer/connectionwizard.rb:2443 #, fuzzy msgid "Select a connection" msgstr "- Close connection" #. Body of a Popup::AnyMessage when no connection was selected #. because there is no connection available to be selected: -#: src/include/printer/connectionwizard.rb:2418 +#: src/include/printer/connectionwizard.rb:2446 msgid "" "If no connection is shown here, it is not possible\n" "to access the device via this type of connection.\n" "Was the printer connected and switched on all the time?" msgstr "" -#: src/include/printer/connectionwizard.rb:2426 +#: src/include/printer/connectionwizard.rb:2454 #, fuzzy msgid "Select a valid connection" msgstr "- Close connection" #. Body of a Popup::AnyMessage when an invalid connection was selected #. because the current connection is no longer valid: -#: src/include/printer/connectionwizard.rb:2429 +#: src/include/printer/connectionwizard.rb:2457 msgid "" "When the current connection is no longer valid,\n" "it does no longer work to access the device via this connection.\n" "Is the printer still connected and switched on?" msgstr "" -#: src/include/printer/connectionwizard.rb:2469 +#: src/include/printer/connectionwizard.rb:2497 #, fuzzy msgid "Serial device and baud rate could not be empty." msgstr "Server name cannot be empty." -#: src/include/printer/connectionwizard.rb:2473 +#: src/include/printer/connectionwizard.rb:2501 msgid "The 'space' parity checking is only supported with 7 data bits." msgstr "" -#: src/include/printer/connectionwizard.rb:2481 +#: src/include/printer/connectionwizard.rb:2509 msgid "The 'mark' parity checking is only supported with 7 data bits and 1 stop bit." msgstr "" -#: src/include/printer/connectionwizard.rb:2523 +#: src/include/printer/connectionwizard.rb:2551 #, fuzzy msgid "Bluetooth device ID could not be empty." msgstr "The root directory cannot be empty." @@ -1286,17 +1286,17 @@ #. because special URI characters like ':' or '/' in connection_uri #. must stay as is and not be percent encoded because only the values #. of the URI parts must be percent encoded but not the whole URI. -#: src/include/printer/connectionwizard.rb:2536 +#: src/include/printer/connectionwizard.rb:2564 #, fuzzy msgid "URI could not be empty." msgstr "URL cannot be empty." -#: src/include/printer/connectionwizard.rb:2546 +#: src/include/printer/connectionwizard.rb:2574 #, fuzzy msgid "Servername and printer could not be empty." msgstr "Server name cannot be empty." -#: src/include/printer/connectionwizard.rb:2552 +#: src/include/printer/connectionwizard.rb:2580 #, fuzzy msgid "Both user and password must be specified." msgstr "At least one address pair must be specified." @@ -1304,7 +1304,11 @@ #. because special URI characters like '=' or '&' in tcp_uri_options #. must stay as is and not be percent encoded because tcp_uri_options #. contains all options like 'option1=value1&option2=value2'. -#: src/include/printer/connectionwizard.rb:2616 +#. Test whether or not a "client-only" server is accessible. +#. @param [String] server_name string of the "client-only" server name +#. +#. @return false if the "client-only" server is not accessible. +#: src/include/printer/connectionwizard.rb:2644 src/modules/Printer.rb:2348 #, fuzzy msgid "Servername could not be empty." msgstr "Server name cannot be empty." @@ -1315,33 +1319,33 @@ #. because special URI characters like '=' or '&' in cups_uri_options #. must stay as is and not be percent encoded because cups_uri_options #. contains all options like 'option1=value1&option2=value2'. -#: src/include/printer/connectionwizard.rb:2654 -#: src/include/printer/connectionwizard.rb:2693 -#: src/include/printer/connectionwizard.rb:2720 +#: src/include/printer/connectionwizard.rb:2682 +#: src/include/printer/connectionwizard.rb:2721 +#: src/include/printer/connectionwizard.rb:2748 #, fuzzy msgid "Servername and queue name could not be empty." msgstr "Server name cannot be empty." -#: src/include/printer/connectionwizard.rb:2747 +#: src/include/printer/connectionwizard.rb:2775 msgid "Device URI, number of retries, and delay could not be empty." msgstr "" #. because special URI characters like '/ ? = &' in pipe #. must stay as is and not be percent encoded because pipe #. contains all like 'path/to/command?option1=value1&option2=value2' -#: src/include/printer/connectionwizard.rb:2761 +#: src/include/printer/connectionwizard.rb:2789 #, fuzzy msgid "Could not be empty." msgstr "Port field can't be empty" #. Do not change or translate "raw", it is a technical term #. when no driver is used for a print queue. -#: src/include/printer/connectionwizard.rb:2784 +#: src/include/printer/connectionwizard.rb:2812 #, fuzzy msgid "Select a manufacturer or 'raw queue'." msgstr "&Select manufacturer:" -#: src/include/printer/connectionwizard.rb:2802 +#: src/include/printer/connectionwizard.rb:2830 #, fuzzy msgid "Look up all hosts in the local network" msgstr "Scanning for hosts in the local network..." @@ -1351,11 +1355,11 @@ #. Body of a Popup::ShowFeedback: #. Body of a Popup::ShowFeedback: #. Body of a Popup::ShowFeedback: -#: src/include/printer/connectionwizard.rb:2804 -#: src/include/printer/connectionwizard.rb:2831 -#: src/include/printer/connectionwizard.rb:2846 -#: src/include/printer/connectionwizard.rb:2861 -#: src/include/printer/connectionwizard.rb:2876 +#: src/include/printer/connectionwizard.rb:2832 +#: src/include/printer/connectionwizard.rb:2859 +#: src/include/printer/connectionwizard.rb:2874 +#: src/include/printer/connectionwizard.rb:2889 +#: src/include/printer/connectionwizard.rb:2904 #, fuzzy msgid "" "Please wait...\n" @@ -1363,25 +1367,25 @@ msgstr "Rereading disk information..." #. where %1 will be replaced by the port number: -#: src/include/printer/connectionwizard.rb:2827 +#: src/include/printer/connectionwizard.rb:2855 msgid "Scan for hosts which are accessible via TCP port %1" msgstr "" #. Sleep half a second to let the user notice the Popup::ShowFeedback in any case #. before it is removed even when the above SCR::Read finished immediately: -#: src/include/printer/connectionwizard.rb:2844 +#: src/include/printer/connectionwizard.rb:2872 msgid "Scan for hosts which are accessible via Samba (SMB)" msgstr "" #. Sleep half a second to let the user notice the Popup::ShowFeedback in any case #. before it is removed even when the above SCR::Read finished immediately: -#: src/include/printer/connectionwizard.rb:2859 +#: src/include/printer/connectionwizard.rb:2887 msgid "Scan for hosts which are accessible via port 515 (LPD/LPR)" msgstr "" #. Sleep half a second to let the user notice the Popup::ShowFeedback in any case #. before it is removed even when the above SCR::Read finished immediately: -#: src/include/printer/connectionwizard.rb:2874 +#: src/include/printer/connectionwizard.rb:2902 msgid "Scan for hosts which are accessible via port 631 (CUPS/IPP)" msgstr "" @@ -1391,7 +1395,7 @@ #. }); #. Sleep half a second to let the user notice the Popup::ShowFeedback in any case #. before it is removed even when the above SCR::Read finished immediately: -#: src/include/printer/connectionwizard.rb:2901 +#: src/include/printer/connectionwizard.rb:2929 msgid "" "Scanning in the network did not find any host.\n" "(Network issue or firewall active?)" @@ -1399,7 +1403,7 @@ #. where %1 will be replaced by the port number #. and %2 will be replaced by the host name: -#: src/include/printer/connectionwizard.rb:2941 +#: src/include/printer/connectionwizard.rb:2969 msgid "Access test failed for port '%1' on host '%2'." msgstr "" @@ -1409,14 +1413,14 @@ #. and %2 will be replaced by the host name: #. where %1 will be replaced by the queue name #. and %2 will be replaced by the host name: -#: src/include/printer/connectionwizard.rb:2968 -#: src/include/printer/connectionwizard.rb:2994 -#: src/include/printer/connectionwizard.rb:3093 +#: src/include/printer/connectionwizard.rb:2996 +#: src/include/printer/connectionwizard.rb:3022 +#: src/include/printer/connectionwizard.rb:3121 msgid "Access test failed for queue '%1' on host '%2'." msgstr "" #. because there is authentication via Active Directory (R) required: -#: src/include/printer/connectionwizard.rb:3012 +#: src/include/printer/connectionwizard.rb:3040 msgid "" "This is only a generic test which may untruly report failures\n" "if authentication via Active Directory (R) is required.\n" @@ -1426,31 +1430,31 @@ #. where %1 will be replaced by the SMB share name #. and %2 will be replaced by the host name: -#: src/include/printer/connectionwizard.rb:3043 +#: src/include/printer/connectionwizard.rb:3071 msgid "The generic test reports failures for share '%1' on host '%2'." msgstr "" #. where %1 will be replaced by the SMB share name #. and %2 will be replaced by the host name: -#: src/include/printer/connectionwizard.rb:3063 +#: src/include/printer/connectionwizard.rb:3091 msgid "Access test failed for share '%1' on host '%2'." msgstr "" #. Message of a Popup::ErrorDetails -#: src/include/printer/connectionwizard.rb:3105 +#: src/include/printer/connectionwizard.rb:3133 #, fuzzy msgid "Test OK" msgstr "Test" #. Without a link name /usr/lib[64]/cups/backend/smb (which is provided by samba-client) #. the rest makes no sense (in particular the ln commands would create nonsense links in $PWD): -#: src/include/printer/connectionwizard.rb:3245 +#: src/include/printer/connectionwizard.rb:3273 #, fuzzy msgid "To support Active Directory (R), the RPM package samba-krb-printing must be installed." msgstr "<p>To access the X11 system, the <b>%1</b> package must be installed.</p>" #. Show a user notification before it gets disabled: -#: src/include/printer/connectionwizard.rb:3285 +#: src/include/printer/connectionwizard.rb:3313 msgid "Active Directory (R) support will be disabled for all SMB print queues." msgstr "" @@ -1608,55 +1612,48 @@ msgid "SpliX Driver for SPL Printers without JBIG" msgstr "" -#. CheckBox to select or un-select the printer driver package m2300w. -#. There is no need to have the package name "m2300w" in this text -#. because it is shown in a separated column to the left of this text. -#: src/include/printer/driveradd.rb:190 -msgid "Driver for Konica Minolta 2300W and 2400W (unmaintained)" -msgstr "" - #. CheckBox to select or un-select the printer driver package epson-inkjet-printer-escpr. #. There is no need to have the package name "epson-inkjet-printer-escpr" in this text #. because it is shown in a separated column to the left of this text. -#: src/include/printer/driveradd.rb:201 +#: src/include/printer/driveradd.rb:202 msgid "Epson ESC/P-R Inkjet Printer Driver" msgstr "" #. Header for a dialog section where the user can #. make a printer description file (PPD file) available #. so that it can be used to set up a print queue with it: -#: src/include/printer/driveradd.rb:214 +#: src/include/printer/driveradd.rb:215 #, fuzzy msgid "Make a Printer Description File Available" msgstr "no description available" #. TextEntry to specify the full path of a PPD file: -#: src/include/printer/driveradd.rb:224 +#: src/include/printer/driveradd.rb:225 msgid "Printer description &file name with full path where it is located" msgstr "" #. Label of a PushButton to open a file selection box #. to browse the file system to select a PPD file: -#: src/include/printer/driveradd.rb:234 +#: src/include/printer/driveradd.rb:235 msgid "&Browse" msgstr "&Browse" #. Header for a AskForExistingFile popup dialog #. to browse the file system to select a PPD file: -#: src/include/printer/driveradd.rb:273 +#: src/include/printer/driveradd.rb:274 #, fuzzy msgid "Select a printer description file" msgstr "Select a printer model." #. where %1 will be replaced by the file name: -#: src/include/printer/driveradd.rb:660 +#: src/include/printer/driveradd.rb:666 #, fuzzy msgid "Cannot access '%1'" msgstr "Cannot open file '%1'" #. Simply exit this dialog because it does not make sense to proceed here #. and there is nothing else to be done after this: -#: src/include/printer/driveradd.rb:679 +#: src/include/printer/driveradd.rb:685 #, fuzzy msgid "The printer description file is not in compliance with the specification." msgstr "" @@ -1664,17 +1661,17 @@ "Choose another one." #. when a PPD file is not in compliance: -#: src/include/printer/driveradd.rb:694 +#: src/include/printer/driveradd.rb:700 msgid "Use the printer description file regardless of its errors?" msgstr "" #. Body of a Popup::ContinueCancelHeadline #. when PPD file is not in compliance: -#: src/include/printer/driveradd.rb:699 +#: src/include/printer/driveradd.rb:705 msgid "A non-compliant printer description file can lead to arbitrary failures." msgstr "" -#: src/include/printer/driveradd.rb:716 +#: src/include/printer/driveradd.rb:722 #, fuzzy msgid "Failed to make the printer description file available" msgstr "Aborting: Failed to create the scanner database." @@ -2178,7 +2175,7 @@ "<b><big>Printer Device URI</big></b><br>\n" "A connection is specified as so called <b>device URI</b>.<br>\n" "Its first word (the so called URI scheme) specifies the kind of data-transfer,\n" -"for example 'parallel', 'usb', 'socket', 'lpd', or 'ipp'.<br>\n" +"for example 'usb', 'socket', 'lpd', or 'ipp'.<br>\n" "After the scheme there are more or less additional components\n" "which specify the details for this kind of data-transfer.<br>\n" "Space characters are not allowed in an URI.\n" @@ -2287,34 +2284,13 @@ msgid "" "<p>\n" "<b><big>Device URIs for Directly Connected Devices</big></b><br>\n" -"Devices which are connected via the parallel port or via USB\n" +"Devices which are connected via USB\n" "are autodetected and the appropriate device URI is autogenerated.\n" "For example:<br>\n" -"parallel:/dev/lp0<br>\n" -"usb://ACME/Fun%20Printer?serial=A1B2C3<br>\n" -"hp:/usb/HP_LaserJet?serial=1234<br>\n" -"Usually only the autogenerated device URIs work.\n" -"When the device is not autodetected, there is usually no communication\n" -"with the device possible and no data can be sent to the device.<br>\n" -"To access a HP printer or all-in-one device via the backend 'hp',\n" -"the RPM package hplip must be installed.\n" -"The package provides HP's printing and scanning software HPLIP.<br>\n" -"In contrast devices which are connected via serial port or bluetooth\n" -"are not autodetected so that the device URI must be manually specified.\n" -"The serial device URI parameters must comply with\n" -"what the serial port in the printer requires,\n" -"see the manual of your serial printer.\n" -"Example device URIs:<br>\n" -"serial:/dev/ttyS9?baud=9600+bits=8+parity=none+flow=soft+stop=1<br>\n" -"bluetooth://1A2B3C4D5E6F<br>\n" -"To access a device via bluetooth, the RPM package bluez-cups must be installed.\n" -"The package provides the CUPS backend 'bluetooth' which actually sends the data\n" -"to a bluetooth printer.\n" -"</p>" msgstr "" #. ConnectionWizardDialog help 5/7: -#: src/include/printer/helps.rb:586 +#: src/include/printer/helps.rb:588 msgid "" "<p>\n" "<b><big>Device URIs to Access a Network Printer or a Printserver Box</big></b><br>\n" @@ -2355,7 +2331,7 @@ msgstr "" #. ConnectionWizardDialog help 6/7: -#: src/include/printer/helps.rb:625 +#: src/include/printer/helps.rb:627 msgid "" "<p>\n" "<b><big>Device URIs to Print Via a Print Server Machine</big></b><br>\n" @@ -2427,23 +2403,10 @@ "The official IANA port for IPP is 631.\n" "The matching device URI is:<br>\n" "ipp://ip-address:631/printers/queue<br>\n" -"<b>Novell Netware Print Server (IPX)</b><br>\n" -"To access print queues on a Novell Netware print server,\n" -"the RPM package ncpfs must be installed.\n" -"The package provides the CUPS backend 'novell' which runs\n" -"the <tt>nprint</tt> program which actually sends the data\n" -"to a Novell Netware print queue.\n" -"A server name and a printer queue name is needed to access it.\n" -"Furthermore a user name and a password may be required to get access.\n" -"The matching device URI is:<br>\n" -"novell://username:password@server/queue<br>\n" -"For <b>more information</b> have a look at <tt>man nprint</tt> and\n" -"the other documentation in the RPM package ncpfs.\n" -"</p>" msgstr "" #. ConnectionWizardDialog help 7/7: -#: src/include/printer/helps.rb:711 +#: src/include/printer/helps.rb:714 msgid "" "<p>\n" "<b><big>Special Device URIs</big></b><br>\n" @@ -2457,7 +2420,7 @@ "The matching device URI is:<br>\n" "pipe:/path/to/targetcommand<br>\n" "<b>Daisy-chain Backend Error Handler (beh)</b><br>\n" -"To do this, the RPM package foomatic-filters must be installed.\n" +"To do this, the RPM package cups-backends must be installed.\n" "The package provides the CUPS backend 'beh'.<br>\n" "The backend 'beh' is a wrapper for the usual backend,\n" "which is then called by beh.\n" @@ -2485,7 +2448,7 @@ msgstr "" #. PrintingViaNetworkDialog help 1/4: -#: src/include/printer/helps.rb:752 +#: src/include/printer/helps.rb:755 msgid "" "<p>\n" "<b><big>Printing Via Network</big></b><br>\n" @@ -2524,7 +2487,7 @@ msgstr "" #. PrintingViaNetworkDialog help 2/4: -#: src/include/printer/helps.rb:789 +#: src/include/printer/helps.rb:792 msgid "" "<p>\n" "If you can access remote CUPS servers for printing\n" @@ -2541,7 +2504,7 @@ msgstr "" #. PrintingViaNetworkDialog help 3/4: -#: src/include/printer/helps.rb:804 +#: src/include/printer/helps.rb:807 msgid "" "<p>\n" "If you print only via network and if you use only one single CUPS server,\n" @@ -2557,7 +2520,7 @@ msgstr "" #. PrintingViaNetworkDialog help 4/4: -#: src/include/printer/helps.rb:818 +#: src/include/printer/helps.rb:821 msgid "" "<p>\n" "You have to set up an appropriate print queue on your host\n" @@ -2572,7 +2535,7 @@ msgstr "" #. SharingDialog help 1/4: -#: src/include/printer/helps.rb:832 +#: src/include/printer/helps.rb:835 msgid "" "<p>\n" "<b><big>Sharing Print Queues and Publish Them Via Network</big></b><br>\n" @@ -2586,7 +2549,7 @@ msgstr "" #. SharingDialog help 2/4: -#: src/include/printer/helps.rb:844 +#: src/include/printer/helps.rb:847 msgid "" "<p>\n" "First of all CUPS client systems must be allowed to access the CUPS server.\n" @@ -2602,7 +2565,7 @@ msgstr "" #. SharingDialog help 3/4: -#: src/include/printer/helps.rb:858 +#: src/include/printer/helps.rb:861 msgid "" "<p>\n" "There are various ways which can coexist how to specify\n" @@ -2622,7 +2585,7 @@ msgstr "" #. SharingDialog help 4/4: -#: src/include/printer/helps.rb:876 +#: src/include/printer/helps.rb:879 msgid "" "<p>\n" "Regarding firewall:<br>\n" @@ -2658,7 +2621,7 @@ msgstr "" #. Policies help 1/2: -#: src/include/printer/helps.rb:911 +#: src/include/printer/helps.rb:914 msgid "" "<p>\n" "<b><big>CUPS Operation Policy</big></b><br>\n" @@ -2670,14 +2633,14 @@ msgstr "" #. Policies help 2/2: -#: src/include/printer/helps.rb:921 +#: src/include/printer/helps.rb:924 msgid "" "<p>\n" "<b><big>CUPS Error Policy</big></b><br>\n" "The error policy defines the default policy that is used when\n" "CUPS fails to send a print job to the printer device.<br>\n" "Depending on the particular way how the printer is connected\n" -"(for example 'parallel', 'usb', 'socket', 'lpd', or 'ipp'),\n" +"(for example 'usb', 'socket', 'lpd', or 'ipp'),\n" "and depending on the actual kind of failure,\n" "the CUPS backend which actually sends the data to the printer\n" "can overwrite the default error policy\n" @@ -2696,7 +2659,7 @@ msgstr "" #. Autoconfig help 1/2: -#: src/include/printer/helps.rb:946 +#: src/include/printer/helps.rb:949 msgid "" "<p>\n" "<b><big>Automatic Configuration for Local Connected Printers</big></b><br>\n" @@ -2715,7 +2678,7 @@ msgstr "" #. Autoconfig help 2/2: -#: src/include/printer/helps.rb:963 +#: src/include/printer/helps.rb:966 msgid "" "<p>\n" "<b><big>Automatic Configuration for USB Printers</big></b><br>\n" @@ -2869,32 +2832,32 @@ msgstr "" #. where %1 will be replaced by the server name: -#: src/include/printer/overview.rb:204 +#: src/include/printer/overview.rb:201 msgid "Do no longer use the inaccessible CUPS server '%1'?" msgstr "" #. Popup::YesNoHeadline body recommendation how to answer the headline question #. where %1 will be replaced by the server name: -#: src/include/printer/overview.rb:210 +#: src/include/printer/overview.rb:207 msgid "To proceed, you should agree that '%1' will be no longer used." msgstr "" #. The 'ServerName' entry in /etc/cups/client.conf was removed #. so that it is now no longer a real client-only config and #. therefore the Printerlib::client_* values must be determined anew: -#: src/include/printer/overview.rb:226 src/include/printer/overview.rb:237 +#: src/include/printer/overview.rb:223 src/include/printer/overview.rb:234 msgid "A non-accessible server leads to an endless sequence of delays and failures." msgstr "" #. where %1 will be replaced by the CUPS server name. -#: src/include/printer/overview.rb:256 +#: src/include/printer/overview.rb:253 #, fuzzy msgid "CUPS Server %1" msgstr "CUPS Server" #. Busy message: #. Body of a Popup::ShowFeedback: -#: src/include/printer/overview.rb:280 +#: src/include/printer/overview.rb:277 #, fuzzy #| msgid "The print server is accessible." msgid "Testing if CUPS server is accessible..." @@ -2903,39 +2866,39 @@ #. Body of a Popup::AnyMessage when no queue was selected from the list: #. Body of a Popup::AnyMessage when no queue was selected from the list: #. Body of a Popup::AnyMessage when no queue was selected from the list: -#: src/include/printer/overview.rb:595 src/include/printer/overview.rb:681 -#: src/include/printer/overview.rb:1155 +#: src/include/printer/overview.rb:592 src/include/printer/overview.rb:678 +#: src/include/printer/overview.rb:1152 msgid "Select an entry." msgstr "Select an entry." -#: src/include/printer/overview.rb:608 +#: src/include/printer/overview.rb:605 #, fuzzy msgid "Cannot Delete" msgstr "Cannot delete TSIG key." #. Body of a Popup::AnyMessage when a remote queue was selected to be deleted: -#: src/include/printer/overview.rb:610 +#: src/include/printer/overview.rb:607 msgid "This is a remote configuration. Only local configurations can be deleted." msgstr "" -#: src/include/printer/overview.rb:617 +#: src/include/printer/overview.rb:614 #, fuzzy msgid "Confirm Deletion" msgstr "Confirm Installation" #. Body of a confirmation popup before a queue will be deleted: -#: src/include/printer/overview.rb:619 +#: src/include/printer/overview.rb:616 msgid "The selected configuration would be deleted immediately and cannot be restored." msgstr "" #. 'Yes' button label of a confirmation popup before a queue will be deleted: -#: src/include/printer/overview.rb:623 +#: src/include/printer/overview.rb:620 #, fuzzy msgid "Delete configuration %1" msgstr "Default configuration" #. 'No' button label of a confirmation popup before a queue will be deleted: -#: src/include/printer/overview.rb:625 +#: src/include/printer/overview.rb:622 #, fuzzy msgid "Do not delete it" msgstr "Do not delete" @@ -2947,39 +2910,39 @@ #. Nevertheless it is possible to delete a class with the YaST printer module #. so that the user can get rid of a class which may have been created by accident #. with whatever other setup tool: -#: src/include/printer/overview.rb:640 +#: src/include/printer/overview.rb:637 #, fuzzy #| msgid "Configuration of a Class" msgid "Confirm Deletion of a Class" msgstr "Configuration of a Class" #. Body of a confirmation popup before a class will be deleted: -#: src/include/printer/overview.rb:642 +#: src/include/printer/overview.rb:639 #, fuzzy #| msgid "A zone of this type cannot be edited with this tool." msgid "A deleted class cannot be re-created with this tool." msgstr "A zone of this type cannot be edited with this tool." -#: src/include/printer/overview.rb:688 +#: src/include/printer/overview.rb:685 #, fuzzy msgid "Rejecting Print Jobs" msgstr "Detected Printers:" #. Body of a Popup::AnyMessage when the queue rejects print jobs: -#: src/include/printer/overview.rb:690 +#: src/include/printer/overview.rb:687 msgid "The testpage cannot be printed because print jobs are rejected." msgstr "" #. Do a refresh of the overview content to be on the safe side. #. Perhaps the actual current queue state is no longer "rejecting". #. Re-run the OverviewDialog (with re-created queue status) via the sequencer: -#: src/include/printer/overview.rb:700 +#: src/include/printer/overview.rb:697 #, fuzzy msgid "Printout Disabled" msgstr "Printout &Finished" #. Body of a Popup::AnyMessage when printing is disabled for the queue: -#: src/include/printer/overview.rb:702 +#: src/include/printer/overview.rb:699 msgid "The testpage cannot be printed because printout is disabled." msgstr "" @@ -2988,27 +2951,27 @@ #. the test above makes sure that the queue has printing enabled. #. When this command fails for whatever reason, it is a safe fallback #. to assume that there are no pending jobs in the queue: -#: src/include/printer/overview.rb:731 +#: src/include/printer/overview.rb:728 msgid "There are pending print jobs which might be deleted before the testpage is printed." msgstr "" #. where %1 will be replaced by the queue name. #. where %1 will be replaced by the queue name. -#: src/include/printer/overview.rb:751 src/include/printer/overview.rb:920 +#: src/include/printer/overview.rb:748 src/include/printer/overview.rb:917 #, fuzzy msgid "Delete Pending Print Jobs For %1" msgstr "Detected Printers:" #. 'Yes' button label of a confirmation popup #. before all pending jobs in a queue will be deleted: -#: src/include/printer/overview.rb:759 +#: src/include/printer/overview.rb:756 #, fuzzy msgid "Delete them before printing testpage" msgstr "Delete the old settings?" #. 'No' button label of a confirmation popup #. before all pending jobs in a queue will be deleted: -#: src/include/printer/overview.rb:762 +#: src/include/printer/overview.rb:759 #, fuzzy msgid "Print testpage after the other jobs" msgstr "Print the help for this module" @@ -3017,7 +2980,7 @@ #. Only a simple message because this error does not happen on a normal system. #. where %1 will be replaced by the queue name. #. Only a simple message because this error does not happen on a normal system. -#: src/include/printer/overview.rb:775 src/include/printer/overview.rb:944 +#: src/include/printer/overview.rb:772 src/include/printer/overview.rb:941 #, fuzzy msgid "Failed to delete all pending jobs for %1." msgstr "Really delete configuration \"%1\"?" @@ -3037,26 +3000,26 @@ #. + (Printed with CUPS) show #. make it obvious that it is not a YaST testpage but a CUPS testpage #. and it is now independent of the CUPS version. -#: src/include/printer/overview.rb:802 +#: src/include/printer/overview.rb:799 #, fuzzy #| msgid "&Test printing" msgid "Test printout" msgstr "&Test printing" #. Popup::AnyQuestion message: -#: src/include/printer/overview.rb:804 +#: src/include/printer/overview.rb:801 msgid "Print one or two pages e.g. to test duplex printing" msgstr "" #. Popup::AnyQuestion so called 'yes' (default) button label: -#: src/include/printer/overview.rb:806 +#: src/include/printer/overview.rb:803 #, fuzzy #| msgid "Print test page" msgid "Single test page" msgstr "Print test page" #. Popup::AnyQuestion so called 'no' button label: -#: src/include/printer/overview.rb:808 +#: src/include/printer/overview.rb:805 #, fuzzy #| msgid "YaST2 test page" msgid "Two test pages" @@ -3064,7 +3027,7 @@ #. where %1 will be replaced by the queue name. #. Only a simple message because this error does not happen on a normal system. -#: src/include/printer/overview.rb:838 +#: src/include/printer/overview.rb:835 #, fuzzy msgid "Failed to print testpage for %1." msgstr "Failed to install required package %1." @@ -3073,19 +3036,19 @@ #. there might be whatever reason (e.g. a remote queue might have been deleted in the meantime) #. so that a refresh of the overview content is needed to be on the safe side. #. Re-run the OverviewDialog (with re-created queue status) via the sequencer: -#: src/include/printer/overview.rb:855 +#: src/include/printer/overview.rb:852 msgid "Wait Until Testpage Printing Finished" msgstr "" #. Popup::AnyQuestion message regarding testpage printout result #. where %1 will be replaced by the queue name. -#: src/include/printer/overview.rb:859 +#: src/include/printer/overview.rb:856 msgid "Sent testpage to %1. Printing should start soon." msgstr "" #. Popup::AnyQuestion 'Yes' button label #. regarding a positive testpage printout result: -#: src/include/printer/overview.rb:864 +#: src/include/printer/overview.rb:861 #, fuzzy #| msgid "The test was successful" msgid "Testpage printout was successful" @@ -3093,7 +3056,7 @@ #. Popup::AnyQuestion 'No' button label #. regarding a negative testpage printout result: -#: src/include/printer/overview.rb:867 +#: src/include/printer/overview.rb:864 #, fuzzy #| msgid "&Test printing" msgid "Testpage printing failed" @@ -3115,56 +3078,56 @@ #. spit out zillions of sheets with nonsense characters. #. When this command fails for whatever reason, it is a safe fallback #. to assume that there are no pending jobs in the queue: -#: src/include/printer/overview.rb:900 +#: src/include/printer/overview.rb:897 msgid "There are pending print jobs which might be deleted now." msgstr "" #. 'Yes' button label of a confirmation popup #. before all pending jobs in a queue will be deleted: -#: src/include/printer/overview.rb:928 +#: src/include/printer/overview.rb:925 #, fuzzy msgid "Delete all pending jobs" msgstr "Detected Printers:" #. 'No' button label of a confirmation popup #. before all pending jobs in a queue will be deleted: -#: src/include/printer/overview.rb:931 +#: src/include/printer/overview.rb:928 #, fuzzy msgid "Do not delete them" msgstr "Do not delete" #. Ignore an effectively empty test_print_cups_error_log: -#: src/include/printer/overview.rb:1046 +#: src/include/printer/overview.rb:1043 msgid "For the full log, see the /var/log/cups/error_log file." msgstr "" -#: src/include/printer/overview.rb:1051 +#: src/include/printer/overview.rb:1048 msgid "CUPS log information while processing the testpage for %1 (English only)" msgstr "" #. but the test_print_cups_error_log was effectively empty, #. show a very generic info to the user to show at least something: -#: src/include/printer/overview.rb:1068 +#: src/include/printer/overview.rb:1065 msgid "For CUPS log information, see the /var/log/cups/error_log file." msgstr "" #. show a very generic info to the user to show at least something: -#: src/include/printer/overview.rb:1078 +#: src/include/printer/overview.rb:1075 msgid "When printing via a remote system fails, you may ask an admin of the remote system." msgstr "" #. PopupYesNoHeadline body: -#: src/include/printer/overview.rb:1105 +#: src/include/printer/overview.rb:1102 msgid "A remote CUPS server setting conflicts with adding a configuration." msgstr "" -#: src/include/printer/overview.rb:1162 +#: src/include/printer/overview.rb:1159 #, fuzzy msgid "Cannot Modify" msgstr "Cannot Read fstab" #. Body of a Popup::AnyMessage when a remote queue was selected to be modified: -#: src/include/printer/overview.rb:1164 +#: src/include/printer/overview.rb:1161 msgid "This is a remote configuration. Only local configurations can be modified." msgstr "" @@ -3925,142 +3888,61 @@ msgstr "Determining active drivers..." #. show a meaningful text as fallback entry ('Find More' is a button label). -#: src/modules/Printer.rb:1594 +#: src/modules/Printer.rb:1588 msgid "No matching driver found. Change the search string or try 'Find More'." msgstr "" #. Busy message: #. Body of a Popup::ShowFeedback: -#: src/modules/Printer.rb:1619 +#: src/modules/Printer.rb:1613 #, fuzzy msgid "Processing many printer drivers. Please wait..." msgstr "Creating swap area. Please wait..." #. Only a simple message because this error does not happen on a normal system #. (i.e. a system which is not totally broken or totally messed up). -#: src/modules/Printer.rb:2065 +#: src/modules/Printer.rb:2059 #, fuzzy msgid "Failed to add queue %1." msgstr "Failed to read %1." #. Only a simple message because this error does not happen on a normal system #. (i.e. a system which is not totally broken or totally messed up). -#: src/modules/Printer.rb:2185 +#: src/modules/Printer.rb:2179 #, fuzzy msgid "Failed to delete configuration %1." msgstr "Really delete configuration \"%1\"?" #. Only a simple message because this is only a fallback case #. which should not happen at all: -#: src/modules/Printer.rb:2208 +#: src/modules/Printer.rb:2202 #, fuzzy msgid "Failed to determine the driver options." msgstr "Failed to determine the active drivers." #. Info for a currently selected item which is to be set as new value in the system: -#: src/modules/Printer.rb:2215 +#: src/modules/Printer.rb:2209 #, fuzzy #| msgid "New value" msgid "new value" msgstr "New value" #. Info for a current setting which is the currently still saved value in the system: -#: src/modules/Printer.rb:2217 +#: src/modules/Printer.rb:2211 #, fuzzy #| msgid "Set value" msgid "saved value" msgstr "Set value" -#. where %1 will be replaced by the server name. -#: src/modules/Printer.rb:2366 -msgid "The server '%1' is not accessible via port 631 (IPP/CUPS)." -msgstr "" - -#. where %1 will be replaced by the server name. -#: src/modules/Printer.rb:2371 -msgid "The server '%1' responds to a 'ping' in the network." -msgstr "" - -#. where %1 will be replaced by the server name. -#: src/modules/Printer.rb:2376 +#: src/modules/Printer.rb:2358 #, fuzzy -msgid "The server '%1' does not respond to a 'ping' in the network." -msgstr "The DNS server does not start when booting the system." +msgid "The server '" +msgstr "&Name Server" -#. where %1 will be replaced by the server name. -#: src/modules/Printer.rb:2381 -#, fuzzy -msgid "The server name '%1' is known in the network." -msgstr "The NFS server name '%1' is invalid." - -#. where %1 will be replaced by the server name. -#: src/modules/Printer.rb:2386 -#, fuzzy -msgid "The server name '%1' is not known in the network." -msgstr "The NFS server name '%1' is invalid." - -#. but in most cases TestClientOnlyServer is called -#. indirectly without a button click by the user -#. so that even the netcat test is silently skipped -#. and no negative feedback is shown when netcat is not executable: -#: src/modules/Printer.rb:2404 -#, fuzzy -msgid "Cannot execute the program 'netcat'." -msgstr "Cannot delete the default host." - -#. Popup::ErrorDetails details: -#: src/modules/Printer.rb:2409 -msgid "The RPM package 'netcat' is required for a meaningful test." -msgstr "" - -#. but it the less meaningful test is not really important -#. so that the less meaningful test is silently skipped -#. and no negative feedback is shown when ping is not executable: -#: src/modules/Printer.rb:2445 -#, fuzzy -msgid "Cannot execute the program 'ping'." -msgstr "Cannot delete the default host." - -#. Popup::ErrorDetails details: -#: src/modules/Printer.rb:2454 -msgid "The RPM package 'iputils' is required for a meaningful test." -msgstr "" - -#. where %1 will be replaced by the server name. -#: src/modules/Printer.rb:2483 -#, fuzzy -msgid "The server '%1' is not accessible." -msgstr "The print server is accessible." - -#. but it the last test is not really important -#. so that the last test is silently skipped -#. and no negative feedback is shown when host is not executable: -#: src/modules/Printer.rb:2546 -#, fuzzy -msgid "Cannot execute the program 'host'." -msgstr "Cannot delete the default host." - -#. Popup::ErrorDetails details: -#: src/modules/Printer.rb:2555 -msgid "The RPM package 'bind-utils' is required for a meaningful test." -msgstr "" - -#. where %1 will be replaced by the server name. -#: src/modules/Printer.rb:2582 -#, fuzzy -msgid "The server '%1' does not respond in the network." -msgstr "The share '%1' does not exist." - -#. where %1 will be replaced by the server name. -#: src/modules/Printer.rb:2644 -#, fuzzy -msgid "The server '%1' is unknown." -msgstr "The NFS server name '%1' is invalid." - #. Message of a Popup::Error when hp-setup should be run. #. Do not change or translate "hp-setup", it is a program name. #. Do not change or translate "DISPLAY", it is an environment variable name. -#: src/modules/Printer.rb:2673 +#: src/modules/Printer.rb:2371 msgid "" "Cannot run hp-setup because no graphical display can be opened.\n" "This happens in particular when YaST runs in text-only mode,\n" @@ -4071,7 +3953,7 @@ #. Message of a Popup::Error when hp-setup should be run. #. Do not change or translate "hp-setup", it is a program name: -#: src/modules/Printer.rb:2683 +#: src/modules/Printer.rb:2381 msgid "" "Cannot run hp-setup because\n" "/usr/bin/hp-setup is not executable\n" @@ -4080,7 +3962,7 @@ #. Body of a Popup::ShowFeedback. #. Do not change or translate "hp-setup", it is a program name: -#: src/modules/Printer.rb:2691 +#: src/modules/Printer.rb:2389 msgid "" "Launched hp-setup.\n" "You must finish hp-setup before you can proceed with the printer configuration.\n" @@ -4090,7 +3972,7 @@ #. Do not change or translate "hp-setup", it is a program name. #. Do not change or translate "hplip", it is a package name. #. Translate 'Driver Packages' the same as the PushButton name to go to the "Add Driver" dialog: -#: src/modules/Printer.rb:2725 +#: src/modules/Printer.rb:2423 msgid "" "To run hp-setup, the RPM package hplip must be installed.\n" "Use 'Driver Packages' to install it." @@ -4251,6 +4133,49 @@ msgstr "&Skip Mounting" #, fuzzy +#~ msgid "Parallel Port" +#~ msgstr "&Parallel Printer" + +#~ msgid "Serial Port" +#~ msgstr "Serial Port" + +#, fuzzy +#~ msgid "The server '%1' does not respond to a 'ping' in the network." +#~ msgstr "The DNS server does not start when booting the system." + +#, fuzzy +#~ msgid "The server name '%1' is known in the network." +#~ msgstr "The NFS server name '%1' is invalid." + +#, fuzzy +#~ msgid "The server name '%1' is not known in the network." +#~ msgstr "The NFS server name '%1' is invalid." + +#, fuzzy +#~ msgid "Cannot execute the program 'netcat'." +#~ msgstr "Cannot delete the default host." + +#, fuzzy +#~ msgid "Cannot execute the program 'ping'." +#~ msgstr "Cannot delete the default host." + +#, fuzzy +#~ msgid "The server '%1' is not accessible." +#~ msgstr "The print server is accessible." + +#, fuzzy +#~ msgid "Cannot execute the program 'host'." +#~ msgstr "Cannot delete the default host." + +#, fuzzy +#~ msgid "The server '%1' does not respond in the network." +#~ msgstr "The share '%1' does not exist." + +#, fuzzy +#~ msgid "The server '%1' is unknown." +#~ msgstr "The NFS server name '%1' is invalid." + +#, fuzzy #~ msgid "Look Up" #~ msgstr "&Look Up" @@ -4385,11 +4310,6 @@ #~ msgstr "Importing the Following Certificates:" #, fuzzy -#~| msgid "Check whether additional packages must be installed" -#~ msgid "To use 'beh', the RPM package cups-backends must be installed." -#~ msgstr "Check whether additional packages must be installed" - -#, fuzzy #~ msgid "Usual &General Setting" #~ msgstr "General Settings" Modified: trunk/yast/en_GB/po/product-creator.en_GB.po =================================================================== --- trunk/yast/en_GB/po/product-creator.en_GB.po 2015-09-09 08:18:21 UTC (rev 92602) +++ trunk/yast/en_GB/po/product-creator.en_GB.po 2015-09-09 08:19:44 UTC (rev 92603) @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-04 15:53+0200\n" +"POT-Creation-Date: 2015-08-25 18:37+0200\n" "PO-Revision-Date: 2007-08-16 20:49+0100\n" "Last-Translator: Benjamin Weber\n" "Language-Team: British English\n" Modified: trunk/yast/en_GB/po/proxy.en_GB.po =================================================================== --- trunk/yast/en_GB/po/proxy.en_GB.po 2015-09-09 08:18:21 UTC (rev 92602) +++ trunk/yast/en_GB/po/proxy.en_GB.po 2015-09-09 08:19:44 UTC (rev 92603) @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-10-29 16:21+0100\n" +"POT-Creation-Date: 2015-08-25 18:37+0200\n" "PO-Revision-Date: 2001-07-17 16:27+0200\n" "Last-Translator: James Ogley \n" "Language-Team: English \n" @@ -18,100 +18,6 @@ "Content-Transfer-Encoding: 8-bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -#. Commandline help title -#. Proxy dialog caption -#: src/clients/proxy.rb:32 src/include/proxy/dialogs.rb:399 -msgid "Proxy Configuration" -msgstr "Proxy Configuration" - -#. command-line help -#: src/clients/proxy.rb:40 -msgid "Enable proxy settings" -msgstr "Enable proxy settings" - -#. command-line help -#: src/clients/proxy.rb:48 -msgid "Disable proxy settings" -msgstr "Disable proxy settings" - -#. command-line help -#: src/clients/proxy.rb:56 -msgid "Change the current proxy settings" -msgstr "Change the current proxy settings" - -#. command-line help -#: src/clients/proxy.rb:66 -msgid "Set the authentication for proxy" -msgstr "Set the authentication for proxy" - -#. command-line help -#: src/clients/proxy.rb:76 -msgid "Show the summary of the current settings" -msgstr "Show the summary of the current settings" - -#. command-line option help -#: src/clients/proxy.rb:88 -msgid "Set HTTP proxy" -msgstr "Set HTTP proxy" - -#. command-line option help -#: src/clients/proxy.rb:93 -msgid "Set HTTPS proxy" -msgstr "Set HTTPS proxy" - -#. command-line option help -#: src/clients/proxy.rb:98 -msgid "Set FTP proxy" -msgstr "Set FTP proxy" - -#. command-line option help -#: src/clients/proxy.rb:103 -msgid "Clear all options listed" -msgstr "Clear all options listed" - -#. command-line option help -#: src/clients/proxy.rb:107 -msgid "Set domains for not using the proxy settings" -msgstr "Set domains for not using the proxy settings" - -#. command-line option help -#: src/clients/proxy.rb:114 -msgid "The username to be used for proxy authentication" -msgstr "The username to be used for proxy authentication" - -#. command-line option help -#: src/clients/proxy.rb:121 -msgid "The password to be used for proxy authentication" -msgstr "The password to be used for proxy authentication" - -#. ask the user -#. translators: command line prompt for entering a password -#: src/clients/proxy.rb:238 -msgid "Password:" -msgstr "Password:" - -#. Return a modification status -#. @return true if data was modified -#: src/clients/proxy_auto.rb:109 -msgid "Status of Proxy Configuration" -msgstr "Status of Proxy Configuration" - -#: src/clients/proxy_auto.rb:110 -msgid "Enabled" -msgstr "Enabled" - -#: src/clients/proxy_auto.rb:112 -msgid "HTTP" -msgstr "HTTP" - -#: src/clients/proxy_auto.rb:116 -msgid "HTTPS" -msgstr "HTTPS" - -#: src/clients/proxy_auto.rb:120 -msgid "FTP" -msgstr "FTP" - #. Informative label #: src/include/proxy/dialogs.rb:101 msgid "No details available." @@ -180,6 +86,12 @@ msgid "Proxy settings work correctly." msgstr "Proxy settings work correctly." +#. Proxy dialog caption +#. Commandline help title +#: src/include/proxy/dialogs.rb:399 src/lib/proxy/client.rb:27 +msgid "Proxy Configuration" +msgstr "Proxy Configuration" + #. Proxy dialog help 1/8 #: src/include/proxy/dialogs.rb:405 msgid "" @@ -327,7 +239,7 @@ msgstr "Test Pr&oxy Settings" #. Popup error text - http, https and ftp proxy URLs are blank -#: src/include/proxy/dialogs.rb:619 +#: src/include/proxy/dialogs.rb:615 msgid "" "Proxy is enabled, but no proxy URL has been specified.\n" "Really use these settings?" @@ -335,7 +247,7 @@ "Proxy is enabled, but no proxy URL has been specified.\n" "Really use these settings?" -#: src/include/proxy/dialogs.rb:632 +#: src/include/proxy/dialogs.rb:628 msgid "" "Security warning:\n" "Username and password will be stored unencrypted\n" @@ -344,42 +256,42 @@ msgstr "" #. Popup::Error text -#: src/include/proxy/dialogs.rb:647 +#: src/include/proxy/dialogs.rb:643 msgid "You cannot enter a password and leave the user name empty." msgstr "You cannot enter a password and leave the user name empty." #. Popup::Error text -#: src/include/proxy/dialogs.rb:655 +#: src/include/proxy/dialogs.rb:651 msgid "HTTP proxy URL is invalid." msgstr "HTTP proxy URL is invalid." #. Popup::Error text -#: src/include/proxy/dialogs.rb:663 +#: src/include/proxy/dialogs.rb:659 msgid "HTTP proxy URL must contain a scheme specification (http)." msgstr "HTTP proxy URL must contain a scheme specification (http)." #. Popup::Error text -#: src/include/proxy/dialogs.rb:672 +#: src/include/proxy/dialogs.rb:668 msgid "The HTTPS proxy URL is invalid." msgstr "The HTTPS proxy URL is invalid." #. Popup::Error text -#: src/include/proxy/dialogs.rb:680 +#: src/include/proxy/dialogs.rb:676 msgid "The HTTPS proxy URL must contain a scheme specification (http)." msgstr "The HTTPS proxy URL must contain a scheme specification (http)." #. Popup::Error text -#: src/include/proxy/dialogs.rb:691 +#: src/include/proxy/dialogs.rb:687 msgid "FTP proxy URL is invalid." msgstr "FTP proxy URL is invalid." #. Popup::Error text -#: src/include/proxy/dialogs.rb:699 +#: src/include/proxy/dialogs.rb:695 msgid "FTP proxy URL must contain a scheme specification (http)." msgstr "FTP proxy URL must contain a scheme specification (http)." #. Translators: no proxy domain is a domain that can be accessed without proxy -#: src/include/proxy/dialogs.rb:709 +#: src/include/proxy/dialogs.rb:705 msgid "" "One or more no proxy domains are invalid. \n" "Check if all domains match one of the following:\n" @@ -389,55 +301,143 @@ "* Domain name prefixed by '.'" msgstr "" +#. Return a modification status +#. @return true if data was modified +#: src/lib/proxy/auto_client.rb:104 +msgid "Status of Proxy Configuration" +msgstr "Status of Proxy Configuration" + +#: src/lib/proxy/auto_client.rb:105 +msgid "Enabled" +msgstr "Enabled" + +#: src/lib/proxy/auto_client.rb:107 +msgid "HTTP" +msgstr "HTTP" + +#: src/lib/proxy/auto_client.rb:111 +msgid "HTTPS" +msgstr "HTTPS" + +#: src/lib/proxy/auto_client.rb:115 +msgid "FTP" +msgstr "FTP" + +#. command-line help +#: src/lib/proxy/client.rb:35 +msgid "Enable proxy settings" +msgstr "Enable proxy settings" + +#. command-line help +#: src/lib/proxy/client.rb:43 +msgid "Disable proxy settings" +msgstr "Disable proxy settings" + +#. command-line help +#: src/lib/proxy/client.rb:51 +msgid "Change the current proxy settings" +msgstr "Change the current proxy settings" + +#. command-line help +#: src/lib/proxy/client.rb:61 +msgid "Set the authentication for proxy" +msgstr "Set the authentication for proxy" + +#. command-line help +#: src/lib/proxy/client.rb:71 +msgid "Show the summary of the current settings" +msgstr "Show the summary of the current settings" + +#. command-line option help +#: src/lib/proxy/client.rb:83 +msgid "Set HTTP proxy" +msgstr "Set HTTP proxy" + +#. command-line option help +#: src/lib/proxy/client.rb:88 +msgid "Set HTTPS proxy" +msgstr "Set HTTPS proxy" + +#. command-line option help +#: src/lib/proxy/client.rb:93 +msgid "Set FTP proxy" +msgstr "Set FTP proxy" + +#. command-line option help +#: src/lib/proxy/client.rb:98 +msgid "Clear all options listed" +msgstr "Clear all options listed" + +#. command-line option help +#: src/lib/proxy/client.rb:102 +msgid "Set domains for not using the proxy settings" +msgstr "Set domains for not using the proxy settings" + +#. command-line option help +#: src/lib/proxy/client.rb:109 +msgid "The username to be used for proxy authentication" +msgstr "The username to be used for proxy authentication" + +#. command-line option help +#: src/lib/proxy/client.rb:116 +msgid "The password to be used for proxy authentication" +msgstr "The password to be used for proxy authentication" + +#. ask the user +#. translators: command line prompt for entering a password +#: src/lib/proxy/client.rb:233 +msgid "Password:" +msgstr "Password:" + #. Popup headline -#: src/modules/Proxy.rb:45 +#: src/modules/Proxy.rb:38 msgid "Proxy Configuration Successfully Saved" msgstr "Proxy Configuration Successfully Saved" -#: src/modules/Proxy.rb:46 +#: src/modules/Proxy.rb:39 #, fuzzy #| msgid "It is recommended to restore the RPM database." msgid "It is recommended to relogin to make new proxy settings effective." msgstr "It is recommended to restore the RPM database." -#. Write routing settings and apply changes +#. Write proxy settings and apply changes #. @return true if success -#: src/modules/Proxy.rb:131 +#: src/modules/Proxy.rb:174 msgid "Update proxy configuration" msgstr "Update proxy configuration" -#: src/modules/Proxy.rb:133 +#: src/modules/Proxy.rb:176 msgid "Saving Proxy Configuration" msgstr "Saving Proxy Configuration" #. sleep for longer time, so that progress does not disappear right afterwards #. but only when Progress is visible -#: src/modules/Proxy.rb:141 +#: src/modules/Proxy.rb:184 msgid "Updating proxy configuration..." msgstr "Updating proxy configuration..." #. Summary text -#: src/modules/Proxy.rb:437 +#: src/modules/Proxy.rb:418 msgid "Proxy is disabled." msgstr "Proxy is disabled." #. Summary text -#: src/modules/Proxy.rb:442 +#: src/modules/Proxy.rb:423 msgid "Proxy is enabled." msgstr "Proxy is enabled." #. Summary text -#: src/modules/Proxy.rb:451 +#: src/modules/Proxy.rb:432 msgid "HTTP Proxy: %1" msgstr "HTTP Proxy: %1" #. Summary text -#: src/modules/Proxy.rb:459 +#: src/modules/Proxy.rb:440 msgid "HTTPS Proxy: %1" msgstr "HTTPS Proxy: %1" #. Summary text -#: src/modules/Proxy.rb:466 +#: src/modules/Proxy.rb:447 msgid "FTP Proxy: %1" msgstr "FTP Proxy: %1" Modified: trunk/yast/en_GB/po/qt-pkg.en_GB.po =================================================================== --- trunk/yast/en_GB/po/qt-pkg.en_GB.po 2015-09-09 08:18:21 UTC (rev 92602) +++ trunk/yast/en_GB/po/qt-pkg.en_GB.po 2015-09-09 08:19:44 UTC (rev 92603) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: yast2 9.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-04 15:52+0200\n" +"POT-Creation-Date: 2015-08-25 18:36+0200\n" "PO-Revision-Date: 2007-08-16 20:15+0100\n" "Last-Translator: Benjamin Weber\n" "Language-Team: British English\n" @@ -17,271 +17,279 @@ "X-Generator: KAider 0.1\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: src/YQPackageSelector.cc:315 +#: src/YQPackageSelector.cc:318 #, fuzzy msgid "&Update Problems" msgstr "Update Problems" -#: src/YQPackageSelector.cc:342 +#: src/YQPackageSelector.cc:345 #, fuzzy #| msgid "Patterns" msgid "Patter&ns" msgstr "Patterns" -#: src/YQPackageSelector.cc:364 +#: src/YQPackageSelector.cc:367 #, fuzzy msgid "Package &Groups" msgstr "Package Groups" -#: src/YQPackageSelector.cc:376 +#: src/YQPackageSelector.cc:379 msgid "&RPM Groups" msgstr "&RPM Groups" -#: src/YQPackageSelector.cc:389 +#: src/YQPackageSelector.cc:392 msgid "&Languages" msgstr "&Languages" -#: src/YQPackageSelector.cc:405 +#: src/YQPackageSelector.cc:408 msgid "&Repositories" msgstr "&Repositories" -#: src/YQPackageSelector.cc:419 +#: src/YQPackageSelector.cc:422 msgid "S&earch" msgstr "S&earch" #. DEBUG -#: src/YQPackageSelector.cc:426 src/YQPkgSearchFilterView.cc:113 +#: src/YQPackageSelector.cc:429 src/YQPkgSearchFilterView.cc:113 #, fuzzy msgid "&Keywords" msgstr "Keywords" -#: src/YQPackageSelector.cc:435 +#: src/YQPackageSelector.cc:438 msgid "&Installation Summary" msgstr "&Installation Summary" -#: src/YQPackageSelector.cc:520 +#: src/YQPackageSelector.cc:526 msgid "D&escription" msgstr "D&escription" -#: src/YQPackageSelector.cc:533 +#: src/YQPackageSelector.cc:539 msgid "&Technical Data" msgstr "&Technical Data" -#: src/YQPackageSelector.cc:546 src/YQPkgProductDialog.cc:115 +#: src/YQPackageSelector.cc:552 src/YQPkgProductDialog.cc:115 msgid "Dependencies" msgstr "Dependencies" -#: src/YQPackageSelector.cc:562 +#: src/YQPackageSelector.cc:567 msgid "&Versions" msgstr "&Versions" -#: src/YQPackageSelector.cc:580 +#: src/YQPackageSelector.cc:585 msgid "File List" msgstr "File List" -#: src/YQPackageSelector.cc:597 +#: src/YQPackageSelector.cc:602 msgid "Change Log" msgstr "Change Log" #. "Cancel" button #. button #0 #. text -#: src/YQPackageSelector.cc:624 src/YQPackageSelectorBase.cc:194 +#. button #0 +#: src/YQPackageSelector.cc:629 src/YQPackageSelectorBase.cc:194 #: 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/YQSimplePatchSelector.cc:219 +#: src/YQPkgVersionsView.cc:429 src/YQSimplePatchSelector.cc:219 msgid "&Cancel" msgstr "&Cancel" #. Translators: "Accept" here refers to licenses or similar -#: src/YQPackageSelector.cc:634 src/YQPatternSelector.cc:268 +#: src/YQPackageSelector.cc:639 src/YQPatternSelector.cc:268 #: src/YQPkgTextDialog.cc:258 src/YQSimplePatchSelector.cc:228 msgid "&Accept" msgstr "&Accept" -#: src/YQPackageSelector.cc:677 +#: src/YQPackageSelector.cc:682 msgid "&File" msgstr "&File" -#: src/YQPackageSelector.cc:679 +#: src/YQPackageSelector.cc:684 msgid "&Import..." msgstr "&Import..." -#: src/YQPackageSelector.cc:680 +#: src/YQPackageSelector.cc:685 msgid "&Export..." msgstr "&Export..." -#: src/YQPackageSelector.cc:684 +#: src/YQPackageSelector.cc:689 msgid "E&xit -- Discard Changes" msgstr "E&xit -- Discard Changes" -#: src/YQPackageSelector.cc:685 +#: src/YQPackageSelector.cc:690 msgid "&Quit -- Save Changes" msgstr "&Quit -- Save Changes" -#: src/YQPackageSelector.cc:697 +#: src/YQPackageSelector.cc:702 msgid "&Package" msgstr "&Package" -#: src/YQPackageSelector.cc:737 src/YQPkgPackageKitGroupsFilterView.cc:92 +#: src/YQPackageSelector.cc:742 src/YQPkgPackageKitGroupsFilterView.cc:92 #: src/YQPkgRepoFilterView.cc:149 msgid "All Packages" msgstr "All Packages" -#: src/YQPackageSelector.cc:739 src/YQPkgObjList.cc:430 +#: src/YQPackageSelector.cc:744 src/YQPkgObjList.cc:430 msgid "Update if newer version available" msgstr "Update if newer version available" -#: src/YQPackageSelector.cc:742 src/YQPkgObjList.cc:415 +#: src/YQPackageSelector.cc:747 src/YQPkgObjList.cc:415 #: src/YQPkgObjList.cc:436 msgid "Update unconditionally" msgstr "Update unconditionally" -#: src/YQPackageSelector.cc:756 +#: src/YQPackageSelector.cc:761 msgid "&Patch" msgstr "&Patch" -#: src/YQPackageSelector.cc:783 +#: src/YQPackageSelector.cc:788 #, fuzzy #| msgid "Configuration" msgid "Confi&guration" msgstr "Configuration" -#: src/YQPackageSelector.cc:784 +#: src/YQPackageSelector.cc:789 #, fuzzy msgid "&Repositories..." msgstr "&Repositories" -#: src/YQPackageSelector.cc:785 +#: src/YQPackageSelector.cc:790 #, fuzzy msgid "&Online Update..." msgstr "Online Update" -#: src/YQPackageSelector.cc:795 +#: src/YQPackageSelector.cc:800 msgid "&Dependencies" msgstr "&Dependencies" -#: src/YQPackageSelector.cc:797 +#: src/YQPackageSelector.cc:802 #, fuzzy msgid "&Check Now" msgstr "Chec&k" -#: src/YQPackageSelector.cc:798 +#: src/YQPackageSelector.cc:804 #, fuzzy msgid "&Autocheck" msgstr "A&utocheck" +#: src/YQPackageSelector.cc:809 +#, fuzzy +msgid "Install &Recommended Packages" +msgstr "Removed package" + #. Translators: Menu for view options (Use a noun, not a verb!) -#: src/YQPackageSelector.cc:811 +#: src/YQPackageSelector.cc:822 msgid "&Options" msgstr "&Options" #. Translators: This is about packages ending in "-devel", so don't translate that "-devel"! -#: src/YQPackageSelector.cc:814 +#: src/YQPackageSelector.cc:825 msgid "Show -de&vel Packages" msgstr "Show -de&vel Packages" #. Translators: This is about packages ending in "-debuginfo", so don't translate that "-debuginfo"! -#: src/YQPackageSelector.cc:823 +#: src/YQPackageSelector.cc:834 #, fuzzy msgid "Show -&debuginfo/-debugsource Packages" msgstr "Show -&debuginfo Packages" -#: src/YQPackageSelector.cc:831 +#: src/YQPackageSelector.cc:842 #, fuzzy msgid "&System Verification Mode" msgstr "&Authentication Mode" -#: src/YQPackageSelector.cc:836 -msgid "&Ignore Recommended Packages for Already Installed Packages" -msgstr "" - -#: src/YQPackageSelector.cc:842 +#: src/YQPackageSelector.cc:847 #, fuzzy #| msgid "Selecting packages..." msgid "&Cleanup when deleting packages" msgstr "Selecting packages..." -#: src/YQPackageSelector.cc:846 +#: src/YQPackageSelector.cc:851 msgid "&Allow vendor change" msgstr "" -#: src/YQPackageSelector.cc:859 +#: src/YQPackageSelector.cc:864 #, fuzzy #| msgid "&Extras" msgid "E&xtras" msgstr "&Extras" -#: src/YQPackageSelector.cc:861 +#: src/YQPackageSelector.cc:866 msgid "Show &Products" msgstr "Show &Products" -#: src/YQPackageSelector.cc:862 +#: src/YQPackageSelector.cc:867 #, fuzzy msgid "Show P&ackage Changes" msgstr "Show &Automatic Package Changes" -#: src/YQPackageSelector.cc:863 +#: src/YQPackageSelector.cc:868 #, fuzzy #| msgid "History" msgid "Show &History" msgstr "History" #. Translators: This is about packages ending in "-devel", so don't translate that "-devel"! -#: src/YQPackageSelector.cc:871 +#: src/YQPackageSelector.cc:876 msgid "Install All Matching -&devel Packages" msgstr "Install All Matching -&devel Packages" #. Translators: This is about packages ending in "-debuginfo", so don't translate that "-debuginfo"! -#: src/YQPackageSelector.cc:875 +#: src/YQPackageSelector.cc:880 msgid "Install All Matching -de&buginfo Packages" msgstr "Install All Matching -de&buginfo Packages" #. Translators: This is about packages ending in "-debugsource", so don't translate that "-debugsource"! -#: src/YQPackageSelector.cc:878 +#: src/YQPackageSelector.cc:883 #, fuzzy msgid "Install All Matching -debug&source Packages" msgstr "Install All Matching -de&buginfo Packages" -#: src/YQPackageSelector.cc:883 +#: src/YQPackageSelector.cc:885 +#, fuzzy +#| msgid "Install All Matching -&devel Packages" +msgid "Install All Matching &Recommended Packages" +msgstr "Install All Matching -&devel Packages" + +#: src/YQPackageSelector.cc:891 msgid "Generate Dependency Resolver &Test Case" msgstr "Generate Dependency Resolver &Test Case" -#: src/YQPackageSelector.cc:903 +#: src/YQPackageSelector.cc:911 msgid "&Help" msgstr "&Help" #. Note: The help functions and their texts are moved out #. to a separate source file YQPackageSelectorHelp.cc #. Menu entry for help overview -#: src/YQPackageSelector.cc:909 +#: src/YQPackageSelector.cc:917 msgid "&Overview" msgstr "&Overview" #. Menu entry for help about used symbols ( icons ) -#: src/YQPackageSelector.cc:912 +#: src/YQPackageSelector.cc:920 msgid "&Symbols" msgstr "&Symbols" #. Menu entry for keyboard help -#: src/YQPackageSelector.cc:915 +#: src/YQPackageSelector.cc:923 msgid "&Keys" msgstr "&Keys" -#: src/YQPackageSelector.cc:1101 +#: src/YQPackageSelector.cc:1109 msgid "All package dependencies are OK." msgstr "All package dependencies are OK." -#: src/YQPackageSelector.cc:1117 +#: src/YQPackageSelector.cc:1125 #, fuzzy msgid "P&atches" msgstr "Patches" #. startsWith #. filter -#: src/YQPackageSelector.cc:1179 +#: src/YQPackageSelector.cc:1187 msgid "Save Package List" msgstr "Save Package List" @@ -289,59 +297,59 @@ #. parent #. Post error popup. #. parent -#: src/YQPackageSelector.cc:1218 src/YQPackageSelector.cc:1312 +#: src/YQPackageSelector.cc:1226 src/YQPackageSelector.cc:1320 #: src/YQPkgConflictDialog.cc:425 src/YQPkgConflictList.cc:201 #: src/YQPkgList.cc:605 msgid "Error" msgstr "Error" #. caption -#: src/YQPackageSelector.cc:1219 +#: src/YQPackageSelector.cc:1227 msgid "Error exporting package list to %1" msgstr "Error exporting package list to %1" -#: src/YQPackageSelector.cc:1231 +#: src/YQPackageSelector.cc:1239 msgid "Load Package List" msgstr "Load Package List" #. caption -#: src/YQPackageSelector.cc:1313 +#: src/YQPackageSelector.cc:1321 msgid "Error loading package list from %1" msgstr "Error loading package list from %1" #. caption #. Translators: %1 is the number of affected packages -#: src/YQPackageSelector.cc:1415 +#: src/YQPackageSelector.cc:1423 msgid "%1 packages will be updated" msgstr "%1 packages will be updated" -#: src/YQPackageSelector.cc:1416 +#: src/YQPackageSelector.cc:1424 msgid "&Continue" msgstr "&Continue" -#: src/YQPackageSelector.cc:1416 +#: src/YQPackageSelector.cc:1424 msgid "C&ancel" msgstr "C&ancel" -#: src/YQPackageSelector.cc:1455 +#: src/YQPackageSelector.cc:1463 msgid "<p><small>Cancel switching</a> system packages to versions in repository %2</small></p>" msgstr "" -#: src/YQPackageSelector.cc:1474 +#: src/YQPackageSelector.cc:1482 msgid "<p>Switch system packages</a> to the versions in this repository (%2)</p>" msgstr "" -#: src/YQPackageSelector.cc:1697 +#: src/YQPackageSelector.cc:1571 src/YQPackageSelector.cc:1726 msgid "Added Subpackages:" msgstr "Added Subpackages:" #. "OK" button #. addHStretch( hbox ); #. "OK" button -#: src/YQPackageSelector.cc:1699 src/YQPackageSelectorBase.cc:214 -#: src/YQPkgDescriptionDialog.cc:120 src/YQPkgDiskUsageList.cc:156 -#: src/YQPkgDiskUsageList.cc:165 src/YQPkgProductDialog.cc:135 -#: src/YQPkgTextDialog.cc:71 +#: src/YQPackageSelector.cc:1572 src/YQPackageSelector.cc:1728 +#: src/YQPackageSelectorBase.cc:214 src/YQPkgDescriptionDialog.cc:120 +#: src/YQPkgDiskUsageList.cc:156 src/YQPkgDiskUsageList.cc:165 +#: src/YQPkgProductDialog.cc:135 src/YQPkgTextDialog.cc:71 msgid "&OK" msgstr "&OK" @@ -389,7 +397,7 @@ msgstr "In addition to your manual selections, the following packages have been changed to resolve dependencies:" #: src/YQPackageSelectorBase.cc:305 src/YQPackageSelectorBase.cc:326 -#: src/YQPkgConflictDialog.cc:397 +#: src/YQPkgConflictDialog.cc:397 src/YQPkgVersionsView.cc:428 msgid "C&ontinue" msgstr "C&ontinue" @@ -1591,10 +1599,43 @@ "The safest course of action is to delete them.\n" "</p>" -#: src/YQPkgVersionsView.cc:211 +#: src/YQPkgVersionsView.cc:207 msgid "%1-%2 from vendor %3 (installed)" msgstr "" +#. Translators: Popup dialog text. Try to keep the lines about the same length. +#: src/YQPkgVersionsView.cc:398 +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 +msgid "" +"This version is multiversion-capable.\n" +"\n" +"Press \"Continue\" to install this version\n" +"and unselect the non-multiversion-capable version,\n" +"\"Cancel\" to unselect this version and keep the other one." +msgstr "" + +#: src/YQPkgVersionsView.cc:415 +msgid "" +"This version is not multiversion-capable.\n" +"\n" +"Press \"Continue\" to install only this version\n" +"and unselect all other versions,\n" +"\"Cancel\" to unselect this version and keep the other ones." +msgstr "" + +#. Dialog heading +#: src/YQPkgVersionsView.cc:423 +#, fuzzy +#| msgid "&Generate Package Descriptions" +msgid "Incompatible Package Versions" +msgstr "&Generate Package Descriptions" + #. Translators: %1 is a package version, %2 the package architecture, #. %3 describes the repository where it comes from, #. %4 is the repository's priority @@ -1602,13 +1643,13 @@ #. Examples: #. 2.5.23-i568 from Packman with priority 100 and vendor openSUSE #. 3.17.4-i386 from openSUSE-11.1 update repository with priority 20 and vendor openSUSE -#. ^^^^^^ ^^^^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ^^ ^^^^^^^^ -#. %1 %2 %3 %4 %5 -#: src/YQPkgVersionsView.cc:365 src/YQPkgVersionsView.cc:402 +#. ^^^^^^ ^^^^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ^^ ^^^^^^^^ +#. %1 %2 %3 %4 %5 +#: src/YQPkgVersionsView.cc:549 src/YQPkgVersionsView.cc:586 msgid "%1-%2 from %3 with priority %4 and vendor %5" msgstr "" -#: src/YQPkgVersionsView.cc:386 +#: src/YQPkgVersionsView.cc:570 msgid "This version is installed in your system." msgstr "This version is installed in your system." Modified: trunk/yast/en_GB/po/qt.en_GB.po =================================================================== --- trunk/yast/en_GB/po/qt.en_GB.po 2015-09-09 08:18:21 UTC (rev 92602) +++ trunk/yast/en_GB/po/qt.en_GB.po 2015-09-09 08:19:44 UTC (rev 92603) @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: qt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-04 15:52+0200\n" +"POT-Creation-Date: 2015-08-25 18:36+0200\n" "PO-Revision-Date: 2008-03-27 23:04+0000\n" "Last-Translator: Benjamin Weber \n" "Language-Team: \n" @@ -49,18 +49,23 @@ msgstr "Used" #. Window title for help wizard window -#. Help button - intentionally without keyboard shortcut -#. "Help" button - intentionally without keyboard shortcut -#: src/QY2HelpDialog.cc:63 src/QY2HelpDialog.cc:112 src/YQWizard.cc:853 -#: src/YQWizard.cc:1320 +#: src/QY2HelpDialog.cc:63 src/QY2HelpDialog.cc:112 msgid "Help" msgstr "Help" #. Close button for wizard help window #: src/QY2HelpDialog.cc:66 src/QY2HelpDialog.cc:113 +#: src/QY2RelNotesDialog.cc:86 src/QY2RelNotesDialog.cc:132 msgid "&Close" msgstr "&Close" +#. Window title for help wizard window +#: src/QY2RelNotesDialog.cc:83 src/QY2RelNotesDialog.cc:131 +#, fuzzy +#| msgid "Release Notes..." +msgid "Release Notes" +msgstr "Release Notes..." + #: src/QY2StyleEditor.cc:46 #, fuzzy msgid "Stylesheet Editor" @@ -80,12 +85,12 @@ msgstr "Unexpected Click" #. parent -#: src/YQDialog.cc:623 +#: src/YQDialog.cc:629 msgid "Color switching" msgstr "Colour switching" #. caption -#: src/YQDialog.cc:624 +#: src/YQDialog.cc:630 msgid "" "Switching to color palette for vision impaired users -\n" "press Shift-F4 again to switch back to normal colors." @@ -120,24 +125,41 @@ msgid "Configure YaST Logging:" msgstr "Configure YaST2 Logging:" +#. Help button +#. QT handles duplicate shortcuts, it can be kept (bnc#880983) +#. "Help" button +#. QT handles duplicate shortcuts, it can be kept (bnc#880983) +#: src/YQWizard.cc:857 src/YQWizard.cc:1340 +msgid "&Help" +msgstr "&Help" + #. #. "Release Notes" button #. -#. Help button - intentionally without keyboard shortcut -#: src/YQWizard.cc:869 +#. Release Notes button +#. QT handles duplicate shortcuts, it can be kept (bnc#880983) +#. "Release Notes" button +#. QT handles duplicate shortcuts, it can be kept (bnc#880983) +#: src/YQWizard.cc:874 src/YQWizard.cc:1355 #, fuzzy #| msgid "Release Notes..." -msgid "Release Notes" +msgid "&Release Notes" msgstr "Release Notes..." -#. "Steps" button - intentionally without keyboard shortcut -#: src/YQWizard.cc:1324 -msgid "Steps" +#. "Steps" button +#. QT handles duplicate shortcuts, it can be kept (bnc#880983) +#: src/YQWizard.cc:1345 +#, fuzzy +#| msgid "Steps" +msgid "&Steps" msgstr "Steps" -#. "Tree" button - intentionally without keyboard shortcut -#: src/YQWizard.cc:1328 -msgid "Tree" +#. "Tree" button +#. QT handles duplicate shortcuts, it can be kept (bnc#880983) +#: src/YQWizard.cc:1350 +#, fuzzy +#| msgid "Tree" +msgid "&Tree" msgstr "Tree" #~ msgid "%1 exists! Really overwrite?" Modified: trunk/yast/en_GB/po/rdp.en_GB.po =================================================================== --- trunk/yast/en_GB/po/rdp.en_GB.po 2015-09-09 08:18:21 UTC (rev 92602) +++ trunk/yast/en_GB/po/rdp.en_GB.po 2015-09-09 08:19:44 UTC (rev 92603) @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-04 15:53+0200\n" +"POT-Creation-Date: 2015-08-25 18:37+0200\n" "PO-Revision-Date: 2001-07-17 16:27+0200\n" "Last-Translator: James Ogley \n" "Language-Team: English \n" Modified: trunk/yast/en_GB/po/rear.en_GB.po =================================================================== --- trunk/yast/en_GB/po/rear.en_GB.po 2015-09-09 08:18:21 UTC (rev 92602) +++ trunk/yast/en_GB/po/rear.en_GB.po 2015-09-09 08:19:44 UTC (rev 92603) @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-04 15:53+0200\n" +"POT-Creation-Date: 2015-08-25 18:37+0200\n" "PO-Revision-Date: 2001-07-17 16:27+0200\n" "Last-Translator: James Ogley \n" "Language-Team: English \n" @@ -282,16 +282,16 @@ #: src/include/rear/ui.rb:698 #, fuzzy +#| msgid "Analyzing the system..." +msgid "Analyzing system" +msgstr "Analysing the system..." + +#: src/include/rear/ui.rb:698 +#, fuzzy #| msgid "Reading firewall settings" msgid "Reading rear settings" msgstr "Reading firewall settings" -#: src/include/rear/ui.rb:698 -#, fuzzy -#| msgid "Analyzing the system..." -msgid "Analyzing system" -msgstr "Analysing the system..." - #: src/include/rear/ui.rb:699 #, fuzzy #| msgid "Analyzing the system..." Modified: trunk/yast/en_GB/po/registration.en_GB.po =================================================================== --- trunk/yast/en_GB/po/registration.en_GB.po 2015-09-09 08:18:21 UTC (rev 92602) +++ trunk/yast/en_GB/po/registration.en_GB.po 2015-09-09 08:19:44 UTC (rev 92603) @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: registration\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-10-29 16:21+0100\n" +"POT-Creation-Date: 2015-08-27 10:52+0200\n" "PO-Revision-Date: 2008-03-27 23:04+0000\n" "Last-Translator: Benjamin Weber \n" "Language-Team: \n" @@ -23,25 +23,25 @@ "X-Generator: KBabel 1.11.4\n" #. popup heading (in bold) -#: src/clients/discover_registration_services.rb:40 +#: src/clients/discover_registration_services.rb:42 #, fuzzy msgid "Local Registration Servers" msgstr "Registration Code" -#: src/clients/discover_registration_services.rb:42 +#: src/clients/discover_registration_services.rb:44 msgid "" "Select a detected registration server from the list\n" "or the default SUSE registration server." msgstr "" #. error popup -#: src/clients/discover_registration_services.rb:66 +#: src/clients/discover_registration_services.rb:68 #, fuzzy msgid "No registration server selected." msgstr "Registration Code" #. %s is the default SCC URL -#: src/clients/discover_registration_services.rb:112 +#: src/clients/discover_registration_services.rb:114 #, fuzzy #| msgid "Novell Customer Center Configuration" msgid "SUSE Customer Center (%s)" @@ -50,231 +50,76 @@ #. popup message #. popup message #. popup message -#: src/clients/inst_scc.rb:53 src/clients/scc_auto.rb:49 -#: src/lib/registration/registration_ui.rb:39 +#: src/clients/inst_scc.rb:54 src/clients/scc_auto.rb:49 +#: src/lib/registration/registration_ui.rb:40 #, fuzzy msgid "Contacting the Registration Server" msgstr "Registration Code" -#. display the registration update dialog +#. check the base product at start to avoid problems later +#. Translators: Text for UI Label - capitalized #. dialog title +#. just set an empty Wizard dialog to replace the current one after +#. pressing "Next" #. dialog title -#. Translators: Text for UI Label - capitalized -#: src/clients/inst_scc.rb:215 src/clients/inst_scc.rb:310 -#: src/clients/inst_scc.rb:467 src/clients/inst_scc.rb:515 -#: src/lib/registration/ui/autoyast_config_dialog.rb:92 +#. display and run a dialog for updating the current registration +#. @return [Symbol] user input +#: 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/registered_system_dialog.rb:37 +#: src/lib/registration/ui/registration_update_dialog.rb:41 #, fuzzy #| msgid "Registration Code" msgid "Registration" msgstr "Registration Code" -#: src/clients/inst_scc.rb:216 -#, fuzzy -#| msgid "Registration Code" -msgid "Registration is being updated..." -msgstr "Registration Code" - -#: src/clients/inst_scc.rb:217 -#, fuzzy -msgid "The previous registration is being updated." -msgstr "No software repository found on medium." - -#. automatic registration refresh during system upgrade failed, register from scratch -#: src/clients/inst_scc.rb:233 -msgid "" -"Automatic registration upgrade failed.\n" -"You can manually register the system from scratch." -msgstr "" - -#. label text describing the registration (1/2) -#. use \n to split to more lines if needed (use max. 76 chars/line) -#: src/clients/inst_scc.rb:247 -msgid "" -"Please enter a registration or evaluation code for this product and your\n" -"User Name/E-mail address from the SUSE Customer Center in the fields below.\n" -"Access to security and general software updates is only possible on\n" -"a registered system." -msgstr "" - -#. label text describing the registration (2/2), -#. not displayed in installed system -#. use \n to split to more lines if needed (use max. 76 chars/line) -#: src/clients/inst_scc.rb:259 -msgid "" -"If you skip product registration now, remember to register after\n" -"installation has completed." -msgstr "" - -#: src/clients/inst_scc.rb:267 -#, fuzzy -#| msgid "Novell Customer Center Configuration" -msgid "Network Configuration..." -msgstr "Novell Customer Centre Configuration" - -#: src/clients/inst_scc.rb:276 src/clients/inst_scc.rb:452 -msgid "The system is already registered." -msgstr "" - -#: src/clients/inst_scc.rb:283 -#: src/lib/registration/ui/autoyast_config_dialog.rb:94 -#, fuzzy -#| msgid "Email Address" -msgid "&E-mail Address" -msgstr "Email Address" - -#. handle nil specifically, it cannot be stored in XML profile -#: src/clients/inst_scc.rb:285 -#: src/lib/registration/ui/autoyast_addon_dialog.rb:167 -#: src/lib/registration/ui/autoyast_config_dialog.rb:96 -#, fuzzy -#| msgid "Registration Code" -msgid "Registration &Code" -msgstr "Registration Code" - -#. button label -#: src/clients/inst_scc.rb:290 -#, fuzzy -msgid "&Local Registration Server..." -msgstr "Registration Code" - -#. button label -#: src/clients/inst_scc.rb:293 -#, fuzzy -#| msgid "Registration" -msgid "&Skip Registration" -msgstr "Registration" - -#. help text -#: src/clients/inst_scc.rb:301 -msgid "Enter SUSE Customer Center credentials here to register the system to get updates and extensions." -msgstr "" - -#. not set yet? -#: src/clients/inst_scc.rb:334 -msgid "" -"Registration added some update repositories.\n" -"\n" -"Do you want to install the latest available\n" -"on-line updates during installation?" -msgstr "" - -#. %s is name of given product -#. %s is name of given product -#. then register the product(s) -#: src/clients/inst_scc.rb:385 src/clients/scc_auto.rb:284 -#: src/lib/registration/registration_ui.rb:71 -#, fuzzy -#| msgid "Registration Code" -msgid "Registering %s ..." -msgstr "Registration Code" - -#. dialog title -#: src/clients/inst_scc.rb:419 -#, fuzzy -msgid "Register Extensions and Modules" -msgstr "Registration Code" - -#. help text -#: src/clients/inst_scc.rb:423 -#, fuzzy -#| msgid "<p>Please wait, while volumes are being detected.</p>" -msgid "<p>Extensions and Modules are being registered.</p>" -msgstr "<p>Please wait, while volumes are being detected.</p>" - -#. Popup question: confirm skipping the registration -#: src/clients/inst_scc.rb:441 -msgid "" -"If you do not register your system we will not be able\n" -"to grant you access to the update repositories.\n" -"\n" -"You can register after the installation or visit our\n" -"Customer Center for online registration.\n" -"\n" -"Really skip the registration now?" -msgstr "" - -#. button label -#: src/clients/inst_scc.rb:455 -#, fuzzy -#| msgid "Register New User" -msgid "Register Again" -msgstr "Register New User" - -#. button label -#: src/clients/inst_scc.rb:458 -msgid "Select Extensions" -msgstr "" - -#. help text -#: src/clients/inst_scc.rb:470 -#, fuzzy -#| msgid "<p>Your system is ready for use.</p>" -msgid "<p>The system is already registered.</p>" -msgstr "<p>Your system is ready for use.</p>" - -#: src/clients/inst_scc.rb:471 -msgid "<p>You can re-register it again or you can register additional extension or modules to enhance the functionality of the system.</p>" -msgstr "" - -#: src/clients/inst_scc.rb:473 -msgid "<p>If you want to deregister your system you need to log into the SUSE Customer Center and remove the system manually there.</p>" -msgstr "" - -#. error message -#: src/clients/inst_scc.rb:497 -msgid "" -"The base product was not found,\n" -"check your system." -msgstr "" - -#. TRANSLATORS: %s = bugzilla URL -#: src/clients/inst_scc.rb:501 -msgid "" -"The installation medium or the installer itself is seriously broken.\n" -"Report a bug at %s." -msgstr "" - -#: src/clients/inst_scc.rb:504 -msgid "" -"Make sure a product is installed and /etc/products.d/baseproduct\n" -"is a symlink pointing to the base product .prod file." -msgstr "" - #. Command line help text for the repository module, %1 is "SUSEconnect" -#: src/clients/scc.rb:44 +#. Command line help text for the repository module, %1 is "SUSEconnect" +#: src/clients/registration.rb:43 src/clients/scc.rb:43 msgid "Use '%s' instead of this YaST module." msgstr "" #. popup message: registration finished properly -#: src/clients/scc_auto.rb:184 +#: src/clients/scc_auto.rb:201 #, fuzzy msgid "Registration was successfull." msgstr "Installation was successful" #. remove possible duplicates -#: src/clients/scc_auto.rb:212 +#: src/clients/scc_auto.rb:229 msgid "SLP discovery failed, no server found" msgstr "" -#. more than one server found: let the user select, we cannot automatically -#. decide which one to use, asking user in AutoYast mode is not nice -#. but better than aborting the installation... -#: src/clients/scc_auto.rb:228 +#. download and install the specified SSL certificate to the system +#. @param url [String] URL of the certificate +#: src/clients/scc_auto.rb:247 #, fuzzy #| msgid "Downloading SMT certificate file failed" msgid "Downloading SSL Certificate" msgstr "Downloading SMT certificate file failed" -#: src/clients/scc_auto.rb:232 +#: src/clients/scc_auto.rb:251 #, fuzzy #| msgid "Import Certificate" msgid "Importing SSL Certificate" msgstr "Import Certificate" +#. %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 +#, fuzzy +#| msgid "Registration Code" +msgid "Registering %s ..." +msgstr "Registration Code" + #. display the extension selection dialog and wait for a button click #. @return [Symbol] user input (:import, :cancel) #: src/data/registration/autoyast_summary.erb:5 -#: src/lib/registration/ui/autoyast_config_dialog.rb:49 +#: src/lib/registration/ui/autoyast_config_dialog.rb:55 msgid "Product Registration" msgstr "Product Registration" @@ -366,33 +211,33 @@ msgstr "Select Certificate File" #: src/data/registration/certificate_summary.erb:4 -#: src/lib/registration/ssl_certificate_details.rb:35 +#: src/lib/registration/ssl_certificate_details.rb:34 msgid "Issued To" msgstr "" #. label followed by the SSL certificate identification #: src/data/registration/certificate_summary.erb:7 #: src/data/registration/certificate_summary.erb:16 -#: src/lib/registration/ssl_certificate_details.rb:61 +#: src/lib/registration/ssl_certificate_details.rb:60 msgid "Common Name (CN): " msgstr "" #. label followed by the SSL certificate identification #: src/data/registration/certificate_summary.erb:8 #: src/data/registration/certificate_summary.erb:17 -#: src/lib/registration/ssl_certificate_details.rb:63 +#: src/lib/registration/ssl_certificate_details.rb:62 msgid "Organization (O): " msgstr "" #. label followed by the SSL certificate identification #: src/data/registration/certificate_summary.erb:9 #: src/data/registration/certificate_summary.erb:18 -#: src/lib/registration/ssl_certificate_details.rb:65 +#: src/lib/registration/ssl_certificate_details.rb:64 msgid "Organization Unit (OU): " msgstr "" #: src/data/registration/certificate_summary.erb:13 -#: src/lib/registration/ssl_certificate_details.rb:36 +#: src/lib/registration/ssl_certificate_details.rb:35 msgid "Issued By" msgstr "" @@ -431,44 +276,44 @@ msgstr "If &Serial Number is Known" #: src/data/registration/certificate_summary.erb:44 -#: src/lib/registration/ssl_certificate_details.rb:36 +#: src/lib/registration/ssl_certificate_details.rb:35 #, fuzzy #| msgid "Fingerprint: " msgid "SHA1 Fingerprint: " msgstr "Fingerprint: " #: src/data/registration/certificate_summary.erb:46 -#: src/lib/registration/ssl_certificate_details.rb:38 +#: src/lib/registration/ssl_certificate_details.rb:37 #, fuzzy #| msgid "Fingerprint: " msgid "SHA256 Fingerprint: " msgstr "Fingerprint: " #. Error popup -#: src/lib/registration/connect_helpers.rb:72 +#: src/lib/registration/connect_helpers.rb:74 msgid "" "Network is not configured, the registration server cannot be reached.\n" "Do you want to configure the network now?" msgstr "" -#: src/lib/registration/connect_helpers.rb:78 +#: src/lib/registration/connect_helpers.rb:80 msgid "Network error, check the network configuration." msgstr "" #. Error popup -#: src/lib/registration/connect_helpers.rb:83 +#: src/lib/registration/connect_helpers.rb:85 msgid "Connection time out." msgstr "" #. TRANSLATORS: additional hint for an error message -#: src/lib/registration/connect_helpers.rb:91 +#: src/lib/registration/connect_helpers.rb:93 #, fuzzy #| msgid "Destination is invalid." msgid "Check that this system is known to the registration server." msgstr "Destination is invalid." #. TRANSLATORS: additional hint for an error message -#: src/lib/registration/connect_helpers.rb:97 +#: src/lib/registration/connect_helpers.rb:99 msgid "" "If you are upgrading from SLE11 make sure the SCC server\n" "knows the old NCC registration. Synchronization from NCC to SCC\n" @@ -484,58 +329,58 @@ #. update the message when an old SMT server is found #. Error popup #. update the message when an old SMT server is found -#: src/lib/registration/connect_helpers.rb:111 -#: src/lib/registration/connect_helpers.rb:116 -#: src/lib/registration/connect_helpers.rb:119 -#: src/lib/registration/connect_helpers.rb:125 -#: src/lib/registration/connect_helpers.rb:175 -#: src/lib/registration/connect_helpers.rb:178 +#: src/lib/registration/connect_helpers.rb:113 +#: src/lib/registration/connect_helpers.rb:118 +#: src/lib/registration/connect_helpers.rb:121 +#: src/lib/registration/connect_helpers.rb:128 +#: src/lib/registration/connect_helpers.rb:179 +#: src/lib/registration/connect_helpers.rb:182 #, fuzzy #| msgid "Registration Code" msgid "Registration failed." msgstr "Registration Code" -#: src/lib/registration/connect_helpers.rb:121 +#: src/lib/registration/connect_helpers.rb:123 #, fuzzy msgid "Registration client error." msgstr "Registration Data to Use" -#: src/lib/registration/connect_helpers.rb:123 +#: src/lib/registration/connect_helpers.rb:125 msgid "" "Registration server error.\n" "Retry registration later." msgstr "" #. error message -#: src/lib/registration/connect_helpers.rb:164 +#: src/lib/registration/connect_helpers.rb:167 msgid "Received SSL Certificate does not match the expected certificate." msgstr "" #. %s are error details -#: src/lib/registration/connect_helpers.rb:195 +#: src/lib/registration/connect_helpers.rb:197 #, fuzzy #| msgid "Details..." msgid "Details: %s" msgstr "Details..." #. progress label -#: src/lib/registration/connect_helpers.rb:220 +#: src/lib/registration/connect_helpers.rb:222 msgid "Importing the SSL certificate" msgstr "" -#: src/lib/registration/connect_helpers.rb:221 +#: src/lib/registration/connect_helpers.rb:223 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:241 +#: src/lib/registration/connect_helpers.rb:244 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:260 +#: src/lib/registration/connect_helpers.rb:263 msgid "" "An old registration server was detected at\n" "%s.\n" @@ -550,21 +395,37 @@ msgid "Storing Registration Configuration..." msgstr "Saving Remote Administration Configuration" -#. register the system and the base product -#. @return [Array] array with two -#. items: boolean (true on success), remote service (or nil) -#. TODO FIXME: split to two separate parts -#. TODO FIXME: reused an existing message due to text freeze +#. error message +#: src/lib/registration/helpers.rb:231 +msgid "" +"The base product was not found,\n" +"check your system." +msgstr "" + +#. TRANSLATORS: %s = bugzilla URL +#: src/lib/registration/helpers.rb:235 +msgid "" +"The installation medium or the installer itself is seriously broken.\n" +"Report a bug at %s." +msgstr "" + +#: src/lib/registration/helpers.rb:238 +msgid "" +"Make sure a product is installed and /etc/products.d/baseproduct\n" +"is a symlink pointing to the base product .prod file." +msgstr "" + +#. 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:62 -#: src/lib/registration/registration_ui.rb:95 +#: src/lib/registration/registration_ui.rb:80 +#: src/lib/registration/registration_ui.rb:233 msgid "Registering the System..." msgstr "" #. updating base product registration, %s is a new base product name #. updating registered addon/extension, %s is an extension name -#: src/lib/registration/registration_ui.rb:121 -#: src/lib/registration/registration_ui.rb:146 +#: src/lib/registration/registration_ui.rb:106 +#: src/lib/registration/registration_ui.rb:312 #, fuzzy #| msgid "Updating zone files..." msgid "Updating to %s ..." @@ -574,74 +435,137 @@ #. the result is cached to avoid reloading when going back and forth in the #. installation workflow #. @return [ArrayRegistration::Addon] available addons -#. create a new dialog for accepting and importing a SSL certificate and run it -#: src/lib/registration/registration_ui.rb:174 -#: src/lib/registration/ui/autoyast_config_workflow.rb:101 +#. 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 #, fuzzy msgid "Loading Available Extensions and Modules..." msgstr "Registration Code" +#: src/lib/registration/registration_ui.rb:157 +#, fuzzy +#| msgid "Loading configuration %1..." +msgid "Loading Migration Products..." +msgstr "Loading configuration %1..." + +#. dialog title +#: src/lib/registration/registration_ui.rb:174 +#, fuzzy +msgid "Register Extensions and Modules" +msgstr "Registration Code" + +#. help text +#: src/lib/registration/registration_ui.rb:178 +#, fuzzy +#| msgid "<p>Please wait, while volumes are being detected.</p>" +msgid "<p>Extensions and Modules are being registered.</p>" +msgstr "<p>Please wait, while volumes are being detected.</p>" + +#. TRANSLATORS: updates popup question (1/2), multiline, max. ~60 chars/line +#: src/lib/registration/registration_ui.rb:203 +#, fuzzy +msgid "" +"The registration server offers update repositories.\n" +"\n" +msgstr "Registration Code" + +#. TRANSLATORS: updates popup question (2/2), multiline, max. ~60 chars/line +#: src/lib/registration/registration_ui.rb:207 +#, 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" +msgstr "" +"Would you like to use these mount points\n" +"for your new installation?" + +#. Yast::Mode.update +#. TRANSLATORS: updates popup question (2/2), multiline, max. ~60 chars/line +#: src/lib/registration/registration_ui.rb:211 +#, fuzzy +#| msgid "Would you like to enable access to the profile repository?" +msgid "Would you like to enable these repositories during upgrade\n" +msgstr "Would you like to enable access to the profile repository?" + #. indent size used in summary text -#: src/lib/registration/ssl_certificate_details.rb:35 +#: src/lib/registration/ssl_certificate_details.rb:34 #, fuzzy #| msgid "SMT Certificate" msgid "Certificate:" msgstr "SMT Certificate" #. create UI label for a base product -#. @param [Hash] Product (hash from pkg-bindings) +#. @param base_product [Hash] Product (hash from pkg-bindings) #. @return [String] UI Label -#: src/lib/registration/sw_mgmt.rb:120 +#: src/lib/registration/sw_mgmt.rb:147 #, fuzzy #| msgid "Unknown error" msgid "Unknown product" msgstr "Unknown error" #. error message -#: src/lib/registration/sw_mgmt.rb:153 +#. error message +#: src/lib/registration/sw_mgmt.rb:174 src/lib/registration/sw_mgmt.rb:248 #, fuzzy msgid "Saving repository configuration failed." msgstr "Starting Installation" #. # error message #. error message -#: src/lib/registration/sw_mgmt.rb:191 src/lib/registration/sw_mgmt.rb:202 +#: src/lib/registration/sw_mgmt.rb:212 src/lib/registration/sw_mgmt.rb:223 msgid "Updating service '%s' failed." msgstr "" #. error message -#: src/lib/registration/sw_mgmt.rb:197 +#: src/lib/registration/sw_mgmt.rb:218 msgid "Adding service '%s' failed." msgstr "" #. error message -#: src/lib/registration/sw_mgmt.rb:209 +#: src/lib/registration/sw_mgmt.rb:230 msgid "Saving service '%s' failed." msgstr "" #. error message -#: src/lib/registration/sw_mgmt.rb:214 +#: src/lib/registration/sw_mgmt.rb:235 msgid "Refreshing service '%s' failed." msgstr "" +#. TRANSLATORS: %s is a product name +#: src/lib/registration/sw_mgmt.rb:438 +#, fuzzy +#| msgid "No product found in the repository" +msgid "" +"Cannot find remote product %s.\n" +"The product cannot be registered." +msgstr "No product found in the repository" + +#. Use .AnyQuestion instead of .YesNo or .ReallyAbort to have full control +#. on :focus_no and be consistent with the .ConfirmAbort behavior +#: src/lib/registration/ui/abort_confirmation.rb:35 +msgid "Really abort?" +msgstr "Really abort?" + #. dialog title -#: src/lib/registration/ui/addon_eula_dialog.rb:40 +#: src/lib/registration/ui/addon_eula_dialog.rb:43 msgid "License Agreement" msgstr "License Agreement" -#: src/lib/registration/ui/addon_eula_dialog.rb:41 +#: src/lib/registration/ui/addon_eula_dialog.rb:44 msgid "Downloading Licenses..." msgstr "" #. download the addon EULAs to a temp dir -#. @param [SUSE::Connect::Product] addon the addon +#. @param [Addon] addon the addon #. @param [String] tmpdir target where to download the files -#: src/lib/registration/ui/addon_eula_dialog.rb:72 +#: src/lib/registration/ui/addon_eula_dialog.rb:75 msgid "Downloading License Agreement..." msgstr "" #. %s is an extension name, e.g. "SUSE Linux Enterprise Software Development Kit" -#: src/lib/registration/ui/addon_eula_dialog.rb:85 +#: src/lib/registration/ui/addon_eula_dialog.rb:88 #, fuzzy #| msgid "Downloading SMT certificate file failed" msgid "" @@ -651,30 +575,31 @@ msgstr "Downloading SMT certificate file failed" #. %s is an extension name, e.g. "SUSE Linux Enterprise Software Development Kit" -#: src/lib/registration/ui/addon_eula_dialog.rb:100 +#: src/lib/registration/ui/addon_eula_dialog.rb:102 msgid "%s License Agreement" msgstr "" #. dialog title -#: src/lib/registration/ui/addon_reg_codes_dialog.rb:37 +#: src/lib/registration/ui/addon_reg_codes_dialog.rb:46 msgid "Extension and Module Registration Codes" msgstr "" #. help text -#: src/lib/registration/ui/addon_reg_codes_dialog.rb:41 +#: src/lib/registration/ui/addon_reg_codes_dialog.rb:50 msgid "" "<p>Enter registration codes for the requested extensions or modules.</p>\n" "<p>Registration codes are required for successfull registration.If you cannot provide a registration code then go back and deselect the respective extension or module.</p>" msgstr "" -#. round the half up (more items in the first column for odd number of items) -#: src/lib/registration/ui/addon_reg_codes_dialog.rb:87 +#. part of the UI - labels in the dialog +#. @return [ArrayYast::Term] UI definition +#: src/lib/registration/ui/addon_reg_codes_dialog.rb:102 msgid "The extension you selected needs a separate registration code." msgid_plural "The extensions you selected need separate registration codes." msgstr[0] "" msgstr[1] "" -#: src/lib/registration/ui/addon_reg_codes_dialog.rb:92 +#: src/lib/registration/ui/addon_reg_codes_dialog.rb:111 #, fuzzy #| msgid "Enter the registration data." msgid "Enter the registration code into the field below." @@ -682,130 +607,165 @@ msgstr[0] "Enter the registration data." msgstr[1] "Enter the registration data." -#. dialog title -#: src/lib/registration/ui/addon_selection_dialog.rb:44 +#. create the main dialog definition +#. @return [Yast::Term] the main UI dialog term +#: src/lib/registration/ui/addon_selection_base_dialog.rb:77 #, fuzzy -msgid "Extension and Module Selection" -msgstr "Registration Code" +#| msgid "Details..." +msgid "Details" +msgstr "Details..." -#. help text (1/3) -#: src/lib/registration/ui/addon_selection_dialog.rb:47 +#. addon description widget +#. @return [Yast::Term] the addon details widget +#: src/lib/registration/ui/addon_selection_base_dialog.rb:88 +msgid "Select an extension or a module to show details here" +msgstr "" + +#. checkbox label for an unavailable extension +#. (%s is an extension name) +#: src/lib/registration/ui/addon_selection_base_dialog.rb:164 #, fuzzy -#| msgid "<p>First you can set the mail addresses and aliases for the user.</p>" -msgid "<p>Here you can select available extensions and modules for yoursystem.</p>" -msgstr "<p>First you can set the mail addresses and aliases for the user.</p>" +#| msgid "is not available" +msgid "%s (not available)" +msgstr "is not available" +#. check if the count of addons requiring a reg. code fits two columns +#: src/lib/registration/ui/addon_selection_base_dialog.rb:246 +msgid "YaST allows to select at most %s extensions or modules." +msgstr "" + #. help text (2/3) -#: src/lib/registration/ui/addon_selection_dialog.rb:50 +#: src/lib/registration/ui/addon_selection_base_dialog.rb:257 msgid "<p>Please note, that some extensions or modules might need specific registration code.</p>" msgstr "" #. help text (3/3) -#: src/lib/registration/ui/addon_selection_dialog.rb:53 +#: src/lib/registration/ui/addon_selection_base_dialog.rb:260 msgid "<p>If you want to remove any extension or module you need to loginto the SUSE Customer Center and remove them manually there.</p>" msgstr "" -#. always enable Back/Next, the dialog cannot be the first in workflow -#: src/lib/registration/ui/addon_selection_dialog.rb:72 +#. dialog title +#: src/lib/registration/ui/addon_selection_registration_dialog.rb:31 +#, fuzzy +msgid "Extension and Module Selection" +msgstr "Registration Code" + +#. help text (1/3) +#: src/lib/registration/ui/addon_selection_registration_dialog.rb:34 +#, fuzzy +#| msgid "<p>First you can set the mail addresses and aliases for the user.</p>" +msgid "<p>Here you can select available extensions and modules for yoursystem.</p>" +msgstr "<p>First you can set the mail addresses and aliases for the user.</p>" + +#. @return [String] the main dialog label +#: src/lib/registration/ui/addon_selection_registration_dialog.rb:52 msgid "Available Extensions and Modules" msgstr "" -#: src/lib/registration/ui/addon_selection_dialog.rb:74 +#. dialog title +#: src/lib/registration/ui/addon_selection_reregistration_dialog.rb:37 #, fuzzy -#| msgid "Details..." -msgid "Details" -msgstr "Details..." +msgid "Extension and Module Re-registration" +msgstr "Registration Code" -#: src/lib/registration/ui/addon_selection_dialog.rb:77 -msgid "Select an extension or a module to show details here" -msgstr "" +#. help text (1/3) +#: src/lib/registration/ui/addon_selection_reregistration_dialog.rb:40 +#, fuzzy +#| msgid "<p>First you can set the mail addresses and aliases for the user.</p>" +msgid "<p>Here you can select extensions and modules which will be registered again.</p>" +msgstr "<p>First you can set the mail addresses and aliases for the user.</p>" -#. checkbox label for an unavailable extension -#. (%s is an extension name) -#: src/lib/registration/ui/addon_selection_dialog.rb:136 +#. @return [String] the main dialog label +#: src/lib/registration/ui/addon_selection_reregistration_dialog.rb:54 #, fuzzy -#| msgid "is not available" -msgid "%s (not available)" -msgstr "is not available" +msgid "Registered Extensions and Modules" +msgstr "Registration Code" -#. check the addons requiring a reg. code -#: src/lib/registration/ui/addon_selection_dialog.rb:217 -msgid "YaST allows to select at most %s extensions or modules." -msgstr "" - #. help text -#: src/lib/registration/ui/autoyast_addon_dialog.rb:33 +#: src/lib/registration/ui/autoyast_addon_dialog.rb:38 msgid "<p>Here you can select which extensions or moduleswill be registered together with the base product.</p>" msgstr "" -#: src/lib/registration/ui/autoyast_addon_dialog.rb:36 +#: src/lib/registration/ui/autoyast_addon_dialog.rb:41 #, fuzzy msgid "Register Optional Extensions or Modules" msgstr "Registration Code" -#: src/lib/registration/ui/autoyast_addon_dialog.rb:50 +#. create the main dialog content +#. @return [Yast::Term] UI definition +#: src/lib/registration/ui/autoyast_addon_dialog.rb:57 msgid "Identifier" msgstr "Identifier" -#: src/lib/registration/ui/autoyast_addon_dialog.rb:51 +#: src/lib/registration/ui/autoyast_addon_dialog.rb:58 msgid "Version" msgstr "Version" -#: src/lib/registration/ui/autoyast_addon_dialog.rb:52 +#: src/lib/registration/ui/autoyast_addon_dialog.rb:59 msgid "Architecture" msgstr "Architecture" -#: src/lib/registration/ui/autoyast_addon_dialog.rb:53 +#: src/lib/registration/ui/autoyast_addon_dialog.rb:60 #, fuzzy #| msgid "Rule Type" msgid "Release Type" msgstr "Rule Type" -#: src/lib/registration/ui/autoyast_addon_dialog.rb:54 +#: src/lib/registration/ui/autoyast_addon_dialog.rb:61 #, fuzzy #| msgid "Registration Code" msgid "Registration Code" msgstr "Registration Code" #. button label -#: src/lib/registration/ui/autoyast_addon_dialog.rb:65 +#: src/lib/registration/ui/autoyast_addon_dialog.rb:72 #, fuzzy #| msgid "Downloading installation system language extension..." msgid "Download Available Extensions..." msgstr "Downloading installation system language extension..." -#. disable download on a non-registered system -#: src/lib/registration/ui/autoyast_addon_dialog.rb:119 +#. remove the selected addon after user confirms the removal +#: src/lib/registration/ui/autoyast_addon_dialog.rb:137 #, fuzzy #| msgid "Really delete '%1'?" msgid "Really delete '%s'?" msgstr "Really delete '%1'?" -#. replace the content -#: src/lib/registration/ui/autoyast_addon_dialog.rb:161 +#. dialog definition for adding/editing an addon +#. @return [Yast::Term] popup definition +#: src/lib/registration/ui/autoyast_addon_dialog.rb:185 #, fuzzy #| msgid "Vendor Identifier" msgid "Extension or Module &Identifier" msgstr "Vendor Identifier" -#: src/lib/registration/ui/autoyast_addon_dialog.rb:162 +#: src/lib/registration/ui/autoyast_addon_dialog.rb:186 msgid "&Version" msgstr "&Version" -#: src/lib/registration/ui/autoyast_addon_dialog.rb:163 +#: src/lib/registration/ui/autoyast_addon_dialog.rb:187 #, fuzzy #| msgid "Architecture" msgid "&Architecture" msgstr "Architecture" -#: src/lib/registration/ui/autoyast_addon_dialog.rb:164 +#: src/lib/registration/ui/autoyast_addon_dialog.rb:188 #, fuzzy #| msgid "Rule Type" msgid "&Release Type" msgstr "Rule Type" -#: src/lib/registration/ui/autoyast_config_dialog.rb:51 +#. handle nil specifically, it cannot be stored in XML profile +#: src/lib/registration/ui/autoyast_addon_dialog.rb:191 +#: src/lib/registration/ui/autoyast_config_dialog.rb:108 +#: src/lib/registration/ui/base_system_registration_dialog.rb:133 #, fuzzy +#| msgid "Registration Code" +msgid "Registration &Code" +msgstr "Registration Code" + +#: src/lib/registration/ui/autoyast_config_dialog.rb:57 +#, fuzzy #| msgid "<p>Product registration includes your product in Novell's database, enabling you to get online updates and technical support. To register while installing automatically, select <b>Run Product Registration</b>. To simplify the procedure, include information from your system with <b>Hardware Profile</b> and <b>Optional Information</b>.</p>" msgid "" "<p>Product registration includes your product in SUSE Customer Center database,\n" @@ -813,7 +773,7 @@ "To register while installing automatically, select <b>Run Product Registration</b>.</p>" msgstr "<p>Product registration includes your product in Novell's database, enabling you to get online updates and technical support. To register while installing automatically, select <b>Run Product Registration</b>. To simplify the procedure, include information from your system with <b>Hardware Profile</b> and <b>Optional Information</b>.</p>" -#: src/lib/registration/ui/autoyast_config_dialog.rb:56 +#: src/lib/registration/ui/autoyast_config_dialog.rb:63 #, fuzzy #| msgid "<p>If your network deploys a custom SMT server, please set the URL of the SMT Server and the location of the SMT Certificate in <b>SMT Server Settings</b>. Please see your SMT manual for further assistance.</p>" msgid "" @@ -822,133 +782,451 @@ "to your SMT manual for further assistance.</p>" msgstr "<p>If your network deploys a custom SMT server, please set the URL of the SMT Server and the location of the SMT Certificate in <b>SMT Server Settings</b>. Please see your SMT manual for further assistance.</p>" -#. FIXME the dialog should be created by external code before calling this -#: src/lib/registration/ui/autoyast_config_dialog.rb:83 +#. the UI defition for the global registration status +#. @return [Yast::Term] UI term +#: src/lib/registration/ui/autoyast_config_dialog.rb:93 #, fuzzy #| msgid "Registration Code" msgid "Register the Product" msgstr "Registration Code" -#: src/lib/registration/ui/autoyast_config_dialog.rb:100 +#. part of the main dialog definition - the input fields +#. @return [Yast::Term] UI term +#: src/lib/registration/ui/autoyast_config_dialog.rb:106 +#: src/lib/registration/ui/base_system_registration_dialog.rb:131 #, fuzzy +#| msgid "Email Address" +msgid "&E-mail Address" +msgstr "Email Address" + +#: src/lib/registration/ui/autoyast_config_dialog.rb:112 +#, fuzzy #| msgid "Available Repositories" msgid "Install Available Updates from Update Repositories" msgstr "Available Repositories" #. Translators: Text for UI Label - capitalized -#: src/lib/registration/ui/autoyast_config_dialog.rb:114 +#: src/lib/registration/ui/autoyast_config_dialog.rb:128 #, fuzzy #| msgid "SMT Server Settings" msgid "Server Settings" msgstr "SMT Server Settings" -#: src/lib/registration/ui/autoyast_config_dialog.rb:118 +#: src/lib/registration/ui/autoyast_config_dialog.rb:132 #, fuzzy msgid "Find Registration Server Using SLP Discovery" msgstr "Registration Code" #. Translators: Text for UI Label - capitalized -#: src/lib/registration/ui/autoyast_config_dialog.rb:123 +#: src/lib/registration/ui/autoyast_config_dialog.rb:137 msgid "Use Specific Server URL Instead of the Default" msgstr "" #. Translators: Text for UI Label - capitalized -#: src/lib/registration/ui/autoyast_config_dialog.rb:130 +#: src/lib/registration/ui/autoyast_config_dialog.rb:144 #, fuzzy msgid "Optional SSL Server Certificate URL" msgstr "&Server Certificate" #. Translators: Text for UI Label - capitalized -#: src/lib/registration/ui/autoyast_config_dialog.rb:139 +#: src/lib/registration/ui/autoyast_config_dialog.rb:153 #, fuzzy msgid "Optional SSL Server Certificate Fingerprint" msgstr "&Server Certificate" -#: src/lib/registration/ui/autoyast_config_dialog.rb:141 +#: src/lib/registration/ui/autoyast_config_dialog.rb:155 msgid "none" msgstr "none" #. Translators: Text for UI Label - capitalized -#: src/lib/registration/ui/autoyast_config_dialog.rb:152 +#: src/lib/registration/ui/autoyast_config_dialog.rb:166 #, fuzzy #| msgid "Select Certificate File" msgid "SSL Certificate Fingerprint" msgstr "Select Certificate File" -#: src/lib/registration/ui/autoyast_config_dialog.rb:173 +#. the UI defition for the main dialog +#. @return [Yast::Term] UI term +#: src/lib/registration/ui/autoyast_config_dialog.rb:189 #, fuzzy msgid "Register Extensions or Modules..." msgstr "Registration Code" +#. button label +#: src/lib/registration/ui/base_system_registration_dialog.rb:84 +#, fuzzy +msgid "&Local Registration Server..." +msgstr "Registration Code" + +#. button label +#: src/lib/registration/ui/base_system_registration_dialog.rb:97 +#, fuzzy +#| msgid "Registration" +msgid "&Skip Registration" +msgstr "Registration" + +#. display the addon re-registration button only in registered installed system +#: src/lib/registration/ui/base_system_registration_dialog.rb:106 +#, fuzzy +msgid "&Register Extensions or Modules Again" +msgstr "Registration Code" + +#. part of the main dialog definition - the base product details +#. @return [Yast::Term] UI term +#. the main dialog content +#. @return [Yast::Term] UI term +#: src/lib/registration/ui/base_system_registration_dialog.rb:118 +#: src/lib/registration/ui/registered_system_dialog.rb:67 +msgid "The system is already registered." +msgstr "" + +#. help text +#: src/lib/registration/ui/base_system_registration_dialog.rb:142 +msgid "Enter SUSE Customer Center credentials here to register the system to get updates and extensions." +msgstr "" + +#. Popup question: confirm skipping the registration +#: src/lib/registration/ui/base_system_registration_dialog.rb:177 +msgid "" +"If you do not register your system we will not be able\n" +"to grant you access to the update repositories.\n" +"\n" +"You can register after the installation or visit our\n" +"Customer Center for online registration.\n" +"\n" +"Really skip the registration now?" +msgstr "" + +#. label text describing the registration (1/2) +#. use \n to split to more lines if needed (use max. 76 chars/line) +#: src/lib/registration/ui/base_system_registration_dialog.rb:194 +msgid "" +"Please enter a registration or evaluation code for this product and your\n" +"User Name/E-mail address from the SUSE Customer Center in the fields below.\n" +"Access to security and general software updates is only possible on\n" +"a registered system." +msgstr "" + +#. label text describing the registration (2/2), +#. not displayed in installed system +#. use \n to split to more lines if needed (use max. 76 chars/line) +#: src/lib/registration/ui/base_system_registration_dialog.rb:206 +msgid "" +"If you skip product registration now, remember to register after\n" +"installation has completed." +msgstr "" + +#. UI term for the network configuration button (or empty if not needed) +#. @return [Yast::Term] UI term +#: src/lib/registration/ui/base_system_registration_dialog.rb:218 +#, fuzzy +#| msgid "Novell Customer Center Configuration" +msgid "Network Configuration..." +msgstr "Novell Customer Centre Configuration" + #. SSL error message -#: src/lib/registration/ui/import_certificate_dialog.rb:25 +#: src/lib/registration/ui/import_certificate_dialog.rb:23 #, fuzzy #| msgid "Certificate has been imported." msgid "Certificate has expired" msgstr "Certificate has been imported." #. SSL error message -#: src/lib/registration/ui/import_certificate_dialog.rb:27 +#: src/lib/registration/ui/import_certificate_dialog.rb:25 #, fuzzy msgid "Self signed certificate" msgstr "&Server Certificate" #. SSL error message -#: src/lib/registration/ui/import_certificate_dialog.rb:29 +#: src/lib/registration/ui/import_certificate_dialog.rb:27 msgid "Self signed certificate in certificate chain" msgstr "" #. push button -#: src/lib/registration/ui/import_certificate_dialog.rb:73 +#: src/lib/registration/ui/import_certificate_dialog.rb:74 msgid "&Trust and Import" msgstr "" #. help text (RichText) for importing a SSL certificate (1/5) -#: src/lib/registration/ui/import_certificate_dialog.rb:119 +#: src/lib/registration/ui/import_certificate_dialog.rb:122 msgid "<p>Secure connection (HTTPS) uses SSL certificates for verifying the authenticity of the server and for encrypting the transferred data.</p>" msgstr "" #. help text (RichText) for importing a SSL certificate (2/5) -#: src/lib/registration/ui/import_certificate_dialog.rb:123 +#: src/lib/registration/ui/import_certificate_dialog.rb:126 msgid "<p>You can choose to import the certificate it into the list of known certificate autohorities (CA), meaning that you trust the subject and the issuer of the unknown certificate.</p>" msgstr "" #. help text (RichText) for importing a SSL certificate (3/5) -#: src/lib/registration/ui/import_certificate_dialog.rb:128 +#: src/lib/registration/ui/import_certificate_dialog.rb:131 msgid "<p>Importing a certificate will allow to use for example a self-signed certificate.</p>" msgstr "" #. help text (RichText) for importing a SSL certificate (4/5) -#: src/lib/registration/ui/import_certificate_dialog.rb:132 +#: src/lib/registration/ui/import_certificate_dialog.rb:135 msgid "<p><b>Important:</b> You should verify the fingerprint of the certificate to be sure you import the genuine certificate from the requested server.</p>" msgstr "" #. help text (RichText) for importing a SSL certificate (5/5) -#: src/lib/registration/ui/import_certificate_dialog.rb:137 +#: src/lib/registration/ui/import_certificate_dialog.rb:140 msgid "<p><b>Importing an unknown certificate without verification is a big security risk.</b></p>" msgstr "" #. error message, the entered URL is not valid -#: src/lib/registration/ui/local_server_dialog.rb:60 +#: src/lib/registration/ui/local_server_dialog.rb:67 #, fuzzy #| msgid "Invalid value." msgid "Invalid URL." msgstr "Invalid value." #. input field label -#: src/lib/registration/ui/local_server_dialog.rb:97 +#: src/lib/registration/ui/local_server_dialog.rb:106 #, fuzzy msgid "&Local Registration Server URL" msgstr "Registration Code" +#. register the base system if not already registered +#: src/lib/registration/ui/media_addon_workflow.rb:130 +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?" +msgstr "" + +#. TRANSLATORS: dialog title +#: src/lib/registration/ui/migration_repos_selection_dialog.rb:47 +#, fuzzy +#| msgid "Online Repositories" +msgid "Migration Repositories" +msgstr "Online Repositories" + +#. TRANSLATORS: help text +#: src/lib/registration/ui/migration_repos_selection_dialog.rb:50 +msgid "<p>In this dialog you can manually select which repositories willbe used for online migration. The packages will be upgraded to thehighest version found in the selected repositories.</p>" +msgstr "" + +#. TRANSLATORS: Multiselection widget label +#: src/lib/registration/ui/migration_repos_selection_dialog.rb:85 +#, fuzzy +#| msgid "Di&rectory to Contain Repositories:" +msgid "Select the Migration Repositories" +msgstr "Di&rectory to Contain Repositories:" + +#. TRANSLATORS: Push button label, starts the repository management module +#: src/lib/registration/ui/migration_repos_selection_dialog.rb:89 +#, fuzzy +#| msgid "Adding Repositories..." +msgid "Manage Repositories..." +msgstr "Adding Repositories..." + +#. TRANSLATORS: summary text, %s is a repository URL +#: src/lib/registration/ui/migration_repos_selection_dialog.rb:114 +#, fuzzy +#| msgid "URL: %1" +msgid "URL: %s" +msgstr "URL: %1" + +#. TRANSLATORS: summary text, %s is a repository priority (1-99) +#: src/lib/registration/ui/migration_repos_selection_dialog.rb:116 +#, fuzzy +#| msgid "Priority" +msgid "Priority: %s" +msgstr "Priority" + +#. 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 +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?" +msgstr "" + +#. TRANSLATORS: error message, %s are details +#: src/lib/registration/ui/migration_repos_workflow.rb:86 +#, fuzzy +#| msgid "Internal error" +msgid "Internal error: %s" +msgstr "Internal error" + +#. TRANSLATORS: Error message +#: src/lib/registration/ui/migration_repos_workflow.rb:170 +msgid "No installed product found." +msgstr "" + +#. TRANSLATORS: Error message +#: src/lib/registration/ui/migration_repos_workflow.rb:199 +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 "Registration Code" + +#. TRANSLATORS: progress message +#: src/lib/registration/ui/migration_repos_workflow.rb:272 +#, fuzzy +#| msgid "Adding Repositories..." +msgid "Preparing Migration Repositories..." +msgstr "Adding Repositories..." + +#. TRANSLATORS: dialog title +#: src/lib/registration/ui/migration_selection_dialog.rb:61 +#, fuzzy +#| msgid "Select the Mount Point" +msgid "Select the Migration Target" +msgstr "Select the Mount Point" + +#. TRANSLATORS: help text (1/3) +#: src/lib/registration/ui/migration_selection_dialog.rb:64 +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 +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 +msgid "<p>Use the <b>%s</b> check box to manually select the migration repositories later.</p>" +msgstr "" + +#. TRANSLATORS: check button label +#: src/lib/registration/ui/migration_selection_dialog.rb:70 +#: src/lib/registration/ui/migration_selection_dialog.rb:139 +#, fuzzy +#| msgid "&Manually Select Patches" +msgid "Manually Select Migration Repositories" +msgstr "&Manually Select Patches" + +#. TRANSLATORS: error popup, no target migration is selected +#: src/lib/registration/ui/migration_selection_dialog.rb:96 +#, fuzzy +#| msgid "Select the boot loader before editing sections." +msgid "Select the target migration." +msgstr "Select the boot loader before editing sections." + +#. TRANSLATORS: selection box label +#: src/lib/registration/ui/migration_selection_dialog.rb:151 +#, fuzzy +#| msgid "Possible &Solutions" +msgid "Possible Migration Targets" +msgstr "Possible &Solutions" + +#. TRANSLATORS: RichText header (details for the selected item) +#: src/lib/registration/ui/migration_selection_dialog.rb:189 +#, fuzzy +#| msgid "Configuration Summary" +msgid "Migration Summary" +msgstr "Configuration Summary" + +#. TRANSLATORS: An error message displayed in the migration details. +#. The product has not been mirrored to the SMT server and cannot be used +#. for migration. The SMT admin has to mirror the product to allow +#. 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 +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 +#, fuzzy +#| msgid "Package %1 will be installed." +msgid "%s <b>will be installed.</b>" +msgstr "Package %1 will be installed." + +#. 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 +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 +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 +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 +msgid "" +"The selected migration contains a product\n" +"which is not available at the registration server.\n" +"\n" +"Select a different migration target or make the missing products\n" +"available at the registration server." +msgstr "" + +#. help text +#: src/lib/registration/ui/registered_system_dialog.rb:40 +#, fuzzy +#| msgid "<p>Your system is ready for use.</p>" +msgid "<p>The system is already registered.</p>" +msgstr "<p>Your system is ready for use.</p>" + +#: src/lib/registration/ui/registered_system_dialog.rb:41 +msgid "<p>You can re-register it again or you can register additional extension or modules to enhance the functionality of the system.</p>" +msgstr "" + +#: src/lib/registration/ui/registered_system_dialog.rb:43 +msgid "<p>If you want to deregister your system you need to log into the SUSE Customer Center and remove the system manually there.</p>" +msgstr "" + +#. button label +#: src/lib/registration/ui/registered_system_dialog.rb:70 +msgid "Select Extensions" +msgstr "" + +#. button label +#: src/lib/registration/ui/registered_system_dialog.rb:73 +#, fuzzy +#| msgid "Register New User" +msgid "Register Again" +msgstr "Register New User" + +#: src/lib/registration/ui/registration_update_dialog.rb:42 +#, fuzzy +#| msgid "Registration Code" +msgid "Registration is being updated..." +msgstr "Registration Code" + +#: src/lib/registration/ui/registration_update_dialog.rb:43 +#, fuzzy +msgid "The previous registration is being updated." +msgstr "No software repository found on medium." + +#. automatic registration refresh during system upgrade failed, register from scratch +#: src/lib/registration/ui/registration_update_dialog.rb:65 +msgid "" +"Automatic registration upgrade failed.\n" +"You can manually register the system from scratch." +msgstr "" + #. ignore SUSE manager registration servers (bnc#894470) -#: src/lib/registration/url_helpers.rb:213 +#: src/lib/registration/url_helpers.rb:203 #, fuzzy #| msgid "Checking..." msgid "Searching..." msgstr "Checking..." -#: src/lib/registration/url_helpers.rb:213 +#: src/lib/registration/url_helpers.rb:203 #, fuzzy msgid "Looking up local registration servers..." msgstr "1 item of registration data" @@ -960,13 +1238,6 @@ #, fuzzy #~| msgid "Registration Code" -#~ msgid "Registering Product..." -#~ msgid_plural "Registering Products..." -#~ msgstr[0] "Registration Code" -#~ msgstr[1] "Registration Code" - -#, fuzzy -#~| msgid "Registration Code" #~ msgid "Register Optional Add-ons" #~ msgstr "Registration Code" @@ -1420,11 +1691,6 @@ #~ msgstr "Registration Code" #, fuzzy -#~| msgid "No product found in the repository" -#~ msgid "No products found to be registered." -#~ msgstr "No product found in the repository" - -#, fuzzy #~| msgid "unknown process" #~ msgid "unknown status" #~ msgstr "unknown process" Modified: trunk/yast/en_GB/po/reipl.en_GB.po =================================================================== --- trunk/yast/en_GB/po/reipl.en_GB.po 2015-09-09 08:18:21 UTC (rev 92602) +++ trunk/yast/en_GB/po/reipl.en_GB.po 2015-09-09 08:19:44 UTC (rev 92603) @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-04 15:53+0200\n" +"POT-Creation-Date: 2015-08-25 18:37+0200\n" "PO-Revision-Date: 2001-07-17 16:27+0200\n" "Last-Translator: James Ogley \n" "Language-Team: English \n" Modified: trunk/yast/en_GB/po/relocation-server.en_GB.po =================================================================== --- trunk/yast/en_GB/po/relocation-server.en_GB.po 2015-09-09 08:18:21 UTC (rev 92602) +++ trunk/yast/en_GB/po/relocation-server.en_GB.po 2015-09-09 08:19:44 UTC (rev 92603) @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-04 15:53+0200\n" +"POT-Creation-Date: 2015-08-25 18:37+0200\n" "PO-Revision-Date: 2001-07-17 16:27+0200\n" "Last-Translator: James Ogley \n" "Language-Team: English \n" @@ -301,21 +301,21 @@ msgstr "Mail Server Configuration" #. RelocationServer read dialog caption -#: src/modules/RelocationServer.rb:303 +#: src/modules/RelocationServer.rb:307 #, fuzzy #| msgid "Initializing kerberos-server Configuration" msgid "Initializing relocation-server Configuration" msgstr "Initialising kerberos-server Configuration" #. Progress stage 1/3 -#: src/modules/RelocationServer.rb:313 +#: src/modules/RelocationServer.rb:317 #, fuzzy #| msgid "Read the current SSHD configuration" msgid "Read the current xend configuration" msgstr "Read the current SSHD configuration" #. Progress stage 2/3 -#: src/modules/RelocationServer.rb:315 +#: src/modules/RelocationServer.rb:319 #, fuzzy #| msgid "Read the current SSHD state" msgid "Read the current xend state" @@ -323,19 +323,19 @@ #. Progress stage 3/3 #. Progress stage 1/2 -#: src/modules/RelocationServer.rb:317 src/modules/RelocationServer.rb:333 +#: src/modules/RelocationServer.rb:321 src/modules/RelocationServer.rb:337 msgid "Read firewall settings" msgstr "Read firewall settings" #. Progress step 1/3 -#: src/modules/RelocationServer.rb:322 +#: src/modules/RelocationServer.rb:326 #, fuzzy #| msgid "Reading the current SSHD configuration..." msgid "Reading the current xend configuration..." msgstr "Reading the current SSHD configuration..." #. Progress step 2/3 -#: src/modules/RelocationServer.rb:324 +#: src/modules/RelocationServer.rb:328 #, fuzzy #| msgid "Reading the current SSHD state..." msgid "Reading the current xend state..." @@ -343,59 +343,59 @@ #. Progress step 3/3 #. Progress step 1/2 -#: src/modules/RelocationServer.rb:326 src/modules/RelocationServer.rb:340 +#: src/modules/RelocationServer.rb:330 src/modules/RelocationServer.rb:344 msgid "Reading firewall settings..." msgstr "Reading firewall settings..." #. Progress stage 2/2 -#: src/modules/RelocationServer.rb:335 +#: src/modules/RelocationServer.rb:339 #, fuzzy #| msgid "Read the current SSHD state" msgid "Read the current libvirtd/sshd state" msgstr "Read the current SSHD state" #. Progress stage 2/2 -#: src/modules/RelocationServer.rb:342 +#: src/modules/RelocationServer.rb:346 #, fuzzy #| msgid "Reading the current SSHD state..." msgid "Reading the current libvirtd/sshd state..." msgstr "Reading the current SSHD state..." #. Error message -#: src/modules/RelocationServer.rb:364 +#: src/modules/RelocationServer.rb:368 #, fuzzy #| msgid "Cannot read the current SSHD state." msgid "Cannot read the current Xend state." msgstr "Cannot read the current SSHD state." #. Error message -#: src/modules/RelocationServer.rb:373 +#: src/modules/RelocationServer.rb:377 msgid "Cannot read firewall settings." msgstr "Cannot read firewall settings." #. Error message -#: src/modules/RelocationServer.rb:382 +#: src/modules/RelocationServer.rb:386 #, fuzzy #| msgid "Cannot read the current SSHD state." msgid "Cannot read the current libvirtd/sshd state." msgstr "Cannot read the current SSHD state." #. RelocationServer read dialog caption -#: src/modules/RelocationServer.rb:401 +#: src/modules/RelocationServer.rb:407 #, fuzzy #| msgid "Saving kerberos-server Configuration" msgid "Saving relocation-server Configuration" msgstr "Saving kerberos-server Configuration" #. Progress stage 1 -#: src/modules/RelocationServer.rb:411 +#: src/modules/RelocationServer.rb:417 #, fuzzy #| msgid "Write the new settings" msgid "Write the Xend settings" msgstr "Write the new settings" #. Progress stage 2 -#: src/modules/RelocationServer.rb:413 +#: src/modules/RelocationServer.rb:419 #, fuzzy #| msgid "Adjust the DNS service" msgid "Adjust the Xend service" @@ -403,19 +403,19 @@ #. Progress stage 3 #. Progress stage 2 -#: src/modules/RelocationServer.rb:415 src/modules/RelocationServer.rb:432 +#: src/modules/RelocationServer.rb:421 src/modules/RelocationServer.rb:438 msgid "Write firewall settings" msgstr "Write firewall settings" #. Progress step 1 -#: src/modules/RelocationServer.rb:420 +#: src/modules/RelocationServer.rb:426 #, fuzzy #| msgid "Writing the settings..." msgid "Writing the Xend settings..." msgstr "Writing the settings..." #. Progress step 2 -#: src/modules/RelocationServer.rb:422 +#: src/modules/RelocationServer.rb:428 #, fuzzy #| msgid "Adjusting the DNS service..." msgid "Adjusting the Xend service..." @@ -423,32 +423,32 @@ #. Progress step 3 #. Progress stage 2 -#: src/modules/RelocationServer.rb:424 src/modules/RelocationServer.rb:439 +#: src/modules/RelocationServer.rb:430 src/modules/RelocationServer.rb:445 msgid "Writing firewall settings..." msgstr "Writing firewall settings..." #. Progress stage 1 -#: src/modules/RelocationServer.rb:430 +#: src/modules/RelocationServer.rb:436 #, fuzzy #| msgid "Adjust the DNS service" msgid "Adjust the libvirtd/sshd service" msgstr "Adjust the DNS service" #. Progress step 1 -#: src/modules/RelocationServer.rb:437 +#: src/modules/RelocationServer.rb:443 #, fuzzy #| msgid "Adjusting the DNS service..." msgid "Adjusting the libvirtd/sshd service" msgstr "Adjusting the DNS service..." #. Error message -#: src/modules/RelocationServer.rb:454 +#: src/modules/RelocationServer.rb:460 #, fuzzy #| msgid "Cannot write the SSHD settings." msgid "Cannot write the xend settings." msgstr "Cannot write the SSHD settings." #. Error message -#: src/modules/RelocationServer.rb:475 +#: src/modules/RelocationServer.rb:481 msgid "Cannot write firewall settings." msgstr "Cannot write firewall settings." Modified: trunk/yast/en_GB/po/samba-client.en_GB.po =================================================================== --- trunk/yast/en_GB/po/samba-client.en_GB.po 2015-09-09 08:18:21 UTC (rev 92602) +++ trunk/yast/en_GB/po/samba-client.en_GB.po 2015-09-09 08:19:44 UTC (rev 92603) @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: samba-client\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-04 15:53+0200\n" +"POT-Creation-Date: 2015-08-25 18:37+0200\n" "PO-Revision-Date: 2008-03-27 22:59+0000\n" "Last-Translator: Benjamin Weber \n" "Language-Team: \n" @@ -20,7 +20,7 @@ "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. translators: command line help text for Samba client module -#: src/clients/samba-client.rb:61 +#: src/clients/samba-client.rb:62 msgid "" "Samba client configuration module.\n" "See Samba documentation for details." @@ -29,44 +29,44 @@ "See Samba documentation for details." #. translators: command line help text for winbind action -#: src/clients/samba-client.rb:74 +#: src/clients/samba-client.rb:75 msgid "Enable or disable the Winbind services (winbindd)" msgstr "Enable or disable the Winbind services (winbindd)" #. translators: command line help text for isdomainmember action -#: src/clients/samba-client.rb:84 +#: src/clients/samba-client.rb:85 msgid "Check if this machine is a member of a domain" msgstr "Check if this machine is a member of a domain" #. translators: command line help text for joindomain action -#: src/clients/samba-client.rb:94 +#: src/clients/samba-client.rb:95 #, fuzzy #| msgid "Join this machine into a domain" msgid "Join this machine to a domain" msgstr "Join this machine into a domain" #. translators: command line help text for configure action -#: src/clients/samba-client.rb:104 +#: src/clients/samba-client.rb:105 msgid "Change the global settings of Samba" msgstr "Change the global settings of Samba" #. translators: command line help text for winbind enable option -#: src/clients/samba-client.rb:112 +#: src/clients/samba-client.rb:113 msgid "Enable the service" msgstr "Enable the service" #. translators: command line help text for winbind disable option -#: src/clients/samba-client.rb:118 +#: src/clients/samba-client.rb:119 msgid "Disable the service" msgstr "Disable the service" #. translators: command line help text for domain to be checked/joined -#: src/clients/samba-client.rb:124 +#: src/clients/samba-client.rb:125 msgid "The name of a domain to join" msgstr "The name of a domain to join" #. translators: command line help text for joindomain user option -#: src/clients/samba-client.rb:131 +#: src/clients/samba-client.rb:132 #, fuzzy #| msgid "" #| "The user used for joining the domain. If omitted, YaST2 will\n" @@ -79,18 +79,18 @@ "try to join the domain without specifying user and password." #. translators: command line help text for joindomain password option -#: src/clients/samba-client.rb:138 +#: src/clients/samba-client.rb:139 msgid "The password used for the user when joining the domain" msgstr "The password used for the user when joining the domain" #. command line help text for machine optioa -#: src/clients/samba-client.rb:145 +#: src/clients/samba-client.rb:146 #, fuzzy msgid "The machine account" msgstr "Read Samba accounts" #. translators: command line help text for the workgroup name option -#: src/clients/samba-client.rb:152 +#: src/clients/samba-client.rb:153 msgid "The name of a workgroup" msgstr "The name of a workgroup" @@ -123,7 +123,7 @@ #. translators: result message for joindomain command line action #. Translators: Information popup, %1 is the name of the domain -#: src/clients/samba-client.rb:275 src/include/samba-client/routines.rb:274 +#: src/clients/samba-client.rb:278 src/include/samba-client/routines.rb:280 msgid "Domain %1 joined successfully." msgstr "Domain %1 joined successfully." @@ -325,7 +325,7 @@ #. text entry label #. text entry label #: src/include/samba-client/dialogs.rb:516 -#: src/include/samba-client/routines.rb:88 +#: src/include/samba-client/routines.rb:90 msgid "&Username" msgstr "&Username" @@ -643,24 +643,24 @@ "</p>\n" #. default value of Machine Account -#: src/include/samba-client/routines.rb:60 +#: src/include/samba-client/routines.rb:62 #, fuzzy msgid "(default)" msgstr " (default)" #. combo box label -#: src/include/samba-client/routines.rb:71 +#: src/include/samba-client/routines.rb:73 #, fuzzy msgid "&Machine Account OU" msgstr "Games Account" -#: src/include/samba-client/routines.rb:76 +#: src/include/samba-client/routines.rb:78 #, fuzzy msgid "O&btain list" msgstr "as _plain list" #. error popup -#: src/include/samba-client/routines.rb:119 +#: src/include/samba-client/routines.rb:121 #, fuzzy msgid "" "User name and password are required\n" @@ -669,18 +669,18 @@ "Enter the username and the password\n" "for joining the domain %1." -#: src/include/samba-client/routines.rb:137 +#: src/include/samba-client/routines.rb:139 #, fuzzy msgid "&Machine Account" msgstr "Games Account" #. translators: text for busy pop-up -#: src/include/samba-client/routines.rb:175 +#: src/include/samba-client/routines.rb:177 msgid "Verifying workgroup membership..." msgstr "Verifying workgroup membership..." #. popup to fill in the domain leaving info; %1 is the domain name -#: src/include/samba-client/routines.rb:201 +#: src/include/samba-client/routines.rb:203 #, fuzzy msgid "Enter the username and the password for leaving the domain %1." msgstr "" @@ -688,21 +688,21 @@ "for joining the domain %1." #. additional information for cluster environment -#: src/include/samba-client/routines.rb:229 +#: src/include/samba-client/routines.rb:231 #, fuzzy #| msgid "The configuration will be written now.\n" msgid "The configuration will be propagated across cluster nodes." msgstr "The configuration will be written now.\n" #. popup to fill in the domain joining info; %1 is the domain name -#: src/include/samba-client/routines.rb:240 +#: src/include/samba-client/routines.rb:242 #, fuzzy msgid "Enter the username and the password for joining the domain %1." msgstr "" "Enter the username and the password\n" "for joining the domain %1." -#: src/include/samba-client/routines.rb:247 +#: src/include/samba-client/routines.rb:249 #, fuzzy msgid "To join the domain anonymously, leave the text entries empty.\n" msgstr "" @@ -710,7 +710,7 @@ "text entries empty." #. popup question, the domain status cannot be found out, ask user what to do -#: src/include/samba-client/routines.rb:298 +#: src/include/samba-client/routines.rb:304 msgid "" "Cannot automatically determine if this host\n" "is a member of the domain %1." @@ -719,7 +719,7 @@ "is a member of the domain %1." #. popup question, first part -#: src/include/samba-client/routines.rb:302 +#: src/include/samba-client/routines.rb:308 msgid "" "This host is not a member\n" "of the domain %1." @@ -728,11 +728,11 @@ "of the domain %1." #. last part of popup question -#: src/include/samba-client/routines.rb:306 +#: src/include/samba-client/routines.rb:312 msgid "Join the domain %1?" msgstr "Join the domain %1?" -#: src/include/samba-client/routines.rb:310 +#: src/include/samba-client/routines.rb:316 #, fuzzy #| msgid "" #| "Cannot automatically determine if this host\n" @@ -744,7 +744,7 @@ "Cannot automatically determine if this host\n" "is a member of the domain %1." -#: src/include/samba-client/routines.rb:313 +#: src/include/samba-client/routines.rb:319 #, fuzzy #| msgid "" #| "This host is not a member\n" @@ -757,92 +757,92 @@ "of the domain %1." #. popup question -#: src/include/samba-client/routines.rb:355 +#: src/include/samba-client/routines.rb:361 msgid "User shares already exist. Keep or delete these shares?" msgstr "User shares already exist. Keep or delete these shares?" #. button label -#: src/include/samba-client/routines.rb:357 +#: src/include/samba-client/routines.rb:363 msgid "&Keep" msgstr "&Keep" #. button label -#: src/include/samba-client/routines.rb:359 +#: src/include/samba-client/routines.rb:365 msgid "&Delete" msgstr "&Delete" #. yes/no popup -#: src/include/samba-client/routines.rb:375 +#: src/include/samba-client/routines.rb:381 msgid "Other Windows sharing services are available. Stop them as well?" msgstr "Other Windows sharing services are available. Stop them as well?" #. check box label -#: src/include/samba-client/routines.rb:386 +#: src/include/samba-client/routines.rb:392 msgid "&Use WINS for Hostname Resolution" msgstr "" #. help text for "Use WINS for Hostname Resolution" check box label -#: src/include/samba-client/routines.rb:395 +#: src/include/samba-client/routines.rb:401 msgid "<p>If you want to use Microsoft Windows Internet Name Service (WINS) for name resolution, check <b>Use WINS for Hostname Resolution</b>.</p>" msgstr "" #. check box label -#: src/include/samba-client/routines.rb:405 +#: src/include/samba-client/routines.rb:411 msgid "Retrieve WINS server via &DHCP" msgstr "Retrieve WINS server via &DHCP" #. help text ("Retrieve WINS server via DHCP" is a checkbox label) -#: src/include/samba-client/routines.rb:412 +#: src/include/samba-client/routines.rb:418 msgid "<p>Check <b>Retrieve WINS server via DHCP</b> to use a WINS server provided by DHCP.</p>" msgstr "<p>Check <b>Retrieve WINS server via DHCP</b> to use a WINS server provided by DHCP.</p>" #. frame label -#: src/include/samba-client/routines.rb:432 +#: src/include/samba-client/routines.rb:438 msgid "Sharing by Users" msgstr "Sharing by Users" #. frame label -#: src/include/samba-client/routines.rb:434 +#: src/include/samba-client/routines.rb:440 msgid "Sharing" msgstr "Sharing" #. checkbox label -#: src/include/samba-client/routines.rb:447 +#: src/include/samba-client/routines.rb:453 msgid "&Allow Users to Share Their Directories" msgstr "&Allow Users to Share Their Directories" #. checkbox label -#: src/include/samba-client/routines.rb:457 +#: src/include/samba-client/routines.rb:463 msgid "Allow &Guest Access" msgstr "Allow &Guest Access" #. texty entry label -#: src/include/samba-client/routines.rb:469 +#: src/include/samba-client/routines.rb:475 msgid "&Permitted Group" msgstr "&Permitted Group" #. infield label -#: src/include/samba-client/routines.rb:475 +#: src/include/samba-client/routines.rb:481 msgid "&Maximum Number of Shares" msgstr "&Maximum Number of Shares" #. membership dialog help (common part 3/4), %1 is separator (e.g. '\') -#: src/include/samba-client/routines.rb:505 +#: src/include/samba-client/routines.rb:511 msgid "<p><b>Allow Users to Share Their Directories</b> enables members of the group in <b>Permitted Group</b> to share directories they own with other users. For example, <tt>users</tt> for a local scope or <tt>DOMAIN%1Users</tt> for a domain scope. The user also must make sure that the file system permissions allow access.</p>" msgstr "<p><b>Allow Users to Share Their Directories</b> enables members of the group in <b>Permitted Group</b> to share directories they own with other users. For example, <tt>users</tt> for a local scope or <tt>DOMAIN%1Users</tt> for a domain scope. The user also must make sure that the file system permissions allow access.</p>" #. membership dialog help (common part 3/4) -#: src/include/samba-client/routines.rb:511 +#: src/include/samba-client/routines.rb:517 msgid "<p>With <b>Maximum Number of Shares</b>, limit the total amount of shares that may be created.</p>" msgstr "<p>With <b>Maximum Number of Shares</b>, limit the total amount of shares that may be created.</p>" #. membership dialog help common part -#: src/include/samba-client/routines.rb:516 +#: src/include/samba-client/routines.rb:522 msgid "<p>To permit access to user shares without authentication, enable <b>Allow Guest Access</b>.</p>" msgstr "<p>To permit access to user shares without authentication, enable <b>Allow Guest Access</b>.</p>" #. help text for PAM Mount table -#: src/include/samba-client/routines.rb:525 +#: src/include/samba-client/routines.rb:531 msgid "" "<p>In the table <b>Mount Server Directories</b>, you can specify server\n" "directories (such as home directory) which should be locally mounted when the\n" @@ -851,12 +851,12 @@ msgstr "" #. help text for PAM Mount table: example -#: src/include/samba-client/routines.rb:532 +#: src/include/samba-client/routines.rb:538 msgid "<p>For example, you may use <tt>/home/%(DOMAIN_USER)</tt> value for <b>Remote Path</b>, <tt>~/</tt> value for <b>Local Mount Point</b> to mount the home directory, together with a value <tt>user=%(DOMAIN_USER)</tt> as a part of <b>Options</b>.</p>" msgstr "" #. help text for kerberos method option -#: src/include/samba-client/routines.rb:540 +#: src/include/samba-client/routines.rb:546 msgid "<p>The value of <b>Kerberos Method</b> defines how kerberos tickets are verified. When <b>Single Sing-on for SSH</b> is used, the default Kerberos Method set by YaST is <tt>secrets and keytab</tt>. See smb.conf manual page for details.</p>" msgstr "" @@ -922,8 +922,8 @@ #. final progress step label #. translators: progress finished #. translators: write progress finished -#: src/modules/Kerberos.rb:669 src/modules/Samba.rb:642 -#: src/modules/Samba.rb:761 +#: src/modules/Kerberos.rb:669 src/modules/Samba.rb:643 +#: src/modules/Samba.rb:765 msgid "Finished" msgstr "Finished" @@ -998,13 +998,13 @@ #. summary value #. translators: winbind status in summary -#: src/modules/Kerberos.rb:1013 src/modules/Samba.rb:1104 +#: src/modules/Kerberos.rb:1013 src/modules/Samba.rb:1112 msgid "Yes" msgstr "Yes" #. summary value #. translators: winbind status in summary -#: src/modules/Kerberos.rb:1015 src/modules/Samba.rb:1106 +#: src/modules/Kerberos.rb:1015 src/modules/Samba.rb:1114 msgid "No" msgstr "No" @@ -1032,143 +1032,143 @@ "Try again." #. Samba-client read dialog caption -#: src/modules/Samba.rb:621 +#: src/modules/Samba.rb:622 msgid "Initializing Samba Client Configuration" msgstr "Initialising Samba Client Configuration" #. translators: progress stage 1/2 -#: src/modules/Samba.rb:632 +#: src/modules/Samba.rb:633 msgid "Read the global Samba settings" msgstr "Read the global Samba settings" #. translators: progress stage 2/2 -#: src/modules/Samba.rb:634 +#: src/modules/Samba.rb:635 msgid "Read the winbind status" msgstr "Read the winbind status" #. translators: progress step 1/2 -#: src/modules/Samba.rb:638 +#: src/modules/Samba.rb:639 msgid "Reading the global Samba settings..." msgstr "Reading the global Samba settings..." #. translators: progress step 2/2 -#: src/modules/Samba.rb:640 +#: src/modules/Samba.rb:641 msgid "Reading the winbind status..." msgstr "Reading the winbind status..." #. Samba-client read dialog caption -#: src/modules/Samba.rb:741 +#: src/modules/Samba.rb:745 msgid "Saving Samba Client Configuration" msgstr "Saving Samba Client Configuration" #. translators: write progress stage -#: src/modules/Samba.rb:745 +#: src/modules/Samba.rb:749 msgid "Write the settings" msgstr "Write the settings" #. translators: write progress stage -#: src/modules/Samba.rb:748 +#: src/modules/Samba.rb:752 msgid "Disable Samba services" msgstr "Disable Samba services" #. translators: write progress stage -#: src/modules/Samba.rb:750 +#: src/modules/Samba.rb:754 msgid "Enable Samba services" msgstr "Enable Samba services" #. translators: write progress step -#: src/modules/Samba.rb:754 +#: src/modules/Samba.rb:758 msgid "Writing the settings..." msgstr "Writing the settings..." #. translators: write progress step -#: src/modules/Samba.rb:757 +#: src/modules/Samba.rb:761 msgid "Disabling Samba services..." msgstr "Disabling Samba services..." #. translators: write progress step -#: src/modules/Samba.rb:759 +#: src/modules/Samba.rb:763 msgid "Enabling Samba services..." msgstr "Enabling Samba services..." #. write progress stage -#: src/modules/Samba.rb:769 +#: src/modules/Samba.rb:773 msgid "Write Kerberos configuration" msgstr "Write Kerberos configuration" #. write progress step -#: src/modules/Samba.rb:771 +#: src/modules/Samba.rb:775 msgid "Writing Kerberos configuration..." msgstr "Writing Kerberos configuration..." #. translators: error message, %1 is filename #. translators: error message, %1 is filename #. translators: error message, %1 is filename -#: src/modules/Samba.rb:825 src/modules/Samba.rb:862 src/modules/Samba.rb:879 +#: src/modules/Samba.rb:833 src/modules/Samba.rb:870 src/modules/Samba.rb:887 msgid "Cannot write settings to %1." msgstr "Cannot write settings to %1." #. translators: error message, do not change winbind -#: src/modules/Samba.rb:838 +#: src/modules/Samba.rb:846 msgid "Cannot start winbind service." msgstr "Cannot start winbind service." #. translators: error message, do not change winbind -#: src/modules/Samba.rb:843 +#: src/modules/Samba.rb:851 msgid "Cannot start winbind daemon." msgstr "Cannot start winbind daemon." #. translators: error message, do not change winbind -#: src/modules/Samba.rb:849 +#: src/modules/Samba.rb:857 msgid "Cannot stop winbind service." msgstr "Cannot stop winbind service." #. translators: error message, do not change winbind -#: src/modules/Samba.rb:854 +#: src/modules/Samba.rb:862 msgid "Cannot stop winbind daemon." msgstr "Cannot stop winbind daemon." #. translators: error message -#: src/modules/Samba.rb:870 +#: src/modules/Samba.rb:878 msgid "Cannot write PAM settings." msgstr "Cannot write PAM settings." #. summary header -#: src/modules/Samba.rb:1044 +#: src/modules/Samba.rb:1052 msgid "Global Configuration" msgstr "Global Configuration" #. autoyast summary item: configured workgroup -#: src/modules/Samba.rb:1051 +#: src/modules/Samba.rb:1059 msgid "Workgroup or Domain: %1" msgstr "Workgroup or Domain: %1" #. autoyast summary item -#: src/modules/Samba.rb:1060 +#: src/modules/Samba.rb:1068 msgid "Create Home Directory on Login" msgstr "Create Home Directory on Login" #. autoyast summary item -#: src/modules/Samba.rb:1067 +#: src/modules/Samba.rb:1075 msgid "Offline Authentication Enabled" msgstr "Offline Authentication Enabled" #. autoyast summary item -#: src/modules/Samba.rb:1075 +#: src/modules/Samba.rb:1083 msgid "Maximum Number of Shares: %1" msgstr "Maximum Number of Shares: %1" #. summary item: configured workgroup -#: src/modules/Samba.rb:1096 +#: src/modules/Samba.rb:1104 msgid "<p><b>Workgroup or Domain</b>: %1</p>" msgstr "<p><b>Workgroup or Domain</b>: %1</p>" #. summary item: authentication using winbind -#: src/modules/Samba.rb:1101 +#: src/modules/Samba.rb:1109 msgid "<p><b>Authentication with SMB</b>: %1</p>" msgstr "<p><b>Authentication with SMB</b>: %1</p>" -#: src/modules/SambaNetJoin.pm:328 +#: src/modules/SambaNetJoin.pm:322 msgid "Unable to proceed with join: Inconsistent cluster state" msgstr "" Modified: trunk/yast/en_GB/po/samba-server.en_GB.po =================================================================== --- trunk/yast/en_GB/po/samba-server.en_GB.po 2015-09-09 08:18:21 UTC (rev 92602) +++ trunk/yast/en_GB/po/samba-server.en_GB.po 2015-09-09 08:19:44 UTC (rev 92603) @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: samba-server\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-10-29 16:21+0100\n" +"POT-Creation-Date: 2015-08-25 18:37+0200\n" "PO-Revision-Date: 2008-03-27 22:59+0000\n" "Last-Translator: Benjamin Weber \n" "Language-Team: \n" @@ -207,7 +207,7 @@ #. translators: error message for "add share" command line action, %1 is share name #. translators: popup error message for "add share", %1 is share name -#: src/clients/samba-server.rb:400 src/include/samba-server/dialogs.rb:1070 +#: src/clients/samba-server.rb:400 src/include/samba-server/dialogs.rb:1071 msgid "Share %1 already exists." msgstr "Share %1 already exists." @@ -229,7 +229,7 @@ #. translators: share status #. translators: share status #: src/clients/samba-server.rb:463 src/clients/samba-server.rb:481 -#: src/include/samba-server/dialogs.rb:145 +#: src/include/samba-server/dialogs.rb:146 msgid "Disabled" msgstr "Disabled" @@ -237,7 +237,7 @@ #. translators: share status #. check if given path has a corresponding snapper configuration #: src/clients/samba-server.rb:465 src/clients/samba-server.rb:483 -#: src/include/samba-server/dialogs.rb:145 +#: src/include/samba-server/dialogs.rb:146 msgid "Enabled" msgstr "Enabled" @@ -391,23 +391,23 @@ #. Lukas Ocilka #. #. $Id$ -#: src/include/samba-server/dialogs.rb:68 +#: src/include/samba-server/dialogs.rb:69 msgid "&Primary Domain Controller (PDC)" msgstr "&Primary Domain Controller (PDC)" -#: src/include/samba-server/dialogs.rb:69 +#: src/include/samba-server/dialogs.rb:70 msgid "B&ackup Domain Controller (BDC)" msgstr "B&ackup Domain Controller (BDC)" -#: src/include/samba-server/dialogs.rb:70 +#: src/include/samba-server/dialogs.rb:71 msgid "Not a Domain &Controller" msgstr "Not a Domain &Controller" #. Samba LDAP Settings Misc Widget #. ///////////////////////////////////////////////////////////////////////// #. translators: combo box value -#: src/include/samba-server/dialogs.rb:152 -#: src/include/samba-server/dialogs.rb:155 +#: src/include/samba-server/dialogs.rb:153 +#: src/include/samba-server/dialogs.rb:156 #: src/include/samba-server/ldap-widget.rb:76 msgid "Yes" msgstr "Yes" @@ -416,19 +416,19 @@ #. ///////////////////////////////////////////////////////////////////////// #. translators: combo box value #. translators: combo box value -#: src/include/samba-server/dialogs.rb:152 -#: src/include/samba-server/dialogs.rb:155 +#: src/include/samba-server/dialogs.rb:153 +#: src/include/samba-server/dialogs.rb:156 #: src/include/samba-server/ldap-widget.rb:65 #: src/include/samba-server/ldap-widget.rb:78 msgid "No" msgstr "No" -#: src/include/samba-server/dialogs.rb:170 -#: src/include/samba-server/dialogs.rb:235 +#: src/include/samba-server/dialogs.rb:171 +#: src/include/samba-server/dialogs.rb:236 msgid "Samba Installation" msgstr "Samba Installation" -#: src/include/samba-server/dialogs.rb:170 +#: src/include/samba-server/dialogs.rb:171 msgid "Step 1 of 2" msgstr "Step 1 of 2" @@ -436,48 +436,48 @@ #. TRANSLATORS: text entry #. `ComboBox(`id("workgroup_domainname"), `opt(`editable, `hstretch), _("&Workgroup or Domain Name"), #. SambaNmbLookup::GetAvailableNeighbours(nil)), -#: src/include/samba-server/dialogs.rb:190 -#: src/include/samba-server/dialogs.rb:1187 +#: src/include/samba-server/dialogs.rb:191 +#: src/include/samba-server/dialogs.rb:1188 msgid "&Workgroup or Domain Name" msgstr "&Workgroup or Domain Name" -#: src/include/samba-server/dialogs.rb:235 +#: src/include/samba-server/dialogs.rb:236 msgid "Step 2 of 2" msgstr "Step 2 of 2" #. header of status-like information. followed by domain name -#: src/include/samba-server/dialogs.rb:244 +#: src/include/samba-server/dialogs.rb:245 msgid "Current Domain Name:" msgstr "Current Domain Name:" -#: src/include/samba-server/dialogs.rb:249 +#: src/include/samba-server/dialogs.rb:250 msgid "Samba Server Type" msgstr "Samba Server Type" #. appears on new line after Primary Domain Controller radio button -#: src/include/samba-server/dialogs.rb:262 +#: src/include/samba-server/dialogs.rb:263 msgid "Not available because a PDC is present." msgstr "Not available because a PDC is present." #. TRANSLATORS: dialog caption -#: src/include/samba-server/dialogs.rb:583 +#: src/include/samba-server/dialogs.rb:584 msgid "Rename Share" msgstr "Rename Share" #. TRANSLATORS: text entry -#: src/include/samba-server/dialogs.rb:592 +#: src/include/samba-server/dialogs.rb:593 msgid "New Share &Name" msgstr "New Share &Name" #. TRANSLATORS: popup error message -#: src/include/samba-server/dialogs.rb:621 +#: src/include/samba-server/dialogs.rb:622 #, fuzzy #| msgid "Enter a new share name, please." msgid "Enter a new share name." msgstr "Enter a new share name, please." #. TRANSLATORS: popup error message, %1 is a variable share name -#: src/include/samba-server/dialogs.rb:630 +#: src/include/samba-server/dialogs.rb:631 #, fuzzy #| msgid "" #| "Share '%1' already exists.\n" @@ -490,7 +490,7 @@ "Choose another share name, please." #. confirmation dialog before deleting a share -#: src/include/samba-server/dialogs.rb:726 +#: src/include/samba-server/dialogs.rb:727 msgid "" "If you delete share %1,\n" "all its settings will be lost.\n" @@ -501,26 +501,26 @@ "Really delete it?" #. rwalter I couldn't make this one show up. Please make sure my deletions didn't make it too confusing. -#: src/include/samba-server/dialogs.rb:756 +#: src/include/samba-server/dialogs.rb:757 msgid "Trusted &Domain" msgstr "Trusted &Domain" #. text entry label -#: src/include/samba-server/dialogs.rb:757 -#: src/include/samba-server/dialogs.rb:1721 +#: src/include/samba-server/dialogs.rb:758 +#: src/include/samba-server/dialogs.rb:1722 msgid "&Password" msgstr "&Password" -#: src/include/samba-server/dialogs.rb:778 +#: src/include/samba-server/dialogs.rb:779 msgid "Domain name cannot be empty." msgstr "Domain name cannot be empty." -#: src/include/samba-server/dialogs.rb:784 +#: src/include/samba-server/dialogs.rb:785 msgid "Cannot establish trusted domain relationship." msgstr "Cannot establish trusted domain relationship." #. issue a warning, if not already done so -#: src/include/samba-server/dialogs.rb:800 +#: src/include/samba-server/dialogs.rb:801 msgid "" "The password for trusted domains\n" "is stored in the autoinstallation control file. The password\n" @@ -533,14 +533,14 @@ "a security threat." #. SambaTrustDom::List() might return 'nil' -#: src/include/samba-server/dialogs.rb:822 -#: src/include/samba-server/dialogs.rb:1219 -#: src/include/samba-server/dialogs.rb:1335 +#: src/include/samba-server/dialogs.rb:823 +#: src/include/samba-server/dialogs.rb:1220 +#: src/include/samba-server/dialogs.rb:1336 msgid "&Trusted Domains" msgstr "&Trusted Domains" #. confirmation -#: src/include/samba-server/dialogs.rb:843 +#: src/include/samba-server/dialogs.rb:844 msgid "" "Really abandon trust relationship\n" "to trusted domain %1?" @@ -549,234 +549,234 @@ "to trusted domain %1?" #. dialog caption -#: src/include/samba-server/dialogs.rb:863 +#: src/include/samba-server/dialogs.rb:864 msgid "Share %1" msgstr "Share %1" #. dialog caption -#: src/include/samba-server/dialogs.rb:887 +#: src/include/samba-server/dialogs.rb:888 msgid "Expert Global Settings Configuration" msgstr "Expert Global Settings Configuration" #. frame label -#: src/include/samba-server/dialogs.rb:919 +#: src/include/samba-server/dialogs.rb:920 msgid "Identification" msgstr "Identification" #. text entry label -#: src/include/samba-server/dialogs.rb:921 +#: src/include/samba-server/dialogs.rb:922 msgid "Share &Name" msgstr "Share &Name" #. text entry label -#: src/include/samba-server/dialogs.rb:923 +#: src/include/samba-server/dialogs.rb:924 msgid "Share &Description" msgstr "Share &Description" #. frame label -#: src/include/samba-server/dialogs.rb:927 +#: src/include/samba-server/dialogs.rb:928 msgid "Share Type" msgstr "Share Type" #. radio button label -#: src/include/samba-server/dialogs.rb:932 +#: src/include/samba-server/dialogs.rb:933 msgid "&Printer" msgstr "&Printer" #. radio button label -#: src/include/samba-server/dialogs.rb:934 +#: src/include/samba-server/dialogs.rb:935 msgid "&Directory" msgstr "&Directory" #. translators: text entry label -#: src/include/samba-server/dialogs.rb:938 +#: src/include/samba-server/dialogs.rb:939 msgid "Share &Path" msgstr "Share &Path" #. translators: checkbox label, setting for share -#: src/include/samba-server/dialogs.rb:945 +#: src/include/samba-server/dialogs.rb:946 msgid "&Read-Only" msgstr "&Read-Only" #. checkbox label -#: src/include/samba-server/dialogs.rb:947 +#: src/include/samba-server/dialogs.rb:948 msgid "&Inherit ACLs" msgstr "&Inherit ACLs" #. checkbox label -#: src/include/samba-server/dialogs.rb:949 +#: src/include/samba-server/dialogs.rb:950 msgid "Expose Snapshots" msgstr "" #. checkbox label -#: src/include/samba-server/dialogs.rb:951 +#: src/include/samba-server/dialogs.rb:952 msgid "Utilize Btrfs Features" msgstr "" #. translators: dialog caption -#: src/include/samba-server/dialogs.rb:960 +#: src/include/samba-server/dialogs.rb:961 msgid "New Share" msgstr "New Share" #. translators: file selection dialog title -#: src/include/samba-server/dialogs.rb:1006 +#: src/include/samba-server/dialogs.rb:1007 msgid "Path for a Share" msgstr "Path for a Share" #. translators: error message -#: src/include/samba-server/dialogs.rb:1030 +#: src/include/samba-server/dialogs.rb:1031 msgid "Share name cannot be empty." msgstr "Share name cannot be empty." #. translators: error message -#: src/include/samba-server/dialogs.rb:1035 +#: src/include/samba-server/dialogs.rb:1036 msgid "Share path cannot be empty." msgstr "Share path cannot be empty." -#: src/include/samba-server/dialogs.rb:1088 +#: src/include/samba-server/dialogs.rb:1089 msgid "Available Shares" msgstr "Available Shares" -#: src/include/samba-server/dialogs.rb:1092 +#: src/include/samba-server/dialogs.rb:1093 msgid "&Filter" msgstr "&Filter" -#: src/include/samba-server/dialogs.rb:1094 +#: src/include/samba-server/dialogs.rb:1095 msgid "Show &All Shares" msgstr "Show &All Shares" -#: src/include/samba-server/dialogs.rb:1097 +#: src/include/samba-server/dialogs.rb:1098 msgid "Do Not Show &System Shares" msgstr "Do Not Show &System Shares" #. translators: table header texts -#: src/include/samba-server/dialogs.rb:1108 +#: src/include/samba-server/dialogs.rb:1109 msgid "Status" msgstr "Status" -#: src/include/samba-server/dialogs.rb:1109 +#: src/include/samba-server/dialogs.rb:1110 msgid "Read-Only" msgstr "Read-Only" -#: src/include/samba-server/dialogs.rb:1110 +#: src/include/samba-server/dialogs.rb:1111 msgid "Name" msgstr "Name" -#: src/include/samba-server/dialogs.rb:1111 +#: src/include/samba-server/dialogs.rb:1112 msgid "Path" msgstr "Path" -#: src/include/samba-server/dialogs.rb:1112 -#: src/include/samba-server/dialogs.rb:1123 +#: src/include/samba-server/dialogs.rb:1113 +#: src/include/samba-server/dialogs.rb:1124 #, fuzzy #| msgid "Allow &Guest Access" msgid "Guest Access" msgstr "Allow &Guest Access" -#: src/include/samba-server/dialogs.rb:1113 +#: src/include/samba-server/dialogs.rb:1114 msgid "Comment" msgstr "Comment" -#: src/include/samba-server/dialogs.rb:1122 +#: src/include/samba-server/dialogs.rb:1123 msgid "&Rename..." msgstr "&Rename..." -#: src/include/samba-server/dialogs.rb:1124 +#: src/include/samba-server/dialogs.rb:1125 msgid "&Toggle Status" msgstr "&Toggle Status" -#: src/include/samba-server/dialogs.rb:1142 +#: src/include/samba-server/dialogs.rb:1143 msgid "WINS Server Support" msgstr "WINS Server Support" -#: src/include/samba-server/dialogs.rb:1149 +#: src/include/samba-server/dialogs.rb:1150 msgid "Remote WINS Server" msgstr "Remote WINS Server" -#: src/include/samba-server/dialogs.rb:1154 +#: src/include/samba-server/dialogs.rb:1155 msgid "Na&me" msgstr "Na&me" #. TRANSLATORS: check box -#: src/include/samba-server/dialogs.rb:1164 +#: src/include/samba-server/dialogs.rb:1165 msgid "Use WINS for Hostname Resolution" msgstr "" #. translators: combobox item -#: src/include/samba-server/dialogs.rb:1169 +#: src/include/samba-server/dialogs.rb:1170 msgid "Not a DC" msgstr "Not a DC" #. translators: combobox item -#: src/include/samba-server/dialogs.rb:1171 +#: src/include/samba-server/dialogs.rb:1172 msgid "Primary (PDC)" msgstr "Primary (PDC)" #. translators: combobox item -#: src/include/samba-server/dialogs.rb:1175 +#: src/include/samba-server/dialogs.rb:1176 msgid "Backup (BDC)" msgstr "Backup (BDC)" -#: src/include/samba-server/dialogs.rb:1178 +#: src/include/samba-server/dialogs.rb:1179 msgid "Base Settings" msgstr "Base Settings" #. translators: combobox label -#: src/include/samba-server/dialogs.rb:1193 +#: src/include/samba-server/dialogs.rb:1194 msgid "Domain &Controller" msgstr "Domain &Controller" -#: src/include/samba-server/dialogs.rb:1203 +#: src/include/samba-server/dialogs.rb:1204 msgid "Advanced Settings..." msgstr "Advanced Settings..." -#: src/include/samba-server/dialogs.rb:1205 +#: src/include/samba-server/dialogs.rb:1206 msgid "&Expert Global Settings" msgstr "&Expert Global Settings" -#: src/include/samba-server/dialogs.rb:1206 +#: src/include/samba-server/dialogs.rb:1207 msgid "&User Authentication Sources" msgstr "&User Authentication Sources" -#: src/include/samba-server/dialogs.rb:1236 +#: src/include/samba-server/dialogs.rb:1237 msgid "Samba Configuration" msgstr "Samba Configuration" #. tab label -#: src/include/samba-server/dialogs.rb:1241 +#: src/include/samba-server/dialogs.rb:1242 msgid "Start-&Up" msgstr "Start-&Up" -#: src/include/samba-server/dialogs.rb:1259 +#: src/include/samba-server/dialogs.rb:1260 msgid "&Shares" msgstr "&Shares" #. BNC #579993, Allow guest access -#: src/include/samba-server/dialogs.rb:1282 +#: src/include/samba-server/dialogs.rb:1283 msgid "I&dentity" msgstr "I&dentity" -#: src/include/samba-server/dialogs.rb:1297 +#: src/include/samba-server/dialogs.rb:1298 msgid "WINS" msgstr "WINS" -#: src/include/samba-server/dialogs.rb:1340 +#: src/include/samba-server/dialogs.rb:1341 msgid "&LDAP Settings" msgstr "&LDAP Settings" #. BNC #247344, BNC #541958 (comment #18) -#: src/include/samba-server/dialogs.rb:1463 +#: src/include/samba-server/dialogs.rb:1464 msgid "NetBIOS &Hostname" msgstr "NetBIOS &Hostname" #. dialog caption -#: src/include/samba-server/dialogs.rb:1564 +#: src/include/samba-server/dialogs.rb:1565 msgid "User Information Sources" msgstr "User Information Sources" #. try to create it #. first, ask for password -#: src/include/samba-server/dialogs.rb:1618 +#: src/include/samba-server/dialogs.rb:1619 msgid "" "For a proper function, Samba server needs an\n" "administrative account (root).\n" @@ -786,16 +786,16 @@ "administrative account (root).\n" "It will be created now." -#: src/include/samba-server/dialogs.rb:1624 +#: src/include/samba-server/dialogs.rb:1625 msgid "Samba root &Password" msgstr "Samba root &Password" -#: src/include/samba-server/dialogs.rb:1625 +#: src/include/samba-server/dialogs.rb:1626 msgid "&Verify Password" msgstr "&Verify Password" #. TRANSLATORS: popup error message -#: src/include/samba-server/dialogs.rb:1645 +#: src/include/samba-server/dialogs.rb:1646 msgid "" "The first and the second version\n" "of the password do not match." @@ -804,12 +804,12 @@ "of the password do not match." #. TRANSLATORS: popup error message, %1 is a username -#: src/include/samba-server/dialogs.rb:1662 +#: src/include/samba-server/dialogs.rb:1663 msgid "Cannot create account for user %1." msgstr "Cannot create account for user %1." #. translators: popup to fill in the domain joining info; %1 is the domain name -#: src/include/samba-server/dialogs.rb:1704 +#: src/include/samba-server/dialogs.rb:1705 msgid "" "Enter the username and the password\n" "for joining the domain %1." @@ -817,7 +817,7 @@ "Enter the username and the password\n" "for joining the domain %1." -#: src/include/samba-server/dialogs.rb:1711 +#: src/include/samba-server/dialogs.rb:1712 msgid "" "To join the domain anonymously, leave the\n" "text entries empty." @@ -826,17 +826,17 @@ "text entries empty." #. text entry label -#: src/include/samba-server/dialogs.rb:1719 +#: src/include/samba-server/dialogs.rb:1720 msgid "&Username" msgstr "&Username" #. translators: button label to skip joining to domain -#: src/include/samba-server/dialogs.rb:1724 +#: src/include/samba-server/dialogs.rb:1725 msgid "Do &Not Join" msgstr "Do &Not Join" #. Translators: Information popup, %1 is the name of the domain -#: src/include/samba-server/dialogs.rb:1756 +#: src/include/samba-server/dialogs.rb:1761 msgid "Domain %1 joined successfully." msgstr "Domain %1 joined successfully." Modified: trunk/yast/en_GB/po/samba-users.en_GB.po =================================================================== --- trunk/yast/en_GB/po/samba-users.en_GB.po 2015-09-09 08:18:21 UTC (rev 92602) +++ trunk/yast/en_GB/po/samba-users.en_GB.po 2015-09-09 08:19:44 UTC (rev 92603) @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-04 15:53+0200\n" +"POT-Creation-Date: 2015-08-25 18:37+0200\n" "PO-Revision-Date: 2007-08-16 20:22+0100\n" "Last-Translator: Benjamin Weber\n" "Language-Team: British English\n" Modified: trunk/yast/en_GB/po/scanner.en_GB.po =================================================================== --- trunk/yast/en_GB/po/scanner.en_GB.po 2015-09-09 08:18:21 UTC (rev 92602) +++ trunk/yast/en_GB/po/scanner.en_GB.po 2015-09-09 08:19:44 UTC (rev 92603) @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: scanner\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-04 15:53+0200\n" +"POT-Creation-Date: 2015-08-25 18:37+0200\n" "PO-Revision-Date: 2008-03-27 22:59+0000\n" "Last-Translator: Benjamin Weber \n" "Language-Team: \n" @@ -162,7 +162,7 @@ #. Only a simple message because this error does not happen on a normal system #. (i.e. a system which is not totally broken or totally messed up). #: src/include/scanner/dialogs.rb:438 src/include/scanner/dialogs.rb:971 -#: src/modules/Scanner.rb:2267 +#: src/modules/Scanner.rb:2261 msgid "Failed to deactivate %1." msgstr "Failed to deactivate %1." @@ -1088,7 +1088,7 @@ #. Only a simple message because this error does not happen on a normal system #. (i.e. a system which is not totally broken or totally messed up). #: src/modules/Scanner.rb:533 src/modules/Scanner.rb:591 -#: src/modules/Scanner.rb:650 src/modules/Scanner.rb:2506 +#: src/modules/Scanner.rb:650 src/modules/Scanner.rb:2500 msgid "File %1 does not exist." msgstr "File %1 does not exist." @@ -1101,7 +1101,7 @@ #. Only a simple message because this error does not happen on a normal system #. (i.e. a system which is not totally broken or totally messed up). #: src/modules/Scanner.rb:553 src/modules/Scanner.rb:611 -#: src/modules/Scanner.rb:670 src/modules/Scanner.rb:2526 +#: src/modules/Scanner.rb:670 src/modules/Scanner.rb:2520 msgid "Failed to read %1." msgstr "Failed to read %1." @@ -1144,7 +1144,7 @@ #. 3. progress stage name of a Progress::New: #. 5. progress stage name of a Progress::New: -#: src/modules/Scanner.rb:774 src/modules/Scanner.rb:1994 +#: src/modules/Scanner.rb:774 src/modules/Scanner.rb:1988 msgid "Determine active scanners" msgstr "Determine active scanners" @@ -1171,7 +1171,7 @@ #. 3. progress step progress bar title of a Progress::New: #. 5. progress step progress bar title of a Progress::New: -#: src/modules/Scanner.rb:785 src/modules/Scanner.rb:2007 +#: src/modules/Scanner.rb:785 src/modules/Scanner.rb:2001 msgid "Determining active scanners..." msgstr "Determining active scanners..." @@ -1195,7 +1195,7 @@ #. Last progress step progress bar title of a Progress::New: #. Last progress step progress bar title of a Progress::New: #: src/modules/Scanner.rb:791 src/modules/Scanner.rb:1030 -#: src/modules/Scanner.rb:2009 +#: src/modules/Scanner.rb:2003 msgid "Finished" msgstr "Finished" @@ -1299,19 +1299,19 @@ #. Fallback device name if the real device name is missing: #. Fallback device name if the real device name is missing: -#: src/modules/Scanner.rb:1326 src/modules/Scanner.rb:2248 +#: src/modules/Scanner.rb:1326 src/modules/Scanner.rb:2242 msgid "Unknown device" msgstr "Unknown device" #. Fallback manufacturer name if the real manufacturer name is missing: #. Fallback manufacturer name if the real manufacturer name is missing: -#: src/modules/Scanner.rb:1332 src/modules/Scanner.rb:2236 +#: src/modules/Scanner.rb:1332 src/modules/Scanner.rb:2230 msgid "Unknown manufacturer" msgstr "Unknown manufacturer" #. Fallback model name if the real model name is missing: #. Fallback model name if the real model name is missing: -#: src/modules/Scanner.rb:1335 src/modules/Scanner.rb:2242 +#: src/modules/Scanner.rb:1335 src/modules/Scanner.rb:2236 msgid "Unknown model" msgstr "Unknown model" @@ -1322,7 +1322,7 @@ #. %1 will be replaced by the manufacturer name #. %2 will be replaced by the model name #. %3 will be replaced by the device name where the scanner is connected to: -#: src/modules/Scanner.rb:1360 src/modules/Scanner.rb:2231 +#: src/modules/Scanner.rb:1360 src/modules/Scanner.rb:2225 msgid "%1 %2 at %3" msgstr "%1 %2 at %3" @@ -1457,7 +1457,7 @@ #. stored on the manufacturer's CD but often it is buried in a weird Windows-only #. driver archive format. The text must indicate this. #. Do not change or translate "SANE", it is a project name. -#: src/modules/Scanner.rb:1892 +#: src/modules/Scanner.rb:1886 #, fuzzy #| msgid "" #| "A firmware file contains software that must be uploaded to the scanner's memory.\n" @@ -1505,7 +1505,7 @@ #. Message of a Popup::ContinueCancel for scanners which should be set up with the hpaio driver. #. Do not change or translate "ptal", it is a service name. #. Do not change or translate "HPLIP", it is a subsystem name. -#: src/modules/Scanner.rb:1911 +#: src/modules/Scanner.rb:1905 #, fuzzy msgid "" "There is at least one printer configuration that uses the ptal service.\n" @@ -1525,7 +1525,7 @@ #. Do not change or translate "PTAL", it is a subsystem name. #. Do not change or translate "ptal", it is a service name. #. Do not change or translate "hplip", it is a service name. -#: src/modules/Scanner.rb:1923 +#: src/modules/Scanner.rb:1917 msgid "" "The hpoj driver requires the PTAL system to be set up and running.\n" "In particular, the ptal service must be up and running.\n" @@ -1565,7 +1565,7 @@ #. Do not change or translate "hplip", it is a service name. #. Do not change or translate "hpaio", it is a driver name. #. Do not change or translate "ptal", it is a service name. -#: src/modules/Scanner.rb:1946 +#: src/modules/Scanner.rb:1940 msgid "" "There is at least one printer configuration that uses the hplip service.\n" "It is possible to proceed but then the hplip service would be stopped\n" @@ -1582,51 +1582,51 @@ "Alternatively proceed and change the printer configuration to use the ptal service.\n" #. %1 will be replaced by the backend name -#: src/modules/Scanner.rb:1982 +#: src/modules/Scanner.rb:1976 msgid "Setting Up Driver %1" msgstr "Setting Up Driver %1" -#: src/modules/Scanner.rb:1986 +#: src/modules/Scanner.rb:1980 msgid "Check whether additional packages must be installed" msgstr "Check whether additional packages must be installed" #. 2. progress stage name of a Progress::New: -#: src/modules/Scanner.rb:1988 +#: src/modules/Scanner.rb:1982 msgid "Check whether firmware upload is required" msgstr "Check whether firmware upload is required" #. 3. progress stage name of a Progress::New: -#: src/modules/Scanner.rb:1990 +#: src/modules/Scanner.rb:1984 msgid "Test and set up special requirements for particular drivers" msgstr "Test and set up special requirements for particular drivers" #. 4. progress stage name of a Progress::New: -#: src/modules/Scanner.rb:1992 +#: src/modules/Scanner.rb:1986 msgid "Activate the driver" msgstr "Activate the driver" #. 1. progress stage name of a Progress::New: -#: src/modules/Scanner.rb:1997 +#: src/modules/Scanner.rb:1991 msgid "Checking whether additional packages must be installed..." msgstr "Checking whether additional packages must be installed..." #. 2. progress step progress bar title of a Progress::New: -#: src/modules/Scanner.rb:1999 +#: src/modules/Scanner.rb:1993 msgid "Checking whether firmware upload is required..." msgstr "Checking whether firmware upload is required..." #. 3. progress step progress bar title of a Progress::New: -#: src/modules/Scanner.rb:2001 +#: src/modules/Scanner.rb:1995 msgid "Testing and setting up special requirements for particular drivers..." msgstr "Testing and setting up special requirements for particular drivers..." #. 4. progress step progress bar title of a Progress::New: -#: src/modules/Scanner.rb:2005 +#: src/modules/Scanner.rb:1999 msgid "Activating the driver..." msgstr "Activating the driver..." #. the third-party Image Scan driver software from Epson/Avasys: -#: src/modules/Scanner.rb:2026 +#: src/modules/Scanner.rb:2020 msgid "Required Package Not Installed" msgstr "Required Package Not Installed" @@ -1636,7 +1636,7 @@ #. Only a simple message because before there was a dialog #. which let the user install the package so that this message is shown #. if the user has explicitly rejected to install it. -#: src/modules/Scanner.rb:2034 +#: src/modules/Scanner.rb:2028 msgid "The driver %1 requires the package %2." msgstr "The driver %1 requires the package %2." @@ -1644,9 +1644,9 @@ #. It may happen that the conflicting service hplip is in use by the printing system. #. The hplip service is associated with the hpaoi backend. #. Activate the backend via bash script: -#: src/modules/Scanner.rb:2040 src/modules/Scanner.rb:2081 -#: src/modules/Scanner.rb:2125 src/modules/Scanner.rb:2139 -#: src/modules/Scanner.rb:2149 +#: src/modules/Scanner.rb:2034 src/modules/Scanner.rb:2075 +#: src/modules/Scanner.rb:2119 src/modules/Scanner.rb:2133 +#: src/modules/Scanner.rb:2143 msgid "Aborted" msgstr "Aborted" @@ -1658,7 +1658,7 @@ #. because which scanner requires firmware upload is stored in the database #. and additionally user confirmation must be requested. #. Otherwise skip this section. -#: src/modules/Scanner.rb:2060 +#: src/modules/Scanner.rb:2054 msgid "Firmware Upload Required" msgstr "Firmware Upload Required" @@ -1667,14 +1667,14 @@ #. which asked the user whether he wants to let YaST activate the ptal service #. so that this message is shown if the user has explicitly rejected to do it. #. Do not change or translate "ptal", it is a service name. -#: src/modules/Scanner.rb:2115 +#: src/modules/Scanner.rb:2109 msgid "If the ptal service is not running, the scanner cannot work." msgstr "If the ptal service is not running, the scanner cannot work." #. Only a simple message because this error does not happen on a normal system #. (i.e. a system which is not totally broken or totally messed up). #. Do not change or translate "PTAL", it is a subsystem name. -#: src/modules/Scanner.rb:2136 +#: src/modules/Scanner.rb:2130 #, fuzzy msgid "Failed to set up the PTAL system." msgstr "" @@ -1682,7 +1682,7 @@ "%1" #. Header message for a list of scanners which will be deactivated: -#: src/modules/Scanner.rb:2223 +#: src/modules/Scanner.rb:2217 msgid "" "The following scanners use the same driver.\n" "Therefore all those scanners will be deactivated:" @@ -1697,49 +1697,49 @@ #. Do not change or translate "hpoj", it is a driver name. #. Do not change or translate "ptal", it is a service name. #. Do not change or translate "CUPS", it is a subsystem name. -#: src/modules/Scanner.rb:2291 +#: src/modules/Scanner.rb:2285 msgid "The driver hpoj is deactivated but the associated service ptal is not deactivated because it is needed by the CUPS printing system." msgstr "The driver hpoj is deactivated but the associated service ptal is not deactivated because it is needed by the CUPS printing system." #. (i.e. a system which is not totally broken or totally messed up). #. Do not change or translate "ptal", it is a service name. -#: src/modules/Scanner.rb:2306 +#: src/modules/Scanner.rb:2300 msgid "Failed to stop the ptal service." msgstr "Failed to stop the ptal service." #. (i.e. a system which is not totally broken or totally messed up). #. Do not change or translate "ptal", it is a service name. -#: src/modules/Scanner.rb:2317 +#: src/modules/Scanner.rb:2311 msgid "Failed to disable the ptal service." msgstr "Failed to disable the ptal service." #. If there is no active scanner for the backend #. then show a message but exit successfully because #. it is no error when there is no active scanner for the backend: -#: src/modules/Scanner.rb:2376 +#: src/modules/Scanner.rb:2370 msgid "No Scanner for %1" msgstr "No Scanner for %1" #. Header of a Popup::AnyMessage where %1 will be replaced by the driver name: #. Body of a Popup::AnyMessage: -#: src/modules/Scanner.rb:2378 +#: src/modules/Scanner.rb:2372 msgid "It is not possible to test without a matching active scanner." msgstr "It is not possible to test without a matching active scanner." #. Header of a SelectionBox with a list of scanners: -#: src/modules/Scanner.rb:2393 +#: src/modules/Scanner.rb:2387 msgid "&Scanner to Test" msgstr "&Scanner to Test" #. Test the device: -#: src/modules/Scanner.rb:2415 +#: src/modules/Scanner.rb:2409 msgid "Testing %1" msgstr "Testing %1" #. Header of a Popup::ShowFeedback where %1 will be replaced by the driver name: #. Body of a Popup::ShowFeedback where %1 will be replaced by the SANE device identifier. #. Do not change or translate "scanimage -d %1 -v", it is a fixed command. -#: src/modules/Scanner.rb:2418 +#: src/modules/Scanner.rb:2412 msgid "Testing with 'scanimage -d %1 -v'..." msgstr "Testing with 'scanimage -d %1 -v'..." @@ -1747,7 +1747,7 @@ #. %2 will be replaced by the actual test results #. which are usually only available in English. #. Do not change or translate "scanimage -d %1 -v", it is a fixed command. -#: src/modules/Scanner.rb:2430 +#: src/modules/Scanner.rb:2424 msgid "" "Test with 'scanimage -d %1 -v' failed.\n" "The results are:\n" @@ -1761,7 +1761,7 @@ #. Fallback message if the real results are missing: #. Fallback message if the real results are missing: -#: src/modules/Scanner.rb:2441 src/modules/Scanner.rb:2473 +#: src/modules/Scanner.rb:2435 src/modules/Scanner.rb:2467 msgid "(no results available)" msgstr "(no results available)" @@ -1771,7 +1771,7 @@ #. the scanner had fallen into coma or the USB or SCSI system had crashed #. and then the scanner would be no longer an active scanner nor could it be autodetected. #. To simulate such an event, simply unplug an USB scanner while it is being tested. -#: src/modules/Scanner.rb:2456 +#: src/modules/Scanner.rb:2450 msgid "Successfully Tested %1" msgstr "Successfully Tested %1" @@ -1779,7 +1779,7 @@ #. %2 will be replaced by the actual test results #. which are usually only available in English. #. Do not change or translate "scanimage -d %1 -v", it is a fixed command. -#: src/modules/Scanner.rb:2462 +#: src/modules/Scanner.rb:2456 msgid "" "Test with 'scanimage -d %1 -v' succeeded.\n" "The results are:\n" @@ -1795,7 +1795,7 @@ #. (i.e. a system which is not totally broken or totally messed up). #. Do not confuse this error with the case when no scanning via network was configured. #. The latter results no error. -#: src/modules/Scanner.rb:2492 +#: src/modules/Scanner.rb:2486 msgid "Failed to determine the configuration for scanning via network." msgstr "Failed to determine the configuration for scanning via network." @@ -1803,7 +1803,7 @@ #. (i.e. a system which is not totally broken or totally messed up). #. Do not confuse this error with the case when no scanning via network is to be set up. #. The latter results no error. -#: src/modules/Scanner.rb:2568 +#: src/modules/Scanner.rb:2562 msgid "Failed to set up scanning via network." msgstr "Failed to set up scanning via network." @@ -1818,14 +1818,14 @@ #. If any kind of firewall seems to be active, show a popup message #. regarding scanning via network and firewall. #. @return true if any kind of firewall seems to be active -#: src/modules/Scanner.rb:2596 +#: src/modules/Scanner.rb:2590 #, fuzzy #| msgid "Failed to write firewall settings regarding scanning via network." msgid "Check that your firewall allows scanning via network." msgstr "Failed to write firewall settings regarding scanning via network." #. Popup::MessageDetails information regarding details: -#: src/modules/Scanner.rb:2598 +#: src/modules/Scanner.rb:2592 msgid "For details regarding firewall see the help text of this dialog." msgstr "" Modified: trunk/yast/en_GB/po/security.en_GB.po =================================================================== --- trunk/yast/en_GB/po/security.en_GB.po 2015-09-09 08:18:21 UTC (rev 92602) +++ trunk/yast/en_GB/po/security.en_GB.po 2015-09-09 08:19:44 UTC (rev 92603) @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: security\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-10-29 16:21+0100\n" +"POT-Creation-Date: 2015-08-25 18:37+0200\n" "PO-Revision-Date: 2008-03-27 22:54+0000\n" "Last-Translator: Benjamin Weber \n" "Language-Team: \n" @@ -19,7 +19,7 @@ "X-Generator: KBabel 1.11.4\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#. translators: command line help text for Securoty module +#. translators: command line help text for Security module #: src/clients/security.rb:59 msgid "Security configuration module" msgstr "Security configuration module" @@ -39,15 +39,17 @@ msgid "Set the value of the specific option" msgstr "Set the value of the specific option" -#. command line help text for 'level home' option +#. command line help text for 'level workstation' option #: src/clients/security.rb:94 -msgid "Home Workstation security level (without network)" -msgstr "Home Workstation security level (without network)" +#, fuzzy +#| msgid "Networked Workstation security level" +msgid "Workstation security level" +msgstr "Networked Workstation security level" -#. command line help text for 'level network' option +#. command line help text for 'level roaming' option #: src/clients/security.rb:100 -msgid "Networked Workstation security level" -msgstr "Networked Workstation security level" +msgid "Roaming Device (e.g. laptop or tablet) security level" +msgstr "" #. command line help text for 'level server' option #: src/clients/security.rb:106 @@ -119,233 +121,223 @@ #. Authors: Michal Svec #. #. $Id$ -#: src/include/security/dialogs.rb:63 +#: src/include/security/dialogs.rb:62 msgid "Unknown" msgstr "Unknown" -#: src/include/security/dialogs.rb:66 +#: src/include/security/dialogs.rb:65 #, fuzzy msgid "Use magic SysRq keys" msgstr "Enable &Magic SysRq Keys" -#: src/include/security/dialogs.rb:67 +#: src/include/security/dialogs.rb:66 #, fuzzy msgid "Use secure file permissions" msgstr "Use inherited permissions" -#: src/include/security/dialogs.rb:70 +#: src/include/security/dialogs.rb:69 #, fuzzy msgid "Remote access to the display manager" msgstr "Remote Access to Display Manager" -#: src/include/security/dialogs.rb:73 +#: src/include/security/dialogs.rb:72 msgid "Write back system time to the hardware clock" msgstr "" -#: src/include/security/dialogs.rb:76 +#: src/include/security/dialogs.rb:75 msgid "Always generate syslog message for cron scripts" msgstr "" -#: src/include/security/dialogs.rb:79 +#: src/include/security/dialogs.rb:78 #, fuzzy msgid "Run the DHCP daemon in a chroot" msgstr "Run NTP Daemon in Chroot &Jail" -#: src/include/security/dialogs.rb:82 +#: src/include/security/dialogs.rb:81 msgid "Run the DHCP daemon as dhcp user" msgstr "" -#: src/include/security/dialogs.rb:85 +#: src/include/security/dialogs.rb:84 #, fuzzy msgid "Remote root login in the display manager" msgstr "Remote Access to Display Manager" -#: src/include/security/dialogs.rb:88 +#: src/include/security/dialogs.rb:87 #, fuzzy msgid "Remote access to the X server" msgstr "Disable the DHCP server" -#: src/include/security/dialogs.rb:91 +#: src/include/security/dialogs.rb:90 #, fuzzy msgid "Remote access to the email delivery subsystem" msgstr "Remote Access to Display Manager" -#: src/include/security/dialogs.rb:94 +#: src/include/security/dialogs.rb:93 #, fuzzy #| msgid "Restart services" msgid "Restart services on update" msgstr "Restart services" -#: src/include/security/dialogs.rb:97 +#: src/include/security/dialogs.rb:96 #, fuzzy msgid "Stop services on removal" msgstr "Disable service" -#: src/include/security/dialogs.rb:100 +#: src/include/security/dialogs.rb:99 #, fuzzy msgid "Enable TCP syncookies" msgstr "Enable Password Policies" -#: src/include/security/dialogs.rb:103 +#: src/include/security/dialogs.rb:102 #, fuzzy msgid "IPv4 forwarding" msgstr "Enable &IP Forwarding" -#: src/include/security/dialogs.rb:104 +#: src/include/security/dialogs.rb:103 #, fuzzy msgid "IPv6 forwarding" msgstr "Enable &IP Forwarding" -#: src/include/security/dialogs.rb:105 +#: src/include/security/dialogs.rb:104 #, fuzzy -msgid "" -"Enable basic system services in runlevel 3\n" -" (multiuser with network)" -msgstr "Initialising system services (runlevel). Please wait..." +#| msgid "Enable the service" +msgid "Enable basic system services" +msgstr "Enable the service" -#: src/include/security/dialogs.rb:108 +#: src/include/security/dialogs.rb:107 #, fuzzy -msgid "" -"Enable basic system services in runlevel 5\n" -" (multiuser with network and graphical login)" -msgstr "Initialising system services (runlevel). Please wait..." +#| msgid "Disable the service" +msgid "Disable extra services" +msgstr "Disable the service" -#: src/include/security/dialogs.rb:111 -#, fuzzy -msgid "Enable extra services in runlevel 3" -msgstr "" -"Unable to enable service %1 in runlevels %2:\n" -"%3" - -#: src/include/security/dialogs.rb:114 -#, fuzzy -msgid "Enable extra services in runlevel 5" -msgstr "" -"Unable to enable service %1 in runlevels %2:\n" -"%3" - #. handle the special cases at first -#: src/include/security/dialogs.rb:156 +#: src/include/security/dialogs.rb:150 msgid "Configure" msgstr "Configure" -#: src/include/security/dialogs.rb:158 +#: src/include/security/dialogs.rb:152 msgid "Enabled" msgstr "Enabled" -#: src/include/security/dialogs.rb:160 +#: src/include/security/dialogs.rb:154 msgid "Disabled" msgstr "Disabled" #. table header #. table header -#: src/include/security/dialogs.rb:186 src/include/security/dialogs.rb:470 +#: src/include/security/dialogs.rb:180 src/include/security/dialogs.rb:409 #, fuzzy msgid "Security Setting" msgstr "Security Settings" -#: src/include/security/dialogs.rb:187 src/include/security/dialogs.rb:471 +#: src/include/security/dialogs.rb:181 src/include/security/dialogs.rb:410 msgid "Status" msgstr "Status" -#: src/include/security/dialogs.rb:188 src/include/security/dialogs.rb:472 +#: src/include/security/dialogs.rb:182 src/include/security/dialogs.rb:411 #, fuzzy msgid "Security Status" msgstr "Security Settings" #. add one line for each security setting -#: src/include/security/dialogs.rb:348 +#: src/include/security/dialogs.rb:318 msgid "Help" msgstr "Help" #. this is a separator between service names #. e.g.: "postfix" + " or " + "sendmail" -#: src/include/security/dialogs.rb:395 +#: src/include/security/dialogs.rb:361 msgid " or " msgstr "" #. richtext message: %1 = runlevel ("3" or "5"), %2 = list of services -#: src/include/security/dialogs.rb:404 +#: src/include/security/dialogs.rb:368 #, fuzzy -msgid "<P>These basic system services are not enabled in runlevel %1:<BR><B>%2</B></P>" +msgid "<P>These basic system services are not enabled:<BR><B>%s</B></P>" msgstr "" "These required services are missing:\n" "%1." -#: src/include/security/dialogs.rb:412 +#: src/include/security/dialogs.rb:370 msgid "<P>All basic services are enabled.</P>" msgstr "" -#. TODO: runlevel is not longer needed (read above) -#: src/include/security/dialogs.rb:425 +#: src/include/security/dialogs.rb:378 #, fuzzy -msgid "<P>These extra services are enabled in runlevel %1:<BR><B>%2</B></P>" +msgid "<P>These extra services are enabled:<BR><B>%s</B></P>" msgstr "" "These required services are missing:\n" "%1." -#: src/include/security/dialogs.rb:434 +#: src/include/security/dialogs.rb:379 msgid "<P>Check the list of services and disable all unused services.</P>" msgstr "" -#: src/include/security/dialogs.rb:441 +#: src/include/security/dialogs.rb:381 msgid "<P>Only basic system services are enabled.</P>" msgstr "" -#: src/include/security/dialogs.rb:448 +#: src/include/security/dialogs.rb:387 msgid "Description" msgstr "Description" #. Overview dialog caption #. params: input tree, parent, label, id -#: src/include/security/dialogs.rb:460 src/include/security/wizards.rb:49 +#: src/include/security/dialogs.rb:399 src/include/security/wizards.rb:49 #, fuzzy msgid "Security Overview" msgstr "Special Keys Overview" #. push button label -#: src/include/security/dialogs.rb:485 +#: src/include/security/dialogs.rb:424 #, fuzzy msgid "Change &Status" msgstr "Change this?" #. push button label -#: src/include/security/dialogs.rb:488 +#: src/include/security/dialogs.rb:427 msgid "&Description" msgstr "&Description" +#. update the current value +#: src/include/security/dialogs.rb:521 +#, fuzzy +#| msgid "Analyzing the system..." +msgid "Analyzing system" +msgstr "Analysing the system..." + #. Boot dialog caption -#: src/include/security/dialogs.rb:634 src/include/security/wizards.rb:57 +#: src/include/security/dialogs.rb:575 src/include/security/wizards.rb:57 msgid "Boot Settings" msgstr "Boot Settings" #. Frame label -#: src/include/security/dialogs.rb:646 +#: src/include/security/dialogs.rb:587 msgid "Boot Permissions" msgstr "Boot Permissions" #. Misc dialog caption -#: src/include/security/dialogs.rb:723 src/include/security/wizards.rb:60 +#: src/include/security/dialogs.rb:664 src/include/security/wizards.rb:60 msgid "Miscellaneous Settings" msgstr "Miscellaneous Settings" #. Password dialog caption -#: src/include/security/dialogs.rb:803 src/include/security/wizards.rb:56 +#: src/include/security/dialogs.rb:744 src/include/security/wizards.rb:56 msgid "Password Settings" msgstr "Password Settings" #. Frame label -#: src/include/security/dialogs.rb:812 +#: src/include/security/dialogs.rb:753 msgid "Checks" msgstr "Checks" #. Frame label -#: src/include/security/dialogs.rb:827 +#: src/include/security/dialogs.rb:768 msgid "Password Age" msgstr "Password Age" #. Popup text -#: src/include/security/dialogs.rb:905 +#: src/include/security/dialogs.rb:846 msgid "" "The minimum number of days cannot be larger\n" "than the maximum." @@ -354,7 +346,7 @@ "than the maximum." #. Popup text, %1 is number -#: src/include/security/dialogs.rb:922 +#: src/include/security/dialogs.rb:863 msgid "" "The minimum password length cannot be larger than the maximum.\n" "The maximum password length for the selected encryption method is %1." @@ -363,12 +355,12 @@ "The maximum password length for the selected encryption method is %1." #. Login dialog caption -#: src/include/security/dialogs.rb:954 src/include/security/wizards.rb:58 +#: src/include/security/dialogs.rb:895 src/include/security/wizards.rb:58 msgid "Login Settings" msgstr "Login Settings" #. Frame label -#: src/include/security/dialogs.rb:963 +#: src/include/security/dialogs.rb:904 msgid "Login" msgstr "Login" @@ -472,21 +464,23 @@ #. Main dialog help 5/8 #: src/include/security/helps.rb:86 +#, fuzzy +#| msgid "" +#| "<p><b>Networked Workstation</b>: For a computer connected\n" +#| "to any type of network including the Internet.</p>" msgid "" -"<p><b>Home Workstation</b>: For a home computer not connected to\n" -"any type of a network.</p>" +"<p><b>Workstation</b>: For a computer connected\n" +"to any type of network including the Internet.</p>" msgstr "" -"<p><b>Home Workstation</b>: For a home computer not connected to\n" -"any type of a network.</p>" +"<p><b>Networked Workstation</b>: For a computer connected\n" +"to any type of network including the Internet.</p>" #. Main dialog help 6/8 #: src/include/security/helps.rb:90 msgid "" -"<p><b>Networked Workstation</b>: For a computer connected\n" -"to any type of network including the Internet.</p>" +"<p><b>Roaming Device</b>: For a laptop, tablet or similar device\n" +"that connects to different networks.</p>" msgstr "" -"<p><b>Networked Workstation</b>: For a computer connected\n" -"to any type of network including the Internet.</p>" #. Main dialog help 7/8 #: src/include/security/helps.rb:94 @@ -937,41 +931,49 @@ msgid "<P>There are predefined file permissions in /etc/permissions.* files. The most restrictive file permissions are defined 'secure' or 'paranoid' file.</P>" msgstr "" -#: src/include/security/helps.rb:349 src/include/security/helps.rb:352 +#: src/include/security/helps.rb:349 msgid "<P>Basic system services must be enabled to provide system consistency and to run the security-related services.</P>" msgstr "" -#: src/include/security/helps.rb:355 src/include/security/helps.rb:358 +#: src/include/security/helps.rb:352 msgid "<P>Every running service is a potential target of a security attack. Therefore it is recommended to turn off all services which are not used by the system.</P>" msgstr "" #. level name -#: src/include/security/levels.rb:51 -msgid "Home Workstation" +#: src/include/security/levels.rb:54 +#, fuzzy +#| msgid "Home Workstation" +msgid "Workstation" msgstr "Home Workstation" #. level name -#: src/include/security/levels.rb:53 -msgid "Networked Workstation" -msgstr "Networked Workstation" +#: src/include/security/levels.rb:56 +#, fuzzy +#| msgid "Raid Device" +msgid "Roaming Device" +msgstr "Raid Device" #. level name -#: src/include/security/levels.rb:55 +#: src/include/security/levels.rb:58 msgid "Network Server" msgstr "Network Server" #. RadioButton label -#: src/include/security/levels.rb:60 -msgid "&Home Workstation" +#: src/include/security/levels.rb:63 +#, fuzzy +#| msgid "&Home Workstation" +msgid "&Workstation" msgstr "&Home Workstation" #. RadioButton label -#: src/include/security/levels.rb:62 -msgid "N&etworked Workstation" -msgstr "N&etworked Workstation" +#: src/include/security/levels.rb:65 +#, fuzzy +#| msgid "Raid Device" +msgid "&Roaming Device" +msgstr "Raid Device" #. RadioButton label -#: src/include/security/levels.rb:64 +#: src/include/security/levels.rb:67 msgid "Network &Server" msgstr "Network &Server" @@ -1055,13 +1057,13 @@ #. IntField label #. IntField label -#: src/include/security/widgets.rb:142 src/include/security/widgets.rb:209 +#: src/include/security/widgets.rb:142 src/include/security/widgets.rb:205 msgid "Maxim&um" msgstr "Maxim&um" #. IntField label #. IntField label -#: src/include/security/widgets.rb:148 src/include/security/widgets.rb:222 +#: src/include/security/widgets.rb:148 src/include/security/widgets.rb:218 msgid "M&inimum" msgstr "M&inimum" @@ -1087,94 +1089,87 @@ msgid "Nobody" msgstr "Nobody" -#. ComboBox value -#. ["local",_("Local Users")], -#. ComboBox value -#: src/include/security/widgets.rb:167 -msgid "Automatic" -msgstr "Automatic" - #. ComboBox label -#: src/include/security/widgets.rb:174 +#: src/include/security/widgets.rb:170 #, fuzzy #| msgid "System Information" msgid "System Hybernation" msgstr "System Information" #. ComboBox value -#: src/include/security/widgets.rb:177 +#: src/include/security/widgets.rb:173 msgid "User on the active console" msgstr "" #. ComboBox value -#: src/include/security/widgets.rb:179 +#: src/include/security/widgets.rb:175 msgid "Anyone can hibernate" msgstr "" #. ComboBox value -#: src/include/security/widgets.rb:181 +#: src/include/security/widgets.rb:177 #, fuzzy #| msgid "Authentication Realms" msgid "Authentication always required" msgstr "Authentication Realms" #. ComboBox label -#: src/include/security/widgets.rb:188 +#: src/include/security/widgets.rb:184 msgid "P&assword Encryption Method" msgstr "P&assword Encryption Method" #. CheckBox label -#: src/include/security/widgets.rb:202 +#: src/include/security/widgets.rb:198 msgid "&Check New Passwords" msgstr "&Check New Passwords" #. IntField label -#: src/include/security/widgets.rb:215 +#: src/include/security/widgets.rb:211 msgid "Numb&er of Passwords to Remember" msgstr "Numb&er of Passwords to Remember" #. IntField label -#: src/include/security/widgets.rb:228 +#: src/include/security/widgets.rb:224 msgid "&Minimum Acceptable Password Length" msgstr "&Minimum Acceptable Password Length" #. IntField label -#: src/include/security/widgets.rb:236 +#: src/include/security/widgets.rb:232 msgid "&Days before Password Expires Warning" msgstr "&Days before Password Expires Warning" #. ComboBox label -#: src/include/security/widgets.rb:244 +#: src/include/security/widgets.rb:240 msgid "&File Permissions" msgstr "&File Permissions" #. ComboBox value -#: src/include/security/widgets.rb:247 +#: src/include/security/widgets.rb:243 msgid "Easy" msgstr "Easy" #. ComboBox value -#: src/include/security/widgets.rb:249 +#: src/include/security/widgets.rb:245 msgid "Secure" msgstr "Secure" #. ComboBox value -#: src/include/security/widgets.rb:251 +#: src/include/security/widgets.rb:247 msgid "Paranoid" msgstr "Paranoid" #. ComboBox label -#: src/include/security/widgets.rb:258 +#: src/include/security/widgets.rb:254 msgid "&User Launching updatedb" msgstr "&User Launching updatedb" #. IntField label -#: src/include/security/widgets.rb:265 +#: src/include/security/widgets.rb:261 msgid "Ma&ximum" msgstr "Ma&ximum" #. IntField label -#: src/include/security/widgets.rb:271 +#: src/include/security/widgets.rb:267 msgid "&Minimum" msgstr "&Minimum" @@ -1194,69 +1189,112 @@ msgstr "Initialising..." #. Security read dialog caption -#: src/modules/Security.rb:608 +#: src/modules/Security.rb:654 msgid "Saving Security Configuration" msgstr "Saving Security Configuration" #. Progress stage 1/4 -#: src/modules/Security.rb:617 +#: src/modules/Security.rb:663 msgid "Write security settings" msgstr "Write security settings" #. Progress stage 2/4 -#: src/modules/Security.rb:619 +#: src/modules/Security.rb:665 msgid "Write inittab settings" msgstr "Write inittab settings" #. Progress stage 3/4 -#: src/modules/Security.rb:621 +#: src/modules/Security.rb:667 msgid "Write PAM settings" msgstr "Write PAM settings" #. Progress stage 4/4 -#: src/modules/Security.rb:623 +#: src/modules/Security.rb:669 #, fuzzy #| msgid "Save system settings" msgid "Update system settings" msgstr "Save system settings" #. Progress step 1/5 -#: src/modules/Security.rb:627 +#: src/modules/Security.rb:673 msgid "Writing security settings..." msgstr "Writing security settings..." #. Progress step 2/5 -#: src/modules/Security.rb:629 +#: src/modules/Security.rb:675 msgid "Writing inittab settings..." msgstr "Writing inittab settings..." #. Progress step 3/5 -#: src/modules/Security.rb:631 +#: src/modules/Security.rb:677 msgid "Writing PAM settings..." msgstr "Writing PAM settings..." #. Progress step 4/5 -#: src/modules/Security.rb:633 +#: src/modules/Security.rb:679 #, fuzzy #| msgid "Saving system settings..." msgid "Updating system settings..." msgstr "Saving system settings..." #. Progress step 5/5 -#: src/modules/Security.rb:635 +#: src/modules/Security.rb:681 msgid "Finished" msgstr "Finished" #. Summary text -#: src/modules/Security.rb:869 +#: src/modules/Security.rb:791 msgid "Current Security Level: Custom settings" msgstr "Current Security Level: Custom settings" #. Summary text -#: src/modules/Security.rb:873 +#: src/modules/Security.rb:795 msgid "Current Security Level: %1" msgstr "Current Security Level: %1" +#~ msgid "Home Workstation security level (without network)" +#~ msgstr "Home Workstation security level (without network)" + +#, fuzzy +#~ msgid "" +#~ "Enable basic system services in runlevel 3\n" +#~ " (multiuser with network)" +#~ msgstr "Initialising system services (runlevel). Please wait..." + +#, fuzzy +#~ msgid "" +#~ "Enable basic system services in runlevel 5\n" +#~ " (multiuser with network and graphical login)" +#~ msgstr "Initialising system services (runlevel). Please wait..." + +#, fuzzy +#~ msgid "Enable extra services in runlevel 3" +#~ msgstr "" +#~ "Unable to enable service %1 in runlevels %2:\n" +#~ "%3" + +#, fuzzy +#~ msgid "Enable extra services in runlevel 5" +#~ msgstr "" +#~ "Unable to enable service %1 in runlevels %2:\n" +#~ "%3" + +#~ msgid "" +#~ "<p><b>Home Workstation</b>: For a home computer not connected to\n" +#~ "any type of a network.</p>" +#~ msgstr "" +#~ "<p><b>Home Workstation</b>: For a home computer not connected to\n" +#~ "any type of a network.</p>" + +#~ msgid "Networked Workstation" +#~ msgstr "Networked Workstation" + +#~ msgid "N&etworked Workstation" +#~ msgstr "N&etworked Workstation" + +#~ msgid "Automatic" +#~ msgstr "Automatic" + #~ msgid "&Current Directory in root's Path" #~ msgstr "&Current Directory in root's Path" Modified: trunk/yast/en_GB/po/services-manager.en_GB.po =================================================================== --- trunk/yast/en_GB/po/services-manager.en_GB.po 2015-09-09 08:18:21 UTC (rev 92602) +++ trunk/yast/en_GB/po/services-manager.en_GB.po 2015-09-09 08:19:44 UTC (rev 92603) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: opensuse-i 18n\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-10-29 16:21+0100\n" +"POT-Creation-Date: 2015-08-25 18:37+0200\n" "PO-Revision-Date: 2014-05-19 09:35+0200\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" @@ -17,7 +17,226 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" +#: src/clients/default_target_finish.rb:30 +#, fuzzy +#| msgid "Reading the default system settings..." +msgid "Saving default systemd target..." +msgstr "Reading the default system settings..." + +#: src/clients/default_target_proposal.rb:26 +msgid "VNC needs graphical system to be available" +msgstr "" + #. TODO implement behaviour if force_reset parameter provided +#: src/clients/default_target_proposal.rb:51 +#, fuzzy +#| msgid "Default initrd Path" +msgid "&Default systemd target" +msgstr "Default initrd Path" + +#: src/clients/default_target_proposal.rb:52 +#, fuzzy +#| msgid "Default initrd Path" +msgid "Default systemd target" +msgstr "Default initrd Path" + +#. create the proposal dialog and get the sequence symbol from block +#: src/clients/default_target_proposal.rb:116 +#, fuzzy +#| msgid "Read the default system settings" +msgid "Set Default Systemd Target" +msgstr "Read the default system settings" + +#: src/clients/default_target_proposal.rb:134 +#, fuzzy +#| msgid "Reading the default system settings..." +msgid "Selecting the Default Systemd Target" +msgstr "Reading the default system settings..." + +#: src/clients/default_target_proposal.rb:136 +msgid "Systemd is a system and service manager for Linux. It consists of units whose job is to activate services and other units." +msgstr "" + +#: src/clients/default_target_proposal.rb:139 +msgid "Default target unit is activated on boot by default. Usually it is a symlink located in path/etc/systemd/system/default.target . See more on systemd man page." +msgstr "" + +#: src/clients/default_target_proposal.rb:143 +msgid "Multi-User target is for setting up a non-graphical multi-user system with network suitable for server (similar to runlevel 3)." +msgstr "" + +#: src/clients/default_target_proposal.rb:146 +msgid "Graphical target for setting up a graphical login screen with network which is typical for workstations (similar to runlevel 5)." +msgstr "" + +#: src/clients/default_target_proposal.rb:149 +msgid "When you are not sure what would be the best option for you then go with graphical target." +msgstr "" + +#: src/clients/default_target_proposal.rb:160 +#, fuzzy +#| msgid "Available Shares" +msgid "Available Targets" +msgstr "Available Shares" + +#. Check if the user forced a particular target before; if he did and the +#. autodetection recommends a different one now, warn the user about this +#. and keep the default target unchanged. +#: src/clients/default_target_proposal.rb:220 +msgid "The installer is recommending you the default target '%s' " +msgstr "" + +#: src/clients/default_target_proposal.rb:232 +#, fuzzy +#| msgid "No patches have been selected for installation.\n" +msgid "X11 packages have been selected for installation" +msgstr "No patches have been selected for installation.\n" + +#: src/clients/default_target_proposal.rb:235 +msgid "Live Installation is typically used for full GUI in target system" +msgstr "" + +#: src/clients/default_target_proposal.rb:238 +msgid "Serial connection does typically not support GUI" +msgstr "" + +#: src/clients/default_target_proposal.rb:242 +msgid "Text mode installation assumes no GUI on the target system" +msgstr "" + +#: src/clients/default_target_proposal.rb:245 +#: src/clients/default_target_proposal.rb:249 +msgid "Using VNC assumes a GUI on the target system" +msgstr "" + +#: src/clients/default_target_proposal.rb:252 +msgid "SSH installation mode assumes no GUI on the target system" +msgstr "" + +#: src/clients/default_target_proposal.rb:255 +#, fuzzy +#| msgid "No patches have been selected for installation.\n" +msgid "X11 packages have not been selected for installation" +msgstr "No patches have been selected for installation.\n" + +#: src/clients/default_target_proposal.rb:258 +msgid "This recommendation is based on the analysis of other installation settings" +msgstr "" + +#. translators: command line help text for services-manager module +#. translators: command line help text for services-manager module +#: src/clients/services-manager.rb:29 src/clients/services.rb:29 +msgid "" +"Systemd target and services configuration module.\n" +"Use systemctl for commandline services configuration." +msgstr "" + +#. Default for double-click in the table +#. Default for double-click in the table +#: src/clients/services-manager.rb:89 src/clients/services.rb:89 +msgid "Writing configuration..." +msgstr "Writing configuration..." + +#: src/clients/services-manager.rb:94 src/clients/services.rb:94 +#, fuzzy +#| msgid "Writing the system configuration" +msgid "Writing the configuration failed:\n" +msgstr "Writing the system configuration" + +#. Additional space for UI features +#. Additional space for UI features +#: src/clients/services-manager.rb:131 src/clients/services.rb:131 +#, fuzzy +#| msgid "Default &Lease Time" +msgid "Default System &Target" +msgstr "Default &Lease Time" + +#: src/clients/services-manager.rb:142 src/clients/services.rb:142 +msgid "Service" +msgstr "Service" + +#: src/clients/services-manager.rb:143 src/clients/services-manager.rb:172 +#: src/clients/services-manager.rb:188 src/clients/services.rb:143 +#: src/clients/services.rb:172 src/clients/services.rb:188 +#: src/data/services-manager/autoyast_summary.erb:16 +msgid "Enabled" +msgstr "Enabled" + +#. The current state matches the futural state +#. The current state matches the futural state +#: src/clients/services-manager.rb:144 src/clients/services-manager.rb:173 +#: src/clients/services-manager.rb:198 src/clients/services.rb:144 +#: src/clients/services.rb:173 src/clients/services.rb:198 +msgid "Active" +msgstr "Active" + +#: src/clients/services-manager.rb:145 src/clients/services.rb:145 +msgid "Description" +msgstr "Description" + +#: src/clients/services-manager.rb:150 src/clients/services.rb:150 +#, fuzzy +#| msgid "&Start" +msgid "&Start/Stop" +msgstr "&Start" + +#: src/clients/services-manager.rb:152 src/clients/services.rb:152 +#, fuzzy +#| msgid "Enable/Disable Kdump" +msgid "&Enable/Disable" +msgstr "Enable/Disable Kdump" + +#: src/clients/services-manager.rb:154 src/clients/services.rb:154 +msgid "Show &Details" +msgstr "Show &Details" + +#: src/clients/services-manager.rb:157 src/clients/services.rb:157 +#: src/data/services-manager/autoyast_summary.erb:5 +#, fuzzy +#| msgid "Security Manager" +msgid "Services Manager" +msgstr "Security Manager" + +#. Redraws the services dialog +#. Redraws the services dialog +#: src/clients/services-manager.rb:168 src/clients/services.rb:168 +#, fuzzy +#| msgid "Reading Samba service settings..." +msgid "Reading services status..." +msgstr "Reading Samba service settings..." + +#: src/clients/services-manager.rb:172 src/clients/services-manager.rb:188 +#: src/clients/services.rb:172 src/clients/services.rb:188 +#: src/data/services-manager/autoyast_summary.erb:23 +msgid "Disabled" +msgstr "Disabled" + +#: src/clients/services-manager.rb:173 src/clients/services-manager.rb:198 +#: src/clients/services.rb:173 src/clients/services.rb:198 +#, fuzzy +#| msgid "active" +msgid "Inactive" +msgstr "active" + +#. The current state differs the the futural state +#. The current state differs the the futural state +#: src/clients/services-manager.rb:205 src/clients/services.rb:205 +msgid "Active (will start)" +msgstr "" + +#: src/clients/services-manager.rb:205 src/clients/services.rb:205 +msgid "Inactive (will stop)" +msgstr "" + +#. Opens up a popup with details about the currently selected service +#. Opens up a popup with details about the currently selected service +#: src/clients/services-manager.rb:226 src/clients/services.rb:226 +#, fuzzy +#| msgid "Service %service will be %toggled %link" +msgid "Service %{service} Full Info" +msgstr "Service %service will be %toggled %link" + +#. TODO implement behaviour if force_reset parameter provided #: src/clients/services_proposal.rb:52 msgid "&Services" msgstr "&Services" @@ -73,166 +292,84 @@ msgid "Cannot enable service %1" msgstr "Cannot enable service %1" -#: src/data/services-manager/autoyast_summary.erb:5 -#, fuzzy -#| msgid "Security Manager" -msgid "Services Manager" -msgstr "Security Manager" - #: src/data/services-manager/autoyast_summary.erb:6 #, fuzzy #| msgid "Default Hat" msgid "Default Target" msgstr "Default Hat" -#: src/data/services-manager/autoyast_summary.erb:16 -msgid "Enabled" -msgstr "Enabled" - -#: src/data/services-manager/autoyast_summary.erb:23 -msgid "Disabled" -msgstr "Disabled" - #. Name of the systemd default target unit. Suffix '.target' is optional. #. @return [String] if the target has been specified in the profile. Can be nil. -#: src/lib/services-manager/services_manager_profile.rb:104 +#: src/lib/services-manager/services_manager_profile.rb:103 msgid "Unknown autoyast services profile schema for 'services-manager'" msgstr "" -#, fuzzy -#~| msgid "Reading the default system settings..." -#~ msgid "Saving default systemd target..." -#~ msgstr "Reading the default system settings..." +#. AutoYast summary +#: src/modules/services_manager.rb:29 +msgid "Not configured yet." +msgstr "Not configured yet." +#. Do not start or stop services that are already in the desired state. +#. They might be coming from AutoYast import and thus marked as :modified. +#: src/modules/services_manager_service.rb:407 #, fuzzy -#~| msgid "Default initrd Path" -#~ msgid "&Default systemd target" -#~ msgstr "Default initrd Path" +#| msgid "%1: Could not change state of the device" +msgid "Could not %{change} %{service} which is currently %{status}. " +msgstr "%1: Could not change state of the device" +#: src/modules/services_manager_service.rb:426 #, fuzzy -#~| msgid "Default initrd Path" -#~ msgid "Default systemd target" -#~ msgstr "Default initrd Path" +#| msgid "%1: Could not change state of the device" +msgid "Could not %{change} %{service}. " +msgstr "%1: Could not change state of the device" +#. Default systemd target (previously: runlevel 5) option #1 +#: src/modules/services_manager_target.rb:20 #, fuzzy -#~| msgid "Read the default system settings" -#~ msgid "Set Default Systemd Target" -#~ msgstr "Read the default system settings" +#| msgid "Dial mode" +msgid "Graphical mode" +msgstr "Dial mode" +#. Default systemd target (previously: runlevel 3) option #2 +#: src/modules/services_manager_target.rb:22 #, fuzzy -#~| msgid "Reading the default system settings..." -#~ msgid "Selecting the Default Systemd Target" -#~ msgstr "Reading the default system settings..." +#| msgid "Text Mode" +msgid "Text mode" +msgstr "Text Mode" +#. Systemd targets, bnc#892366 +#: src/modules/services_manager_target.rb:25 #, fuzzy -#~| msgid "Available Shares" -#~ msgid "Available Targets" -#~ msgstr "Available Shares" +#| msgid "Select Mode" +msgid "Emergency Mode" +msgstr "Select Mode" +#: src/modules/services_manager_target.rb:26 #, fuzzy -#~| msgid "No patches have been selected for installation.\n" -#~ msgid "X11 packages have been selected for installation" -#~ msgstr "No patches have been selected for installation.\n" +#| msgid "&Graphical interface" +msgid "Graphical Interface" +msgstr "&Graphical interface" +#: src/modules/services_manager_target.rb:27 #, fuzzy -#~| msgid "No patches have been selected for installation.\n" -#~ msgid "X11 packages have not been selected for installation" -#~ msgstr "No patches have been selected for installation.\n" +#| msgid "Default Bridge" +msgid "Initrd Default Target" +msgstr "Default Bridge" -#~ msgid "Writing configuration..." -#~ msgstr "Writing configuration..." - +#: src/modules/services_manager_target.rb:28 #, fuzzy -#~| msgid "Writing the system configuration" -#~ msgid "Writing the configuration failed:\n" -#~ msgstr "Writing the system configuration" +#| msgid "Switch Mode" +msgid "Switch Root" +msgstr "Switch Mode" +#: src/modules/services_manager_target.rb:29 #, fuzzy -#~| msgid "Default &Lease Time" -#~ msgid "Default System &Target" -#~ msgstr "Default &Lease Time" +#| msgid "Other System" +msgid "Multi-User System" +msgstr "Other System" -#~ msgid "Service" -#~ msgstr "Service" - -#~ msgid "Active" -#~ msgstr "Active" - -#~ msgid "Description" -#~ msgstr "Description" - +#: src/modules/services_manager_target.rb:30 #, fuzzy -#~| msgid "&Start" -#~ msgid "&Start/Stop" -#~ msgstr "&Start" - -#, fuzzy -#~| msgid "Enable/Disable Kdump" -#~ msgid "&Enable/Disable" -#~ msgstr "Enable/Disable Kdump" - -#~ msgid "Show &Details" -#~ msgstr "Show &Details" - -#, fuzzy -#~| msgid "Reading Samba service settings..." -#~ msgid "Reading services status..." -#~ msgstr "Reading Samba service settings..." - -#, fuzzy -#~| msgid "active" -#~ msgid "Inactive" -#~ msgstr "active" - -#, fuzzy -#~| msgid "Service %service will be %toggled %link" -#~ msgid "Service %{service} Full Info" -#~ msgstr "Service %service will be %toggled %link" - -#~ msgid "Not configured yet." -#~ msgstr "Not configured yet." - -#, fuzzy -#~| msgid "%1: Could not change state of the device" -#~ msgid "Could not %{change} %{service}. " -#~ msgstr "%1: Could not change state of the device" - -#, fuzzy -#~| msgid "Dial mode" -#~ msgid "Graphical mode" -#~ msgstr "Dial mode" - -#, fuzzy -#~| msgid "Text Mode" -#~ msgid "Text mode" -#~ msgstr "Text Mode" - -#, fuzzy -#~| msgid "&Graphical interface" -#~ msgid "Graphical Interface" -#~ msgstr "&Graphical interface" - -#, fuzzy -#~| msgid "Select Mode" -#~ msgid "Emergency Mode" -#~ msgstr "Select Mode" - -#, fuzzy -#~| msgid "Switch Mode" -#~ msgid "Switch Root" -#~ msgstr "Switch Mode" - -#, fuzzy -#~| msgid "Default Bridge" -#~ msgid "Initrd Default Target" -#~ msgstr "Default Bridge" - -#, fuzzy -#~| msgid "Other System" -#~ msgid "Multi-User System" -#~ msgstr "Other System" - -#, fuzzy -#~| msgid "Required DMA Mode" -#~ msgid "Rescue Mode" -#~ msgstr "Required DMA Mode" +#| msgid "Required DMA Mode" +msgid "Rescue Mode" +msgstr "Required DMA Mode" Modified: trunk/yast/en_GB/po/slp-server.en_GB.po =================================================================== --- trunk/yast/en_GB/po/slp-server.en_GB.po 2015-09-09 08:18:21 UTC (rev 92602) +++ trunk/yast/en_GB/po/slp-server.en_GB.po 2015-09-09 08:19:44 UTC (rev 92603) @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-04 15:53+0200\n" +"POT-Creation-Date: 2015-08-25 18:37+0200\n" "PO-Revision-Date: 2007-08-16 20:24+0100\n" "Last-Translator: Benjamin Weber\n" "Language-Team: British English\n" Modified: trunk/yast/en_GB/po/snapper.en_GB.po =================================================================== --- trunk/yast/en_GB/po/snapper.en_GB.po 2015-09-09 08:18:21 UTC (rev 92602) +++ trunk/yast/en_GB/po/snapper.en_GB.po 2015-09-09 08:19:44 UTC (rev 92603) @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-04 15:53+0200\n" +"POT-Creation-Date: 2015-08-25 18:37+0200\n" "PO-Revision-Date: 2001-07-17 16:27+0200\n" "Last-Translator: James Ogley \n" "Language-Team: English \n" @@ -18,8 +18,32 @@ "Content-Transfer-Encoding: 8-bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -#. The main () -#: src/clients/snapper.rb:53 +#. encoding: utf-8 +#. ------------------------------------------------------------------------------ +#. Copyright (c) 2006-2012 Novell, Inc. All Rights Reserved. +#. +#. +#. This program is free software; you can redistribute it and/or modify it under +#. the terms of version 2 of the GNU General Public License as published by the +#. Free Software Foundation. +#. +#. This program is distributed in the hope that it will be useful, but WITHOUT +#. ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS +#. FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. +#. +#. You should have received a copy of the GNU General Public License along with +#. this program; if not, contact Novell, Inc. +#. +#. To contact Novell about this file by physical or electronic mail, you may find +#. current contact information at www.novell.com. +#. ------------------------------------------------------------------------------ +#. File: clients/snapper.ycp +#. Package: Configuration of snapper +#. Summary: Main file +#. Authors: Jiri Suchomel +#. +#. Main file for snapper configuration. Uses all other files. +#: src/clients/snapper.rb:49 #, fuzzy #| msgid "Configuration of sshd" msgid "Configuration of system snapshots" @@ -27,14 +51,14 @@ #. text entry label #. text entry label -#: src/include/snapper/dialogs.rb:130 src/include/snapper/dialogs.rb:251 -#: src/include/snapper/dialogs.rb:490 +#: src/include/snapper/dialogs.rb:123 src/include/snapper/dialogs.rb:244 +#: src/include/snapper/dialogs.rb:496 msgid "Description" msgstr "Description" #. text entry label #. text entry label -#: src/include/snapper/dialogs.rb:136 src/include/snapper/dialogs.rb:297 +#: src/include/snapper/dialogs.rb:130 src/include/snapper/dialogs.rb:290 #, fuzzy #| msgid "User name" msgid "User data" @@ -42,45 +66,45 @@ #. combo box label #. text entry label -#: src/include/snapper/dialogs.rb:144 src/include/snapper/dialogs.rb:302 +#: src/include/snapper/dialogs.rb:138 src/include/snapper/dialogs.rb:295 #, fuzzy #| msgid "C&leanup Script" msgid "Cleanup algorithm" msgstr "C&leanup Script" -#. popup label, %1 is number -#: src/include/snapper/dialogs.rb:158 -msgid "Modify Snapshot %1" +#. popup label, %{num} is number +#: src/include/snapper/dialogs.rb:153 +msgid "Modify Snapshot %{num}" msgstr "" -#. popup label, %1, %2 are numbers (range) -#: src/include/snapper/dialogs.rb:166 -msgid "Modify Snapshots %1 - %2" +#. popup label, %{pre} and %{post} are numbers +#: src/include/snapper/dialogs.rb:159 +msgid "Modify Snapshot %{pre} and %{post}" msgstr "" #. label -#: src/include/snapper/dialogs.rb:169 +#: src/include/snapper/dialogs.rb:161 #, fuzzy #| msgid "PReP (%1)" -msgid "Pre (%1)" +msgid "Pre (%{pre})" msgstr "PReP (%1)" #. label -#: src/include/snapper/dialogs.rb:173 +#: src/include/snapper/dialogs.rb:165 #, fuzzy #| msgid "Host %1" -msgid "Post (%1)" +msgid "Post (%{post})" msgstr "Host %1" #. popup label -#: src/include/snapper/dialogs.rb:249 +#: src/include/snapper/dialogs.rb:242 #, fuzzy #| msgid "Create New " msgid "Create New Snapshot" msgstr "Create New " #. radio button label -#: src/include/snapper/dialogs.rb:262 +#: src/include/snapper/dialogs.rb:255 #, fuzzy #| msgid "Read the list of profiles" msgid "Single snapshot" @@ -88,243 +112,250 @@ #. radio button label #. 0 means there's no post -#: src/include/snapper/dialogs.rb:271 src/include/snapper/dialogs.rb:435 +#: src/include/snapper/dialogs.rb:264 src/include/snapper/dialogs.rb:442 msgid "Pre" msgstr "Pre" #. radio button label, snapshot selection will follow -#: src/include/snapper/dialogs.rb:281 +#: src/include/snapper/dialogs.rb:274 msgid "Post, paired with:" msgstr "" #. yes/no popup question -#: src/include/snapper/dialogs.rb:352 +#: src/include/snapper/dialogs.rb:350 #, fuzzy #| msgid "Really delete '%1'?" -msgid "Really delete snapshot '%1'?" +msgid "Really delete snapshot %{num}?" msgstr "Really delete '%1'?" +#. yes/no popup question +#: src/include/snapper/dialogs.rb:357 +#, fuzzy +#| msgid "Really delete '%1'?" +msgid "Really delete snapshots %{pre} and %{post}?" +msgstr "Really delete '%1'?" + #. summary dialog caption -#: src/include/snapper/dialogs.rb:365 +#: src/include/snapper/dialogs.rb:372 msgid "Snapshots" msgstr "" #. generate list of snapshot table items -#: src/include/snapper/dialogs.rb:394 +#: src/include/snapper/dialogs.rb:401 #, fuzzy #| msgid "Singlehead" msgid "Single" msgstr "Singlehead" #. pre canot be 0 -#: src/include/snapper/dialogs.rb:419 +#: src/include/snapper/dialogs.rb:426 msgid "Pre & Post" msgstr "" #. busy popup message -#: src/include/snapper/dialogs.rb:454 +#: src/include/snapper/dialogs.rb:461 #, fuzzy #| msgid "Read the list of profiles" msgid "Reading list of snapshots..." msgstr "Read the list of profiles" #. combo box label -#: src/include/snapper/dialogs.rb:475 +#: src/include/snapper/dialogs.rb:481 #, fuzzy #| msgid "Current Configuration:" msgid "Current Configuration" msgstr "Current Configuration:" #. table header -#: src/include/snapper/dialogs.rb:486 +#: src/include/snapper/dialogs.rb:492 msgid "ID" msgstr "ID" -#: src/include/snapper/dialogs.rb:487 +#: src/include/snapper/dialogs.rb:493 msgid "Type" msgstr "Type" -#: src/include/snapper/dialogs.rb:488 +#: src/include/snapper/dialogs.rb:494 msgid "Start Date" msgstr "Start Date" -#: src/include/snapper/dialogs.rb:489 +#: src/include/snapper/dialogs.rb:495 msgid "End Date" msgstr "End Date" -#: src/include/snapper/dialogs.rb:491 +#: src/include/snapper/dialogs.rb:497 msgid "User Data" msgstr "User Data" #. button label -#: src/include/snapper/dialogs.rb:497 +#: src/include/snapper/dialogs.rb:503 #, fuzzy #| msgid "&Show Changes" msgid "Show Changes" msgstr "&Show Changes" #. button label -#: src/include/snapper/dialogs.rb:500 +#: src/include/snapper/dialogs.rb:506 #, fuzzy #| msgid "&Modify" msgid "Modify" msgstr "&Modify" #. popup message -#: src/include/snapper/dialogs.rb:542 +#: src/include/snapper/dialogs.rb:549 msgid "" "This 'Pre' snapshot is not paired with any 'Post' one yet.\n" "Showing differences is not possible." msgstr "" #. dialog caption -#: src/include/snapper/dialogs.rb:588 +#: src/include/snapper/dialogs.rb:634 #, fuzzy #| msgid "Selected Service" msgid "Selected Snapshot Overview" msgstr "Selected Service" #. '%1: %2' means 'ID: description', adapt the order if necessary -#: src/include/snapper/dialogs.rb:626 +#: src/include/snapper/dialogs.rb:666 #, fuzzy #| msgid "Next %1: %2" msgid "%1: %2" msgstr "Next %1: %2" #. busy popup message -#: src/include/snapper/dialogs.rb:645 +#: src/include/snapper/dialogs.rb:685 #, fuzzy #| msgid "Saving changes to the files..." msgid "Calculating changed files..." msgstr "Saving changes to the files..." #. busy popup message -#: src/include/snapper/dialogs.rb:742 +#: src/include/snapper/dialogs.rb:695 #, fuzzy #| msgid "Accepting failed verifications" msgid "Calculating file modifications..." msgstr "Accepting failed verifications" #. label -#: src/include/snapper/dialogs.rb:750 +#: src/include/snapper/dialogs.rb:703 msgid "New file was created." msgstr "" #. label -#: src/include/snapper/dialogs.rb:754 +#: src/include/snapper/dialogs.rb:707 #, fuzzy #| msgid "Card removed" msgid "File was removed." msgstr "Card removed" #. label -#: src/include/snapper/dialogs.rb:759 +#: src/include/snapper/dialogs.rb:712 msgid "File content was not changed." msgstr "" #. label -#: src/include/snapper/dialogs.rb:765 +#: src/include/snapper/dialogs.rb:718 #, fuzzy #| msgid "File %1 does not exist." msgid "File does not exist in either snapshot." msgstr "File %1 does not exist." #. label -#: src/include/snapper/dialogs.rb:771 +#: src/include/snapper/dialogs.rb:724 #, fuzzy #| msgid "Nothing was modified yet." msgid "File content was modified." msgstr "Nothing was modified yet." #. text label, %1, %2 are file modes (like '-rw-r--r--') -#: src/include/snapper/dialogs.rb:781 +#: src/include/snapper/dialogs.rb:734 msgid "File mode was changed from '%1' to '%2'." msgstr "" #. text label, %1, %2 are user names -#: src/include/snapper/dialogs.rb:796 +#: src/include/snapper/dialogs.rb:749 msgid "File user ownership was changed from '%1' to '%2'." msgstr "" #. text label, %1, %2 are group names -#: src/include/snapper/dialogs.rb:812 +#: src/include/snapper/dialogs.rb:765 msgid "File group ownership was changed from '%1' to '%2'." msgstr "" #. button label -#: src/include/snapper/dialogs.rb:847 +#: src/include/snapper/dialogs.rb:782 #, fuzzy #| msgid "Restore options" msgid "R&estore from First" msgstr "Restore options" #. button label -#: src/include/snapper/dialogs.rb:849 +#: src/include/snapper/dialogs.rb:784 #, fuzzy #| msgid "Restore Options" msgid "Restore" msgstr "Restore Options" -#: src/include/snapper/dialogs.rb:872 +#: src/include/snapper/dialogs.rb:807 #, fuzzy #| msgid "Selected" msgid "Res&tore from Second" msgstr "Selected" #. radio button label -#: src/include/snapper/dialogs.rb:909 +#: src/include/snapper/dialogs.rb:844 msgid "Show the difference between snapshot and current system" msgstr "" #. radio button label, snapshot selection will follow -#: src/include/snapper/dialogs.rb:921 +#: src/include/snapper/dialogs.rb:856 msgid "Show the difference between current and selected snapshot:" msgstr "" #. radio button label -#: src/include/snapper/dialogs.rb:968 +#: src/include/snapper/dialogs.rb:903 msgid "Show the difference between first and second snapshot" msgstr "" #. radio button label -#: src/include/snapper/dialogs.rb:979 +#: src/include/snapper/dialogs.rb:914 msgid "Show the difference between first snapshot and current system" msgstr "" #. radio button label -#: src/include/snapper/dialogs.rb:990 +#: src/include/snapper/dialogs.rb:925 msgid "Show the difference between second snapshot and current system" msgstr "" #. label, date string will follow at the end of line -#: src/include/snapper/dialogs.rb:1031 -msgid "Time of taking the first snapshot:" +#: src/include/snapper/dialogs.rb:954 +msgid "Time of taking the snapshot:" msgstr "" #. label, date string will follow at the end of line -#: src/include/snapper/dialogs.rb:1036 -msgid "Time of taking the second snapshot:" +#: src/include/snapper/dialogs.rb:962 +msgid "Time of taking the first snapshot:" msgstr "" #. label, date string will follow at the end of line -#: src/include/snapper/dialogs.rb:1044 -msgid "Time of taking the snapshot:" +#: src/include/snapper/dialogs.rb:967 +msgid "Time of taking the second snapshot:" msgstr "" #. button label -#: src/include/snapper/dialogs.rb:1066 +#: src/include/snapper/dialogs.rb:990 msgid "&Open" msgstr "&Open" #. button label -#: src/include/snapper/dialogs.rb:1112 +#: src/include/snapper/dialogs.rb:1036 #, fuzzy #| msgid "Selected" msgid "Restore Selected" msgstr "Selected" #. yes/no question, %1 is file name, %2 is number -#: src/include/snapper/dialogs.rb:1186 +#: src/include/snapper/dialogs.rb:1121 #, fuzzy #| msgid "Do you really want to delete this entry?" msgid "" @@ -337,7 +368,7 @@ #. yes/no question, %1 is file name, %2 is number #. yes/no question, %1 is file name, %2 is number -#: src/include/snapper/dialogs.rb:1206 src/include/snapper/dialogs.rb:1224 +#: src/include/snapper/dialogs.rb:1142 src/include/snapper/dialogs.rb:1161 msgid "" "Do you want to copy the file\n" "\n" @@ -347,17 +378,19 @@ msgstr "" #. popup message -#: src/include/snapper/dialogs.rb:1259 -msgid "No file was selected for restoring" -msgstr "" +#: src/include/snapper/dialogs.rb:1187 +#, fuzzy +#| msgid "No patches have been selected for installation.\n" +msgid "No file was selected for restoring." +msgstr "No patches have been selected for installation.\n" #. popup headline -#: src/include/snapper/dialogs.rb:1264 +#: src/include/snapper/dialogs.rb:1197 msgid "Restoring files" msgstr "Restoring files" #. popup message, %1 is snapshot number, %2 list of files -#: src/include/snapper/dialogs.rb:1267 +#: src/include/snapper/dialogs.rb:1200 msgid "" "<p>These files will be restored from snapshot '%1':</p>\n" "<p>\n" @@ -368,7 +401,7 @@ msgstr "" #. Read dialog help -#: src/include/snapper/helps.rb:36 +#: src/include/snapper/helps.rb:35 #, fuzzy #| msgid "" #| "<p><b><big>Creating the Add-On</big></b><br>\n" @@ -381,30 +414,30 @@ "Please wait...<br></p>\n" #. Summary dialog help: -#: src/include/snapper/helps.rb:40 +#: src/include/snapper/helps.rb:39 msgid "" "<p><b><big>Snapshots Configuration</big></b><p>\n" "<p>The table shows a list of root filesystem snapshots. There are three types\n" "of snapshots, <b>single</b>, <b>pre</b> and <b>post</b>. Single snapshots are\n" -"used for storing the file system state in a certain time, while Pre and Post are used to define the changes done by special operation performed between taking those two snapshots. Pre and Post snapshots are coupled together in the table.</p>\n" -"<p>Select a snapshot or snapshot couple and click <b>Show Changes</b> to see the\n" +"used for storing the file system state in a certain time, while Pre and Post are used to define the changes done by special operation performed between taking those two snapshots. Pre and Post snapshots are paired together in the table.</p>\n" +"<p>Select a snapshot or snapshot pair and click <b>Show Changes</b> to see the\n" "new file system changes in the specified snapshot.</p>\n" msgstr "" #. Show snapshot dialog help -#: src/include/snapper/helps.rb:49 +#: src/include/snapper/helps.rb:48 msgid "" "<p><b><big>Snapshot Overview</big></b><p>\n" "<p>\n" "The tree shows all the files that were modified between creating the first ('pre') and second ('post') snapshot. On the right side, you see the description generated when the first snapshot was created and the time of creation for both snapshots.\n" "</p>\n" "<p>\n" -"When a file is selected in the tree, you see the changes done to it. By default, changes between selected coupled snapshots are shown, but it is possible to compare the file with different versions.\n" +"When a file is selected in the tree, you see the changes done to it. By default, changes between selected paired snapshots are shown, but it is possible to compare the file with different versions.\n" "</p>\n" msgstr "" #. Show snapshot dialog help, alternative for single snapshots -#: src/include/snapper/helps.rb:59 +#: src/include/snapper/helps.rb:58 msgid "" "<p><b><big>Snapshot Overview</big></b><p>\n" "<p>\n" @@ -415,147 +448,164 @@ "</p>\n" msgstr "" -#. popup error -#: src/modules/Snapper.rb:91 +#. Return Tree of files modified between given snapshots +#. Map is recursively describing the filesystem structure; helps to build Tree widget contents +#: src/modules/Snapper.rb:108 #, fuzzy -#| msgid "Variable %1 was not found." -msgid "Snapshot '%1' was not found." -msgstr "Variable %1 was not found." +#| msgid "Failed to save ipsec.conf:" +msgid "Failed to get config:\n" +msgstr "Failed to save ipsec.conf:" -#. Initialize snapper agent -#. Return true on success -#. Delete existing snapshot -#. Return true on success -#. Modify existing snapshot -#. Return true on success +#. Return the path to given snapshot +#: src/modules/Snapper.rb:129 +#, fuzzy +#| msgid "Failed to test %1." +msgid "Failed to get snapshot mount point:\n" +msgstr "Failed to test %1." + #. Create new snapshot #. Return true on success -#: src/modules/Snapper.rb:236 src/modules/Snapper.rb:264 -#: src/modules/Snapper.rb:284 src/modules/Snapper.rb:303 +#: src/modules/Snapper.rb:276 #, fuzzy -#| msgid "(not known)" -msgid "Reason not known." -msgstr "(not known)" +#| msgid "Failed to create the new map." +msgid "Failed to create new snapshot:\n" +msgstr "Failed to create the new map." -#: src/modules/Snapper.rb:238 +#. Modify existing snapshot +#. Return true on success +#: src/modules/Snapper.rb:291 #, fuzzy -#| msgid "Configuration of autofs" -msgid "Configuration not found." -msgstr "Configuration of autofs" +#| msgid "Failed to modify an autofs entry in map." +msgid "Failed to modify snapshot:\n" +msgstr "Failed to modify an autofs entry in map." -#: src/modules/Snapper.rb:240 +#. Delete existing snapshot +#. Return true on success +#: src/modules/Snapper.rb:306 #, fuzzy -#| msgid "Network configuration is not valid." -msgid "Configuration is not valid." -msgstr "Network configuration is not valid." - -#. error popup -#: src/modules/Snapper.rb:247 -#, fuzzy -#| msgid "Failed to initialize the software repository." -msgid "" -"Failed to initialize snapper library:\n" -"%1" -msgstr "Failed to initialise the software repository." - -#: src/modules/Snapper.rb:266 -#, fuzzy -#| msgid "Variable %1 was not found." -msgid "Snapshot was not found." -msgstr "Variable %1 was not found." - -#. error popup -#: src/modules/Snapper.rb:271 -#, fuzzy #| msgid "Failed to test %1." -msgid "" -"Failed to delete snapshot:\n" -"%1" +msgid "Failed to delete snapshot:\n" msgstr "Failed to test %1." -#. error popup -#: src/modules/Snapper.rb:289 +#. Snapper read dialog caption +#: src/modules/Snapper.rb:319 #, fuzzy -#| msgid "Failed to modify an autofs entry in map." -msgid "" -"Failed to modify snapshot:\n" -"%1" -msgstr "Failed to modify an autofs entry in map." +#| msgid "Initializing" +msgid "Initializing Snapper" +msgstr "Initialising" -#: src/modules/Snapper.rb:306 -msgid "Wrong snapshot type given." -msgstr "" - -#: src/modules/Snapper.rb:308 +#. Progress stage 1/2 +#: src/modules/Snapper.rb:324 #, fuzzy -#| msgid "Variable %1 was not found." -msgid "'Pre' snapshot was not given." -msgstr "Variable %1 was not found." +#| msgid "Read the configuration" +msgid "Read list of configurations" +msgstr "Read the configuration" -#: src/modules/Snapper.rb:310 +#. Progress stage 2/2 +#: src/modules/Snapper.rb:326 #, fuzzy -#| msgid "Variable %1 was not found." -msgid "Given 'Pre' snapshot was not found." -msgstr "Variable %1 was not found." +#| msgid "Read the list of profiles" +msgid "Read list of snapshots" +msgstr "Read the list of profiles" -#. error popup -#: src/modules/Snapper.rb:316 +#. Progress step 1/2 +#: src/modules/Snapper.rb:330 #, fuzzy -#| msgid "Failed to create the new map." -msgid "" -"Failed to create new snapshot:\n" -"%1" -msgstr "Failed to create the new map." +#| msgid "Reading the Configuration" +msgid "Reading list of configurations" +msgstr "Reading the Configuration" -#. Snapper read dialog caption -#: src/modules/Snapper.rb:326 +#. Progress step 2/2 +#: src/modules/Snapper.rb:332 #, fuzzy -#| msgid "Initializing" -msgid "Initializing Snapper" -msgstr "Initialising" - -#. Progress stage 1/3 -#: src/modules/Snapper.rb:337 -#, fuzzy #| msgid "Read the list of profiles" -msgid "Read the list of snapshots" +msgid "Reading list of snapshots" msgstr "Read the list of profiles" -#. Progress step 1/3 -#: src/modules/Snapper.rb:341 -msgid "Reading the database..." -msgstr "Reading the database..." - #. Progress finished -#: src/modules/Snapper.rb:343 +#: src/modules/Snapper.rb:334 msgid "Finished" msgstr "Finished" -#. error popup -#: src/modules/Snapper.rb:352 +#: src/modules/Snapper.rb:344 +#, fuzzy +#| msgid "Boot loader configuration failed." +msgid "Querying snapper configurations failed:" +msgstr "Boot loader configuration failed." + +#: src/modules/Snapper.rb:349 msgid "" "No snapper configurations exist. You have to create one or more\n" "configurations to use yast2-snapper. The snapper command line\n" "tool can be used to create configurations." msgstr "" +#: src/modules/Snapper.rb:359 +msgid "Querying snapper snapshots failed:" +msgstr "" + #. label for log window -#: src/modules/Snapper.rb:395 +#: src/modules/Snapper.rb:399 #, fuzzy #| msgid "Restoring Files" msgid "Restoring Files..." msgstr "Restoring Files" #. log entry (%1 is file name) -#: src/modules/Snapper.rb:424 +#: src/modules/Snapper.rb:428 #, fuzzy #| msgid "Delete" msgid "Deleted %1\n" msgstr "Delete" #. log entry (%1 is file name) -#: src/modules/Snapper.rb:477 +#: src/modules/Snapper.rb:481 #, fuzzy #| msgid "Skipped\n" msgid "%1 skipped\n" msgstr "Skipped\n" + +#, fuzzy +#~| msgid "Variable %1 was not found." +#~ msgid "Snapshot '%1' was not found." +#~ msgstr "Variable %1 was not found." + +#, fuzzy +#~| msgid "(not known)" +#~ msgid "Reason not known." +#~ msgstr "(not known)" + +#, fuzzy +#~| msgid "Configuration of autofs" +#~ msgid "Configuration not found." +#~ msgstr "Configuration of autofs" + +#, fuzzy +#~| msgid "Network configuration is not valid." +#~ msgid "Configuration is not valid." +#~ msgstr "Network configuration is not valid." + +#, fuzzy +#~| msgid "Failed to initialize the software repository." +#~ msgid "" +#~ "Failed to initialize snapper library:\n" +#~ "%1" +#~ msgstr "Failed to initialise the software repository." + +#, fuzzy +#~| msgid "Variable %1 was not found." +#~ msgid "Snapshot was not found." +#~ msgstr "Variable %1 was not found." + +#, fuzzy +#~| msgid "Variable %1 was not found." +#~ msgid "'Pre' snapshot was not given." +#~ msgstr "Variable %1 was not found." + +#, fuzzy +#~| msgid "Variable %1 was not found." +#~ msgid "Given 'Pre' snapshot was not found." +#~ msgstr "Variable %1 was not found." + +#~ msgid "Reading the database..." +#~ msgstr "Reading the database..." Modified: trunk/yast/en_GB/po/sound.en_GB.po =================================================================== --- trunk/yast/en_GB/po/sound.en_GB.po 2015-09-09 08:18:21 UTC (rev 92602) +++ trunk/yast/en_GB/po/sound.en_GB.po 2015-09-09 08:19:44 UTC (rev 92603) @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: sound\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-04 15:53+0200\n" +"POT-Creation-Date: 2015-08-25 18:37+0200\n" "PO-Revision-Date: 2008-03-27 22:53+0000\n" "Last-Translator: Benjamin Weber \n" "Language-Team: \n" Modified: trunk/yast/en_GB/po/squid.en_GB.po =================================================================== --- trunk/yast/en_GB/po/squid.en_GB.po 2015-09-09 08:18:21 UTC (rev 92602) +++ trunk/yast/en_GB/po/squid.en_GB.po 2015-09-09 08:19:44 UTC (rev 92603) @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: squid\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-04 15:53+0200\n" +"POT-Creation-Date: 2015-08-25 18:37+0200\n" "PO-Revision-Date: 2008-03-27 22:53+0000\n" "Last-Translator: Benjamin Weber \n" "Language-Team: \n" @@ -156,7 +156,7 @@ msgid "When Booting" msgstr "When Booting" -#: src/include/squid/complex.rb:69 src/modules/Squid.rb:1591 +#: src/include/squid/complex.rb:69 src/modules/Squid.rb:1590 msgid "Manually" msgstr "Manually" @@ -327,7 +327,7 @@ msgid "Logging and Timeouts" msgstr "Logging and Timeouts" -#: src/include/squid/complex.rb:339 src/include/squid/dialogs.rb:370 +#: src/include/squid/complex.rb:339 src/include/squid/dialogs.rb:369 msgid "Miscellaneous Setting" msgstr "Miscellaneous Setting" @@ -445,35 +445,29 @@ msgid "Cache &Store Log" msgstr "Cache &Store Log" -#: src/include/squid/dialogs.rb:339 -#, fuzzy -#| msgid "&Emulate Httpd Log?" -msgid "&Emulate httpd Log?" -msgstr "&Emulate Httpd Log?" - -#: src/include/squid/dialogs.rb:346 +#: src/include/squid/dialogs.rb:345 msgid "Timeouts" msgstr "Timeouts" -#: src/include/squid/dialogs.rb:351 +#: src/include/squid/dialogs.rb:350 msgid "Connection &Timeout" msgstr "Connection &Timeout" -#: src/include/squid/dialogs.rb:359 +#: src/include/squid/dialogs.rb:358 msgid "Client &Lifetime" msgstr "Client &Lifetime" -#: src/include/squid/dialogs.rb:372 +#: src/include/squid/dialogs.rb:371 msgid "&Language of error messages" msgstr "&Language of error messages" -#: src/include/squid/dialogs.rb:374 +#: src/include/squid/dialogs.rb:373 #, fuzzy #| msgid "&Administrator's e-mail" msgid "&Administrator's email" msgstr "&Administrator's e-mail" -#: src/include/squid/dialogs.rb:376 +#: src/include/squid/dialogs.rb:375 #, fuzzy #| msgid "&Use Ftp Passive Mode" msgid "&Use FTP Passive Mode" @@ -1167,28 +1161,28 @@ #. ************* ACL END ************************ #. ******* LOGGING AND TIMEOUTS DIALOG ********** -#: src/include/squid/store_del.rb:581 +#: src/include/squid/store_del.rb:578 msgid "Access Log must not be empty." msgstr "Access Log must not be empty." -#: src/include/squid/store_del.rb:591 +#: src/include/squid/store_del.rb:588 msgid "Cache Log must not be empty." msgstr "Cache Log must not be empty." -#: src/include/squid/store_del.rb:602 +#: src/include/squid/store_del.rb:599 msgid "Incorrect pathname in Access Log field." msgstr "Incorrect pathname in Access Log field." -#: src/include/squid/store_del.rb:613 +#: src/include/squid/store_del.rb:610 msgid "Incorrect pathname in Cache Log field." msgstr "Incorrect pathname in Cache Log field." -#: src/include/squid/store_del.rb:624 +#: src/include/squid/store_del.rb:621 msgid "Incorrect pathname in Cache Store Log field." msgstr "Incorrect pathname in Cache Store Log field." #. ******* LOGGING AND TIMEOUTS DIALOG END ****** -#: src/include/squid/store_del.rb:691 +#: src/include/squid/store_del.rb:684 #, fuzzy #| msgid "Administrator's E-mail must not contain any white spaces." msgid "Administrator's email must not contain any white spaces." @@ -1206,167 +1200,167 @@ #. Read all squid settings #. @return true on success -#: src/modules/Squid.rb:1089 +#: src/modules/Squid.rb:1088 #, fuzzy #| msgid "Initializing squid Configuration" msgid "Initializing Squid Configuration" msgstr "Initialising squid Configuration" -#: src/modules/Squid.rb:1093 +#: src/modules/Squid.rb:1092 #, fuzzy #| msgid "Read HTTP Ports from config file." msgid "Read HTTP Ports from Config File." msgstr "Read HTTP Ports from config file." -#: src/modules/Squid.rb:1094 +#: src/modules/Squid.rb:1093 #, fuzzy #| msgid "Read Refresh Patterns from config file." msgid "Read Refresh Patterns from Config File." msgstr "Read Refresh Patterns from config file." -#: src/modules/Squid.rb:1095 +#: src/modules/Squid.rb:1094 #, fuzzy #| msgid "Read ACL Groups from config file." msgid "Read ACL Groups from Config File." msgstr "Read ACL Groups from config file." -#: src/modules/Squid.rb:1096 +#: src/modules/Squid.rb:1095 #, fuzzy #| msgid "Read Access Control table from config file." msgid "Read Access Control Table from Config File." msgstr "Read Access Control table from config file." -#: src/modules/Squid.rb:1097 +#: src/modules/Squid.rb:1096 #, fuzzy msgid "Read Other Settings." msgstr "Read the settings" -#: src/modules/Squid.rb:1098 +#: src/modules/Squid.rb:1097 #, fuzzy msgid "Read Service Status." msgstr "Read service status." -#: src/modules/Squid.rb:1099 +#: src/modules/Squid.rb:1098 #, fuzzy msgid "Read Firewall Settings." msgstr "Read firewall settings." -#: src/modules/Squid.rb:1102 +#: src/modules/Squid.rb:1101 msgid "Reading HTTP Ports ..." msgstr "Reading HTTP Ports ..." -#: src/modules/Squid.rb:1103 +#: src/modules/Squid.rb:1102 msgid "Reading Refresh Patterns ..." msgstr "Reading Refresh Patterns ..." -#: src/modules/Squid.rb:1104 +#: src/modules/Squid.rb:1103 msgid "Reading ACL Groups ..." msgstr "Reading ACL Groups ..." -#: src/modules/Squid.rb:1105 +#: src/modules/Squid.rb:1104 #, fuzzy #| msgid "Reading Access Control table ..." msgid "Reading Access Control Table ..." msgstr "Reading Access Control table ..." -#: src/modules/Squid.rb:1106 +#: src/modules/Squid.rb:1105 #, fuzzy msgid "Reading Other Settings ..." msgstr "Reading the settings..." -#: src/modules/Squid.rb:1107 +#: src/modules/Squid.rb:1106 #, fuzzy msgid "Reading Service Status ..." msgstr "Reading service status ..." -#: src/modules/Squid.rb:1108 +#: src/modules/Squid.rb:1107 #, fuzzy msgid "Reading Firewall Settings ..." msgstr "Reading firewall settings ..." -#: src/modules/Squid.rb:1118 +#: src/modules/Squid.rb:1117 msgid "Cannot read configuration file." msgstr "Cannot read configuration file." -#: src/modules/Squid.rb:1123 +#: src/modules/Squid.rb:1122 msgid "Cannot read service status." msgstr "Cannot read service status." #. We do not set help text here, because it was set outside -#: src/modules/Squid.rb:1466 +#: src/modules/Squid.rb:1465 msgid "Saving Squid Configuration" msgstr "Saving Squid Configuration" #. Progress stage 1/2 -#: src/modules/Squid.rb:1471 +#: src/modules/Squid.rb:1470 msgid "Write the settings" msgstr "Write the settings" #. Progress stage 1/2 -#: src/modules/Squid.rb:1473 +#: src/modules/Squid.rb:1472 msgid "Write firewall settings" msgstr "Write firewall settings" #. Progress stage 2/2 -#: src/modules/Squid.rb:1475 +#: src/modules/Squid.rb:1474 msgid "Start Service" msgstr "Start Service" #. Progress step 1/2 -#: src/modules/Squid.rb:1479 +#: src/modules/Squid.rb:1478 msgid "Writing the settings..." msgstr "Writing the settings..." #. Progress step 1/2 -#: src/modules/Squid.rb:1481 +#: src/modules/Squid.rb:1480 msgid "Writing firewall settings..." msgstr "Writing firewall settings..." #. Progress step 2/2 -#: src/modules/Squid.rb:1483 +#: src/modules/Squid.rb:1482 msgid "Starting Service..." msgstr "Starting Service..." #. Progress finished -#: src/modules/Squid.rb:1485 +#: src/modules/Squid.rb:1484 msgid "Finished" msgstr "Finished" #. write settings -#: src/modules/Squid.rb:1495 +#: src/modules/Squid.rb:1494 msgid "Cannot write settings." msgstr "Cannot write settings." #. firewall -#: src/modules/Squid.rb:1501 +#: src/modules/Squid.rb:1500 msgid "Cannot write firewall settings." msgstr "Cannot write firewall settings." #. Header -#: src/modules/Squid.rb:1585 +#: src/modules/Squid.rb:1584 msgid "Squid Cache Proxy" msgstr "Squid Cache Proxy" #. Start daemon -#: src/modules/Squid.rb:1590 +#: src/modules/Squid.rb:1589 msgid "Start daemon: " msgstr "Start daemon: " -#: src/modules/Squid.rb:1591 +#: src/modules/Squid.rb:1590 msgid "When booting" msgstr "When booting" #. Http Ports -#: src/modules/Squid.rb:1595 +#: src/modules/Squid.rb:1594 msgid "Configured ports:" msgstr "Configured ports:" -#: src/modules/Squid.rb:1612 +#: src/modules/Squid.rb:1611 msgid " (transparent)" msgstr " (transparent)" #. Cache directory -#: src/modules/Squid.rb:1626 +#: src/modules/Squid.rb:1625 msgid "Cache directory: " msgstr "Cache directory: " @@ -1838,6 +1832,11 @@ msgstr "Traditional Chinese" #, fuzzy +#~| msgid "&Emulate Httpd Log?" +#~ msgid "&Emulate httpd Log?" +#~ msgstr "&Emulate Httpd Log?" + +#, fuzzy #~ msgid "Russian-koi8-r" #~ msgstr "Russian" Modified: trunk/yast/en_GB/po/sshd.en_GB.po =================================================================== --- trunk/yast/en_GB/po/sshd.en_GB.po 2015-09-09 08:18:21 UTC (rev 92602) +++ trunk/yast/en_GB/po/sshd.en_GB.po 2015-09-09 08:19:44 UTC (rev 92603) @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: sshd\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-04 15:52+0200\n" +"POT-Creation-Date: 2015-08-25 18:36+0200\n" "PO-Revision-Date: 2008-03-27 22:42+0000\n" "Last-Translator: Benjamin Weber \n" "Language-Team: \n" Modified: trunk/yast/en_GB/po/storage.en_GB.po =================================================================== --- trunk/yast/en_GB/po/storage.en_GB.po 2015-09-09 08:18:21 UTC (rev 92602) +++ trunk/yast/en_GB/po/storage.en_GB.po 2015-09-09 08:19:44 UTC (rev 92603) @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: storage\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-10-29 16:21+0100\n" +"POT-Creation-Date: 2015-08-27 10:53+0200\n" "PO-Revision-Date: 2008-12-02 10:13+0100\n" "Last-Translator: Benjamin Weber \n" "Language-Team: \n" @@ -52,7 +52,7 @@ #. dialog heading #. dialog caption -#: src/clients/disk.rb:67 src/include/partitioning/ep-main.rb:67 +#: src/clients/disk.rb:67 src/include/partitioning/ep-main.rb:68 msgid "Expert Partitioner" msgstr "Expert Partitioner" @@ -1049,7 +1049,7 @@ #. Label text #. TRANSLATORS: checkbox text #: src/include/partitioning/auto_part_ui.rb:341 -#: src/modules/StorageProposal.rb:6230 +#: src/modules/StorageProposal.rb:6245 msgid "Propose Separate &Home Partition" msgstr "Propose Separate &Home Partition" @@ -1163,15 +1163,16 @@ #: src/include/partitioning/custom_part_check_generated.rb:338 msgid "" "Warning: There is no partition of type bios_grub present.\n" -"To boot from a GPT disk using grub2 such a partition is needed.\n" -"\n" +"Such a partition is recommended (required with Btrfs) when Grub2 is\n" +"installed in the MBR of a GPT disk. It must be unformatted and\n" +"approximately 1MB large.\n" "Really use this setup?\n" msgstr "" #. 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:358 +#: src/include/partitioning/custom_part_check_generated.rb:360 #, fuzzy msgid "" "Warning: There is no partition mounted as /boot.\n" @@ -1191,7 +1192,7 @@ "Do you want to change your setup?\n" #. popup text -#: src/include/partitioning/custom_part_check_generated.rb:378 +#: src/include/partitioning/custom_part_check_generated.rb:380 #, fuzzy msgid "" "Warning: According to your setup, you intend to\n" @@ -1212,7 +1213,7 @@ "\n" "Change this?\n" -#: src/include/partitioning/custom_part_check_generated.rb:398 +#: src/include/partitioning/custom_part_check_generated.rb:400 msgid "" "Warning: Some subvolumes of the root filesystem are shadowed by\n" "mount points of other filesystem. This could lead to problems.\n" @@ -1221,7 +1222,7 @@ msgstr "" #. popup text -#: src/include/partitioning/custom_part_check_generated.rb:415 +#: src/include/partitioning/custom_part_check_generated.rb:417 #, fuzzy msgid "" "Warning: With your current setup, your %1\n" @@ -1239,7 +1240,7 @@ "Change this?\n" #. popup text -#: src/include/partitioning/custom_part_check_generated.rb:433 +#: src/include/partitioning/custom_part_check_generated.rb:435 #, fuzzy msgid "" "Warning: With your current setup, your %2 installation\n" @@ -1265,7 +1266,7 @@ "Change this?\n" #. popup text -#: src/include/partitioning/custom_part_check_generated.rb:455 +#: src/include/partitioning/custom_part_check_generated.rb:457 #, fuzzy msgid "" "Warning: With your current setup, your %2 installation will\n" @@ -1291,13 +1292,13 @@ "Change this?\n" #. popup text -#: src/include/partitioning/custom_part_check_generated.rb:478 +#: src/include/partitioning/custom_part_check_generated.rb:480 #, fuzzy msgid "Really use this setup?" msgstr "Really delete this entry?" #. popup text -#: src/include/partitioning/custom_part_check_generated.rb:486 +#: src/include/partitioning/custom_part_check_generated.rb:488 #, fuzzy msgid "" "\n" @@ -1320,7 +1321,7 @@ "Do you want to change this?\n" #. popup text -#: src/include/partitioning/custom_part_check_generated.rb:502 +#: src/include/partitioning/custom_part_check_generated.rb:504 #, fuzzy msgid "" "\n" @@ -1336,7 +1337,7 @@ "particularly in any of the following cases:\n" #. continued popup text -#: src/include/partitioning/custom_part_check_generated.rb:509 +#: src/include/partitioning/custom_part_check_generated.rb:511 msgid "" "- if this is an existing ReiserFS partition\n" "- if this partition already contains a Linux distribution that will be\n" @@ -1349,7 +1350,7 @@ "- if this partition does not yet contain a file system\n" #. continued popup text -#: src/include/partitioning/custom_part_check_generated.rb:516 +#: src/include/partitioning/custom_part_check_generated.rb:518 #, fuzzy #| msgid "" #| "If in doubt, you might want to go back and mark this partition for\n" @@ -1365,7 +1366,7 @@ "like /, /boot, /usr, /opt, or /var.\n" #. continued popup text -#: src/include/partitioning/custom_part_check_generated.rb:522 +#: src/include/partitioning/custom_part_check_generated.rb:524 #, fuzzy msgid "" "If you decide to format the partition, all data on it will be lost.\n" @@ -1377,7 +1378,7 @@ "Do you want to change your setup?\n" #. popup text %1 is replaced by a raid name e.g. md0 -#: src/include/partitioning/custom_part_check_generated.rb:577 +#: src/include/partitioning/custom_part_check_generated.rb:579 msgid "" "The selected device belongs to the RAID (%1).\n" "Remove it from the RAID before editing it.\n" @@ -1386,7 +1387,7 @@ "Remove it from the RAID before editing it.\n" #. popup text %1 is replaced by a name e.g. system -#: src/include/partitioning/custom_part_check_generated.rb:588 +#: src/include/partitioning/custom_part_check_generated.rb:590 msgid "" "The selected device belongs to a volume group (%1).\n" "Remove it from the volume group before editing it.\n" @@ -1395,7 +1396,7 @@ "Remove it from the volume group before editing it.\n" #. popup text %1 is replaced by a name e.g. system -#: src/include/partitioning/custom_part_check_generated.rb:598 +#: src/include/partitioning/custom_part_check_generated.rb:600 msgid "" "The selected device is used by volume (%1).\n" "Remove the volume before editing it.\n" @@ -1404,7 +1405,7 @@ "Remove the volume before editing it.\n" #. popup text %2 is a device name, %1 is the raid name -#: src/include/partitioning/custom_part_check_generated.rb:631 +#: src/include/partitioning/custom_part_check_generated.rb:633 msgid "" "The device (%2) belongs to the RAID (%1).\n" "Remove it from the RAID before deleting it.\n" @@ -1413,7 +1414,7 @@ "Remove it from the RAID before deleting it.\n" #. popup text, %1 and %2 are device names -#: src/include/partitioning/custom_part_check_generated.rb:642 +#: src/include/partitioning/custom_part_check_generated.rb:644 msgid "" "The device (%2) is used by %1.\n" "Remove %1 before deleting it.\n" @@ -1421,13 +1422,13 @@ "The device (%2) is used by %1.\n" "Remove %1 before deleting it.\n" -#: src/include/partitioning/custom_part_check_generated.rb:654 +#: src/include/partitioning/custom_part_check_generated.rb:656 #, fuzzy msgid "It cannot be deleted while mounted." msgstr "The selected scheme cannot be deleted." #. popup text, %1 is a device name -#: src/include/partitioning/custom_part_check_generated.rb:690 +#: src/include/partitioning/custom_part_check_generated.rb:692 #, fuzzy #| msgid "" #| "The device (%1) cannot be removed\n" @@ -1442,7 +1443,7 @@ "partition with higher number is in use.\n" #. popup text -#: src/include/partitioning/custom_part_check_generated.rb:766 +#: src/include/partitioning/custom_part_check_generated.rb:768 #, fuzzy #| msgid "" #| "The selected extended partition contains partitions which are currently mounted:\n" @@ -1461,7 +1462,7 @@ "Please choose Cancel unless you know exactly what you are doing.\n" #. popup text, Do not translate LVM. -#: src/include/partitioning/custom_part_check_generated.rb:784 +#: src/include/partitioning/custom_part_check_generated.rb:786 msgid "" "\n" "The selected extended partition contains at least one LVM partition\n" @@ -1476,7 +1477,7 @@ "before deleting the extended partition.\n" #. popup text, Do not translate RAID. -#: src/include/partitioning/custom_part_check_generated.rb:795 +#: src/include/partitioning/custom_part_check_generated.rb:797 msgid "" "\n" "The selected extended partition contains at least one partition\n" @@ -1491,7 +1492,7 @@ "deleting the extended partition.\n" #. popup text -#: src/include/partitioning/custom_part_check_generated.rb:806 +#: src/include/partitioning/custom_part_check_generated.rb:808 msgid "" "\n" "The selected extended partition contains at least one partition\n" @@ -1513,7 +1514,7 @@ #. label text #: src/include/partitioning/custom_part_dialogs.rb:75 #: src/include/partitioning/ep-dialogs.rb:768 -#: src/modules/StorageProposal.rb:6357 +#: src/modules/StorageProposal.rb:6372 #, fuzzy #| msgid "Do not forget what you enter here." msgid "Do not forget what you enter here!" @@ -1569,7 +1570,7 @@ #. 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:3998 +#: src/include/partitioning/ep-dialogs.rb:780 src/modules/Storage.rb:4001 #, fuzzy #| msgid "Reenter the password for &verification:" msgid "Reenter the Password for &Verification:" @@ -1595,7 +1596,7 @@ #. popup text #. popup text #: src/include/partitioning/custom_part_dialogs.rb:197 -#: src/modules/Storage.rb:3954 +#: src/modules/Storage.rb:3957 msgid "" "You did not enter a password.\n" "Try again.\n" @@ -1606,7 +1607,7 @@ #. popup text #. popup text #: src/include/partitioning/custom_part_dialogs.rb:204 -#: src/modules/Storage.rb:3962 +#: src/modules/Storage.rb:3965 msgid "" "The password must have at least %1 characters.\n" "Try again.\n" @@ -2021,7 +2022,7 @@ #. TRANSLATOR: checkbox text #. TRANSLATORS: checkbox text #: src/include/partitioning/custom_part_dialogs.rb:1596 -#: src/modules/StorageProposal.rb:6211 +#: src/modules/StorageProposal.rb:6226 msgid "Enable Snapshots" msgstr "" @@ -3295,7 +3296,7 @@ msgstr "Device: %1" #. encoding: utf-8 -#. Copyright (c) 2012 Novell, Inc. +#. Copyright (c) [2012-2015] Novell, Inc. #. #. All Rights Reserved. #. @@ -3313,17 +3314,17 @@ #. #. To contact Novell about this file by physical or electronic mail, you may #. find current contact information at www.novell.com. -#. File: ep-main.ycp +#. File: ep-graph.rb #. Package: yast2-storage #. Summary: Expert Partitioner #. Authors: Arvin Schnell -#: src/include/partitioning/ep-graph.rb:38 +#: src/include/partitioning/ep-graph.rb:39 #, fuzzy msgid "Add RAID" msgstr "Add RAI&D" #. dialog title -#: src/include/partitioning/ep-graph.rb:43 +#: src/include/partitioning/ep-graph.rb:44 #: src/include/partitioning/ep-lvm-dialogs.rb:475 msgid "Add Volume Group" msgstr "Add Volume Group" @@ -3331,21 +3332,21 @@ #. dialog heading, graph is the mathematic term for #. a set of notes connected with edges #. tree node label -#: src/include/partitioning/ep-graph.rb:69 -#: src/include/partitioning/ep-main.rb:457 +#: src/include/partitioning/ep-graph.rb:70 +#: src/include/partitioning/ep-main.rb:453 #, fuzzy #| msgid "Device Path" msgid "Device Graph" msgstr "Device Path" #. button text -#: src/include/partitioning/ep-graph.rb:79 +#: src/include/partitioning/ep-graph.rb:74 #, fuzzy msgid "Save Device Graph..." msgstr "&Export..." #. helptext -#: src/include/partitioning/ep-graph.rb:89 +#: src/include/partitioning/ep-graph.rb:84 #, fuzzy msgid "<p>This view shows a graph of devices.</p>" msgstr "" @@ -3354,8 +3355,8 @@ #. error popup #. error popup -#: src/include/partitioning/ep-graph.rb:145 -#: src/include/partitioning/ep-graph.rb:225 +#: src/include/partitioning/ep-graph.rb:140 +#: src/include/partitioning/ep-graph.rb:214 #, fuzzy msgid "Saving graph file failed." msgstr "Parsing the key file failed." @@ -3363,21 +3364,21 @@ #. dialog heading, graph is the mathematic term for #. a set of notes connected with edges #. tree node label -#: src/include/partitioning/ep-graph.rb:164 -#: src/include/partitioning/ep-main.rb:467 +#: src/include/partitioning/ep-graph.rb:159 +#: src/include/partitioning/ep-main.rb:459 #, fuzzy #| msgid " Mount " msgid "Mount Graph" msgstr " Mount " #. button text -#: src/include/partitioning/ep-graph.rb:174 +#: src/include/partitioning/ep-graph.rb:163 #, fuzzy msgid "Save Mount Graph..." msgstr "&Export..." #. helptext -#: src/include/partitioning/ep-graph.rb:184 +#: src/include/partitioning/ep-graph.rb:173 #, fuzzy msgid "<p>This view shows a graph of mount points.</p>" msgstr "" @@ -3527,7 +3528,7 @@ #. error popup #. TRANSLATORS: error popup -#: src/include/partitioning/ep-hd-lib.rb:51 src/modules/Storage.rb:5165 +#: src/include/partitioning/ep-hd-lib.rb:51 src/modules/Storage.rb:5211 msgid "The disk is in use and cannot be modified." msgstr "" @@ -3775,7 +3776,7 @@ #. heading #. tree node label #: src/include/partitioning/ep-hd.rb:210 -#: src/include/partitioning/ep-main.rb:382 +#: src/include/partitioning/ep-main.rb:380 #, fuzzy msgid "Hard Disks" msgstr "Hard Disk" @@ -4062,7 +4063,7 @@ #. heading #. tree node label #: src/include/partitioning/ep-log.rb:43 -#: src/include/partitioning/ep-main.rb:503 +#: src/include/partitioning/ep-main.rb:493 msgid "Log" msgstr "Log" @@ -4235,7 +4236,7 @@ #. heading #. tree node label #: src/include/partitioning/ep-loop.rb:103 -#: src/include/partitioning/ep-main.rb:406 +#: src/include/partitioning/ep-main.rb:404 #, fuzzy msgid "Crypt Files" msgstr "Cr&ypt File..." @@ -4653,7 +4654,7 @@ #. heading #. tree node label #: src/include/partitioning/ep-lvm.rb:204 -#: src/include/partitioning/ep-main.rb:398 +#: src/include/partitioning/ep-main.rb:396 #, fuzzy msgid "Volume Management" msgstr "Profile Mana&gement" @@ -4724,36 +4725,36 @@ #. tree node label #. heading -#: src/include/partitioning/ep-main.rb:390 +#: src/include/partitioning/ep-main.rb:388 #: src/include/partitioning/ep-raid.rb:123 #, fuzzy msgid "RAID" msgstr "R&AID:" #. tree node label -#: src/include/partitioning/ep-main.rb:414 +#: src/include/partitioning/ep-main.rb:412 #, fuzzy msgid "Device Mapper" msgstr "Device Type" #. tree node label -#: src/include/partitioning/ep-main.rb:422 +#: src/include/partitioning/ep-main.rb:420 msgid "NFS" msgstr "NFS" #. tree node label -#: src/include/partitioning/ep-main.rb:429 +#: src/include/partitioning/ep-main.rb:427 msgid "Btrfs" msgstr "" #. tree node label -#: src/include/partitioning/ep-main.rb:436 +#: src/include/partitioning/ep-main.rb:434 msgid "tmpfs" msgstr "" #. tree node label #. heading -#: src/include/partitioning/ep-main.rb:443 +#: src/include/partitioning/ep-main.rb:441 #: src/include/partitioning/ep-unused.rb:87 #, fuzzy msgid "Unused Devices" @@ -4761,20 +4762,20 @@ #. tree node label #. dialog heading -#: src/include/partitioning/ep-main.rb:480 +#: src/include/partitioning/ep-main.rb:470 #: src/include/partitioning/ep-summary.rb:41 msgid "Installation Summary" msgstr "Installation Summary" #. tree node label #. dialog heading -#: src/include/partitioning/ep-main.rb:491 +#: src/include/partitioning/ep-main.rb:481 #: src/include/partitioning/ep-settings.rb:130 msgid "Settings" msgstr "Settings" #. popup text, %1 will be replaces with button text -#: src/include/partitioning/ep-main.rb:576 +#: src/include/partitioning/ep-main.rb:566 #, fuzzy msgid "" "You have changed the partitioning or storage settings. These changes\n" @@ -4786,19 +4787,19 @@ "Continue?\n" #. helptext -#: src/include/partitioning/ep-main.rb:590 +#: src/include/partitioning/ep-main.rb:580 #, fuzzy msgid "<p>Here you can see the partitioning summary.</p>" msgstr "<p>Now, enter the location of the new partition on your hard disk. </p>" #. Fullscreen summary of changes -#: src/include/partitioning/ep-main.rb:602 +#: src/include/partitioning/ep-main.rb:592 #, fuzzy msgid ": Summary" msgstr "Summary" #. tree node label -#: src/include/partitioning/ep-main.rb:677 +#: src/include/partitioning/ep-main.rb:667 #, fuzzy msgid "System View" msgstr "System Check" @@ -6387,7 +6388,7 @@ #. @param integer testsize #. @param [Symbol] used_fs #. @param [Boolean] verbose -#: src/modules/Storage.rb:976 +#: src/modules/Storage.rb:991 msgid "Resize Not Possible:" msgstr "Resize Not Possible:" @@ -6400,7 +6401,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:2706 src/modules/Storage.rb:3911 +#: src/modules/Storage.rb:2691 src/modules/Storage.rb:3914 #, fuzzy #| msgid "" #| "Could not set encryption.\n" @@ -6419,7 +6420,7 @@ "The crypt password provided could be incorrect.\n" #. popup text -#: src/modules/Storage.rb:3942 +#: src/modules/Storage.rb:3945 #, fuzzy msgid "" "The first and the second version\n" @@ -6431,7 +6432,7 @@ "Please try again." #. popup text -#: src/modules/Storage.rb:3973 +#: src/modules/Storage.rb:3976 #, fuzzy msgid "" "The password may only contain the following characters:\n" @@ -6444,29 +6445,29 @@ #. Label: get password for encrypted volume #. Please use newline if label is longer than 40 characters -#: src/modules/Storage.rb:4027 +#: src/modules/Storage.rb:4030 #, fuzzy #| msgid "Enter Encryption Key" msgid "&Enter Encryption Password:" msgstr "Enter Encryption Key" #. Clear password fields on every round. -#: src/modules/Storage.rb:4086 +#: src/modules/Storage.rb:4089 #, fuzzy #| msgid "Enter Provider Password" msgid "Provide Password" msgstr "Enter Provider Password" -#: src/modules/Storage.rb:4105 +#: src/modules/Storage.rb:4108 msgid "The following encrypted volumes are already available." msgstr "" -#: src/modules/Storage.rb:4120 +#: src/modules/Storage.rb:4123 #, fuzzy msgid "Encrypted Volume Activation" msgstr " Volume Group " -#: src/modules/Storage.rb:4124 +#: src/modules/Storage.rb:4127 msgid "" "The following volumes contain an encryption signature but the \n" "passwords are not yet known.\n" @@ -6474,14 +6475,14 @@ "during an update or if they contain an encrypted LVM physical volume." msgstr "" -#: src/modules/Storage.rb:4136 +#: src/modules/Storage.rb:4139 #, fuzzy #| msgid "Do you want to retry?" msgid "Do you want to provide encryption passwords?" msgstr "Do you want to retry?" #. text in help field -#: src/modules/Storage.rb:4193 +#: src/modules/Storage.rb:4196 msgid "" "Enter encryption password for any of the\n" "devices in the locked devices list.\n" @@ -6489,66 +6490,66 @@ msgstr "" #. header text -#: src/modules/Storage.rb:4199 +#: src/modules/Storage.rb:4202 #, fuzzy #| msgid "Enter Encryption Key" msgid "Enter Encryption Password" msgstr "Enter Encryption Key" -#: src/modules/Storage.rb:4202 +#: src/modules/Storage.rb:4205 msgid "There are no encrypted volume to unlock." msgstr "" #. label text, multiple device names follow -#: src/modules/Storage.rb:4215 +#: src/modules/Storage.rb:4218 #, fuzzy #| msgid "YaST2 detected the following device" msgid "Provide password for any of the following devices:" msgstr "YaST2 detected the following device" #. label text, one device name follows -#: src/modules/Storage.rb:4218 +#: src/modules/Storage.rb:4221 #, fuzzy #| msgid "YaST2 detected the following device" msgid "Provide password for the following device:" msgstr "YaST2 detected the following device" -#: src/modules/Storage.rb:4231 +#: src/modules/Storage.rb:4234 msgid "Trying to unlock encrypted volumes..." msgstr "" -#: src/modules/Storage.rb:4255 +#: src/modules/Storage.rb:4258 msgid "Password did not unlock any volume." msgstr "" -#: src/modules/Storage.rb:4341 +#: src/modules/Storage.rb:4344 #, fuzzy #| msgid "DASD Disks" msgid "IDE Disk" msgstr "DASD Disks" -#: src/modules/Storage.rb:4347 +#: src/modules/Storage.rb:4350 #, fuzzy #| msgid "DASD Disks" msgid "SCSI Disk" msgstr "DASD Disks" -#: src/modules/Storage.rb:4353 +#: src/modules/Storage.rb:4356 msgid "Disk" msgstr "Disk" -#: src/modules/Storage.rb:4381 +#: src/modules/Storage.rb:4384 #, fuzzy msgid "DM RAID" msgstr "R&AID:" -#: src/modules/Storage.rb:4394 +#: src/modules/Storage.rb:4397 #, fuzzy msgid "MD RAID" msgstr "R&AID:" #. TRANSLATORS: error popup -#: src/modules/Storage.rb:5177 +#: src/modules/Storage.rb:5223 #, fuzzy #| msgid "" #| "Partition %1 cannot be resized\n" @@ -6558,7 +6559,7 @@ "Partition %1 cannot be resized\n" "because the file system could not be mounted.\n" -#: src/modules/Storage.rb:5203 +#: src/modules/Storage.rb:5249 msgid "" "\n" "Device %1 cannot be modified because it contains activated swap\n" @@ -6568,7 +6569,7 @@ "Device %1 cannot be modified because it contains activated swap\n" "that is needed to run the installation.\n" -#: src/modules/Storage.rb:5217 +#: src/modules/Storage.rb:5263 msgid "" "\n" "Device %1 cannot be modified because it contains the installation\n" @@ -6578,7 +6579,7 @@ "Device %1 cannot be modified because it contains the installation\n" "data needed to perform the installation.\n" -#: src/modules/Storage.rb:5246 +#: src/modules/Storage.rb:5292 msgid "" "\n" "Device %1 cannot be removed because it contains activated swap\n" @@ -6588,7 +6589,7 @@ "Device %1 cannot be removed because it contains activated swap\n" "that is needed to run the installation.\n" -#: src/modules/Storage.rb:5255 +#: src/modules/Storage.rb:5301 msgid "" "\n" "Device %1 cannot be removed because it contains the installation\n" @@ -6598,7 +6599,7 @@ "Device %1 cannot be removed because it contains the installation\n" "data needed to perform the installation.\n" -#: src/modules/Storage.rb:5284 +#: src/modules/Storage.rb:5330 #, fuzzy #| msgid "" #| "\n" @@ -6616,7 +6617,7 @@ "device %2 which contains activated swap that is needed to run \n" "the installation.\n" -#: src/modules/Storage.rb:5295 +#: src/modules/Storage.rb:5341 #, fuzzy #| msgid "" #| "\n" @@ -6632,7 +6633,7 @@ "device %2 which contains data needed to perform the installation.\n" #. the check for verbose is needed for calls from StorageProposal (see bnc#871779) -#: src/modules/Storage.rb:5317 +#: src/modules/Storage.rb:5363 #, fuzzy #| msgid "" #| "Partition %1 cannot be resized\n" @@ -6646,20 +6647,20 @@ "because the file system could not be mounted.\n" #. FIXME: please, add description of the list that is returned by this function. -#: src/modules/Storage.rb:5406 +#: src/modules/Storage.rb:5452 #, fuzzy #| msgid "Copying root filesystem..." msgid "Nothing assigned as root filesystem!" msgstr "Copying root filesystem..." -#: src/modules/Storage.rb:5407 +#: src/modules/Storage.rb:5453 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:6009 +#: src/modules/Storage.rb:6003 #, fuzzy #| msgid "writing the firewall rules failed" msgid "Adding the following resolvables failed: %1" @@ -7334,54 +7335,54 @@ #. enable snapshots for root volume if desired #. penalty for not having separate /home -#: src/modules/StorageProposal.rb:4552 src/modules/StorageProposal.rb:5675 +#: src/modules/StorageProposal.rb:4560 src/modules/StorageProposal.rb:5683 #, fuzzy #| msgid "Resize impossible due to inconsistent fs. Try checking fs under Windows." msgid "Resize impossible due to inconsistent file system. Try checking file system under Windows." msgstr "Resize impossible due to inconsistent fs. Try checking fs under Windows." #. TRANSLATORS: checkbox text -#: src/modules/StorageProposal.rb:6164 +#: src/modules/StorageProposal.rb:6179 #, fuzzy #| msgid "Create &LVM Based Proposal" msgid "Create &LVM-based Proposal" msgstr "Create &LVM Based Proposal" #. TRANSLATORS: checkbox text -#: src/modules/StorageProposal.rb:6179 +#: src/modules/StorageProposal.rb:6194 #, fuzzy msgid "Encr&ypt Volume Group" msgstr " Volume Group " #. TRANSLATORS: combobox label -#: src/modules/StorageProposal.rb:6197 +#: src/modules/StorageProposal.rb:6212 #, fuzzy #| msgid "File system options:" msgid "File System for Root Partition" msgstr "File system options:" #. TRANSLATORS: combobox label -#: src/modules/StorageProposal.rb:6244 +#: src/modules/StorageProposal.rb:6259 #, fuzzy #| msgid "Propose Separate &Home Partition" msgid "File System for Home Partition" msgstr "Propose Separate &Home Partition" #. TRANSLATORS: checkbox text -#: src/modules/StorageProposal.rb:6262 +#: src/modules/StorageProposal.rb:6277 #, fuzzy #| msgid "&Enable Suspend" msgid "Enlarge &Swap for Suspend" msgstr "&Enable Suspend" -#: src/modules/StorageProposal.rb:6272 +#: src/modules/StorageProposal.rb:6287 #, fuzzy #| msgid "Special settings" msgid "Proposal Settings" msgstr "Special settings" #. TRANSLATORS: help text -#: src/modules/StorageProposal.rb:6287 +#: src/modules/StorageProposal.rb:6302 #, fuzzy #| msgid "" #| "<p>\n" @@ -7394,7 +7395,7 @@ "To create an LVM based proposal, choose the corresponding button.</p>\n" #. TRANSLATORS: help text -#: src/modules/StorageProposal.rb:6294 +#: src/modules/StorageProposal.rb:6309 msgid "" "<p>The filesystem for the root partition can be selected with the\n" "corresponding combo box. With the filesystem BtrFS the proposal can\n" @@ -7403,33 +7404,33 @@ msgstr "" #. TRANSLATORS: help text -#: src/modules/StorageProposal.rb:6303 +#: src/modules/StorageProposal.rb:6318 msgid "" "<p>The proposal can create a separate home partition. The filesystem for\n" "the home partition can be selected with the corresponding combo box.</p>" msgstr "" #. TRANSLATORS: help text -#: src/modules/StorageProposal.rb:6310 +#: src/modules/StorageProposal.rb:6325 msgid "" "<p>The swap partition can be made large enough to be used to suspend\n" "the system to disk in most cases.</p>" msgstr "" -#: src/modules/StorageProposal.rb:6335 +#: src/modules/StorageProposal.rb:6350 #, fuzzy msgid "Enter your password for the proposal encryption." msgstr "Enter your password for the encrypted file system." #. Label: get password for user root #. Please use newline if label is longer than 40 characters -#: src/modules/StorageProposal.rb:6342 +#: src/modules/StorageProposal.rb:6357 msgid "Password:" msgstr "Password:" #. Label: get same password again for verification #. Please use newline if label is longer than 40 characters -#: src/modules/StorageProposal.rb:6353 +#: src/modules/StorageProposal.rb:6368 #, fuzzy msgid "Reenter the password for verification:" msgstr "Reenter the password for &verification:" Modified: trunk/yast/en_GB/po/sudo.en_GB.po =================================================================== --- trunk/yast/en_GB/po/sudo.en_GB.po 2015-09-09 08:18:21 UTC (rev 92602) +++ trunk/yast/en_GB/po/sudo.en_GB.po 2015-09-09 08:19:44 UTC (rev 92603) @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: sudo\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-04 15:53+0200\n" +"POT-Creation-Date: 2015-08-25 18:37+0200\n" "PO-Revision-Date: 2008-03-27 22:39+0000\n" "Last-Translator: Benjamin Weber \n" "Language-Team: \n" Modified: trunk/yast/en_GB/po/support.en_GB.po =================================================================== --- trunk/yast/en_GB/po/support.en_GB.po 2015-09-09 08:18:21 UTC (rev 92602) +++ trunk/yast/en_GB/po/support.en_GB.po 2015-09-09 08:19:44 UTC (rev 92603) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: opensuse-i 18n\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-04 15:53+0200\n" +"POT-Creation-Date: 2015-08-25 18:37+0200\n" "PO-Revision-Date: 2014-05-19 09:35+0200\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" @@ -33,56 +33,56 @@ msgstr "&Support" #. Command line parameters dialog caption -#: src/include/support/dialogs.rb:46 +#: src/include/support/dialogs.rb:50 msgid "Supportconfig Overview Dialog" msgstr "Supportconfig Overview Dialog" #. Support configure1 dialog contents -#: src/include/support/dialogs.rb:53 +#: src/include/support/dialogs.rb:57 #, fuzzy #| msgid "Open Novell Support Center" msgid "Open SUSE Support Center" msgstr "Open Novell Support Center" -#: src/include/support/dialogs.rb:58 +#: src/include/support/dialogs.rb:62 #, fuzzy #| msgid "This will start a browser connecting to the Novell Support Center Portal." msgid "This will start a browser connecting to the SUSE Support Center Portal." msgstr "This will start a browser connecting to the Novell Support Center Portal." -#: src/include/support/dialogs.rb:68 +#: src/include/support/dialogs.rb:72 msgid "Open" msgstr "Open" -#: src/include/support/dialogs.rb:79 +#: src/include/support/dialogs.rb:83 msgid "Collect Data" msgstr "Collect Data" -#: src/include/support/dialogs.rb:84 +#: src/include/support/dialogs.rb:88 msgid "This will create a tarball containing the collected log files." msgstr "This will create a tarball containing the collected log files." -#: src/include/support/dialogs.rb:96 +#: src/include/support/dialogs.rb:100 msgid "Create report tarball" msgstr "Create report tarball" -#: src/include/support/dialogs.rb:108 +#: src/include/support/dialogs.rb:112 msgid "Upload Data" msgstr "Upload Data" -#: src/include/support/dialogs.rb:112 +#: src/include/support/dialogs.rb:116 msgid "This will upload the collected logs to the specified URL." msgstr "This will upload the collected logs to the specified URL." -#: src/include/support/dialogs.rb:119 +#: src/include/support/dialogs.rb:123 msgid "Upload" msgstr "Upload" -#: src/include/support/dialogs.rb:149 +#: src/include/support/dialogs.rb:153 msgid "Could not find any installed browser." msgstr "Could not find any installed browser." -#: src/include/support/dialogs.rb:159 +#: src/include/support/dialogs.rb:163 msgid "" "YaST will run a Web browser as superuser. Consider\n" "running it as a non-provileged user and entering the URL\n" @@ -94,185 +94,186 @@ "%1.\n" "Start Web browser?\n" -#: src/include/support/dialogs.rb:201 +#: src/include/support/dialogs.rb:205 msgid "Supportconfig Upload Dialog" msgstr "Supportconfig Upload Dialog" #. Support configure1 dialog contents -#: src/include/support/dialogs.rb:226 +#: src/include/support/dialogs.rb:230 msgid "Save as" msgstr "Save as" -#: src/include/support/dialogs.rb:229 +#: src/include/support/dialogs.rb:233 msgid "Directory to Save" msgstr "Directory to Save" -#: src/include/support/dialogs.rb:239 +#: src/include/support/dialogs.rb:243 msgid "Package with log files" msgstr "Package with log files" -#: src/include/support/dialogs.rb:253 +#: src/include/support/dialogs.rb:257 msgid "Upload log files tarball to URL" msgstr "Upload log files tarball to URL" -#: src/include/support/dialogs.rb:255 src/include/support/dialogs.rb:756 +#: src/include/support/dialogs.rb:259 src/include/support/dialogs.rb:760 msgid "Upload Target" msgstr "Upload Target" #. } -#: src/include/support/dialogs.rb:327 +#: src/include/support/dialogs.rb:331 msgid "Cannot write settings" msgstr "Cannot write settings" -#: src/include/support/dialogs.rb:343 +#: src/include/support/dialogs.rb:347 msgid "Cannot write settings." msgstr "Cannot write settings." -#: src/include/support/dialogs.rb:389 +#: src/include/support/dialogs.rb:393 msgid "Choose Directory Where to Save Tarball" msgstr "Choose Directory Where to Save Tarball" #. Support::log_files["tmp_dir"]=save_dir; -#: src/include/support/dialogs.rb:401 +#: src/include/support/dialogs.rb:405 msgid "Choose Log Files Tarball File" msgstr "Choose Log Files Tarball File" #. Command line parameters dialog caption -#: src/include/support/dialogs.rb:421 +#: src/include/support/dialogs.rb:425 msgid "Supportconfig Parameters Configuration" msgstr "Supportconfig Parameters Configuration" -#: src/include/support/dialogs.rb:426 +#: src/include/support/dialogs.rb:430 msgid "Create a full file listing from '/'" msgstr "Create a full file listing from '/'" -#: src/include/support/dialogs.rb:431 +#: src/include/support/dialogs.rb:435 msgid "Exclude detailed disk info and scans" msgstr "Exclude detailed disk info and scans" -#: src/include/support/dialogs.rb:436 +#: src/include/support/dialogs.rb:440 msgid "Search root filesystem for eDirectory instances" msgstr "Search root filesystem for eDirectory instances" -#: src/include/support/dialogs.rb:441 +#: src/include/support/dialogs.rb:445 msgid "Include full SLP service lists" msgstr "Include full SLP service lists" -#: src/include/support/dialogs.rb:446 +#: src/include/support/dialogs.rb:450 msgid "Performs an rpm -V for each installed rpm" msgstr "Performs an rpm -V for each installed rpm" -#: src/include/support/dialogs.rb:451 +#: src/include/support/dialogs.rb:455 msgid "Include all log file lines, gather additional rotated logs" msgstr "Include all log file lines, gather additional rotated logs" #. Support configure1 dialog contents -#: src/include/support/dialogs.rb:465 +#: src/include/support/dialogs.rb:469 msgid "Use Defaults (ignore /etc/supportconfig.conf)" msgstr "Use Defaults (ignore /etc/supportconfig.conf)" -#: src/include/support/dialogs.rb:472 +#: src/include/support/dialogs.rb:476 msgid "Activates all support functions" msgstr "Activates all support functions" -#: src/include/support/dialogs.rb:479 +#: src/include/support/dialogs.rb:483 msgid "Only gather a minimum amount of info" msgstr "Only gather a minimum amount of info" -#: src/include/support/dialogs.rb:487 +#: src/include/support/dialogs.rb:491 msgid "Use Custom (Expert) Settings" msgstr "Use Custom (Expert) Settings" -#: src/include/support/dialogs.rb:489 +#: src/include/support/dialogs.rb:493 msgid "Expert Settings" msgstr "Expert Settings" -#: src/include/support/dialogs.rb:495 +#: src/include/support/dialogs.rb:499 msgid "Options" msgstr "Options" #. Support overview dialog caption -#: src/include/support/dialogs.rb:584 +#: src/include/support/dialogs.rb:588 msgid "Supportconfig Expert Configuration" msgstr "Supportconfig Expert Configuration" #. FIXME table header -#: src/include/support/dialogs.rb:614 +#: src/include/support/dialogs.rb:618 msgid "Default Options" msgstr "Default Options" #. Support configure2 dialog caption -#: src/include/support/dialogs.rb:680 +#: src/include/support/dialogs.rb:684 msgid "Supportconfig Contact Configuration" msgstr "Supportconfig Contact Configuration" #. Support configure2 dialog contents -#: src/include/support/dialogs.rb:685 +#: src/include/support/dialogs.rb:689 msgid "Contact Information" msgstr "Contact Information" -#: src/include/support/dialogs.rb:690 +#: src/include/support/dialogs.rb:694 msgid "Company" msgstr "Company" -#: src/include/support/dialogs.rb:701 +#: src/include/support/dialogs.rb:705 msgid "Email Address" msgstr "Email Address" -#: src/include/support/dialogs.rb:708 +#: src/include/support/dialogs.rb:712 msgid "Name" msgstr "Name" -#: src/include/support/dialogs.rb:715 +#: src/include/support/dialogs.rb:719 msgid "Phone Number" msgstr "Phone Number" -#: src/include/support/dialogs.rb:722 +#: src/include/support/dialogs.rb:726 msgid "Store ID" msgstr "Store ID" -#: src/include/support/dialogs.rb:733 +#: src/include/support/dialogs.rb:737 msgid "Terminal ID" msgstr "Terminal ID" -#: src/include/support/dialogs.rb:744 +#: src/include/support/dialogs.rb:748 msgid "GPG UID" msgstr "GPG UID" -#: src/include/support/dialogs.rb:751 +#: src/include/support/dialogs.rb:755 msgid "Upload Information" msgstr "Upload Information" -#: src/include/support/dialogs.rb:770 +#: src/include/support/dialogs.rb:774 #, fuzzy #| msgid "Novell 11-digit service request number" msgid "11-digit service request number" msgstr "Novell 11-digit service request number" #. abort? -#: src/include/support/dialogs.rb:847 +#: src/include/support/dialogs.rb:851 msgid "The SR number must be 11 digits" msgstr "The SR number must be 11 digits" -#: src/include/support/dialogs.rb:865 +#: src/include/support/dialogs.rb:869 msgid "Collecting Data" msgstr "Collecting Data" -#: src/include/support/dialogs.rb:866 +#: src/include/support/dialogs.rb:870 msgid "Progress" msgstr "Progress" -#: src/include/support/dialogs.rb:931 +#. Remove ANSI escape codes for cursor movement (bnc#921233) +#: src/include/support/dialogs.rb:939 msgid "Collected Data Review" msgstr "Collected Data Review" #. FIXME use list of generated files, as well as directory prefix #. `MultiLineEdit (`id (`file), `opt (`read_only), _("File Contents")) -#: src/include/support/dialogs.rb:978 src/include/support/dialogs.rb:1026 +#: src/include/support/dialogs.rb:986 src/include/support/dialogs.rb:1034 msgid "File Name" msgstr "File Name" -#: src/include/support/dialogs.rb:984 +#: src/include/support/dialogs.rb:992 msgid "Remove from Data" msgstr "Remove from Data" Modified: trunk/yast/en_GB/po/sysconfig.en_GB.po =================================================================== --- trunk/yast/en_GB/po/sysconfig.en_GB.po 2015-09-09 08:18:21 UTC (rev 92602) +++ trunk/yast/en_GB/po/sysconfig.en_GB.po 2015-09-09 08:19:44 UTC (rev 92603) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: yast2 9.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-04 15:53+0200\n" +"POT-Creation-Date: 2015-08-25 18:37+0200\n" "PO-Revision-Date: 2004-03-18 15:42+0100\n" "Last-Translator: proofreader\n" "Language-Team: en_US\n" @@ -489,101 +489,125 @@ "\n" #. Translation: Progress bar label -#: src/modules/Sysconfig.rb:159 +#: src/modules/Sysconfig.rb:162 msgid "Searching..." msgstr "Searching..." -#. Display confirmation dialog -#. @param [String] message Confirmation message -#. @param [String] command Command to confirm -#. @return [Symbol] `cont - start command, `skip - skip this command, `abort - skip all remaining commands -#: src/modules/Sysconfig.rb:883 -msgid "Command: " -msgstr "Command: " - #. button label -#: src/modules/Sysconfig.rb:889 +#: src/modules/Sysconfig.rb:881 msgid "S&kip" msgstr "S&kip" -#. get activation map for variable -#. start generic commands -#: src/modules/Sysconfig.rb:967 src/modules/Sysconfig.rb:1171 -msgid "A command will be executed" -msgstr "A command will be executed" - -#: src/modules/Sysconfig.rb:968 src/modules/Sysconfig.rb:1172 -msgid "Starting command: %1..." -msgstr "Starting command: %1..." - -#: src/modules/Sysconfig.rb:969 src/modules/Sysconfig.rb:1173 -msgid "Command %1 failed" -msgstr "Command %1 failed" - #. write dialog caption -#: src/modules/Sysconfig.rb:1009 +#: src/modules/Sysconfig.rb:909 msgid "Saving sysconfig Configuration" msgstr "Saving sysconfig Configuration" #. progress bar item -#: src/modules/Sysconfig.rb:1036 +#: src/modules/Sysconfig.rb:923 msgid "Write the new settings" msgstr "Write the new settings" -#: src/modules/Sysconfig.rb:1037 +#: src/modules/Sysconfig.rb:924 msgid "Activate the changes" msgstr "Activate the changes" -#. error popup: %1 - variable name (e.g. DISPLAYMANAGER), %2 - file name (/etc/sysconfig/displaymanager) -#: src/modules/Sysconfig.rb:1060 -msgid "Saving variable %1 to the file %2 failed." -msgstr "Saving variable %1 to the file %2 failed." - -#. progress bar label, %1 is variable name (e.g. DISPLAYMANAGER) -#: src/modules/Sysconfig.rb:1068 -msgid "Saving variable %1..." -msgstr "Saving variable %1..." - -#: src/modules/Sysconfig.rb:1073 +#: src/modules/Sysconfig.rb:934 msgid "Saving changes to the files..." msgstr "Saving changes to the files..." -#. service is running, reload it -#: src/modules/Sysconfig.rb:1100 -msgid "Service %1 will be reloaded" -msgstr "Service %1 will be reloaded" +#. start generic commands +#: src/modules/Sysconfig.rb:965 +msgid "Finished" +msgstr "Finished" -#: src/modules/Sysconfig.rb:1103 -msgid "Reloading service %1..." +#. configuration summary headline +#: src/modules/Sysconfig.rb:1048 +msgid "Configuration Summary" +msgstr "Configuration Summary" + +#. Executes a bash command using #exec_action +#. @see #exec_action +#. @param cmd [String] command to execute +#. @return [Symbol] result returned by #exec_action +#: src/modules/Sysconfig.rb:1132 +msgid "Starting command: %1..." +msgstr "Starting command: %1..." + +#: src/modules/Sysconfig.rb:1133 +msgid "Command %1 failed" +msgstr "Command %1 failed" + +#: src/modules/Sysconfig.rb:1134 +msgid "A command will be executed" +msgstr "A command will be executed" + +#: src/modules/Sysconfig.rb:1134 +msgid "Command: " +msgstr "Command: " + +#. Restarts or reloads a service using #exec_action +#. @see #exec_action +#. @param name [String] service name +#. @param action [Symbol] :reload or :restart +#. @return [Symbol] result returned by #exec_action +#: src/modules/Sysconfig.rb:1156 +#, fuzzy +#| msgid "Reloading service %1..." +msgid "Reloading service %s..." msgstr "Reloading service %1..." -#: src/modules/Sysconfig.rb:1105 -msgid "Reload of the service %1 failed" +#: src/modules/Sysconfig.rb:1157 +#, fuzzy +#| msgid "Reload of the service %1 failed" +msgid "Reload of the service %s failed" msgstr "Reload of the service %1 failed" -#. service is running, restart it -#: src/modules/Sysconfig.rb:1143 -msgid "Service %1 will be restarted" -msgstr "Service %1 will be restarted" +#: src/modules/Sysconfig.rb:1158 +#, fuzzy +#| msgid "Service %1 will be reloaded" +msgid "Service %s will be reloaded" +msgstr "Service %1 will be reloaded" -#: src/modules/Sysconfig.rb:1146 -msgid "Restarting service %1..." +#: src/modules/Sysconfig.rb:1160 +#, fuzzy +#| msgid "Restarting service %1..." +msgid "Restarting service %s..." msgstr "Restarting service %1..." -#: src/modules/Sysconfig.rb:1148 -msgid "Restart of the service %1 failed" +#: src/modules/Sysconfig.rb:1161 +#, fuzzy +#| msgid "Restart of the service %1 failed" +msgid "Restart of the service %s failed" msgstr "Restart of the service %1 failed" -#. set 100% in progress bar -#: src/modules/Sysconfig.rb:1186 -msgid "Finished" -msgstr "Finished" +#: src/modules/Sysconfig.rb:1162 +#, fuzzy +#| msgid "Service %1 will be restarted" +msgid "Service %s will be restarted" +msgstr "Service %1 will be restarted" -#. configuration summary headline -#: src/modules/Sysconfig.rb:1269 -msgid "Configuration Summary" -msgstr "Configuration Summary" +#. Returns whether given service is active (info from systemd) +#. If service is not found, reports error in UI and returns nil +#. +#. @param service name +#. @return [Boolean] active? +#: src/modules/Sysconfig.rb:1187 +#, fuzzy +#| msgid "Cannot delete the service. It is not installed." +msgid "Cannot determine service state, systemd service does not exist:" +msgstr "Cannot delete the service. It is not installed." +#. progress bar label, %1 is variable name (e.g. DISPLAYMANAGER) +#: src/modules/Sysconfig.rb:1266 +msgid "Saving variable %1..." +msgstr "Saving variable %1..." + +#. error popup: %1 - variable name (e.g. DISPLAYMANAGER), %2 - file name (/etc/sysconfig/displaymanager) +#: src/modules/Sysconfig.rb:1273 +msgid "Saving variable %1 to the file %2 failed." +msgstr "Saving variable %1 to the file %2 failed." + #~ msgid "" #~ "<p> SuSEconfig saves a checksum of each configuration file, so it can detect if\n" #~ " you have manually changed any of them. If you have changed a configuration file manually,\n" Modified: trunk/yast/en_GB/po/tftp-server.en_GB.po =================================================================== --- trunk/yast/en_GB/po/tftp-server.en_GB.po 2015-09-09 08:18:21 UTC (rev 92602) +++ trunk/yast/en_GB/po/tftp-server.en_GB.po 2015-09-09 08:19:44 UTC (rev 92603) @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-04 15:53+0200\n" +"POT-Creation-Date: 2015-08-25 18:37+0200\n" "PO-Revision-Date: 2001-07-17 16:27+0200\n" "Last-Translator: James Ogley \n" "Language-Team: English \n" Modified: trunk/yast/en_GB/po/timezone_db.en_GB.po =================================================================== --- trunk/yast/en_GB/po/timezone_db.en_GB.po 2015-09-09 08:18:21 UTC (rev 92602) +++ trunk/yast/en_GB/po/timezone_db.en_GB.po 2015-09-09 08:19:44 UTC (rev 92603) @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: timezone_db\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-04 15:52+0200\n" +"POT-Creation-Date: 2015-08-25 18:36+0200\n" "PO-Revision-Date: 2008-03-27 22:36+0000\n" "Last-Translator: Benjamin Weber \n" "Language-Team: \n" @@ -1392,8 +1392,8 @@ #. time zone #: timezone/src/data/timezone_raw.ycp:587 -msgid "Saigon" -msgstr "Saigon" +msgid "Ho Chi Minh City" +msgstr "" #. time zone #: timezone/src/data/timezone_raw.ycp:591 @@ -2481,6 +2481,9 @@ msgid "GMT-9" msgstr "GMT-9" +#~ msgid "Saigon" +#~ msgstr "Saigon" + #~ msgid "Calcutta" #~ msgstr "Calcutta" Modified: trunk/yast/en_GB/po/tune.en_GB.po =================================================================== --- trunk/yast/en_GB/po/tune.en_GB.po 2015-09-09 08:18:21 UTC (rev 92602) +++ trunk/yast/en_GB/po/tune.en_GB.po 2015-09-09 08:19:44 UTC (rev 92603) @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: tune\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-08-04 16:02+0200\n" +"POT-Creation-Date: 2015-08-25 18:37+0200\n" "PO-Revision-Date: 2008-03-27 22:33+0000\n" "Last-Translator: Benjamin Weber \n" "Language-Team: \n" Modified: trunk/yast/en_GB/po/update.en_GB.po =================================================================== --- trunk/yast/en_GB/po/update.en_GB.po 2015-09-09 08:18:21 UTC (rev 92602) +++ trunk/yast/en_GB/po/update.en_GB.po 2015-09-09 08:19:44 UTC (rev 92603) @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: update\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-04 15:53+0200\n" +"POT-Creation-Date: 2015-08-25 18:37+0200\n" "PO-Revision-Date: 2008-03-27 22:32+0000\n" "Last-Translator: Benjamin Weber \n" "Language-Team: \n" @@ -155,7 +155,7 @@ #. screen title for update options #. this is a heading -#: src/clients/inst_update.rb:48 src/clients/update_proposal.rb:278 +#: src/clients/inst_update.rb:48 src/clients/update_proposal.rb:284 msgid "Update Options" msgstr "Update Options" @@ -184,9 +184,9 @@ #. TRANSLATORS: label for an unknown installed system #: src/clients/inst_update.rb:69 src/clients/inst_update.rb:74 #: src/include/update/rootpart.rb:100 src/include/update/rootpart.rb:106 -#: src/include/update/rootpart.rb:126 src/modules/RootPart.rb:155 -#: src/modules/RootPart.rb:1434 src/modules/RootPart.rb:1440 -#: src/modules/RootPart.rb:1981 +#: src/include/update/rootpart.rb:126 src/modules/RootPart.rb:156 +#: src/modules/RootPart.rb:1441 src/modules/RootPart.rb:1447 +#: src/modules/RootPart.rb:1994 msgid "Unknown" msgstr "Unknown" @@ -308,28 +308,30 @@ msgstr "" #. proposal for packages during update, %1 is count of packages -#: src/clients/packages_proposal.rb:115 +#: src/clients/packages_proposal.rb:119 msgid "Packages to Update: %1" msgstr "Packages to Update: %1" #. proposal for packages during update, %1 is count of packages -#: src/clients/packages_proposal.rb:123 +#: src/clients/packages_proposal.rb:127 msgid "New Packages to Install: %1" msgstr "New Packages to Install: %1" #. proposal for packages during update, %1 is count of packages -#: src/clients/packages_proposal.rb:131 +#: src/clients/packages_proposal.rb:135 msgid "Packages to Remove: %1" msgstr "Packages to Remove: %1" #. part of summary, %1 is size of packages (in MB or GB) -#: src/clients/packages_proposal.rb:139 +#: src/clients/packages_proposal.rb:143 msgid "Total Size of Packages to Update: %1" msgstr "Total Size of Packages to Update: %1" -#. warning text -#: src/clients/packages_proposal.rb:149 -msgid "Cannot solve all conflicts. Manual intervention is required." +#. TRANSLATORS: warning text, keep the HTML tags (<a href...>) untouched +#: src/clients/packages_proposal.rb:154 +#, fuzzy +#| msgid "Cannot solve all conflicts. Manual intervention is required." +msgid "Cannot solve all conflicts. Manual intervention is required.</a>" msgstr "Cannot solve all conflicts. Manual intervention is required." #. this is a heading @@ -374,27 +376,29 @@ #. error message in proposal #. part of error popup message -#: src/clients/update_proposal.rb:85 src/clients/update_proposal.rb:384 +#: src/clients/update_proposal.rb:87 src/clients/update_proposal.rb:390 msgid "Cannot read the current RPM Database." msgstr "Cannot read the current RPM Database." -#. error message in proposal -#: src/clients/update_proposal.rb:101 -msgid "The installed product is not compatible with the product on the installation media." -msgstr "The installed product is not compatible with the product on the installation media." - #. TRANSLATORS: unknown product (label) #. TRANSLATORS: unknown product (label) #. TRANSLATORS: unknown product name #. TRANSLATORS: unknown product name -#: src/clients/update_proposal.rb:110 src/clients/update_proposal.rb:128 -#: src/clients/update_proposal.rb:171 src/clients/update_proposal.rb:177 +#: src/clients/update_proposal.rb:101 src/clients/update_proposal.rb:119 +#: src/clients/update_proposal.rb:174 src/clients/update_proposal.rb:180 msgid "Unknown product" msgstr "Unknown product" +#. error message in proposal +#: src/clients/update_proposal.rb:129 +#, fuzzy +#| msgid "The installed product is not compatible with the product on the installation media." +msgid "The installed product (%{update_from}) is not compatible with the product on the installation media (%{update_to})." +msgstr "The installed product is not compatible with the product on the installation media." + #. TRANSLATORS: proposal error, %1 is the version of installed system #. %2 is the version being installed -#: src/clients/update_proposal.rb:143 +#: src/clients/update_proposal.rb:146 #, fuzzy #| msgid "" #| "Updating system to another version (%1 -> %2) is not supported on the running system.<br>\n" @@ -410,22 +414,22 @@ "or disable software repositories of products with different versions." #. TRANSLATORS: proposal warning, both %1 and %2 are replaced with product names -#: src/clients/update_proposal.rb:164 +#: src/clients/update_proposal.rb:167 msgid "Warning: Updating from '%1' to '%2', products do not exactly match." msgstr "Warning: Updating from '%1' to '%2', products do not exactly match." #. Proposal for backup during update -#: src/clients/update_proposal.rb:191 +#: src/clients/update_proposal.rb:194 msgid "Only update installed packages" msgstr "Only update installed packages" #. proposal string -#: src/clients/update_proposal.rb:206 +#: src/clients/update_proposal.rb:209 msgid "Update based on patterns" msgstr "Update based on patterns" #. TRANSLATORS: proposal dialog help -#: src/clients/update_proposal.rb:232 +#: src/clients/update_proposal.rb:238 #, fuzzy msgid "" "<p><b><big>Update Options</big></b> Select how your system will be updated.\n" @@ -439,17 +443,17 @@ "(the default selection), and whether unmaintained packages should be deleted." #. this is a menu entry -#: src/clients/update_proposal.rb:280 +#: src/clients/update_proposal.rb:286 msgid "&Update Options" msgstr "&Update Options" #. part of error popup message, %1 stands for newline-separated list of files -#: src/clients/update_proposal.rb:387 +#: src/clients/update_proposal.rb:393 msgid "None of these files exist:%1" msgstr "None of these files exist:%1" #. continue-cancel popup -#: src/clients/update_proposal.rb:517 +#: src/clients/update_proposal.rb:529 msgid "" "The installed product is not compatible with the product\n" "on the installation media. If you try to update using the\n" @@ -611,7 +615,7 @@ msgstr "&Continue" #. Link to SDB article concerning renaming of devices. -#: src/modules/RootPart.rb:108 +#: src/modules/RootPart.rb:109 #, fuzzy msgid "" "See the SDB article at %1 for details\n" @@ -621,17 +625,17 @@ "about how to solve this problem." #. label - name of sustem to update -#: src/modules/RootPart.rb:146 +#: src/modules/RootPart.rb:147 msgid "Unknown Linux System" msgstr "Unknown Linux System" #. label - name of sustem to update -#: src/modules/RootPart.rb:151 +#: src/modules/RootPart.rb:152 msgid "Non-Linux System" msgstr "Non-Linux System" #. error report, %1 is device (eg. /dev/hda1) -#: src/modules/RootPart.rb:307 +#: src/modules/RootPart.rb:308 msgid "" "Cannot unmount partition %1.\n" "\n" @@ -646,7 +650,7 @@ "or restart your computer.\n" #. label, %1 is partition -#: src/modules/RootPart.rb:378 +#: src/modules/RootPart.rb:379 msgid "Checking partition %1" msgstr "Checking partition %1" @@ -655,23 +659,23 @@ #. @param string button (true) #. @param string button (false) #. @param [String] details (hidden under [Details] button; optional; to disable, use "") -#: src/modules/RootPart.rb:415 +#: src/modules/RootPart.rb:416 msgid "Show &Details" msgstr "Show &Details" #. #176292, run fsck before jfs is mounted -#: src/modules/RootPart.rb:497 +#: src/modules/RootPart.rb:498 msgid "Checking file system on %1..." msgstr "Checking file system on %1..." #. popup headline -#: src/modules/RootPart.rb:529 +#: src/modules/RootPart.rb:530 msgid "File System Check Failed" msgstr "File System Check Failed" #. popup question (continue/cancel dialog) #. %1 is a device name such as /dev/hda5 -#: src/modules/RootPart.rb:533 +#: src/modules/RootPart.rb:534 #, fuzzy #| msgid "" #| "The file system check of device %1 has failed.\n" @@ -687,24 +691,24 @@ "Would you like to continue in mounting the device?" #. button -#: src/modules/RootPart.rb:542 +#: src/modules/RootPart.rb:543 msgid "&Skip Mounting" msgstr "&Skip Mounting" #. yes-no popup -#: src/modules/RootPart.rb:1058 +#: src/modules/RootPart.rb:1065 msgid "Incorrect password. Try again?" msgstr "Incorrect password. Try again?" #. TRANSLATORS: a popup headline -#: src/modules/RootPart.rb:1161 +#: src/modules/RootPart.rb:1168 msgid "Warning" msgstr "Warning" #. TRANSLATORS: error message, #. %1 is replaced with the current /boot partition size #. %2 with the recommended size -#: src/modules/RootPart.rb:1166 +#: src/modules/RootPart.rb:1173 #, fuzzy #| msgid "" #| "Your /boot partition is too small (%1 MB).\n" @@ -729,7 +733,7 @@ "Would you like to continue updating the current system?" #. label in a popup, %1 is device (eg. /dev/hda1), %2 is output of the 'mount' command -#: src/modules/RootPart.rb:1258 +#: src/modules/RootPart.rb:1265 #, fuzzy #| msgid "" #| "The partition %1 could not be mounted.\n" @@ -760,27 +764,27 @@ "To abort update, click Cancel." #. push button -#: src/modules/RootPart.rb:1276 +#: src/modules/RootPart.rb:1283 msgid "&Specify Mount Options" msgstr "&Specify Mount Options" #. popup heading -#: src/modules/RootPart.rb:1292 +#: src/modules/RootPart.rb:1299 msgid "Mount Options" msgstr "Mount Options" #. text entry label -#: src/modules/RootPart.rb:1295 +#: src/modules/RootPart.rb:1302 msgid "&Mount Point" msgstr "&Mount Point" #. tex entry label -#: src/modules/RootPart.rb:1298 +#: src/modules/RootPart.rb:1305 msgid "&Device" msgstr "&Device" #. text entry label -#: src/modules/RootPart.rb:1303 +#: src/modules/RootPart.rb:1310 msgid "" "&File System\n" "(empty for autodetection)" @@ -789,12 +793,12 @@ "(empty for autodetection)" #. error message -#: src/modules/RootPart.rb:1380 +#: src/modules/RootPart.rb:1387 msgid "The /var partition %1 could not be mounted.\n" msgstr "The /var partition %1 could not be mounted.\n" #. Informational text about selected partition, %x are replaced with values later -#: src/modules/RootPart.rb:1421 +#: src/modules/RootPart.rb:1428 msgid "" "<b>File system:</b> %1, <b>Type:</b> %2,<br>\n" "<b>Label:</b> %3, <b>Size:</b> %4,<br>\n" @@ -802,18 +806,18 @@ "<b>udev path:</b> %6" msgstr "" -#: src/modules/RootPart.rb:1435 +#: src/modules/RootPart.rb:1442 msgid "None" msgstr "None" #. a popup caption -#: src/modules/RootPart.rb:1458 +#: src/modules/RootPart.rb:1465 #, fuzzy msgid "Unable to find the /var partition automatically" msgstr "Unable to mount /var partition with this disk configuration.\n" #. a popup message -#: src/modules/RootPart.rb:1463 +#: src/modules/RootPart.rb:1470 msgid "" "Your system uses a separate /var partition which is required for the upgrade\n" "process to detect the disk-naming changes. Select the /var partition manually\n" @@ -821,24 +825,24 @@ msgstr "" #. a combo-box label -#: src/modules/RootPart.rb:1476 +#: src/modules/RootPart.rb:1483 #, fuzzy msgid "&Select /var Partition Device" msgstr "Select a Root Partition" #. an informational rich-text widget label -#: src/modules/RootPart.rb:1482 +#: src/modules/RootPart.rb:1489 #, fuzzy msgid "Device Info" msgstr "Device ID" #. error message -#: src/modules/RootPart.rb:1623 +#: src/modules/RootPart.rb:1630 msgid "Unable to mount /var partition with this disk configuration.\n" msgstr "Unable to mount /var partition with this disk configuration.\n" #. popup message, %1 will be replace with the name of the logfile -#: src/modules/RootPart.rb:1654 +#: src/modules/RootPart.rb:1661 msgid "" "Partitions could not be mounted.\n" "\n" @@ -851,7 +855,7 @@ #. read the keyboard settings now, so that it used when #. typing passwords for encrypted partitions #. Calling a script because otherwise this module would depend on yast2-country -#: src/modules/RootPart.rb:1698 +#: src/modules/RootPart.rb:1705 msgid "" "Some partitions in the system on %1 are mounted by kernel-device name. This is\n" "not reliable for the update since kernel-device names are unfortunately not\n" @@ -860,32 +864,32 @@ msgstr "" #. error message -#: src/modules/RootPart.rb:1716 +#: src/modules/RootPart.rb:1723 msgid "No fstab found." msgstr "No fstab found." #. message part 1 -#: src/modules/RootPart.rb:1741 +#: src/modules/RootPart.rb:1748 msgid "The root partition in /etc/fstab has an invalid root device.\n" msgstr "The root partition in /etc/fstab has an invalid root device.\n" #. message part 2 -#: src/modules/RootPart.rb:1746 +#: src/modules/RootPart.rb:1753 msgid "It is currently mounted as %1 but listed as %2.\n" msgstr "It is currently mounted as %1 but listed as %2.\n" #. prepare progress-bar -#: src/modules/RootPart.rb:2102 +#: src/modules/RootPart.rb:2115 msgid "Evaluating root partition. One moment please..." msgstr "Evaluating root partition. One moment please..." #. intermediate popup while mounting partitions -#: src/modules/RootPart.rb:2184 +#: src/modules/RootPart.rb:2197 msgid "Mounting partitions. One moment please..." msgstr "Mounting partitions. One moment please..." #. TRANSLATORS: dialog caption -#: src/modules/RootPart.rb:2199 +#: src/modules/RootPart.rb:2212 #, fuzzy #| msgid "Checking for available updates..." msgid "Searching for Available Systems" Modified: trunk/yast/en_GB/po/users.en_GB.po =================================================================== --- trunk/yast/en_GB/po/users.en_GB.po 2015-09-09 08:18:21 UTC (rev 92602) +++ trunk/yast/en_GB/po/users.en_GB.po 2015-09-09 08:19:44 UTC (rev 92603) @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: users\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-04 15:53+0200\n" +"POT-Creation-Date: 2015-08-25 18:37+0200\n" "PO-Revision-Date: 2008-03-27 22:31+0000\n" "Last-Translator: Benjamin Weber \n" "Language-Team: \n" @@ -149,7 +149,7 @@ #. helptext 2/3 #. help text for dialog "User Authentication Method" 2/2 -#: src/clients/inst_auth.rb:125 src/clients/inst_user_first.rb:162 +#: src/clients/inst_auth.rb:125 src/clients/inst_user_first.rb:164 msgid "<p>Select <b>Local</b> to authenticate users only by using the local files <i>/etc/passwd</i> and <i>/etc/shadow</i>.</p>" msgstr "<p>Select <b>Local</b> to authenticate users only by using the local files <i>/etc/passwd</i> and <i>/etc/shadow</i>.</p>" @@ -181,7 +181,7 @@ #. radiobutton to select local user auth. #. radiobutton label -#: src/clients/inst_auth.rb:151 src/clients/inst_user_first.rb:83 +#: src/clients/inst_auth.rb:151 src/clients/inst_user_first.rb:85 msgid "L&ocal (/etc/passwd)" msgstr "L&ocal (/etc/passwd)" @@ -238,18 +238,18 @@ #. check box label #. check box label -#: src/clients/inst_auth.rb:240 src/clients/inst_user_first.rb:100 +#: src/clients/inst_auth.rb:240 src/clients/inst_user_first.rb:102 msgid "&Read User Data from a Previous Installation" msgstr "&Read User Data from a Previous Installation" #. button label #. button label -#: src/clients/inst_auth.rb:245 src/clients/inst_user_first.rb:105 +#: src/clients/inst_auth.rb:245 src/clients/inst_user_first.rb:107 msgid "&Choose" msgstr "&Choose" #. frame title for authentication methods -#: src/clients/inst_auth.rb:295 src/clients/inst_user_first.rb:134 +#: src/clients/inst_auth.rb:295 src/clients/inst_user_first.rb:136 msgid "Authentication Method" msgstr "Authentication Method" @@ -260,13 +260,13 @@ #. selection box label #. selection box label -#: src/clients/inst_auth.rb:428 src/clients/inst_user_first.rb:498 +#: src/clients/inst_auth.rb:428 src/clients/inst_user_first.rb:507 msgid "&Select Users to Read" msgstr "&Select Users to Read" #. check box label #. check box label -#: src/clients/inst_auth.rb:434 src/clients/inst_user_first.rb:506 +#: src/clients/inst_auth.rb:434 src/clients/inst_user_first.rb:515 msgid "Select or Deselect &All" msgstr "Select or Deselect &All" @@ -397,8 +397,8 @@ #. The two group password information do not match #. error popup #: src/clients/inst_root.rb:233 src/clients/inst_root_first.rb:185 -#: src/clients/inst_user_first.rb:679 src/include/users/dialogs.rb:146 -#: src/include/users/dialogs.rb:1246 src/include/users/dialogs.rb:2363 +#: src/clients/inst_user_first.rb:688 src/include/users/dialogs.rb:146 +#: src/include/users/dialogs.rb:1247 src/include/users/dialogs.rb:2364 msgid "" "The passwords do not match.\n" "Try again." @@ -440,8 +440,8 @@ #. last part of message popup #. last part of message popup #: src/clients/inst_root.rb:285 src/clients/inst_root_first.rb:239 -#: src/clients/inst_user_first.rb:705 src/include/users/dialogs.rb:1268 -#: src/include/users/dialogs.rb:2390 +#: src/clients/inst_user_first.rb:714 src/include/users/dialogs.rb:1269 +#: src/include/users/dialogs.rb:2391 #, fuzzy #| msgid "&Reset Password" msgid "Really use this password?" @@ -479,7 +479,7 @@ #. encryption type #. encryption type #. encryption type -#: src/clients/inst_user_first.rb:87 src/clients/users_proposal.rb:53 +#: src/clients/inst_user_first.rb:89 src/clients/users_proposal.rb:53 #: src/include/users/helps.rb:52 src/include/users/helps.rb:54 msgid "DES" msgstr "DES" @@ -487,61 +487,61 @@ #. encryption type #. encryption type #. encryption type -#: src/clients/inst_user_first.rb:89 src/clients/users_proposal.rb:55 +#: src/clients/inst_user_first.rb:91 src/clients/users_proposal.rb:55 #: src/include/users/helps.rb:56 msgid "MD5" msgstr "MD5" #. encryption type #. encryption type -#: src/clients/inst_user_first.rb:91 src/clients/users_proposal.rb:57 +#: src/clients/inst_user_first.rb:93 src/clients/users_proposal.rb:57 msgid "SHA-256" msgstr "" #. encryption type #. encryption type -#: src/clients/inst_user_first.rb:93 src/clients/users_proposal.rb:59 +#: src/clients/inst_user_first.rb:95 src/clients/users_proposal.rb:59 msgid "SHA-512" msgstr "" #. frame label -#: src/clients/inst_user_first.rb:141 +#: src/clients/inst_user_first.rb:143 msgid "Password Encryption Type" msgstr "Password Encryption Type" #. Radio button label: password encryption type #. Radio buttons for password encryption: DES-crypt -#: src/clients/inst_user_first.rb:147 src/include/users/widgets.rb:513 +#: src/clients/inst_user_first.rb:149 src/include/users/widgets.rb:513 msgid "&DES" msgstr "" #. Radio button label: password encryption type #. Radio buttons for password encryption: MD5-crypt -#: src/clients/inst_user_first.rb:149 src/include/users/widgets.rb:515 +#: src/clients/inst_user_first.rb:151 src/include/users/widgets.rb:515 msgid "&MD5" msgstr "&MD5" #. Radio button label: password encryption type #. Radio buttons for password encryption: sha256 crypt -#: src/clients/inst_user_first.rb:151 src/include/users/widgets.rb:520 +#: src/clients/inst_user_first.rb:153 src/include/users/widgets.rb:520 msgid "SHA-&256" msgstr "" #. Radio button label: password encryption type #. Radio buttons for password encryption: sha512 crypt -#: src/clients/inst_user_first.rb:153 src/include/users/widgets.rb:528 +#: src/clients/inst_user_first.rb:155 src/include/users/widgets.rb:528 msgid "SHA-&512" msgstr "" #. help text for dialog "User Authentication Method" 1/2 -#: src/clients/inst_user_first.rb:160 +#: src/clients/inst_user_first.rb:162 #, fuzzy #| msgid "<p><b>Login Settings</b></p>" msgid "<p><b>Authentication</b><br></p>" msgstr "<p><b>Login Settings</b></p>" #. Help text for password expert dialog -#: src/clients/inst_user_first.rb:166 +#: src/clients/inst_user_first.rb:168 #, fuzzy #| msgid "The password encryption method is %1." msgid "<p>Choose a password encryption method for local and system users.</p>" @@ -549,41 +549,41 @@ #. Help text for password expert dialog #. Help text for password expert dialog 4/5 -#: src/clients/inst_user_first.rb:168 src/include/users/widgets.rb:491 +#: src/clients/inst_user_first.rb:170 src/include/users/widgets.rb:491 msgid "<p><b>SHA-512</b> is the current standard hash method. Using other algorithms is not recommended unless needed for compatibility purposes.</p>" msgstr "" #. text entry #. text entry -#: src/clients/inst_user_first.rb:221 src/include/users/dialogs.rb:403 +#: src/clients/inst_user_first.rb:223 src/include/users/dialogs.rb:403 msgid "User's &Full Name" msgstr "User's &Full Name" #. input field for login name #. input field for login name -#: src/clients/inst_user_first.rb:228 src/include/users/dialogs.rb:433 +#: src/clients/inst_user_first.rb:230 src/include/users/dialogs.rb:433 msgid "&Username" msgstr "&Username" #. checkbox label #. checkbox label -#: src/clients/inst_user_first.rb:250 src/include/users/dialogs.rb:470 +#: src/clients/inst_user_first.rb:252 src/include/users/dialogs.rb:470 msgid "U&se this password for system administrator" msgstr "U&se this password for system administrator" #. checkbox label #. checkbox label -#: src/clients/inst_user_first.rb:256 src/include/users/dialogs.rb:446 +#: src/clients/inst_user_first.rb:258 src/include/users/dialogs.rb:446 msgid "Receive S&ystem Mail" msgstr "Receive S&ystem Mail" #. checkbox label -#: src/clients/inst_user_first.rb:259 +#: src/clients/inst_user_first.rb:261 msgid "&Automatic Login" msgstr "&Automatic Login" #. dialog caption -#: src/clients/inst_user_first.rb:281 +#: src/clients/inst_user_first.rb:283 msgid "Create New User" msgstr "Create New User" @@ -591,13 +591,13 @@ #. The user login field is empty, this is allowed if the #. system is part of a network with (e.g.) NIS user management. #. yes-no popup headline -#: src/clients/inst_user_first.rb:350 src/include/users/dialogs.rb:1112 +#: src/clients/inst_user_first.rb:342 src/include/users/dialogs.rb:1112 msgid "Empty User Login" msgstr "Empty User Login" #. yes-no popup contents #. yes-no popup contents -#: src/clients/inst_user_first.rb:352 src/include/users/dialogs.rb:1114 +#: src/clients/inst_user_first.rb:344 src/include/users/dialogs.rb:1114 msgid "" "Leaving the user name empty only makes sense\n" "in a network environment with an authentication server.\n" @@ -609,7 +609,7 @@ #. help text for main add user dialog #. alternative help text 1/7 -#: src/clients/inst_user_first.rb:441 src/include/users/helps.rb:212 +#: src/clients/inst_user_first.rb:450 src/include/users/helps.rb:212 msgid "" "<p>\n" "Enter the <b>User's Full Name</b>, <b>Username</b>, and <b>Password</b> to\n" @@ -622,7 +622,7 @@ "</p>\n" #. help text for main add user dialog -#: src/clients/inst_user_first.rb:444 +#: src/clients/inst_user_first.rb:453 #, fuzzy msgid "" "<p>\n" @@ -638,7 +638,7 @@ #. help text %1 is encryption type, %2,%3 numbers #. help text 2/4 %1 is encryption type, %2,%3 numbers -#: src/clients/inst_user_first.rb:448 src/include/users/helps.rb:73 +#: src/clients/inst_user_first.rb:457 src/include/users/helps.rb:73 msgid "" "<p>\n" "With the current password encryption (%1), the password length should be between\n" @@ -651,7 +651,7 @@ "</p>" #. additional help text about password -#: src/clients/inst_user_first.rb:458 +#: src/clients/inst_user_first.rb:467 #, fuzzy #| msgid "" #| "<p>If you intend to use this password for creating certificates,\n" @@ -665,7 +665,7 @@ #. help text for main add user dialog #. help text 4/4 -#: src/clients/inst_user_first.rb:463 src/include/users/helps.rb:90 +#: src/clients/inst_user_first.rb:472 src/include/users/helps.rb:90 msgid "" "<p>\n" "To ensure that the password was entered correctly,\n" @@ -678,7 +678,7 @@ "</p>\n" #. help text for main add user dialog -#: src/clients/inst_user_first.rb:467 +#: src/clients/inst_user_first.rb:476 msgid "" "<p>\n" "For the <b>Username</b> use only letters (no accented characters), digits, and <tt>._-</tt>.\n" @@ -695,14 +695,14 @@ "</p>\n" #. help text for main add user dialog -#: src/clients/inst_user_first.rb:473 +#: src/clients/inst_user_first.rb:482 msgid "<p>Check <b>Use this password for system administrator</b> if the same password as entered for the first user should be used for root.</p>" msgstr "<p>Check <b>Use this password for system administrator</b> if the same password as entered for the first user should be used for root.</p>" #. help text for main add user dialog #. these are used only during installation time #. help text 4/7 (only during installation) -#: src/clients/inst_user_first.rb:476 src/include/users/helps.rb:259 +#: src/clients/inst_user_first.rb:485 src/include/users/helps.rb:259 msgid "" "<p>\n" "The username and password created here are needed to log in and work with your Linux system. With <b>Automatic Login</b> enabled, the login procedure is skipped. This user is logged in automatically.</p>\n" @@ -712,7 +712,7 @@ #. help text for main add user dialog #. help text 5/7 (only during installation) -#: src/clients/inst_user_first.rb:480 src/include/users/helps.rb:264 +#: src/clients/inst_user_first.rb:489 src/include/users/helps.rb:264 msgid "" "<p>\n" "Have mail for root forwarded to this user by checking <b>Receive System Mail</b>.</p>\n" @@ -723,24 +723,24 @@ #. Dialog for expert user settings: authentication method as well #. as password encryption (see fate 302980) #. @return true if user accepted expert settings -#: src/clients/inst_user_first.rb:564 +#: src/clients/inst_user_first.rb:573 msgid "Expert Settings" msgstr "Expert Settings" #. summary label -#: src/clients/inst_user_first.rb:616 +#: src/clients/inst_user_first.rb:625 msgid "The authentication method is local /etc/passwd." msgstr "The authentication method is local /etc/passwd." #. summary label -#: src/clients/inst_user_first.rb:619 +#: src/clients/inst_user_first.rb:628 #, fuzzy #| msgid "The password encryption method is %1." msgid "The password encryption method is %s." msgstr "The password encryption method is %1." #. summary label, %s is a single user name or multiple usernames (comma separated) -#: src/clients/inst_user_first.rb:626 +#: src/clients/inst_user_first.rb:635 #, fuzzy msgid "User %s will be imported." msgid_plural "Users %s will be imported." @@ -748,17 +748,17 @@ msgstr[1] "Service %1 will be restarted" #. pushbutton label -#: src/clients/inst_user_first.rb:641 +#: src/clients/inst_user_first.rb:650 msgid "&Change..." msgstr "&Change..." #. frame label -#: src/clients/inst_user_first.rb:648 +#: src/clients/inst_user_first.rb:657 msgid "Summary" msgstr "Summary" #. yes/no popup question, %s is a number -#: src/clients/inst_user_first.rb:700 +#: src/clients/inst_user_first.rb:709 #, fuzzy #| msgid "" #| "If you intend to create certificates,\n" @@ -894,7 +894,7 @@ msgstr "New UID of the user" #. progress step title -#: src/clients/users_finish.rb:66 +#: src/clients/users_finish.rb:63 msgid "Writing Users Configuration..." msgstr "Writing Users Configuration..." @@ -1043,7 +1043,7 @@ #. popup label - don't reorder the letters YYYY-MM-DD #. The date must stay in this format #: src/clients/users_plugin_ldap_shadowaccount.rb:235 -#: src/include/users/dialogs.rb:1675 src/include/users/widgets.rb:1665 +#: src/include/users/dialogs.rb:1676 src/include/users/widgets.rb:1665 msgid "The expiration date must be in the format YYYY-MM-DD." msgstr "The expiration date must be in the format YYYY-MM-DD." @@ -1562,19 +1562,19 @@ #. table header #. table header -#: src/include/users/dialogs.rb:935 src/include/users/dialogs.rb:2216 +#: src/include/users/dialogs.rb:935 src/include/users/dialogs.rb:2217 msgid "Plug-In Description" msgstr "Plug-In Description" #. pushbutton label #. pushbutton label -#: src/include/users/dialogs.rb:944 src/include/users/dialogs.rb:2225 +#: src/include/users/dialogs.rb:944 src/include/users/dialogs.rb:2226 msgid "Add &or Remove Plug-In" msgstr "Add &or Remove Plug-In" #. pushbutton label #. pushbutton label -#: src/include/users/dialogs.rb:947 src/include/users/dialogs.rb:2228 +#: src/include/users/dialogs.rb:947 src/include/users/dialogs.rb:2229 msgid "&Launch" msgstr "&Launch" @@ -1630,17 +1630,17 @@ #. tab label #. tab label -#: src/include/users/dialogs.rb:1019 src/include/users/dialogs.rb:2272 +#: src/include/users/dialogs.rb:1019 src/include/users/dialogs.rb:2273 msgid "Plu&g-Ins" msgstr "Plu&g-Ins" #. popup question -#: src/include/users/dialogs.rb:1307 +#: src/include/users/dialogs.rb:1308 msgid "Change home directory to %1?" msgstr "Change home directory to %1?" #. error popup -#: src/include/users/dialogs.rb:1429 +#: src/include/users/dialogs.rb:1430 msgid "" "The home directory for this user cannot be decrypted,\n" "because the user is currently logged in.\n" @@ -1651,12 +1651,12 @@ "Log the user out first." #. error popup -#: src/include/users/dialogs.rb:1576 +#: src/include/users/dialogs.rb:1577 msgid "Enter the size for the home directory." msgstr "Enter the size for the home directory." #. error popup -#: src/include/users/dialogs.rb:1582 +#: src/include/users/dialogs.rb:1583 msgid "" "\n" "Directory cannot be encrypted." @@ -1664,64 +1664,64 @@ #. popup message #. popup message -#: src/include/users/dialogs.rb:1749 src/include/users/dialogs.rb:2484 +#: src/include/users/dialogs.rb:1750 src/include/users/dialogs.rb:2485 msgid "This plug-in cannot be removed." msgstr "This plug-in cannot be removed." #. popup text -#: src/include/users/dialogs.rb:2004 +#: src/include/users/dialogs.rb:2005 msgid "Now you have added a new user." msgstr "Now you have added a new user." #. dialog caption: -#: src/include/users/dialogs.rb:2070 +#: src/include/users/dialogs.rb:2071 msgid "New Local Group" msgstr "New Local Group" #. dialog caption: -#: src/include/users/dialogs.rb:2072 +#: src/include/users/dialogs.rb:2073 msgid "New System Group" msgstr "New System Group" #. dialog caption: -#: src/include/users/dialogs.rb:2074 +#: src/include/users/dialogs.rb:2075 msgid "New LDAP Group" msgstr "New LDAP Group" #. dialog caption: -#: src/include/users/dialogs.rb:2078 +#: src/include/users/dialogs.rb:2079 msgid "Existing Local Group" msgstr "Existing Local Group" #. dialog caption: -#: src/include/users/dialogs.rb:2080 +#: src/include/users/dialogs.rb:2081 msgid "Existing System Group" msgstr "Existing System Group" #. dialog caption: -#: src/include/users/dialogs.rb:2082 +#: src/include/users/dialogs.rb:2083 msgid "Existing LDAP Group" msgstr "Existing LDAP Group" #. textentry label -#: src/include/users/dialogs.rb:2144 +#: src/include/users/dialogs.rb:2145 msgid "Group &Name" msgstr "Group &Name" #. textentry label -#: src/include/users/dialogs.rb:2153 +#: src/include/users/dialogs.rb:2154 msgid "Group &ID (gid)" msgstr "Group &ID (gid)" #. selection box label #. add items later (when there is a huge amount of them, it takes #. long time to display, so display at least the rest of the dialog) -#: src/include/users/dialogs.rb:2173 src/include/users/dialogs.rb:2592 +#: src/include/users/dialogs.rb:2174 src/include/users/dialogs.rb:2593 msgid "Group &Members" msgstr "Group &Members" #. tab label -#: src/include/users/dialogs.rb:2270 +#: src/include/users/dialogs.rb:2271 msgid "Group &Data" msgstr "Group &Data" @@ -3586,13 +3586,13 @@ #. init dialog caption #. dialog caption -#: src/include/users/wizards.rb:263 src/include/users/wizards.rb:286 +#: src/include/users/wizards.rb:261 src/include/users/wizards.rb:284 msgid "User and Group Configuration" msgstr "User and Group Configuration" #. label (during init dialog) #. label (during init dialog) -#: src/include/users/wizards.rb:265 src/include/users/wizards.rb:289 +#: src/include/users/wizards.rb:263 src/include/users/wizards.rb:287 msgid "Initializing..." msgstr "Initialising..." @@ -4558,14 +4558,14 @@ "group name and an existing group name.\n" "Try another one." -#: src/modules/Users.pm:5529 +#: src/modules/Users.pm:5531 #, fuzzy, perl-format #| msgid "User does not exist." msgid "User %s does not exist." msgstr "User does not exist." #. error message: group cannot be deleted -#: src/modules/Users.pm:5583 +#: src/modules/Users.pm:5585 msgid "" "You cannot delete this group because\n" "there are users that use this group\n" @@ -4576,7 +4576,7 @@ "as their default group." #. error message: group cannot be deleted -#: src/modules/Users.pm:5590 +#: src/modules/Users.pm:5592 msgid "" "You cannot delete this group because\n" "there are users in the group.\n" @@ -4587,23 +4587,23 @@ "Remove these users from the group first." #. summary label -#: src/modules/Users.pm:6601 +#: src/modules/Users.pm:6603 msgid "<h3>Users</h3>" msgstr "<h3>Users</h3>" #. summary label -#: src/modules/Users.pm:6611 +#: src/modules/Users.pm:6613 msgid "<h3>Groups</h3>" msgstr "<h3>Groups</h3>" #. summary label -#: src/modules/Users.pm:6622 +#: src/modules/Users.pm:6624 #, fuzzy msgid "<h3>Login Settings</h3>" msgstr "Login Settings" #. summary item, %1 is user name -#: src/modules/Users.pm:6624 +#: src/modules/Users.pm:6626 msgid "User %1 configured for automatic login" msgstr "" Modified: trunk/yast/en_GB/po/vm.en_GB.po =================================================================== --- trunk/yast/en_GB/po/vm.en_GB.po 2015-09-09 08:18:21 UTC (rev 92602) +++ trunk/yast/en_GB/po/vm.en_GB.po 2015-09-09 08:19:44 UTC (rev 92603) @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: vm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-10-29 16:22+0100\n" +"POT-Creation-Date: 2015-08-25 18:37+0200\n" "PO-Revision-Date: 2008-03-27 22:27+0000\n" "Last-Translator: Benjamin Weber \n" "Language-Team: \n" Added: trunk/yast/en_GB/po/vpn.en_GB.po =================================================================== --- trunk/yast/en_GB/po/vpn.en_GB.po (rev 0) +++ trunk/yast/en_GB/po/vpn.en_GB.po 2015-09-09 08:19:44 UTC (rev 92603) @@ -0,0 +1,642 @@ +# English message file for YaST2 (@memory@). +# Copyright (C) 2005 SUSE Linux Products GmbH. +# Copyright (C) 2002 SuSE Linux AG. +# Copyright (C) 2000, 2001 SuSE GmbH. +# James Ogley , 2000, 2001. +# +msgid "" +msgstr "" +"Project-Id-Version: YaST (@memory@)\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2015-08-25 18:37+0200\n" +"PO-Revision-Date: 2001-07-17 16:27+0200\n" +"Last-Translator: James Ogley \n" +"Language-Team: English \n" +"Language: en\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8-bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" + +#. Manage VPN client secrets. +#: src/lib/vpn/edit_client_secrets.rb:56 +msgid "Pre-shared key for gateways" +msgstr "" + +#: src/lib/vpn/edit_client_secrets.rb:57 src/lib/vpn/edit_client_secrets.rb:62 +#, fuzzy +#| msgid "Gateway" +msgid "Gateway IP" +msgstr "Gateway" + +#: src/lib/vpn/edit_client_secrets.rb:57 +#, fuzzy +#| msgid "WEP - Shared Key" +msgid "Pre-shared key" +msgstr "WEP - Shared Key" + +#: src/lib/vpn/edit_client_secrets.rb:59 src/lib/vpn/edit_client_secrets.rb:63 +#, fuzzy +#| msgid "&Set" +msgid "Set" +msgstr "&Set" + +#: src/lib/vpn/edit_client_secrets.rb:60 src/lib/vpn/edit_gw_secrets.rb:188 +#, fuzzy +#| msgid "Show &Next" +msgid "Show key" +msgstr "Show &Next" + +#: src/lib/vpn/edit_client_secrets.rb:61 +#, fuzzy +#| msgid "Certificate key file does not exist." +msgid "Certificate/key pair for gateways" +msgstr "Certificate key file does not exist." + +#: src/lib/vpn/edit_client_secrets.rb:62 +msgid "Certificate" +msgstr "Certificate" + +#: src/lib/vpn/edit_client_secrets.rb:62 +msgid "Key" +msgstr "Key" + +#. Make sure that tables are filled, then save all settings. +#: src/lib/vpn/edit_client_secrets.rb:121 +msgid "" +"Shared keys for the following gateways are still missing:\n" +"%s" +msgstr "" + +#: src/lib/vpn/edit_client_secrets.rb:127 +msgid "" +"Certificates for the following gateways are still missing:\n" +"%s" +msgstr "" + +#. Load PSKs +#. Reload gateway PSK text input. +#. Load XAuth +#. Load EAP +#: src/lib/vpn/edit_client_secrets.rb:140 src/lib/vpn/edit_gw_secrets.rb:224 +#: src/lib/vpn/edit_gw_secrets.rb:233 src/lib/vpn/edit_gw_secrets.rb:239 +msgid "(hidden)" +msgstr "" + +#. Remove the selected EAP user. +#. Remove the selected XAuth user. +#: src/lib/vpn/edit_gw_secrets.rb:120 src/lib/vpn/edit_gw_secrets.rb:141 +#, fuzzy +#| msgid "Please select a card to delete first." +msgid "Please select a user to delete." +msgstr "Please select a card to delete first." + +#. Save PSK and certificate settings. Note that XAUTH and EAP user lists are already saved. +#: src/lib/vpn/edit_gw_secrets.rb:154 +msgid "A pre-shared key is mandatory. Please enter a pre-shared key." +msgstr "" + +#: src/lib/vpn/edit_gw_secrets.rb:166 +#, fuzzy +#| msgid "Could not find the SMT certificate file in specified path." +msgid "Please enter both certificate file path and key file path." +msgstr "Could not find the SMT certificate file in specified path." + +#. Event handlers +#: src/lib/vpn/edit_gw_secrets.rb:175 src/lib/vpn/set_client_cert_dialog.rb:64 +#, fuzzy +#| msgid "Cannot read certificate file." +msgid "Pick a PEM encoded certificate file" +msgstr "Cannot read certificate file." + +#: src/lib/vpn/edit_gw_secrets.rb:180 src/lib/vpn/set_client_cert_dialog.rb:69 +#, fuzzy +#| msgid "Cannot read certificate file." +msgid "Pick a PEM encoded certificate key file" +msgstr "Cannot read certificate file." + +#: src/lib/vpn/edit_gw_secrets.rb:186 +msgid "Gateway pre-shared key" +msgstr "" + +#: src/lib/vpn/edit_gw_secrets.rb:192 +#, fuzzy +#| msgid "Read certificates" +msgid "Gateway certificate" +msgstr "Read certificates" + +#: src/lib/vpn/edit_gw_secrets.rb:194 +#, fuzzy +#| msgid "Path to certificate file required." +msgid "Path to certificate file" +msgstr "Path to certificate file required." + +#: src/lib/vpn/edit_gw_secrets.rb:195 src/lib/vpn/edit_gw_secrets.rb:198 +#: src/lib/vpn/set_client_cert_dialog.rb:50 +#: src/lib/vpn/set_client_cert_dialog.rb:53 +msgid "Pick.." +msgstr "" + +#: src/lib/vpn/edit_gw_secrets.rb:197 +#, fuzzy +#| msgid "Path to certificate file required." +msgid "Path to certificate key file" +msgstr "Path to certificate file required." + +#: src/lib/vpn/edit_gw_secrets.rb:202 +msgid "User credentials for Android, iOS, MacOS X clients" +msgstr "" + +#: src/lib/vpn/edit_gw_secrets.rb:203 src/lib/vpn/edit_gw_secrets.rb:212 +msgid "Username" +msgstr "Username" + +#: src/lib/vpn/edit_gw_secrets.rb:203 src/lib/vpn/edit_gw_secrets.rb:212 +msgid "Password" +msgstr "Password" + +#: src/lib/vpn/edit_gw_secrets.rb:205 src/lib/vpn/edit_gw_secrets.rb:214 +msgid "Add" +msgstr "Add" + +#: src/lib/vpn/edit_gw_secrets.rb:206 src/lib/vpn/edit_gw_secrets.rb:215 +msgid "Delete" +msgstr "Delete" + +#: src/lib/vpn/edit_gw_secrets.rb:207 src/lib/vpn/edit_gw_secrets.rb:216 +#, fuzzy +#| msgid "No Password" +msgid "Show Password" +msgstr "No Password" + +#: src/lib/vpn/edit_gw_secrets.rb:211 +msgid "User credentials for Windows 7, Windows 8 clients" +msgstr "" + +#. Return a user-friendly brief description of the connection. +#: src/lib/vpn/ipsec.rb:199 +#, fuzzy +#| msgid "Gateway" +msgid "Gateway - PSK" +msgstr "Gateway" + +#: src/lib/vpn/ipsec.rb:201 +#, fuzzy +#| msgid "&Path of Certificate" +msgid "Gateway - Certificate" +msgstr "&Path of Certificate" + +#: src/lib/vpn/ipsec.rb:203 +msgid "Gateway - Mobile clients" +msgstr "" + +#: src/lib/vpn/ipsec.rb:205 +#, fuzzy +#| msgid "Samba or Windows Printer" +msgid "Gateway - Windows clients" +msgstr "Samba or Windows Printer" + +#: src/lib/vpn/ipsec.rb:207 +#, fuzzy +#| msgid "Client &Key" +msgid "Client - PSK" +msgstr "Client &Key" + +#: src/lib/vpn/ipsec.rb:209 +#, fuzzy +#| msgid "&Client Certificate" +msgid "Client - Certificate" +msgstr "&Client Certificate" + +#. Create a new connection, by default it is a site-to-site client. Return true if successful. +#: src/lib/vpn/ipsec.rb:303 +#, fuzzy +#| msgid "The selected option is already present." +msgid "The connection name is already used." +msgstr "The selected option is already present." + +#. Find an unused gateway scenario +#: src/lib/vpn/ipsec.rb:320 +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 +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 +#, fuzzy +#| msgid "Specified queue name %1 is already used." +msgid "The user name is already used." +msgstr "Specified queue name %1 is already used." + +#. Set client certificate/key for a connection to remote gateway. Return true if successful, otherwise false. +#: src/lib/vpn/ipsec.rb:496 +msgid "Cannot find a matching client connection." +msgstr "" + +#. Render global options, connection list, and connection configuration frames. +#: src/lib/vpn/main_dialog.rb:60 +msgid "VPN Gateway and Client" +msgstr "" + +#. Left side: global config & connection management +#: src/lib/vpn/main_dialog.rb:66 +msgid "Global Configuration" +msgstr "Global Configuration" + +#: src/lib/vpn/main_dialog.rb:68 +#, fuzzy +#| msgid "Enable the NTP daemon" +msgid "Enable VPN daemon" +msgstr "Enable the NTP daemon" + +#: src/lib/vpn/main_dialog.rb:70 +msgid "Reduce TCP MSS" +msgstr "" + +#: src/lib/vpn/main_dialog.rb:73 +#, fuzzy +#| msgid "All Patches" +msgid "All VPNs" +msgstr "All Patches" + +#: src/lib/vpn/main_dialog.rb:76 +msgid "New VPN" +msgstr "" + +#: src/lib/vpn/main_dialog.rb:77 +#, fuzzy +#| msgid "Delete " +msgid "Delete VPN" +msgstr "Delete " + +#: src/lib/vpn/main_dialog.rb:79 +#, fuzzy +#| msgid "Connection Settings" +msgid "View Connection Status" +msgstr "Connection Settings" + +#. Event handlers +#. Display a help text to let user know why reducing MSS is sometimes necessary. +#: src/lib/vpn/main_dialog.rb:103 +msgid "" +"If VPN clients have trouble accessing certain Internet sites, it is possible that the affected hosts prevent automatic MTU (maximum transmission unit) discovery due to incorrect firewall configuration.\n" +"Reducing TCP-MSS will correct the situation; however, the available bandwidth will be reduced by about 10%." +msgstr "" + +#. Delete the chosen VPN connection. +#: src/lib/vpn/main_dialog.rb:124 +#, fuzzy +#| msgid "- Close connection" +msgid "Delete connection" +msgstr "- Close connection" + +#: src/lib/vpn/main_dialog.rb:125 +#, fuzzy +#| msgid "Are you sure you want to delete: " +msgid "Are you sure to delete connection " +msgstr "Are you sure you want to delete: " + +#. Check for incomplete configuration +#: src/lib/vpn/main_dialog.rb:144 +#, fuzzy +#| msgid "Configuration failed for the following operations: " +msgid "Please complete configuration for the following connections:\n" +msgstr "Configuration failed for the following operations: " + +#. Consider enabling the daemon +#: src/lib/vpn/main_dialog.rb:151 +msgid "" +"There are VPN connections but the daemon is not enabled.\n" +"Would you like to enable the VPN daemon?" +msgstr "" + +#. Ask user whether he wants to view daemon log +#: src/lib/vpn/main_dialog.rb:172 +#, fuzzy +#| msgid "Configuration has been successfully saved." +msgid "Settings have been successfully applied." +msgstr "Configuration has been successfully saved." + +#: src/lib/vpn/main_dialog.rb:174 +msgid "Failed to configure IPSec daemon." +msgstr "" + +#: src/lib/vpn/main_dialog.rb:177 +#, fuzzy +#| msgid "Would you like to change the CD and retry ?" +msgid "Would you like to view daemon log and connection status?" +msgstr "Would you like to change the CD and retry ?" + +#. Open dialog to edit VPN client passwords/certificates. +#: src/lib/vpn/main_dialog.rb:285 +msgid "Please enter gateway IP before editing credentials." +msgstr "" + +#. Render a table of configured gateway and client connections. +#: src/lib/vpn/main_dialog.rb:361 +msgid "Name" +msgstr "Name" + +#: src/lib/vpn/main_dialog.rb:361 +msgid "Description" +msgstr "Description" + +#. Render configuration controls for the chosen connection. +#: src/lib/vpn/main_dialog.rb:376 +msgid "Click 'New VPN' to create a gateway or client." +msgstr "" + +#. Make widgets for connection configuration +#: src/lib/vpn/main_dialog.rb:386 +msgid "All IPv4 networks (0.0.0.0/0)" +msgstr "" + +#: src/lib/vpn/main_dialog.rb:387 +msgid "All IPv6 networks (::/0)" +msgstr "" + +#: src/lib/vpn/main_dialog.rb:389 +msgid "Limited CIDRs, comma separated:" +msgstr "" + +#: src/lib/vpn/main_dialog.rb:395 +#, fuzzy +#| msgid "Connection Management" +msgid "Connection name: " +msgstr "Connection Management" + +#: src/lib/vpn/main_dialog.rb:396 +msgid "Type" +msgstr "Type" + +#: src/lib/vpn/main_dialog.rb:398 +#, fuzzy +#| msgid "Master Server" +msgid "Gateway (Server)" +msgstr "Master Server" + +#: src/lib/vpn/main_dialog.rb:399 +#, fuzzy +#| msgid "Clients" +msgid "Client" +msgstr "Clients" + +#: src/lib/vpn/main_dialog.rb:406 +#, fuzzy +#| msgid "The scanner" +msgid "The scenario is" +msgstr "The scanner" + +#: src/lib/vpn/main_dialog.rb:408 +msgid "Secure communication with a pre-shared key" +msgstr "" + +#: src/lib/vpn/main_dialog.rb:409 +#, fuzzy +#| msgid "You must select a certificate." +msgid "Secure communication with a certificate" +msgstr "You must select a certificate." + +#: src/lib/vpn/main_dialog.rb:410 +msgid "Provide access to Android, iOS, MacOS X clients" +msgstr "" + +#: src/lib/vpn/main_dialog.rb:411 +msgid "Provide access to Windows 7, Windows 8 clients" +msgstr "" + +#: src/lib/vpn/main_dialog.rb:413 src/lib/vpn/main_dialog.rb:427 +#, fuzzy +#| msgid "Proxy User Credentials" +msgid "Edit Credentials" +msgstr "Proxy User Credentials" + +#: src/lib/vpn/main_dialog.rb:416 +msgid "Provide VPN clients access to" +msgstr "" + +#: src/lib/vpn/main_dialog.rb:417 +msgid "Clients' address pool (e.g. 192.168.100.0/24)" +msgstr "" + +#: src/lib/vpn/main_dialog.rb:421 +#, fuzzy +#| msgid "Server Requires Authentication" +msgid "The gateway requires authentication" +msgstr "Server Requires Authentication" + +#: src/lib/vpn/main_dialog.rb:423 +msgid "By a pre-shared key" +msgstr "" + +#: src/lib/vpn/main_dialog.rb:424 +#, fuzzy +#| msgid "Read certificates" +msgid "By a certificate" +msgstr "Read certificates" + +#: src/lib/vpn/main_dialog.rb:426 +#, fuzzy +#| msgid "Default &Gateway IP" +msgid "VPN gateway IP" +msgstr "Default &Gateway IP" + +#: src/lib/vpn/main_dialog.rb:430 +msgid "Use the VPN tunnel to access" +msgstr "" + +#. They are however allowed in password +#: src/lib/vpn/new_user_dialog.rb:64 +#, fuzzy +#| msgid "Enter the user password." +msgid "Please enter both username and password." +msgstr "Enter the user password." + +#: src/lib/vpn/new_user_dialog.rb:68 +msgid "" +"Please refrain from using special characters and spaces in the username.\n" +"Acceptable characters are: A-Z, a-z, 0-9, dash, underscore" +msgstr "" + +#. Create a new VPN connection - by default it is a site-to-site gateway. +#: src/lib/vpn/new_vpn_dialog.rb:46 +#, fuzzy +#| msgid "Enter a name for the new profile." +msgid "Please enter a name for the new VPN connection" +msgstr "Enter a name for the new profile." + +#. Return :ok if new VPN connection is created, otherwise :cancel. +#: src/lib/vpn/new_vpn_dialog.rb:58 +#, fuzzy +#| msgid "Enter the connection name." +msgid "Please enter a VPN connection name." +msgstr "Enter the connection name." + +#: src/lib/vpn/new_vpn_dialog.rb:62 +msgid "" +"Please refrain from using special characters and spaces in the name.\n" +"Acceptable characters are: A-Z, a-z, 0-9, dash, underscore\n" +"Name has to begin with a letter." +msgstr "" + +#. Ask for a new certificate/key combination for a VPN client +#: src/lib/vpn/set_client_cert_dialog.rb:49 +#, fuzzy +#| msgid "Path to certificate file required." +msgid "Path to certificate file:" +msgstr "Path to certificate file required." + +#: src/lib/vpn/set_client_cert_dialog.rb:52 +#, fuzzy +#| msgid "Path to certificate file required." +msgid "Path to certificate key file:" +msgstr "Path to certificate file required." + +#: src/lib/vpn/set_client_cert_dialog.rb:54 +#, fuzzy +#| msgid "Could not find the SMT certificate file in specified path." +msgid "Please do not store the key in the certificate file itself." +msgstr "Could not find the SMT certificate file in specified path." + +#. Return tuple of certificate and certificate key locations. +#: src/lib/vpn/set_client_cert_dialog.rb:80 +#, fuzzy +#| msgid "Enter the certificate file." +msgid "Please enter both certificate file and key file." +msgstr "Enter the certificate file." + +#. Return password string. +#: src/lib/vpn/set_client_psk_dialog.rb:59 +#, fuzzy +#| msgid "Please enter keywords:" +msgid "Please enter a password." +msgstr "Please enter keywords:" + +#. View log dialog displays current status about all IPSec connections. +#: src/lib/vpn/view_log_dialog.rb:49 +msgid "The logs are refreshed automatically every 3 seconds." +msgstr "" + +#: src/lib/vpn/view_log_dialog.rb:51 +#, fuzzy +#| msgid "Restart NTP Daemon" +msgid "Restart VPN Daemon" +msgstr "Restart NTP Daemon" + +#. Restart IPSec daemon service. +#: src/lib/vpn/view_log_dialog.rb:76 +#, fuzzy +#| msgid "Confirm Hardware Detection" +msgid "Confirm daemon restart" +msgstr "Confirm Hardware Detection" + +#: src/lib/vpn/view_log_dialog.rb:77 +#, fuzzy +#| msgid "" +#| "Existing file %1\n" +#| "can be part of new volume set and it can be rewritten.\n" +#| "Do you wish to continue?" +msgid "" +"Existing connections will be interrupted.\n" +"Do you still wish to continue?" +msgstr "" +"Existing file %1\n" +"can be part of new volume set and it can be rewritten.\n" +"Do you wish to continue?" + +#: src/lib/vpn/view_log_dialog.rb:81 +#, fuzzy +#| msgid "Failed to restore MBR" +msgid "Failed to restart IPSec daemon" +msgstr "Failed to restore MBR" + +#. Read daemon status and refresh the content of log views. +#: src/lib/vpn/view_log_dialog.rb:100 +#, fuzzy +#| msgid "%s is not available in the LDAP directory." +msgid "Status not available: is the daemon running?" +msgstr "%s is not available in the LDAP directory." + +#. Install packages +#: src/modules/IPSecConf.rb:172 +#, fuzzy +#| msgid "Failed to install required packages." +msgid "Failed to install IPSec packages." +msgstr "Failed to install required packages." + +#. Enable/disable daemon +#: src/modules/IPSecConf.rb:180 +#, fuzzy +#| msgid "Restart NTP daemon" +msgid "Failed to start IPSec daemon." +msgstr "Restart NTP daemon" + +#. Configure IP forwarding +#: src/modules/IPSecConf.rb:210 +#, fuzzy +#| msgid "Write IP forwarding settings" +msgid "Failed to apply IP forwarding settings using sysctl:" +msgstr "Write IP forwarding settings" + +#. Configure/deconfigure firewall +#: src/modules/IPSecConf.rb:225 +msgid "" +"SuSE firewall is enabled but not activated.\n" +"In order for VPN to function properly, SuSE firewall will now be activated." +msgstr "" + +#: src/modules/IPSecConf.rb:229 src/modules/IPSecConf.rb:234 +#, fuzzy +#| msgid "Failed to create the new map." +msgid "Failed to restart SuSE firewall." +msgstr "Failed to create the new map." + +#: src/modules/IPSecConf.rb:240 +msgid "" +"Both VPN gateway and clients require special SuSE firewall configuration.\n" +"SuSE firewall is not enabled, therefore you must manually run the configuration script on every reboot. The script will be run now.\n" +"The script is located at %s" +msgstr "" + +#. AutoYaST: Return a rich text summary of the current configuration. +#: src/modules/IPSecConf.rb:279 +#, fuzzy +#| msgid "Global Settings" +msgid "VPN Global Settings" +msgstr "Global Settings" + +#: src/modules/IPSecConf.rb:280 +#, fuzzy +#| msgid "Enable VPN Services" +msgid "Enable VPN (IPSec) daemon: %s" +msgstr "Enable VPN Services" + +#: src/modules/IPSecConf.rb:281 +msgid "Reduce TCP MSS to 1024: %s" +msgstr "" + +#: src/modules/IPSecConf.rb:282 +#, fuzzy +#| msgid "Create Client Connection" +msgid "Gateway and Connections" +msgstr "Create Client Connection" + +#. Gateway summary +#: src/modules/IPSecConf.rb:288 +msgid "A gateway serving clients in " +msgstr "" + +#. Client summary +#: src/modules/IPSecConf.rb:292 +#, fuzzy +#| msgid "Accept client connections" +msgid "A client connecting to " +msgstr "Accept client connections" Modified: trunk/yast/en_GB/po/wol.en_GB.po =================================================================== --- trunk/yast/en_GB/po/wol.en_GB.po 2015-09-09 08:18:21 UTC (rev 92602) +++ trunk/yast/en_GB/po/wol.en_GB.po 2015-09-09 08:19:44 UTC (rev 92603) @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: wol\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-04 15:52+0200\n" +"POT-Creation-Date: 2015-08-25 18:36+0200\n" "PO-Revision-Date: 2008-03-27 22:27+0000\n" "Last-Translator: Benjamin Weber \n" "Language-Team: \n" Modified: trunk/yast/en_GB/po/yast2-apparmor.en_GB.po =================================================================== --- trunk/yast/en_GB/po/yast2-apparmor.en_GB.po 2015-09-09 08:18:21 UTC (rev 92602) +++ trunk/yast/en_GB/po/yast2-apparmor.en_GB.po 2015-09-09 08:19:44 UTC (rev 92603) @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: yast2-apparmor\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-04 15:51+0200\n" +"POT-Creation-Date: 2015-08-25 18:36+0200\n" "PO-Revision-Date: 2008-03-27 22:23+0000\n" "Last-Translator: Benjamin Weber \n" "Language-Team: \n"