Author: keichwa
Date: 2015-11-03 13:57:47 +0100 (Tue, 03 Nov 2015)
New Revision: 94275
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/packager.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:
from SLE-SP1 plus Factory
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-03 12:57:46 UTC (rev 94274)
+++ branches/plus-SLE12-SP1/yast/en_US/po/add-on-creator.en_US.po 2015-11-03 12:57:47 UTC (rev 94275)
@@ -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 "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 ""
#. 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-03 12:57:46 UTC (rev 94274)
+++ branches/plus-SLE12-SP1/yast/en_US/po/autoinst.en_US.po 2015-11-03 12:57:47 UTC (rev 94275)
@@ -715,12 +715,6 @@
"\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-03 12:57:46 UTC (rev 94274)
+++ branches/plus-SLE12-SP1/yast/en_US/po/base.en_US.po 2015-11-03 12:57:47 UTC (rev 94275)
@@ -476,15 +476,6 @@
"\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
@@ -3426,9 +3417,6 @@
"\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-03 12:57:46 UTC (rev 94274)
+++ branches/plus-SLE12-SP1/yast/en_US/po/bootloader.en_US.po 2015-11-03 12:57:47 UTC (rev 94275)
@@ -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 "The boot device is on RAID type: %1. System will not boot."
+msgstr ""
#. 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 "The boot device is on software RAID1. Select another boot loader location, e.g. Master Boot Record."
+msgstr ""
#. 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-03 12:57:46 UTC (rev 94274)
+++ branches/plus-SLE12-SP1/yast/en_US/po/dns-server.en_US.po 2015-11-03 12:57:47 UTC (rev 94275)
@@ -1451,8 +1451,6 @@
"<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-03 12:57:46 UTC (rev 94274)
+++ branches/plus-SLE12-SP1/yast/en_US/po/drbd.en_US.po 2015-11-03 12:57:47 UTC (rev 94275)
@@ -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 "<p>Check <b>\"Disable IP Verification\"</b> to disable one of drbdadm's sanity checks.</p>"
+msgstr ""
#: src/include/drbd/helps.rb:136
msgid ""
@@ -339,11 +339,6 @@
" 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-03 12:57:46 UTC (rev 94274)
+++ branches/plus-SLE12-SP1/yast/en_US/po/installation.en_US.po 2015-11-03 12:57:47 UTC (rev 94275)
@@ -937,7 +937,7 @@
#. progress stage
#: src/lib/installation/clients/inst_finish.rb:204
msgid "Copy files to installed system"
-msgstr "Copying files to installed system..."
+msgstr ""
#. 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 "Saving installation settings..."
+msgstr ""
#. progress stage
#: src/lib/installation/clients/inst_finish.rb:227
msgid "Install boot manager"
-msgstr "Installing boot manager..."
+msgstr ""
#. progress stage
#: src/lib/installation/clients/inst_finish.rb:234
msgid "Prepare system for initial boot"
-msgstr "Preparing system for initial boot..."
+msgstr ""
#. 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-03 12:57:46 UTC (rev 94274)
+++ branches/plus-SLE12-SP1/yast/en_US/po/multipath.en_US.po 2015-11-03 12:57:47 UTC (rev 94275)
@@ -242,16 +242,6 @@
"\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
@@ -279,10 +269,6 @@
"\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
@@ -295,15 +281,6 @@
"\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
@@ -316,15 +293,6 @@
"\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-03 12:57:46 UTC (rev 94274)
+++ branches/plus-SLE12-SP1/yast/en_US/po/network.en_US.po 2015-11-03 12:57:47 UTC (rev 94275)
@@ -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 "At least one of the following parameters (gateway, netmask, device, options) must be specified"
+msgstr ""
#: src/clients/routing.rb:370
msgid "Updating '%1' destination in routing table ..."
Modified: branches/plus-SLE12-SP1/yast/en_US/po/packager.en_US.po
===================================================================
--- branches/plus-SLE12-SP1/yast/en_US/po/packager.en_US.po 2015-11-03 12:57:46 UTC (rev 94274)
+++ branches/plus-SLE12-SP1/yast/en_US/po/packager.en_US.po 2015-11-03 12:57:47 UTC (rev 94275)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-10-06 16:04+0200\n"
+"POT-Creation-Date: 2015-08-25 18:37+0200\n"
"PO-Revision-Date: 2007-08-27 15:15+0200\n"
"Last-Translator: proofreader \n"
"Language-Team: English \n"
@@ -179,8 +179,8 @@
#. force minimum width
#. table header - name of the repo
#. table header - name of the repo
-#: src/clients/inst_mediacopy.rb:65 src/clients/repositories.rb:703
-#: src/clients/repositories.rb:716
+#: src/clients/inst_mediacopy.rb:65 src/clients/repositories.rb:674
+#: src/clients/repositories.rb:687
#: src/include/packager/key_manager_dialogs.rb:306
msgid "Name"
msgstr "Name"
@@ -382,7 +382,7 @@
#. TRANSLATORS: dialog help
#. TRANSLATORS: dialog help
#: src/clients/inst_productsources.rb:1380
-#: src/include/packager/repositories_include.rb:93
+#: src/include/packager/repositories_include.rb:91
msgid "<p>The repository manager is downloading repository details...</p>"
msgstr ""
@@ -491,8 +491,8 @@
#. dialog caption
#. dialog caption
#. dialog caption
-#: src/clients/key_manager.rb:70 src/clients/repositories.rb:1845
-#: src/modules/AddOnProduct.rb:684
+#: src/clients/key_manager.rb:70 src/clients/repositories.rb:1810
+#: src/modules/AddOnProduct.rb:682
#, fuzzy
msgid "Initializing..."
msgstr ""
@@ -529,24 +529,24 @@
msgstr "Checking the LDAP configuration..."
#. default (minimal) priority of a repository
-#: src/clients/repositories.rb:58
+#: src/clients/repositories.rb:55
msgid "&Priority"
msgstr ""
-#: src/clients/repositories.rb:60
+#: src/clients/repositories.rb:57
#, fuzzy
msgid "Keep Downloaded Packages"
msgstr "Recommended packages"
#. Command line help text for the repository module, %1 is "zypper"
-#: src/clients/repositories.rb:75
+#: src/clients/repositories.rb:72
#, fuzzy
#| msgid "Hardware Detection - this module doesn't support command line interface, use '%1' instead."
msgid "Installation Repositories - This module does not support the command line interface, use '%1' instead."
msgstr "Hardware Detection - this module does not support the command line interface, use '%1' instead."
#. pad to 3 characters
-#: src/clients/repositories.rb:169
+#: src/clients/repositories.rb:166
#, fuzzy
msgid "Default"
msgstr "Default Hat"
@@ -554,83 +554,68 @@
#. unkown name (alias) of the source
#. get the editable propertis from 'source' parameter,
#. get the fixed propertis from the package manager
-#: src/clients/repositories.rb:199 src/clients/repositories.rb:264
+#: src/clients/repositories.rb:195 src/clients/repositories.rb:260
msgid "Unknown Name"
msgstr ""
#. displaye only repositories from the selected service
-#: src/clients/repositories.rb:334 src/clients/repositories.rb:335
-#: src/clients/repositories.rb:377 src/clients/repositories.rb:383
-#: src/modules/SourceManager.rb:436
+#: src/clients/repositories.rb:326 src/clients/repositories.rb:362
+#: src/clients/repositories.rb:368 src/modules/SourceManager.rb:436
msgid "Unknown"
msgstr ""
#. label to be used instead of URL if not found
-#: src/clients/repositories.rb:337 src/clients/repositories.rb:376
-#: src/modules/AddOnProduct.rb:1336
+#: src/clients/repositories.rb:328 src/clients/repositories.rb:361
+#: src/modules/AddOnProduct.rb:1334
msgid "URL: %1"
msgstr ""
-#. TRANSLATORS: Raw URL is the address without expanding repo variables
-#. e.g. Raw URL = http://something/$arch -> URL = http://something/x86_64
-#: src/clients/repositories.rb:342
-msgid "Raw URL: %s"
-msgstr ""
-
#. heading - in case repo name not found
-#: src/clients/repositories.rb:372
+#: src/clients/repositories.rb:357
#, fuzzy
msgid "Unknown Repository Name"
msgstr "Unknown option."
#. label, %1 is repo category (eg. YUM)
-#: src/clients/repositories.rb:382
+#: src/clients/repositories.rb:367
msgid "Category: %1"
msgstr ""
#. label, %1 is repo category (eg. YUM)
-#: src/clients/repositories.rb:392
+#: src/clients/repositories.rb:377
msgid "Service: %1"
msgstr "Service: %1"
#. #176013
-#: src/clients/repositories.rb:640
+#: src/clients/repositories.rb:625
#, fuzzy
msgid "All repositories"
msgstr "URL of the update source."
-#: src/clients/repositories.rb:643
+#: src/clients/repositories.rb:628
#, fuzzy
msgid "All services"
msgstr "Service: %1"
-#: src/clients/repositories.rb:652
+#: src/clients/repositories.rb:637
#, fuzzy
msgid "Service '%1'"
msgstr "Service: %1"
-#. TRANSLATORS: Item in selection box that allow user to see only
-#. repositories not associated with service. Sometimes called also
-#. third party as they are usually repositories not provided by SUSE
-#. within product subscription.
-#: src/clients/repositories.rb:669
-msgid "Only repositories not provided by a service"
-msgstr ""
-
#. combobox label
-#: src/clients/repositories.rb:681
+#: src/clients/repositories.rb:652
msgid "View"
msgstr ""
#. table header - priority of the repository - keep the translation as short as possible!
-#: src/clients/repositories.rb:696
+#: src/clients/repositories.rb:667
msgid "Priority"
msgstr ""
#. table header - is the repo enabled? - keep the translation as short as possible!
#. table header - is the repo enabled? - keep the translation as short as possible!
#. status info, to be used inside summary
-#: src/clients/repositories.rb:698 src/clients/repositories.rb:711
+#: src/clients/repositories.rb:669 src/clients/repositories.rb:682
#: src/modules/SourceManager.rb:393
msgid "Enabled"
msgstr ""
@@ -639,104 +624,104 @@
#. keep the translation as short as possible!
#. table header - is autorefresh enabled for the repo?
#. keep the translation as short as possible!
-#: src/clients/repositories.rb:701 src/clients/repositories.rb:714
+#: src/clients/repositories.rb:672 src/clients/repositories.rb:685
#, fuzzy
msgid "Autorefresh"
msgstr "Autofs"
#. table header - service to which the repo belongs
-#: src/clients/repositories.rb:705
+#: src/clients/repositories.rb:676
#, fuzzy
msgid "Service"
msgstr "Service: %1"
#. table header - URL of the repo
#. table header - URL of the repo
-#: src/clients/repositories.rb:707 src/clients/repositories.rb:718
+#: src/clients/repositories.rb:678 src/clients/repositories.rb:689
msgid "URL"
msgstr ""
#. push button - change URL of the selected repository
-#: src/clients/repositories.rb:818
+#: src/clients/repositories.rb:789
msgid "&Replace..."
msgstr ""
#. push button - refresh the selected repository now
-#: src/clients/repositories.rb:820
+#: src/clients/repositories.rb:791
#, fuzzy
msgid "Re&fresh Selected"
msgstr "Online Repositories"
#. push button - disable/enable the selected repository
-#: src/clients/repositories.rb:822
+#: src/clients/repositories.rb:793
msgid "Status &on or off"
msgstr ""
#. push button - disable/enable automatic refresh of the selected repository
-#: src/clients/repositories.rb:824
+#: src/clients/repositories.rb:795
msgid "Refre&sh on or off"
msgstr ""
#. push button - set name of the selected repository
-#: src/clients/repositories.rb:826
+#: src/clients/repositories.rb:797
msgid "Set &Name..."
msgstr ""
#. label
-#: src/clients/repositories.rb:833
+#: src/clients/repositories.rb:804
msgid "Properties"
msgstr ""
#. check box
-#: src/clients/repositories.rb:838
+#: src/clients/repositories.rb:809
#, fuzzy
msgid "&Enabled"
msgstr "&Enable CASA"
#. check box
-#: src/clients/repositories.rb:844
+#: src/clients/repositories.rb:815
msgid "Automatically &Refresh"
msgstr ""
#. push button label
-#: src/clients/repositories.rb:882
+#: src/clients/repositories.rb:853
#, fuzzy
msgid "&GPG Keys..."
msgstr "GPG &Key ID"
#. menu button label
-#: src/clients/repositories.rb:887
+#: src/clients/repositories.rb:858
msgid "Refresh"
msgstr ""
#. menu button label
-#: src/clients/repositories.rb:891
+#: src/clients/repositories.rb:862
msgid "Refresh all Autor&efreshed"
msgstr ""
#. menu button label
-#: src/clients/repositories.rb:893
+#: src/clients/repositories.rb:864
msgid "Refresh all &Enabled"
msgstr ""
#. dialog caption
-#: src/clients/repositories.rb:900
+#: src/clients/repositories.rb:871
msgid "Configured Software Repositories"
msgstr ""
#. help
-#: src/clients/repositories.rb:903
+#: src/clients/repositories.rb:874
#, fuzzy
msgid ""
"<p>\n"
"Manage configured software repositories and services.</p>\n"
msgstr "<p>In this dialog, edit some parameters to set up an LDAP server.<p>"
-#: src/clients/repositories.rb:909
+#: src/clients/repositories.rb:880
msgid "<P>A <B>service</B> or <B>Repository Index Service (RIS) </B> is a protocol for package repository management. A service can offer one or more software repositories which can be dynamically changed by the service administrator.</P>"
msgstr ""
-#: src/clients/repositories.rb:916
+#: src/clients/repositories.rb:887
msgid ""
"<p>\n"
"<b>Adding a new Repository or a Service</b><br>\n"
@@ -746,7 +731,7 @@
msgstr ""
#. help, continued
-#: src/clients/repositories.rb:928
+#: src/clients/repositories.rb:899
msgid ""
"<p>\n"
"To install packages from <b>CD</b>,\n"
@@ -755,7 +740,7 @@
msgstr ""
#. help, continued
-#: src/clients/repositories.rb:939
+#: src/clients/repositories.rb:910
msgid ""
"<p>\n"
"The CDs can be copied to <b>hard disk</b>\n"
@@ -768,7 +753,7 @@
msgstr ""
#. help, continued
-#: src/clients/repositories.rb:955
+#: src/clients/repositories.rb:926
msgid ""
"<p>\n"
"<b>Modifying Status of a Repository or a Service</b><br>\n"
@@ -778,31 +763,31 @@
msgstr ""
#. help text, continued
-#: src/clients/repositories.rb:967
+#: src/clients/repositories.rb:938
msgid ""
"<P><B>Priority of a Repository</B><BR>\n"
"Priority of a repository is an integer value between 0 (the highest priority) and 200 (the lowest priority). Default is 99. If a package is available in more repositories, the repository with the highest priority is used.</P>\n"
msgstr ""
#. help text, continued
-#: src/clients/repositories.rb:975
+#: src/clients/repositories.rb:946
msgid "<P>Select the appropriate option on top of the window for navigation in repositories and services.</P>"
msgstr ""
#. help text, continued
-#: src/clients/repositories.rb:983
+#: src/clients/repositories.rb:954
msgid ""
"<P><B>Keep Downloaded Packages</B><BR>Check this option to keep downloaded\n"
"packages in a local cache so they can be reused later when the packages are\n"
"reinstalled. If not checked, the downloaded packages are deleted after installation.</P>"
msgstr ""
-#: src/clients/repositories.rb:989
+#: src/clients/repositories.rb:960
msgid "<P>The default local cache is located in directory <B>/var/cache/zypp/packages</B>. Change the location in <B>/etc/zypp/zypp.conf</B> file.</P>"
msgstr ""
#. popup message part 1
-#: src/clients/repositories.rb:1034
+#: src/clients/repositories.rb:1005
#, fuzzy
msgid ""
"Unable to save changes to the repository\n"
@@ -811,7 +796,7 @@
#. popup message part 2 followed by other info
#. popup message, after message header, header of details
-#: src/clients/repositories.rb:1040 src/modules/Packages.rb:1329
+#: src/clients/repositories.rb:1011 src/modules/Packages.rb:1329
#: src/modules/SourceManager.rb:162 src/modules/SourceManager.rb:310
msgid "Details:"
msgstr ""
@@ -819,71 +804,71 @@
#. popup message part 3
#. end of popup message, question
#. end of popup message, question
-#: src/clients/repositories.rb:1042 src/modules/Packages.rb:1337
+#: src/clients/repositories.rb:1013 src/modules/Packages.rb:1337
#: src/modules/SourceManager.rb:164 src/modules/SourceManager.rb:312
msgid "Try again?"
msgstr ""
#. popup headline
-#: src/clients/repositories.rb:1059
+#: src/clients/repositories.rb:1030
#, fuzzy
msgid "Abort Repository Configuration"
msgstr "Configure Online Update"
#. popup message
-#: src/clients/repositories.rb:1061
+#: src/clients/repositories.rb:1032
msgid ""
"Abort the repository configuration?\n"
"All changes will be lost."
msgstr ""
#. refresh also the combobox widget
-#: src/clients/repositories.rb:1364
+#: src/clients/repositories.rb:1329
msgid ""
"There is no service at URL:\n"
"%1"
msgstr ""
#. TODO: add help text
-#: src/clients/repositories.rb:1475
+#: src/clients/repositories.rb:1440
#, fuzzy
msgid "Refreshing Repositories"
msgstr "Online Repositories"
-#: src/clients/repositories.rb:1476
+#: src/clients/repositories.rb:1441
#, fuzzy
msgid "Refreshing Services"
msgstr "Online Repositories"
-#: src/clients/repositories.rb:1481
+#: src/clients/repositories.rb:1446
#, fuzzy
msgid "Refresh Repositories"
msgstr "Online Repositories"
-#: src/clients/repositories.rb:1482
+#: src/clients/repositories.rb:1447
#, fuzzy
msgid "Refresh Services"
msgstr "Online Repositories"
#. progress bar label
-#: src/clients/repositories.rb:1514
+#: src/clients/repositories.rb:1479
msgid "Refreshing Repository %1..."
msgstr ""
#. refreshing services
#. progress bar label
-#: src/clients/repositories.rb:1540
+#: src/clients/repositories.rb:1505
#, fuzzy
msgid "Refreshing Service %1..."
msgstr "Online Repositories"
#. yes-no popup
-#: src/clients/repositories.rb:1559
+#: src/clients/repositories.rb:1524
msgid "Delete the selected repository from the list?"
msgstr ""
#. yes-no popup
-#: src/clients/repositories.rb:1573
+#: src/clients/repositories.rb:1538
#, fuzzy
msgid ""
"Delete service %1\n"
@@ -891,14 +876,14 @@
msgstr "Service: %1"
#. popup message
-#: src/clients/repositories.rb:1641
+#: src/clients/repositories.rb:1606
msgid ""
"For the selected repository, refresh\n"
"cannot be set."
msgstr ""
#. popup question, %1 is repository URL
-#: src/clients/repositories.rb:1803
+#: src/clients/repositories.rb:1768
msgid ""
"Repository %1\n"
"has been already added. Each repository should be added only once.\n"
@@ -907,7 +892,7 @@
msgstr ""
#. Error popup
-#: src/clients/repositories.rb:1871
+#: src/clients/repositories.rb:1836
#, fuzzy
msgid "<p>Errors occurred while restoring the repository configuration.</p>\n"
msgstr "Failed to integrate the service pack repository."
@@ -1356,50 +1341,50 @@
msgstr ""
#. TRANSLATORS: dialog caption
-#: src/include/packager/repositories_include.rb:79
+#: src/include/packager/repositories_include.rb:77
#, fuzzy
msgid "Adding a New Repository"
msgstr "URL of the update source."
-#: src/include/packager/repositories_include.rb:83
+#: src/include/packager/repositories_include.rb:81
#, fuzzy
msgid "Check Repository Type"
msgstr "URL of the update source."
-#: src/include/packager/repositories_include.rb:84
+#: src/include/packager/repositories_include.rb:82
#, fuzzy
msgid "Add Repository"
msgstr "URL of the update source."
-#: src/include/packager/repositories_include.rb:85
+#: src/include/packager/repositories_include.rb:83
#, fuzzy
msgid "Read Repository License"
msgstr "Online Repositories"
-#: src/include/packager/repositories_include.rb:88
+#: src/include/packager/repositories_include.rb:86
#, fuzzy
msgid "Checking Repository Type"
msgstr "Online Repositories"
-#: src/include/packager/repositories_include.rb:89
+#: src/include/packager/repositories_include.rb:87
#, fuzzy
msgid "Adding Repository"
msgstr "URL of the update source."
-#: src/include/packager/repositories_include.rb:90
+#: src/include/packager/repositories_include.rb:88
#, fuzzy
msgid "Reading Repository License"
msgstr "Online Repositories"
#. add at least one product if the scan result is empty (no product info available)
-#: src/include/packager/repositories_include.rb:154
+#: src/include/packager/repositories_include.rb:152
#, fuzzy
msgid "Repository"
msgstr "URL of the update source."
#. continue-back popup
#. continue-back popup
-#: src/include/packager/repositories_include.rb:226
+#: src/include/packager/repositories_include.rb:224
#: src/modules/SourceManager.rb:330
msgid ""
"There is no product information available at the given location.\n"
@@ -1411,7 +1396,7 @@
#. popup message part 1
#. Import GPG keys found in the inst-sys
-#: src/include/packager/repositories_include.rb:321
+#: src/include/packager/repositories_include.rb:319
#: src/modules/Packages.rb:1324 src/modules/SourceManager.rb:306
msgid ""
"Unable to create repository\n"
@@ -1419,20 +1404,20 @@
msgstr ""
#. error message
-#: src/include/packager/repositories_include.rb:333
+#: src/include/packager/repositories_include.rb:331
msgid ""
"Using an ISO image over ftp or http protocol is not possible.\n"
"Change the protocol or unpack the ISO image on the server side."
msgstr ""
#. popup message part 2
-#: src/include/packager/repositories_include.rb:343
+#: src/include/packager/repositories_include.rb:341
#, fuzzy
msgid "Change the URL and try again?"
msgstr "Change Date and Time"
#. popup error message, %1 is the package name
-#: src/include/packager/repositories_include.rb:420
+#: src/include/packager/repositories_include.rb:418
#, fuzzy
msgid ""
"Cannot search for SLP repositories\n"
@@ -1448,19 +1433,19 @@
#. error report
#. popup error
#. popup error
-#: src/modules/AddOnProduct.rb:518 src/modules/AddOnProduct.rb:620
+#: src/modules/AddOnProduct.rb:516 src/modules/AddOnProduct.rb:618
#: src/modules/ProductLicense.rb:539 src/modules/ProductLicense.rb:730
msgid "An error occurred while preparing the installation system."
msgstr ""
#. error report
-#: src/modules/AddOnProduct.rb:655
+#: src/modules/AddOnProduct.rb:653
msgid "Control file %1 not found on media."
msgstr ""
#. FATE #305578: Add-On Product Requiring Registration
#. or check the content file
-#: src/modules/AddOnProduct.rb:896
+#: src/modules/AddOnProduct.rb:894
#, fuzzy
#| msgid "Dependencies of the add-on product cannot be fulfilled."
msgid ""
@@ -1470,64 +1455,64 @@
#. TRANSLATORS: error report
#. TRANSLATORS: error report
-#: src/modules/AddOnProduct.rb:1263 src/modules/AddOnProduct.rb:1427
+#: 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:1314 src/modules/AddOnProduct.rb:1320
+#: src/modules/AddOnProduct.rb:1312 src/modules/AddOnProduct.rb:1318
msgid "%1, URL: %2"
msgstr ""
-#: src/modules/AddOnProduct.rb:1330
+#: src/modules/AddOnProduct.rb:1328
msgid "URL: %1, Path: %2"
msgstr ""
#. TRANSLATORS: popup heading
-#: src/modules/AddOnProduct.rb:1361
+#: src/modules/AddOnProduct.rb:1359
#, fuzzy
msgid "Additional Products"
msgstr "&No Additional YaST Modules"
#. TRANSLATORS: additional dialog information
-#: src/modules/AddOnProduct.rb:1367
+#: 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:1378
+#: src/modules/AddOnProduct.rb:1376
msgid "Additional Products to Select"
msgstr ""
#. push button label
-#: src/modules/AddOnProduct.rb:1385
+#: src/modules/AddOnProduct.rb:1383
#, fuzzy
msgid "Add Selected &Products"
msgstr "Selected Patterns"
#. %1 is either "CD" or "DVD"
-#: src/modules/AddOnProduct.rb:1517
+#: 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:1522
+#: src/modules/AddOnProduct.rb:1520
msgid "Insert the %1 %2 medium"
msgstr ""
#. TRANSLATORS: error message, %1 is replaced with product URL
-#: src/modules/AddOnProduct.rb:1574
+#: src/modules/AddOnProduct.rb:1572
#, fuzzy
msgid "Unable to add product %1."
msgstr "Failed to add add-on product."
#. adding the product to the list of products (BNC #269625)
#. no such products
-#: src/modules/AddOnProduct.rb:1766 src/modules/AddOnProduct.rb:1772
+#: src/modules/AddOnProduct.rb:1764 src/modules/AddOnProduct.rb:1770
#: src/modules/Packages.rb:471
#, fuzzy
msgid "Unknown Product"
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-03 12:57:46 UTC (rev 94274)
+++ branches/plus-SLE12-SP1/yast/en_US/po/qt-pkg.en_US.po 2015-11-03 12:57:47 UTC (rev 94275)
@@ -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 "The following selected software is either unsupported or requires an additional customer contract for support."
+msgstr ""
#: 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 "<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 ""
#. 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-03 12:57:46 UTC (rev 94274)
+++ branches/plus-SLE12-SP1/yast/en_US/po/rpm-groups.en_US.po 2015-11-03 12:57:47 UTC (rev 94275)
@@ -178,7 +178,7 @@
msgstr ""
msgid "File-Sharing"
-msgstr "File Sharing"
+msgstr ""
msgid "Filesystems"
msgstr ""
@@ -612,7 +612,7 @@
msgstr ""
msgid "Wifi"
-msgstr "Wi-Fi"
+msgstr ""
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-03 12:57:46 UTC (rev 94274)
+++ branches/plus-SLE12-SP1/yast/en_US/po/sshd.en_US.po 2015-11-03 12:57:47 UTC (rev 94275)
@@ -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 "Print &Message of the Day after Login"
+msgstr ""
#. 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-03 12:57:46 UTC (rev 94274)
+++ branches/plus-SLE12-SP1/yast/en_US/po/sudo.en_US.po 2015-11-03 12:57:47 UTC (rev 94275)
@@ -445,11 +445,6 @@
"\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
@@ -461,9 +456,6 @@
"\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
@@ -535,13 +527,6 @@
"\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
