Author: keichwa Date: 2015-11-11 13:25:11 +0100 (Wed, 11 Nov 2015) New Revision: 94917 Modified: branches/plus-SLE12-SP1/yast/en_US/po/add-on-creator.en_US.po branches/plus-SLE12-SP1/yast/en_US/po/autoinst.en_US.po branches/plus-SLE12-SP1/yast/en_US/po/base.en_US.po branches/plus-SLE12-SP1/yast/en_US/po/bootloader.en_US.po branches/plus-SLE12-SP1/yast/en_US/po/dns-server.en_US.po branches/plus-SLE12-SP1/yast/en_US/po/drbd.en_US.po branches/plus-SLE12-SP1/yast/en_US/po/installation.en_US.po branches/plus-SLE12-SP1/yast/en_US/po/multipath.en_US.po branches/plus-SLE12-SP1/yast/en_US/po/network.en_US.po branches/plus-SLE12-SP1/yast/en_US/po/qt-pkg.en_US.po branches/plus-SLE12-SP1/yast/en_US/po/rpm-groups.en_US.po branches/plus-SLE12-SP1/yast/en_US/po/sshd.en_US.po branches/plus-SLE12-SP1/yast/en_US/po/sudo.en_US.po Log: merged Modified: branches/plus-SLE12-SP1/yast/en_US/po/add-on-creator.en_US.po =================================================================== --- branches/plus-SLE12-SP1/yast/en_US/po/add-on-creator.en_US.po 2015-11-11 12:25:02 UTC (rev 94916) +++ branches/plus-SLE12-SP1/yast/en_US/po/add-on-creator.en_US.po 2015-11-11 12:25:11 UTC (rev 94917) @@ -1476,7 +1476,7 @@ #. help text for content file 'DISTRIBUTION' key #: src/modules/AddOnCreator.rb:194 msgid "Some string denoting the distribution. The same string is most probably used in the .rpms to denote the distribution. Usually a composition of the name, version and architecture." -msgstr "" +msgstr "Some string denoting the distribution. The same string is most probably used in the .rpms to denote the distribution. Usually a composition of the name, version and architecture." #. label of content file key #: src/modules/AddOnCreator.rb:201 Modified: branches/plus-SLE12-SP1/yast/en_US/po/autoinst.en_US.po =================================================================== --- branches/plus-SLE12-SP1/yast/en_US/po/autoinst.en_US.po 2015-11-11 12:25:02 UTC (rev 94916) +++ branches/plus-SLE12-SP1/yast/en_US/po/autoinst.en_US.po 2015-11-11 12:25:11 UTC (rev 94917) @@ -715,6 +715,12 @@ "\tmounted by UUID or a volume label. If an option is disabled, it is not possible.\n" "\t" msgstr "" +"<p><b>Mount in /etc/fstab by:</b>\n" +"\tNormally, a file system to mount is identified in /etc/fstab\n" +"\tby the device name. Some file system can be identified by UUID or\n" +"\tvolume label. Not all file systems support this. If an option is\n" +"\tdisabled, it is not possible. \n" +"\t" #. help text, richtext format #: src/include/autoinstall/AdvancedPartitionDialog.rb:71 Modified: branches/plus-SLE12-SP1/yast/en_US/po/base.en_US.po =================================================================== --- branches/plus-SLE12-SP1/yast/en_US/po/base.en_US.po 2015-11-11 12:25:02 UTC (rev 94916) +++ branches/plus-SLE12-SP1/yast/en_US/po/base.en_US.po 2015-11-11 12:25:11 UTC (rev 94917) @@ -476,6 +476,15 @@ "\n" "%2" msgstr "" +"The profile does not allow you to run these products on this system.\n" +"Continuing installation will leave the system in an unsupported state,\n" +"which might impact your compliance requirements.\n" +" \n" +"The following requirements are not fulfilled on this system:\n" +" \n" +"%1\n" +"\n" +"%2" #. make sure that every workflow is merged only once #. bugzilla #332436 @@ -3417,6 +3426,9 @@ "\t\t column. To view a description for an item, select it in the list.\n" "\t\t </p>" msgstr "" +"<p>Define the system's tasks and what software to install. The left column in\n" +"the list shows available tasks and software for this system by category. To view a description for an item, select it in the list.\n" +"</p>" #: library/packages/src/modules/PackagesUI.rb:333 msgid "" Modified: branches/plus-SLE12-SP1/yast/en_US/po/bootloader.en_US.po =================================================================== --- branches/plus-SLE12-SP1/yast/en_US/po/bootloader.en_US.po 2015-11-11 12:25:02 UTC (rev 94916) +++ branches/plus-SLE12-SP1/yast/en_US/po/bootloader.en_US.po 2015-11-11 12:25:11 UTC (rev 94917) @@ -1180,12 +1180,12 @@ #. check if boot device is on raid0 #: src/modules/BootSupportCheck.rb:167 msgid "The boot device is on raid type: %1. System will not boot." -msgstr "" +msgstr "The boot device is on RAID type: %1. System will not boot." #. bnc#501043 added check for valid configuration #: src/modules/BootSupportCheck.rb:187 msgid "The boot device is on software RAID1. Select other bootloader location, e.g. Master Boot Record" -msgstr "" +msgstr "The boot device is on software RAID1. Select another boot loader location, e.g. Master Boot Record." #. if partitioning worked before upgrade, it will keep working (bnc#886604) #: src/modules/BootSupportCheck.rb:239 Modified: branches/plus-SLE12-SP1/yast/en_US/po/dns-server.en_US.po =================================================================== --- branches/plus-SLE12-SP1/yast/en_US/po/dns-server.en_US.po 2015-11-11 12:25:02 UTC (rev 94916) +++ branches/plus-SLE12-SP1/yast/en_US/po/dns-server.en_US.po 2015-11-11 12:25:11 UTC (rev 94917) @@ -1451,6 +1451,8 @@ "<p><b><big>Initializing DNS Server Configuration</big></b><br>\n" "Please wait...<br></p>" msgstr "" +"<p><b><big>Initializing DNS Server Configuration</big></b><br>\n" +"Please wait...<br></p>" #. Read dialog help 2/2 #: src/include/dns-server/helps.rb:24 Modified: branches/plus-SLE12-SP1/yast/en_US/po/drbd.en_US.po =================================================================== --- branches/plus-SLE12-SP1/yast/en_US/po/drbd.en_US.po 2015-11-11 12:25:02 UTC (rev 94916) +++ branches/plus-SLE12-SP1/yast/en_US/po/drbd.en_US.po 2015-11-11 12:25:11 UTC (rev 94917) @@ -328,7 +328,7 @@ #: src/include/drbd/helps.rb:133 msgid "<p>Check <b>\"Disable IP Verification\"</b> to disable one of drbdadm's sanity check</p>" -msgstr "" +msgstr "<p>Check <b>\"Disable IP Verification\"</b> to disable one of drbdadm's sanity checks.</p>" #: src/include/drbd/helps.rb:136 msgid "" @@ -339,6 +339,11 @@ " The Dialog will print the count each 'dialog-refresh' seconds,\n" " set it to 0 to disable redrawing completely. </p>" msgstr "" +"<p><b>Dialog Refresh:</b> The user dialog counts and displays the seconds it\n" +"has been waiting so far. Disable this option if you have the console of your\n" +"server connected to a serial terminal server with limited logging capacity.\n" +"The dialog will print the count with each 'dialog-refresh' in seconds. \n" +"Set it to 0 to disable redrawing completely.</p>" #: src/include/drbd/helps.rb:144 msgid "" Modified: branches/plus-SLE12-SP1/yast/en_US/po/installation.en_US.po =================================================================== --- branches/plus-SLE12-SP1/yast/en_US/po/installation.en_US.po 2015-11-11 12:25:02 UTC (rev 94916) +++ branches/plus-SLE12-SP1/yast/en_US/po/installation.en_US.po 2015-11-11 12:25:11 UTC (rev 94917) @@ -937,7 +937,7 @@ #. progress stage #: src/lib/installation/clients/inst_finish.rb:204 msgid "Copy files to installed system" -msgstr "" +msgstr "Copying files to installed system..." #. progress stage #: src/lib/installation/clients/inst_finish.rb:211 @@ -948,17 +948,17 @@ #. progress stage #: src/lib/installation/clients/inst_finish.rb:218 msgid "Save installation settings" -msgstr "" +msgstr "Saving installation settings..." #. progress stage #: src/lib/installation/clients/inst_finish.rb:227 msgid "Install boot manager" -msgstr "" +msgstr "Installing boot manager..." #. progress stage #: src/lib/installation/clients/inst_finish.rb:234 msgid "Prepare system for initial boot" -msgstr "" +msgstr "Preparing system for initial boot..." #. merge steps from add-on products #. bnc #438678 Modified: branches/plus-SLE12-SP1/yast/en_US/po/multipath.en_US.po =================================================================== --- branches/plus-SLE12-SP1/yast/en_US/po/multipath.en_US.po 2015-11-11 12:25:02 UTC (rev 94916) +++ branches/plus-SLE12-SP1/yast/en_US/po/multipath.en_US.po 2015-11-11 12:25:11 UTC (rev 94917) @@ -242,6 +242,16 @@ "\t\t\t<b><big>Configure Multipath</big></b><br>\n" "\t\t\tClick <b>Configure</b> Tab to make the multipath configurations.<br></p>\n" msgstr "" +"<p><b><big>Multipath Status</big></b><br>\n" +"\t\t\tStart or stop multipathd and check the multipath information.<br><br>\n" +"\n" +"\t\t\t<b><big>Stop/Start multipathd</big></b><br>\n" +"\t\t\tClick <b>\"Use Multipath\"</b> to start multipathd. Click <b>\"Do not use Multipath\"</b> to stop multipathd.<br>\n" +"\t\t\tMultipath status information can still be displayed\n" +"\t\t\twhen multipathd has stopped.<br><br>\n" +"\n" +"\t\t\t<b><big>Configure Multipath</big></b><br>\n" +"\t\t\tClick <b>Configure</b> to configure multipath.<br></p>\n" #. dialog help for Configure tab #: src/include/multipath/helps.rb:56 @@ -269,6 +279,10 @@ "\t\t\tAny default setting here will take effect in all multipath configurations, unless a corresponding local setting overwrites it.<br>\n" "\t\t\tIf a default setting here is cleared, multipath will take its own value as default setting.<br></p>\n" msgstr "" +"<p><b><big>Defaults Configuration</big></b><br>\n" +"\t\t\tGlobal default settings can be configured and cleared here.<br>\n" +"\t\t\tAny default setting will take effect in all multipath configurations, unless a corresponding local setting overwrites it.<br>\n" +"\t\t\tIf a default setting is cleared, multipath will take its own value as default setting.<br></p>\n" #. dialog help for blacklist section configure tab 1/3 #: src/include/multipath/helps.rb:79 @@ -281,6 +295,15 @@ "\t\t\t<b>device</b>: Used to identify a specific storage controller in blacklist. A device can be specified by vendor and product name.<br>\n" "</p>" msgstr "" +"<p><b><big>Blacklist Configuration</big></b><br>\n" +"\t\t\tDevice names listed here are discarded as not multipath candidates.<br>\n" +"\t\t\tThere are three methods to identify a device name: <b>wwid</b>, <b>devnode</b>, <b>device</b>.<br><br>\n" +"\t\t\t<b>wwid</b>: The world wide ID identifies the device\n" +"\t\t\tin the blacklist.<br>\n" +"\t\t\t<b>devnode</b>: A regular expression that can be used to identify device names in udev_dir (default in directory /dev). Common device names are cciss, fd, hd, md, dm, sr, scd, st, ram, raw, loop.<br>\n" +"\t\t\t<b>device</b>: Used to identify a specific storage\n" +"\t\t\tcontroller in the blacklist. A device can be specified by vendor and product name.<br>\n" +"</p>" #. dialog help for blacklist_exception section configure tab 1/3 #: src/include/multipath/helps.rb:89 @@ -293,6 +316,15 @@ "\t\t\t<b>device</b>: Used to identify a specific storage controller excepted from blacklist. A device can be specified by vendor and product name.<br>\n" "</p>" msgstr "" +"<p><b><big>Blacklist Exceptions Configuration</big></b><br>\n" +"\t\t\tDevice names listed here are excluded from the blacklist.<br>\n" +"\t\t\tThere are three methods to identify a device name: <b>wwid</b>, <b>devnode</b>, <b>device</b>.<br><br>\n" +"\t\t\t<b>wwid</b>: The world wide ID identifying the device\n" +"\t\t\texcepted from the blacklist.<br>\n" +"\t\t\t<b>devnode</b>: A regular expression used to identify device names in udev_dir (default in directory /dev). Common device names are cciss, fd, hd, md, dm, sr, scd, st, ram, raw, loop.<br>\n" +"\t\t\t<b>device</b>: Used to identify a specific storage\n" +"\t\t\tcontroller excepted from the blacklist. A device can be specified by vendor and product name.<br>\n" +"</p>" #. dialog help for devcies section configure tab 1/3 #: src/include/multipath/helps.rb:99 Modified: branches/plus-SLE12-SP1/yast/en_US/po/network.en_US.po =================================================================== --- branches/plus-SLE12-SP1/yast/en_US/po/network.en_US.po 2015-11-11 12:25:02 UTC (rev 94916) +++ branches/plus-SLE12-SP1/yast/en_US/po/network.en_US.po 2015-11-11 12:25:11 UTC (rev 94917) @@ -746,7 +746,7 @@ #: src/clients/routing.rb:348 msgid "At least one of the following parameters (gateway, netmask, device, options) must be specified" -msgstr "" +msgstr "At least one of the following parameters (gateway, netmask, device, options) must be specified" #: src/clients/routing.rb:370 msgid "Updating '%1' destination in routing table ..." Modified: branches/plus-SLE12-SP1/yast/en_US/po/qt-pkg.en_US.po =================================================================== --- branches/plus-SLE12-SP1/yast/en_US/po/qt-pkg.en_US.po 2015-11-11 12:25:02 UTC (rev 94916) +++ branches/plus-SLE12-SP1/yast/en_US/po/qt-pkg.en_US.po 2015-11-11 12:25:11 UTC (rev 94917) @@ -397,7 +397,7 @@ #: src/YQPackageSelectorBase.cc:322 msgid "Please realize that the following selected software is either unsupported or requires an additional customer contract for support." -msgstr "" +msgstr "The following selected software is either unsupported or requires an additional customer contract for support." #: src/YQPackageSelectorBase.cc:421 msgid "Not implemented yet. Sorry." @@ -775,7 +775,7 @@ #: src/YQPkgConflictDialog.cc:410 msgid "<p>Dependency resolver test case written to <br><tt>%1</tt></p><p>Prepare <tt>y2logs.tgz tar</tt> archive to attach to Bugzilla?</p>" -msgstr "" +msgstr "<p>Dependency resolver test case written to <br><tt>%1</tt>.</p><p>Prepare <tt>y2logs.tgz tar</tt> archive to attach to Bugzilla?</p>" #. parent #: src/YQPkgConflictDialog.cc:413 Modified: branches/plus-SLE12-SP1/yast/en_US/po/rpm-groups.en_US.po =================================================================== --- branches/plus-SLE12-SP1/yast/en_US/po/rpm-groups.en_US.po 2015-11-11 12:25:02 UTC (rev 94916) +++ branches/plus-SLE12-SP1/yast/en_US/po/rpm-groups.en_US.po 2015-11-11 12:25:11 UTC (rev 94917) @@ -178,7 +178,7 @@ msgstr "" msgid "File-Sharing" -msgstr "" +msgstr "File Sharing" msgid "Filesystems" msgstr "" @@ -612,7 +612,7 @@ msgstr "" msgid "Wifi" -msgstr "" +msgstr "Wi-Fi" msgid "Word" msgstr "" Modified: branches/plus-SLE12-SP1/yast/en_US/po/sshd.en_US.po =================================================================== --- branches/plus-SLE12-SP1/yast/en_US/po/sshd.en_US.po 2015-11-11 12:25:02 UTC (rev 94916) +++ branches/plus-SLE12-SP1/yast/en_US/po/sshd.en_US.po 2015-11-11 12:25:11 UTC (rev 94917) @@ -204,7 +204,7 @@ #: tutorials/tutorial-includes/sshd/t1-final-dialogs.ycp:113 #: tutorials/tutorial-sources/clean-ycp/dialogs.ycp:107 msgid "Print &Message of the Day After Login" -msgstr "" +msgstr "Print &Message of the Day after Login" #. A check box #: tutorials/tutorial-includes/sshd/t1-final-dialogs.ycp:115 Modified: branches/plus-SLE12-SP1/yast/en_US/po/sudo.en_US.po =================================================================== --- branches/plus-SLE12-SP1/yast/en_US/po/sudo.en_US.po 2015-11-11 12:25:02 UTC (rev 94916) +++ branches/plus-SLE12-SP1/yast/en_US/po/sudo.en_US.po 2015-11-11 12:25:11 UTC (rev 94917) @@ -445,6 +445,11 @@ "\t</p>\n" "\t" msgstr "" +"<p>The <b>Users</b> column denotes a local or system user or a user alias. \n" +"The <b>Hosts</b> column determines, on which hosts, or group \n" +"of hosts referred to by host alias, a user may run specified commands.\n" +"</p>\n" +"\t" #. User Specification help 3/6 #: src/include/sudo/helps.rb:74 @@ -456,6 +461,9 @@ "\t</p>\n" "\t" msgstr "" +"The <b>RunAs</b> column is an optional parameter containing the name (or\n" +"alias) of the user whose access privileges will be used to run\n" +"commands. <b>NOPASSWD</b> is a tag determining whether users need to authenticate themselves before running commands.</p> " #. User Specification help 4/6 #: src/include/sudo/helps.rb:83 @@ -527,6 +535,13 @@ "\t</p>\n" "\t" msgstr "" +"<p>The <b>Hostname or Alias</b> entry consists of either a hostname\n" +"(e.g. www.example.com), a single IP address (e.g. 192.168.0.1), an IP address\n" +"combined with netmask, or a host alias. If commands may be run on any host,\n" +"use the keyword 'ALL'. Hostname or IP address is matched against your own hostname\n" +"or IP address, so if you don't intend to share one /etc/sudoers file between\n" +"multiple machines, the 'ALL' or 'localhost' entry will be sufficient for almost all purposes.</p>\n" +"\t" #. Single User Specification help 2/4 #: src/include/sudo/helps.rb:122